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

kleuren werden niet goed opgehaald bij resultaat matrix

Browse Source
This commit is contained in:
Monique
2022-06-10 10:35:52 +02:00
parent e4c852671b
commit e8a6bf85b7
13 changed files with 153 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/models/monpas/Scorekleuren_model.php
+11
View File
@@ -23,6 +23,17 @@ class Scorekleuren_model extends MY_Model{
return $this->get_query_row();
}
function getWensKleur($scoretype, $nummer){
$this->sql="SELECT kleurcode
FROM tb_scorekleuren
WHERE scoretype = {$scoretype}
AND nummer = {$nummer}
AND disabled = 'F' ";
return $this->get_query_row('kleurcode');
}
application/models/monpas/Scores_model.php
+5 -8
View File
@@ -636,7 +636,7 @@ class Scores_model extends MY_Model{
function getgemscores($orgversieid, $orgids){
$gevuldeversies = $this->fGetGevuldeVersies($orgversieid, $orgids);
if ($gevuldeversies) {
$this->sql = " SELECT Q.omschrijving, Q.toelichting, Q.ijkpunt_id, Q.kleurnummer, Q.disabled, Q.scoretype,
$this->sql = " SELECT Q.omschrijving, Q.toelichting, Q.ijkpunt_id, Q.disabled, Q.scoretype,
CASE WHEN Q.aantalvier > 0 THEN
CASE WHEN Q.aantalvier = Q.aantalnvt THEN
'T'
@@ -644,11 +644,11 @@ class Scores_model extends MY_Model{
END
ELSE 'F'
END AS disablenvt,
Q.sumscores/Q.sumgewicht AS gem, Q.kleurcode, Q.nummer, Q.ondergrens, Q.bovengrens
Q.sumscores/Q.sumgewicht AS gem, Q.nummer
FROM (
SELECT Y.omschrijving, Y.toelichting,Y.id as ijkpunt_id,
Y.nummer, Y.disabled, SC.scoretype, SK.nummer AS kleurnummer,
SK.kleurcode, SK.ondergrens, SK.bovengrens,
Y.nummer, Y.disabled, SC.scoretype,
SUM(CASE WHEN Y.disabled = 'T' THEN 0
WHEN Y.disabled = 'F' THEN
CASE WHEN SC.scoretype = 1
@@ -715,12 +715,9 @@ class Scores_model extends MY_Model{
FROM tb_scores SC
JOIN tb_indicatoren I ON I.id = SC.indicator_id
JOIN tb_ijkpunten Y ON Y.id = SC.ijkpunt_id
JOIN tb_scorekleuren SK ON SK.scoretype = SC.scoretype
WHERE SC.filledversion_id IN ({$gevuldeversies})
AND SK.disabled = Y.disabled
GROUP BY SC.ijkpunt_id
ORDER BY Y.nummer ) AS Q
HAVING Q.ondergrens <= gem AND Q.bovengrens > gem ";
ORDER BY Y.nummer ) AS Q ";
}
else return false;
return $this->get_query_result();