From d1a8ec7490a9297a887588becb66a189e2cbdef0 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Tue, 29 Nov 2022 08:15:22 +0100 Subject: [PATCH] Erweiterung und OrderBy der Abfragen um Dauer Auslandsaufenthalt --- cis/private/lehre/fotoliste.pdf.php | 5 +++-- include/lehrelisthelper.class.php | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/cis/private/lehre/fotoliste.pdf.php b/cis/private/lehre/fotoliste.pdf.php index 353f3a2ad..881649ddf 100644 --- a/cis/private/lehre/fotoliste.pdf.php +++ b/cis/private/lehre/fotoliste.pdf.php @@ -180,7 +180,8 @@ $qry = 'SELECT DISTINCT ON tbl_person.matr_nr, tbl_person.geschlecht, tbl_person.foto, - tbl_person.foto_sperre + tbl_person.foto_sperre, + (tbl_bisio.bis::timestamp - tbl_bisio.von::timestamp) as daysout FROM campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid) @@ -200,7 +201,7 @@ $qry = 'SELECT DISTINCT ON if ($lehreinheit != '') $qry .= ' AND vw_student_lehrveranstaltung.lehreinheit_id=' . $db->db_add_param($lehreinheit, FHC_INTEGER); -$qry .= ' ORDER BY nachname, vorname, person_id, tbl_bisio.bis DESC'; +$qry .= ' ORDER BY nachname, vorname, person_id, daysout DESC'; $stsem_obj = new studiensemester(); $stsem_obj->load($studiensemester); diff --git a/include/lehrelisthelper.class.php b/include/lehrelisthelper.class.php index 31f6a067d..581c103cc 100644 --- a/include/lehrelisthelper.class.php +++ b/include/lehrelisthelper.class.php @@ -208,7 +208,8 @@ class LehreListHelper tbl_bisio.bisio_id, tbl_bisio.von, tbl_bisio.bis, tbl_student.studiengang_kz AS stg_kz_student, tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_studiengang.kurzbzlang, tbl_mobilitaet.mobilitaetstyp_kurzbz, tbl_zeugnisnote.note, - (CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN 1 ELSE 0 END) as doubledegree + (CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN 1 ELSE 0 END) as doubledegree, + (tbl_bisio.bis::timestamp - tbl_bisio.von::timestamp) as daysout FROM campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid) @@ -230,10 +231,11 @@ class LehreListHelper if($this->lehreinheit!='') $qry.=' AND vw_student_lehrveranstaltung.lehreinheit_id='.$this->db->db_add_param($this->lehreinheit, FHC_INTEGER); - $qry.=' ORDER BY nachname, vorname, person_id, tbl_bisio.bis, doubledegree DESC'; + $qry.=' ORDER BY nachname, vorname, person_id, daysout DESC, doubledegree DESC'; $stsem_obj = new studiensemester(); $stsem_obj->load($this->studiensemester); + $stsemdatumvon = $stsem_obj->start; $stsemdatumbis = $stsem_obj->ende;