Overigen/monpas
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fouten/sop' into develop

Browse Source 
# Conflicts:
#	application/core/MY_Controller.php
This commit is contained in:
Monique
2022-01-24 13:21:28 +01:00
parent ef3fe83b6e b12ca62443
commit c1bb148e98
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/core/MY_Controller.php
+4 -1
View File
@@ -59,7 +59,10 @@ class MY_Controller extends CI_Controller{
// public $version = '1.17.76'; // cluster scans passend onderwijs
// public $version = '1.17.79'; // fout matrixfunctie
// public $version = '1.17.83'; // sophomepage
public $version = '1.17.84'; // scan passend onderwijs in compact sop.
// 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 $partituurid;
application/models/monpas/Groepen_model.php
+2 -2
View File
@@ -41,7 +41,7 @@ class Groepen_model extends MY_Model{
}
function get_AantalGroepen($schooljaarnr, $orgid, $module){
$this->sql = " SELECT COUNT(id) as aantal
$this->sql = " SELECT COUNT(COALESCE(id, 0)) 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(totaantal) AS aantallln
$this->sql="SELECT SUM(COALESCE(totaantal, 0)) AS aantallln
FROM tb_groepen
WHERE organisatie_id ={$orgid}
AND schooljaarnr = {$schooljaarnr}