From 7d634e8589c68cb9538896e78c3015f47bebd27a Mon Sep 17 00:00:00 2001 From: Monique Hansma Date: Thu, 22 Oct 2026 12:28:25 +0200 Subject: [PATCH] individuele ijkpuntenlijst: disablenvt in query calculateindividualscores leverde geen disablenvt; Individuelescores gaf daardoor per ijkpunt een warning (lokaal voor de JSON, dus geen grafiek en tabel) en telde geen ijkpunt mee in het gemiddelde. Nu 'F' AS disablenvt zoals getgemscores; totgem veilig als er geen gemiddelde is. Co-Authored-By: Claude Opus 5.5 --- application/libraries/monpas/ijkpunten/Individuelescores.php | 2 +- application/models/monpas/Scores_model.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/application/libraries/monpas/ijkpunten/Individuelescores.php b/application/libraries/monpas/ijkpunten/Individuelescores.php index b0b25e7..7618e1e 100644 --- a/application/libraries/monpas/ijkpunten/Individuelescores.php +++ b/application/libraries/monpas/ijkpunten/Individuelescores.php @@ -244,7 +244,7 @@ class Individuelescores private function setResults(){ if($this->scores) { $this->resultaten = [ - 'totgem' => $this->gemiddelde->gem, + 'totgem' => $this->gemiddelde->gem ?? null, 'ijkpuntenok' => $this->ijkpuntenok, 'welkehoogste' => $this->welkehoogste, 'hoogstescore' => round($this->hoogstescore, 1), diff --git a/application/models/monpas/Scores_model.php b/application/models/monpas/Scores_model.php index 23fb2f1..24e841f 100644 --- a/application/models/monpas/Scores_model.php +++ b/application/models/monpas/Scores_model.php @@ -26,8 +26,8 @@ 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, score AS gem, Y.disabled, - SUM(CASE WHEN Y.disabled = 'T' THEN 0 + $this->sql="SELECT SC.id, filledversion_id, SC.ijkpunt_id, scoretype, score, score AS gem, Y.disabled, 'F' AS disablenvt, + SUM(CASE WHEN Y.disabled = 'T' THEN 0 WHEN Y.disabled = 'F' THEN CASE WHEN SC.scoretype = 1 THEN SC.score * 10 * Indi.gewicht