diff --git a/application/libraries/monpas/compactsop/Compacteonderdelen.php b/application/libraries/monpas/compactsop/Compacteonderdelen.php index 236b252..451c700 100644 --- a/application/libraries/monpas/compactsop/Compacteonderdelen.php +++ b/application/libraries/monpas/compactsop/Compacteonderdelen.php @@ -371,6 +371,11 @@ class Compacteonderdelen private function setIJkpunten() { + // geen lijst gekozen voor dit blok: overslaan (anders query met lege orgversie_id) + if(!$this->onderdeel['orgversieid']) { + $this->data = false; + return; + } $this->setScorevorm(); $this->setSelecties(); $this->setLijsten(); diff --git a/application/libraries/monpas/compactsop/Compactepaginas.php b/application/libraries/monpas/compactsop/Compactepaginas.php index fd28122..5879a90 100644 --- a/application/libraries/monpas/compactsop/Compactepaginas.php +++ b/application/libraries/monpas/compactsop/Compactepaginas.php @@ -226,7 +226,8 @@ class Compactepaginas private function setHtml() { if (!$this->blokjeshtml) return; - $data = ['schooljaar' => $this->schooljaar]; + $data = ['schooljaar' => $this->schooljaar, + 'schoolgegevens' => $this->orgGegevens]; $html = $this->CI->load->view("monpas/compactsop/paginacompact", $data, true); $this->html = str_replace('##PLACEHOLDER##', $this->blokjeshtml, $html); } diff --git a/application/libraries/monpas/compactsop/Compacteversies.php b/application/libraries/monpas/compactsop/Compacteversies.php index 26829f6..bce2ced 100644 --- a/application/libraries/monpas/compactsop/Compacteversies.php +++ b/application/libraries/monpas/compactsop/Compacteversies.php @@ -308,7 +308,7 @@ class Compacteversies $this->onderdeel->gegevens = "T"; foreach($this->onderdeel->filledversies as $index => $this->filledversie) { $this->filledversie->selected = 'F'; - $valterin = $this->CI->Filledversions_model->checkperiode($this->versie->id,$this->schooljaar->start, + $valterin = $this->CI->Filledversions_model->checkperiode($this->filledversie->id,$this->schooljaar->start, $this->schooljaar->eind ); if($valterin){ $this->filledversie->selected = 'T'; diff --git a/application/models/monpas/Filledversions_model.php b/application/models/monpas/Filledversions_model.php index dc9923c..dd33a60 100644 --- a/application/models/monpas/Filledversions_model.php +++ b/application/models/monpas/Filledversions_model.php @@ -205,13 +205,13 @@ class Filledversions_model extends MY_Model{ - function checkperiode($fvid, $van, $tm){ - $this->sql = "SELECT DISTINCT(FV.orgversie_id) as id, + function checkperiode($orgversieid, $van, $tm){ + $this->sql = "SELECT DISTINCT(FV.orgversie_id) as id FROM tb_filledversions FV JOIN tb_orgversies OV ON OV.id = FV.orgversie_id - WHERE FV.id ={$fvid} - AND OV.geldigvanaf >= '{$van}' - AND OV.geldigtm <= '{$tm}' "; + WHERE FV.orgversie_id ={$orgversieid} + AND OV.geldigtm >= '{$van}' + AND OV.geldigtm <= '{$tm}' "; // lijst telt mee in de periode waarin geldigtm valt return $this->get_query_result(); } diff --git a/application/views/monpas/compactsop/paginacompact.php b/application/views/monpas/compactsop/paginacompact.php index a84e8cd..c012ae3 100644 --- a/application/views/monpas/compactsop/paginacompact.php +++ b/application/views/monpas/compactsop/paginacompact.php @@ -2,7 +2,7 @@