From 002d448f022822bcdc65cd458e18f3cb34e6b7d5 Mon Sep 17 00:00:00 2001 From: Monique Date: Thu, 9 Dec 2021 18:10:25 +0100 Subject: [PATCH 1/4] versie --- application/core/MY_Controller.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/core/MY_Controller.php b/application/core/MY_Controller.php index be9598f..53d38ac 100644 --- a/application/core/MY_Controller.php +++ b/application/core/MY_Controller.php @@ -56,7 +56,7 @@ class MY_Controller extends CI_Controller{ // public $version = '1.17.72'; // data2mysql fout // public $version = '1.17.73'; // 0-waarden aantal tlvs in omvang extra ondersteuning // public $version = '1.17.75'; // mogelijkheid tot uitzetten extra ondersteuning in divmeters - public $version = '1.17.76'; // cluster scans passend onderwijs +// public $version = '1.17.76'; // cluster scans passend onderwijs public $version = '1.17.79'; // fout matrixfunctie public $partituurid; From ed6980443a5d00f4fea2eb8c0257dd4b259db0b9 Mon Sep 17 00:00:00 2001 From: Monique Date: Thu, 9 Dec 2021 18:13:35 +0100 Subject: [PATCH 2/4] foutje --- application/controllers/monpas/Rapmatrix.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/controllers/monpas/Rapmatrix.php b/application/controllers/monpas/Rapmatrix.php index 5eb3512..1ab9a72 100644 --- a/application/controllers/monpas/Rapmatrix.php +++ b/application/controllers/monpas/Rapmatrix.php @@ -89,7 +89,7 @@ class Rapmatrix extends MY_Controller if ($orgsoort == 4) {//schoolniveau if ($orgversie->vorm == 2) { - $labels = $this->getIndividueleMatrix($orgID, $orgversieID, $aantalY, $scoretype); + $labels = $this->getIndividueleMatrix($orgID, $orgversieID, $ijkpunten, $scoretype); //geef individuele scores + het gemiddelde } if ($orgversie->vorm == 1){ From a15dd94a81ea722a726076f0175eb2f01a9eb85f Mon Sep 17 00:00:00 2001 From: Monique Date: Thu, 9 Dec 2021 22:19:28 +0100 Subject: [PATCH 3/4] disabled --- application/models/monpas/Scores_model.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/models/monpas/Scores_model.php b/application/models/monpas/Scores_model.php index 784a955..12e2546 100644 --- a/application/models/monpas/Scores_model.php +++ b/application/models/monpas/Scores_model.php @@ -387,7 +387,7 @@ class Scores_model extends MY_Model{ if ($gevuldeversies) { - $this->sql = "SELECT SC.id, filledversion_id, SC.ijkpunt_id , scoretype, + $this->sql = "SELECT SC.id, filledversion_id, SC.ijkpunt_id , scoretype, Y.disabled, sum(IF ({$a}, {$b} ,{$c}) )/ sum(IF ((SC.scoretype=4 && SC.score=3), 0, I.gewicht)) AS gem, Y.nummer, Y.omschrijving, count(DISTINCT O.id) AS aantalscholen, count(DISTINCT FV.id) AS aantallijsten, Y.toelichting FROM tb_filledversions FV From d8330d42a24422602906993aacd583f5cbcd7ced Mon Sep 17 00:00:00 2001 From: Monique Date: Thu, 9 Dec 2021 23:00:44 +0100 Subject: [PATCH 4/4] fouten matrix indiiduele scores --- application/controllers/monpas/Rapmatrix.php | 4 ++-- application/libraries/monpas/ijkpunten/Userlijsten.php | 2 +- application/models/monpas/Scores_model.php | 2 +- public/js/monpas/models/ijkpuntenmodel.js | 1 + 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/application/controllers/monpas/Rapmatrix.php b/application/controllers/monpas/Rapmatrix.php index 1ab9a72..4074919 100644 --- a/application/controllers/monpas/Rapmatrix.php +++ b/application/controllers/monpas/Rapmatrix.php @@ -330,7 +330,7 @@ class Rapmatrix extends MY_Controller $labels->label->users = $leerkrachten; foreach ($labels->label->users as $user) { - $user->scores = $this->Scores_model->getlkscores($user->filledversionid); + $user->scores = $this->Scores_model->calculateindividualscores($orgversieID, $orgID,$user->user_id ); if ($user->scores) { foreach ($user->scores as $score) { $score->gem = new stdClass(); @@ -663,7 +663,7 @@ private function getGemiddeldeScores($labels, $ijkpunten, $scoretype){ } } - $user->scores[$i]->kleur = $user->scores[$i]->kleurcode; + $user->scores[$i]->kleur = $this->Scorekleuren_model->getGemiddeldeKleur($scoretype, $user->scores[$i]->gem); if(!isset($user->scores[$i]->disablenvt)){ $user->scores[$i]->disablenvt= 'F'; if($user->scores[$i]->aantalvier > 0 && diff --git a/application/libraries/monpas/ijkpunten/Userlijsten.php b/application/libraries/monpas/ijkpunten/Userlijsten.php index c52dfd7..d96de9a 100644 --- a/application/libraries/monpas/ijkpunten/Userlijsten.php +++ b/application/libraries/monpas/ijkpunten/Userlijsten.php @@ -138,7 +138,7 @@ class Userlijsten private function loopVergelijkingScores(){ if( (!isset($this->lijst->vergelijkingen) ||$this->lijst->vergelijkingen== false )) return; - for($i = 0; $i < count($this->lijst->scores); $i++){ + for($i = 0; $i < count($this->lijst->vergelijkingen); $i++){ $this->setVergelijkingScores($i); } } diff --git a/application/models/monpas/Scores_model.php b/application/models/monpas/Scores_model.php index 12e2546..1a51e0f 100644 --- a/application/models/monpas/Scores_model.php +++ b/application/models/monpas/Scores_model.php @@ -443,7 +443,7 @@ class Scores_model extends MY_Model{ SUM( IF((OV.scoretype=4 && S.score=3), 0, Indi.gewicht) ) AS num, - Y.nummer + Y.nummer, Y.disabled FROM tb_filledversions FV JOIN tb_scores S ON FV.id = S.filledversion_id diff --git a/public/js/monpas/models/ijkpuntenmodel.js b/public/js/monpas/models/ijkpuntenmodel.js index 7b88e6a..9db91d7 100644 --- a/public/js/monpas/models/ijkpuntenmodel.js +++ b/public/js/monpas/models/ijkpuntenmodel.js @@ -587,6 +587,7 @@ ls.initIJkpuntenModel = function(){ 'selectie': selectieOrgversies, 'orgid': self.selectedOrg().id }; + console.log(submitData, "submitdata") // showAjaxLoader(); self.lijsten.removeAll();