From ad6d39d8f1e11d42e60c8f94f00bf887bea996f2 Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Thu, 9 Jan 2025 10:21:06 +0100 Subject: [PATCH] Geenversies ophalen recenter dan gekozen schooljaar --- .../monpas/compactsop/Compacteversies.php | 5 ++--- .../models/monpas/Filledversions_model.php | 3 ++- application/models/monpas/Orgversies_model.php | 3 ++- public/images/logos/a0V8NRPgnbE45FZ.jpg | Bin 0 -> 10532 bytes public/js/monpas/models/compactsopmodel.js | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) create mode 100644 public/images/logos/a0V8NRPgnbE45FZ.jpg 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 0000000000000000000000000000000000000000..bdde56c53afcc3d3e30bf0dd55ae992c3f589d90 GIT binary patch literal 10532 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 F{~tt|Xxsn* literal 0 HcmV?d00001 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;