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

Merge branch 'feature/passendOndCompactsop'

Browse Source 
# Conflicts:
#	application/core/MY_Controller.php
#	application/libraries/monpas/compactsop/Compactepaginas.php
This commit is contained in:
Monique
2022-01-24 20:10:26 +01:00
parent 22fbe6e2fd f85b2632b5
commit 461f933bc2
12 changed files with 526 additions and 285 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/monpas/compactsop/Compactepaginas.php
+2 -15
View File
@@ -16,11 +16,9 @@ class Compactepaginas
private $aantalpaginas;
private $divBreed = 'F';
private $middelenBreed = 'F';
private $inspectieBreed = 'F';
private $compactarray;
private $blokjeshtml;
private $html;
private $sopid;
private $gegevens;
private $gegevensarray = [];
@@ -74,7 +72,7 @@ class Compactepaginas
foreach($this->onderdelen as $index => $this->onderdeel ) {
$this->setDivBreedte();
$this->setMiddelenBreedte();
$this->setInspectieBreedte();
//
$this->setOnderdelenDef();
}
}
@@ -96,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;
}
@@ -117,9 +106,7 @@ class Compactepaginas
if($this->middelenBreed == 'T'){
$ruimte = $ruimte + 1;
}
if($this->inspectieBreed == 'T'){
$ruimte = $ruimte + 1;
}
$this->aantalpaginas = ceil($ruimte/4);
}
application/libraries/monpas/compactsop/Compacteversies.php
+2 -6
View File
@@ -134,16 +134,12 @@ 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 = 'Alle';
break;
default: $this->onderdeel->schooltype = 'R';