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

gemiddelde matrix

Browse Source
This commit is contained in:
Monique
2021-11-22 10:27:52 +01:00
parent 2b258c9a0c
commit b9b585f762
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/controllers/monpas/Rapmatrix.php
+8
View File
@@ -387,16 +387,19 @@ private function getGemiddeldenSchool($labels, $aantalY, $orgversieID, $kleuren)
$aantalrijen = $aantalrijen + 1; $aantalrijen = $aantalrijen + 1;
for ($i = 0; $i < $aantalY; $i++) { for ($i = 0; $i < $aantalY; $i++) {
if(isset($user->scores[$i])) { if(isset($user->scores[$i])) {
if($user->scores[$i]->disabled == 'F' && $user->scores[$i]->disablenvt == 'F') {
// if ($user->scores[$i]->gem == '' || $user->scores[$i]->gem == null) { // if ($user->scores[$i]->gem == '' || $user->scores[$i]->gem == null) {
// // doe niks // // doe niks
// } else { // } else {
$aantalscores++; $aantalscores++;
$sumscore[$i] = $sumscore[$i] + $user->scores[$i]->gem; $sumscore[$i] = $sumscore[$i] + $user->scores[$i]->gem;
$aantalresults[$i] = $aantalresults[$i] + 1; $aantalresults[$i] = $aantalresults[$i] + 1;
$sumscorerij = $sumscorerij + $user->scores[$i]->gem; $sumscorerij = $sumscorerij + $user->scores[$i]->gem;
if ($sumscorerij > 0) { if ($sumscorerij > 0) {
$waarden++; $waarden++;
} }
}
// } // }
$user->scores[$i]->kleur = $this->getkleur($user->scores[$i]->gem, $kleuren); $user->scores[$i]->kleur = $this->getkleur($user->scores[$i]->gem, $kleuren);
@@ -624,6 +627,10 @@ private function getGemiddeldeScores($labels, $aantalY, $kleuren){
$aantalrijen = $aantalrijen + 1; $aantalrijen = $aantalrijen + 1;
for ($i = 0; $i < $aantalY; $i++) { for ($i = 0; $i < $aantalY; $i++) {
if(isset($user->scores[$i])) { if(isset($user->scores[$i])) {
if($user->scores[$i]->disabled == 'F' &&
($user->scores[$i]->aantalvier == 0 ||
($user->scores[$i]->aantalvier > 0 &&
$user->scores[$i]->aantalnvt != $user->scores[$i]->aantalvier ))){
// if ($user->scores[$i]->gem == '' || $user->scores[$i]->gem == null) { // if ($user->scores[$i]->gem == '' || $user->scores[$i]->gem == null) {
// // doe niks // // doe niks
// } else { // } else {
@@ -634,6 +641,7 @@ private function getGemiddeldeScores($labels, $aantalY, $kleuren){
if ($sumscorerij > 0) { if ($sumscorerij > 0) {
$waarden++; $waarden++;
// } // }
}
} }
$user->scores[$i]->kleur = $this->getkleur($user->scores[$i]->gem, $kleuren); $user->scores[$i]->kleur = $this->getkleur($user->scores[$i]->gem, $kleuren);
} }