diff --git a/application/libraries/monpas/compactsop/Compacteversies.php b/application/libraries/monpas/compactsop/Compacteversies.php index 08388a8..59d3d80 100644 --- a/application/libraries/monpas/compactsop/Compacteversies.php +++ b/application/libraries/monpas/compactsop/Compacteversies.php @@ -213,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, $this->schooljaar->eind); + $orgversies = $this->CI->Orgversies_model->getOrgversiesBijSOP($this->swvID, $this->onderdeel->modulenr); if($orgversies){ $this->onderdeel->erZijnOrgVersies = 'T'; @@ -223,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->schooljaar->eind); + $this->orglist, $this->onderdeel->modulenr); } private function loopGeopendeVersies(){ diff --git a/application/models/monpas/Filledversions_model.php b/application/models/monpas/Filledversions_model.php index 2d2833b..1771e36 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, $schooljaareind){ + function getfilledversions_bij_orglist($orglist, $modulenr){ $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,8 +93,6 @@ 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 55c2abb..0ebf84a 100644 --- a/application/models/monpas/Orgversies_model.php +++ b/application/models/monpas/Orgversies_model.php @@ -187,15 +187,13 @@ class Orgversies_model extends MY_Model{ return $this->get_query_result(); } - function getOrgVersiesBijSop($swvid, $modulenr, $schooljaareind){ + function getOrgVersiesBijSop($swvid, $modulenr){ $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/application/views/monpas/compactsop/ijktabelcompact.php b/application/views/monpas/compactsop/ijktabelcompact.php index d4bedbe..62ad69c 100644 --- a/application/views/monpas/compactsop/ijktabelcompact.php +++ b/application/views/monpas/compactsop/ijktabelcompact.php @@ -171,7 +171,7 @@ min:0, max: 100, y: 20, - title: false, + title: ' ', labels:{ skew3d: true, style:{ @@ -230,7 +230,7 @@
scores){ ?> - +
nr