From 93a6652c5f3df9193cd5627080d020e7ad6ccf53 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Fri, 5 Jul 2019 17:07:06 +0200 Subject: [PATCH] Gradelist - Max-ECTS-Sum includes ECTS of assigned Courses without Grades --- application/controllers/person/Gradelist.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/application/controllers/person/Gradelist.php b/application/controllers/person/Gradelist.php index e1ef14792..230c7f67f 100644 --- a/application/controllers/person/Gradelist.php +++ b/application/controllers/person/Gradelist.php @@ -46,6 +46,9 @@ class Gradelist extends Auth_Controller $this->_grades[$row->note]['anmerkung'] = $row->anmerkung; $this->_grades[$row->note]['notenwert'] = $row->notenwert; } + $this->_grades['']['positiv'] = false; + $this->_grades['']['anmerkung'] = ''; + $this->_grades['']['notenwert'] = 0; } /** @@ -386,6 +389,15 @@ class Gradelist extends Auth_Controller 'sws' => $row['sws'] ); } + elseif (isset($row['zugeordnet']) && $row['zugeordnet'] == true && $row['lehrtyp_kurzbz']=='lv') + { + // ECTS und SWS mitzaehlen wenn die Person zugeordnet ist auch wenn noch keine Noten vorhanden ist. + $grades[] = array( + 'note' => '', + 'ects' => $row['ects'], + 'sws' => $row['sws'] + ); + } if (isset($row['childs'])) {