Merge branch 'master' into develop

application/libraries/monpas/Gemiddeldescores.php

@@ -253,7 +253,7 @@ class Gemiddeldescores
                 if($this->scoretype == 4) $lkrtscore = round($this->score->somscore);
                 else $lkrtscore = round($this->score->somscore / $this->score->num);
                 $this->ijkpunt->totaal = $this->ijkpunt->totaal + $lkrtscore;
-                $this->ijkpunt->aantallkrtn++;
+                if(($this->scoretype == 4 && $this->score->disablenvt == 'F') || $this->scoretype != 4) $this->ijkpunt->aantallkrtn++;
                 $this->slaover = true;
             }
         }
@@ -278,6 +278,7 @@ class Gemiddeldescores
     private function setNietVanToepassing(){
         if( $this->aantalnvt == $this->metingen->aantal ){
             $this->ijkpunt->disablenvt = 'T';
+
         }
     }
 
@@ -346,7 +347,6 @@ class Gemiddeldescores
             if(!isset($this->ijkpunt->score)){continue;};
             if(! $this->ijkpunt->score) $this->ijkpuntscore = 0;
             $this->setScorenummer();
-//            $this->rondScoresAf();
             $this->setScoreKleuren();
             $this->addGewensteScores($index);
             $this->setWenskleuren();
@@ -371,9 +371,6 @@ class Gemiddeldescores
         }
     }
 
-    private function rondScoresAf(){
-        $this->ijkpunt->score = round($this->ijkpunt->score);
-    }
 
     private function setScoreKleuren(){
         $kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->scoretype, $this->ijkpunt->score);
@@ -435,7 +432,10 @@ class Gemiddeldescores
     private function setGemiddelde(){
         $this->gemiddelde = new stdClass();
         $this->gemiddelde->score = 0;
-        $deler = $this->aantalY - $this->aantalnvt;
+        $deler = 0;
+            foreach($this->ijkpunten As $ijkpunt){
+                if($ijkpunt->disablenvt == 'F') $deler++;
+            }
         if($deler > 0) $this->gemiddelde->score = round($this->somscore / $deler);
         $this->gemiddelde->gem        = $this->gemiddelde->score;
         $this->gemiddelde->nummer     = 'gem';

application/libraries/monpas/Schoolscores.php

@@ -172,6 +172,7 @@ class Schoolscores
         if(!$this->scores) return;
         foreach ($this->scores as $index => $this->score) {
             if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
+                $this->score->gem = round($this->score->gem);
                 $this->somscore = $this->somscore + $this->score->gem;
                 $this->aantalscores++;
             }
@@ -186,7 +187,7 @@ class Schoolscores
         if (!$this->scores) return;
         foreach ($this->scores as $index => $this->score) {
             $this->setScoreNummer();
-            $this->rondScoresAf();
+//            $this->rondScoresAf();
             $this->setScoreKleuren();
             $this->telIJkpuntenok();
             $this->setResultaten();
@@ -294,7 +295,7 @@ class Schoolscores
         $this->gemiddelde->gem = 0;
         $this->gemiddelde->score = 0;
         $deler = $this->aantalY - $this->aantaldisablenvt;
-        if($deler > 0) $this->gemiddelde->gem = round(round($this->somscore) / $deler);
+        if($deler > 0) $this->gemiddelde->gem = round($this->somscore / $deler);
 
         $this->gemiddelde->disabled = 'F';
         $this->gemiddelde->disablenvt = 'F';