diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 3d5ae6d..214db37 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -78,7 +78,9 @@ class MY_Controller extends CI_Controller{ // public $version = '1.18.04';// invul status // public $version = '1.18.05';// fout schoolgegevens compactsop // public $version = '1.18.08';// kleurenfout - public $version = '1.19.00';// ambities per org +// public $version = '1.19.00';// ambities per org + public $version = '1.19.01';// compactdiv met orgid ipv globorg + diff --git a/application/libraries/monpas/Diversiteit.php b/application/libraries/monpas/Diversiteit.php index c59a852..6441c9b 100644 --- a/application/libraries/monpas/Diversiteit.php +++ b/application/libraries/monpas/Diversiteit.php @@ -81,13 +81,13 @@ class Diversiteit private function setGroepen(){ if($this->modulenr == 2 || $this->modulenr == 660) { $this->groepen = $this->CI->Groepen_model->getgroepen( - $this->CI->globorgid, $this->schooljaarnr, $this->modulenr); + $this->orgid, $this->schooljaarnr, $this->modulenr); } if($this->modulenr == 270) { $this->groepen = $this->CI->Groepen_model->getgroepenSboSo( - $this->CI->globorgid, $this->schooljaarnr); + $this->orgid, $this->schooljaarnr); } } @@ -107,7 +107,7 @@ class Diversiteit private function setOndersteuningsvormen(){ $this->vormen = $this->CI->Diversiteits_model->getosvormen( - $this->CI->globorgid, $this->schooljaarnr, $this->minnivo, $this->maxnivo, $this->modulenr); + $this->orgid, $this->schooljaarnr, $this->minnivo, $this->maxnivo, $this->modulenr); } private function setCombifactoren(){ diff --git a/application/libraries/monpas/compactsop/Compacteversies.php b/application/libraries/monpas/compactsop/Compacteversies.php index 0c02478..300ffe7 100644 --- a/application/libraries/monpas/compactsop/Compacteversies.php +++ b/application/libraries/monpas/compactsop/Compacteversies.php @@ -150,11 +150,11 @@ class Compacteversies } $module = $this->onderdeel->modulenr; $this->aantallln = $this->CI->Groepen_model->getversiesmetleerlingengoedeversie( - $this->CI->globorgid, $this->schooljaarnr, $this->onderdeel->schooltype, $module); + $this->orgid, $this->schooljaarnr, $this->onderdeel->schooltype, $module); if(isset($this->aantallln)){ if ($this->aantallln > 0) { - $this->onderdeel->groepen = $this->CI->Groepen_model->get_AantalGroepen($this->schooljaarnr, $this->CI->globorgid, $module); + $this->onderdeel->groepen = $this->CI->Groepen_model->get_AantalGroepen($this->schooljaarnr, $this->orgid, $module); $this->onderdeel->erIsDiversiteit = 'T'; $this->onderdeel->gegevens = 'T'; if($this->onderdeel->schooltype = 'R') $this->onderdeel->schoolsoort = 'PO'; @@ -196,13 +196,13 @@ class Compacteversies if($this->onderdeel->type != "FIN") return; $this->onderdeel->budgetversies = []; - $this->budgetten = $this->CI->Finbestemmingen_model->getTotaalSchoolBestedingen($this->CI->globorgid, $this->jaarnr1); + $this->budgetten = $this->CI->Finbestemmingen_model->getTotaalSchoolBestedingen($this->orgid, $this->jaarnr1); if($this->budgetten > 0){ $this->onderdeel->budgetversies [] = $this->kalenderjaar1; $this->onderdeel->erZijnBudgetten = 'T'; $this->onderdeel->gegevens = 'T'; } - $this->budgetten = $this->CI->Finbestemmingen_model->getTotaalSchoolBestedingen($this->CI->globorgid, $this->jaarnr2); + $this->budgetten = $this->CI->Finbestemmingen_model->getTotaalSchoolBestedingen($this->orgid, $this->jaarnr2); if(intval($this->budgetten) > 0){ $this->onderdeel->budgetversies [] = $this->kalenderjaar2; $this->onderdeel->erZijnBudgetten = 'T';