From 2b2b211470f174e54708da786bb27055ab004238 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Thu, 10 Mar 2022 11:45:05 +0100 Subject: [PATCH 1/4] =?UTF-8?q?=C3=84nderung=20Abfrage?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- include/lehrelisthelper.class.php | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/include/lehrelisthelper.class.php b/include/lehrelisthelper.class.php index e78792732..7624d5531 100644 --- a/include/lehrelisthelper.class.php +++ b/include/lehrelisthelper.class.php @@ -202,9 +202,12 @@ class LehreListHelper $qry = 'SELECT distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr, public.tbl_student.student_uid, tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe, - (SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=tbl_student.prestudent_id ORDER BY datum DESC, insertamum DESC, ext_id DESC LIMIT 1) as status, + (SELECT status_kurzbz FROM public.tbl_prestudentstatus + 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_mobilitaet.mobilitaetstyp_kurzbz, + 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 FROM campus.vw_student_lehrveranstaltung @@ -212,7 +215,9 @@ class LehreListHelper JOIN public.tbl_person USING(person_id) LEFT JOIN public.tbl_student ON(uid=student_uid) LEFT JOIN public.tbl_mitarbeiter ON(uid=mitarbeiter_uid) LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz) - LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id AND tbl_zeugnisnote.student_uid=tbl_student.student_uid AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz) + LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id + AND tbl_zeugnisnote.student_uid=tbl_student.student_uid + AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz) LEFT JOIN lehre.tbl_note USING (note) LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid) LEFT JOIN public.tbl_studiengang ON(tbl_student.studiengang_kz=tbl_studiengang.studiengang_kz) @@ -281,7 +286,8 @@ class LehreListHelper 'gruppe'=>trim($row->gruppe), 'zusatz'=>$zusatz, 'studiengang_kurzbz'=>$row->kurzbzlang, - 'mobilitaetstyp_kurzbz'=>$row->mobilitaetstyp_kurzbz + 'mobilitaetstyp_kurzbz'=>$row->mobilitaetstyp_kurzbz, + 'note'=>$row->note )); } } From 37c29455ef203e42002c60078cbb3501d0c9e301 Mon Sep 17 00:00:00 2001 From: ma0068 Date: Mon, 21 Mar 2022 10:52:19 +0100 Subject: [PATCH 2/4] =?UTF-8?q?intern=20angerechnet=20f=C3=BCr=20Notenlist?= =?UTF-8?q?e=20hinzugef=C3=BCgt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cis/private/lehre/notenliste.xls.php | 19 ++++++++++++++++--- 1 file changed, 16 insertions(+), 3 deletions(-) diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php index 7853600de..c2357baa9 100644 --- a/cis/private/lehre/notenliste.xls.php +++ b/cis/private/lehre/notenliste.xls.php @@ -112,6 +112,12 @@ else $format_highlight->setBorder(1); $format_highlight->setBorderColor('white'); + $format_highlightright=& $workbook->addFormat(); + $format_highlightright->setFgColor(15); + $format_highlightright->setBorder(1); + $format_highlightright->setBorderColor('white'); + $format_highlightright->setAlign('right'); + $format_border_bottom =& $workbook->addFormat(); $format_border_bottom ->setBottom(2); $format_border_bottom->setBold(); @@ -174,7 +180,7 @@ else $qry.=' ORDER BY nachname, vorname'; if($result = $db->db_query($qry)) - { + {center while($row=$db->db_fetch_object($result)) { $worksheet->write($lines,1,"$row->vorname $row->nachname"); @@ -246,15 +252,22 @@ else if($elem->bisio_id!='' && $elem->status!='Incoming' && ($elem->bis > $stsemdatumvon || $elem->bis=='') && $elem->von < $stsemdatumbis) //Outgoing $inc.=' (o)'; + $note = $elem->note; if($elem->note==6) //angerechnet { $inc.=' (ar)'; $note='ar'; } + if ($elem->note == 19) // intern angerechnet + { + $inc .= ' (iar)'; + $note = 'iar'; + } + if ($elem->mobilitaetstyp_kurzbz !='' && $elem->doubledegree == 1) //dd-Program { - $inc.=' (d.d.)'; + $inc .=' (d.d.)'; } $worksheet->write($lines,1,$elem->uid); @@ -262,7 +275,7 @@ else $worksheet->write($lines,3,$elem->vorname); $worksheet->write($lines,4,'="'.$elem->semester.$elem->verband.$elem->gruppe.'"'); $worksheet->write($lines,5,'="'.trim($elem->matrikelnr).'"',$format_highlight); - $worksheet->write($lines,6,$note,$format_highlight); + $worksheet->write($lines,6, $note, $format_highlightright); $i++; $lines++; } From f87671ac4f00ea4a0a491cbd074ca19874d79fbb Mon Sep 17 00:00:00 2001 From: ma0068 Date: Wed, 23 Mar 2022 16:34:25 +0100 Subject: [PATCH 3/4] fix typo --- cis/private/lehre/notenliste.xls.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php index c2357baa9..f4d8ebb20 100644 --- a/cis/private/lehre/notenliste.xls.php +++ b/cis/private/lehre/notenliste.xls.php @@ -180,7 +180,7 @@ else $qry.=' ORDER BY nachname, vorname'; if($result = $db->db_query($qry)) - {center + { while($row=$db->db_fetch_object($result)) { $worksheet->write($lines,1,"$row->vorname $row->nachname"); From 29c0fc54e517ac2073c39c69e90e0aa522f83e3c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= Date: Wed, 13 Apr 2022 11:35:02 +0200 Subject: [PATCH 4/4] =?UTF-8?q?Nicht=20=C3=9Cberschreibbare=20Noten=20werd?= =?UTF-8?q?en=20generisch=20auf=20der=20Notenliste=20angedruckt=20statt=20?= =?UTF-8?q?hartcodiert?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- cis/private/lehre/notenliste.xls.php | 56 ++++++++++++++-------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php index f4d8ebb20..ab41e2d2e 100644 --- a/cis/private/lehre/notenliste.xls.php +++ b/cis/private/lehre/notenliste.xls.php @@ -206,27 +206,32 @@ else $stsemdatumvon = $stsem_obj->start; $stsemdatumbis = $stsem_obj->ende; - $qry = "SELECT - distinct on(nachname, vorname, person_id) vorname, nachname, matrikelnr, person_id, tbl_student.student_uid as uid, - tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe, - (SELECT status_kurzbz - FROM public.tbl_prestudentstatus - 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.bis, tbl_bisio.von, - tbl_zeugnisnote.note,tbl_mobilitaet.mobilitaetstyp_kurzbz, - (CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree - FROM campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid) - JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid) - LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz) - LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id - AND tbl_zeugnisnote.student_uid=tbl_student.student_uid - AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz) - LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid) - LEFT JOIN bis.tbl_mobilitaet USING(prestudent_id) + $qry = " + SELECT + distinct on(nachname, vorname, person_id) + vorname, nachname, matrikelnr, person_id, tbl_student.student_uid as uid, + tbl_studentlehrverband.semester, tbl_studentlehrverband.verband, tbl_studentlehrverband.gruppe, + (SELECT status_kurzbz + FROM public.tbl_prestudentstatus + 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.bis, tbl_bisio.von, + tbl_zeugnisnote.note,tbl_mobilitaet.mobilitaetstyp_kurzbz, + (CASE WHEN bis.tbl_mobilitaet.studiensemester_kurzbz = vw_student_lehrveranstaltung.studiensemester_kurzbz THEN '1' ELSE '' END) as doubledegree, + tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung + FROM + campus.vw_student_lehrveranstaltung JOIN public.tbl_benutzer USING(uid) + JOIN public.tbl_person USING(person_id) JOIN public.tbl_student ON(uid=student_uid) + LEFT JOIN public.tbl_studentlehrverband USING(student_uid,studiensemester_kurzbz) + LEFT JOIN lehre.tbl_zeugnisnote on(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id + AND tbl_zeugnisnote.student_uid=tbl_student.student_uid + AND tbl_zeugnisnote.studiensemester_kurzbz=tbl_studentlehrverband.studiensemester_kurzbz) + LEFT JOIN bis.tbl_bisio ON(uid=tbl_bisio.student_uid) + LEFT JOIN bis.tbl_mobilitaet USING(prestudent_id) + LEFT JOIN lehre.tbl_note USING(note) WHERE - vw_student_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." AND - vw_student_lehrveranstaltung.studiensemester_kurzbz=".$db->db_add_param($stsem);";"; + vw_student_lehrveranstaltung.lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER)." + AND vw_student_lehrveranstaltung.studiensemester_kurzbz=".$db->db_add_param($stsem);";"; if($lehreinheit_id!='') $qry.=" AND vw_student_lehrveranstaltung.lehreinheit_id=".$db->db_add_param($lehreinheit_id, FHC_INTEGER); @@ -253,16 +258,11 @@ else $inc.=' (o)'; $note = $elem->note; - if($elem->note==6) //angerechnet - { - $inc.=' (ar)'; - $note='ar'; - } - if ($elem->note == 19) // intern angerechnet + if($elem->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen { - $inc .= ' (iar)'; - $note = 'iar'; + $inc.= '('. $elem->anmerkung. ')'; + $note = $elem->anmerkung; } if ($elem->mobilitaetstyp_kurzbz !='' && $elem->doubledegree == 1) //dd-Program