diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index b480087..4c8df2b 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -58,7 +58,8 @@ class MY_Controller extends CI_Controller{ // public $version = '1.17.75'; // mogelijkheid tot uitzetten extra ondersteuning in divmeters // public $version = '1.17.76'; // cluster scans passend onderwijs // public $version = '1.17.79'; // fout matrixfunctie - public $version = '1.17.83'; // sophomepage +// public $version = '1.17.83'; // sophomepage + public $version = '1.17.84'; // scan passend onderwijs in compact sop. public $partituurid; diff --git a/application/libraries/monpas/compactsop/Compactepaginas.php b/application/libraries/monpas/compactsop/Compactepaginas.php index f190459..63032ac 100644 --- a/application/libraries/monpas/compactsop/Compactepaginas.php +++ b/application/libraries/monpas/compactsop/Compactepaginas.php @@ -16,7 +16,6 @@ class Compactepaginas private $aantalpaginas; private $divBreed = 'F'; private $middelenBreed = 'F'; - private $inspectieBreed = 'F'; private $compactarray; private $blokjeshtml; private $html; @@ -73,14 +72,14 @@ class Compactepaginas foreach($this->onderdelen as $index => $this->onderdeel ) { $this->setDivBreedte(); $this->setMiddelenBreedte(); -// $this->setInspectieBreedte(); +// $this->setOnderdelenDef(); } } private function setDivBreedte(){ if (!$this->onderdeel['onderdeelnr']) return; - if($this->onderdeel['onderdeelnr'] != 1 || $this->divBreed== 'T') return; + if($this->onderdeel['onderdeelnr'] != 1 || $this->onderdeel['onderdeelnr'] != 10 ||$this->divBreed== 'T') return; $aantalGroepen = count($this->onderdeel['data']['data']['groepen']); if($aantalGroepen > 8){ $this->divBreed = 'T'; @@ -95,15 +94,6 @@ class Compactepaginas $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(){ $this->onderdelendef[] = $this->onderdeel; } @@ -116,9 +106,7 @@ class Compactepaginas if($this->middelenBreed == '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 65d9ad5..c5c80a7 100644 --- a/application/libraries/monpas/compactsop/Compacteversies.php +++ b/application/libraries/monpas/compactsop/Compacteversies.php @@ -134,17 +134,11 @@ class Compacteversies case 270: case 300: $this->onderdeel->schooltype = 'SBO'; break; - case 340: $this->onderdeel->schooltype = 'R'; - break; - case 350: $this->onderdeel->schooltype = 'SBO'; - break; - case 360: $this->onderdeel->schooltype = 'SO'; - break; case 630: $this->onderdeel->schooltype = 'Alle'; break; case 660: $this->onderdeel->schooltype = 'R'; break; - case 680: $this->onderdeel->schooltype = 'R'; + case 680: $this->onderdeel->schooltype = 'Alle'; break; default: $this->onderdeel->schooltype = 'R'; diff --git a/application/libraries/monpas/ijkpunten/Lijsten.php b/application/libraries/monpas/ijkpunten/Lijsten.php index a7e9ac6..2423182 100644 --- a/application/libraries/monpas/ijkpunten/Lijsten.php +++ b/application/libraries/monpas/ijkpunten/Lijsten.php @@ -500,7 +500,9 @@ class Lijsten $scholen = ' scholen'; if(intval($this->lijst->aantalorgs) == 1) $scholen = ' school'; $toevoeging = ''; + $versie = ' , schoolversie'; if(intval($this->lijst->vorm) == 2) { + $versie = ' , individuele versie'; $metingen = ' metingen'; if(intval($this->lijst->metingen) == 1) $metingen = ' meting'; $toevoeging = ', '. $this->lijst->metingen. $metingen; @@ -509,7 +511,7 @@ class Lijsten if(intval($this->soort < 4)) $toevoeging .= ', '. $this->lijst->aantalorgs. $scholen; $this->lijst->vantm = "periode " . $this->lijst->orgversie->periodenummer . " van " . mysql2date($this->lijst->orgversie->geldigvanaf) . " t/m " . mysql2date($this->lijst->orgversie->geldigtm) . - $toevoeging; + $versie . $toevoeging; } private function setLijsten(){ diff --git a/application/views/monpas/compactsop/expertisecompact.php b/application/views/monpas/compactsop/expertisecompact.php index cd6d0b4..71d84a1 100644 --- a/application/views/monpas/compactsop/expertisecompact.php +++ b/application/views/monpas/compactsop/expertisecompact.php @@ -6,7 +6,7 @@
- vorm == 1 ? ', schoolversie' : ', indivduele versie'; ?> +
$lijst){ ?>=$lijst->vantm ?>
diff --git a/application/views/monpas/compactsop/expertisecompactsosbo.php b/application/views/monpas/compactsop/expertisecompactsosbo.php index 14fb234..7361dbe 100644 --- a/application/views/monpas/compactsop/expertisecompactsosbo.php +++ b/application/views/monpas/compactsop/expertisecompactsosbo.php @@ -6,7 +6,7 @@- vorm == 1 ? ', schoolversie' : ', indivduele versie'; ?> +
$lijst){ ?>=$lijst->vantm ?>
diff --git a/application/views/monpas/compactsop/extracompact.php b/application/views/monpas/compactsop/extracompact.php index aa47859..389af35 100644 --- a/application/views/monpas/compactsop/extracompact.php +++ b/application/views/monpas/compactsop/extracompact.php @@ -4,7 +4,7 @@- vorm == 1 ? ', schoolversie' : ', indivduele versie'; ?> + $lijst){ ?>
diff --git a/application/views/monpas/compactsop/ijktabelcompact.php b/application/views/monpas/compactsop/ijktabelcompact.php index 287d805..e9bfa13 100644 --- a/application/views/monpas/compactsop/ijktabelcompact.php +++ b/application/views/monpas/compactsop/ijktabelcompact.php @@ -7,7 +7,7 @@ -
vorm == 1 ? ', schoolversie' : ', indivduele versie'; ?> +
$lijst){ ?>
vantm ?>
diff --git a/application/views/monpas/compactsop/inspectiecompact.php b/application/views/monpas/compactsop/inspectiecompact.php index 1378e96..309d2e6 100644 --- a/application/views/monpas/compactsop/inspectiecompact.php +++ b/application/views/monpas/compactsop/inspectiecompact.php @@ -1,251 +1,251 @@ -- -
- -- 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 | -|||||||
vorm == 1 ? ', schoolversie' : ', indivduele versie'; ?> +
$lijst){ ?>
vantm ?>
@@ -17,8 +17,8 @@