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();