From 00446cdb33e63bf8ef67344ffc2402eed4c9d4d5 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 16 Dec 2022 08:37:04 +0100 Subject: [PATCH 1/2] Erweiterung Anwesenheitsliste um Geschlecht --- include/lehrelisthelper.class.php | 3 +- system/xsl/Anwesenheitsliste.xsl | 903 ++++++++++++++++-------------- 2 files changed, 473 insertions(+), 433 deletions(-) diff --git a/include/lehrelisthelper.class.php b/include/lehrelisthelper.class.php index 31f6a067d..f447fdbf5 100644 --- a/include/lehrelisthelper.class.php +++ b/include/lehrelisthelper.class.php @@ -206,7 +206,7 @@ class LehreListHelper WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status, 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_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_mitarbeiter.mitarbeiter_uid, tbl_person.matr_nr, tbl_person.geschlecht, 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 FROM @@ -295,6 +295,7 @@ class LehreListHelper 'uid' => $row->student_uid, 'vorname'=>$vorname, 'nachname'=>$row->nachname, + 'geschlecht'=>$row->geschlecht, 'personenkennzeichen'=>trim($row->matrikelnr), 'matr_nr'=>$row->matr_nr, 'semester'=>$row->semester, diff --git a/system/xsl/Anwesenheitsliste.xsl b/system/xsl/Anwesenheitsliste.xsl index 105bb7366..55e72900c 100644 --- a/system/xsl/Anwesenheitsliste.xsl +++ b/system/xsl/Anwesenheitsliste.xsl @@ -1,432 +1,471 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Anwesenheitsliste - Gruppen: Studiensemester: - - Monat ___________ - - - - - - - - - - Datum - - - - - - - - - - - - - - - - - - - - - - - Anzahl der abgehaltenen Einheiten - - - - - - - - - - - - - - - - - - - - - - - LektorInnen - - - - - - - - - - - - - - - - Studierende - - - - - - - - - - - - - - - - Name - - - Kennzeichen - - - Gruppe - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Freifach - - - Fachhochschulstudiengang - - - - Lorem ipsum dolor sit amet, consetetur sadipscing elitr, sed diam nonumy eirmod tempor invidunt ut labore et dolore magna aliquyam erat, sed diam voluptua. At vero eos et accusam et justo duo dolores et ea rebum. Stet clita kasd gubergren, - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Anwesenheitsliste + Gruppen: Studiensemester: + + Monat ___________ + + + + + + + + + + Datum + + + + + + + + + + + + + + + + + + + + + + + Anzahl der abgehaltenen Einheiten + + + + + + + + + + + + + + + + + + + + + + + LektorInnen + + + + + + + + + + + + + + + + Studierende + + + + + + + + + + + + + + + + Name + + + Kennzeichen + + + Gruppe + + + + + + + + + + + + + + + + + + + + + + + + (m) ... männlich + (w) ... weiblich + (x) ... divers + (u) ... unbekannt + + + (i) ... Incoming + (o) ... Outgoing + (ar) ... angerechnet + (iar) ... intern angerechnet + (nz) ... nicht zugelassen + (ma) ... MitarbeiterIn + (a.o.) ... Außerordentliche/r HörerIn + (d.d.) ... Double Degree Program + + + + + Freifach + + + Fachhochschulstudiengang + + + + Fehlt ein/e Student/in länger als 2 Wochen, bitte um einen deutlichen Vermerk auf der Anwesenheitsliste. Die Anwesenheitsliste bitte am Ende des Monats im Sekretariat abgeben! Bitte achten Sie darauf, dass Sie nur VOLLSTÄNDIG AUSGEFÜLLTE LISTEN abgeben! + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + () + + + + + + + + + + + + + + + + - + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + () + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + From 08ebcf591af016bfbcdbf0c05ae1c955a22aa467 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Fri, 16 Dec 2022 11:50:14 +0100 Subject: [PATCH 2/2] Adaptierung Legende Fotoliste --- system/vorlage_zip/fotoliste.odt | Bin 59733 -> 59836 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/system/vorlage_zip/fotoliste.odt b/system/vorlage_zip/fotoliste.odt index 866e4e1ea413ac0dbad16f2c0c616983762738a1..9c18714f524ee606d59c80ba7214ebad005d7a6a 100644 GIT binary patch delta 2918 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