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
application/views/monpas/compactsop/ijktabelcompact.php
+4 -4
View File
@@ -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 } ?>