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

fouten matrix indiiduele scores

Browse Source
This commit is contained in:
Monique
2021-12-09 23:00:44 +01:00
parent a15dd94a81
commit d8330d42a2
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Rapmatrix.php
+2 -2
View File
@@ -330,7 +330,7 @@ class Rapmatrix extends MY_Controller
$labels->label->users = $leerkrachten; $labels->label->users = $leerkrachten;
foreach ($labels->label->users as $user) { 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) { if ($user->scores) {
foreach ($user->scores as $score) { foreach ($user->scores as $score) {
$score->gem = new stdClass(); $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)){ if(!isset($user->scores[$i]->disablenvt)){
$user->scores[$i]->disablenvt= 'F'; $user->scores[$i]->disablenvt= 'F';
if($user->scores[$i]->aantalvier > 0 && if($user->scores[$i]->aantalvier > 0 &&
application/libraries/monpas/ijkpunten/Userlijsten.php
+1 -1
View File
@@ -138,7 +138,7 @@ class Userlijsten
private function loopVergelijkingScores(){ private function loopVergelijkingScores(){
if( (!isset($this->lijst->vergelijkingen) ||$this->lijst->vergelijkingen== false )) return; 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); $this->setVergelijkingScores($i);
} }
} }
application/models/monpas/Scores_model.php
+1 -1
View File
@@ -443,7 +443,7 @@ class Scores_model extends MY_Model{
SUM( IF((OV.scoretype=4 && S.score=3), 0, Indi.gewicht) ) AS num, SUM( IF((OV.scoretype=4 && S.score=3), 0, Indi.gewicht) ) AS num,
Y.nummer Y.nummer, Y.disabled
FROM tb_filledversions FV FROM tb_filledversions FV
JOIN tb_scores S ON FV.id = S.filledversion_id JOIN tb_scores S ON FV.id = S.filledversion_id
public/js/monpas/models/ijkpuntenmodel.js
+1
View File
@@ -587,6 +587,7 @@ ls.initIJkpuntenModel = function(){
'selectie': selectieOrgversies, 'selectie': selectieOrgversies,
'orgid': self.selectedOrg().id 'orgid': self.selectedOrg().id
}; };
console.log(submitData, "submitdata")
// showAjaxLoader(); // showAjaxLoader();
self.lijsten.removeAll(); self.lijsten.removeAll();