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

flexibel sop

Browse Source
This commit is contained in:
Monique
2021-11-19 19:59:34 +01:00
parent b8177ade48
commit 39a120e214
14 changed files with 204 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/monpas/Gemiddeldenafbeeldingen.php
+7 -2
View File
@@ -326,8 +326,13 @@ class Gemiddeldenafbeeldingen {
} }
private function setAdvies(){ private function setAdvies(){
if(isset($this->ijkpunt->wens) && $this->ijkpunt->huidig < $this->ijkpunt->wens && if(isset($this->ijkpunt->wens) &&
$this->ijkpunt->huidig != 0 && $this->ijkpunt->wens!= 0 && isset($this->ijkpunt->omschrijving)){ $this->ijkpunt->huidig < $this->ijkpunt->wens &&
$this->ijkpunt->huidig != 0 &&
$this->ijkpunt->wens!= 0 &&
isset($this->ijkpunt->omschrijving ) &&
$this->ijkpunt->disabled == 'F' &&
$this->ijkpunt->disablenvt == 'F'){
array_push($this->adviezen, [ array_push($this->adviezen, [
"nummer"=> $this->ijkpunt->nummer, "nummer"=> $this->ijkpunt->nummer,
"omschrijving" =>$this->ijkpunt->omschrijving "omschrijving" =>$this->ijkpunt->omschrijving
application/libraries/monpas/Schoolafbeeldingen.php
+5 -1
View File
@@ -310,7 +310,11 @@ class Schoolafbeeldingen {
private function setAdvies(){ private function setAdvies(){
if(isset($this->score->wens) && $this->score->huidig < $this->score->wens && $this->score->huidig != 0 && $this->score->wens!= 0 && $this->score->disabled == 'F'){ if(isset($this->score->wens) &&
$this->score->huidig < $this->score->wens &&
$this->score->huidig != 0 && $this->score->wens!= 0 &&
$this->score->disabled == 'F' &&
$this->score->disablenvt == 'F'){
$omschrijving = ""; $omschrijving = "";
if(isset($this->score->omschrijving)){ if(isset($this->score->omschrijving)){
$omschrijving = $this->score->omschrijving; $omschrijving = $this->score->omschrijving;
application/models/Phantom_model.php
+1
View File
@@ -55,6 +55,7 @@ class Phantom_model extends CI_Model{
if( $margins ) $data['margins'] = serialize($margins); if( $margins ) $data['margins'] = serialize($margins);
curl_setopt_array($curl, array( curl_setopt_array($curl, array(
curl_setopt($curl, CURLOPT_SSL_VERIFYPEER, 0),
CURLOPT_RETURNTRANSFER => 1, CURLOPT_RETURNTRANSFER => 1,
CURLOPT_URL => 'https://print.pensare-services.nl/test/1', CURLOPT_URL => 'https://print.pensare-services.nl/test/1',
CURLOPT_POST => 1, CURLOPT_POST => 1,
application/models/monpas/Sopinhouden_model.php
+37 -10
View File
@@ -571,7 +571,7 @@ class Sopinhouden_model extends MY_Model{
$laagstescore = 101; $laagstescore = 101;
if ($scores) { if ($scores) {
foreach ($scores as $score) { foreach ($scores as $score) {
// $gem = 0; $score->gem = round($score->gem);
// //
// if ($score->num > 0) { // if ($score->num > 0) {
// $gem=$score->somscore / $score->num; // $gem=$score->somscore / $score->num;
@@ -676,16 +676,33 @@ class Sopinhouden_model extends MY_Model{
$lks = $this->Filledversions_model->getlks($orgid, $orgversieid); $lks = $this->Filledversions_model->getlks($orgid, $orgversieid);
if ($lks){ if ($lks){
foreach($lks as $lk){ foreach($lks as $lk){
$lk->scores = $this->Scores_model->getlkscores($lk->filledversionid); $lk->scores = $this->Scores_model->calculateindividualscores($orgversieid, $orgid, $lk->user_id);
$som = 0; $som = 0;
if ($lk->scores){ if ($lk->scores){
foreach($lk->scores as $score){ foreach($lk->scores as $index => $score){
$aftrek = 0;
$score->gem = new stdClass(); $score->gem = new stdClass();
$score->gem = $score->somcore / $score->num; $score->gem = 0;
$score->colorcode = $this->kleurcodes->getkleur($score->gem); $score->colorcode = '#808080';
$som = $som + $score->gem; $score->disablenvt = 'F';
if($score->aantalvier > 0 && $score->aantalvier == $score->aantalnvt) $score->disablenvt = 'T';
if($score->disabled == 'F' && $score->disablenvt == 'F') {
$score->gem = $score->somscore / $score->num;
$score->colorcode = $this->kleurcodes->getkleur($score->gem);
$som = $som + $score->gem;
}
if($score->disabled == 'T') $aftrek++;
if($score->disablenvt == 'T') $aftrek++;
} }
$lk->lkgem = round($som / $aantalijkpunten, 0);
$deler = $aantalijkpunten - $aftrek;
if ($deler > 0) $lk->lkgem = round($som / $aantalijkpunten, 0);
else $lk->gem = 0;
$lk->colorcode = $this->kleurcodes->getkleur($lk->lkgem); $lk->colorcode = $this->kleurcodes->getkleur($lk->lkgem);
} }
} }
@@ -704,11 +721,21 @@ class Sopinhouden_model extends MY_Model{
if ($lks[0]->scores){ if ($lks[0]->scores){
$som = 0; $som = 0;
$aftrek = 0;
foreach($lks[0]->scores as $score){ foreach($lks[0]->scores as $score){
$score->colorcode = $this->kleurcodes->getkleur($score->gem); $score->colorcode = '#808080';
$som = $som + $score->gem; if($score->disabled == 'F' && $score->disablenvt == 'F') {
$score->colorcode = $this->kleurcodes->getkleur($score->gem);
$som = $som + $score->gem;
}
if($score->disabled =='T' || $score->disablenvt =='T' ) $aftrek++;
} }
$lks[0]->lkgem = round($som / $aantalijkpunten, 0); if($aantalijkpunten - $aftrek > 0) {
$lks[0]->lkgem = round($som / ($aantalijkpunten - $aftrek), 0);
}
else{
$lks[0]->lkgem = 0;
}
$lks[0]->colorcode = $this->kleurcodes->getkleur($lks[0]->lkgem); $lks[0]->colorcode = $this->kleurcodes->getkleur($lks[0]->lkgem);
} }
return $lks; return $lks;
application/models/testPrint.http
+10
View File
@@ -0,0 +1,10 @@
### Send POST request with json body
POST https://print.pensare-services.nl/test/1
Content-Type: application/json
{
"html":"<h1>test</h1>",
"file":"test.png",
"app": "MONPAS"
}
application/views/monpas/sop/monbasgrafiek1.php
+1 -1
View File
@@ -19,7 +19,7 @@
$.each(results, function(i,p){ $.each(results, function(i,p){
// scores[i] = p.gem(); // scores[i] = p.gem();
if (p.num > 0){ if (p.num > 0){
scores[i]=p.somscore / p.num; scores[i]= Number(p.gem);
} }
else {scores[i]= 0;}; else {scores[i]= 0;};
slabels[i] = p.nummer; slabels[i] = p.nummer;
application/views/monpas/sop/monbastabel1.php
+9 -6
View File
@@ -33,8 +33,10 @@
</tr> </tr>
</thead> </thead>
<tbody > <tbody >
<?php foreach($scores as $score){ <?php foreach($scores as $score){
$gem =round($score->somscore / $score->num,1); $kleur = $score->disabled == 'T' || $score->disablenvt == 'T' ? '#808080' : $score->kleurcode; ?>
// $gem =round($score->somscore / $score->num,1);
//$backgroundcolor =$score->kleurcode; //$backgroundcolor =$score->kleurcode;
// if ($gem >50 )$backgroundcolor = "#fea719"; // if ($gem >50 )$backgroundcolor = "#fea719";
// if ($gem > 70) $backgroundcolor = "#15d029"; // if ($gem > 70) $backgroundcolor = "#15d029";
@@ -44,10 +46,11 @@
<tr style="border-bottom: 1px solid #ebebeb" > <tr style="border-bottom: 1px solid #ebebeb" >
<td style="vertical-align:top" ><?=$score->nummer?></td> <td style="vertical-align:top" ><?=$score->nummer?></td>
<td style="vertical-align:top" ><?=$score->omschrijving?></td> <td style="vertical-align:top" ><?=$score->omschrijving?></td>
<td style="text-align:right; vertical-align:top; padding-right: 5px; color:#ffffff; background-color:<?=$score->kleurcode?> "> <td style="text-align:right; vertical-align:top; padding-right: 5px; color:#ffffff; background-color:<?=$kleur?> ">
<?=number_format($gem,1);?> <?php echo $score->disabled == 'T' ? 'uit' : ($score->disablenvt == 'T' ? 'nvt' : (isset($score->gem) ? $score->gem : '')) ?>
</td>
</td>
<?php ;} ; ?> <?php ;} ; ?>
</tbody> </tbody>
application/views/monpas/sop/monbastabel2.php
+5 -2
View File
@@ -24,8 +24,11 @@
</td> </td>
<?php <?php
if ($lk->scores) { if ($lk->scores) {
foreach($lk->scores as $result){ foreach($lk->scores as $result){
echo "<td style='background-color:".$result->colorcode." ; color:#ffffff;text-align:right; padding-right:1px '>".number_format($result->gem,0)."</td>"; $tekst = number_format($result->gem,0);
if($result->disablenvt == 'T') $tekst = 'nvt';
if($result->disabled == 'T') $tekst = 'uit';
echo "<td style='background-color:".$result->colorcode." ; color:#ffffff;text-align:right; padding-right:1px '>".$tekst."</td>";
};?> };?>
<td style="background-color: <?=$lk->colorcode?>; color:#ffffff;text-align:right; padding-right:1px" ><?=$lk->lkgem?></td> <td style="background-color: <?=$lk->colorcode?>; color:#ffffff;text-align:right; padding-right:1px" ><?=$lk->lkgem?></td>
<?php }; // if scores ?> <?php }; // if scores ?>
application/views/monpas/sopkeuze/agendagemiddeld.php
+56 -48
View File
@@ -42,74 +42,82 @@
</tr> </tr>
<?php <?php
if ($data['lijsten'][0]->scores){ if ($data['lijsten'][0]->scores){
foreach ($data['lijsten'][0]->scores as $ijkpunt){ foreach ($data['lijsten'][0]->scores as $score){
if($ijkpunt->nummer != 'gem'){?> if($score->nummer != 'gem'){?>
<tr style="border:1px solid #dddddd;"> <tr style="border:1px solid #dddddd;">
<td style="border:1px solid #dddddd; text-align:right; padding-right:3px"><?php echo $ijkpunt->nummer;?></td> <td style="border:1px solid #dddddd; text-align:right; padding-right:3px"><?php echo $score->nummer;?></td>
<td style="border:1px solid #dddddd;padding-left:2px;"><?php if (isset($ijkpunt->omschrijving)){echo $ijkpunt->omschrijving;}?> <td style="border:1px solid #dddddd;padding-left:2px;"><?php if (isset($score->omschrijving)){echo $score->omschrijving;}?>
<span><?php if (isset($ijkpunt->omschrijving)){echo $ijkpunt->omschrijving;}?></span> <span><?php if (isset($score->omschrijving)){echo $score->omschrijving;}?></span>
<span><?php if ($ijkpunt->disabled== 'T'){echo '(uit)';} ?></span> <span><?php if ($score->disabled == 'T'){echo ' (uit)';} ?></span>
<span><?php if ($ijkpunt->disablenvt == 'T' &&$ijkpunt->disabled== 'F' ){echo '(nvt)';} ?></span> <span><?php if ($score->disabled == 'F' && $score->disablenvt == 'T'){echo ' (nvt)';} ?></span>
</td> </td>
<?php if ($ijkpunt->disabled == 'F' && $ijkpunt->disablenvt == 'F'){?>
<td style="border:1px solid #dddddd" >
<?php if ($ijkpunt->huidig == 1 ){?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:<?php if(isset($ijkpunt->kleur)){echo $ijkpunt->kleur;} ?>"></div>
<?php };?>
</td>
<td style="border:1px solid #dddddd" >
<?php if ($ijkpunt->huidig == 2){?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:<?php if(isset($ijkpunt->kleur)){echo $ijkpunt->kleur;} ?>"></div>
<?php };?>
</td>
<td style="border:1px solid #dddddd" >
<?php if ($ijkpunt->huidig == 3){?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:<?php if(isset($ijkpunt->kleur)){echo $ijkpunt->kleur;} ?>"></div>
<?php };?>
</td>
<td style="border:1px solid #dddddd" >
<?php if ($ijkpunt->huidig == 4){?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:<?php if(isset($ijkpunt->kleur)){echo $ijkpunt->kleur;} ?>"></div>
<?php };?>
</td>
<?php };?>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if ($ijkpunt->disabled == 'T' || $ijkpunt->disablenvt == 'T' ){?> <?php if (isset($score->huidig) && $score->huidig == 1){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px; margin-left: 5px;background-color: #808080 "></div> <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;} ?>"></div>
<?php }; ?>
</td>
<td style="border:1px solid #dddddd" >
<?php if (isset($score->huidig) && $score->huidig == 2){ ?>
<div style= "width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;} ?>"></div>
<?php };?> <?php };?>
</td> </td>
<td style="border:1px solid #dddddd" >
<?php if (isset($score->huidig) && $score->huidig == 3){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;} ?>"></div>
<?php };?>
</td>
<td style="border:1px solid #dddddd" >
<?php if (isset($score->huidig) && $score->huidig == 4){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;} ?>"></div>
<?php }; ?>
</td>
<td style="border:1px solid #dddddd" >
<?php if ($score->disabled == 'T' || $score->disablenvt == 'T'){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color: #808080;"></div>
<?php }; ?>
</td>
<td style="border-bottom:none; border-top:none"></td> <td style="border-bottom:none; border-top:none"></td>
<?php if ($ijkpunt->disabled == 'F' && $ijkpunt->disablenvt == 'F'){?>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if (isset($ijkpunt->wens) && $ijkpunt->wens == 1){ ?> <?php if (isset($score->wens) && $score->wens == 1){ ?>
<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:<?php if(isset($ijkpunt->wenskleur)){echo $ijkpunt->wenskleur;} ?>'></div> <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
<?php };?> background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
<?php };?>
</td> </td>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if (isset($ijkpunt->wens) && $ijkpunt->wens == 2){ ?> <?php if (isset($score->wens) && $score->wens == 2){ ?>
<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:<?php if(isset($ijkpunt->wenskleur)){echo $ijkpunt->wenskleur;} ?>'></div> <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
<?php };?> <?php };?>
</td> </td>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if (isset($ijkpunt->wens) && $ijkpunt->wens == 3){ ?> <?php if (isset($score->wens) && $score->wens == 3){ ?>
<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:<?php if(isset($ijkpunt->wenskleur)){echo $ijkpunt->wenskleur;} ?>'></div> <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
<?php };?> background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
<?php };?>
</td> </td>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if (isset($ijkpunt->wens) && $ijkpunt->wens == 4){ ?> <?php if (isset($score->wens) && $score->wens == 4){ ?>
<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color:<?php if(isset($ijkpunt->wenskleur)){echo $ijkpunt->wenskleur;} ?>'></div> <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
<?php };?> background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
<?php };?>
</td> </td>
<?php };?>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if ($ijkpunt->disabled == 'T' || $ijkpunt->disablenvt == 'T' ){ ?> <?php if ($score->disabled == 'T' || $score->disablenvt == 'T'){ ?>
<div style='width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;background-color: #808080'></div> <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
<?php };?> background-color: #808080;"></div>
<?php }; ?>
</td> </td>
</tr> </tr>
<?php ;}};}; ?> <?php ;}};}; ?>
</table> </table>
application/views/monpas/sopkeuze/ijkgrafiekgemiddeld.php
+7 -2
View File
@@ -48,12 +48,17 @@
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 $index2 => $score){
$kleur = '#808080';
if($score->disabled == 'F' && $score->disablenvt == 'F' && isset($score->kleur)) $kleur = $score->kleur;
?>
labels.push(<?php $score->nummer ?>); labels.push(<?php $score->nummer ?>);
scores.push({ scores.push({
y: <?= $score->gem ?>, y: <?= $score->gem ?>,
color: '<?=$score->kleur ?>', color: '<?=$kleur ?>',
name: '<?= $score->nummer ?>', name: '<?= $score->nummer ?>',
soort: 'score', soort: 'score',
versie: <?= $lijst->periodenummer ?> versie: <?= $lijst->periodenummer ?>
application/views/monpas/sopkeuze/ijktabelgemiddeld.php
+14 -6
View File
@@ -22,11 +22,12 @@
</tr> </tr>
</thead> </thead>
<tbody > <tbody >
<?php foreach($data['lijsten'][0]->scores ? $data['lijsten'][0]->scores : [] as $ijkpunt){ <?php foreach($data['lijsten'][0]->scores ? $data['lijsten'][0]->scores : [] as $score){
?> ?>
<tr style="border: 1px solid grey" > <tr style="border: 1px solid grey" >
<td style="vertical-align:top; border-right: 1px solid grey" ><?php if($ijkpunt->nummer != 'gem'){ echo $ijkpunt->nummer;}?></td> <td style="vertical-align:top; border-right: 1px solid grey" ><?php if($score->nummer != 'gem'){ echo $score->nummer;}?></td>
<td style="vertical-align:top; border-right: 1px solid grey; overflow-x: hidden; overflow-y: hidden; text-overflow: ellipsis; white-space: nowrap;"><?php echo isset($ijkpunt->omschrijving) ? $ijkpunt->omschrijving: 'Gemiddelde'?></td> <td style="vertical-align:top; border-right: 1px solid grey; overflow-x: hidden; overflow-y: hidden; text-overflow: ellipsis; white-space: nowrap;">
<?php echo isset($score->omschrijving) ? $score->omschrijving: 'Gemiddelde'?></td>
<?php ;} ; ?> <?php ;} ; ?>
</tr> </tr>
</tbody> </tbody>
@@ -42,12 +43,19 @@
</thead> </thead>
<tbody> <tbody>
<?php if ($lijst->scores) <?php if ($lijst->scores)
foreach($lijst->scores as $ijkpunt){?> foreach($lijst->scores as $score){
$kleur = '#808080';
if(isset($score->kleur) && $score->disabled == 'F' && $score->disablenvt== 'F')
$kleur = $score->kleur;
$gem = $score->gem;
if($score->disablenvt == 'T') $gem = 'nvt';
if($score->disabled == 'T') $gem = 'uit';
?>
<tr style="border: 1px solid grey"> <tr style="border: 1px solid grey">
<td style="vertical-align:top; text-align: right: border-right: 1px solid grey; padding-left: 3px; background-color: <?php echo $ijkpunt->disable== 'F' || $ijkpunt->kleur ?>" > <td style="vertical-align:top; text-align: right: border-right: 1px solid grey; padding-left: 3px; background-color: <?php echo $kleur ?>" >
<?php echo $ijkpunt->gem ?> <?php echo $gem ?>
</td> </td>
</tr> </tr>
<?php } ?> <?php } ?>
application/views/monpas/sopkeuze/matrix.php
+10 -3
View File
@@ -42,10 +42,17 @@
<?php <?php
if($data['lijsten'][0]->scores){ if($data['lijsten'][0]->scores){
foreach($data['lijsten'][0]->scores as $score){ ?> foreach($data['lijsten'][0]->scores as $score){
<td style=" color:white; text-align:center; width: 30px; border-left: 1px solid grey; background-color:<?=$score->kleur?>"> $kleur = '#808080';
if($score->disabled == 'F' && $score->disablenvt == 'F') $kleur = $score->kleur;
$gem = number_format($score->gem);
if($score->disablenvt == 'T') $gem = 'nvt';
if($score->disabled == 'T') $gem = 'uit';
?>
<td style=" color:white; text-align:center; width: 30px; border-left: 1px solid grey; background-color:<?=$kleur?>">
<div> <div>
<?php echo number_format($score->gem); <?php echo $gem;
?> ?>
</div> </div>
</td> </td>
application/views/monpas/sopkeuze/matrixgemiddeld.php
+10 -5
View File
@@ -20,9 +20,9 @@
<?php <?php
if($data['lijsten'][0]->scores){ if($data['lijsten'][0]->scores){
foreach($data['lijsten'][0]->scores as $ijkpunt){ ?> foreach($data['lijsten'][0]->scores as $score){ ?>
<td style="text-align:center; "> <td style="text-align:center; ">
<?php echo $ijkpunt->nummer; <?php echo $score->nummer;
?> ?>
</td> </td>
<?php }; <?php };
@@ -42,10 +42,15 @@
<?php <?php
if($data['lijsten'][0]->scores){ if($data['lijsten'][0]->scores){
foreach($data['lijsten'][0]->scores as $ijkpunt){ ?> foreach($data['lijsten'][0]->scores as $score){
<td style=" color:white; width: 30px; text-align:center; border-left: 1px solid grey; background-color:<?=$ijkpunt->kleur?>"> $kleur = '#808080';
if($score->disabled == 'F' && $score->disablenvt == 'F' && isset($score->kleur)) $kleur = $score->kleur;
$gem = number_format($score->gem);
if($score->disablenvt == 'T') $gem = 'nvt';
if($score->disabled == 'T') $gem = 'uit';?>
<td style=" color:white; width: 30px; text-align:center; border-left: 1px solid grey; background-color:<?=$kleur?>">
<div > <div >
<?php echo number_format($ijkpunt->score); <?php echo $gem;
?> ?>
</div> </div>
</td> </td>
application/views/monpas/sopkeuze/ontwikkelagenda.php
+32 -14
View File
@@ -16,13 +16,13 @@
<colgroup> <colgroup>
<col style="width: 25px; "> <col style="width: 25px; ">
<col > <col >
<col span='9' style="width: 22px"> <col span='11' style="width: 22px">
</colgroup> </colgroup>
<tr style="background-color: #ded0d7;border: 1px solid grey; border-bottom: none"> <tr style="background-color: #ded0d7;border: 1px solid grey; border-bottom: none">
<td colspan=2 style="border: 1px; solid grey; border-bottom: none; "></td> <td colspan=2 style="border: 1px; solid grey; border-bottom: none; "></td>
<td colspan=4 style="text-align:center; "> <b>huidige situatie</b></td> <td colspan=5 style="text-align:center; "> <b>huidige situatie</b></td>
<td style="border: 1px; solid grey;"></td> <td style="border: 1px; solid grey;"></td>
<td colspan =4 style="text-align:center;"> <b> gewenste situatie</b></td> <td colspan =5 style="text-align:center;"> <b> gewenste situatie</b></td>
<tr> <tr>
<tr style="background-color: #ded0d7; border: 1px; solid grey; border-top: none;"> <tr style="background-color: #ded0d7; border: 1px; solid grey; border-top: none;">
<td style="width: 25px; border-left: 1px solid grey;border-top: none; border-bottom: 1px solid grey; border-right:none;font-weight: bold">nr</td> <td style="width: 25px; border-left: 1px solid grey;border-top: none; border-bottom: 1px solid grey; border-right:none;font-weight: bold">nr</td>
@@ -31,73 +31,91 @@
<td style=" border-bottom: 1px solid grey;text-align:center; background-color: #ffcc80; color:#ffffff"> 2</td> <td style=" border-bottom: 1px solid grey;text-align:center; background-color: #ffcc80; color:#ffffff"> 2</td>
<td style=" border-bottom: 1px solid grey;text-align:center; background-color: #9fdf9f; color:#ffffff"> 3</td> <td style=" border-bottom: 1px solid grey;text-align:center; background-color: #9fdf9f; color:#ffffff"> 3</td>
<td style=" border-bottom: 1px solid grey;text-align:center; background-color: #99d6ff; color:#ffffff"> 4</td> <td style=" border-bottom: 1px solid grey;text-align:center; background-color: #99d6ff; color:#ffffff"> 4</td>
<td style=" border-bottom: 1px solid grey;text-align:center; background-color: #808080; color:#ffffff"> </td>
<td style="border-bottom: 1px solid grey;background-color:#ded0d7"></td> <td style="border-bottom: 1px solid grey;background-color:#ded0d7"></td>
<td style="border-bottom: 1px solid grey;text-align:center; background-color: #e08885; color:#ffffff"> 1</td> <td style="border-bottom: 1px solid grey;text-align:center; background-color: #e08885; color:#ffffff"> 1</td>
<td style="border-bottom: 1px solid grey;text-align:center; background-color: #ffcc80; color:#ffffff"> 2</td> <td style="border-bottom: 1px solid grey;text-align:center; background-color: #ffcc80; color:#ffffff"> 2</td>
<td style="border-bottom: 1px solid grey;text-align:center; background-color: #9fdf9f; color:#ffffff"> 3</td> <td style="border-bottom: 1px solid grey;text-align:center; background-color: #9fdf9f; color:#ffffff"> 3</td>
<td style="border-bottom: 1px solid grey; border-right: 1px solid grey;text-align:center; background-color: #99d6ff; color:#ffffff"> 4</td> <td style="border-bottom: 1px solid grey; border-right: 1px solid grey;text-align:center; background-color: #99d6ff; color:#ffffff"> 4</td>
<td style=" border-bottom: 1px solid grey;text-align:center; background-color: #808080; color:#ffffff"> </td>
</tr> </tr>
<?php <?php
if ($data['lijsten'][0]->scores){ if ($data['lijsten'][0]->scores){
foreach ($data['lijsten'][0]->scores as $score){ foreach ($data['lijsten'][0]->scores as $score){
if($score->nummer != 'gem'){?> if($score->nummer != 'gem'){?>
<tr style="border:1px solid #dddddd;"> <tr style="border:1px solid #dddddd;">
<td style="border:1px solid #dddddd; text-align:right; padding-right:3px"> <td style="border:1px solid #dddddd; text-align:right; padding-right:3px">
<?php if($score->nummer!= 'gem') echo $score->nummer;?></td> <?php if($score->nummer!= 'gem') echo $score->nummer;?>
</td>
<td style="border:1px solid #dddddd;padding-left:2px;"> <td style="border:1px solid #dddddd;padding-left:2px;">
<?php if (isset($score->omschrijving)){echo $score->omschrijving;} ?></td> <span> <?php if (isset($score->omschrijving)){echo $score->omschrijving;} ?></span>
<span><?php if ($score->disabled == 'T'){echo ' (uit)';} ?></span>
<span><?php if ($score->disabled == 'F' && $score->disablenvt == 'T'){echo ' (nvt)';} ?></span>
</td>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if ($score->huidig == 1){ ?> <?php if ($score->huidig == 1){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px; <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php if(isset($score->kleur)){echo $score->kleur;} ?>"></div> background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;} ?>"></div>
<?php }; ?> <?php }; ?>
</td> </td>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if ($score->huidig == 2){ ?> <?php if ($score->huidig == 2){ ?>
<div style= "width: 12px; height: 12px;border-radius: 12px;margin-left: 5px; <div style= "width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php if(isset($score->kleur)){echo $score->kleur;} ?>"></div> background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;} ?>"></div>
<?php };?> <?php };?>
</td> </td>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if ($score->huidig == 3){ ?> <?php if ($score->huidig == 3){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px; <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php if(isset($score->kleur)){echo $score->kleur;} ?>"></div> background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;} ?>"></div>
<?php };?> <?php };?>
</td> </td>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if ($score->huidig == 4){ ?> <?php if ($score->huidig == 4){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px; <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php if(isset($score->kleur)){echo $score->kleur;} ?>"></div> background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->kleur;} ?>"></div>
<?php }; ?> <?php }; ?>
</td> </td>
<td style="border:1px solid #dddddd" >
<?php if ($score->disabled == 'T' || $score->disablenvt == 'T'){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color: #808080;"></div>
<?php }; ?>
</td>
<td style="border-bottom:none; border-top:none"></td> <td style="border-bottom:none; border-top:none"></td>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if (isset($score->wens) && $score->wens == 1){ ?> <?php if (isset($score->wens) && $score->wens == 1){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px; <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php if(isset($score->wenskleur)){echo $score->wenskleur;} ?>"></div> background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
<?php };?> <?php };?>
</td> </td>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if (isset($score->wens) && $score->wens == 2){ ?> <?php if (isset($score->wens) && $score->wens == 2){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px; <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php if(isset($score->wenskleur)){echo $score->wenskleur;} ?>"></div> background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
<?php };?> <?php };?>
</td> </td>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if (isset($score->wens) && $score->wens == 3){ ?> <?php if (isset($score->wens) && $score->wens == 3){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px; <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php if(isset($score->wenskleur)){echo $score->wenskleur;} ?>"></div> background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
<?php };?> <?php };?>
</td> </td>
<td style="border:1px solid #dddddd" > <td style="border:1px solid #dddddd" >
<?php if (isset($score->wens) && $score->wens == 4){ ?> <?php if (isset($score->wens) && $score->wens == 4){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px; <div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color:<?php if(isset($score->wenskleur)){echo $score->wenskleur;} ?>"></div> background-color:<?php {echo $score->disabled == 'T' || $score->disablenvt == 'T' ? '': $score->wenskleur;} ?>"></div>
<?php };?> <?php };?>
</td> </td>
<td style="border:1px solid #dddddd" >
<?php if ($score->disabled == 'T' || $score->disablenvt == 'T'){ ?>
<div style="width: 12px; height: 12px;border-radius: 12px;margin-left: 5px;
background-color: #808080;"></div>
<?php }; ?>
</td>
</tr> </tr>
<?php ;}};}; ?> <?php ;}};}; ?>
</table> </table>