From 8d58bef718c9e34a67db74012c7627d19d546de3 Mon Sep 17 00:00:00 2001 From: Manuela Thamer Date: Thu, 27 Aug 2026 12:30:50 +0200 Subject: [PATCH] refactor functions isJgv and getPrestudentsOfJgv # --- application/models/person/Benutzerfunktion_model.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/application/models/person/Benutzerfunktion_model.php b/application/models/person/Benutzerfunktion_model.php index 52236ba7c..80a92525e 100644 --- a/application/models/person/Benutzerfunktion_model.php +++ b/application/models/person/Benutzerfunktion_model.php @@ -360,7 +360,8 @@ class Benutzerfunktion_model extends DB_Model SELECT DISTINCT ps.prestudent_id, bf.datum_von, bf.datum_bis FROM public.tbl_benutzerfunktion bf JOIN public.tbl_benutzer bn USING (uid) - JOIN public.tbl_prestudent ps USING (person_id) + JOIN public.tbl_student stud ON (stud.student_uid = bn.uid) + JOIN public.tbl_prestudent ps USING (prestudent_id) JOIN public.tbl_prestudentstatus pss ON (ps.prestudent_id = pss.prestudent_id) JOIN public.tbl_studiensemester ss ON (pss.studiensemester_kurzbz = ss.studiensemester_kurzbz) WHERE ss.studiensemester_kurzbz = ? @@ -387,10 +388,11 @@ class Benutzerfunktion_model extends DB_Model public function isJgv($semester, $prestudent_id) { $query = " - SELECT ps.prestudent_id, ss.start as von, ss.ende as bis + SELECT DISTINCT ps.prestudent_id, bf.datum_von, bf.datum_bis FROM public.tbl_benutzerfunktion bf JOIN public.tbl_benutzer bn USING (uid) - JOIN public.tbl_prestudent ps USING (person_id) + JOIN public.tbl_student stud ON (stud.student_uid = bn.uid) + JOIN public.tbl_prestudent ps USING (prestudent_id) JOIN public.tbl_prestudentstatus pss ON (ps.prestudent_id = pss.prestudent_id) JOIN public.tbl_studiensemester ss ON (pss.studiensemester_kurzbz = ss.studiensemester_kurzbz) WHERE ss.studiensemester_kurzbz = ?