diff --git a/application/libraries/monpas/compactsop/Compactepaginas.php b/application/libraries/monpas/compactsop/Compactepaginas.php index e30dd34..f190459 100644 --- a/application/libraries/monpas/compactsop/Compactepaginas.php +++ b/application/libraries/monpas/compactsop/Compactepaginas.php @@ -20,7 +20,6 @@ class Compactepaginas private $compactarray; private $blokjeshtml; private $html; - private $sopid; private $gegevens; private $gegevensarray = []; @@ -74,7 +73,7 @@ class Compactepaginas foreach($this->onderdelen as $index => $this->onderdeel ) { $this->setDivBreedte(); $this->setMiddelenBreedte(); - $this->setInspectieBreedte(); +// $this->setInspectieBreedte(); $this->setOnderdelenDef(); } } @@ -97,12 +96,12 @@ class Compactepaginas } - private function setInspectieBreedte(){ - if (!$this->onderdeel['onderdeelnr']) return; - if($this->onderdeel['onderdeelnr'] != 8 || $this->inspectieBreed == 'T') return; - $this->inspectieBreed = 'T'; - $this->onderdeel['breed'] = 'T'; - } +// private function setInspectieBreedte(){ +// if (!$this->onderdeel['onderdeelnr']) return; +// if($this->onderdeel['onderdeelnr'] != 8 || $this->inspectieBreed == 'T') return; +// $this->inspectieBreed = 'T'; +// $this->onderdeel['breed'] = 'T'; +// } private function setOnderdelenDef(){ @@ -117,9 +116,9 @@ class Compactepaginas if($this->middelenBreed == 'T'){ $ruimte = $ruimte + 1; } - if($this->inspectieBreed == 'T'){ - $ruimte = $ruimte + 1; - } +// if($this->inspectieBreed == 'T'){ +// $ruimte = $ruimte + 1; +// } $this->aantalpaginas = ceil($ruimte/4); } diff --git a/application/libraries/monpas/compactsop/Compacteversies.php b/application/libraries/monpas/compactsop/Compacteversies.php index ba13a7c..65d9ad5 100644 --- a/application/libraries/monpas/compactsop/Compacteversies.php +++ b/application/libraries/monpas/compactsop/Compacteversies.php @@ -144,6 +144,8 @@ class Compacteversies break; case 660: $this->onderdeel->schooltype = 'R'; break; + case 680: $this->onderdeel->schooltype = 'R'; + break; default: $this->onderdeel->schooltype = 'R'; diff --git a/application/views/monpas/compactsop/passendcompact.php b/application/views/monpas/compactsop/passendcompact.php new file mode 100644 index 0000000..287d805 --- /dev/null +++ b/application/views/monpas/compactsop/passendcompact.php @@ -0,0 +1,259 @@ +
vorm == 1 ? ', schoolversie' : ', indivduele versie'; ?> + + $lijst){ ?> +
vantm ?>
+ + + + +| nr | +=$data['lijsten'][0]->label?> | + + ++ periodenummer; ?> + | + +|||||
|---|---|---|---|---|---|---|---|
| nummer != 'gem'){ echo $score->nummer . '.';}?> + | + + scores[$i]->disabled == 'T' || $lijst->scores[$i]->disablenvt == 'T' ? '' : (isset($lijst->scores[$i]->kleur) ? $lijst->scores[$i]->kleur : ''); + $gem = $lijst->scores[$i]->disabled == 'T' ? 'uit' : ($lijst->scores[$i]->disablenvt == 'T' ? 'nvt' : (isset($lijst->scores[$i]->gem) ? $lijst->scores[$i]->gem : '')); ?> ++ =$gem?> + | + +||||||
| Scores in procenten | +|||||||