Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fouten/kleuren' into develop

Browse Source 
# Conflicts:
#	.gitignore
#	application/core/MY_Controller.php
This commit is contained in:
Monique
2022-10-07 09:07:27 +02:00
parent 509e10ecfb 3d715f6b87
commit dd95f19047
4 changed files with 14 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+5 -4
View File
@@ -88,6 +88,11 @@ public/tmp/
documents/compactsops/ documents/compactsops/
/.vscode /.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/acceptRood.png
/public/css/images/diffBlauw.png /public/css/images/diffBlauw.png
/public/css/images/diffGrijs.png /public/css/images/diffGrijs.png
@@ -104,7 +109,3 @@ documents/compactsops/
/public/css/images/samenGroen.png /public/css/images/samenGroen.png
/public/css/images/samenOranje.png /public/css/images/samenOranje.png
/public/css/images/samenRood.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
application/controllers/monpas/Compactsop.php
+3 -3
View File
@@ -156,12 +156,12 @@ class Compactsop extends MY_Controller{
$filename = random_string('alnum', 15).'.'.$extension; $filename = random_string('alnum', 15).'.'.$extension;
$source = $_FILES['image_file']['tmp_name']; $source = $_FILES['image_file']['tmp_name'];
$target = $savePath.$filename; $target = $savePath.$filename;
chmod($target, '0777');
rename($source, $target ); rename($source, $target );
//TODO: unlink eventueel oud logo //TODO: unlink eventueel oud logo
$logo = $this->Schooldetails_model->getLogo($schoolID); $logo = $this->Schooldetails_model->getLogo($schoolID);
$padNaam = $savePath.$logo; $padNaam = $savePath.$logo;
unlink($padNaam);
// unlink($padNaam);
$this->Schooldetails_model->update_record_where(['logo'=>$filename], ['organisatie_id' =>$schoolID]); $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/'; $savePath = MYROOTPATH.'public/images/logos/';
$logo =$this->Schooldetails_model->getLogo($schoolID); $logo =$this->Schooldetails_model->getLogo($schoolID);
$padNaam = $savePath.$logo; $padNaam = $savePath.$logo;
chmod($padNaam, '0777');
$this->json($padNaam); $this->json($padNaam);
} }
application/core/MY_Controller.php
+2 -2
View File
@@ -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.00';// alle instrumenten in het compact sop
// public $version = '1.18.02';// fout in resultaatmatrix // public $version = '1.18.02';// fout in resultaatmatrix
// public $version = '1.18.04';// invul status // public $version = '1.18.04';// invul status
// public $version = '1.18.10';// drag and drop // public $version = '1.18.05';// fout schoolgegevens compactsop
public $version = '1.18.20';// drag and drop public $version = '1.18.08';// kleurenfout
application/views/monpas/compactsop/ijktabelcompact.php
+4 -4
View File
@@ -44,19 +44,19 @@
var xastitel = '<?php echo $lijst->label ?>'; var xastitel = '<?php echo $lijst->label ?>';
<?php } ?> <?php } ?>
<?php foreach($lijst->scores as $index2 => $score){ <?php foreach($lijst->scores as $score){
$omschrijving = "gemiddelde"; $omschrijving = "gemiddelde";
if(isset($score->omschrijving)){ if(isset($score->omschrijving)){
$omschrijving = $score->omschrijving; $omschrijving = $score->omschrijving;
$kleur = '#808080'; $kleur = '#808080';}
if(isset($score->kleur) && $score->disabled == 'F' && $score->disablenvt =='F') $kleur = $score->kleur; if(isset($score->kleur) && $score->disabled == 'F' && $score->disablenvt =='F'){ $kleur = $score->kleur;
}; };
?> ?>
labels.push(<?php $score->nummer ?>); labels.push(<?php $score->nummer ?>);
<?php if(floatval($score->gem) > 0 ){ ?> <?php if(floatval($score->gem) > 0 ){ ?>
scores.push({ scores.push({
y: <?= floatval($score->gem) ?>, y: <?= floatval($score->gem) ?>,
color: '<?=$kleur ?>', color: '<?= $kleur ?>',
name: '<?= $score->nummer ?>', name: '<?= $score->nummer ?>',
}); });
<?php } ?> <?php } ?>