From 0b969b48410351f51c81368496552ec9cb25171c Mon Sep 17 00:00:00 2001 From: Monique Date: Mon, 24 Jan 2022 13:47:53 +0100 Subject: [PATCH] sopversie functies alleen doorlopen met licentie --- application/core/MY_Controller.php | 2 +- application/libraries/monpas/compactsop/Compacteversies.php | 4 +++- application/models/monpas/Groepen_model.php | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index 9ea09e7..0d8986f 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -62,7 +62,7 @@ class MY_Controller extends CI_Controller{ // public $version = '1.17.84'; // zichtbaarheid paginas afhankelijk van orgsoort // public $version = '1.17.85'; // fouten divmeter po 2203 in compact // public $version = '1.17.86'; // titels en headers sop - public $version = '1.17.87'; // afvangen dat llaantal ook 0 kan zijn + public $version = '1.17.88'; // sopfout public $partituurid; diff --git a/application/libraries/monpas/compactsop/Compacteversies.php b/application/libraries/monpas/compactsop/Compacteversies.php index 4497380..a55ca6c 100644 --- a/application/libraries/monpas/compactsop/Compacteversies.php +++ b/application/libraries/monpas/compactsop/Compacteversies.php @@ -120,7 +120,7 @@ class Compacteversies } private function setDivSchooltypes(){ - if(!isset($this->onderdeel->modulenr)) return; + if($this->onderdeel->licentie =='F') return; switch($this->onderdeel->modulenr){ case 1: $this->onderdeel->schooltype = 'Alle'; break; @@ -151,6 +151,7 @@ class Compacteversies } private function setDiversiteit(){ + if($this->onderdeel->licentie =='F') return; if($this->onderdeel->nummer != 1 && $this->onderdeel->nummer != 10) return; $module = $this->onderdeel->modulenr; if(isset($this->swvID) && $this->swvID == 150 && $this->schooljaar->schooljaarnr > 8 && $this->onderdeel->modulenr != 270) $module = 660; @@ -170,6 +171,7 @@ class Compacteversies } private function setExtraOmvang(){ + if($this->onderdeel->nummer != 3 || $this->onderdeel->licentie == 'F') return; $schooljaren = $this->CI->Aantalleerlingen_model->get_gevuldeschooljaren_Sop($this->schooljaarnr, $this->orglist); if($schooljaren && count($schooljaren) > 0) { diff --git a/application/models/monpas/Groepen_model.php b/application/models/monpas/Groepen_model.php index 74016e7..c075e18 100644 --- a/application/models/monpas/Groepen_model.php +++ b/application/models/monpas/Groepen_model.php @@ -41,7 +41,7 @@ class Groepen_model extends MY_Model{ } function get_AantalGroepen($schooljaarnr, $orgid, $module){ - $this->sql = " SELECT COUNT(COALESCE(id, 0)) as aantal + $this->sql = " SELECT COUNT(id) as aantal FROM tb_groepen WHERE organisatie_id = {$orgid} AND schooljaarnr = {$schooljaarnr} @@ -50,7 +50,7 @@ class Groepen_model extends MY_Model{ } function getversiesmetleerlingengoedeversie($orgid, $schooljaarnr, $schooltype, $module){ - $this->sql="SELECT SUM(COALESCE(totaantal, 0)) AS aantallln + $this->sql="SELECT SUM(totaantal) AS aantallln FROM tb_groepen WHERE organisatie_id ={$orgid} AND schooljaarnr = {$schooljaarnr}