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

Merge branch 'master' into develop

Browse Source
This commit is contained in:
Monique
2024-01-17 20:23:37 +01:00
parent df59f39165 aa1fa483e1
commit fb692bba7d
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/libraries/monpas/Gemiddeldescores.php
+6 -6
View File
@@ -253,7 +253,7 @@ class Gemiddeldescores
if($this->scoretype == 4) $lkrtscore = round($this->score->somscore); if($this->scoretype == 4) $lkrtscore = round($this->score->somscore);
else $lkrtscore = round($this->score->somscore / $this->score->num); else $lkrtscore = round($this->score->somscore / $this->score->num);
$this->ijkpunt->totaal = $this->ijkpunt->totaal + $lkrtscore; $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; $this->slaover = true;
} }
} }
@@ -278,6 +278,7 @@ class Gemiddeldescores
private function setNietVanToepassing(){ private function setNietVanToepassing(){
if( $this->aantalnvt == $this->metingen->aantal ){ if( $this->aantalnvt == $this->metingen->aantal ){
$this->ijkpunt->disablenvt = 'T'; $this->ijkpunt->disablenvt = 'T';
} }
} }
@@ -346,7 +347,6 @@ class Gemiddeldescores
if(!isset($this->ijkpunt->score)){continue;}; if(!isset($this->ijkpunt->score)){continue;};
if(! $this->ijkpunt->score) $this->ijkpuntscore = 0; if(! $this->ijkpunt->score) $this->ijkpuntscore = 0;
$this->setScorenummer(); $this->setScorenummer();
// $this->rondScoresAf();
$this->setScoreKleuren(); $this->setScoreKleuren();
$this->addGewensteScores($index); $this->addGewensteScores($index);
$this->setWenskleuren(); $this->setWenskleuren();
@@ -371,9 +371,6 @@ class Gemiddeldescores
} }
} }
private function rondScoresAf(){
$this->ijkpunt->score = round($this->ijkpunt->score);
}
private function setScoreKleuren(){ private function setScoreKleuren(){
$kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->scoretype, $this->ijkpunt->score); $kleur = $this->CI->Scorekleuren_model->getGemiddeldeKleur($this->scoretype, $this->ijkpunt->score);
@@ -435,7 +432,10 @@ class Gemiddeldescores
private function setGemiddelde(){ private function setGemiddelde(){
$this->gemiddelde = new stdClass(); $this->gemiddelde = new stdClass();
$this->gemiddelde->score = 0; $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); if($deler > 0) $this->gemiddelde->score = round($this->somscore / $deler);
$this->gemiddelde->gem = $this->gemiddelde->score; $this->gemiddelde->gem = $this->gemiddelde->score;
$this->gemiddelde->nummer = 'gem'; $this->gemiddelde->nummer = 'gem';
application/libraries/monpas/Schoolscores.php
+3 -2
View File
@@ -172,6 +172,7 @@ class Schoolscores
if(!$this->scores) return; if(!$this->scores) return;
foreach ($this->scores as $index => $this->score) { foreach ($this->scores as $index => $this->score) {
if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') { if($this->score->disabled == 'F' && $this->score->disablenvt == 'F') {
$this->score->gem = round($this->score->gem);
$this->somscore = $this->somscore + $this->score->gem; $this->somscore = $this->somscore + $this->score->gem;
$this->aantalscores++; $this->aantalscores++;
} }
@@ -186,7 +187,7 @@ class Schoolscores
if (!$this->scores) return; if (!$this->scores) return;
foreach ($this->scores as $index => $this->score) { foreach ($this->scores as $index => $this->score) {
$this->setScoreNummer(); $this->setScoreNummer();
$this->rondScoresAf(); // $this->rondScoresAf();
$this->setScoreKleuren(); $this->setScoreKleuren();
$this->telIJkpuntenok(); $this->telIJkpuntenok();
$this->setResultaten(); $this->setResultaten();
@@ -294,7 +295,7 @@ class Schoolscores
$this->gemiddelde->gem = 0; $this->gemiddelde->gem = 0;
$this->gemiddelde->score = 0; $this->gemiddelde->score = 0;
$deler = $this->aantalY - $this->aantaldisablenvt; $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->disabled = 'F';
$this->gemiddelde->disablenvt = 'F'; $this->gemiddelde->disablenvt = 'F';