diff --git a/.gitignore b/.gitignore index bfd81ae..e2dc2b2 100644 --- a/.gitignore +++ b/.gitignore @@ -88,6 +88,11 @@ 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 @@ -104,7 +109,3 @@ documents/compactsops/ /public/css/images/samenGroen.png /public/css/images/samenOranje.png /public/css/images/samenRood.png -/public/css/images/acceptBlauw.png -/public/css/images/acceptGrijs.png -/public/css/images/acceptGroen.png -/public/css/images/acceptOranje.png diff --git a/application/controllers/monpas/Compactsop.php b/application/controllers/monpas/Compactsop.php index cb1a4da..d76451a 100644 --- a/application/controllers/monpas/Compactsop.php +++ b/application/controllers/monpas/Compactsop.php @@ -156,12 +156,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]); } @@ -170,7 +170,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); } diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 1dcf0a5..90d67a6 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -76,8 +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.10';// drag and drop - public $version = '1.18.20';// drag and drop +// 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 = 'label ?>'; - scores as $index2 => $score){ + 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(nummer ?>); gem) > 0 ){ ?> scores.push({ y: gem) ?>, - color: '', + color: '', name: 'nummer ?>', });