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

ijkpunten

Browse Source
This commit is contained in:
Monique
2021-11-16 21:40:12 +01:00
parent 2db90688a6
commit af3d32b653
15 changed files with 321 additions and 159 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/monpas/Ijkpunten_model.php
+10
View File
@@ -20,6 +20,16 @@ class Ijkpunten_model extends MY_Model{
ORDER BY Y.nummer ";
return $this->get_query_result();
}
function getijkpuntenMetIndicatoren($orgversieid){
$this->sql="SELECT Y.id, Y.nummer,Y.omschrijving,Y.toelichting, disabled
FROM tb_orgversies OV
JOIN tb_ijkpunten Y ON Y.versie_id = OV.versie_id
JOIN tb_indicatoren I ON Y.id = I.ijkpunt_id
WHERE OV.id ={$orgversieid}
GROUP BY Y.nummer
ORDER BY Y.nummer ";
return $this->get_query_result();
}
application/models/monpas/Scores_model.php
+16 -10
View File
@@ -475,7 +475,7 @@ class Scores_model extends MY_Model{
FROM tb_scores S
JOIN tb_filledversions FV ON FV.id = S.filledversion_id
WHERE FV.orgversie_id = {$orgversieid}
AND FV.organisatie_id = {$orgid}
AND FV.organisatie_id IN ({$orgid})
AND FV.meetellen = 1
AND S.score > 0
GROUP BY S.filledversion_id
@@ -517,15 +517,21 @@ class Scores_model extends MY_Model{
}
function fCountGevuldeVersiesNieuw($orgversieid, $orgids){
$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
WHERE FV.orgversie_id = {$orgversieid}
AND FV.organisatie_id IN ({$orgids})
AND FV.meetellen = 1
AND S.score > 0
HAVING COUNT(S.id) >= 5";
$this->sql =" SELECT SUM(CASE WHEN Q.aantal> 0 THEN Q.aantal
ELSE 0
END ) as aantal,
SUM(CASE WHEN Q.aantalorgs > 0 THEN Q.aantalorgs
ELSE 0
END ) as aantalorgs
FROM( SELECT COUNT(DISTINCT filledversion_id) as aantal, COUNT(DISTINCT(FV.organisatie_id)) AS aantalorgs
FROM tb_scores S
JOIN tb_filledversions FV ON FV.id = S.filledversion_id
WHERE FV.orgversie_id = {$orgversieid}
AND FV.organisatie_id IN ({$orgids})
AND FV.meetellen = 1
AND S.score > 0
GROUP BY FV.organisatie_id
HAVING COUNT(S.id) >= 5 ) AS Q ";
return $this->get_query_row();
}