diff --git a/application/controllers/monpas/Diversiteitmonitor.php b/application/controllers/monpas/Diversiteitmonitor.php index e9a82a0..fc3c03f 100644 --- a/application/controllers/monpas/Diversiteitmonitor.php +++ b/application/controllers/monpas/Diversiteitmonitor.php @@ -51,7 +51,7 @@ class Diversiteitmonitor extends MY_Controller{ case 2: case 3: $swvid = $this->Organisaties_model->get_swvid($orgid); break; - default: $swvID = 0; + default: $swvid = 0; } $criteria = $this->Sorteringen_model->get_criteriabijSWV($swvid); diff --git a/application/controllers/monpas/Monfinoverzicht.php b/application/controllers/monpas/Monfinoverzicht.php index cc57e3a..d087569 100644 --- a/application/controllers/monpas/Monfinoverzicht.php +++ b/application/controllers/monpas/Monfinoverzicht.php @@ -251,7 +251,7 @@ class Monfinoverzicht extends MY_Controller{ $totbudget = $budgetten->basis + $budgetten->extra + $budgetten->overig; } else { - $totbudget = $budget->som+ $budget->overig; + $totbudget = $budgetten->som + $budgetten->overig; } } diff --git a/application/controllers/monpas/Overzichtscores.php b/application/controllers/monpas/Overzichtscores.php index b685d6c..8c0456e 100644 --- a/application/controllers/monpas/Overzichtscores.php +++ b/application/controllers/monpas/Overzichtscores.php @@ -53,9 +53,9 @@ class Overzichtscores extends MY_Controller{ $recht = true; } if($this->globorgid == $kamerid && $this->userrole <= 32){//werkt bij kamer - $recht == true; + $recht = true; } - if($this->globorgid == $bgid && $this->uderrole <=128){//werkt bij bg + if($this->globorgid == $bgid && $this->userrole <=128){//werkt bij bg $recht = true; } if($this->globorgid == $orgid && $this->userrole <= 256){//management op school diff --git a/application/controllers/monpas/Sopoud.php b/application/controllers/monpas/Sopoud.php index 707c823..91476e6 100644 --- a/application/controllers/monpas/Sopoud.php +++ b/application/controllers/monpas/Sopoud.php @@ -332,7 +332,7 @@ class Sopoud extends MY_Controller{ $imageoa = $this->Phantom_model->create_img($result['tabel1'], 'test.png', FALSE, FALSE, array(650, 300)); $id = "oa1image1"; - if ( $module = 4) { $id = "oa2image1";}; + if ( $module == 4) { $id = "oa2image1";}; $imagedata = ""; echo json_encode(array('image1' => $imagedata , diff --git a/application/controllers/shared/Users.php b/application/controllers/shared/Users.php index 98296f8..7422acd 100644 --- a/application/controllers/shared/Users.php +++ b/application/controllers/shared/Users.php @@ -70,7 +70,9 @@ class Users extends MY_Controller{ } } } - if ($userorg->soort=1){ + // boom in 'orgs' voor elke soort; gebruikersmodel.js gebruikt alleen deze + // (was 'if ($userorg->soort=1)': een toewijzing die altijd waar was en soort overschreef) + { $userorg->orgs= $this->Organisaties_model->getorgsvanaf($userorg->id); if ($userorg->orgs){ foreach($userorg->orgs as $kamer){ diff --git a/application/libraries/monpas/compactsop/Compacteversies.php b/application/libraries/monpas/compactsop/Compacteversies.php index bce2ced..47a2fde 100644 --- a/application/libraries/monpas/compactsop/Compacteversies.php +++ b/application/libraries/monpas/compactsop/Compacteversies.php @@ -159,7 +159,8 @@ class Compacteversies $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'; + // was 'schooltype = 'R'' (toewijzing): alles werd PO en schooltype werd overschreven + $this->onderdeel->schoolsoort = $this->onderdeel->schooltype == 'SBO' ? 'SBO' : 'PO'; $this->onderdeel->versie = $this->schooljaar->naam. ', '. $this->onderdeel->schoolsoort; }