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

compact div met opg ipv globorg

Browse Source
This commit is contained in:
Monique
2022-11-29 14:05:51 +01:00
parent 98e25650b5
commit 8f5449e80d
3 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+3 -1
View File
@@ -78,7 +78,9 @@ class MY_Controller extends CI_Controller{
// public $version = '1.18.04';// invul status // public $version = '1.18.04';// invul status
// public $version = '1.18.05';// fout schoolgegevens compactsop // public $version = '1.18.05';// fout schoolgegevens compactsop
// public $version = '1.18.08';// kleurenfout // 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
application/libraries/monpas/Diversiteit.php
+3 -3
View File
@@ -81,13 +81,13 @@ class Diversiteit
private function setGroepen(){ private function setGroepen(){
if($this->modulenr == 2 || $this->modulenr == 660) { if($this->modulenr == 2 || $this->modulenr == 660) {
$this->groepen = $this->CI->Groepen_model->getgroepen( $this->groepen = $this->CI->Groepen_model->getgroepen(
$this->CI->globorgid, $this->schooljaarnr, $this->modulenr); $this->orgid, $this->schooljaarnr, $this->modulenr);
} }
if($this->modulenr == 270) { if($this->modulenr == 270) {
$this->groepen = $this->CI->Groepen_model->getgroepenSboSo( $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(){ private function setOndersteuningsvormen(){
$this->vormen = $this->CI->Diversiteits_model->getosvormen( $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(){ private function setCombifactoren(){
application/libraries/monpas/compactsop/Compacteversies.php
+4 -4
View File
@@ -150,11 +150,11 @@ class Compacteversies
} }
$module = $this->onderdeel->modulenr; $module = $this->onderdeel->modulenr;
$this->aantallln = $this->CI->Groepen_model->getversiesmetleerlingengoedeversie( $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(isset($this->aantallln)){
if ($this->aantallln > 0) { 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->erIsDiversiteit = 'T';
$this->onderdeel->gegevens = 'T'; $this->onderdeel->gegevens = 'T';
if($this->onderdeel->schooltype = 'R') $this->onderdeel->schoolsoort = 'PO'; if($this->onderdeel->schooltype = 'R') $this->onderdeel->schoolsoort = 'PO';
@@ -196,13 +196,13 @@ class Compacteversies
if($this->onderdeel->type != "FIN") return; if($this->onderdeel->type != "FIN") return;
$this->onderdeel->budgetversies = []; $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){ if($this->budgetten > 0){
$this->onderdeel->budgetversies [] = $this->kalenderjaar1; $this->onderdeel->budgetversies [] = $this->kalenderjaar1;
$this->onderdeel->erZijnBudgetten = 'T'; $this->onderdeel->erZijnBudgetten = 'T';
$this->onderdeel->gegevens = '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){ if(intval($this->budgetten) > 0){
$this->onderdeel->budgetversies [] = $this->kalenderjaar2; $this->onderdeel->budgetversies [] = $this->kalenderjaar2;
$this->onderdeel->erZijnBudgetten = 'T'; $this->onderdeel->erZijnBudgetten = 'T';