diff --git a/application/libraries/monpas/compactsop/Compacteversies.php b/application/libraries/monpas/compactsop/Compacteversies.php index 300ffe7..08388a8 100644 --- a/application/libraries/monpas/compactsop/Compacteversies.php +++ b/application/libraries/monpas/compactsop/Compacteversies.php @@ -5,7 +5,6 @@ class Compacteversies private $CI; private $schooljaar; - private $organisatie; private $kalenderjaar1; private $kalenderjaar2; private $jaarnr1; @@ -214,7 +213,7 @@ class Compacteversies if($this->onderdeel->type != "LIJST" && $this->onderdeel->type != "LIJSTBREED") return; $this->onderdeel->erZijnOrgVersies = 'F'; $this->onderdeel->gegevens = 'F'; - $orgversies = $this->CI->Orgversies_model->getOrgversiesBijSOP($this->swvID, $this->onderdeel->modulenr); + $orgversies = $this->CI->Orgversies_model->getOrgversiesBijSOP($this->swvID, $this->onderdeel->modulenr, $this->schooljaar->eind); if($orgversies){ $this->onderdeel->erZijnOrgVersies = 'T'; @@ -224,7 +223,7 @@ class Compacteversies private function setGeopendeVersies(){ if($this->onderdeel->type != "LIJST" && $this->onderdeel->type != "LIJSTBREED") return; $this->onderdeel->geopendeversies = $this->CI->Filledversions_model->getfilledversions_bij_orglist( - $this->orglist, $this->onderdeel->modulenr); + $this->orglist, $this->onderdeel->modulenr, $this->schooljaar->eind); } private function loopGeopendeVersies(){ diff --git a/application/models/monpas/Filledversions_model.php b/application/models/monpas/Filledversions_model.php index 9d086ff..2d2833b 100644 --- a/application/models/monpas/Filledversions_model.php +++ b/application/models/monpas/Filledversions_model.php @@ -81,7 +81,7 @@ class Filledversions_model extends MY_Model{ } - function getfilledversions_bij_orglist($orglist, $modulenr){ + function getfilledversions_bij_orglist($orglist, $modulenr, $schooljaareind){ $this->sql = "SELECT DISTINCT(FV.orgversie_id) as id, OV.organisatie_id, periodenummer, OV.actief, versie_id, V.naam, OV.vorm, OV.scoretype, OV.score_omschrijving, DATE_FORMAT(geldigvanaf, '%d-%m-%Y') AS geldigvanaf, @@ -93,6 +93,7 @@ class Filledversions_model extends MY_Model{ JOIN tb_versies V ON V.id =OV.versie_id WHERE FV.organisatie_id IN ({$orglist}) AND V.modulenr = {$modulenr} + AND OV.invullentm <= '{$schooljaareind}' ORDER BY OV.actief DESC, OV.periodenummer DESC "; return $this->get_query_result(); diff --git a/application/models/monpas/Orgversies_model.php b/application/models/monpas/Orgversies_model.php index 3607393..55c2abb 100644 --- a/application/models/monpas/Orgversies_model.php +++ b/application/models/monpas/Orgversies_model.php @@ -187,13 +187,14 @@ class Orgversies_model extends MY_Model{ return $this->get_query_result(); } - function getOrgVersiesBijSop($swvid, $modulenr){ + function getOrgVersiesBijSop($swvid, $modulenr, $schooljaareind){ $this->sql = "SELECT OV.id,V.naam FROM tb_orgversies OV JOIN tb_versies V ON V.id =OV.versie_id JOIN tb_organisaties O ON OV.organisatie_id = O.id WHERE (O.id = {$swvid} OR O.valtonder_id = {$swvid}) AND V.modulenr = {$modulenr} + AND OV.invullentm <='{$schooljaareind}' "; return $this->get_query_result(); diff --git a/public/images/logos/a0V8NRPgnbE45FZ.jpg b/public/images/logos/a0V8NRPgnbE45FZ.jpg new file mode 100644 index 0000000..bdde56c Binary files /dev/null and b/public/images/logos/a0V8NRPgnbE45FZ.jpg differ diff --git a/public/js/monpas/models/compactsopmodel.js b/public/js/monpas/models/compactsopmodel.js index 9d6ad8d..e7a433e 100644 --- a/public/js/monpas/models/compactsopmodel.js +++ b/public/js/monpas/models/compactsopmodel.js @@ -623,7 +623,7 @@ mh.initCompactSopModel = function(){ }, fSelecteerBudgetVersie: function(data, parent){ - + var self = mh.CompactSopModel; var onderdeel = data; var dit = this;