From 2b258c9a0c7d9516be3a15fe4449b03f5a1f14b8 Mon Sep 17 00:00:00 2001
From: Liesbeth ter Schure <l.terschure@pensare.nl>
Date: Sun, 21 Nov 2021 21:12:26 +0100
Subject: [PATCH] kwalOndersteuning

---
 .../models/monpas/Sopinhouden_model.php       | 18 ++++++-----
 .../views/monpas/sop/monbasgrafiek1.php       | 30 +++++++++++--------
 application/views/monpas/sop/monbastabel1.php |  6 ++--
 3 files changed, 31 insertions(+), 23 deletions(-)

diff --git a/application/models/monpas/Sopinhouden_model.php b/application/models/monpas/Sopinhouden_model.php
index e958974..6557719 100644
--- a/application/models/monpas/Sopinhouden_model.php
+++ b/application/models/monpas/Sopinhouden_model.php
@@ -79,6 +79,8 @@ class Sopinhouden_model extends MY_Model{
 
 					$versie 		= $result['targetversie'];
 					$mbgrafiek = $result['grafiek1'];
+// print_r($mbgrafiek);
+// exit;
 					$imagemb	=$this->Phantom_model->create_img($mbgrafiek, 'test', FALSE, FALSE, array(650, 300));
 					$imagedata = "<img src='data:image/png;base64,".$imagemb."' id='mod1image1'/>";
 					$pos 		= strpos($content,'mbgrafiek1');
@@ -571,12 +573,13 @@ class Sopinhouden_model extends MY_Model{
 		$laagstescore = 101;
 		if ($scores) {
             foreach ($scores as $score) {
-			$score->gem = round($score->gem);
+			    $score->gem = round($score->gem);
 //
 //				if ($score->num > 0) {
 //					$gem=$score->somscore / $score->num;
 //				};
-//                $score->kleurcode = $this->kleurcodes->getkleur($score->gem);
+//LS ACTIEF GEMAAKT
+                $score->kleurcode = $this->kleurcodes->getkleur($score->gem);
 
                 if ($score->disabled == 'F' && $score->disablenvt == 'F') {
                     $totgem = $totgem + $score->gem;
@@ -593,13 +596,12 @@ class Sopinhouden_model extends MY_Model{
                     if ($ambitie && $score->gem >= $ambitie->zprocent) {
                         $ijkpuntenok = $ijkpuntenok + 1;
                     };
-
-
-                    if ($totaantal > 0) {
-                        $totgem = round($totgem / $totaantal, 2);
-                    }
+                    
                 }
             }
+            if ($totaantal > 0) {
+                $totgem = round($totgem / $totaantal, 0);
+            }
             $totgemkleur = $this->kleurcodes->getkleur($totgem);
             // foreach scores bereken som en dus totgem en ijkpuntenok
         }
@@ -624,7 +626,7 @@ class Sopinhouden_model extends MY_Model{
 						"labels" 		=> $labels,
 						"scores"		=> $scores,
 						'totgem' 		=> $totgem,
-						'totgemkleur'	=>$totgem,
+						'totgemkleur'	=>$totgemkleur,
 						'ijkpuntenok' 	=> $ijkpuntenok,
 						'welkehoogste'	=> $welkehoogste,
 						'hoogstescore'	=> round($hoogstescore,1),
diff --git a/application/views/monpas/sop/monbasgrafiek1.php b/application/views/monpas/sop/monbasgrafiek1.php
index 42d226b..33dfc59 100644
--- a/application/views/monpas/sop/monbasgrafiek1.php
+++ b/application/views/monpas/sop/monbasgrafiek1.php
@@ -16,28 +16,34 @@
 				var ambitiescore= <?php echo $ambitie->gemscore; ?>;
 				var lijnAt = (((100 - parseFloat(ambitiescore)) / 10 ) * 25 ) +12;
 				var j=0;
+                var colors=[]
              <?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 ?>',
-
-             });
+            //  scores.push({
+            //      y:         <?= $score->gem ?>,
+            //      color:     '<?= isset($score->kleur)? $score->kleur : "#808080" ?>',
+            //      name:      '<?= $score->nummer ?>',
 
+            //  });
+            scores.push(<?=$score->gem ?>)
+            colors.push('<?= isset($score->kleurcode) ? $score->kleurcode : "#808080" ?>')
 
              <?php }   ?>
-
-			  	var ctxSchoolijkpunt2=$("#schoolijkpunt2").get(0).getContext("2d");
+            slabels.push('gem')
+            scores.push(<?= $totgem ?>)
+            colors.push('<?= isset($totgemkleur) ? $totgemkleur : "#808080" ?>')
+			  	
+            var ctxSchoolijkpunt2=$("#schoolijkpunt2").get(0).getContext("2d");
 			
 				var data5 = {labels :slabels,
 							datasets: [{	label: tekstlabels,
-										fillColor: "rgba(147,15,80,0.9)",      									
-            									 strokeColor: "rgba(111,11,61,1)",     
-            									 highlightStroke: "rgba(222,22,123,1)",      						 			
-           									data: scores},
+										    fillColor: "rgba(147,15,80,0.9)",      									
+            								strokeColor: "rgba(111,11,61,1)",     
+            								highlightStroke: "rgba(222,22,123,1)",      						 			
+           									data: scores
+                                               },
 							]}
 				
 				Chart.types.Bar.extend({
diff --git a/application/views/monpas/sop/monbastabel1.php b/application/views/monpas/sop/monbastabel1.php
index 185d5f0..aa9a5c8 100644
--- a/application/views/monpas/sop/monbastabel1.php
+++ b/application/views/monpas/sop/monbastabel1.php
@@ -34,15 +34,15 @@
 		</thead>
 		<tbody >
 			<?php foreach($scores as $score){
-            $kleur = $score->disabled == 'T' || $score->disablenvt == 'T' ?   '#808080'    : $score->kleurcode; ?>
+                $kleur = $score->disabled == 'T' || $score->disablenvt == 'T' ?   '#808080'    : $score->kleurcode; ?>
 
-            //				$gem =round($score->somscore / $score->num,1);
+          <!--  //				$gem =round($score->somscore / $score->num,1);
 				//$backgroundcolor =$score->kleurcode;
 				// if ($gem >50 )$backgroundcolor = "#fea719";
 				// if ($gem > 70) $backgroundcolor = "#15d029";
 				// if ($gem > 90) $backgroundcolor = "#1558d0";
-				
 				?>
+            -->
 			<tr style="border-bottom: 1px solid #ebebeb" >
 				<td style="vertical-align:top" ><?=$score->nummer?></td>
 				<td style="vertical-align:top" ><?=$score->omschrijving?></td>