ijkpunten & ontwikelagenda

This commit is contained in:
Monique
2021-11-18 14:15:47 +01:00
parent 6c82268ae5
commit bdf313ae64
13 changed files with 108 additions and 88 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ class Scores_model extends MY_Model{
return $this->get_query_result();
}
function calculateindividualscores($orgversieid, $orgid, $userid){
$this->sql="SELECT SC.id, filledversion_id, SC.ijkpunt_id, scoretype, score,
$this->sql="SELECT SC.id, filledversion_id, SC.ijkpunt_id, scoretype, score, Y.disabled,
SUM(CASE WHEN Y.disabled = 'T' THEN 0
WHEN Y.disabled = 'F' THEN
CASE
@@ -15,9 +15,9 @@ class Wenssituaties_model extends MY_Model{
$this->sql = "SELECT W.id, W.ijkpunt_id, W.wens, Y.disabled
FROM tb_wenssituaties W
JOIN tb_ijkpunten Y ON W.ijkpunt_id = Y.id
WHERE organisatie_id = {$orgid}
AND Y.disabled = 'F'
AND orgversie_id = {$orgversieid}";
WHERE organisatie_id = {$orgid}
AND orgversie_id = {$orgversieid}
ORDER BY Y.nummer ";
return $this->get_query_result();
}
function getgewenstvoorpartituur($orgversieid, $orgid){