From d4feee89142fc6bcbf1222549b5a088376e87225 Mon Sep 17 00:00:00 2001
From: Cristina <hainberg@technikum-wien.at>
Date: Tue, 18 Mar 2025 14:30:19 +0100
Subject: [PATCH 1/2] Fixed wrong param causing wrong Notenliste for
 Wiederholer

---
 cis/private/lehre/notenliste.xls.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
index 6c8db5246..c525b2d6c 100644
--- a/cis/private/lehre/notenliste.xls.php
+++ b/cis/private/lehre/notenliste.xls.php
@@ -339,7 +339,7 @@ else
 					{
 						$worksheet->write($lines,8, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
-						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $sem);
+						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $stsem);
 						$output2 = $pr->result;
 
 						if ($output2)
@@ -360,7 +360,7 @@ else
 					{
 						$worksheet->write($lines,12, trim($elem->matrikelnr), $format_highlight);
 						$pr = new Pruefung();
-						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $sem);
+						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $stsem);
 						$output3 = $pr->result;
 
 						if ($output3)

From 7cd438d18839d1b059a2934144942baff9b907be Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 10 Mar 2026 11:47:24 +0100
Subject: [PATCH 2/2] Wenn Punkteeingabe aktiviert ist werden auch Punkte in
 der Excel Notenliste exportiert damit es beim Import von Spezialnoten (zb 18)
 nicht zu Problemen kommt

---
 cis/private/lehre/notenliste.xls.php | 41 ++++++++++++++++++----------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
index 6c8db5246..8202302a0 100644
--- a/cis/private/lehre/notenliste.xls.php
+++ b/cis/private/lehre/notenliste.xls.php
@@ -264,7 +264,7 @@ else
 		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
+		tbl_note.lkt_ueberschreibbar, tbl_note.anmerkung, tbl_zeugnisnote.punkte
 	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)
@@ -306,7 +306,14 @@ else
 						&& $elem->von < $stsemdatumbis &&	(anzahlTage($elem->von, $elem->bis) >= 30))
 							$inc.=' (o)';
 
-					$note = $elem->note;
+					if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
+					{
+						$note = $elem->punkte;
+					}
+					else
+					{
+						$note = $elem->note;
+					}
 
 					if($elem->lkt_ueberschreibbar == 'f') // angerechnet / intern angerechnet / nicht zugelassen
 					{
@@ -346,13 +353,16 @@ else
 						{
 							$resultPr = $output2[0];
 							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
-							$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
+							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
+								$worksheet->write($lines,10, $resultPr->punkte, $format_highlightright);
+							else
+								$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
+						}
+						else
+						{
+								$worksheet->write($lines,9, '', $format_highlightright_date);
+								$worksheet->write($lines,10, '', $format_highlightright);
 						}
-                                                else
-                                                {
-                                                        $worksheet->write($lines,9, '', $format_highlightright_date);
-                                                        $worksheet->write($lines,10, '', $format_highlightright);
-                                                }
 					}
 
 					// Nachprüfung
@@ -367,13 +377,16 @@ else
 						{
 							$resultPr = $output3[0];
 							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
-							$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
+							if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE==true)
+								$worksheet->write($lines,14, $resultPr->punkte, $format_highlightright);
+							else
+								$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
+						}
+						else
+						{
+								$worksheet->write($lines,13, '', $format_highlightright_date);
+								$worksheet->write($lines,14, '', $format_highlightright);
 						}
-                                                else
-                                                {
-                                                        $worksheet->write($lines,13, '', $format_highlightright_date);
-                                                        $worksheet->write($lines,14, '', $format_highlightright);
-                                                }
 					}
 
 					$i++;