sops

application/models/monpas/Sopinhouden_model.php

@@ -777,11 +777,13 @@ class Sopinhouden_model extends MY_Model{
 		$scores = $scores ? $scores : [];
 
 		foreach($scores as $score){
-//				$score->gem = 0;
-				if ($score->num > 0) {
+				$score->gem = 0;
+				if (isset($score->gem)) {
 					$score->gem= round($score->gem);
 				}
-				$score->huidig = $score->nummer;
+				$score->kleur = '#808080';
+				if(isset($score->kleurcode)) $score->kleur = $score->kleurcode;
+				$score->huidig = $score->kleurnummer;
             if($targetversie->scoretype == 7){
                 if($score->gem == $grens3) $score->huidig = 4;
                 if($score->gem < $grens3)  $score->huidig = 3;
@@ -789,10 +791,15 @@ class Sopinhouden_model extends MY_Model{
                 if($score->gem < $grens1) $score->huidig = 1;
             }
 				
-				if ($gewenst){					
+				if ($gewenst){
+
 					$score->wens  = $gewenst[$i]->wens;
 					$i = $i + 1;
-				};	
+				}
+				else{
+				  $score->wens = 3;
+				  $score->wenskleur = '#9fdf9f';
+            }
 		}; //foreach	
 
 		$labels = $this->Labels_model->getalllabels($module);