From 376ce0e44053cd737a8a14b9126cba6390cf531d Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 17 Aug 2023 14:13:30 +0200 Subject: [PATCH] WH: nur positive Noten bei intern angerechnet zulassen --- .../education/Studierendenantraglehrveranstaltung_model.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/application/models/education/Studierendenantraglehrveranstaltung_model.php b/application/models/education/Studierendenantraglehrveranstaltung_model.php index 9445b8cf8..47a07ecfe 100644 --- a/application/models/education/Studierendenantraglehrveranstaltung_model.php +++ b/application/models/education/Studierendenantraglehrveranstaltung_model.php @@ -70,6 +70,7 @@ class Studierendenantraglehrveranstaltung_model extends DB_Model 'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid AND z.studiensemester_kurzbz=a.studiensemester_kurzbz', 'LEFT' ); + $this->addJoin('lehre.tbl_note zn', 'z.note = zn.note', 'LEFT'); return $this->loadWhere([ 'ps.prestudent_id' => $prestudent_id, @@ -77,7 +78,7 @@ class Studierendenantraglehrveranstaltung_model extends DB_Model 'stat.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED, 'n.note <> ' => 0, $this->dbTable . '.studiensemester_kurzbz' => $studiensemester_kurzbz, - '(n.note<>19 OR z.note IS NOT NULL)' => null + '(n.note<>19 OR (z.note IS NOT NULL AND zn.positiv))' => null ]); } }