From 1cccd025d6b9696eb677e56b07aa90dd1d384893 Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Fri, 9 Sep 2022 17:29:08 +0200
Subject: [PATCH 1/4] chmod

---
 application/controllers/monpas/Compactsop.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/application/controllers/monpas/Compactsop.php b/application/controllers/monpas/Compactsop.php
index cb6503c..c4464fc 100644
--- a/application/controllers/monpas/Compactsop.php
+++ b/application/controllers/monpas/Compactsop.php
@@ -155,12 +155,12 @@ class  Compactsop extends MY_Controller{
         $filename = random_string('alnum', 15).'.'.$extension;
         $source = $_FILES['image_file']['tmp_name'];
         $target = $savePath.$filename;
+        chmod($target, '0777');
         rename($source, $target );
         //TODO: unlink eventueel oud logo
         $logo = $this->Schooldetails_model->getLogo($schoolID);
         $padNaam = $savePath.$logo;
-
-//        unlink($padNaam);
+        unlink($padNaam);
         $this->Schooldetails_model->update_record_where(['logo'=>$filename], ['organisatie_id' =>$schoolID]);
     }
 
@@ -169,7 +169,7 @@ class  Compactsop extends MY_Controller{
         $savePath = MYROOTPATH.'public/images/logos/';
         $logo =$this->Schooldetails_model->getLogo($schoolID);
         $padNaam = $savePath.$logo;
-        chmod($padNaam, '0777');
+
         $this->json($padNaam);
     }
 

From 09affb644a042e74f240eff9a8d8c567fdddc769 Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Fri, 7 Oct 2022 09:03:49 +0200
Subject: [PATCH 2/4] kleurenfout

---
 application/core/MY_Controller.php                      | 3 ++-
 application/views/monpas/compactsop/ijktabelcompact.php | 8 ++++----
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php
index 582dbc7..90d67a6 100644
--- a/application/core/MY_Controller.php
+++ b/application/core/MY_Controller.php
@@ -76,7 +76,8 @@ class MY_Controller extends CI_Controller{
 //    public $version = '1.18.00';// alle instrumenten in het compact sop
 //    public $version = '1.18.02';// fout in resultaatmatrix
 //    public $version = '1.18.04';// invul status
-    public $version = '1.18.05';// fout schoolgegevens compactsop
+//    public $version = '1.18.05';// fout schoolgegevens compactsop
+    public $version = '1.18.08';// kleurenfout
 
 
 
diff --git a/application/views/monpas/compactsop/ijktabelcompact.php b/application/views/monpas/compactsop/ijktabelcompact.php
index d63447a..6cf2b4c 100644
--- a/application/views/monpas/compactsop/ijktabelcompact.php
+++ b/application/views/monpas/compactsop/ijktabelcompact.php
@@ -44,19 +44,19 @@
                 var xastitel = '<?php echo $lijst->label ?>';
                 <?php }   ?>
 
-                <?php foreach($lijst->scores as $index2 => $score){
+                <?php foreach($lijst->scores as $score){
                 $omschrijving = "gemiddelde";
                 if(isset($score->omschrijving)){
                     $omschrijving = $score->omschrijving;
-                $kleur = '#808080';
-                if(isset($score->kleur) && $score->disabled == 'F' && $score->disablenvt =='F') $kleur = $score->kleur;
+                $kleur = '#808080';}
+                if(isset($score->kleur) && $score->disabled == 'F' && $score->disablenvt =='F'){ $kleur = $score->kleur;
                 };
                 ?>
                 labels.push(<?php $score->nummer ?>);
                 <?php if(floatval($score->gem) > 0 ){ ?>
                 scores.push({
                     y:         <?= floatval($score->gem) ?>,
-                    color:     '<?=$kleur ?>',
+                    color:     '<?= $kleur ?>',
                     name:      '<?= $score->nummer ?>',
                        });
                 <?php } ?>

From 1fed24d27b902be91dcee2f00adde4d47d816afc Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Fri, 7 Oct 2022 09:05:15 +0200
Subject: [PATCH 3/4] ignore

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 92f2a90..57ee7b5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -88,3 +88,4 @@ public/tmp/
 
 documents/compactsops/
 /.vscode
+*.png

From 3d715f6b87c6acabd0d7d0c01c875c815112d785 Mon Sep 17 00:00:00 2001
From: Monique <monique@MacBook-Pro-van-Monique.local>
Date: Fri, 7 Oct 2022 09:05:23 +0200
Subject: [PATCH 4/4] ignore

---
 .gitignore | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/.gitignore b/.gitignore
index 57ee7b5..e2dc2b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -89,3 +89,23 @@ public/tmp/
 documents/compactsops/
 /.vscode
 *.png
+/public/css/images/acceptBlauw.png
+/public/css/images/acceptGrijs.png
+/public/css/images/acceptGroen.png
+/public/css/images/acceptOranje.png
+/public/css/images/acceptRood.png
+/public/css/images/diffBlauw.png
+/public/css/images/diffGrijs.png
+/public/css/images/diffGroen.png
+/public/css/images/diffOranje.png
+/public/css/images/diffRood.png
+/public/css/images/extraBlauw.png
+/public/css/images/extraGrijs.png
+/public/css/images/extraGroen.png
+/public/css/images/extraOranje.png
+/public/css/images/extraRood.png
+/public/css/images/samenBlauw.png
+/public/css/images/samenGrijs.png
+/public/css/images/samenGroen.png
+/public/css/images/samenOranje.png
+/public/css/images/samenRood.png