From 7ea12a20ed2ec30a53bf80c199626d3509de4c1a Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Fri, 19 Nov 2021 22:47:25 +0100
Subject: [PATCH] sops

---
 .../monpas/Gemiddeldenafbeeldingen.php        |   2 +-
 .../libraries/monpas/Schoolafbeeldingen.php   |   2 +-
 .../models/monpas/Sopinhouden_model.php       |  17 +-
 .../monpas/compactsop/expertisecompact.php    |  11 +-
 .../compactsop/expertisecompactsosbo.php      |   6 +-
 .../monpas/compactsop/ijktabelcompact.php     |   4 +-
 .../views/monpas/sop/indiviudeleagenda.php    | 186 ++++++++++--------
 .../views/monpas/sop/monbasgrafiek1.php       |  26 +--
 .../views/monpas/sop/ontwikkelagenda.php      | 152 +++++++++-----
 .../views/monpas/sop/ontwikkelagenda2.php     |   7 +-
 10 files changed, 262 insertions(+), 151 deletions(-)

diff --git a/application/libraries/monpas/Gemiddeldenafbeeldingen.php b/application/libraries/monpas/Gemiddeldenafbeeldingen.php
index 8c56b01..77ad29f 100644
--- a/application/libraries/monpas/Gemiddeldenafbeeldingen.php
+++ b/application/libraries/monpas/Gemiddeldenafbeeldingen.php
@@ -328,7 +328,7 @@ class Gemiddeldenafbeeldingen {
     private function setAdvies(){
         if(isset($this->ijkpunt->wens) &&
                  $this->ijkpunt->huidig < $this->ijkpunt->wens &&
-                 $this->ijkpunt->huidig != 0 &&
+
                  $this->ijkpunt->wens!= 0 &&
                  isset($this->ijkpunt->omschrijving ) &&
                  $this->ijkpunt->disabled == 'F' &&
diff --git a/application/libraries/monpas/Schoolafbeeldingen.php b/application/libraries/monpas/Schoolafbeeldingen.php
index d57a3d0..a58f81b 100644
--- a/application/libraries/monpas/Schoolafbeeldingen.php
+++ b/application/libraries/monpas/Schoolafbeeldingen.php
@@ -312,7 +312,7 @@ class Schoolafbeeldingen {
 
             if(isset($this->score->wens) &&
                 $this->score->huidig < $this->score->wens &&
-                $this->score->huidig != 0 && $this->score->wens!= 0 &&
+                $this->score->wens!= 0 &&
                 $this->score->disabled == 'F' &&
                 $this->score->disablenvt == 'F'){
                 $omschrijving = "";
diff --git a/application/models/monpas/Sopinhouden_model.php b/application/models/monpas/Sopinhouden_model.php
index 57d372f..e958974 100644
--- a/application/models/monpas/Sopinhouden_model.php
+++ b/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);
diff --git a/application/views/monpas/compactsop/expertisecompact.php b/application/views/monpas/compactsop/expertisecompact.php
index e8eef99..cd6d0b4 100644
--- a/application/views/monpas/compactsop/expertisecompact.php
+++ b/application/views/monpas/compactsop/expertisecompact.php
@@ -45,12 +45,15 @@
                 if(isset($score->omschrijving)){
                     $omschrijving = $score->omschrijving;
                 };
+                $kleur = '#808080';
+                if(isset($score->kleur) && $score->disabled == 'F' && $score->disablenvt =='F') $kleur = $score->kleur;
+
                 ?>
 
                 labels.push(<?php $score->nummer ?>);
                 scores.push({
                     y:         <?= $score->gem ?>,
-                    color:     '<?=$score->kleur ?>',
+                    color:     '<?=$kleur ?>',
                     name:      '<?= $score->nummer ?>',
                     soort:     'score',
                     versie:    <?= $lijst->periodenummer ?>,
@@ -235,9 +238,9 @@
                                 <?php echo isset($score->omschrijving) ? $score->omschrijving: 'Gemiddelde'?>
                         </td>
                          <?php foreach ($data['lijsten'] as $lijst){
-                            $kleur = isset($lijst->scores[$i]->kleur) ? $lijst->scores[$i]->kleur : ''; 
-                            $gem   = isset($lijst->scores[$i]->gem) ? $lijst->scores[$i]->gem : ''; ?>
-                            <td style="background-color: <?=$kleur ?> !important; 
+                             $kleur = $lijst->scores[$i]->disabled == 'T' || $lijst->scores[$i]->disablenvt == 'T' ? ''    : (isset($lijst->scores[$i]->kleur) ? $lijst->scores[$i]->kleur : '');
+                             $gem   = $lijst->scores[$i]->disabled == 'T' ? 'uit' : ($lijst->scores[$i]->disablenvt == 'T' ? 'nvt' : (isset($lijst->scores[$i]->gem) ? $lijst->scores[$i]->gem : '')); ?>
+                             <td style="background-color: <?=$kleur ?> !important;
                                         padding-right: 3px;
                                         text-align: right" >
                                 <?=$gem?>
diff --git a/application/views/monpas/compactsop/expertisecompactsosbo.php b/application/views/monpas/compactsop/expertisecompactsosbo.php
index 3c72467..14fb234 100644
--- a/application/views/monpas/compactsop/expertisecompactsosbo.php
+++ b/application/views/monpas/compactsop/expertisecompactsosbo.php
@@ -235,9 +235,9 @@
                                 <?php echo isset($score->omschrijving) ? $score->omschrijving: 'Gemiddelde'?>
                         </td>
                          <?php foreach ($data['lijsten'] as $lijst){
-                            $kleur = isset($lijst->scores[$i]->kleur) ? $lijst->scores[$i]->kleur : ''; 
-                            $gem   = isset($lijst->scores[$i]->gem) ? $lijst->scores[$i]->gem : ''; ?>
-                            <td style="background-color: <?=$kleur ?> !important; 
+                             $kleur = $lijst->scores[$i]->disabled == 'T' || $lijst->scores[$i]->disablenvt == 'T' ? ''    : (isset($lijst->scores[$i]->kleur) ? $lijst->scores[$i]->kleur : '');
+                             $gem   = $lijst->scores[$i]->disabled == 'T' ? 'uit' : ($lijst->scores[$i]->disablenvt == 'T' ? 'nvt' : (isset($lijst->scores[$i]->gem) ? $lijst->scores[$i]->gem : '')); ?>
+                             <td style="background-color: <?=$kleur ?> !important;
                                         padding-right: 3px;
                                         text-align: right" >
                                 <?=$gem?>
diff --git a/application/views/monpas/compactsop/ijktabelcompact.php b/application/views/monpas/compactsop/ijktabelcompact.php
index f8623dd..287d805 100644
--- a/application/views/monpas/compactsop/ijktabelcompact.php
+++ b/application/views/monpas/compactsop/ijktabelcompact.php
@@ -45,13 +45,15 @@
                 $omschrijving = "gemiddelde";
                 if(isset($score->omschrijving)){
                     $omschrijving = $score->omschrijving;
+                $kleur = '#808080';
+                if(isset($score->kleur) && $score->disabled == 'F' && $score->disablenvt =='F') $kleur = $score->kleur;
                 };
                 ?>
 
                 labels.push(<?php $score->nummer ?>);
                 scores.push({
                     y:         <?= $score->gem ?>,
-                    color:     '<?=$score->kleur ?>',
+                    color:     '<?=$kleur ?>',
                     name:      '<?= $score->nummer ?>',
                     soort:     'score',
                     versie:    <?= $lijst->periodenummer ?>,
diff --git a/application/views/monpas/sop/indiviudeleagenda.php b/application/views/monpas/sop/indiviudeleagenda.php
index c4c21b7..3648a06 100644
--- a/application/views/monpas/sop/indiviudeleagenda.php
+++ b/application/views/monpas/sop/indiviudeleagenda.php
@@ -1,84 +1,116 @@
 <table style="width: 100%; font-size:0.7em; border-collapse: collapse; line-height:1.6em"
 		id="mod<?=$module?>tabel1">
-		<colgroup>
-			<col style="width: 25px">
-			<col >
-			<col span='9' style="width: 22px">
-		</colgroup>
-		<tr>
-			<td colspan=2></td>
-			<td  colspan=4 style="text-align:center"> <b>huidige situatie</b></td>
-			<td></td>
-			<td colspan =4  style="text-align:center"> <b> gewenste situatie</b></td>
-		<tr>
-		<tr style="background-color: #6F0B3D; color:#ffffff">
-			<td style="width: 25px"></td>
-			<td ><?=ucfirst($labels['ijkpunten'])?></td>
-			<td style=" text-align:center; background-color: #fe2219; color:#ffffff"> 1</td>
-			<td style=" text-align:center; background-color: #fea719; color:#ffffff" > 2</td>
-			<td style=" text-align:center; background-color:#15d029 ; color:#ffffff" > 3</td>
-			<td style=" text-align:center; background-color: #1558d0; color:#ffffff;" > 4</td>
-			<td style="background-color:#ffffff"></td>
-			<td style="text-align:center; background-color: #fe2219; color:#ffffff"> 1</td>
-			<td style="text-align:center; background-color: #fea719; color:#ffffff"> 2</td>
-			<td style="text-align:center; background-color:#15d029 ; color:#ffffff"> 3</td>
-			<td style="text-align:center; background-color: #1558d0; color:#ffffff"> 4</td>
-		</tr>
-		<?php 
-			if ($scores){
-				foreach ($scores as $score){ ?>
-				<tr>
-					<td style="border:1px solid #dddddd; text-align:right; padding-right:3px"><?=$score->nummer?></td>
-					<td style="border:1px solid #dddddd;padding-left:2px;"><?=$score->omschrijving?></td>
-					<td style="border:1px solid #dddddd" >
-						<?php if ($score->huidig == 1){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#fe2219;'></div>";					
-						};?>
-					</td>
-					<td style="border:1px solid #dddddd" >
-						<?php if ($score->huidig == 2){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#fea719;'></div>";					
-						};?>
-					</td>
-					<td style="border:1px solid #dddddd" >
-						<?php if ($score->huidig == 3){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#15d029;'></div>";					
-						};?>
-					</td>
-					<td style="border:1px solid #dddddd" >
-						<?php if ($score->huidig == 4){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#1558d0;'></div>";					
-						};?>
-					</td>
+    <colgroup>
+        <col style="width: 25px">
+        <col >
+        <col span='12' style="width: 22px">
+    </colgroup>
+    <tr>
+        <td colspan=2></td>
+        <td  colspan=5 style="text-align:center"> <b>huidige situatie</b></td>
+        <td></td>
+        <td colspan =5  style="text-align:center"> <b> gewenste situatie</b></td>
+    <tr>
+    <tr style="background-color: #6F0B3D; color:#ffffff">
+        <td style="width: 25px"></td>
+        <td ><?=ucfirst($labels['ijkpunten'])?></td>
+        <td style=" text-align:center; background-color: #e08885; color:#ffffff"> 1</td>
+        <td style=" text-align:center; background-color: #ffcc80; color:#ffffff" > 2</td>
+        <td style=" text-align:center; background-color:#9fdf9f ; color:#ffffff" > 3</td>
+        <td style=" text-align:center; background-color: #99d6ff; color:#ffffff;" > 4</td>
+        <td style=" text-align:center; background-color: #99d6ff; color:#ffffff;" > </td>
+        <td style="background-color:#ffffff"></td>
+        <td style="text-align:center; background-color: #e08885; color:#ffffff"> 1</td>
+        <td style="text-align:center; background-color: #ffcc80; color:#ffffff"> 2</td>
+        <td style="text-align:center; background-color:#9fdf9f ; color:#ffffff"> 3</td>
+        <td style="text-align:center; background-color: #99d6ff; color:#ffffff"> 4</td>
+        <td style=" text-align:center; background-color: #99d6ff; color:#ffffff;" ></td>
+    </tr>
+    <?php
+    if ($scores){
+        foreach ($scores as $score){ ?>
+            <tr>
+                <td style="border:1px solid #dddddd; text-align:right; padding-right:3px"><?=$score->nummer?></td>
+                <td style="border:1px solid #dddddd;padding-left:2px;"><?=$score->omschrijving?>
+                    <span><?=$score->omschrijving?></span>
+                    <span><?php if ($score->disabled == 'T'){echo ' (uit)';} ?></span>
+                    <span><?php if ($score->disabled == 'F' && $score->disablenvt == 'T'){echo ' (nvt)';} ?></span>
 
-					<td style="border-bottom:none; border-top:none"></td>
+                </td>
+                <td style="border:1px solid #dddddd;padding-left:2px;">
+                    <span> <?php if (isset($score->omschrijving)){echo $score->omschrijving;} ?></span>
+                    <span><?php if ($score->disabled == 'T'){echo ' (uit)';} ?></span>
+                    <span><?php if ($score->disabled == 'F' && $score->disablenvt == 'T'){echo ' (nvt)';} ?></span>
+                </td>
+                <td style="border:1px solid #dddddd" >
+                    <?php if ($score->huidig == 1){ ?>
+                        <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;} ?>"></div>
+                    <?php }; ?>
+                </td>
+                <td style="border:1px solid #dddddd" >
+                    <?php if ($score->huidig == 2){ ?>
+                        <div style= "width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;}  ?>"></div>
+                    <?php };?>
+                </td>
+                <td style="border:1px solid #dddddd" >
+                    <?php if ($score->huidig == 3){ ?>
+                        <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;} ?>"></div>
+                    <?php };?>
+                </td>
+                <td style="border:1px solid #dddddd" >
+                    <?php if ($score->huidig == 4){ ?>
+                        <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;} ?>"></div>
+                    <?php }; ?>
+                </td>
+                <td style="border:1px solid #dddddd" >
+                    <?php if ($score->disabled == 'T' || $score->disablenvt == 'T'){ ?>
+                        <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color: #808080;"></div>
+                    <?php }; ?>
+                </td>
 
-					<td style="border:1px solid #dddddd" >
-						<?php if (isset($score->wens) && $score->wens == 1){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#fe2219;'></div>";					
-						};?>
-					</td>
-					
-					<td style="border:1px solid #dddddd" >
-						<?php if (isset($score->wens) && $score->wens == 2){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#fea719;'></div>";					
-						};?>
-					</td>
-					<td style="border:1px solid #dddddd" >
-						<?php if (isset($score->wens) && $score->wens == 3){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#15d029;'></div>";					
-						};?>
-					</td>				
-					<td style="border:1px solid #dddddd" >
-						<?php if (isset($score->wens) &&  $score->wens == 4){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#1558d0;'></div>";					
-						};?>
-					</td>			
-				</tr>
-		<?php ;};}; ?>
-	</table>
-	<p> </p>
-	<?=$kleurtabel?>
+                <td style="border-bottom:none; border-top:none"></td>
+
+                <td style="border:1px solid #dddddd" >
+                    <?php if (isset($score->wens) && $score->wens == 1){ ?>
+                        <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
+                    <?php };?>
+                </td>
+
+                <td style="border:1px solid #dddddd" >
+                    <?php if (isset($score->wens) && $score->wens == 2){ ?>
+                        <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                       background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
+                    <?php };?>
+                </td>
+                <td style="border:1px solid #dddddd" >
+                    <?php if (isset($score->wens) && $score->wens == 3){ ?>
+                        <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
+                    <?php };?>
+                </td>
+                <td style="border:1px solid #dddddd" >
+                    <?php if (isset($score->wens) && $score->wens == 4){ ?>
+                        <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
+                    <?php };?>
+                </td>
+                <td style="border:1px solid #dddddd" >
+                    <?php if ($score->disabled == 'T' || $score->disablenvt == 'T'){ ?>
+                        <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color: #808080;"></div>
+                    <?php }; ?>
+                </td>
+            </tr>
+            <?php ;};}; ?>
+</table>
+<p> </p>
+<?=$kleurtabel?>
 
 
 
diff --git a/application/views/monpas/sop/monbasgrafiek1.php b/application/views/monpas/sop/monbasgrafiek1.php
index bbb4ddb..42d226b 100644
--- a/application/views/monpas/sop/monbasgrafiek1.php
+++ b/application/views/monpas/sop/monbasgrafiek1.php
@@ -16,18 +16,20 @@
 				var ambitiescore= <?php echo $ambitie->gemscore; ?>;
 				var lijnAt = (((100 - parseFloat(ambitiescore)) / 10 ) * 25 ) +12;
 				var j=0;
-				$.each(results, function(i,p){
-				//	scores[i] = p.gem();
-					if (p.num > 0){
-						scores[i]= Number(p.gem);
-					}
-					else {scores[i]= 0;};
-					slabels[i] 		= p.nummer;
-					tekstlabels[i] 	= p.omschrijving;
-					j ++;
-				}); // each
-				slabels[j]='gem';
-				scores[j]=<?php echo $totgem;?> ;
+             <?php foreach($scores as $index => $score){ ?>
+
+             slabels.push('<?= $score->nummer ?>');
+             tekstlabels.push('<?= $score->omschrijving ?>');
+             scores.push({
+                 y:         <?= $score->gem ?>,
+                 color:     '<?= isset($score->kleur)? $score->kleur : "#808080" ?>',
+                 name:      '<?= $score->nummer ?>',
+
+             });
+
+
+             <?php }   ?>
+
 			  	var ctxSchoolijkpunt2=$("#schoolijkpunt2").get(0).getContext("2d");
 			
 				var data5 = {labels :slabels,
diff --git a/application/views/monpas/sop/ontwikkelagenda.php b/application/views/monpas/sop/ontwikkelagenda.php
index 2a65993..1305e7e 100644
--- a/application/views/monpas/sop/ontwikkelagenda.php
+++ b/application/views/monpas/sop/ontwikkelagenda.php
@@ -3,13 +3,13 @@
 		<colgroup>
 			<col style="width: 25px">
 			<col >
-			<col span='9' style="width: 22px">
+			<col span='11' style="width: 22px">
 		</colgroup>
 		<tr>
 			<td colspan=2></td>
-			<td  colspan=4 style="text-align:center"> <b>huidige situatie</b></td>
+			<td  colspan=5 style="text-align:center"> <b>huidige situatie</b></td>
 			<td></td>
-			<td colspan =4  style="text-align:center"> <b> gewenste situatie</b></td>
+			<td colspan =5  style="text-align:center"> <b> gewenste situatie</b></td>
 		<tr>
 		<tr style="background-color: #6F0B3D; color:#ffffff">
 			<td style="width: 25px"></td>
@@ -18,62 +18,122 @@
 			<td style=" text-align:center; background-color: #ffcc80; color:#ffffff" > 2</td>
 			<td style=" text-align:center; background-color:#9fdf9f ; color:#ffffff" > 3</td>
 			<td style=" text-align:center; background-color: #99d6ff; color:#ffffff;" > 4</td>
+            <td style=" text-align:center; background-color: #808080; color:#ffffff;" > </td>
 			<td style="background-color:#ffffff"></td>
 			<td style="text-align:center; background-color: #e08885; color:#ffffff"> 1</td>
 			<td style="text-align:center; background-color: #ffcc80; color:#ffffff"> 2</td>
 			<td style="text-align:center; background-color:#9fdf9f ; color:#ffffff"> 3</td>
 			<td style="text-align:center; background-color: #99d6ff; color:#ffffff"> 4</td>
+            <td style=" text-align:center; background-color: #808080; color:#ffffff;" ></td>
 		</tr>
 		<?php 
 			if ($scores){
 				foreach ($scores as $score){ ?>
+
 				<tr>
 					<td style="border:1px solid #dddddd; text-align:right; padding-right:3px"><?=$score->nummer?></td>
-					<td style="border:1px solid #dddddd;padding-left:2px;"><?=$score->omschrijving?></td>
-					<td style="border:1px solid #dddddd" >
-						<?php if ($score->huidig == 1){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#e08885;'></div>";
-						};?>
-					</td>
-					<td style="border:1px solid #dddddd" >
-						<?php if ($score->huidig == 2){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#ffcc80;'></div>";
-						};?>
-					</td>
-					<td style="border:1px solid #dddddd" >
-						<?php if ($score->huidig == 3){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#9fdf9f;'></div>";
-						};?>
-					</td>
-					<td style="border:1px solid #dddddd" >
-						<?php if ($score->huidig == 4){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#99d6ff;'></div>";
-						};?>
-					</td>
+					<td style="border:1px solid #dddddd;padding-left:2px;">
+                        <span><?=$score->omschrijving?></span>
+                        <span><?php if ($score->disabled == 'T'){echo ' (uit)';} ?></span>
+                        <span><?php if ($score->disabled == 'F' && $score->disablenvt == 'T'){echo ' (nvt)';} ?></span>
 
-					<td style="border-bottom:none; border-top:none"></td>
+                    </td>
+                    <td style="border:1px solid #dddddd" >
+                        <?php if ($score->kleurnummer == 1){
+                            $kleur = '';
+                            if($score->disabled == 'F' && $score->disablenvt == 'F') $kleur = '#e08885';
 
-					<td style="border:1px solid #dddddd" >
-						<?php if (isset($score->wens) && $score->wens == 1){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#e08885;'></div>";
-						};?>
-					</td>
-					
-					<td style="border:1px solid #dddddd" >
-						<?php if (isset($score->wens) && $score->wens == 2){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#ffcc80;'></div>";
-						};?>
-					</td>
-					<td style="border:1px solid #dddddd" >
-						<?php if (isset($score->wens) && $score->wens == 3){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#9fdf9f;'></div>";
-						};?>
-					</td>				
-					<td style="border:1px solid #dddddd" >
-						<?php if (isset($score->wens) &&  $score->wens == 4){
-							echo "<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:#99d6ff;'></div>";
-						};?>
-					</td>			
+                            ?>
+                            <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $kleur;} ?>"></div>
+                        <?php }; ?>
+                    </td>
+                    <td style="border:1px solid #dddddd" >
+                        <?php if ($score->kleurnummer == 2){
+                            $kleur = '';
+                            if($score->disabled == 'F' && $score->disablenvt == 'F') $kleur = '#ffcc80';
+
+                            ?>
+
+                            <div style= "width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $kleur;} ?>"></div>
+                        <?php };?>
+                    </td>
+                    <td style="border:1px solid #dddddd" >
+                        <?php if ($score->kleurnummer == 3){
+                            $kleur = '';
+                            if($score->disabled == 'F' && $score->disablenvt == 'F') $kleur = '#9fdf9f';
+
+                            ?>
+                            <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $kleur;} ?>"></div>
+                        <?php };?>
+                    </td>
+                    <td style="border:1px solid #dddddd" >
+                        <?php if ($score->kleurnummer == 4){
+                            $kleur = '';
+                            if($score->disabled == 'F' && $score->disablenvt == 'F') $kleur = '#99d6ff';
+
+                            ?>
+                            <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $kleur;} ?>"></div>
+                        <?php }; ?>
+                    </td>
+                    <td style="border:1px solid #dddddd" >
+                        <?php if ($score->disabled == 'T' || $score->disablenvt == 'T'){ ?>
+                            <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color: #808080;"></div>
+                        <?php }; ?>
+                    </td>
+
+                    <td style="border-bottom:none; border-top:none"></td>
+
+                    <td style="border:1px solid #dddddd" >
+                        <?php if (isset($score->wens) && $score->wens == 1){
+                            $kleur = '';
+                            if($score->disabled == 'F' && $score->disablenvt == 'F') $kleur = '#e08885';
+
+
+                            ?>
+                            <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $kleur;} ?>"></div>
+                        <?php };?>
+                    </td>
+
+                    <td style="border:1px solid #dddddd" >
+                        <?php if (isset($score->wens) && $score->wens == 2){
+                            $kleur = '';
+                            if($score->disabled == 'F' && $score->disablenvt == 'F') $kleur = '#ffcc80';
+                            ?>
+                            <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                       background-color:<?php {echo $kleur;} ?>"></div>
+                        <?php };?>
+                    </td>
+                    <td style="border:1px solid #dddddd" >
+                        <?php if (isset($score->wens) && $score->wens == 3){
+                            $kleur = '';
+                            if($score->disabled == 'F' && $score->disablenvt == 'F') $kleur = '#99d6ff';
+
+                            ?>
+                            <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $kleur;} ?>"></div>
+                        <?php };?>
+                    </td>
+                    <td style="border:1px solid #dddddd" >
+                        <?php if (isset($score->wens) && $score->wens == 4){
+                            $kleur = '';
+                            if($score->disabled == 'F' && $score->disablenvt == 'F') $kleur = '#99d6ff';
+                            ?>
+                            <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color:<?php {echo $kleur;} ?>"></div>
+                        <?php };?>
+                    </td>
+                    <td style="border:1px solid #dddddd" >
+                        <?php if ($score->disabled == 'T' || $score->disablenvt == 'T'){ ?>
+                            <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
+                        background-color: #808080;"></div>
+                        <?php }; ?>
+                    </td>
 				</tr>
 		<?php ;};}; ?>
 	</table>
diff --git a/application/views/monpas/sop/ontwikkelagenda2.php b/application/views/monpas/sop/ontwikkelagenda2.php
index 1edadc2..20e9761 100644
--- a/application/views/monpas/sop/ontwikkelagenda2.php
+++ b/application/views/monpas/sop/ontwikkelagenda2.php
@@ -1,7 +1,12 @@
 	<table style="border-collapse: collapse; cellspacing:0px; font-size:0.8em; line-height:1.5em"
 			id="mod<?=$module?>tabel2">
 	<?php foreach($scores as $score){ 
-			if (isset($score->wens)  && $score->huidig < $score->wens){?>
+			if (isset($score->wens)  &&
+                      $score->huidig < $score->wens &&
+                      $score->wens!= 0 &&
+                isset($score->omschrijving ) &&
+                       $score->disabled == 'F' &&
+                       $score->disablenvt == 'F'){?>
 		<tr>
 			<td style="text-align:right; padding-right:3px"><?=$score->nummer?></td>
 			<td><?=$score->omschrijving?></td>