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

Merge branch 'fouten/kamerversiesbijambities' into develop

Browse Source 
# Conflicts:
#	application/controllers/monpas/Streefcijfers.php
This commit is contained in:
Monique
2022-12-06 22:03:57 +01:00
parent 77bfe72e1a d03944c77b
commit 05d22502d5
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Streefcijfers.php
+2 -2
View File
@@ -302,8 +302,8 @@ class Streefcijfers extends MY_Controller{
$onderliggend = ''; $onderliggend = '';
$scholen = $this->Organisaties_model->get_onderliggende_orgs($this->globorgid); $scholen = $this->Organisaties_model->get_onderliggende_orgs($this->globorgid);
foreach($scholen AS $school){ foreach($scholen AS $school){
$onderliggend .= $school->id . ','; $onderliggend .= $school->id . ',';
} }
$onderliggend = rtrim($onderliggend, ','); $onderliggend = rtrim($onderliggend, ',');
if ($orgversie) $ambities = $this->Ambities_model->mh_get_ambities($module, $this->globorgid, $orgversie->orgversieID); if ($orgversie) $ambities = $this->Ambities_model->mh_get_ambities($module, $this->globorgid, $orgversie->orgversieID);
if (!$ambities) $ambities = $this->Ambities_model->mh_get_ambities($module, $kamer, $orgversie->orgversieID); if (!$ambities) $ambities = $this->Ambities_model->mh_get_ambities($module, $kamer, $orgversie->orgversieID);