diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php index e72b24de4..214d45b5e 100644 --- a/application/models/person/Person_model.php +++ b/application/models/person/Person_model.php @@ -424,12 +424,13 @@ class Person_model extends DB_Model public function loadAllStudentUIDSForPersonID($person_id) { $qry = "SELECT CONCAT(tp.vorname, ' ', tp.nachname) AS name, - ARRAY_AGG(DISTINCT b.uid ORDER BY b.uid) AS uids + ARRAY_AGG(DISTINCT b.uid ORDER BY b.uid) AS uids, + ARRAY_AGG(DISTINCT s.studiengang_kz ORDER BY s.studiengang_kz) AS stg_kzs FROM public.tbl_student s JOIN public.tbl_benutzer b ON s.student_uid = b.uid JOIN public.tbl_person tp ON b.person_id = tp.person_id - GROUP BY tp.vorname, tp.nachname, b.aktiv, b.person_id - HAVING b.person_id = ? AND b.aktiv IS TRUE;"; + GROUP BY tp.vorname, tp.nachname, b.aktiv, b.person_id, s.semester, s.studiengang_kz + HAVING b.person_id = ? AND b.aktiv IS TRUE AND s.semester > 0;"; return $this->execReadOnlyQuery($qry, [$person_id]); } diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php index deb856663..898343a27 100644 --- a/system/phrasesupdate.php +++ b/system/phrasesupdate.php @@ -35089,6 +35089,26 @@ array( ) ) ), + array( + 'app' => 'anwesenheiten', + 'category' => 'global', + 'phrase' => 'oldEntsWithoutDocumentFound', + 'insertvon' => 'system', + 'phrases' => array( + array( + 'sprache' => 'German', + 'text' => 'Alte Entschuldigungen ohne Dateiupload gefunden', + 'description' => '', + 'insertvon' => 'system' + ), + array( + 'sprache' => 'English', + 'text' => 'Old excuse notes without file upload detected', + 'description' => '', + 'insertvon' => 'system' + ) + ) + ), // // DIGITALE ANWESENHEITEN PHRASEN END //