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

Merge branch 'feature/foutmatrix' into develop

Browse Source 
# Conflicts:
#	application/core/MY_Controller.php
This commit is contained in:
Monique
2021-12-09 23:01:33 +01:00
parent dd77f82aa1 d8330d42a2
commit ffa90c8dc6
5 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Rapmatrix.php
+3 -3
View File
@@ -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){
@@ -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 &&
application/core/MY_Controller.php
+1 -1
View File
@@ -57,7 +57,7 @@ class MY_Controller extends CI_Controller{
// 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.78'; // grafiek divmeter andere schaal
public $version = '1.17.79'; // fout matrixfunctie
public $partituurid;
public $globProfielVersieID = 1;
application/libraries/monpas/ijkpunten/Userlijsten.php
+1 -1
View File
@@ -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);
}
}
application/models/monpas/Scores_model.php
+2 -2
View File
@@ -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
@@ -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
public/js/monpas/models/ijkpuntenmodel.js
+1
View File
@@ -587,6 +587,7 @@ ls.initIJkpuntenModel = function(){
'selectie': selectieOrgversies,
'orgid': self.selectedOrg().id
};
console.log(submitData, "submitdata")
// showAjaxLoader();
self.lijsten.removeAll();