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

Merge branch 'fouten/omvanggrafiek' into feature/alleInstrumenteninCompactSop

Browse Source
This commit is contained in:
Monique
2022-04-08 12:52:10 +02:00
parent 606dad7d77 0f637c8d12
commit 4230646bd4
13 changed files with 169 additions and 141 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Omvang.php
+1 -1
View File
@@ -468,7 +468,7 @@ class Omvang extends MY_Controller{
$schooljaar->naam = $omvang->naam;
$schooljaar->aantal = $omvang->aantal;
$aantal = $this->Arrangementen_model->getAantalLeerlingenMetArrangement($nummer, $schoolIDs);
$schooljaar->aantalllnarr = $aantal->aantal;
$schooljaar->aantalllnarr = $aantal ? $aantal->aantal: 0;
$schooljaar->tlvs = $this->Tlvs_model->getAantalLeerlingenMetTLV($nummer, $schoolIDs);
if($organisatie->soort == 4){
$schooljaar->arrangementen = $this->Arrangementen_model->getArrangementenMetAantallen($organisatie->id,$nummer );