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

nav 1e test

Browse Source
This commit is contained in:
Monique
2021-09-16 18:42:51 +02:00
parent 8c1d92f99b
commit 598f4e5084
9 changed files with 636 additions and 230 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/monpas/Scores_model.php
+6 -10
View File
@@ -409,9 +409,8 @@ class Scores_model extends MY_Model{
AND FV.organisatie_id = {$orgid}
AND FV.meetellen = 1
AND S.score > 0
GROUP BY S.filledversion_id
HAVING COUNT(S.id) >= 5";
return $this->get_query_result('aantal');
return $this->get_query_result();
}
@@ -444,13 +443,12 @@ class Scores_model extends MY_Model{
AND FV.organisatie_id IN ({$orglist})
AND FV.meetellen = 1
AND S.score > 0
GROUP BY S.filledversion_id
HAVING COUNT(S.id) >= 5) AS Q ";
return $this->get_query_row();
}
function fCountGevuldeBestuurVersies($orgversieid, $bgid){
$this->sql =" SELECT COUNT(DISTINCT filledversion_id) as aantal
$this->sql =" SELECT COUNT(DISTINCT filledversion_id) as aantal, COUNT(DISTINCT(O.id)) AS aantalorgs
FROM tb_scores S
JOIN tb_filledversions FV ON FV.id = S.filledversion_id
JOIN tb_organisaties O ON FV.organisatie_id = O.id
@@ -458,9 +456,8 @@ class Scores_model extends MY_Model{
AND O.valtonder_id = {$bgid}
AND FV.meetellen = 1
AND S.score > 0
GROUP BY S.filledversion_id
HAVING COUNT(S.id) >= 5";
return $this->get_query_row('aantal');
return $this->get_query_row();
}
@@ -507,7 +504,7 @@ class Scores_model extends MY_Model{
function fCountGevuldeKamerEnSWVVersies($orgversieid, $orgs){
$this->sql =" SELECT COUNT(DISTINCT filledversion_id) as aantal
$this->sql =" SELECT COUNT(DISTINCT filledversion_id) as aantal, COUNT(DISTINCT(O.id)) AS aantalorgs
FROM tb_scores S
JOIN tb_filledversions FV ON FV.id = S.filledversion_id
JOIN tb_organisaties O ON FV.organisatie_id = O.id
@@ -515,11 +512,10 @@ class Scores_model extends MY_Model{
AND O.id IN ({$orgs})
AND FV.meetellen = 1
AND S.score > 0
GROUP BY S.filledversion_id
HAVING COUNT(S.id) >= 5";
HAVING COUNT(S.id) >= 5 ";
return $this->get_query_row('aantal');
return $this->get_query_row();
}
application/models/shared/Aantalleerlingen_model.php
+1 -1
View File
@@ -59,7 +59,7 @@ class aantalleerlingen_model extends MY_Model{
function get_omvang($schooljaarnr, $orgs){
$this->sql=" SELECT A.schooljaarnr, S.naam, SUM(A.aantal) as aantal
$this->sql=" SELECT A.schooljaarnr, S.naam, SUM(A.aantal) as aantal, COUNT(DISTINCT(A.organisatie_id)) aantalorgs
FROM tb_schooljaren S
JOIN tb_aantalleerlingen A ON S.schooljaarnr = A.schooljaarnr
WHERE A.organisatie_id IN ({$orgs})