From 9b3b571bd9127dc5e18dcc806574107e53f7218b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 6 Oct 2022 08:55:11 +0200
Subject: [PATCH 001/175] Erweiterung Phrasen

---
 locale/de-AT/benotungstool.php | 1 +
 locale/en-US/benotungstool.php | 1 +
 2 files changed, 2 insertions(+)

diff --git a/locale/de-AT/benotungstool.php b/locale/de-AT/benotungstool.php
index 3c8063936..a38aa31f3 100644
--- a/locale/de-AT/benotungstool.php
+++ b/locale/de-AT/benotungstool.php
@@ -171,6 +171,7 @@ $this->phrasen['benotungstool/zeunis']='Zeugnis';
 $this->phrasen['benotungstool/handbuch']='Handbuch';
 $this->phrasen['benotungstool/punkte']='Punkte';
 $this->phrasen['benotungstool/importAnweisung']='Kopieren Sie die Spalten Personenkennzeichen und Note aus der Notenliste (bzw. StudentenUid und Note aus dem MoodleExport) und fügen Sie diese in folgendes Feld ein';
+$this->phrasen['benotungstool/importAnweisungNachp']='Kopieren Sie die Spalten Personenkennzeichen, Datum und Note aus der Notenliste (bzw. StudentenUid, Datum und Note aus dem MoodleExport) und fügen Sie diese in folgendes Feld ein';
 $this->phrasen['benotungstool/pruefung']='Prüfung';
 $this->phrasen['benotungstool/notenlisteImport']='Notenliste für den LV-Noten-Import (Excel)';
 $this->phrasen['benotungstool/bearbeitetvon']='Bearbeitet von';
diff --git a/locale/en-US/benotungstool.php b/locale/en-US/benotungstool.php
index 17f78d2ba..72f29256e 100644
--- a/locale/en-US/benotungstool.php
+++ b/locale/en-US/benotungstool.php
@@ -170,6 +170,7 @@ $this->phrasen['benotungstool/zeunis']='Transcript';
 $this->phrasen['benotungstool/handbuch']='Handbook';
 $this->phrasen['benotungstool/punkte']='Points';
 $this->phrasen['benotungstool/importAnweisung']='Copy the columns "personal identifier" and "grade" from the grade list (or "student ID number" and "grade" from the moodle export file) and insert them in the following field';
+$this->phrasen['benotungstool/importAnweisungNachp']='Copy the columns "personal identifier", "date" and "grade" from the grade list (or "student ID number", "date" and "grade" from the moodle export file) and insert them in the following field';
 $this->phrasen['benotungstool/pruefung']='Examination';
 $this->phrasen['benotungstool/notenlisteImport']='Grade list for the subject grade import (Excel)';
 $this->phrasen['benotungstool/geaenderteNotenVorhanden']='There are changed grades. Please send the changes to the assistant by clicking "Approval"';

From 54411f4de776fe238e6bd78d5b570f5f1e371bfb Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 12 Oct 2022 15:06:07 +0200
Subject: [PATCH 002/175] Benotungstool: Importfunktion Termin2

---
 .../benotungstool/lvgesamtnoteverwalten.php   | 144 ++++++-
 .../benotungstool/nachpruefungeintragen.php   | 390 +++++++++++-------
 2 files changed, 392 insertions(+), 142 deletions(-)

diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
index 916f2b4e3..6a160c646 100644
--- a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
+++ b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
@@ -402,6 +402,7 @@ foreach ($noten_obj->result as $row)
 			url += '&typ='+typ;
 			url += '&'+ts;
 
+
 			$.ajax({
 				type:"GET",
 				url: url,
@@ -602,6 +603,42 @@ foreach ($noten_obj->result as $row)
 		$('#noteimporttextarea').focus();
 	}
 
+	// ****
+	// * Oeffnet ein Fenster fuer den Import von Noten für die Nachprüfung aus dem Excel
+	// ****
+	function GradeImportNachp()
+	{
+		var str = "<form name='gradeimportNachp_form'><center><table style='width: 95%'>";
+		str += "<tr><td colspan='2' align='right'><a href='#' onclick='closeDiv();'>X</a></td></tr>";
+		var anlegendiv = document.getElementById("nachpruefung_div");
+		var y = getOffset('y'); y = y+50; anlegendiv.style.top = y+"px";
+		str += '<tr><td><?php echo $p->t('benotungstool/importAnweisungNachp');?>:</td>';
+		str	+= '<td></td><tr><td><textarea id="noteimporttextareaNachp" name="notenimportNachp"></textarea></td></tr>';
+		str += "<tr><td><input type='button' name='speichern' value='<?php echo $p->t('global/speichern');?>' onclick='saveGradeBulkNachp(\"Termin2\");'>";
+		str += "</td><td></td></tr></table></center></form>";
+		anlegendiv.innerHTML = str;
+		anlegendiv.style.visibility = "visible";
+		$('#noteimporttextareaNachp').focus();
+	}
+
+	// ****
+	// * Oeffnet ein Fenster fuer den Import von Noten für Termin3 aus dem Excel
+	// ****
+	function GradeImportTermin3()
+	{
+		var str = "<form name='gradeimportNachp_form'><center><table style='width: 95%'>";
+		str += "<tr><td colspan='2' align='right'><a href='#' onclick='closeDiv();'>X</a></td></tr>";
+		var anlegendiv = document.getElementById("nachpruefung_div");
+		var y = getOffset('y'); y = y+50; anlegendiv.style.top = y+"px";
+		str += '<tr><td><?php echo $p->t('benotungstool/importAnweisungNachp');?>:</td>';
+		str	+= '<td></td><tr><td><textarea id="noteimporttextareaNachp" name="notenimportNachp"></textarea></td></tr>';
+		str += "<tr><td><input type='button' name='speichern' value='<?php echo $p->t('global/speichern');?>' onclick='saveGradeBulkNachp(\"Termin3\");'>";
+		str += "</td><td></td></tr></table></center></form>";
+		anlegendiv.innerHTML = str;
+		anlegendiv.style.visibility = "visible";
+		$('#noteimporttextareaTermin3').focus();
+	}
+
 	// Speichert die Noten ueber den Import
 	function saveGradeBulk()
 	{
@@ -698,6 +735,105 @@ foreach ($noten_obj->result as $row)
 		}
 	}
 
+	// Speichert die Noten der Nachprüfung ueber den Import
+	function saveGradeBulkNachp(typ)
+	{
+		data = $('#noteimporttextareaNachp').val();
+		closeDiv();
+
+		//Reihen ermitteln
+		var rows = data.split("\n");
+		var i=0;
+		var params='';
+		alertMsg = '';
+
+		var gradedata = {};
+		var validGrades = '';
+
+		<?php
+		// If CIS_GESAMTNOTE_PUNKTE is false, check for valid grades
+		// Fill Array $gradesArray with valid grades
+		if (CIS_GESAMTNOTE_PUNKTE == false)
+		{
+			$gradesArray = array();
+			foreach ($noten_obj->result as $row_note)
+			{
+				if ($row_note->lehre && $row_note->aktiv)
+					$gradesArray[] = '"' . $row_note->anmerkung . '"';
+			}
+			// Output JS variable with valid grades
+			echo 'var validGrades = [' . implode(',', $gradesArray) . '];';
+		}
+		?>
+
+		for(row in rows)
+		{
+			zeile = rows[row].split("	");
+
+			<?php
+			// If CIS_GESAMTNOTE_PUNKTE is false, check for valid grades
+			if (CIS_GESAMTNOTE_PUNKTE == false)
+				echo '	// check for valid grades
+				if (validGrades.indexOf(zeile[2]) === -1 && typeof(zeile[2]) != "undefined" && zeile[2] != "")
+				{
+					alertMsg = alertMsg+"Die Note "+zeile[2]+" ist nicht zulaessig. Die Zeile wurde uebersprungen. \n";
+					continue;
+				}';
+			?>
+
+			if (zeile[0]!='' && zeile[1]!='' && zeile[2]!='')
+			{
+				gradedata['student_uid_'+i]=zeile[0];
+				gradedata['datumNachp_'+i]=zeile[1];
+				<?php
+				if (CIS_GESAMTNOTE_PUNKTE)
+					echo "gradedata['punkte_'+i]= zeile[2];";
+				else
+					echo "gradedata['note_'+i]= zeile[2];";
+				?>
+
+				i++;
+			}
+		}
+
+		if (alertMsg != "")
+			alert(alertMsg);
+
+		if (i>0)
+		{
+
+			var jetzt = new Date();
+			var ts = jetzt.getTime();
+			var url= '<?php echo "nachpruefungeintragen.php?lvid=".urlencode($lvid)."&stsem=".urlencode($stsem); ?>';
+			url += '&sammel=1';
+			url += '&typ=' + typ;
+			url += '&submit=1&'+ts;
+			$.ajax({
+				type:"POST",
+				url: url,
+				data: gradedata,
+				success:function(result)
+				{
+					var resp = result;
+					if (resp!='')
+					{
+						alert(resp);
+					}
+					window.location.reload();
+					},
+					error:function(result)
+					{
+						alert('Request Nachprüfung fehlgeschlagen');
+					}
+				});
+
+		}
+		else
+		{
+			alert('<?php echo $p->t('benotungstool/hilfeImport');?>');
+		}
+	}
+
 //-->
 </script>
 </head>
@@ -1052,11 +1188,15 @@ $htmlstring .= "<th>" . $p->t('benotungstool/punkte') . ' / ' . $p->t('benotungs
 
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
 {
-	$htmlstring .= "<th colspan='2'>" . $p->t('benotungstool/nachpruefung') . "</th>";
+	$htmlstring .= "<th colspan='2'><br>" . $p->t('benotungstool/nachpruefung') . "<br>
+	<input type='button' onclick='GradeImportNachp()' value='" . $p->t('benotungstool/importieren') . "'>
+	</th>";
 }
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 {
-	$htmlstring .= "<th colspan='2' nowrap>" . $p->t('benotungstool/nachpruefung2') . "</th>";
+	$htmlstring .= "<th colspan='2' nowrap><br>" . $p->t('benotungstool/nachpruefung') . "<br>
+	<input type='button' onclick='GradeImportTermin3()' value='" . $p->t('benotungstool/importieren') . "'>
+	</th>";
 }
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF') && CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF)
 {
diff --git a/cis/private/lehre/benotungstool/nachpruefungeintragen.php b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
index 0ad985e76..81545a7f6 100644
--- a/cis/private/lehre/benotungstool/nachpruefungeintragen.php
+++ b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
@@ -41,10 +41,15 @@ require_once('../../../../include/benutzerfunktion.class.php');
 require_once('../../../../include/benutzer.class.php');
 require_once('../../../../include/student.class.php');
 require_once('../../../../include/notenschluessel.class.php');
+require_once('../../../../include/phrasen.class.php');
+
 
 if (!$db = new basis_db())
 	die('Fehler beim Herstellen der Datenbankverbindung');
 
+$sprache = getSprache();
+$p = new phrasen($sprache);
+
 $user = get_uid();
 
 if(!check_lektor($user))
@@ -52,6 +57,7 @@ if(!check_lektor($user))
 
 
 $lehreinheit_id='';
+$lehreinheit_id_pr='';
 
 if(isset($_GET['lvid']) && is_numeric($_GET['lvid'])) //Lehrveranstaltung_id
 	$lvid = $_GET['lvid'];
@@ -62,60 +68,17 @@ if(isset($_GET['lehreinheit_id']) && is_numeric($_GET['lehreinheit_id'])) //Lehr
 	$lehreinheit_id = $_GET['lehreinheit_id'];
 
 if(isset($_GET['lehreinheit_id_pr']) && is_numeric($_GET['lehreinheit_id_pr'])) //Lehreinheit_id der pruefung
-	$lehreinheit_id = $_GET['lehreinheit_id_pr'];
-
-if(isset($_GET['datum']))
-{
-	$datum = $_GET['datum'];
-	$datum_obj = new datum();
-	$datum = $datum_obj->checkformatDatum($datum, 'Y-m-d', true) OR die('Invalid date format');
-}
-else
-	die('Fehlerhafte Parameteruebergabe');
-
-//Laden der Lehrveranstaltung
-$lv_obj = new lehrveranstaltung();
-if(!$lv_obj->load($lvid))
-	die($lv_obj->errormsg);
-
-//Studiengang laden
-$stg_obj = new studiengang($lv_obj->studiengang_kz);
+	$lehreinheit_id_pr = $_GET['lehreinheit_id_pr'];
 
 if(isset($_GET['stsem']))
 	$stsem = $_GET['stsem'];
 else
 	$stsem = '';
-
-$uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:'');
-$uid = (isset($_GET['uid'])?$_GET['uid']:'');
-
 //Studiensemester laden
 $stsem_obj = new studiensemester();
 if($stsem=='')
 	$stsem = $stsem_obj->getaktorNext();
 
-$student_uid = $_REQUEST["student_uid"];
-
-$note = $_REQUEST["note"];
-if(isset($_REQUEST['punkte']))
-	$punkte = $_REQUEST['punkte'];
-else
-	$punkte = '';
-
-$punkte = str_replace(',','.',$punkte);
-
-if($punkte!='')
-{
-	// Bei Punkteeingabe wird die Note nochmals geprueft und ggf korrigiert
-	$notenschluessel = new notenschluessel();
-	$note_pruef = $notenschluessel->getNote($punkte, $lvid, $stsem);
-	if($note_pruef!=$note)
-	{
-		$note = $note_pruef;
-		$note_dirty=true;
-	}
-}
-
 if(!isset($_GET['typ']))
 {
 	$typ='Termin2';
@@ -128,16 +91,151 @@ else
 		die('Typ ist ungueltig');
 }
 
-if($note=='')
-	$note = 9;
-
-$old_note = $note;
-
-// lvgesamtnote für studenten speichern
-if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '')  )
+if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
+{
+	foreach ($_POST as $row=>$val)
+	{
+		if(mb_strstr(mb_strtolower($row), 'student_uid_'))
+		{
+			$id=mb_substr($row, mb_strlen('student_uid_'));
+
+			$student_uid = $_POST['student_uid_'.$id];
+			$note = null;
+			$punkte = null;
+			$datum = null;
+			if(isset($_POST['note_'.$id]))
+				$note = $_POST['note_'.$id];
+			elseif(isset($_POST['punkte_'.$id]))
+				$punkte = $_POST['punkte_'.$id];
+			else
+			{
+				$response.="\nNote oder Punkte fehlen";
+				continue;
+			}
+			$punkte=str_replace(',','.', $punkte);
+
+			$datum = $_POST['datumNachp_'.$id];
+
+			// //check ob Matrikelnummer anstelle der student_uid übergeben wurde
+			//
+			//
+			// $student = new student();
+			//
+			//
+			// $response2 = true;
+			// if (!$student->checkIfValidStudentUID($student_uid))
+			// {
+			// 	//UID ermitteln
+			// 	if(!$student_uid = $student->getUidFromMatrikelnummer($student_uid))
+			// 	{
+			// 		$response2 = false;
+			// 		$response2.="\n".$p->t('benotungstool/studentMitMatrikelnummerExistiertNicht',array($student_uid));
+			// 		continue;
+			// 	}
+			// }
+
+
+			$lehreinheit_id = getLehreinheit($db, $lvid, $student_uid, $stsem);
+
+			if(isset($_POST['student_uid_'.$id]) && (isset($_POST['note_'.$id]) || isset($_POST['punkte_'.$id])) && isset($_POST['datumNachp_'.$id]))
+			{
+				// echo "\ndb " . " lvid ". $lvid . " note " . $note . " student_uid " . $student_uid . " datum " . $datum . " studiensem " .
+				// $stsem . " lehreinheit_id_pr " . $lehreinheit_id . " typ " . $typ .  "\n";
+
+				$response = savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ, $note, $punkte);
+
+				echo "\ndb " . " lvid ". $lvid . " note " . $note . " student_uid " . $student_uid . " datum " . $datum . " studiensem " .
+				$stsem . " lehreinheit_id_pr " . $lehreinheit_id . " typ " . $typ . " response" . $response . "\n";
+		//		echo $response;
+
+			}
+			else
+			{
+				echo "\n fehlende oder fehlerhafte Inputparameter";
+			}
+		}
+	}
+
+}
+else
+{
+	// Einzelupdate
+
+	if(isset($_GET['datum']) )
+	{
+		$datum = $_GET['datum'];
+		$datum_obj = new datum();
+		$datum = $datum_obj->checkformatDatum($datum, 'Y-m-d', true) OR die('Invalid date format');
+	}
+
+	// 	echo "Variante Einzel";
+	else
+		die('Fehlerhafte Parameteruebergabe');
+
+	$student_uid = $_REQUEST["student_uid"];
+
+	$note = $_REQUEST["note"];
+	if(isset($_REQUEST['punkte']))
+		$punkte = $_REQUEST['punkte'];
+	else
+		$punkte = '';
+
+	$punkte = str_replace(',','.',$punkte);
+
+	if($punkte!='')
+	{
+		// Bei Punkteeingabe wird die Note nochmals geprueft und ggf korrigiert
+		$notenschluessel = new notenschluessel();
+		$note_pruef = $notenschluessel->getNote($punkte, $lvid, $stsem);
+		if($note_pruef!=$note)
+		{
+			$note = $note_pruef;
+			$note_dirty=true;
+		}
+	}
+
+	if($note=='')
+		$note = 9;
+
+	$old_note = $note;
+
+	//Laden der Lehrveranstaltung
+	$lv_obj = new lehrveranstaltung();
+	if(!$lv_obj->load($lvid))
+		die($lv_obj->errormsg);
+
+	//Studiengang laden
+	$stg_obj = new studiengang($lv_obj->studiengang_kz);
+
+	$uebung_id = (isset($_GET['uebung_id'])?$_GET['uebung_id']:'');
+	$uid = (isset($_GET['uid'])?$_GET['uid']:'');
+
+	// lvgesamtnote für studenten speichern
+	if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '')  )
+	{
+		// Die Pruefung muss einer Lehreinheit zugeordnet werden
+		// deshalb wird hier versucht eine passende Lehreinheit zu ermitteln.
+
+		$lehreinheit_id = getLehreinheit($db, $lvid, $student_uid, $stsem);
+
+		$response = savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ, $note);
+		echo $response;
+	}
+	else
+		echo "Fehler beim Eintragen der Pr&uuml;fungen";
+
+}
+
+/**
+ * Berechnet Lehreinheit auf Basis LV-Daten
+ * @param string $db Datenbankvariable
+ * @param string $student_uid student_uid
+ * @param int $lvid Lehrveranstaltungsid
+ * @param string $stsem Studiensemester im Format 'WSYYYY'
+ * @return String LehreinheitId
+ */
+function getLehreinheit($db, $lvid, $student_uid, $stsem)
 {
-	// Die Pruefung muss einer Lehreinheit zugeordnet werden
-	// deshalb wird hier versucht eine passende Lehreinheit zu ermitteln.
 	$le_arr = array();
 	$qry_stud = "SELECT lehreinheit_id, lehrform_kurzbz
 		FROM
@@ -158,104 +256,117 @@ if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '')  )
 		}
 	}
 
-	if (!in_array($lehreinheit_id,$le_arr))
+	//if (!in_array($lehreinheit_id,$le_arr))
 		$lehreinheit_id = $le_arr[0];
 
+	return $lehreinheit_id;
+}
+
+/**
+ * Prüfung speichern
+ */
+function savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ, $note, $punkte=null)
+{
 	$jetzt = date("Y-m-d H:i:s");
+	global $user; //, $note, $punkte, $datum;
 
-	$pr = new Pruefung();
-
-	// Wenn eine Pruefung angelegt wird, wird  zuerst eine Pruefung mit 1. Termin angelegt
-	// und dort die Zeugnisnote gespeichert
-	if($pr->getPruefungen($student_uid, "Termin1", $lvid, $stsem))
+	if ($typ == "Termin2")
 	{
-		if ($pr->result)
+		$pr = new Pruefung();
+		// Wenn eine Pruefung angelegt wird, wird  zuerst eine Pruefung mit 1. Termin angelegt
+	// und dort die Zeugnisnote gespeichert
+		if($pr->getPruefungen($student_uid, "Termin1", $lvid, $stsem))
 		{
-			$termin1 = 1;
-		}
-		else
-		{
-			$lvnote = new lvgesamtnote();
-			if ($lvnote->load($lvid, $student_uid, $stsem))
+			if ($pr->result)
 			{
-				$pr_note = $lvnote->note;
-				$pr_punkte = $lvnote->punkte;
-				$benotungsdatum = $lvnote->benotungsdatum;
+				$termin1 = 1;
 			}
 			else
 			{
-				$pr_note = 9;
-				$pr_punkte = '';
-				$benotungsdatum = $jetzt;
+				$lvnote = new lvgesamtnote();
+				if ($lvnote->load($lvid, $student_uid, $stsem))
+				{
+					$pr_note = $lvnote->note;
+					$pr_punkte = $lvnote->punkte;
+					$benotungsdatum = $lvnote->benotungsdatum;
+				}
+				else
+				{
+					$pr_note = 9;
+					$pr_punkte = '';
+					$benotungsdatum = $jetzt;
+				}
+
+				$pr_1 = new Pruefung();
+				$pr_1->lehreinheit_id = $lehreinheit_id;
+				$pr_1->student_uid = $student_uid;
+				$pr_1->mitarbeiter_uid = $user;
+				$pr_1->note = $pr_note;
+				$pr_1->punkte = $pr_punkte;
+				$pr_1->pruefungstyp_kurzbz = "Termin1";
+				$pr_1->datum = $benotungsdatum;
+				$pr_1->anmerkung = "";
+				$pr_1->insertamum = $jetzt;
+				$pr_1->insertvon = $user;
+				$pr_1->updateamum = null;
+				$pr_1->updatevon = null;
+				$pr_1->ext_id = null;
+				$pr_1->new = true;
+				$pr_1->save();
+				$response = "neu T1";
 			}
 
-			$pr_1 = new Pruefung();
-			$pr_1->lehreinheit_id = $lehreinheit_id;
-			$pr_1->student_uid = $student_uid;
-			$pr_1->mitarbeiter_uid = $user;
-			$pr_1->note = $pr_note;
-			$pr_1->punkte = $pr_punkte;
-			$pr_1->pruefungstyp_kurzbz = "Termin1";
-			$pr_1->datum = $benotungsdatum;
-			$pr_1->anmerkung = "";
-			$pr_1->insertamum = $jetzt;
-			$pr_1->insertvon = $user;
-			$pr_1->updateamum = null;
-			$pr_1->updatevon = null;
-			$pr_1->ext_id = null;
-			$pr_1->new = true;
-			$pr_1->save();
+			$prTermin2 = new Pruefung();
+			$pr_2 = new Pruefung();
+
+			// Die Pruefung wird als Termin2 eingetragen
+			if ($prTermin2->getPruefungen($student_uid, 'Termin2', $lvid, $stsem))
+			{
+				if	($prTermin2->result)
+				{
+					$pr_2->load($prTermin2->result[0]->pruefung_id);
+					$pr_2->new = null;
+					$pr_2->updateamum = $jetzt;
+					$pr_2->updatevon = $user;
+					$old_note = $pr_2->note;
+					$pr_2->note = $note;
+					$pr_2->punkte = $punkte;
+					$pr_2->datum = $datum;
+					$pr_2->anmerkung = "";
+					$response = "update T2";
+				}
+				else
+				{
+					$pr_2->lehreinheit_id = $lehreinheit_id;
+					$pr_2->student_uid = $student_uid;
+					$pr_2->mitarbeiter_uid = $user;
+					$pr_2->note = $note;
+					$pr_2->punkte = $punkte;
+					$pr_2->pruefungstyp_kurzbz = $typ;
+					$pr_2->datum = $datum;
+					$pr_2->anmerkung = "";
+					$pr_2->insertamum = $jetzt;
+					$pr_2->insertvon = $user;
+					$pr_2->updateamum = null;
+					$pr_2->updatevon = null;
+					$pr_2->ext_id = null;
+					$pr_2->new = true;
+					$old_note = -1;
+					$response = "new T2";
+				}
+				$pr_2->save();
+			}
 		}
 	}
-
-
-	$prTermin2 = new Pruefung();
-	$pr_2 = new Pruefung();
-
-	// Die Pruefung wird als Termin2 eingetragen
-	if ($prTermin2->getPruefungen($student_uid, $typ, $lvid, $stsem))
+	else
 	{
-		if	($prTermin2->result)
-		{
-			$pr_2->load($prTermin2->result[0]->pruefung_id);
-			$pr_2->new = null;
-			$pr_2->updateamum = $jetzt;
-			$pr_2->updatevon = $user;
-			$old_note = $pr_2->note;
-			$pr_2->note = $note;
-			$pr_2->punkte = $punkte;
-			$pr_2->datum = $datum;
-			$pr_2->anmerkung = "";
-		}
-		else
-		{
-			$pr_2->lehreinheit_id = $lehreinheit_id;
-			$pr_2->student_uid = $student_uid;
-			$pr_2->mitarbeiter_uid = $user;
-			$pr_2->note = $note;
-			$pr_2->punkte = $punkte;
-			$pr_2->pruefungstyp_kurzbz = $typ;
-			$pr_2->datum = $datum;
-			$pr_2->anmerkung = "";
-			$pr_2->insertamum = $jetzt;
-			$pr_2->insertvon = $user;
-			$pr_2->updateamum = null;
-			$pr_2->updatevon = null;
-			$pr_2->ext_id = null;
-			$pr_2->new = true;
-			$old_note = -1;
-		}
-		$pr_2->save();
+		$response = "no existing T3";
 	}
 
-
-	// Wenn eine Pruefung eingetragen wird, wird danach die LV-Note korrigiert
-	$jetzt = date("Y-m-d H:i:s");
-
-	$lvid = $_REQUEST["lvid"];
+	//Gesamtnote updaten
 	$lvgesamtnote = new lvgesamtnote();
-    if (!$lvgesamtnote->load($lvid, $student_uid, $stsem))
-    {
+	if (!$lvgesamtnote->load($lvid, $student_uid, $stsem))
+	{
 		$lvgesamtnote->student_uid = $student_uid;
 		$lvgesamtnote->lehrveranstaltung_id = $lvid;
 		$lvgesamtnote->studiensemester_kurzbz = $stsem;
@@ -272,9 +383,9 @@ if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '')  )
 		$lvgesamtnote->insertvon = $user;
 		$new = true;
 		$response = "neu";
-    }
-    else
-    {
+	}
+	else
+	{
 		$lvgesamtnote->note = $note;
 		$lvgesamtnote->punkte = $punkte;
 		$lvgesamtnote->benotungsdatum = $jetzt;
@@ -286,12 +397,11 @@ if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '')  )
 		else
 			$response = "update";
 	}
+
 	if (!$lvgesamtnote->save($new))
-		echo "<span class='error'>".$lvgesamtnote->errormsg."</span>";
+		return $lvgesamtnote->errormsg;
 	else
-		echo $response;
+		return $response;
 }
-else
-	echo "Fehler beim Eintragen der Pr&uuml;fungen";
 
 ?>

From 035d196ae5cb45b44a4f2f863e7bf5fd0ddbe872 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 13 Oct 2022 08:04:10 +0200
Subject: [PATCH 003/175] Logik Matrikelnummer StudentenId

---
 .../benotungstool/nachpruefungeintragen.php   | 34 +++++++++----------
 1 file changed, 16 insertions(+), 18 deletions(-)

diff --git a/cis/private/lehre/benotungstool/nachpruefungeintragen.php b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
index 81545a7f6..d1a7e2326 100644
--- a/cis/private/lehre/benotungstool/nachpruefungeintragen.php
+++ b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
@@ -99,6 +99,8 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 		{
 			$id=mb_substr($row, mb_strlen('student_uid_'));
 
+			$response2 = '';
+
 			$student_uid = $_POST['student_uid_'.$id];
 			$note = null;
 			$punkte = null;
@@ -115,24 +117,21 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 			$punkte=str_replace(',','.', $punkte);
 
 			$datum = $_POST['datumNachp_'.$id];
+			$datum_obj = new datum();
+			$datum = $datum_obj->checkformatDatum($datum, 'Y-m-d', true) OR die('Invalid date format');
 
 			// //check ob Matrikelnummer anstelle der student_uid übergeben wurde
-			//
-			//
-			// $student = new student();
-			//
-			//
-			// $response2 = true;
-			// if (!$student->checkIfValidStudentUID($student_uid))
-			// {
-			// 	//UID ermitteln
-			// 	if(!$student_uid = $student->getUidFromMatrikelnummer($student_uid))
-			// 	{
-			// 		$response2 = false;
-			// 		$response2.="\n".$p->t('benotungstool/studentMitMatrikelnummerExistiertNicht',array($student_uid));
-			// 		continue;
-			// 	}
-			// }
+
+			$student = new student();
+			if (!$student->checkIfValidStudentUID($student_uid))
+			{
+				//UID ermitteln
+				if(!$student_uid = $student->getUidFromMatrikelnummer($student_uid))
+				{
+					$response2.="\n".$p->t('benotungstool/studentMitMatrikelnummerExistiertNicht',array($student_uid));
+					continue;
+				}
+			}
 
 
 			$lehreinheit_id = getLehreinheit($db, $lvid, $student_uid, $stsem);
@@ -146,7 +145,7 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 
 				echo "\ndb " . " lvid ". $lvid . " note " . $note . " student_uid " . $student_uid . " datum " . $datum . " studiensem " .
 				$stsem . " lehreinheit_id_pr " . $lehreinheit_id . " typ " . $typ . " response" . $response . "\n";
-		//		echo $response;
+				echo $response2;
 
 			}
 			else
@@ -168,7 +167,6 @@ else
 		$datum = $datum_obj->checkformatDatum($datum, 'Y-m-d', true) OR die('Invalid date format');
 	}
 
-	// 	echo "Variante Einzel";
 	else
 		die('Fehlerhafte Parameteruebergabe');
 

From 29fc5181bf237ba65337de647f1180c4d9420b9d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 13 Oct 2022 10:16:26 +0200
Subject: [PATCH 004/175] Importfunktion Termin3

---
 .../benotungstool/lvgesamtnoteverwalten.php   |  2 +-
 .../benotungstool/nachpruefungeintragen.php   | 48 +++++++++++++++++--
 2 files changed, 44 insertions(+), 6 deletions(-)

diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
index 6a160c646..80bb7c5a5 100644
--- a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
+++ b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
@@ -1194,7 +1194,7 @@ if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN
 }
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 {
-	$htmlstring .= "<th colspan='2' nowrap><br>" . $p->t('benotungstool/nachpruefung') . "<br>
+	$htmlstring .= "<th colspan='2' nowrap><br>" . $p->t('benotungstool/nachpruefung2') . "<br>
 	<input type='button' onclick='GradeImportTermin3()' value='" . $p->t('benotungstool/importieren') . "'>
 	</th>";
 }
diff --git a/cis/private/lehre/benotungstool/nachpruefungeintragen.php b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
index d1a7e2326..e8553ce7b 100644
--- a/cis/private/lehre/benotungstool/nachpruefungeintragen.php
+++ b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
@@ -120,8 +120,7 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 			$datum_obj = new datum();
 			$datum = $datum_obj->checkformatDatum($datum, 'Y-m-d', true) OR die('Invalid date format');
 
-			// //check ob Matrikelnummer anstelle der student_uid übergeben wurde
-
+			//check ob Matrikelnummer anstelle der student_uid übergeben wurde
 			$student = new student();
 			if (!$student->checkIfValidStudentUID($student_uid))
 			{
@@ -138,9 +137,6 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 
 			if(isset($_POST['student_uid_'.$id]) && (isset($_POST['note_'.$id]) || isset($_POST['punkte_'.$id])) && isset($_POST['datumNachp_'.$id]))
 			{
-				// echo "\ndb " . " lvid ". $lvid . " note " . $note . " student_uid " . $student_uid . " datum " . $datum . " studiensem " .
-				// $stsem . " lehreinheit_id_pr " . $lehreinheit_id . " typ " . $typ .  "\n";
-
 				$response = savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ, $note, $punkte);
 
 				echo "\ndb " . " lvid ". $lvid . " note " . $note . " student_uid " . $student_uid . " datum " . $datum . " studiensem " .
@@ -356,6 +352,48 @@ function savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ
 			}
 		}
 	}
+	elseif ($typ == "Termin3")
+	{
+		$prTermin3 = new Pruefung();
+		$pr_3 = new Pruefung();
+
+		if ($prTermin3->getPruefungen($student_uid, 'Termin3', $lvid, $stsem))
+		{
+			if	($prTermin3->result)
+			{
+				$pr_3->load($prTermin3->result[0]->pruefung_id);
+				$pr_3->new = null;
+				$pr_3->updateamum = $jetzt;
+				$pr_3->updatevon = $user;
+				$old_note = $pr_3->note;
+				$pr_3->note = $note;
+				$pr_3->punkte = $punkte;
+				$pr_3->datum = $datum;
+				$pr_3->anmerkung = "";
+				$response = "Prüfung Termin3 aktualisiert";
+			}
+			else
+			{
+				$pr_3->lehreinheit_id = $lehreinheit_id;
+				$pr_3->student_uid = $student_uid;
+				$pr_3->mitarbeiter_uid = $user;
+				$pr_3->note = $note;
+				$pr_3->punkte = $punkte;
+				$pr_3->pruefungstyp_kurzbz = $typ;
+				$pr_3->datum = $datum;
+				$pr_3->anmerkung = "";
+				$pr_3->insertamum = $jetzt;
+				$pr_3->insertvon = $user;
+				$pr_3->updateamum = null;
+				$pr_3->updatevon = null;
+				$pr_3->ext_id = null;
+				$pr_3->new = true;
+				$old_note = -1;
+				$response = "neue Prüfung Termin3";
+			}
+			$pr_3->save();
+		}
+	}
 	else
 	{
 		$response = "no existing T3";

From ce3cea5515721e933b621cf9f2902ddca5aecf21 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 13 Oct 2022 15:36:08 +0200
Subject: [PATCH 005/175] Validierungen Format Datum, Matrikelnr, StudentId,
 Note

---
 .../benotungstool/lvgesamtnoteverwalten.php   | 61 +++++++++----------
 .../benotungstool/nachpruefungeintragen.php   | 51 +++++++---------
 locale/de-AT/benotungstool.php                |  4 +-
 locale/en-US/benotungstool.php                |  1 +
 4 files changed, 56 insertions(+), 61 deletions(-)

diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
index 80bb7c5a5..8a428ff2a 100644
--- a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
+++ b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
@@ -20,33 +20,33 @@
  * Gerald Simane-Sequens < gerald.simane-sequens@technikum-wien.at >
  * Manuela Thamer <manuela.thamer@technikum-wien.at>
  */
-require_once ('../../../../config/cis.config.inc.php');
-require_once ('../../../../config/global.config.inc.php');
-require_once ('../../../../include/functions.inc.php');
-require_once ('../../../../include/lehrveranstaltung.class.php');
-require_once ('../../../../include/studiengang.class.php');
-require_once ('../../../../include/studiensemester.class.php');
-require_once ('../../../../include/lehreinheit.class.php');
-require_once ('../../../../include/benutzerberechtigung.class.php');
-require_once ('../../../../include/uebung.class.php');
-require_once ('../../../../include/beispiel.class.php');
-require_once ('../../../../include/studentnote.class.php');
-require_once ('../../../../include/datum.class.php');
-require_once ('../../../../include/legesamtnote.class.php');
-require_once ('../../../../include/lvgesamtnote.class.php');
-require_once ('../../../../include/zeugnisnote.class.php');
-require_once ('../../../../include/pruefung.class.php');
-require_once ('../../../../include/person.class.php');
-require_once ('../../../../include/benutzer.class.php');
-require_once ('../../../../include/mitarbeiter.class.php');
-require_once ('../../../../include/mail.class.php');
-require_once ('../../../../include/phrasen.class.php');
-require_once ('../../../../include/note.class.php');
-require_once ('../../../../include/notenschluessel.class.php');
-require_once ('../../../../include/studienplan.class.php');
-require_once ('../../../../include/addon.class.php');
-require_once ('../../../../include/mobilitaet.class.php');
-require_once ('../../../../include/student.class.php');
+require_once('../../../../config/cis.config.inc.php');
+require_once('../../../../config/global.config.inc.php');
+require_once('../../../../include/functions.inc.php');
+require_once('../../../../include/lehrveranstaltung.class.php');
+require_once('../../../../include/studiengang.class.php');
+require_once('../../../../include/studiensemester.class.php');
+require_once('../../../../include/lehreinheit.class.php');
+require_once('../../../../include/benutzerberechtigung.class.php');
+require_once('../../../../include/uebung.class.php');
+require_once('../../../../include/beispiel.class.php');
+require_once('../../../../include/studentnote.class.php');
+require_once('../../../../include/datum.class.php');
+require_once('../../../../include/legesamtnote.class.php');
+require_once('../../../../include/lvgesamtnote.class.php');
+require_once('../../../../include/zeugnisnote.class.php');
+require_once('../../../../include/pruefung.class.php');
+require_once('../../../../include/person.class.php');
+require_once('../../../../include/benutzer.class.php');
+require_once('../../../../include/mitarbeiter.class.php');
+require_once('../../../../include/mail.class.php');
+require_once('../../../../include/phrasen.class.php');
+require_once('../../../../include/note.class.php');
+require_once('../../../../include/notenschluessel.class.php');
+require_once('../../../../include/studienplan.class.php');
+require_once('../../../../include/addon.class.php');
+require_once('../../../../include/mobilitaet.class.php');
+require_once('../../../../include/student.class.php');
 
 $summe_stud = 0;
 $summe_t2 = 0;
@@ -190,7 +190,7 @@ foreach ($noten_obj->result as $row)
 	$noten_array[$row->note]['lehre'] = $row->lehre;
 	$noten_array[$row->note]['lkt_ueberschreibbar'] = $row->lkt_ueberschreibbar;
 	$noten_array[$row->note]['anmerkung'] = $row->anmerkung;
-	foreach ($sprachen->result AS $s)
+	foreach ($sprachen->result as $s)
 		$noten_array[$row->note]['bezeichnung_mehrsprachig'][$s->sprache] = $row->bezeichnung_mehrsprachig[$s->sprache];
 }
 
@@ -376,7 +376,7 @@ foreach ($noten_obj->result as $row)
 		var datum_test = datum.split(".");
 		if (datum_test[0].length != 2 || datum_test[1].length != 2 	|| datum_test[2].length!=4
 			|| isNaN(datum_test[2]) || datum_test[1]>12 || datum_test[1]<1 || datum_test[0]>31 || datum_test[0]<1)
-			alert("Invalid Date Format: DD.MM.YYYY");
+			alert("Das Datum entspricht nicht dem Format TT.MM.JJJJ!");
 		else
 		{
 			var anlegendiv = document.getElementById("nachpruefung_div");
@@ -939,7 +939,6 @@ if (defined('CIS_ANWESENHEITSLISTE_NOTENLISTE_ANZEIGEN') && CIS_ANWESENHEITSLIST
 {
 	$hrefpath = "../notenliste.xls.php?stg=$stg_obj->studiengang_kz&lvid=$lvid&stsem=$stsem";
 	echo "<br><a class='Item' href='" . $hrefpath . "'>" . $p->t('benotungstool/notenlisteImport') . "</a>";
-
 }
 
 // eingetragene lv-gesamtnoten freigeben
@@ -1333,7 +1332,6 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 	foreach ($grades as $uid => $data)
 	//Ausgabe Array
 	{
-
 		$htmlstring .= '<tr class="liste' . ($i % 2) . '">
 			<td><a href="mailto:' . $uid . '@' . DOMAIN . '"><img src="../../../../skin/images/button_mail.gif"></a></td>
 			<td>' . $db->convert_html_chars($uid) . '</td>
@@ -1465,7 +1463,6 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 			// Punkte
 			if (CIS_GESAMTNOTE_PUNKTE)
 			{
-
 				$htmlstring .= '
 				<input type="text"
 					name="punkte"
diff --git a/cis/private/lehre/benotungstool/nachpruefungeintragen.php b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
index e8553ce7b..307c0ca30 100644
--- a/cis/private/lehre/benotungstool/nachpruefungeintragen.php
+++ b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
@@ -85,7 +85,7 @@ if(!isset($_GET['typ']))
 }
 else
 {
-	if(in_array($_GET['typ'],array('Termin2','Termin3')))
+	if(in_array($_GET['typ'], array('Termin2', 'Termin3')))
 		$typ=$_GET['typ'];
 	else
 		die('Typ ist ungueltig');
@@ -93,14 +93,14 @@ else
 
 if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 {
-	foreach ($_POST as $row=>$val)
+	$errorMatrnr = '';
+	$errorDatum = '';
+	foreach ($_POST as $row => $val)
 	{
 		if(mb_strstr(mb_strtolower($row), 'student_uid_'))
 		{
 			$id=mb_substr($row, mb_strlen('student_uid_'));
 
-			$response2 = '';
-
 			$student_uid = $_POST['student_uid_'.$id];
 			$note = null;
 			$punkte = null;
@@ -114,35 +114,36 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 				$response.="\nNote oder Punkte fehlen";
 				continue;
 			}
-			$punkte=str_replace(',','.', $punkte);
+			$punkte=str_replace(',', '.', $punkte);
 
 			$datum = $_POST['datumNachp_'.$id];
+			//check Datumsformat
+			$checkedDatum = $datum;
 			$datum_obj = new datum();
-			$datum = $datum_obj->checkformatDatum($datum, 'Y-m-d', true) OR die('Invalid date format');
+			if(!$datum = $datum_obj->checkformatDatum($datum, 'Y-m-d', true))
+			{
+				$errorDatum .="\n".$p->t('benotungstool/datumsformatUnzulaessig', array($checkedDatum));
+				continue;
+			}
 
 			//check ob Matrikelnummer anstelle der student_uid übergeben wurde
 			$student = new student();
 			if (!$student->checkIfValidStudentUID($student_uid))
 			{
+				$checkedMatrnr = $student_uid;
 				//UID ermitteln
 				if(!$student_uid = $student->getUidFromMatrikelnummer($student_uid))
 				{
-					$response2.="\n".$p->t('benotungstool/studentMitMatrikelnummerExistiertNicht',array($student_uid));
+					$errorMatrnr.="\n".$p->t('benotungstool/studentMitMatrikelnummerExistiertNicht', array($checkedMatrnr));
 					continue;
 				}
 			}
 
-
 			$lehreinheit_id = getLehreinheit($db, $lvid, $student_uid, $stsem);
 
 			if(isset($_POST['student_uid_'.$id]) && (isset($_POST['note_'.$id]) || isset($_POST['punkte_'.$id])) && isset($_POST['datumNachp_'.$id]))
 			{
 				$response = savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ, $note, $punkte);
-
-				echo "\ndb " . " lvid ". $lvid . " note " . $note . " student_uid " . $student_uid . " datum " . $datum . " studiensem " .
-				$stsem . " lehreinheit_id_pr " . $lehreinheit_id . " typ " . $typ . " response" . $response . "\n";
-				echo $response2;
-
 			}
 			else
 			{
@@ -150,22 +151,18 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 			}
 		}
 	}
-
+	echo $errorMatrnr . $errorDatum;
 }
 else
 {
 	// Einzelupdate
 
-	if(isset($_GET['datum']) )
+	if(isset($_GET['datum']))
 	{
 		$datum = $_GET['datum'];
 		$datum_obj = new datum();
-		$datum = $datum_obj->checkformatDatum($datum, 'Y-m-d', true) OR die('Invalid date format');
+		$datum = $datum_obj->checkformatDatum($datum, 'Y-m-d', true) or die($p->t('benotungstool/datumsformatUnzulaessig', array($checkedDatum)));
 	}
-
-	else
-		die('Fehlerhafte Parameteruebergabe');
-
 	$student_uid = $_REQUEST["student_uid"];
 
 	$note = $_REQUEST["note"];
@@ -174,7 +171,7 @@ else
 	else
 		$punkte = '';
 
-	$punkte = str_replace(',','.',$punkte);
+	$punkte = str_replace(',', '.', $punkte);
 
 	if($punkte!='')
 	{
@@ -205,11 +202,10 @@ else
 	$uid = (isset($_GET['uid'])?$_GET['uid']:'');
 
 	// lvgesamtnote für studenten speichern
-	if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != '')  )
+	if (isset($_REQUEST["submit"]) && ($_REQUEST["student_uid"] != ''))
 	{
 		// Die Pruefung muss einer Lehreinheit zugeordnet werden
 		// deshalb wird hier versucht eine passende Lehreinheit zu ermitteln.
-
 		$lehreinheit_id = getLehreinheit($db, $lvid, $student_uid, $stsem);
 
 		$response = savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ, $note);
@@ -217,7 +213,6 @@ else
 	}
 	else
 		echo "Fehler beim Eintragen der Pr&uuml;fungen";
-
 }
 
 /**
@@ -259,7 +254,7 @@ function getLehreinheit($db, $lvid, $student_uid, $stsem)
 /**
  * Prüfung speichern
  */
-function savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ, $note, $punkte=null)
+function savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ, $note, $punkte = null)
 {
 	$jetzt = date("Y-m-d H:i:s");
 	global $user; //, $note, $punkte, $datum;
@@ -370,7 +365,7 @@ function savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ
 				$pr_3->punkte = $punkte;
 				$pr_3->datum = $datum;
 				$pr_3->anmerkung = "";
-				$response = "Prüfung Termin3 aktualisiert";
+				$response = "update T3";
 			}
 			else
 			{
@@ -389,14 +384,14 @@ function savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ
 				$pr_3->ext_id = null;
 				$pr_3->new = true;
 				$old_note = -1;
-				$response = "neue Prüfung Termin3";
+				$response = "new T3";
 			}
 			$pr_3->save();
 		}
 	}
 	else
 	{
-		$response = "no existing T3";
+		$response = "fehlende oder fehlerhafte Inputparameter";
 	}
 
 	//Gesamtnote updaten
diff --git a/locale/de-AT/benotungstool.php b/locale/de-AT/benotungstool.php
index a38aa31f3..b7c2af638 100644
--- a/locale/de-AT/benotungstool.php
+++ b/locale/de-AT/benotungstool.php
@@ -148,7 +148,9 @@ $this->phrasen['benotungstool/anzahlKommisionellePruefungen']='Anzahl kommission
 $this->phrasen['benotungstool/pruefungAnlegenFuer']='Prüfung anlegen für';
 $this->phrasen['benotungstool/kreuzerltool']='Kreuzerltool';
 $this->phrasen['benotungstool/studentIstLvNichtZugeordnet']='Der Student %s %s (%s) ist dieser Lehrveranstaltung nicht zugeordnet. Die Note wird nicht uebernommen!';
-$this->phrasen['benotungstool/studentMitMatrikelnummerExistiertNicht']='Student mit Matrikelnummer %s existiert nicht.';
+$this->phrasen['benotungstool/studentMitMatrikelnummerExistiertNicht']='Student*in mit Matrikelnummer %s existiert nicht.';
+$this->phrasen['benotungstool/datumsformatUnzulaessig']='Das Datum %s entspricht nicht dem Format TT.MM.JJJJ!';
+$this->phrasen['benotungstool/noteUnzulaessig']='Die Note %s ist nicht zulaessig. Die Zeile wurde uebersprungen.';
 $this->phrasen['benotungstool/noteNichtUeberschreibbar']='Für Student mit Matrikelnummer %s eingetragene Zeugnisote %s ist nicht überschreibbar';
 $this->phrasen['benotungstool/fehlerhafteNoteBeiStudent']='Fehlerhafte Note bei Student %s %s';
 $this->phrasen['benotungstool/keineKreuzerllistenFuerDieseLehrveranstaltung']='Derzeit gibt es keine Kreuzerllisten für diese Lehrveranstaltung';
diff --git a/locale/en-US/benotungstool.php b/locale/en-US/benotungstool.php
index 72f29256e..1f1dc89c6 100644
--- a/locale/en-US/benotungstool.php
+++ b/locale/en-US/benotungstool.php
@@ -148,6 +148,7 @@ $this->phrasen['benotungstool/pruefungAnlegenFuer']='Create an examination for '
 $this->phrasen['benotungstool/kreuzerltool']='"Kreuzerl" tool';
 $this->phrasen['benotungstool/studentIstLvNichtZugeordnet']='Student is not assigned to this course. The grade was not accepted!';
 $this->phrasen['benotungstool/studentMitMatrikelnummerExistiertNicht']='Student with student ID number %s does not exist.';
+$this->phrasen['benotungstool/datumsformatUnzulaessig']='The date %s is not in valid format TT.MM.JJJJ.';
 $this->phrasen['benotungstool/noteNichtUeberschreibbar']='Transcript grade %2$s for student with Personal identifier %1$s is not rewritable';
 $this->phrasen['benotungstool/fehlerhafteNoteBeiStudent']='Incorrect grade for student %s %s';
 $this->phrasen['benotungstool/keineKreuzerllistenFuerDieseLehrveranstaltung']='There are currently no checklists for this course';

From 8754c46575f53bccffdcb1ec2dd6d51923fd0b48 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 17 Oct 2022 14:34:11 +0200
Subject: [PATCH 006/175] Refactor Import Termin2 und Termin3

---
 .../benotungstool/lvgesamtnoteverwalten.php   | 27 ++++---------------
 1 file changed, 5 insertions(+), 22 deletions(-)

diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
index 8a428ff2a..b7bb74d54 100644
--- a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
+++ b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
@@ -606,7 +606,7 @@ foreach ($noten_obj->result as $row)
 	// ****
 	// * Oeffnet ein Fenster fuer den Import von Noten für die Nachprüfung aus dem Excel
 	// ****
-	function GradeImportNachp()
+	function GradeImportNachp(termin)
 	{
 		var str = "<form name='gradeimportNachp_form'><center><table style='width: 95%'>";
 		str += "<tr><td colspan='2' align='right'><a href='#' onclick='closeDiv();'>X</a></td></tr>";
@@ -614,31 +614,14 @@ foreach ($noten_obj->result as $row)
 		var y = getOffset('y'); y = y+50; anlegendiv.style.top = y+"px";
 		str += '<tr><td><?php echo $p->t('benotungstool/importAnweisungNachp');?>:</td>';
 		str	+= '<td></td><tr><td><textarea id="noteimporttextareaNachp" name="notenimportNachp"></textarea></td></tr>';
-		str += "<tr><td><input type='button' name='speichern' value='<?php echo $p->t('global/speichern');?>' onclick='saveGradeBulkNachp(\"Termin2\");'>";
+
+		str += "<tr><td><input type='button' name='speichern' value='<?php echo $p->t('global/speichern');?>' onclick='saveGradeBulkNachp(\""+ termin +"\");'>";
 		str += "</td><td></td></tr></table></center></form>";
 		anlegendiv.innerHTML = str;
 		anlegendiv.style.visibility = "visible";
 		$('#noteimporttextareaNachp').focus();
 	}
 
-	// ****
-	// * Oeffnet ein Fenster fuer den Import von Noten für Termin3 aus dem Excel
-	// ****
-	function GradeImportTermin3()
-	{
-		var str = "<form name='gradeimportNachp_form'><center><table style='width: 95%'>";
-		str += "<tr><td colspan='2' align='right'><a href='#' onclick='closeDiv();'>X</a></td></tr>";
-		var anlegendiv = document.getElementById("nachpruefung_div");
-		var y = getOffset('y'); y = y+50; anlegendiv.style.top = y+"px";
-		str += '<tr><td><?php echo $p->t('benotungstool/importAnweisungNachp');?>:</td>';
-		str	+= '<td></td><tr><td><textarea id="noteimporttextareaNachp" name="notenimportNachp"></textarea></td></tr>';
-		str += "<tr><td><input type='button' name='speichern' value='<?php echo $p->t('global/speichern');?>' onclick='saveGradeBulkNachp(\"Termin3\");'>";
-		str += "</td><td></td></tr></table></center></form>";
-		anlegendiv.innerHTML = str;
-		anlegendiv.style.visibility = "visible";
-		$('#noteimporttextareaTermin3').focus();
-	}
-
 	// Speichert die Noten ueber den Import
 	function saveGradeBulk()
 	{
@@ -1188,13 +1171,13 @@ $htmlstring .= "<th>" . $p->t('benotungstool/punkte') . ' / ' . $p->t('benotungs
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
 {
 	$htmlstring .= "<th colspan='2'><br>" . $p->t('benotungstool/nachpruefung') . "<br>
-	<input type='button' onclick='GradeImportNachp()' value='" . $p->t('benotungstool/importieren') . "'>
+	<input type='button' onclick='GradeImportNachp(\"Termin2\")' value='" . $p->t('benotungstool/importieren') . "'>
 	</th>";
 }
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 {
 	$htmlstring .= "<th colspan='2' nowrap><br>" . $p->t('benotungstool/nachpruefung2') . "<br>
-	<input type='button' onclick='GradeImportTermin3()' value='" . $p->t('benotungstool/importieren') . "'>
+	<input type='button' onclick='GradeImportNachp(\"Termin3\")' value='" . $p->t('benotungstool/importieren') . "'>
 	</th>";
 }
 if (defined('CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF') && CIS_GESAMTNOTE_PRUEFUNG_KOMMPRUEF)

From 47d3ab33e78d0fbb68f5e484494a518c7e35033c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 18 Oct 2022 09:17:07 +0200
Subject: [PATCH 007/175] =?UTF-8?q?Adaptierung=20Vorlage=20Notenliste.xls?=
 =?UTF-8?q?=20um=20Nachpr=C3=BCfung=20und=20Termin3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../benotungstool/lvgesamtnoteeintragen.php   | 21 +++---
 .../benotungstool/lvgesamtnoteverwalten.php   |  4 +-
 .../benotungstool/nachpruefungeintragen.php   |  1 +
 cis/private/lehre/notenliste.xls.php          | 67 +++++++++++++++++++
 locale/de-AT/benotungstool.php                |  4 +-
 locale/en-US/benotungstool.php                |  2 +-
 6 files changed, 84 insertions(+), 15 deletions(-)

diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteeintragen.php b/cis/private/lehre/benotungstool/lvgesamtnoteeintragen.php
index 73d0e6fca..8337b7c36 100644
--- a/cis/private/lehre/benotungstool/lvgesamtnoteeintragen.php
+++ b/cis/private/lehre/benotungstool/lvgesamtnoteeintragen.php
@@ -98,9 +98,9 @@ if($stsem=='')
 
 //$note = $_REQUEST["note"];
 
-if(!$rechte->isBerechtigt('admin',0) &&
-   !$rechte->isBerechtigt('admin',$lv_obj->studiengang_kz) &&
-   !$rechte->isBerechtigt('lehre',$lv_obj->studiengang_kz))
+if(!$rechte->isBerechtigt('admin', 0) &&
+   !$rechte->isBerechtigt('admin', $lv_obj->studiengang_kz) &&
+   !$rechte->isBerechtigt('lehre', $lv_obj->studiengang_kz))
 {
 	$qry = "SELECT lehreinheit_id FROM lehre.tbl_lehrveranstaltung JOIN lehre.tbl_lehreinheit USING(lehrveranstaltung_id)
 			JOIN lehre.tbl_lehreinheitmitarbeiter USING(lehreinheit_id)
@@ -117,11 +117,11 @@ if(!$rechte->isBerechtigt('admin',0) &&
 	}
 }
 
-function savenote($db,$lvid, $student_uid, $note, $punkte=null)
+function savenote($db, $lvid, $student_uid, $note, $punkte = null)
 {
 	global $stsem, $user, $p, $noten_anmerkung;
 	$jetzt = date("Y-m-d H:i:s");
-	$punkte = str_replace(',','.',$punkte);
+	$punkte = str_replace(',', '.', $punkte);
 	//Ermitteln ob der Student diesem Kurs zugeteilt ist
 	$qry = "SELECT 1 FROM campus.vw_student_lehrveranstaltung WHERE uid=".$db->db_add_param($student_uid)." AND lehrveranstaltung_id=".$db->db_add_param($lvid, FHC_INTEGER);
 	if($result = $db->db_query($qry))
@@ -207,13 +207,12 @@ if (isset($_REQUEST["submit"]))
 		$note = $_REQUEST["note"];
 		$punkte = (isset($_REQUEST["punkte"])?$_REQUEST["punkte"]:'');
 
-		$response = savenote($db,$lvid, $student_uid, $note, $punkte);
+		$response = savenote($db, $lvid, $student_uid, $note, $punkte);
 		echo $response;
 	}
 	else
 	{
-
-		foreach ($_POST as $row=>$val)
+		foreach ($_POST as $row => $val)
 		{
 			if(mb_strstr(mb_strtolower($row), 'matrikelnr_'))
 			{
@@ -232,7 +231,7 @@ if (isset($_REQUEST["submit"]))
 						$response.="\nNote oder Punkte fehlen";
 						continue;
 					}
-					$punkte=str_replace(',','.', $punkte);
+					$punkte=str_replace(',', '.', $punkte);
 
 					//check ob statt Matrikelnummer nicht bereits student_uid (Moodle Grade Import) vorliegt..
 					$student = new student();
@@ -241,7 +240,7 @@ if (isset($_REQUEST["submit"]))
 						//UID ermitteln
 						if(!$student_uid = $student->getUidFromMatrikelnummer($matrikelnummer))
 						{
-							$response.="\n".$p->t('benotungstool/studentMitMatrikelnummerExistiertNicht',array($matrikelnummer));
+							$response.="\n".$p->t('benotungstool/studentMitMatrikelnummerExistiertNicht', array($matrikelnummer));
 							continue;
 						}
 					}
@@ -268,7 +267,7 @@ if (isset($_REQUEST["submit"]))
 						}
 					}
 
-					$val=savenote($db,$lvid, $student_uid, $note, $punkte);
+					$val=savenote($db, $lvid, $student_uid, $note, $punkte);
 					if($val!='neu' && $val!='update' && $val!='update_f')
 						$response.=$val;
 				}
diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
index b7bb74d54..64179a3e9 100644
--- a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
+++ b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
@@ -749,6 +749,7 @@ foreach ($noten_obj->result as $row)
 		}
 		?>
 
+
 		for(row in rows)
 		{
 			zeile = rows[row].split("	");
@@ -779,6 +780,7 @@ foreach ($noten_obj->result as $row)
 			}
 		}
 
+
 		if (alertMsg != "")
 			alert(alertMsg);
 
@@ -1306,7 +1308,7 @@ if (defined("CIS_GESAMTNOTE_PRUEFUNG_MOODLE_LE_NOTE") && CIS_GESAMTNOTE_PRUEFUNG
 			foreach ($addon_obj->result as $row)
 			{
 				if (file_exists('../../../../addons/' . $row->kurzbz . '/cis/grades.inc.php'))
-					include ('../../../../addons/' . $row->kurzbz . '/cis/grades.inc.php');
+					include('../../../../addons/' . $row->kurzbz . '/cis/grades.inc.php');
 			}
 		}
 	}
diff --git a/cis/private/lehre/benotungstool/nachpruefungeintragen.php b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
index 307c0ca30..290113179 100644
--- a/cis/private/lehre/benotungstool/nachpruefungeintragen.php
+++ b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
@@ -105,6 +105,7 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 			$note = null;
 			$punkte = null;
 			$datum = null;
+			$response = '';
 			if(isset($_POST['note_'.$id]))
 				$note = $_POST['note_'.$id];
 			elseif(isset($_POST['punkte_'.$id]))
diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
index 74cb7e7c1..4a6817a36 100644
--- a/cis/private/lehre/notenliste.xls.php
+++ b/cis/private/lehre/notenliste.xls.php
@@ -35,6 +35,7 @@ require_once('../../../include/note.class.php');
 require_once('../../../include/notenschluessel.class.php');
 require_once('../../../include/Excel/excel.php');
 require_once('../../../include/phrasen.class.php');
+require_once('../../../include/pruefung.class.php');
 
 $uid = get_uid();
 
@@ -191,6 +192,19 @@ else
 	}
 
 	//Studenten holen
+
+	//Spaltengruppe für Nachprüfung
+	if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
+	{
+		$worksheet->write($lines,8,$p->t('benotungstool/nachpruefung'),$format_bold);
+	}
+
+	//Spaltengruppe für 2.Nebensprüfungstermin
+	if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
+	{
+		$worksheet->write($lines,12,$p->t('benotungstool/nachpruefung2'),$format_bold);
+	}
+
 	$lines++;
 	$worksheet->write($lines,1,$p->t('global/uid'),$format_border_bottom);
 	$worksheet->write($lines,2,$p->t('global/nachname'),$format_border_bottom);
@@ -203,6 +217,26 @@ else
 	else
 		$worksheet->write($lines,6,$p->t('benotungstool/note'),$format_border_bottom);
 
+	if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
+	{
+		$worksheet->write($lines,8,$p->t('global/uid'),$format_border_bottom);
+		$worksheet->write($lines,9,$p->t('global/datum'),$format_border_bottom);
+		if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
+		$worksheet->write($lines,10,$p->t('benotungstool/punkte'),$format_border_bottom);
+			else
+		$worksheet->write($lines,10,$p->t('benotungstool/note'),$format_border_bottom);
+	}
+
+	if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
+{
+	$worksheet->write($lines,12,$p->t('global/uid'),$format_border_bottom);
+	$worksheet->write($lines,13,$p->t('global/uid'),$format_border_bottom);
+	if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
+		$worksheet->write($lines,14,$p->t('benotungstool/punkte'),$format_border_bottom);
+	else
+		$worksheet->write($lines,14,$p->t('benotungstool/note'),$format_border_bottom);
+}
+
 	$stsem_obj = new studiensemester();
 	$stsem_obj->load($stsem);
 	$stsemdatumvon = $stsem_obj->start;
@@ -282,6 +316,39 @@ else
 					$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_highlightright);
+
+					// Nachprüfung
+					if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
+					{
+						$worksheet->write($lines,8, $elem->uid, $format_highlightright);
+						$pr = new Pruefung();
+						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $sem);
+						$output2 = $pr->result;
+
+						if ($output2)
+						{
+							$resultPr = $output2[0];
+							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright);
+							$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
+						}
+					}
+
+					// Nachprüfung
+					if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
+					{
+						$worksheet->write($lines,12, $elem->uid, $format_highlightright);
+						$pr = new Pruefung();
+						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $sem);
+						$output3 = $pr->result;
+
+						if ($output3)
+						{
+							$resultPr = $output3[0];
+							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright);
+							$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
+						}
+					}
+
 					$i++;
 					$lines++;
 	   			}
diff --git a/locale/de-AT/benotungstool.php b/locale/de-AT/benotungstool.php
index b7c2af638..feac092f6 100644
--- a/locale/de-AT/benotungstool.php
+++ b/locale/de-AT/benotungstool.php
@@ -172,8 +172,8 @@ $this->phrasen['benotungstool/eingetrageneNoten']='Eingetragene Noten';
 $this->phrasen['benotungstool/zeunis']='Zeugnis';
 $this->phrasen['benotungstool/handbuch']='Handbuch';
 $this->phrasen['benotungstool/punkte']='Punkte';
-$this->phrasen['benotungstool/importAnweisung']='Kopieren Sie die Spalten Personenkennzeichen und Note aus der Notenliste (bzw. StudentenUid und Note aus dem MoodleExport) und fügen Sie diese in folgendes Feld ein';
-$this->phrasen['benotungstool/importAnweisungNachp']='Kopieren Sie die Spalten Personenkennzeichen, Datum und Note aus der Notenliste (bzw. StudentenUid, Datum und Note aus dem MoodleExport) und fügen Sie diese in folgendes Feld ein';
+$this->phrasen['benotungstool/importAnweisung']='Kopieren Sie die Spalten StudentenUid und Note aus der Notenliste (bzw. StudentenUid und Note aus dem MoodleExport) und fügen Sie diese in folgendes Feld ein';
+$this->phrasen['benotungstool/importAnweisungNachp']='Kopieren Sie die Spalten StudentenUid (bzw. Personenkennzeichen), Datum und Note aus der Notenliste bzw. dem Moodle Export File und fügen Sie diese in folgendes Feld ein';
 $this->phrasen['benotungstool/pruefung']='Prüfung';
 $this->phrasen['benotungstool/notenlisteImport']='Notenliste für den LV-Noten-Import (Excel)';
 $this->phrasen['benotungstool/bearbeitetvon']='Bearbeitet von';
diff --git a/locale/en-US/benotungstool.php b/locale/en-US/benotungstool.php
index 1f1dc89c6..f482409d8 100644
--- a/locale/en-US/benotungstool.php
+++ b/locale/en-US/benotungstool.php
@@ -171,7 +171,7 @@ $this->phrasen['benotungstool/zeunis']='Transcript';
 $this->phrasen['benotungstool/handbuch']='Handbook';
 $this->phrasen['benotungstool/punkte']='Points';
 $this->phrasen['benotungstool/importAnweisung']='Copy the columns "personal identifier" and "grade" from the grade list (or "student ID number" and "grade" from the moodle export file) and insert them in the following field';
-$this->phrasen['benotungstool/importAnweisungNachp']='Copy the columns "personal identifier", "date" and "grade" from the grade list (or "student ID number", "date" and "grade" from the moodle export file) and insert them in the following field';
+$this->phrasen['benotungstool/importAnweisungNachp']='Copy the columns "student ID number" (or "personal identifier"), "date" and "grade" from the grade list or from the moodle export file and insert them in the following field';
 $this->phrasen['benotungstool/pruefung']='Examination';
 $this->phrasen['benotungstool/notenlisteImport']='Grade list for the subject grade import (Excel)';
 $this->phrasen['benotungstool/geaenderteNotenVorhanden']='There are changed grades. Please send the changes to the assistant by clicking "Approval"';

From 540fc4bede933b704d2d69aeb0325bcc0da780c0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 15 Nov 2022 11:22:47 +0100
Subject: [PATCH 008/175] 26198 Notenimport ausschliesslich bei vorhandener
 Note

---
 .../lehre/benotungstool/nachpruefungeintragen.php    | 12 +++++++++++-
 locale/de-AT/benotungstool.php                       |  3 ++-
 locale/en-US/benotungstool.php                       |  1 +
 3 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/cis/private/lehre/benotungstool/nachpruefungeintragen.php b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
index 290113179..bf0d4b197 100644
--- a/cis/private/lehre/benotungstool/nachpruefungeintragen.php
+++ b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
@@ -95,6 +95,8 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 {
 	$errorMatrnr = '';
 	$errorDatum = '';
+	$errorNachp = '';
+	
 	foreach ($_POST as $row => $val)
 	{
 		if(mb_strstr(mb_strtolower($row), 'student_uid_'))
@@ -140,6 +142,14 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 				}
 			}
 
+			//check ob eine Note vorhanden ist oder (intern) angerechnet wurde
+			$lvnote = new lvgesamtnote();
+			if (!$lvnote->load($lvid, $student_uid, $stsem))
+			{
+				$errorNachp.="\n".$p->t('benotungstool/NachpruefungNichtZulaessig', array($student_uid));
+				continue;
+			}
+
 			$lehreinheit_id = getLehreinheit($db, $lvid, $student_uid, $stsem);
 
 			if(isset($_POST['student_uid_'.$id]) && (isset($_POST['note_'.$id]) || isset($_POST['punkte_'.$id])) && isset($_POST['datumNachp_'.$id]))
@@ -152,7 +162,7 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 			}
 		}
 	}
-	echo $errorMatrnr . $errorDatum;
+	echo $errorMatrnr . $errorDatum . $errorNachp;
 }
 else
 {
diff --git a/locale/de-AT/benotungstool.php b/locale/de-AT/benotungstool.php
index feac092f6..d6e77d3ce 100644
--- a/locale/de-AT/benotungstool.php
+++ b/locale/de-AT/benotungstool.php
@@ -150,8 +150,9 @@ $this->phrasen['benotungstool/kreuzerltool']='Kreuzerltool';
 $this->phrasen['benotungstool/studentIstLvNichtZugeordnet']='Der Student %s %s (%s) ist dieser Lehrveranstaltung nicht zugeordnet. Die Note wird nicht uebernommen!';
 $this->phrasen['benotungstool/studentMitMatrikelnummerExistiertNicht']='Student*in mit Matrikelnummer %s existiert nicht.';
 $this->phrasen['benotungstool/datumsformatUnzulaessig']='Das Datum %s entspricht nicht dem Format TT.MM.JJJJ!';
+$this->phrasen['benotungstool/NachpruefungNichtZulaessig']='Nachprüfung für Student*in %s nicht zulässig.';
 $this->phrasen['benotungstool/noteUnzulaessig']='Die Note %s ist nicht zulaessig. Die Zeile wurde uebersprungen.';
-$this->phrasen['benotungstool/noteNichtUeberschreibbar']='Für Student mit Matrikelnummer %s eingetragene Zeugnisote %s ist nicht überschreibbar';
+$this->phrasen['benotungstool/noteNichtUeberschreibbar']='Für Student mit Matrikelnummer %s eingetragene Zeugnisnote %s ist nicht überschreibbar';
 $this->phrasen['benotungstool/fehlerhafteNoteBeiStudent']='Fehlerhafte Note bei Student %s %s';
 $this->phrasen['benotungstool/keineKreuzerllistenFuerDieseLehrveranstaltung']='Derzeit gibt es keine Kreuzerllisten für diese Lehrveranstaltung';
 $this->phrasen['benotungstool/notenuebersichtFuer']='Notenübersicht</a> für';
diff --git a/locale/en-US/benotungstool.php b/locale/en-US/benotungstool.php
index f482409d8..73a3bd343 100644
--- a/locale/en-US/benotungstool.php
+++ b/locale/en-US/benotungstool.php
@@ -148,6 +148,7 @@ $this->phrasen['benotungstool/pruefungAnlegenFuer']='Create an examination for '
 $this->phrasen['benotungstool/kreuzerltool']='"Kreuzerl" tool';
 $this->phrasen['benotungstool/studentIstLvNichtZugeordnet']='Student is not assigned to this course. The grade was not accepted!';
 $this->phrasen['benotungstool/studentMitMatrikelnummerExistiertNicht']='Student with student ID number %s does not exist.';
+$this->phrasen['benotungstool/NachpruefungNichtZulaessig']='Re-examination for student %s not allowed.';
 $this->phrasen['benotungstool/datumsformatUnzulaessig']='The date %s is not in valid format TT.MM.JJJJ.';
 $this->phrasen['benotungstool/noteNichtUeberschreibbar']='Transcript grade %2$s for student with Personal identifier %1$s is not rewritable';
 $this->phrasen['benotungstool/fehlerhafteNoteBeiStudent']='Incorrect grade for student %s %s';

From d9098179a25cf789e29dc29a1407445112ce4d06 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 14 Dec 2022 12:40:38 +0100
Subject: [PATCH 009/175] - ermoeglicht es master bewerber sich ueber das
 bewerbungstool anzumelden

---
 include/reihungstest.class.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/include/reihungstest.class.php b/include/reihungstest.class.php
index 0140816ab..5c8e5854e 100644
--- a/include/reihungstest.class.php
+++ b/include/reihungstest.class.php
@@ -685,11 +685,15 @@ class reihungstest extends basis_db
 					tbl_reihungstest.studiensemester_kurzbz,
 					tbl_reihungstest.stufe,
 					tbl_reihungstest.anmeldefrist,
-					tbl_reihungstest.aufnahmegruppe_kurzbz
+					tbl_reihungstest.aufnahmegruppe_kurzbz,
+					tbl_studiengang.typ,
+					tbl_studiengang.kurzbzlang
 				FROM
 					public.tbl_rt_person
 				JOIN 
 					public.tbl_reihungstest ON (rt_id=reihungstest_id)
+				LEFT JOIN
+					public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
 				WHERE
 					tbl_rt_person.person_id=".$this->db_add_param($person_id);
 
@@ -728,6 +732,8 @@ class reihungstest extends basis_db
 				$obj->stufe = $row->stufe;
 				$obj->anmeldefrist = $row->anmeldefrist;
 				$obj->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
+				$obj->typ = $row->typ;
+				$obj->kurzbzlang = $row->kurzbzlang;
 
 				$this->result[] = $obj;
 			}

From ed99325bb933d7fee02fffc50014d28f287f8d01 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 10 Jan 2023 09:04:53 +0100
Subject: [PATCH 010/175] - anpassungen fuer master bewerbungen

---
 include/reihungstest.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/reihungstest.class.php b/include/reihungstest.class.php
index 5c8e5854e..42af8ea7a 100644
--- a/include/reihungstest.class.php
+++ b/include/reihungstest.class.php
@@ -687,7 +687,7 @@ class reihungstest extends basis_db
 					tbl_reihungstest.anmeldefrist,
 					tbl_reihungstest.aufnahmegruppe_kurzbz,
 					tbl_studiengang.typ,
-					tbl_studiengang.kurzbzlang
+					UPPER(typ::varchar(1) || kurzbz) AS stg_kuerzel
 				FROM
 					public.tbl_rt_person
 				JOIN 
@@ -733,7 +733,7 @@ class reihungstest extends basis_db
 				$obj->anmeldefrist = $row->anmeldefrist;
 				$obj->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
 				$obj->typ = $row->typ;
-				$obj->kurzbzlang = $row->kurzbzlang;
+				$obj->stg_kuerzel = $row->stg_kuerzel;
 
 				$this->result[] = $obj;
 			}

From 84ca798dadc5ad814a949d69093ae3d113b369b9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 8 Mar 2023 13:50:33 +0100
Subject: [PATCH 011/175] add format to set text as format for date columns and
 highlight them

---
 cis/private/lehre/notenliste.xls.php | 23 ++++++++++++++++++++---
 1 file changed, 20 insertions(+), 3 deletions(-)

diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
index 4a6817a36..42dcc8418 100644
--- a/cis/private/lehre/notenliste.xls.php
+++ b/cis/private/lehre/notenliste.xls.php
@@ -121,6 +121,13 @@ else
 	$format_highlightright->setBorderColor('white');
 	$format_highlightright->setAlign('right');
 
+	$format_highlightright_date=& $workbook->addFormat();
+	$format_highlightright_date->setFgColor(15);
+	$format_highlightright_date->setBorder(1);
+	$format_highlightright_date->setBorderColor('white');
+	$format_highlightright_date->setAlign('right');
+	$format_highlightright_date->setNumFormat(49);
+
 	$format_border_bottom =& $workbook->addFormat();
 	$format_border_bottom ->setBottom(2);
 	$format_border_bottom->setBold();
@@ -230,7 +237,7 @@ else
 	if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 {
 	$worksheet->write($lines,12,$p->t('global/uid'),$format_border_bottom);
-	$worksheet->write($lines,13,$p->t('global/uid'),$format_border_bottom);
+	$worksheet->write($lines,13,$p->t('global/datum'),$format_border_bottom);
 	if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
 		$worksheet->write($lines,14,$p->t('benotungstool/punkte'),$format_border_bottom);
 	else
@@ -328,9 +335,14 @@ else
 						if ($output2)
 						{
 							$resultPr = $output2[0];
-							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright);
+							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
 							$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
 						}
+                                                else 
+                                                {
+                                                        $worksheet->write($lines,9, '', $format_highlightright_date);
+                                                        $worksheet->write($lines,10, '', $format_highlightright);
+                                                }
 					}
 
 					// Nachprüfung
@@ -344,9 +356,14 @@ else
 						if ($output3)
 						{
 							$resultPr = $output3[0];
-							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright);
+							$worksheet->write($lines,13, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
 							$worksheet->write($lines,14, $resultPr->note, $format_highlightright);
 						}
+                                                else
+                                                {
+                                                        $worksheet->write($lines,13, '', $format_highlightright_date);
+                                                        $worksheet->write($lines,14, '', $format_highlightright);
+                                                }
 					}
 
 					$i++;

From 3e056ebf3d35c6eacae1fd042e9358c3925c532c Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 24 Mar 2023 15:21:01 +0100
Subject: [PATCH 012/175] =?UTF-8?q?Notenimport=20Nachpr=C3=BCfung=20und=20?=
 =?UTF-8?q?3.Termin:=20Erg=C3=A4nzung=20um=20nicht=20numerische=20Noten?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../benotungstool/nachpruefungeintragen.php   | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/cis/private/lehre/benotungstool/nachpruefungeintragen.php b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
index bf0d4b197..804ab34fb 100644
--- a/cis/private/lehre/benotungstool/nachpruefungeintragen.php
+++ b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
@@ -42,6 +42,7 @@ require_once('../../../../include/benutzer.class.php');
 require_once('../../../../include/student.class.php');
 require_once('../../../../include/notenschluessel.class.php');
 require_once('../../../../include/phrasen.class.php');
+require_once('../../../../include/note.class.php');
 
 
 if (!$db = new basis_db())
@@ -79,6 +80,17 @@ $stsem_obj = new studiensemester();
 if($stsem=='')
 	$stsem = $stsem_obj->getaktorNext();
 
+//Notenanmerkung für Eintragung von nichtnumerischen Noten wie en (entschuldigt), ue(unentschuldigt)
+$noten_anmerkung = array();
+$noten_arr = array();
+$note_obj = new note();
+$note_obj->getAll();
+foreach($note_obj->result as $row)
+{
+	$noten_anmerkung[$row->anmerkung] = $row->note;
+	$noten_arr[$row->note] = $row;
+}
+
 if(!isset($_GET['typ']))
 {
 	$typ='Termin2';
@@ -96,7 +108,7 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 	$errorMatrnr = '';
 	$errorDatum = '';
 	$errorNachp = '';
-	
+
 	foreach ($_POST as $row => $val)
 	{
 		if(mb_strstr(mb_strtolower($row), 'student_uid_'))
@@ -154,6 +166,11 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 
 			if(isset($_POST['student_uid_'.$id]) && (isset($_POST['note_'.$id]) || isset($_POST['punkte_'.$id])) && isset($_POST['datumNachp_'.$id]))
 			{
+				if(!is_numeric($note))
+				{
+					if(isset($noten_anmerkung[$note]))
+						$note = $noten_anmerkung[$note];
+				}
 				$response = savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ, $note, $punkte);
 			}
 			else

From 76c4c4a0e916226273063c30cc4463d051e36b62 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 27 Mar 2023 08:15:29 +0200
Subject: [PATCH 013/175] Termin 3 als pruefungstyp in lehre.tbl_pruefungstyp
 in dbupdate hinterlegt

---
 system/dbupdate_3.4.php                           |  1 +
 .../25003_notenimport_nachpruefung.php            | 15 +++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 system/dbupdate_3.4/25003_notenimport_nachpruefung.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index c3600d250..2597a0e4c 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -27,6 +27,7 @@ require_once('dbupdate_3.4/example.php');
 require_once('dbupdate_3.4/example2.php');
 ...
 */
+require_once('dbupdate_3.4/25003_notenimport_nachpruefung.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/25003_notenimport_nachpruefung.php b/system/dbupdate_3.4/25003_notenimport_nachpruefung.php
new file mode 100644
index 000000000..7c2406d0e
--- /dev/null
+++ b/system/dbupdate_3.4/25003_notenimport_nachpruefung.php
@@ -0,0 +1,15 @@
+<?php
+
+// lehre.tbl_pruefungstyp: add type Termin3
+if($result = $db->db_query("SELECT 1 FROM lehre.tbl_pruefungstyp WHERE pruefungstyp_kurzbz='Termin3'"))
+{
+	if($db->db_num_rows($result)==0)
+	{
+		$qry = "INSERT INTO lehre.tbl_pruefungstyp(pruefungstyp_kurzbz, beschreibung, abschluss) VALUES('Termin3', '3.Termin', false);";
+
+		if(!$db->db_query($qry))
+			echo '<strong>Prüfungstyp: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>Prüfungstyp 3.Termin in lehre.tbl_pruefungstyp hinzugefügt';
+	}
+}

From 80d5d09ed582462e1eb021799635d3f4246777c8 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 4 Apr 2023 08:07:03 +0200
Subject: [PATCH 014/175] fix styling of textarea in import popup

---
 .../lehre/benotungstool/lvgesamtnoteverwalten.php    | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
index 4dcd6c7cf..d498636ae 100644
--- a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
+++ b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
@@ -145,8 +145,8 @@ echo '<!DOCTYPE HTML>
 		position:absolute;
 		top:100px;
 		left:300px;
-		width:400px;
-		height:200px;
+		min-width:450px;
+		min-height:200px;
 		background-color:#cccccc;
 		visibility:hidden;
 		border-style:solid;
@@ -594,8 +594,8 @@ foreach ($noten_obj->result as $row)
 		str += "<tr><td colspan='2' align='right'><a href='#' onclick='closeDiv();'>X</a></td></tr>";
 		var anlegendiv = document.getElementById("nachpruefung_div");
 		var y = getOffset('y'); y = y+50; anlegendiv.style.top = y+"px";
-		str += '<tr><td><?php echo $p->t('benotungstool/importAnweisung');?>:</td>';
-		str	+= '<td></td><tr><td><textarea id="noteimporttextarea" name="notenimport"></textarea></td></tr>';
+		str += '<tr><td><div style="width: 400px;"><?php echo $p->t('benotungstool/importAnweisung');?>:</div></td>';
+		str	+= '<td></td><tr><td><textarea style="width: 400px;" id="noteimporttextarea" name="notenimport"></textarea></td></tr>';
 		str += "<tr><td><input type='button' name='speichern' value='<?php echo $p->t('global/speichern');?>' onclick='saveGradeBulk();'>";
 		str += "</td><td></td></tr></table></center></form>";
 		anlegendiv.innerHTML = str;
@@ -612,8 +612,8 @@ foreach ($noten_obj->result as $row)
 		str += "<tr><td colspan='2' align='right'><a href='#' onclick='closeDiv();'>X</a></td></tr>";
 		var anlegendiv = document.getElementById("nachpruefung_div");
 		var y = getOffset('y'); y = y+50; anlegendiv.style.top = y+"px";
-		str += '<tr><td><?php echo $p->t('benotungstool/importAnweisungNachp');?>:</td>';
-		str	+= '<td></td><tr><td><textarea id="noteimporttextareaNachp" name="notenimportNachp"></textarea></td></tr>';
+		str += '<tr><td><div style="width: 400px;"><?php echo $p->t('benotungstool/importAnweisungNachp');?>:</div></td>';
+		str	+= '<td></td><tr><td><textarea style="width: 400px;" id="noteimporttextareaNachp" name="notenimportNachp"></textarea></td></tr>';
 
 		str += "<tr><td><input type='button' name='speichern' value='<?php echo $p->t('global/speichern');?>' onclick='saveGradeBulkNachp(\""+ termin +"\");'>";
 		str += "</td><td></td></tr></table></center></form>";

From fb57ea5838731be8532efd2fc5c5e8add5d8feb6 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 4 Apr 2023 15:57:33 +0200
Subject: [PATCH 015/175] - splitten von reihungstest uebersichten

---
 include/reihungstest.class.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/include/reihungstest.class.php b/include/reihungstest.class.php
index 42af8ea7a..2da424af5 100644
--- a/include/reihungstest.class.php
+++ b/include/reihungstest.class.php
@@ -687,7 +687,9 @@ class reihungstest extends basis_db
 					tbl_reihungstest.anmeldefrist,
 					tbl_reihungstest.aufnahmegruppe_kurzbz,
 					tbl_studiengang.typ,
-					UPPER(typ::varchar(1) || kurzbz) AS stg_kuerzel
+					UPPER(typ::varchar(1) || kurzbz) AS stg_kuerzel,
+			       	tbl_studiengang.bezeichnung,
+					tbl_studiengang.english
 				FROM
 					public.tbl_rt_person
 				JOIN 
@@ -734,6 +736,8 @@ class reihungstest extends basis_db
 				$obj->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
 				$obj->typ = $row->typ;
 				$obj->stg_kuerzel = $row->stg_kuerzel;
+				$obj->bezeichnung = $row->bezeichnung;
+				$obj->english = $row->english;
 
 				$this->result[] = $obj;
 			}

From da484fbbb07d7017fb232872e35562a292976294 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 25 Apr 2023 08:45:16 +0200
Subject: [PATCH 016/175] - die letzten 5 tage werden geprueft anstatt nur der
 vortag - neue bewerbungen nach dem aufgenommen status werden nich automatisch
 abgewiesen

---
 application/controllers/jobs/ReihungstestJob.php | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php
index ab6c429a0..431ac5b04 100644
--- a/application/controllers/jobs/ReihungstestJob.php
+++ b/application/controllers/jobs/ReihungstestJob.php
@@ -3,6 +3,9 @@ if (!defined('BASEPATH')) exit('No direct script access allowed');
 
 class ReihungstestJob extends JOB_Controller
 {
+
+	const LAST_DAYS_PRESTUDENTSTATUS = 5;
+
 	/**
 	 * Constructor
 	 */
@@ -826,7 +829,7 @@ class ReihungstestJob extends JOB_Controller
 						AND tbl_studiengang.typ IN ('b', 'm')
 				)
 				SELECT * FROM prst
-				WHERE prestudenstatus_datum >= (SELECT CURRENT_DATE - 1)
+				WHERE prestudenstatus_datum >= (SELECT CURRENT_DATE - ". self::LAST_DAYS_PRESTUDENTSTATUS .")
 				AND (studiengang_typ = 'b' OR (studiengang_typ = 'm' AND EXISTS (SELECT 1 /* Master Studiengänge berücksichtigen wenn auch Bachelor im gleichen Semester */
 																					FROM prst prstb
 																					WHERE studiengang_typ = 'b'
@@ -868,7 +871,8 @@ class ReihungstestJob extends JOB_Controller
 							tbl_person.nachname,
 							tbl_person.vorname,
 							tbl_prestudent.*,
-							tbl_studiengang.typ AS studiengang_typ
+							tbl_studiengang.typ AS studiengang_typ,
+							tbl_prestudentstatus.datum
 						FROM PUBLIC.tbl_person
 							JOIN PUBLIC.tbl_prestudent USING (person_id)
 							JOIN PUBLIC.tbl_prestudentstatus USING (prestudent_id)
@@ -901,7 +905,7 @@ class ReihungstestJob extends JOB_Controller
 								$mailArray[$rowNiedrPrios->studiengang_kz][$rowNiedrPrios->orgform_kurzbz]['AufnahmeHoeherePrio'][]
 									= $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')';
 							}
-							elseif ($rowNiedrPrios->laststatus == 'Bewerber')
+							elseif ($rowNiedrPrios->laststatus == 'Bewerber' && $row_ps->prestudenstatus_datum > $rowNiedrPrios->datum)
 							{
 								// Abgewiesenen-Status mit Statusgrund "Aufnahme anderer Studiengang" (ID 5) setzen
 								$lastStatus = $this->PrestudentstatusModel->getLastStatus($rowNiedrPrios->prestudent_id);
@@ -927,7 +931,7 @@ class ReihungstestJob extends JOB_Controller
 										= $rowNiedrPrios->nachname.' '.$rowNiedrPrios->vorname.' ('.$rowNiedrPrios->prestudent_id.')';
 								}
 							}
-							elseif ($rowNiedrPrios->laststatus == 'Wartender')
+							elseif ($rowNiedrPrios->laststatus == 'Wartender' && $row_ps->prestudenstatus_datum > $rowNiedrPrios->datum)
 							{
 								// Abgewiesenen-Status mit Statusgrund "Aufnahme anderer Studiengang" (ID 5) setzen
 								// Mail zur Info an Assistenz schicken

From 33e313a633a4001f01b1ce55c4dec39f62c2d2e1 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 8 May 2023 12:12:42 +0200
Subject: [PATCH 017/175] update Abfrage

---
 application/inputFileTest.csv         |  8 +++++
 application/tmp/inputFile.csv         | 49 +++++++++++++++++++++++++++
 application/tmp/inputFileMitError.csv | 11 ++++++
 application/tmp/inputFileUltra.csv    |  8 +++++
 cis/private/lehre/notenliste.xls.php  |  7 ++--
 5 files changed, 80 insertions(+), 3 deletions(-)
 create mode 100644 application/inputFileTest.csv
 create mode 100644 application/tmp/inputFile.csv
 create mode 100644 application/tmp/inputFileMitError.csv
 create mode 100644 application/tmp/inputFileUltra.csv

diff --git a/application/inputFileTest.csv b/application/inputFileTest.csv
new file mode 100644
index 000000000..927dc0062
--- /dev/null
+++ b/application/inputFileTest.csv
@@ -0,0 +1,8 @@
+uid,studiensemester,moodle_course_shortname,moodle_course_fullname,moodle_course_url
+aburaia,SS2016,BMR4_MLAB2_2016,BMR4_Mechatronics-Lab2_2016,https://moodle.technikum-wien.at/course/view.php?id=2948
+aburaia,WS2016,MMR-VZB-3-WS2016-PRJ,Projekt,https://moodle.technikum-wien.at/course/view.php?id=3643
+adams,SS2016,BEW-BB-4-SS2016-ENG/67791,Business English 2,https://moodle.technikum-wien.at/course/view.php?id=3034
+adams,SS2016,BEW-DL-2-SS2016-ENG,Technical and Creative Communication,https://moodle.technikum-wien.at/course/view.php?id=2873
+krizek,SS2016,BVU-VZ-6-SS2016-PSB,Praxissemesterbegleitung,https://moodle.technikum-wien.at/course/view.php?id=3157
+krizek,SS2016,MIT-VZ-2-SS2016-ITS PRJ I,ITS Project I,https://moodle.technikum-wien.at/course/view.php?id=3175
+krizek,WS2016,MSC-VZ-3-WS2016-IP2,ITS Project II,https://moodle.technikum-wien.at/course/view.php?id=3713
diff --git a/application/tmp/inputFile.csv b/application/tmp/inputFile.csv
new file mode 100644
index 000000000..48411ca1a
--- /dev/null
+++ b/application/tmp/inputFile.csv
@@ -0,0 +1,49 @@
+uid,studiensemester,moodle_course_shortname,moodle_course_fullname,moodle_course_url
+aburaia,SS2016,BMR4_MLAB2_2016,BMR4_Mechatronics-Lab2_2016,https://moodle.technikum-wien.at/course/view.php?id=2948
+aburaia,SS2016,BMR6_MES_2016,BMR6_Mechatronische-Systeme_2016,https://moodle.technikum-wien.at/course/view.php?id=2951
+aburaia,SS2016,BMR-VZ-6-SS2016-EMS,Entwurf mechatronischer Systeme,https://moodle.technikum-wien.at/course/view.php?id=2833
+aburaia,WS2016,BMB-VZ-5-WS2016-DF,Industrierobotik in der Digitalen Fabrik,https://moodle.technikum-wien.at/course/view.php?id=4188
+aburaia,WS2016,BMR5_PRAK_2016,BMR5_Berufspraktikum_2016,https://moodle.technikum-wien.at/course/view.php?id=3746
+aburaia,WS2016,BMR-VZ-3-WS2016-PJM,Projektmanagement,https://moodle.technikum-wien.at/course/view.php?id=3452
+aburaia,WS2016,MMR-3-WS2016_PROJ,MMR-3-WS2016 - Projekt,https://moodle.technikum-wien.at/course/view.php?id=3351
+aburaia,WS2016,MMR-BB-1-WS2016-BMECH,Mechatronik 1,https://moodle.technikum-wien.at/course/view.php?id=4038
+aburaia,WS2016,MMR-VZ-1-WS2016-VMECH,Mechatronik 1,https://moodle.technikum-wien.at/course/view.php?id=4037
+aburaia,WS2016,MMR-VZ-4-WS2016-MT,Master Thesis,https://moodle.technikum-wien.at/course/view.php?id=3956
+aburaia,WS2016,MMR-VZB-3-WS2016-PRJ,Projekt,https://moodle.technikum-wien.at/course/view.php?id=3643
+adams,SS2016,BEW-BB-4-SS2016-ENG/67791,Business English 2,https://moodle.technikum-wien.at/course/view.php?id=3034
+adams,SS2016,BEW-DL-2-SS2016-ENG,Technical and Creative Communication,https://moodle.technikum-wien.at/course/view.php?id=2873
+adams,SS2016,BEW-DL-4-SS2016-DLPS,Business Communication for Engineers,https://moodle.technikum-wien.at/course/view.php?id=2883
+adams,SS2016,BEW-DL-6-SS2016-ADC,Advanced Communication,https://moodle.technikum-wien.at/course/view.php?id=2897
+adams,SS2016,BIC-BB-2-SS2016-ENG/68928/68931,Technical and Creative Communication,https://moodle.technikum-wien.at/course/view.php?id=2898
+adams,SS2016,BIW-BB-2-SS2016-PTC/67947,BIW-BB-2-SS2016 - Professional & Technical Communication 2,https://moodle.technikum-wien.at/course/view.php?id=3020
+adams,SS2016,BWI-DL-4-SS2016-BUCdl,Business Communication,https://moodle.technikum-wien.at/course/view.php?id=2879
+adams,SS2016,EWU-VZ-1-SS2016-WUE1,Warm-up Englisch 1,https://moodle.technikum-wien.at/course/view.php?id=3415
+adams,SS2016,MGR-VZ-4-SS2016-ENG/67338,Intensiv Englisch,https://moodle.technikum-wien.at/course/view.php?id=3174
+adams,WS2016,BEW-DL-3-WS2016-DLGI,General Information,https://moodle.technikum-wien.at/course/view.php?id=3481
+adams,WS2016,BEW-DL-3-WS2016-EC,Economics  Technology and Society,https://moodle.technikum-wien.at/course/view.php?id=3414
+adams,WS2016,BIC-BB-1-WS2016-PSC/70705/70740,Professional and Social Communication,https://moodle.technikum-wien.at/course/view.php?id=3559
+adams,WS2016,BIW-BB-1-WS2016-PTC/73126,BIW-BB-1-WS2016 - Professional and Technical Communication 1,https://moodle.technikum-wien.at/course/view.php?id=3403
+adams,WS2016,BIW-BB-3-WS2016-EBE/72699,English for Business and Engineering,https://moodle.technikum-wien.at/course/view.php?id=3938
+adams,WS2016,BSA-VZ-1-WS2016-PSC,Professional and Social Communication,https://moodle.technikum-wien.at/course/view.php?id=3747
+adams,WS2016,BSA-VZ-3-WS2016-TCC,Technical and Creative Communication ,https://moodle.technikum-wien.at/course/view.php?id=3748
+adams,WS2016,BWI-DL-3-WS2016-ENGdl,Econonmics  Technology and Society,https://moodle.technikum-wien.at/course/view.php?id=3608
+adensam,SS2016,MEE-BB-2-SS2016-BEV,Bewertungsverfahren,https://moodle.technikum-wien.at/course/view.php?id=2955
+adensam,WS2016,MEE-BB-3-WS2016-ERT,Energierecht,https://moodle.technikum-wien.at/course/view.php?id=3964
+adensam,WS2016,MEE-BB-3-WS2016-EWT,Energiewirtschaft,https://moodle.technikum-wien.at/course/view.php?id=3794
+adensam,WS2016,MUT-BB-3-WS2016-EM,Energiemanagement,https://moodle.technikum-wien.at/course/view.php?id=3676
+kraft,WS2016,MWI-DL-3-WS2016-MBdl,Mobile Business,https://moodle.technikum-wien.at/course/view.php?id=3589
+kraft,WS2016,MWI-PT-1-WS2016-ITSCpt,IT Strategy and IT Controlling,https://moodle.technikum-wien.at/course/view.php?id=3560
+kraft,WS2016,MWI-PT-3-WS2016-MBpt,Mobile Business,https://moodle.technikum-wien.at/course/view.php?id=3590
+kralc,SS2016,MEE-BB-2-SS2020-AS Anlagentechnik und Simulation (mit Modelica und Dymola),Anlagentechnik und Simulation mit Modelica und Dymola,https://moodle.technikum-wien.at/course/view.php?id=3025
+krametz,WS2016,WS2016-BEE3-ALB,WS2016-BEE3-ALB,https://moodle.technikum-wien.at/course/view.php?id=3624
+kratochv,SS2016,BST-VZ-2-SS2016-MTL,Materialtechnologie - Labor I,https://moodle.technikum-wien.at/course/view.php?id=3332
+kravtche,WS2016,BEW-BB-1-WS2016-LAB,Labor 1,https://moodle.technikum-wien.at/course/view.php?id=3734
+krenn,SS2016,BEW-DL-2-SS2016-PHY/67684,Physics 1,https://moodle.technikum-wien.at/course/view.php?id=2862
+krenn,WS2016,BEW-BB-5-WS2016-WIA,Wissenschaftliches Arbeiten,https://moodle.technikum-wien.at/course/view.php?id=3716
+krenn,WS2016,BEW-DL-3-WS2016-DLGI,General Information,https://moodle.technikum-wien.at/course/view.php?id=3481
+krenn,WS2016,BEW-DL-3-WS2016-PHY,Physics 2,https://moodle.technikum-wien.at/course/view.php?id=3378
+krennk,WS2016,BST-VZ-5-WS2016-BA1-MBAP3,Bachelorarbeit 1 - MBA Projekt 3 ,https://moodle.technikum-wien.at/course/view.php?id=3527
+krennm,SS2016,BBE-VZ-4-SS2016-CSA,Circuitdesign and Signal Analysis,https://moodle.technikum-wien.at/course/view.php?id=2956
+krizek,SS2016,BVU-VZ-6-SS2016-PSB,Praxissemesterbegleitung,https://moodle.technikum-wien.at/course/view.php?id=3157
+krizek,SS2016,MIT-VZ-2-SS2016-ITS PRJ I,ITS Project I,https://moodle.technikum-wien.at/course/view.php?id=3175
+krizek,WS2016,MSC-VZ-3-WS2016-IP2,ITS Project II,https://moodle.technikum-wien.at/course/view.php?id=3713
diff --git a/application/tmp/inputFileMitError.csv b/application/tmp/inputFileMitError.csv
new file mode 100644
index 000000000..26c53a78d
--- /dev/null
+++ b/application/tmp/inputFileMitError.csv
@@ -0,0 +1,11 @@
+uid,studiensemester,moodle_course_shortname,moodle_course_fullname,moodle_course_url
+aburaia,SS2016,BMR4_MLAB2_2016,BMR4_Mechatronics-Lab2_2016,https://moodle.technikum-wien.at/course/view.php?id=2948
+aburaia,WS2016,MMR-VZB-3-WS2016-PRJ,,https://moodle.technikum-wien.at/course/view.php?id=3643
+adams,SS2016,BEW-BB-4-SS2016-ENG/67791,Business English 2,https://moodle.technikum-wien.at/course/view.php?id=3034
+adams,SS2016,,Technical and Creative Communication,https://moodle.technikum-wien.at/course/view.php?id=2873
+krizek,SS2016,BVU-VZ-6-SS2016-PSB,Praxissemesterbegleitung,
+krizek,SS2016,MIT-VZ-2-SS2016-ITS PRJ I,ITS Project I,https://moodle.technikum-wien.at/course/view.php?id=3175
+krizek,WS2016,MSC-VZ-3-WS2016-IP2,ITS Project II,https://moodle.technikum-wien.at/course/view.php?id=3713
+kraft,WS2016,MWI-DL-3-WS2016-MBdl,Mobile Business,https://moodle.technikum-wien.at/course/view.php?id=3589
+kraft,,MWI-PT-1-WS2016-ITSCpt,IT Strategy and IT Controlling,https://moodle.technikum-wien.at/course/view.php?id=3560
+kraft,WS2016,MWI-PT-3-WS2016-MBpt,Mobile Business,https://moodle.technikum-wien.at/course/view.php?id=3590
diff --git a/application/tmp/inputFileUltra.csv b/application/tmp/inputFileUltra.csv
new file mode 100644
index 000000000..927dc0062
--- /dev/null
+++ b/application/tmp/inputFileUltra.csv
@@ -0,0 +1,8 @@
+uid,studiensemester,moodle_course_shortname,moodle_course_fullname,moodle_course_url
+aburaia,SS2016,BMR4_MLAB2_2016,BMR4_Mechatronics-Lab2_2016,https://moodle.technikum-wien.at/course/view.php?id=2948
+aburaia,WS2016,MMR-VZB-3-WS2016-PRJ,Projekt,https://moodle.technikum-wien.at/course/view.php?id=3643
+adams,SS2016,BEW-BB-4-SS2016-ENG/67791,Business English 2,https://moodle.technikum-wien.at/course/view.php?id=3034
+adams,SS2016,BEW-DL-2-SS2016-ENG,Technical and Creative Communication,https://moodle.technikum-wien.at/course/view.php?id=2873
+krizek,SS2016,BVU-VZ-6-SS2016-PSB,Praxissemesterbegleitung,https://moodle.technikum-wien.at/course/view.php?id=3157
+krizek,SS2016,MIT-VZ-2-SS2016-ITS PRJ I,ITS Project I,https://moodle.technikum-wien.at/course/view.php?id=3175
+krizek,WS2016,MSC-VZ-3-WS2016-IP2,ITS Project II,https://moodle.technikum-wien.at/course/view.php?id=3713
diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
index 42dcc8418..2e0403139 100644
--- a/cis/private/lehre/notenliste.xls.php
+++ b/cis/private/lehre/notenliste.xls.php
@@ -270,17 +270,18 @@ else
 			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 bis.tbl_mobilitaet ON (bis.tbl_mobilitaet.prestudent_id = public.tbl_student.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);";";
+		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);
 
 	$qry.=' ORDER BY nachname, vorname, person_id, tbl_bisio.bis, doubledegree DESC';
 
+
 	if($result = $db->db_query($qry))
 	{
 		$i=1;
@@ -338,7 +339,7 @@ else
 							$worksheet->write($lines,9, date('d.m.Y', strtotime($resultPr->datum)), $format_highlightright_date);
 							$worksheet->write($lines,10, $resultPr->note, $format_highlightright);
 						}
-                                                else 
+                                                else
                                                 {
                                                         $worksheet->write($lines,9, '', $format_highlightright_date);
                                                         $worksheet->write($lines,10, '', $format_highlightright);

From c086eddfaecccaf40c3dc055f56f4a7f0ed1905e Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 8 May 2023 14:18:07 +0200
Subject: [PATCH 018/175] update Abfrage, delete testfiles

---
 application/inputFileTest.csv         |  8 -----
 application/tmp/inputFile.csv         | 49 ---------------------------
 application/tmp/inputFileMitError.csv | 11 ------
 application/tmp/inputFileUltra.csv    |  8 -----
 4 files changed, 76 deletions(-)
 delete mode 100644 application/inputFileTest.csv
 delete mode 100644 application/tmp/inputFile.csv
 delete mode 100644 application/tmp/inputFileMitError.csv
 delete mode 100644 application/tmp/inputFileUltra.csv

diff --git a/application/inputFileTest.csv b/application/inputFileTest.csv
deleted file mode 100644
index 927dc0062..000000000
--- a/application/inputFileTest.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-uid,studiensemester,moodle_course_shortname,moodle_course_fullname,moodle_course_url
-aburaia,SS2016,BMR4_MLAB2_2016,BMR4_Mechatronics-Lab2_2016,https://moodle.technikum-wien.at/course/view.php?id=2948
-aburaia,WS2016,MMR-VZB-3-WS2016-PRJ,Projekt,https://moodle.technikum-wien.at/course/view.php?id=3643
-adams,SS2016,BEW-BB-4-SS2016-ENG/67791,Business English 2,https://moodle.technikum-wien.at/course/view.php?id=3034
-adams,SS2016,BEW-DL-2-SS2016-ENG,Technical and Creative Communication,https://moodle.technikum-wien.at/course/view.php?id=2873
-krizek,SS2016,BVU-VZ-6-SS2016-PSB,Praxissemesterbegleitung,https://moodle.technikum-wien.at/course/view.php?id=3157
-krizek,SS2016,MIT-VZ-2-SS2016-ITS PRJ I,ITS Project I,https://moodle.technikum-wien.at/course/view.php?id=3175
-krizek,WS2016,MSC-VZ-3-WS2016-IP2,ITS Project II,https://moodle.technikum-wien.at/course/view.php?id=3713
diff --git a/application/tmp/inputFile.csv b/application/tmp/inputFile.csv
deleted file mode 100644
index 48411ca1a..000000000
--- a/application/tmp/inputFile.csv
+++ /dev/null
@@ -1,49 +0,0 @@
-uid,studiensemester,moodle_course_shortname,moodle_course_fullname,moodle_course_url
-aburaia,SS2016,BMR4_MLAB2_2016,BMR4_Mechatronics-Lab2_2016,https://moodle.technikum-wien.at/course/view.php?id=2948
-aburaia,SS2016,BMR6_MES_2016,BMR6_Mechatronische-Systeme_2016,https://moodle.technikum-wien.at/course/view.php?id=2951
-aburaia,SS2016,BMR-VZ-6-SS2016-EMS,Entwurf mechatronischer Systeme,https://moodle.technikum-wien.at/course/view.php?id=2833
-aburaia,WS2016,BMB-VZ-5-WS2016-DF,Industrierobotik in der Digitalen Fabrik,https://moodle.technikum-wien.at/course/view.php?id=4188
-aburaia,WS2016,BMR5_PRAK_2016,BMR5_Berufspraktikum_2016,https://moodle.technikum-wien.at/course/view.php?id=3746
-aburaia,WS2016,BMR-VZ-3-WS2016-PJM,Projektmanagement,https://moodle.technikum-wien.at/course/view.php?id=3452
-aburaia,WS2016,MMR-3-WS2016_PROJ,MMR-3-WS2016 - Projekt,https://moodle.technikum-wien.at/course/view.php?id=3351
-aburaia,WS2016,MMR-BB-1-WS2016-BMECH,Mechatronik 1,https://moodle.technikum-wien.at/course/view.php?id=4038
-aburaia,WS2016,MMR-VZ-1-WS2016-VMECH,Mechatronik 1,https://moodle.technikum-wien.at/course/view.php?id=4037
-aburaia,WS2016,MMR-VZ-4-WS2016-MT,Master Thesis,https://moodle.technikum-wien.at/course/view.php?id=3956
-aburaia,WS2016,MMR-VZB-3-WS2016-PRJ,Projekt,https://moodle.technikum-wien.at/course/view.php?id=3643
-adams,SS2016,BEW-BB-4-SS2016-ENG/67791,Business English 2,https://moodle.technikum-wien.at/course/view.php?id=3034
-adams,SS2016,BEW-DL-2-SS2016-ENG,Technical and Creative Communication,https://moodle.technikum-wien.at/course/view.php?id=2873
-adams,SS2016,BEW-DL-4-SS2016-DLPS,Business Communication for Engineers,https://moodle.technikum-wien.at/course/view.php?id=2883
-adams,SS2016,BEW-DL-6-SS2016-ADC,Advanced Communication,https://moodle.technikum-wien.at/course/view.php?id=2897
-adams,SS2016,BIC-BB-2-SS2016-ENG/68928/68931,Technical and Creative Communication,https://moodle.technikum-wien.at/course/view.php?id=2898
-adams,SS2016,BIW-BB-2-SS2016-PTC/67947,BIW-BB-2-SS2016 - Professional & Technical Communication 2,https://moodle.technikum-wien.at/course/view.php?id=3020
-adams,SS2016,BWI-DL-4-SS2016-BUCdl,Business Communication,https://moodle.technikum-wien.at/course/view.php?id=2879
-adams,SS2016,EWU-VZ-1-SS2016-WUE1,Warm-up Englisch 1,https://moodle.technikum-wien.at/course/view.php?id=3415
-adams,SS2016,MGR-VZ-4-SS2016-ENG/67338,Intensiv Englisch,https://moodle.technikum-wien.at/course/view.php?id=3174
-adams,WS2016,BEW-DL-3-WS2016-DLGI,General Information,https://moodle.technikum-wien.at/course/view.php?id=3481
-adams,WS2016,BEW-DL-3-WS2016-EC,Economics  Technology and Society,https://moodle.technikum-wien.at/course/view.php?id=3414
-adams,WS2016,BIC-BB-1-WS2016-PSC/70705/70740,Professional and Social Communication,https://moodle.technikum-wien.at/course/view.php?id=3559
-adams,WS2016,BIW-BB-1-WS2016-PTC/73126,BIW-BB-1-WS2016 - Professional and Technical Communication 1,https://moodle.technikum-wien.at/course/view.php?id=3403
-adams,WS2016,BIW-BB-3-WS2016-EBE/72699,English for Business and Engineering,https://moodle.technikum-wien.at/course/view.php?id=3938
-adams,WS2016,BSA-VZ-1-WS2016-PSC,Professional and Social Communication,https://moodle.technikum-wien.at/course/view.php?id=3747
-adams,WS2016,BSA-VZ-3-WS2016-TCC,Technical and Creative Communication ,https://moodle.technikum-wien.at/course/view.php?id=3748
-adams,WS2016,BWI-DL-3-WS2016-ENGdl,Econonmics  Technology and Society,https://moodle.technikum-wien.at/course/view.php?id=3608
-adensam,SS2016,MEE-BB-2-SS2016-BEV,Bewertungsverfahren,https://moodle.technikum-wien.at/course/view.php?id=2955
-adensam,WS2016,MEE-BB-3-WS2016-ERT,Energierecht,https://moodle.technikum-wien.at/course/view.php?id=3964
-adensam,WS2016,MEE-BB-3-WS2016-EWT,Energiewirtschaft,https://moodle.technikum-wien.at/course/view.php?id=3794
-adensam,WS2016,MUT-BB-3-WS2016-EM,Energiemanagement,https://moodle.technikum-wien.at/course/view.php?id=3676
-kraft,WS2016,MWI-DL-3-WS2016-MBdl,Mobile Business,https://moodle.technikum-wien.at/course/view.php?id=3589
-kraft,WS2016,MWI-PT-1-WS2016-ITSCpt,IT Strategy and IT Controlling,https://moodle.technikum-wien.at/course/view.php?id=3560
-kraft,WS2016,MWI-PT-3-WS2016-MBpt,Mobile Business,https://moodle.technikum-wien.at/course/view.php?id=3590
-kralc,SS2016,MEE-BB-2-SS2020-AS Anlagentechnik und Simulation (mit Modelica und Dymola),Anlagentechnik und Simulation mit Modelica und Dymola,https://moodle.technikum-wien.at/course/view.php?id=3025
-krametz,WS2016,WS2016-BEE3-ALB,WS2016-BEE3-ALB,https://moodle.technikum-wien.at/course/view.php?id=3624
-kratochv,SS2016,BST-VZ-2-SS2016-MTL,Materialtechnologie - Labor I,https://moodle.technikum-wien.at/course/view.php?id=3332
-kravtche,WS2016,BEW-BB-1-WS2016-LAB,Labor 1,https://moodle.technikum-wien.at/course/view.php?id=3734
-krenn,SS2016,BEW-DL-2-SS2016-PHY/67684,Physics 1,https://moodle.technikum-wien.at/course/view.php?id=2862
-krenn,WS2016,BEW-BB-5-WS2016-WIA,Wissenschaftliches Arbeiten,https://moodle.technikum-wien.at/course/view.php?id=3716
-krenn,WS2016,BEW-DL-3-WS2016-DLGI,General Information,https://moodle.technikum-wien.at/course/view.php?id=3481
-krenn,WS2016,BEW-DL-3-WS2016-PHY,Physics 2,https://moodle.technikum-wien.at/course/view.php?id=3378
-krennk,WS2016,BST-VZ-5-WS2016-BA1-MBAP3,Bachelorarbeit 1 - MBA Projekt 3 ,https://moodle.technikum-wien.at/course/view.php?id=3527
-krennm,SS2016,BBE-VZ-4-SS2016-CSA,Circuitdesign and Signal Analysis,https://moodle.technikum-wien.at/course/view.php?id=2956
-krizek,SS2016,BVU-VZ-6-SS2016-PSB,Praxissemesterbegleitung,https://moodle.technikum-wien.at/course/view.php?id=3157
-krizek,SS2016,MIT-VZ-2-SS2016-ITS PRJ I,ITS Project I,https://moodle.technikum-wien.at/course/view.php?id=3175
-krizek,WS2016,MSC-VZ-3-WS2016-IP2,ITS Project II,https://moodle.technikum-wien.at/course/view.php?id=3713
diff --git a/application/tmp/inputFileMitError.csv b/application/tmp/inputFileMitError.csv
deleted file mode 100644
index 26c53a78d..000000000
--- a/application/tmp/inputFileMitError.csv
+++ /dev/null
@@ -1,11 +0,0 @@
-uid,studiensemester,moodle_course_shortname,moodle_course_fullname,moodle_course_url
-aburaia,SS2016,BMR4_MLAB2_2016,BMR4_Mechatronics-Lab2_2016,https://moodle.technikum-wien.at/course/view.php?id=2948
-aburaia,WS2016,MMR-VZB-3-WS2016-PRJ,,https://moodle.technikum-wien.at/course/view.php?id=3643
-adams,SS2016,BEW-BB-4-SS2016-ENG/67791,Business English 2,https://moodle.technikum-wien.at/course/view.php?id=3034
-adams,SS2016,,Technical and Creative Communication,https://moodle.technikum-wien.at/course/view.php?id=2873
-krizek,SS2016,BVU-VZ-6-SS2016-PSB,Praxissemesterbegleitung,
-krizek,SS2016,MIT-VZ-2-SS2016-ITS PRJ I,ITS Project I,https://moodle.technikum-wien.at/course/view.php?id=3175
-krizek,WS2016,MSC-VZ-3-WS2016-IP2,ITS Project II,https://moodle.technikum-wien.at/course/view.php?id=3713
-kraft,WS2016,MWI-DL-3-WS2016-MBdl,Mobile Business,https://moodle.technikum-wien.at/course/view.php?id=3589
-kraft,,MWI-PT-1-WS2016-ITSCpt,IT Strategy and IT Controlling,https://moodle.technikum-wien.at/course/view.php?id=3560
-kraft,WS2016,MWI-PT-3-WS2016-MBpt,Mobile Business,https://moodle.technikum-wien.at/course/view.php?id=3590
diff --git a/application/tmp/inputFileUltra.csv b/application/tmp/inputFileUltra.csv
deleted file mode 100644
index 927dc0062..000000000
--- a/application/tmp/inputFileUltra.csv
+++ /dev/null
@@ -1,8 +0,0 @@
-uid,studiensemester,moodle_course_shortname,moodle_course_fullname,moodle_course_url
-aburaia,SS2016,BMR4_MLAB2_2016,BMR4_Mechatronics-Lab2_2016,https://moodle.technikum-wien.at/course/view.php?id=2948
-aburaia,WS2016,MMR-VZB-3-WS2016-PRJ,Projekt,https://moodle.technikum-wien.at/course/view.php?id=3643
-adams,SS2016,BEW-BB-4-SS2016-ENG/67791,Business English 2,https://moodle.technikum-wien.at/course/view.php?id=3034
-adams,SS2016,BEW-DL-2-SS2016-ENG,Technical and Creative Communication,https://moodle.technikum-wien.at/course/view.php?id=2873
-krizek,SS2016,BVU-VZ-6-SS2016-PSB,Praxissemesterbegleitung,https://moodle.technikum-wien.at/course/view.php?id=3157
-krizek,SS2016,MIT-VZ-2-SS2016-ITS PRJ I,ITS Project I,https://moodle.technikum-wien.at/course/view.php?id=3175
-krizek,WS2016,MSC-VZ-3-WS2016-IP2,ITS Project II,https://moodle.technikum-wien.at/course/view.php?id=3713

From 08c594148bfb0f20a113b670fc67911e5b023e2d Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 17 May 2023 08:41:04 +0200
Subject: [PATCH 019/175] - details bei abgewiesenen

---
 .../controllers/system/infocenter/InfoCenter.php      | 11 +++++++++--
 .../system/infocenter/infocenterAbgewiesenData.php    | 11 +++++++++++
 .../views/system/infocenter/infocenterDetails.php     |  3 ++-
 3 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 548b071d3..1e6639d25 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -314,7 +314,7 @@ class InfoCenter extends Auth_Controller
 			show_error('Person does not exist!');
 
 		$origin_page = $this->input->get(self::ORIGIN_PAGE);
-		if ($origin_page == self::INDEX_PAGE)
+		if (in_array($origin_page, array(self::INDEX_PAGE, self::ABGEWIESEN_PAGE)))
 		{
 			// mark person as locked for editing
 			$result = $this->PersonLockModel->lockPerson($person_id, $this->_uid, self::APP);
@@ -359,7 +359,14 @@ class InfoCenter extends Auth_Controller
 
 		if (isError($result)) show_error(getError($result));
 
-		$redirectLink = '/'.self::INFOCENTER_URI.'?'.self::FHC_CONTROLLER_ID.'='.$this->getControllerId();
+		$origin_page = $this->input->get(self::ORIGIN_PAGE);
+
+		if ($origin_page === self::ABGEWIESEN_PAGE)
+			$redirectLink = self::INFOCENTER_URI. '/' .self::ABGEWIESEN_PAGE;
+		else
+			$redirectLink = '/'.self::INFOCENTER_URI;
+
+		$redirectLink .= '?'.self::FHC_CONTROLLER_ID.'='.$this->getControllerId();
 
 		// Force reload of Dataset after Unlock
 		$redirectLink .= '&'.self::KEEP_TABLESORTER_FILTER.'=true';
diff --git a/application/views/system/infocenter/infocenterAbgewiesenData.php b/application/views/system/infocenter/infocenterAbgewiesenData.php
index d09f0f41e..94d3d6ee1 100644
--- a/application/views/system/infocenter/infocenterAbgewiesenData.php
+++ b/application/views/system/infocenter/infocenterAbgewiesenData.php
@@ -70,6 +70,7 @@ $query = '
 		'requiredPermissions' => 'infocenter',
 		'datasetRepresentation' => 'tablesorter',
 		'checkboxes' => 'PersonId',
+		'additionalColumns' => array('Details'),
 		'columnsAliases' => array(
 			'PersonId',
 			'PreStudentID',
@@ -82,6 +83,16 @@ $query = '
 		),
 
 		'formatRow' => function($datasetRaw) {
+			/* NOTE: Dont use $this here for PHP Version compatibility */
+			$datasetRaw->{'Details'} = sprintf(
+				'<a href="%s?person_id=%s&origin_page=%s&fhc_controller_id=%s&prev_filter_id=%s">Details</a>',
+				site_url('system/infocenter/InfoCenter/showDetails'),
+				$datasetRaw->{'PersonId'},
+				'abgewiesen',
+				(isset($_GET['fhc_controller_id']) ? $_GET['fhc_controller_id'] : ''),
+				(isset($_GET['filter_id']) ? $_GET['filter_id'] : '')
+			);
+
 			if ($datasetRaw->{'Nachricht'} === null)
 			{
 				$datasetRaw->{'Nachricht'} = 'Nein';
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
index 401e34099..c61bb3cd2 100644
--- a/application/views/system/infocenter/infocenterDetails.php
+++ b/application/views/system/infocenter/infocenterDetails.php
@@ -57,10 +57,11 @@
 							if (isset($lockedby)):
 								echo $this->p->t('global', 'wirdBearbeitetVon').': ';
 								echo $lockedby;
-								if ($origin_page == 'index'):
+								if (in_array($origin_page, array('index', 'abgewiesen'))):
 									$unlockpath = 'unlockPerson/'.$stammdaten->person_id;
 									$unlockpath .= '?fhc_controller_id='.$fhc_controller_id;
 									$unlockpath .= '&filter_id='.$prev_filter_id;
+									$unlockpath .= '&origin_page='.$origin_page;
 							?>
 									&nbsp;&nbsp;
 									<a href="<?php echo $unlockpath; ?>">

From 8584be651b00498d8d03395cfc3469e5fb46c528 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 17 May 2023 15:06:39 +0200
Subject: [PATCH 020/175] - sperren von rts bearbeitet

---
 vilesci/stammdaten/auswertung_fhtw.php | 103 +++++++++++++++++++------
 1 file changed, 79 insertions(+), 24 deletions(-)

diff --git a/vilesci/stammdaten/auswertung_fhtw.php b/vilesci/stammdaten/auswertung_fhtw.php
index e5975b651..2d3d1bc61 100644
--- a/vilesci/stammdaten/auswertung_fhtw.php
+++ b/vilesci/stammdaten/auswertung_fhtw.php
@@ -490,22 +490,58 @@ if ($rtprueflingEntSperren)
 		exit();
 	}
 
-	if (isset($_POST['prestudent_id']) && is_numeric($_POST['prestudent_id'])
+	if (isset($_POST['person_id']) && is_numeric($_POST['person_id'])
 		&& isset($_POST['art']))
 	{
-		$qry = "UPDATE testtool.tbl_pruefling SET gesperrt =" . $db->db_add_param($_POST['art'], 'BOOLEAN') . "
-				WHERE prestudent_id IN 
-						(SELECT prestudent_id FROM public.tbl_prestudent ps
-							JOIN public.tbl_person tp ON tp.person_id = ps.person_id 
-							WHERE tp.person_id = (SELECT person_id FROM public.tbl_prestudent sps WHERE sps.prestudent_id = " . $db->db_add_param($_POST['prestudent_id']) . "));";
+		$qry = "SELECT pruefling_id
+				FROM testtool.tbl_pruefling
+				WHERE prestudent_id IN (
+					SELECT prestudent_id
+					FROM public.tbl_prestudent
+						WHERE person_id = ". $db->db_add_param($_POST['person_id']) . "
+				)";
 
+		
 		if ($result = $db->db_query($qry))
 		{
-			$msg = $_POST['art'] === 'false' ? 'Pruefling wurde gesperrt' : 'Pruefling wurde freigeschaltet';
-			echo json_encode(array(
-				'status' => 'ok',
-				'msg' => $msg));
-			exit();
+			
+			if ($db->db_num_rows($result) === 0)
+			{
+				echo json_encode(array(
+					'status' => 'warning',
+					'msg' => 'Kein Pruefling gefunden!'
+				));
+				exit();
+			}
+			else
+			{
+				$pruefling_ids = array();
+				while ($row = $db->db_fetch_object($result))
+				{
+					$pruefling_ids[] = $row->pruefling_id;
+				}
+				
+				
+				$qry = "UPDATE testtool.tbl_pruefling SET gesperrt =" . $db->db_add_param($_POST['art'], 'BOOLEAN') . "
+						WHERE pruefling_id IN (" . $db->db_implode4SQL($pruefling_ids) . ")";
+				
+				if ($result_update = $db->db_query($qry))
+				{
+					$msg = $_POST['art'] === 'false' ? 'Pruefling wurde gesperrt' : 'Pruefling wurde freigeschaltet';
+					echo json_encode(array(
+						'status' => 'ok',
+						'msg' => $msg));
+					exit();
+				}
+				else
+				{
+					echo json_encode(array(
+						'status' => 'fehler',
+						'msg' => 'Fehler beim speichern der Daten'
+					));
+					exit();
+				}
+			}
 		}
 		else
 		{
@@ -1650,6 +1686,7 @@ if (isset($_REQUEST['reihungstest']) || isset($_POST['rtauswsubmit']))
 	}
 
 	$gebiete_arr = array();
+	$gesperrt_arr = array();
 	while ($row = $db->db_fetch_object($result))
 	{
 		// Hack für BEW-BB, wenn auch BEW-DL-Ergebnisse vorliegen
@@ -1666,7 +1703,10 @@ if (isset($_REQUEST['reihungstest']) || isset($_POST['rtauswsubmit']))
 			$ergebnis[$row->prestudent_id] = new stdClass();
 			$gebiete_arr[$row->prestudent_id] = array();
 		}
-
+		
+		if (!isset($gesperrt_arr[$row->person_id]))
+			$gesperrt_arr[$row->person_id] = new stdClass();
+		
 		$ergebnis[$row->prestudent_id]->prestudent_id = $row->prestudent_id;
 		$ergebnis[$row->prestudent_id]->person_id = $row->person_id;
 		$ergebnis[$row->prestudent_id]->reihungstest_id = $row->reihungstest_id;
@@ -1678,7 +1718,6 @@ if (isset($_REQUEST['reihungstest']) || isset($_POST['rtauswsubmit']))
 		$ergebnis[$row->prestudent_id]->geschlecht = $row->geschlecht;
 		$ergebnis[$row->prestudent_id]->idnachweis = $row->idnachweis;
 		$ergebnis[$row->prestudent_id]->registriert = $row->registriert;
-		$ergebnis[$row->prestudent_id]->gesperrt = $row->gesperrt;
 		$ergebnis[$row->prestudent_id]->stg_kurzbz = $row->stg_kurzbz;
 		$ergebnis[$row->prestudent_id]->stg_bez = $row->stg_bez;
 		$ergebnis[$row->prestudent_id]->ausbildungssemester = $row->ausbildungssemester;
@@ -1690,6 +1729,13 @@ if (isset($_REQUEST['reihungstest']) || isset($_POST['rtauswsubmit']))
 		$ergebnis[$row->prestudent_id]->teilgenommen = $db->db_parse_bool($row->teilgenommen);
 		$ergebnis[$row->prestudent_id]->qualifikationskurs = $db->db_parse_bool($row->qualifikationskurs);
 		$ergebnis[$row->prestudent_id]->letzter_status = $row->letzter_status;
+		$ergebnis[$row->prestudent_id]->gesperrt = $row->gesperrt;
+
+		$gesperrt = $db->db_parse_bool($row->gesperrt);
+		if (!isset($gesperrt_arr[$row->person_id]->gesperrt) || ($gesperrt_arr[$row->person_id]->gesperrt !== true && $gesperrt === true))
+		{
+			$gesperrt_arr[$row->person_id]->gesperrt = $gesperrt;
+		}
 
 		if (!isset($ergebnis[$row->prestudent_id]->gebiet[$row->gebiet_id]))
 		{
@@ -2440,7 +2486,7 @@ else
 			});
 		}
 	}
-	function prueflingEntSperren(prestudent_id, name, art)
+	function prueflingEntSperren(person_id, name, art)
 	{
 		if (art === true)
 			var text = "sperren";
@@ -2450,7 +2496,7 @@ else
 		if (confirm("Wollen Sie den Studenten "+ name + " wirklich " + text + "?"))
 		{
 			data = {
-				prestudent_id: prestudent_id,
+				person_id: person_id,
 				art: art,
 				rtprueflingEntSperren: true
 			};
@@ -2464,21 +2510,30 @@ else
 				{
 					if(data.status !== "ok")
 					{
-						$("#msgbox").attr("class","alert alert-danger");
-						$("#msgbox").show();
-						$("#msgbox").html(data["msg"]);
+						if (data.status === "warning")
+						{
+							$("#msgbox").attr("class","alert alert-warning");
+							$("#msgbox").show();
+							$("#msgbox").html(data["msg"]);
+						}
+						else
+						{
+							$("#msgbox").attr("class","alert alert-danger");
+							$("#msgbox").show();
+							$("#msgbox").html(data["msg"]);
+						}
 					}
 					else
 					{
 						if (art === true)
 						{
-							$("#prueflingentsperren_" + prestudent_id).removeClass("hidden");
-							$("#prueflingsperren_" + prestudent_id).addClass("hidden");
+							$(".prueflingentsperren_" + person_id).removeClass("hidden");
+							$(".prueflingsperren_" + person_id).addClass("hidden");
 						}
 						else if (art === false)
 						{
-							$("#prueflingsperren_" + prestudent_id).removeClass("hidden");
-							$("#prueflingentsperren_" + prestudent_id).addClass("hidden");
+							$(".prueflingsperren_" + person_id).removeClass("hidden");
+							$(".prueflingentsperren_" + person_id).addClass("hidden");
 						}
 					}
 				},
@@ -3293,10 +3348,10 @@ else
 
 
 				echo "<td class='textcentered ".$inaktiv ."'>
-						<a href='#' id='prueflingsperren_".$erg->prestudent_id ."' class='" . ($erg->gesperrt === 't' ? "hidden" : "") ."' onclick='prueflingEntSperren(" . $erg->prestudent_id . ", \"" . $erg->vorname . " " . $erg->nachname ."\"" .", true)'>
+						<a href='#' class='prueflingsperren_".$erg->person_id . ((isset($gesperrt_arr[$erg->person_id]) && $gesperrt_arr[$erg->person_id]->gesperrt === true) ? " hidden" : "") ."' onclick='prueflingEntSperren(" . $erg->person_id . ", \"" . $erg->vorname . " " . $erg->nachname ."\"" .", true)'>
 							<span class='glyphicon glyphicon-remove'></span>
 						</a>
-						<a href='#' id='prueflingentsperren_".$erg->prestudent_id ."' class='" . ($erg->gesperrt !== 't' ? "hidden" : "") ."' onclick='prueflingEntSperren(" . $erg->prestudent_id . ", \"" . $erg->vorname . " " . $erg->nachname ."\"" .", false);'>
+						<a href='#' class='prueflingentsperren_".$erg->person_id . ((isset($gesperrt_arr[$erg->person_id]) && $gesperrt_arr[$erg->person_id]->gesperrt !== true ? " hidden" : "")) . "' onclick='prueflingEntSperren(" . $erg->person_id . ", \"" . $erg->vorname . " " . $erg->nachname ."\"" .", false);'>
 							<span class='glyphicon glyphicon-ok'></span>
 						</a>
 					</td>";

From 54de577eee823a1e4def530cd2b43046fec1feae Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 17 May 2023 15:08:52 +0200
Subject: [PATCH 021/175] - ausblenden des warnings

---
 vilesci/stammdaten/auswertung_fhtw.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/vilesci/stammdaten/auswertung_fhtw.php b/vilesci/stammdaten/auswertung_fhtw.php
index 2d3d1bc61..e72c03bc5 100644
--- a/vilesci/stammdaten/auswertung_fhtw.php
+++ b/vilesci/stammdaten/auswertung_fhtw.php
@@ -2515,6 +2515,7 @@ else
 							$("#msgbox").attr("class","alert alert-warning");
 							$("#msgbox").show();
 							$("#msgbox").html(data["msg"]);
+							$("#msgbox").html(data["msg"]).delay(2000).fadeOut();
 						}
 						else
 						{

From 2f573263ba5cb3d00ef3e018cf2684048ef32b7c Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 17 May 2023 16:00:34 +0200
Subject: [PATCH 022/175] - abfrage ob der pruefling bereits gesperrt ist

---
 cis/testtool/frage.php      |  2 +-
 include/pruefling.class.php | 26 ++++++++++++++++++++++++++
 2 files changed, 27 insertions(+), 1 deletion(-)

diff --git a/cis/testtool/frage.php b/cis/testtool/frage.php
index 6f47992a1..9f6cd4fb7 100644
--- a/cis/testtool/frage.php
+++ b/cis/testtool/frage.php
@@ -161,7 +161,7 @@ if(!isset($_SESSION['pruefling_id']))
 $pruefling = new pruefling();
 $pruefling->load($_SESSION['pruefling_id']);
 
-if ($pruefling->gesperrt === 't')
+if ($pruefling->isGesperrt($_SESSION['pruefling_id']))
 	die("<script>document.location.href='prueflinggesperrt.php';</script>");
 
 if (!in_array($gebiet_id, $_SESSION['alleGebiete']))
diff --git a/include/pruefling.class.php b/include/pruefling.class.php
index fc64d90c4..2a482d793 100644
--- a/include/pruefling.class.php
+++ b/include/pruefling.class.php
@@ -557,5 +557,31 @@ class pruefling extends basis_db
 			return false;
 		}
 	}
+	
+	public function isGesperrt($pruefling_id)
+	{
+		$qry = "SELECT spruefling.gesperrt
+				FROM testtool.tbl_pruefling
+				JOIN public.tbl_prestudent USING(prestudent_id)
+				JOIN public.tbl_person USING (person_id)
+				JOIN public.tbl_prestudent pss ON pss.person_id = tbl_person.person_id
+				JOIN testtool.tbl_pruefling spruefling ON pss.prestudent_id = spruefling.prestudent_id
+				WHERE tbl_pruefling.pruefling_id = ".$this->db_add_param($pruefling_id, FHC_INTEGER)."
+					AND spruefling.gesperrt
+				LIMIT 1";
+		
+		if($result = $this->db_query($qry))
+		{
+			if ($this->db_num_rows($result) == 0)
+				return false;
+			else
+				return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler bei einer Abfrage';
+			return false;
+		}
+	}
 }
 ?>

From 311d235fda8cad5e69ac78702ef50a4106c45c4c Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 17 May 2023 16:35:22 +0200
Subject: [PATCH 023/175] - abgewiesene gesperrt von spalte

---
 .../infocenter/infocenterAbgewiesenData.php   | 33 +++++++++++++++++++
 system/filtersupdate.php                      |  3 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/application/views/system/infocenter/infocenterAbgewiesenData.php b/application/views/system/infocenter/infocenterAbgewiesenData.php
index 94d3d6ee1..2307ea87e 100644
--- a/application/views/system/infocenter/infocenterAbgewiesenData.php
+++ b/application/views/system/infocenter/infocenterAbgewiesenData.php
@@ -1,6 +1,7 @@
 <?php
 
 	$this->config->load('infocenter');
+	$APP = '\'infocenter\'';
 	$ABGEWIESENEN_STATUS = '\'Abgewiesener\'';
 	$STUDIENGANG_TYP = '\''.$this->variablelib->getVar('infocenter_studiensgangtyp').'\'';
 	$ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz');
@@ -17,6 +18,8 @@ $query = '
 			p.nachname AS "Nachname",
 			so.studiengangkurzbzlang as "Studiengang",
 			pss.insertamum AS "AbgewiesenAm",
+			pl.zeitpunkt AS "LockDate",
+			pl.lockuser AS "LockUser",
 			(
 				SELECT l.zeitpunkt
 				FROM system.tbl_log l
@@ -54,6 +57,15 @@ $query = '
 			JOIN public.tbl_studiengang sg USING(studiengang_kz)
 			JOIN lehre.tbl_studienplan sp USING(studienplan_id)
 			JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
+			LEFT JOIN (
+				SELECT tpl.person_id,
+					   tpl.zeitpunkt,
+					   sp.nachname AS lockuser
+				  FROM system.tbl_person_lock tpl
+				  JOIN public.tbl_benutzer sb USING (uid)
+				  JOIN public.tbl_person sp ON sb.person_id = sp.person_id
+				 WHERE tpl.app = '.$APP.'
+			 ) pl USING(person_id)
 		WHERE pss.status_kurzbz = '. $ABGEWIESENEN_STATUS .'
 		AND pss.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
 		AND (sg.typ IN ('. $STUDIENGANG_TYP .') 
@@ -78,6 +90,8 @@ $query = '
 			ucfirst($this->p->t('person', 'nachname')),
 			ucfirst($this->p->t('lehre', 'studiengang')),
 			ucfirst($this->p->t('infocenter', 'abgewiesenam')),
+			ucfirst($this->p->t('global', 'sperrdatum')),
+			ucfirst($this->p->t('global', 'gesperrtVon')),
 			ucfirst($this->p->t('global', 'nachricht')),
 			ucfirst($this->p->t('infocenter', 'kaution'))
 		),
@@ -114,10 +128,29 @@ $query = '
 			{
 				$datasetRaw->{'Kaution'} = 'Offen';
 			}
+			
+			if ($datasetRaw->{'LockDate'} == null)
+			{
+				$datasetRaw->{'LockDate'} = '-';
+			}
+			
+			if ($datasetRaw->{'LockUser'} == null)
+			{
+				$datasetRaw->{'LockUser'} = '-';
+			}
 
 			$datasetRaw->{'AbgewiesenAm'} = date_format(date_create($datasetRaw->{'AbgewiesenAm'}),'Y-m-d H:i');
 			return $datasetRaw;
+		},
+		
+		'markRow' => function($datasetRaw) {
+			
+			if ($datasetRaw->LockDate != null)
+			{
+				return FilterWidget::DEFAULT_MARK_ROW_CLASS;
+			}
 		}
+		
 	);
 
 	echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 2ed253422..abdea4532 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -520,7 +520,8 @@ $filters = array(
 					{"name": "Studiengang"},
 					{"name": "AbgewiesenAm"},
 					{"name": "Nachricht"},
-					{"name": "Kaution"}
+					{"name": "Kaution"},
+					{"name": "LockUser"}
 				],
 				"filters": []
 			}

From 5001713d16177e0470bb443337289e3ded3c9da7 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 19 May 2023 07:51:25 +0200
Subject: [PATCH 024/175] Erzwingen von Reload nach jeder Freigabe

---
 .../benotungstool/lvgesamtnoteverwalten.php   | 288 +++++++++---------
 1 file changed, 146 insertions(+), 142 deletions(-)

diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
index d498636ae..c32fa43e6 100644
--- a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
+++ b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
@@ -104,6 +104,152 @@ $sprachen->getAll(true);
 
 $errormsg = '';
 
+// eingetragene lv-gesamtnoten freigeben
+if (isset($_REQUEST["freigabe"]) && ($_REQUEST["freigabe"] == 1))
+{
+	// Passwort pruefen
+	if (checkldapuser($user, $_REQUEST['passwort']))
+	{
+		$jetzt = date("Y-m-d H:i:s");
+		$neuenoten = 0;
+
+		$studlist = "<table border='1'>
+		<tr>";
+
+		// entweder personenbezogene Daten einbinden
+		if (defined('CIS_GESAMTNOTE_FREIGABEMAIL_NOTE') && CIS_GESAMTNOTE_FREIGABEMAIL_NOTE)
+        {
+            $studlist .= "
+                <td><b>" . $p->t('global/personenkz') . "</b></td>
+                <td><b>" . $p->t('global/studiengang') . "</b></td>
+			    <td><b>" . $p->t('global/nachname') . "</b></td>
+			    <td><b>" . $p->t('global/vorname') . "</b></td>
+            ";
+
+            if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
+            {
+                $studlist .= "<td><b>" . $p->t('benotungstool/punkte') . "</b></td>\n";
+            }
+            $studlist .= "<td><b>" . $p->t('benotungstool/note') . "</b></td>\n";
+
+            $studlist .= "<td><b>" . $p->t('benotungstool/bearbeitetvon') . "</b></td></tr>\n";
+		}
+		// oder anonymisiert nur die UIDs einbinden
+		else
+		{
+			$studlist .= "
+                <td><b>" . $p->t('global/uid') . "</b></td></tr>\n
+            ";
+		}
+
+		// studentenquery
+		$qry_stud = "SELECT
+						DISTINCT uid, vorname, nachname, matrikelnr, kurzbzlang
+					FROM
+						campus.vw_student_lehrveranstaltung
+						JOIN campus.vw_student USING(uid)
+						JOIN public.tbl_studiengang ON campus.vw_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
+					WHERE
+						studiensemester_kurzbz = " . $db->db_add_param($stsem) . "
+						AND lehrveranstaltung_id = " . $db->db_add_param($lvid, FHC_INTEGER) . "
+					ORDER BY nachname, vorname ";
+		if ($result_stud = $db->db_query($qry_stud))
+		{
+			$i = 1;
+			while ($row_stud = $db->db_fetch_object($result_stud))
+			{
+				$lvgesamtnote = new lvgesamtnote();
+				if ($lvgesamtnote->load($lvid, $row_stud->uid, $stsem))
+				{
+					if ($lvgesamtnote->benotungsdatum > $lvgesamtnote->freigabedatum)
+					{
+						$lvgesamtnote->freigabedatum = $jetzt;
+						$lvgesamtnote->freigabevon_uid = $user;
+						$lvgesamtnote->save();
+
+						if (defined('CIS_GESAMTNOTE_FREIGABEMAIL_NOTE') && CIS_GESAMTNOTE_FREIGABEMAIL_NOTE)
+						{
+							$studlist .= "<tr><td>" . trim($row_stud->matrikelnr) . "</td>";
+							$studlist .= "<td>" . trim($row_stud->kurzbzlang) . "</td>";
+							$studlist .= "<td>" . trim($row_stud->nachname) . "</td>";
+							$studlist .= "<td>" . trim($row_stud->vorname) . "</td>";
+
+                            if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
+                            {
+                                $studlist .= "<td>";
+                                if ($lvgesamtnote->punkte != '')
+                                    $studlist .= trim(number_format($lvgesamtnote->punkte, 2));
+                                $studlist .= "</td>\n";
+                            }
+                            $studlist .= "<td>" . $noten_array[trim($lvgesamtnote->note)]['bezeichnung_mehrsprachig'][$sprache] . "</td>";
+
+                            $studlist .= "<td>" . $lvgesamtnote->mitarbeiter_uid;
+                            if ($lvgesamtnote->updatevon != '')
+                                $studlist .= " (" . $lvgesamtnote->updatevon . ")";
+                            $studlist .= "</td></tr>\n";
+						}
+						else
+						{
+							$studlist .= "<tr><td>" . trim($row_stud->uid) . "</td></tr>\n";
+						}
+
+						$neuenoten ++;
+					}
+				}
+			}
+		}
+
+		$studlist .= "</table>";
+
+		// mail an assistentin und den user selber verschicken
+		if ($neuenoten > 0)
+		{
+			$lv = new lehrveranstaltung($lvid);
+			$sg = new studiengang($lv->studiengang_kz);
+			$lektor_adresse = $user . "@" . DOMAIN;
+			$adressen = $sg->email . ", " . $user . "@" . DOMAIN;
+
+			$studienplan = new studienplan();
+			$studienplan->getStudienplanLehrveranstaltung($lvid, $stsem);
+			$studienplan_bezeichnung = '';
+			foreach ($studienplan->result as $row)
+				$studienplan_bezeichnung .= $row->bezeichnung . ' ';
+
+			$mit = new mitarbeiter();
+			$mit->load($user);
+			$name = $mit->anrede.' '.$mit->vorname.' '.$mit->nachname.' ('.$mit->kurzbz.')';
+
+			$betreff = 'Notenfreigabe ' . $lv->bezeichnung . ' ' . $lv->orgform_kurzbz . ' - ' . $studienplan_bezeichnung;
+			$mail = new mail($adressen, 'vilesci@' . DOMAIN, $betreff, '');
+			$htmlcontent = "<html>
+				<body>
+					$name hat neue Noten für die Lehrveranstaltung\n\n<br>
+					<b>" . $sg->kuerzel . ' ' . $lv->semester . '.Semester
+					' . $lv->bezeichnung . " " . $lv->orgform_kurzbz . " - " . $stsem . "</b>
+					<br>eingetragen.\n<br><br>
+					Die Noten können jetzt ins Zeugnis übernommen werden.\n";
+
+            $htmlcontent .= $studlist;
+
+			$htmlcontent.= "
+					<br>Anzahl der Noten:" . $neuenoten . "
+					<br><br>" . $p->t('abgabetool/mailVerschicktAn') . ": " . $adressen . "
+				</body></html>";
+			$mail->setHTMLContent($htmlcontent);
+			$mail->setReplyTo($lektor_adresse);
+			$mail->send();
+		}
+
+		http_response_code(303);
+		header('Location: ' . $_SERVER['REQUEST_URI']);
+		exit;
+	}
+	else
+	{
+		$errormsg = $p->t('gesamtnote/passwortFalsch');
+	}
+}
+
 echo '<!DOCTYPE HTML>
 <html>
 <head>
@@ -926,148 +1072,6 @@ if (defined('CIS_ANWESENHEITSLISTE_NOTENLISTE_ANZEIGEN') && CIS_ANWESENHEITSLIST
 	echo "<br><a class='Item' href='" . $hrefpath . "'>" . $p->t('benotungstool/notenlisteImport') . "</a>";
 }
 
-// eingetragene lv-gesamtnoten freigeben
-if (isset($_REQUEST["freigabe"]) && ($_REQUEST["freigabe"] == 1))
-{
-	// Passwort pruefen
-	if (checkldapuser($user, $_REQUEST['passwort']))
-	{
-		$jetzt = date("Y-m-d H:i:s");
-		$neuenoten = 0;
-
-		$studlist = "<table border='1'>
-		<tr>";
-
-		// entweder personenbezogene Daten einbinden
-		if (defined('CIS_GESAMTNOTE_FREIGABEMAIL_NOTE') && CIS_GESAMTNOTE_FREIGABEMAIL_NOTE)
-        {
-            $studlist .= "
-                <td><b>" . $p->t('global/personenkz') . "</b></td>
-                <td><b>" . $p->t('global/studiengang') . "</b></td>
-			    <td><b>" . $p->t('global/nachname') . "</b></td>
-			    <td><b>" . $p->t('global/vorname') . "</b></td>
-            ";
-
-            if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
-            {
-                $studlist .= "<td><b>" . $p->t('benotungstool/punkte') . "</b></td>\n";
-            }
-            $studlist .= "<td><b>" . $p->t('benotungstool/note') . "</b></td>\n";
-
-            $studlist .= "<td><b>" . $p->t('benotungstool/bearbeitetvon') . "</b></td></tr>\n";
-		}
-		// oder anonymisiert nur die UIDs einbinden
-		else
-		{
-			$studlist .= "
-                <td><b>" . $p->t('global/uid') . "</b></td></tr>\n
-            ";
-		}
-
-		// studentenquery
-		$qry_stud = "SELECT
-						DISTINCT uid, vorname, nachname, matrikelnr, kurzbzlang
-					FROM
-						campus.vw_student_lehrveranstaltung
-						JOIN campus.vw_student USING(uid)
-						JOIN public.tbl_studiengang ON campus.vw_student.studiengang_kz = public.tbl_studiengang.studiengang_kz
-					WHERE
-						studiensemester_kurzbz = " . $db->db_add_param($stsem) . "
-						AND lehrveranstaltung_id = " . $db->db_add_param($lvid, FHC_INTEGER) . "
-					ORDER BY nachname, vorname ";
-		if ($result_stud = $db->db_query($qry_stud))
-		{
-			$i = 1;
-			while ($row_stud = $db->db_fetch_object($result_stud))
-			{
-				$lvgesamtnote = new lvgesamtnote();
-				if ($lvgesamtnote->load($lvid, $row_stud->uid, $stsem))
-				{
-					if ($lvgesamtnote->benotungsdatum > $lvgesamtnote->freigabedatum)
-					{
-						$lvgesamtnote->freigabedatum = $jetzt;
-						$lvgesamtnote->freigabevon_uid = $user;
-						$lvgesamtnote->save();
-
-						if (defined('CIS_GESAMTNOTE_FREIGABEMAIL_NOTE') && CIS_GESAMTNOTE_FREIGABEMAIL_NOTE)
-						{
-							$studlist .= "<tr><td>" . trim($row_stud->matrikelnr) . "</td>";
-							$studlist .= "<td>" . trim($row_stud->kurzbzlang) . "</td>";
-							$studlist .= "<td>" . trim($row_stud->nachname) . "</td>";
-							$studlist .= "<td>" . trim($row_stud->vorname) . "</td>";
-
-                            if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
-                            {
-                                $studlist .= "<td>";
-                                if ($lvgesamtnote->punkte != '')
-                                    $studlist .= trim(number_format($lvgesamtnote->punkte, 2));
-                                $studlist .= "</td>\n";
-                            }
-                            $studlist .= "<td>" . $noten_array[trim($lvgesamtnote->note)]['bezeichnung_mehrsprachig'][$sprache] . "</td>";
-
-                            $studlist .= "<td>" . $lvgesamtnote->mitarbeiter_uid;
-                            if ($lvgesamtnote->updatevon != '')
-                                $studlist .= " (" . $lvgesamtnote->updatevon . ")";
-                            $studlist .= "</td></tr>\n";
-						}
-						else
-						{
-							$studlist .= "<tr><td>" . trim($row_stud->uid) . "</td></tr>\n";
-						}
-
-						$neuenoten ++;
-					}
-				}
-			}
-		}
-
-		$studlist .= "</table>";
-
-		// mail an assistentin und den user selber verschicken
-		if ($neuenoten > 0)
-		{
-			$lv = new lehrveranstaltung($lvid);
-			$sg = new studiengang($lv->studiengang_kz);
-			$lektor_adresse = $user . "@" . DOMAIN;
-			$adressen = $sg->email . ", " . $user . "@" . DOMAIN;
-
-			$studienplan = new studienplan();
-			$studienplan->getStudienplanLehrveranstaltung($lvid, $stsem);
-			$studienplan_bezeichnung = '';
-			foreach ($studienplan->result as $row)
-				$studienplan_bezeichnung .= $row->bezeichnung . ' ';
-
-			$mit = new mitarbeiter();
-			$mit->load($user);
-			$name = $mit->anrede.' '.$mit->vorname.' '.$mit->nachname.' ('.$mit->kurzbz.')';
-
-			$betreff = 'Notenfreigabe ' . $lv->bezeichnung . ' ' . $lv->orgform_kurzbz . ' - ' . $studienplan_bezeichnung;
-			$mail = new mail($adressen, 'vilesci@' . DOMAIN, $betreff, '');
-			$htmlcontent = "<html>
-				<body>
-					$name hat neue Noten für die Lehrveranstaltung\n\n<br>
-					<b>" . $sg->kuerzel . ' ' . $lv->semester . '.Semester
-					' . $lv->bezeichnung . " " . $lv->orgform_kurzbz . " - " . $stsem . "</b>
-					<br>eingetragen.\n<br><br>
-					Die Noten können jetzt ins Zeugnis übernommen werden.\n";
-
-            $htmlcontent .= $studlist;
-
-			$htmlcontent.= "
-					<br>Anzahl der Noten:" . $neuenoten . "
-					<br><br>" . $p->t('abgabetool/mailVerschicktAn') . ": " . $adressen . "
-				</body></html>";
-			$mail->setHTMLContent($htmlcontent);
-			$mail->setReplyTo($lektor_adresse);
-			$mail->send();
-		}
-	}
-	else
-	{
-		$errormsg = $p->t('gesamtnote/passwortFalsch');
-	}
-}
-
 if (defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
 {
 	$onclickpath = "notenschluessel.php?lehrveranstaltung_id=$lvid&stsem=$stsem";

From f993780ec355cfec7b1612d4ab3878191c275daa Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 23 May 2023 13:17:27 +0200
Subject: [PATCH 025/175] - texte und anzeige angepasst

---
 include/reihungstest.class.php | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/include/reihungstest.class.php b/include/reihungstest.class.php
index 2da424af5..633ddf1da 100644
--- a/include/reihungstest.class.php
+++ b/include/reihungstest.class.php
@@ -688,14 +688,14 @@ class reihungstest extends basis_db
 					tbl_reihungstest.aufnahmegruppe_kurzbz,
 					tbl_studiengang.typ,
 					UPPER(typ::varchar(1) || kurzbz) AS stg_kuerzel,
-			       	tbl_studiengang.bezeichnung,
-					tbl_studiengang.english
+					so.studiengangbezeichnung as bezeichnung,
+       				so.studiengangbezeichnung_englisch as english
 				FROM
 					public.tbl_rt_person
-				JOIN 
-					public.tbl_reihungstest ON (rt_id=reihungstest_id)
-				LEFT JOIN
-					public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
+				JOIN public.tbl_reihungstest ON (rt_id=reihungstest_id)
+				JOIN public.tbl_studiengang ON tbl_reihungstest.studiengang_kz = tbl_studiengang.studiengang_kz
+				JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+				JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
 				WHERE
 					tbl_rt_person.person_id=".$this->db_add_param($person_id);
 

From 09bc98543138f75d16a9e4b7a968a58b19f7f071 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 23 May 2023 16:08:50 +0200
Subject: [PATCH 026/175] Notenumrechnung beim Punkteimport, Fehlermeldung wenn
 Note oder Punkte fehlen.

---
 .../benotungstool/lvgesamtnoteverwalten.php   | 149 ++++++++++++------
 .../benotungstool/nachpruefungeintragen.php   |  15 ++
 cis/private/lehre/notenliste.xls.php          |  20 ++-
 3 files changed, 132 insertions(+), 52 deletions(-)

diff --git a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
index c32fa43e6..6dce2b6ae 100644
--- a/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
+++ b/cis/private/lehre/benotungstool/lvgesamtnoteverwalten.php
@@ -341,6 +341,9 @@ foreach ($noten_obj->result as $row)
 }
 
 ?>
+
+	const CIS_GESAMTNOTE_PUNKTE = <?php echo CIS_GESAMTNOTE_PUNKTE ? 'true' : 'false';?>;
+
 	function getOffset(pos)
 	{
 		var x,y;
@@ -799,33 +802,48 @@ foreach ($noten_obj->result as $row)
 		}
 		?>
 
+		var linenumber = 0;
 		for(row in rows)
 		{
-			zeile = rows[row].split("	");
-
-			<?php
-			// If CIS_GESAMTNOTE_PUNKTE is false, check for valid grades
-			if (CIS_GESAMTNOTE_PUNKTE == false)
-				echo '	// check for valid grades
-				if (validGrades.indexOf(zeile[1]) === -1 && typeof(zeile[1]) != "undefined" && zeile[1] != "")
-				{
-					alertMsg = alertMsg+"Die Note "+zeile[1]+" ist nicht zulaessig. Die Zeile wurde uebersprungen. \n";
-					continue;
-				}';
-			?>
-
-			if (zeile[0]!='' && zeile[1]!='')
+			linenumber++;
+			if( rows[row] == '' ) 
 			{
-				gradedata['matrikelnr_'+i]=zeile[0];
-				<?php
-				if (CIS_GESAMTNOTE_PUNKTE)
-					echo "gradedata['punkte_'+i]= zeile[1];";
-				else
-					echo "gradedata['note_'+i]= zeile[1];";
-				?>
-
-				i++;
+				//skip empty lines
+				continue;
 			}
+			zeile = rows[row].split("	");
+			
+			if( zeile.length < 2 )
+			{
+			  alertMsg = alertMsg + "Zeile " + linenumber + ': ' 
+			  + 'Zu wenig Paramter - 2 erforderlich.  '
+			  + 'Die Zeile wurde uebersprungen.' + "\n\n";
+			  continue;
+			}
+
+			if (CIS_GESAMTNOTE_PUNKTE == false)
+			{
+				// check for valid grades
+				if (validGrades.indexOf(zeile[1]) === -1)
+				{
+					alertMsg = alertMsg + "Zeile " + linenumber + ': '
+						+ "Die Note "+zeile[1]+" ist nicht zulaessig. "
+						+ "Die Zeile wurde uebersprungen. \n\n";
+					continue;
+				}
+			}
+
+			gradedata['matrikelnr_'+i]=zeile[0];
+			if (CIS_GESAMTNOTE_PUNKTE)
+			{
+				gradedata['punkte_'+i]= zeile[1];
+			}
+			else
+			{
+				gradedata['note_'+i]= zeile[1];
+			}
+
+			i++;
 		}
 
 		if (alertMsg != "")
@@ -895,35 +913,70 @@ foreach ($noten_obj->result as $row)
 		}
 		?>
 
-
+		var linenumber = 0;
 		for(row in rows)
 		{
-			zeile = rows[row].split("	");
-
-			<?php
-			// If CIS_GESAMTNOTE_PUNKTE is false, check for valid grades
-			if (CIS_GESAMTNOTE_PUNKTE == false)
-				echo '	// check for valid grades
-				if (validGrades.indexOf(zeile[2]) === -1 && typeof(zeile[2]) != "undefined" && zeile[2] != "")
-				{
-					alertMsg = alertMsg+"Die Note "+zeile[2]+" ist nicht zulaessig. Die Zeile wurde uebersprungen. \n";
-					continue;
-				}';
-			?>
-
-			if (zeile[0]!='' && zeile[1]!='' && zeile[2]!='')
+			linenumber++;
+			if( rows[row] == '' ) 
 			{
-				gradedata['student_uid_'+i]=zeile[0];
-				gradedata['datumNachp_'+i]=zeile[1];
-				<?php
-				if (CIS_GESAMTNOTE_PUNKTE)
-					echo "gradedata['punkte_'+i]= zeile[2];";
-				else
-					echo "gradedata['note_'+i]= zeile[2];";
-				?>
-
-				i++;
+				//skip empty lines
+				continue;
 			}
+			zeile = rows[row].split("	");
+			
+			if( zeile.length < 3 )
+			{
+			  alertMsg = alertMsg + "Zeile " + linenumber + ': ' 
+			  + 'Zu wenig Paramter - 3 erforderlich.  '
+			  + 'Die Zeile wurde uebersprungen.' + "\n\n";
+			  continue;
+			}
+			
+			if( zeile[1] == '' && zeile[2] == '' )
+			{
+				// ignore lines just copied from excel 
+				continue;
+			}
+			
+			if( zeile[2] == '' ) 
+			{
+				alertMsg = alertMsg + "Zeile " + linenumber + ': '
+					+ "Die Note oder Punkte fehlen. "
+					+ "Die Zeile wurde uebersprungen. \n\n";
+				continue;			
+			}
+			
+			if (CIS_GESAMTNOTE_PUNKTE == false) 
+			{
+				// check for valid grades
+				if (validGrades.indexOf(zeile[2]) === -1)
+				{
+					alertMsg = alertMsg + "Zeile " + linenumber + ': '
+						+ "Die Note "+zeile[2]+" ist nicht zulaessig. "
+						+ "Die Zeile wurde uebersprungen. \n\n";
+					continue;
+				}
+			}
+
+			if( !zeile[1].match(/[0-9]{2}\.[0-9]{2}\.[0-9]{4}/)  ) 
+			{
+				alertMsg = alertMsg + "Zeile " + linenumber + ': '
+					+ "Das Datum "+zeile[1]+" fehlt oder ist nicht zulaessig. "
+					+ "Die Zeile wurde uebersprungen. \n\n";
+				continue;
+			}
+
+			gradedata['student_uid_'+i]=zeile[0];
+			gradedata['datumNachp_'+i]=zeile[1];
+			if (CIS_GESAMTNOTE_PUNKTE)
+			{
+				gradedata['punkte_'+i]= zeile[2];
+			}
+			else
+			{
+				gradedata['note_'+i]= zeile[2];
+			}
+			i++;
 		}
 
 
diff --git a/cis/private/lehre/benotungstool/nachpruefungeintragen.php b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
index 804ab34fb..873c0f173 100644
--- a/cis/private/lehre/benotungstool/nachpruefungeintragen.php
+++ b/cis/private/lehre/benotungstool/nachpruefungeintragen.php
@@ -130,6 +130,17 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 				continue;
 			}
 			$punkte=str_replace(',', '.', $punkte);
+			if($punkte!='')
+			{
+				// Bei Punkteeingabe wird die Note nochmals geprueft und ggf korrigiert
+				$notenschluessel = new notenschluessel();
+				$note_pruef = $notenschluessel->getNote($punkte, $lvid, $stsem);
+				if($note_pruef!=$note)
+				{
+					$note = $note_pruef;
+					$note_dirty=true;
+				}
+			}
 
 			$datum = $_POST['datumNachp_'.$id];
 			//check Datumsformat
@@ -172,6 +183,10 @@ if (isset($_REQUEST['sammel']) && $_REQUEST["sammel"] == 1)
 						$note = $noten_anmerkung[$note];
 				}
 				$response = savePruefung($lvid, $student_uid, $stsem, $lehreinheit_id, $datum, $typ, $note, $punkte);
+				if($response!='neu' && $response!='update' && $response!='update_f')
+				{
+					echo $response;
+				}
 			}
 			else
 			{
diff --git a/cis/private/lehre/notenliste.xls.php b/cis/private/lehre/notenliste.xls.php
index 2e0403139..63cf45d29 100644
--- a/cis/private/lehre/notenliste.xls.php
+++ b/cis/private/lehre/notenliste.xls.php
@@ -226,7 +226,7 @@ else
 
 	if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
 	{
-		$worksheet->write($lines,8,$p->t('global/uid'),$format_border_bottom);
+		$worksheet->write($lines,8,$p->t('global/personenkennzeichen'),$format_border_bottom);
 		$worksheet->write($lines,9,$p->t('global/datum'),$format_border_bottom);
 		if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
 		$worksheet->write($lines,10,$p->t('benotungstool/punkte'),$format_border_bottom);
@@ -236,7 +236,7 @@ else
 
 	if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 {
-	$worksheet->write($lines,12,$p->t('global/uid'),$format_border_bottom);
+	$worksheet->write($lines,12,$p->t('global/personenkennzeichen'),$format_border_bottom);
 	$worksheet->write($lines,13,$p->t('global/datum'),$format_border_bottom);
 	if(defined('CIS_GESAMTNOTE_PUNKTE') && CIS_GESAMTNOTE_PUNKTE)
 		$worksheet->write($lines,14,$p->t('benotungstool/punkte'),$format_border_bottom);
@@ -328,7 +328,7 @@ else
 					// Nachprüfung
 					if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
 					{
-						$worksheet->write($lines,8, $elem->uid, $format_highlightright);
+						$worksheet->write($lines,8, '="'.trim($elem->matrikelnr).'"', $format_highlight);
 						$pr = new Pruefung();
 						$pr->getPruefungen($elem->uid, "Termin2", $lvid, $sem);
 						$output2 = $pr->result;
@@ -349,7 +349,7 @@ else
 					// Nachprüfung
 					if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
 					{
-						$worksheet->write($lines,12, $elem->uid, $format_highlightright);
+						$worksheet->write($lines,12, '="'.trim($elem->matrikelnr).'"', $format_highlight);
 						$pr = new Pruefung();
 						$pr->getPruefungen($elem->uid, "Termin3", $lvid, $sem);
 						$output3 = $pr->result;
@@ -420,5 +420,17 @@ else
 	$worksheet->setColumn(0, 3, 25);
 	$worksheet->setColumn(0, 4, 7);
 	$worksheet->setColumn(0, 5, 21);
+	
+	if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN2') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN2)
+	{
+		$worksheet->setColumn(8, 8, 15);
+		$worksheet->setColumn(9, 9, 10);
+	}
+	if (defined('CIS_GESAMTNOTE_PRUEFUNG_TERMIN3') && CIS_GESAMTNOTE_PRUEFUNG_TERMIN3)
+	{
+		$worksheet->setColumn(12, 12, 15);
+		$worksheet->setColumn(13, 13, 10);
+	}
+	
 	$workbook->close();
 ?>

From 9e883a48a05eb8ae56414a574461ad4db20a61db Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 2 Jun 2023 09:02:47 +0200
Subject: [PATCH 027/175] Adaptierungen Icalfiles Coole

---
 cis/public/coodle.php    |  93 ++---
 include/coodle.class.php | 722 ++++++++++++++++++++-------------------
 2 files changed, 420 insertions(+), 395 deletions(-)

diff --git a/cis/public/coodle.php b/cis/public/coodle.php
index 721f2d3c0..2b8421db0 100644
--- a/cis/public/coodle.php
+++ b/cis/public/coodle.php
@@ -571,7 +571,7 @@ if (isset($_GET['resend']))
 
 			echo "<div id='coodle_content' >
 						<form action='' method='POST'>
-	
+
 					<table class='table-bordered'>
 					<tr><td></td>";
 			// Für Colspan bei Datum
@@ -675,7 +675,6 @@ if (isset($_GET['resend']))
 				}
 				else
 				{
-
 					// Ort-Ressourcen ueberspringen
 					if ($ressource->ort_kurzbz != '')
 					{
@@ -761,8 +760,8 @@ if (isset($_GET['resend']))
 								echo '	<td class="'.$class.'" align="center" '.$style.'>
 									<div class="checkbox">
 										<label style="font-size: 1.5em; padding-left: 10px">
-											<input  type="checkbox" 
-													value="" 
+											<input  type="checkbox"
+													value=""
 													'.($checked ? 'checked="checked"' : '').'
 													'.($termin->datum == '1900-01-01' ? 'id="disableCheckboxes"' : '').'
 													name="check_'.$ressource->coodle_ressource_id.'_'.$termin->coodle_termin_id.'"
@@ -867,8 +866,8 @@ if (isset($_GET['resend']))
 			<span class="glyphicon glyphicon-info-sign"></span>
 			Sie können ihre vorläufigen Terminzusagen in ihr Kalendersystem einbinden.<br>
 			Importieren Sie dazu die .ics-Datei des folgenden Links in ihren Kalender:<br>
-			<a href="'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid,LVPLAN_CYPHER_KEY).'" target="_blank">
-			'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid,LVPLAN_CYPHER_KEY).'
+			<a href="'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid, LVPLAN_CYPHER_KEY).'" target="_blank">
+			'.APP_ROOT.'cis/public/ical_coodle.php/cipher_encryption/'.encryptData($uid, LVPLAN_CYPHER_KEY).'
 			</a>
 			<br><br>
 			Die Datei enthält ihre Terminzusagen aus <b>allen laufenden Umfragen</b>    .
@@ -999,7 +998,7 @@ function sendEmail($coodle_id)
 			else
 				$partstat = 'TENTATIVE';
 
-			$teilnehmer .= 'ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT='.$partstat.';CN='.$name."\n :MAILTO:".$mail."\n";
+			$teilnehmer .= $coodle->foldContentLine('ATTENDEE;ROLE=REQ-PARTICIPANT;PARTSTAT='.$partstat.';CN='.$name.":MAILTO:".$mail) . "\r\n";
 		}
 	}
 	$date = new DateTime($coodle_help->datum.' '.$coodle_help->uhrzeit);
@@ -1015,44 +1014,48 @@ function sendEmail($coodle_id)
 	$benutzer = new benutzer();
 	$benutzer->load($coodle->ersteller_uid);
 	$erstellername = trim($benutzer->titelpre.' '.$benutzer->vorname.' '.$benutzer->nachname.' '.$benutzer->titelpost);
+
+	$beschreibung = "DESCRIPTION:" . strip_tags(html_entity_decode($coodle->beschreibung, ENT_QUOTES, 'UTF-8'), '<br>');
+	$terminbeschreibung= $coodle->foldContentLine($beschreibung);
+
 	// Ical File erstellen
-	$ical = "BEGIN:VCALENDAR
-PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN
-VERSION:2.0
-METHOD:PUBLISH
-BEGIN:VTIMEZONE
-TZID:Europe/Vienna
-BEGIN:DAYLIGHT
-TZOFFSETFROM:+0100
-RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
-DTSTART:19810329T020000
-TZNAME:GMT+02:00
-TZOFFSETTO:+0200
-END:DAYLIGHT
-BEGIN:STANDARD
-TZOFFSETFROM:+0200
-RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
-DTSTART:19961027T030000
-TZNAME:GMT+01:00
-TZOFFSETTO:+0100
-END:STANDARD
-END:VTIMEZONE
-BEGIN:VEVENT
-ORGANIZER:MAILTO:".$erstellername." <".$coodle->ersteller_uid."@".DOMAIN."
-".$teilnehmer."
-DTSTART;TZID=Europe/Vienna:".$dtstart."
-DTEND;TZID=Europe/Vienna:".$dtend."
-LOCATION:".$ort."
-TRANSP:OPAQUE
-SEQUENCE:0
-UID:FHCompleteCoodle".$coodle_id."
-DTSTAMP;TZID=Europe/Vienna:".$dtstamp."
-DESCRIPTION:".strip_tags(html_entity_decode($coodle->beschreibung, ENT_QUOTES, 'UTF-8'))."
-SUMMARY:".strip_tags($coodle->titel)."
-PRIORITY:5
-CLASS:PUBLIC
-END:VEVENT
-END:VCALENDAR";
+	$ical = "BEGIN:VCALENDAR\r\n"
+			."PRODID:-//Microsoft Corporation//Outlook 11.0 MIMEDIR//EN\r\n"
+			."VERSION:2.0\r\n"
+			."METHOD:PUBLISH\r\n"
+			."BEGIN:VTIMEZONE\r\n"
+			."TZID:Europe/Vienna\r\n"
+			."BEGIN:DAYLIGHT\r\n"
+			."TZOFFSETFROM:+0100\r\n"
+			."RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU\r\n"
+			."DTSTART:19810329T020000\r\n"
+			."TZNAME:GMT+02:00\r\n"
+			."TZOFFSETTO:+0200\r\n"
+			."END:DAYLIGHT\r\n"
+			."BEGIN:STANDARD\r\n"
+			."TZOFFSETFROM:+0200\r\n"
+			."RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU\r\n"
+			."DTSTART:19961027T030000\r\n"
+			."TZNAME:GMT+01:00\r\n"
+			."TZOFFSETTO:+0100\r\n"
+			."END:STANDARD\r\n"
+			."END:VTIMEZONE\r\n"
+			."BEGIN:VEVENT\r\n"
+			.$coodle->foldContentLine("ORGANIZER:MAILTO:".$erstellername." <".$coodle->ersteller_uid."@".DOMAIN)."\r\n"
+			.rtrim($teilnehmer)."\r\n"
+			."DTSTART;TZID=Europe/Vienna:".$dtstart."\r\n"
+			."DTEND;TZID=Europe/Vienna:".$dtend."\r\n"
+			."LOCATION:".$ort."\r\n"
+			."TRANSP:OPAQUE\r\n"
+			."SEQUENCE:0\r\n"
+			."UID:FHCompleteCoodle".$coodle_id."\r\n"
+			."DTSTAMP;TZID=Europe/Vienna:".$dtstamp."\r\n"
+			.$terminbeschreibung."\r\n"
+			."SUMMARY:".strip_tags($coodle->titel)."\r\n"
+			."PRIORITY:5\r\n"
+			."CLASS:PUBLIC\r\n"
+			."END:VEVENT\r\n"
+			."END:VCALENDAR\r\n";
 
 	if (count($coodle_ressource->result) > 0)
 	{
@@ -1173,4 +1176,4 @@ function RaumBelegt($ort_kurzbz, $datum, $stunden)
 	return false;
 }
 
-?>
\ No newline at end of file
+?>
diff --git a/include/coodle.class.php b/include/coodle.class.php
index 9f23f88da..9e4a57b6d 100644
--- a/include/coodle.class.php
+++ b/include/coodle.class.php
@@ -32,7 +32,7 @@ class coodle extends basis_db
 	public $coodle_id;				// integer
 	public $ersteller_uid;			// varchar(32)
 	public $coodle_status_kurzbz;	// varchar(32)
-	public $titel; 					// varchar(64)  
+	public $titel; 					// varchar(64)
 	public $beschreibung;			// text
 	public $dauer;					// smallint
 	public $endedatum;            	// date
@@ -43,7 +43,7 @@ class coodle extends basis_db
 	public $mailversand;			// boolean
 	public $teilnehmer_anonym;		// boolean
 	public $termine_anonym;			// boolean
-    
+
     // tbl_coodle_ressource
     public $coodle_ressource_id;    // integer
     public $uid;                    // varchar(32)
@@ -51,14 +51,14 @@ class coodle extends basis_db
     public $email;                  // varchar(128)
     public $name;                   // varchar(256)
     public $zugangscode;            // varchar(64)
-    
+
     // tbl_coodle_termin
     public $coodle_termin_id;       // integer
     public $datum;                  // date
     public $uhrzeit;                // date
     public $auswahl;                // boolean
-    
-    public $status_arr;	
+
+    public $status_arr;
 
 	/**
 	 * Konstruktor
@@ -67,7 +67,7 @@ class coodle extends basis_db
 	public function __construct($coodle_id=null)
 	{
 		parent::__construct();
-		
+
 		if(!is_null($coodle_id))
 			$this->load($coodle_id);
 	}
@@ -138,11 +138,11 @@ class coodle extends basis_db
 			$this->errormsg = 'titel darf nicht länger als 64 Zeichen sein';
 			return false;
 		}
-		
+
 		$this->errormsg = '';
 		return true;
 	}
-	
+
 	/**
 	 * Speichert den aktuellen Datensatz in die Datenbank
 	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
@@ -153,7 +153,7 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validate())
 			return false;
@@ -199,7 +199,7 @@ class coodle extends basis_db
 				' termine_anonym='.$this->db_add_param($this->termine_anonym, FHC_BOOLEAN).' '.
 		      	'WHERE coodle_id='.$this->db_add_param($this->coodle_id, FHC_INTEGER, false).';';
 		}
-		
+
 		if($this->db_query($qry))
 		{
 			if($new)
@@ -251,8 +251,8 @@ class coodle extends basis_db
 		}
 
 		//loeschen des Datensatzes
-		$qry="UPDATE campus.tbl_coodle SET coodle_status_kurzbz = 'storniert' 
-            WHERE 
+		$qry="UPDATE campus.tbl_coodle SET coodle_status_kurzbz = 'storniert'
+            WHERE
             coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).';';
 
 		if($this->db_query($qry))
@@ -265,10 +265,10 @@ class coodle extends basis_db
 			return false;
 		}
 	}
-    
+
     /**
      * Liefert alle Ressourcen zurück, die einer Coodleumfrage zugeteilt sind
-     * @param type $coodle_id 
+     * @param type $coodle_id
      * @return true wenn ok, false im Fehlerfall
      */
     public function getRessourcen($coodle_id)
@@ -276,42 +276,42 @@ class coodle extends basis_db
         if(!is_numeric($coodle_id) || $coodle_id == '')
         {
             $this->errormsg = 'Coodle_id muss eine gültige Zahl sein'."\n";
-            return false; 
+            return false;
         }
-        
+
         $qry ="SELECT * FROM campus.tbl_coodle_ressource WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false);
-        
+
         if(!$this->db_query($qry))
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten!'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten!';
+            return false;
         }
-        
+
         while($row = $this->db_fetch_object())
         {
-            $coodle_ressource = new coodle(); 
-            
-            $coodle_ressource->coodle_ressource_id = $row->coodle_ressource_id; 
-            $coodle_ressource->coodle_id = $row->coodle_id; 
-            $coodle_ressource->uid = $row->uid; 
-            $coodle_ressource->ort_kurzbz = $row->ort_kurzbz; 
-            $coodle_ressource->email = $row->email; 
-            $coodle_ressource->name = $row->name; 
-            $coodle_ressource->zugangscode = $row->zugangscode; 
-            $coodle_ressource->insertamum = $row->insertamum; 
-            $coodle_ressource->insertvon = $row->insertvon; 
-            $coodle_ressource->updateamum = $row->updateamum; 
-            $coodle_ressource->updatevon = $row->updatevon; 
-            
-            $this->result[] = $coodle_ressource; 
+            $coodle_ressource = new coodle();
+
+            $coodle_ressource->coodle_ressource_id = $row->coodle_ressource_id;
+            $coodle_ressource->coodle_id = $row->coodle_id;
+            $coodle_ressource->uid = $row->uid;
+            $coodle_ressource->ort_kurzbz = $row->ort_kurzbz;
+            $coodle_ressource->email = $row->email;
+            $coodle_ressource->name = $row->name;
+            $coodle_ressource->zugangscode = $row->zugangscode;
+            $coodle_ressource->insertamum = $row->insertamum;
+            $coodle_ressource->insertvon = $row->insertvon;
+            $coodle_ressource->updateamum = $row->updateamum;
+            $coodle_ressource->updatevon = $row->updatevon;
+
+            $this->result[] = $coodle_ressource;
         }
-        
-        return true; 
+
+        return true;
     }
-    
+
     /**
-     * Lädt eine Ressource 
-     * @param type $coodle_ressource_id 
+     * Lädt eine Ressource
+     * @param type $coodle_ressource_id
      * @return true wenn ok, false im Fehlerfall
      */
     public function getRessourceFromId($coodle_ressource_id)
@@ -319,95 +319,95 @@ class coodle extends basis_db
         if(!is_numeric($coodle_ressource_id) || $coodle_ressource_id=='')
         {
             $this->errormsg = 'Coodle_id muss eine gültige Zahl sein'."\n";
-            return false; 
+            return false;
         }
-        
-        $qry = "SELECT * FROM campus.tbl_coodle_ressource WHERE coodle_ressource_id =".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false); 
-        
+
+        $qry = "SELECT * FROM campus.tbl_coodle_ressource WHERE coodle_ressource_id =".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false);
+
         if(!$this->db_query($qry))
         {
             $this->errormsg = 'Fehler bei der Abfrage aufgetreten'."\n";
-            return false; 
+            return false;
         }
-        
+
         if($row = $this->db_fetch_object())
         {
-            $this->coodle_ressource_id = $row->coodle_ressource_id; 
-            $this->coodle_id = $row->coodle_id; 
-            $this->uid = $row->uid; 
-            $this->ort_kurzbz = $row->ort_kurzbz; 
-            $this->email = $row->email; 
-            $this->name = $row->name; 
-            $this->zugangscode = $row->zugangscode; 
-            $this->insertamum = $row->insertamum; 
-            $this->insertvon = $row->insertvon; 
-            $this->updateamum = $row->updateamum; 
-            $this->updatevon = $row->updatevon; 
+            $this->coodle_ressource_id = $row->coodle_ressource_id;
+            $this->coodle_id = $row->coodle_id;
+            $this->uid = $row->uid;
+            $this->ort_kurzbz = $row->ort_kurzbz;
+            $this->email = $row->email;
+            $this->name = $row->name;
+            $this->zugangscode = $row->zugangscode;
+            $this->insertamum = $row->insertamum;
+            $this->insertvon = $row->insertvon;
+            $this->updateamum = $row->updateamum;
+            $this->updatevon = $row->updatevon;
         }
         else
         {
 			$this->errormsg = 'Es ist kein Datensatz mit dieser ID vorhanden';
-            return false; 
+            return false;
         }
-        
-        return true; 
+
+        return true;
     }
-    
+
     /**
-     * Liefert alle Coodle Umfragen zurück wo Benutzer entweder Ersteller oder Ressource ist 
+     * Liefert alle Coodle Umfragen zurück wo Benutzer entweder Ersteller oder Ressource ist
      * und das Endedatum vor 20 Tagen oder in der Zukunft liegt
-     * @param type $uid 
-     * @return true wenn ok, false im Fehlerfall 
+     * @param type $uid
+     * @return true wenn ok, false im Fehlerfall
      */
     public function getCoodleFromUser($uid)
     {
         if($uid == '')
         {
-            $this->errormsg = 'keine gültige uid'; 
-            return false; 
+            $this->errormsg = 'keine gültige uid';
+            return false;
         }
-                
-        $qry = "SELECT distinct campus.tbl_coodle.* 
-                    FROM campus.tbl_coodle 
-                    LEFT JOIN campus.tbl_coodle_ressource USING(coodle_id) 
-                WHERE 
-					(uid =".$this->db_add_param($uid, FHC_STRING, false)." 
+
+        $qry = "SELECT distinct campus.tbl_coodle.*
+                    FROM campus.tbl_coodle
+                    LEFT JOIN campus.tbl_coodle_ressource USING(coodle_id)
+                WHERE
+					(uid =".$this->db_add_param($uid, FHC_STRING, false)."
                     OR ersteller_uid =".$this->db_add_param($uid, FHC_STRING, false).")
                     AND endedatum >= CURRENT_DATE - interval '90 days';";
-        
+
         if(!$this->db_query($qry))
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
+
         while($row = $this->db_fetch_object())
         {
-            $coodle = new coodle(); 
-            $coodle->coodle_id = $row->coodle_id; 
-            $coodle->titel = $row->titel; 
-            $coodle->beschreibung = $row->beschreibung; 
-            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz; 
-            $coodle->dauer = $row->dauer; 
-            $coodle->insertamum = $row->insertamum; 
-            $coodle->insertvon = $row->insertvon; 
-            $coodle->updateamum = $row->updateamum; 
-            $coodle->updatevon = $row->updatevon; 
-            $coodle->endedatum = $row->endedatum; 
-            $coodle->ersteller_uid = $row->ersteller_uid; 
-            $coodle->mailversand = $row->mailversand; 
-            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym; 
-            $coodle->termine_anonym = $row->termine_anonym; 
-            
-            $this->result[] = $coodle; 
+            $coodle = new coodle();
+            $coodle->coodle_id = $row->coodle_id;
+            $coodle->titel = $row->titel;
+            $coodle->beschreibung = $row->beschreibung;
+            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz;
+            $coodle->dauer = $row->dauer;
+            $coodle->insertamum = $row->insertamum;
+            $coodle->insertvon = $row->insertvon;
+            $coodle->updateamum = $row->updateamum;
+            $coodle->updatevon = $row->updatevon;
+            $coodle->endedatum = $row->endedatum;
+            $coodle->ersteller_uid = $row->ersteller_uid;
+            $coodle->mailversand = $row->mailversand;
+            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym;
+            $coodle->termine_anonym = $row->termine_anonym;
+
+            $this->result[] = $coodle;
         }
-        
-        return true; 
+
+        return true;
     }
 
 	/**
 	 * Prueft ob eine Ressource bereits zu einer Umfrage zugeteilt ist
-	 * 
+	 *
 	 * @param $coodle_id ID der CoodleUmfrage
 	 * @param $uid UID des Benutzers
 	 * @param $ort_kurzbz Ort
@@ -423,7 +423,7 @@ class coodle extends basis_db
 			$qry.=' AND ort_kurzbz='.$this->db_add_param($ort_kurzbz, FHC_STRING, false);
 		if($email!='')
 			$qry.=' AND email='.$this->db_add_param($email, FHC_STRING, false);
-        
+
         $qry.=';';
 
 		if($result = $this->db_query($qry))
@@ -437,7 +437,7 @@ class coodle extends basis_db
 				return false;
 		}
 	}
-   
+
 	/**
 	 * Validiert die Ressourcedaten vor dem Speichern
 	 */
@@ -456,7 +456,7 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validateRessource())
 			return false;
@@ -482,7 +482,7 @@ class coodle extends basis_db
 			$this->errormsg = 'Update not Implemented';
 			return false;
 		}
-		
+
 		if($this->db_query($qry))
 		{
 			if($new)
@@ -518,7 +518,7 @@ class coodle extends basis_db
 			return false;
 		}
 	}
-    
+
     /**
 	 * Speichert die Terminwahl der Ressource in die Datenbank
 	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
@@ -529,17 +529,17 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validateRessource())
 			return false;
 
 		if($new)
-		{            
+		{
 			//Neuen Datensatz einfuegen
 			$qry='INSERT INTO campus.tbl_coodle_ressource_termin(coodle_ressource_id, coodle_termin_id, insertamum, insertvon) VALUES('.
                   $this->db_add_param($this->coodle_ressource_id, FHC_INTEGER, false).', '.
-			      $this->db_add_param($this->coodle_termin_id, FHC_INTEGER, false).', 
+			      $this->db_add_param($this->coodle_termin_id, FHC_INTEGER, false).',
                     CURRENT_TIMESTAMP, '.
 			      $this->db_add_param($this->insertvon, FHC_STRING).');';
 		}
@@ -548,7 +548,7 @@ class coodle extends basis_db
 			$this->errormsg = 'Update not Implemented';
 			return false;
 		}
-		
+
 		if(!$this->db_query($qry))
 		{
 			$this->errormsg = 'Fehler beim Speichern des Datensatzes';
@@ -557,23 +557,23 @@ class coodle extends basis_db
         else
             return true;
 	}
-    
+
     /**
      * Lädt eine Ressource zur übergebenen $coodle_id und $uid oder $zugangscode
      * @param Integer $coodle_id
      * @param varchar $uid
      * @param varchar $zugangscode
-     * @return boolean 
+     * @return boolean
      */
     public function getRessourceFromUser($coodle_id, $uid='', $zugangscode='')
     {
 
         $qry ="SELECT * FROM campus.tbl_coodle_ressource
-            WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false); 
-        
+            WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false);
+
         if($uid != '')
-            $qry.= " AND uid = ".$this->db_add_param($uid, FHC_STRING, false); 
-        
+            $qry.= " AND uid = ".$this->db_add_param($uid, FHC_STRING, false);
+
         if ($zugangscode != '')
             $qry.= " AND zugangscode = ".$this->db_add_param($zugangscode, FHC_STRING, false);
         $qry.= ';';
@@ -581,89 +581,89 @@ class coodle extends basis_db
         if(!$this->db_query($qry))
         {
           $this->errormsg = 'Fehler bei einer Datenbankabfrage';
-            return false;  
-        }  
-           
+            return false;
+        }
+
         if ($row = $this->db_fetch_object())
         {
             $this->coodle_ressource_id  = $row->coodle_ressource_id;
-            $this->coodle_id            = $row->coodle_id; 
-            $this->uid                  = $row->uid; 
-            $this->ort_kurzbz           = $row->ort_kurzbz; 
-            $this->email                = $row->email; 
-            $this->name                 = $row->name; 
-            $this->zugangscode          = $row->zugangscode; 
-            $this->insertamum           = $row->insertamum; 
-            $this->insertvon            = $row->insertvon; 
-            $this->updateamum           = $row->updateamum; 
-            $this->updatevon            = $row->updatevon; 
+            $this->coodle_id            = $row->coodle_id;
+            $this->uid                  = $row->uid;
+            $this->ort_kurzbz           = $row->ort_kurzbz;
+            $this->email                = $row->email;
+            $this->name                 = $row->name;
+            $this->zugangscode          = $row->zugangscode;
+            $this->insertamum           = $row->insertamum;
+            $this->insertvon            = $row->insertvon;
+            $this->updateamum           = $row->updateamum;
+            $this->updatevon            = $row->updatevon;
         }
         else
         {
             $this->errormsg = "Fehler bei der Abfrage aufgetreten";
-            return false; 
-        }       
-        return true;             
+            return false;
+        }
+        return true;
     }
-    
+
     /**
      * Löscht alle Termine einer Ressource zu einer übergebenen Coodleumfrage
      * @param Integer $coodle_id
      * @param Integer $ressource_id
-     * @return boolean 
+     * @return boolean
      */
     public function deleteRessourceTermin($coodle_id, $ressource_id)
     {
         if($ressource_id == '' || !is_numeric($ressource_id) || $coodle_id == '' || !is_numeric($coodle_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
+
         $qry="DELETE FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_ressource_id =".$this->db_add_param($ressource_id, FHC_INTEGER)."
-                AND coodle_termin_id IN 
-                    (SELECT coodle_termin_id FROM campus.tbl_coodle_termin 
+                AND coodle_termin_id IN
+                    (SELECT coodle_termin_id FROM campus.tbl_coodle_termin
                         WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER).");";
-        
-        $this->errormsg = $qry; 
-        
+
+        $this->errormsg = $qry;
+
         if($this->db_query($qry))
-            return true; 
+            return true;
         else
-            return false; 
+            return false;
     }
 
     /**
      * Überprüft ob die übergebene Ressource den übergebenen Termin ausgewählt hat
      * @param Integer $termin_id
      * @param Integer $ressource_id
-     * @return boolean 
+     * @return boolean
      */
     public function checkTermin($termin_id, $ressource_id)
     {
         if($ressource_id == '' || !is_numeric($ressource_id) || $termin_id == '' || !is_numeric($termin_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
-        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin 
+
+        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_ressource_id =".$this->db_add_param($ressource_id, FHC_INTEGER)."
                 AND coodle_termin_id=".$this->db_add_param($termin_id, FHC_INTEGER).';';
-         
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_row($result))
             {
-                return true; 
+                return true;
             }
-            return false; 
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
+
 	/**
      * Überprüft ob der übergebenen Termin schon von einer Ressource gewählt wurde
      * @param Integer $termin_id
@@ -674,83 +674,83 @@ class coodle extends basis_db
         if( $termin_id == '' || !is_numeric($termin_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
-        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin 
+
+        $qry="SELECT * FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_termin_id=".$this->db_add_param($termin_id, FHC_INTEGER).';';
-         
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_row($result))
             {
-                return true; 
+                return true;
             }
-            return false; 
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
+
 	/**
      * Zählt, wie oft ein Termin gewählt wurde
      * @param Integer $termin_id
      * @param Integer $ressource_id
-     * @return boolean 
+     * @return boolean
      */
     public function countTermin($termin_id)
     {
         if($termin_id == '' || !is_numeric($termin_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
-        $qry="SELECT count(*) AS anzahl FROM campus.tbl_coodle_ressource_termin 
+
+        $qry="SELECT count(*) AS anzahl FROM campus.tbl_coodle_ressource_termin
             WHERE coodle_termin_id=".$this->db_add_param($termin_id, FHC_INTEGER).';';
-         
+
    		if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
             {
-                $this->anzahl = $row->anzahl; 
+                $this->anzahl = $row->anzahl;
             }
             else
             {
-                return false; 
+                return false;
             }
-            return true; 
+            return true;
         }
         else
         {
             $this->errormsg = "Fehler bei der Abfrage aufgetreten";
-            return false; 
+            return false;
         }
     }
-    
+
     /**
-     * 
+     *
      * Laedt alle Termine einer Umfrage zu denen eine Ressource zugesagt hat
      * @param $coodle_id ID der Umfrage
      * @param $ressource_id ID der Ressource
      */
     public function getRessourceTermin($coodle_id, $ressource_id)
     {
-    	$qry = "SELECT 
-    				* 
-    			FROM 
-    				campus.tbl_coodle_ressource_termin 
+    	$qry = "SELECT
+    				*
+    			FROM
+    				campus.tbl_coodle_ressource_termin
     				JOIN campus.tbl_coodle_termin USING(coodle_termin_id)
-    			WHERE 
+    			WHERE
     				coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER)."
     				AND coodle_ressource_id=".$this->db_add_param($ressource_id, FHC_INTEGER).";";
-    				
+
     	if($result = $this->db_query($qry))
     	{
     		while($row = $this->db_fetch_object($result))
     		{
     			$obj = new coodle();
-    			
+
     			$obj->coodle_id = $row->coodle_id;
     			$obj->coodle_termin_id = $row->coodle_termin_id;
     			$obj->datum = $row->datum;
@@ -760,7 +760,7 @@ class coodle extends basis_db
     			$obj->coodle_termin_id = $row->coodle_termin_id;
     			$obj->insertamum = $row->insertamum;
     			$obj->insertvon = $row->insertvon;
-    			
+
     			$this->result[] = $obj;
     		}
     		return true;
@@ -771,66 +771,66 @@ class coodle extends basis_db
     		return false;
     	}
     }
-    
+
     /**
      * Überprüfut ob der Benutzer entweder der Ersteller oder eine Ressource der Coodleumfrage ist
      * @param Integer $coodle_id
      * @param Integer $uid
      * @param varchar $zugangscode
-     * @return boolean 
+     * @return boolean
      */
     public function checkBerechtigung($coodle_id, $uid='', $zugangscode='')
     {
         if($coodle_id =='' ||  !is_numeric($coodle_id))
         {
             $this->errormsg = 'Ungültige Id übergeben.';
-            return false; 
+            return false;
         }
-        
+
         if($uid != '' && $zugangscode != '')
         {
-            $this->errormsg = 'Uid oder Zuganscode übergeben'; 
-            return false; 
+            $this->errormsg = 'Uid oder Zuganscode übergeben';
+            return false;
         }
-        
+
         $qry ="SELECT 1 FROM campus.tbl_coodle_ressource WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).' AND ';
-        
+
         if($uid != '')
-            $qry.= ' uid = '.$this->db_add_param($uid, FHC_STRING, false); 
-        
+            $qry.= ' uid = '.$this->db_add_param($uid, FHC_STRING, false);
+
         if($zugangscode != '')
             $qry.= ' zugangscode ='.$this->db_add_param($zugangscode, FHC_STRING, false);
-         
+
         $qry.="UNION SELECT 1 FROM campus.tbl_coodle WHERE ersteller_uid=".$this->db_add_param($uid).";";
-        
-        
+
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
-                return true; 
+                return true;
             else
-                return false; 
+                return false;
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
     }
-        
+
 	/**
 	 * Entfernt eine Ressourcezuteilung von einer Umfrage
 	 * @param $coodle_ressource_id ID der Ressourcezuteilung
 	 * @return boolean true wenn ok, false im Fehlerfall
-	 */	
+	 */
 	public function deleteRessource($coodle_ressource_id)
 	{
         if($coodle_ressource_id == '' || !is_numeric($coodle_ressource_id))
         {
             $this->errormsg = 'Ungültige ID übergeben';
-            return false; 
+            return false;
         }
-        
+
 		$qry = "DELETE FROM campus.tbl_coodle_ressource_termin WHERE coodle_ressource_id=".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false).";
 				DELETE FROM campus.tbl_coodle_ressource WHERE coodle_ressource_id=".$this->db_add_param($coodle_ressource_id, FHC_INTEGER, false).";";
 
@@ -851,7 +851,7 @@ class coodle extends basis_db
 		return true;
 	}
 
-	/** 
+	/**
 	 * Speichert einen Termin
      * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
 	 * andernfalls wird der Datensatz mit der ID in $coodle_termin_id aktualisiert
@@ -862,7 +862,7 @@ class coodle extends basis_db
 	{
 		if(is_null($new))
 			$new = $this->new;
-		
+
 		//Variablen pruefen
 		if(!$this->validateTermin())
 			return false;
@@ -883,7 +883,7 @@ class coodle extends basis_db
                 ' auswahl='.$this->db_add_param($this->auswahl, FHC_BOOLEAN, false).
 				' WHERE coodle_termin_id='.$this->db_add_param($this->coodle_termin_id, FHC_INTEGER, false).';';
 		}
-		
+
 		if($this->db_query($qry))
 		{
 			if($new)
@@ -930,21 +930,21 @@ class coodle extends basis_db
 	{
 		if($coodle_id == '' || !is_numeric($coodle_id))
 		{
-			$this->errormsg = "Ungültige Coodle_id"; 
-			return false; 
+			$this->errormsg = "Ungültige Coodle_id";
+			return false;
 		}
-		
+
 		$qry = "(SELECT * FROM campus.tbl_coodle_termin
-					WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
+					WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
 					AND datum != '1900-01-01'
 					ORDER BY datum, uhrzeit)
-							
-				UNION ALL 
-							
+
+				UNION ALL
+
 				(SELECT * FROM campus.tbl_coodle_termin
 					WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
 					AND datum = '1900-01-01');";
-		
+
 		if($result = $this->db_query($qry))
 		{
 			while($row = $this->db_fetch_object($result))
@@ -955,7 +955,7 @@ class coodle extends basis_db
 				$obj->datum = $row->datum;
 				$obj->uhrzeit = $row->uhrzeit;
 				$obj->auswahl = $this->db_parse_bool($row->auswahl);
-	
+
 				$this->result[] = $obj;
 			}
 			return true;
@@ -967,47 +967,47 @@ class coodle extends basis_db
 		}
 	}
 
-        
+
     /**
      * Gibt die Coodle Umfrage zurück in der sich die Ressource mit dem übergebenen Zugangscode befindet
      * @param string $zugangscode
-     * @return boolean 
+     * @return boolean
      */
     public function getCoodleFromZugangscode($zugangscode)
     {
-        $qry = "SELECT tbl_coodle.* from campus.tbl_coodle 
-            JOIN campus.tbl_coodle_ressource USING(coodle_id) 
-            WHERE zugangscode =".$this->db_add_param($zugangscode, FHC_STRING).';'; 
-        
+        $qry = "SELECT tbl_coodle.* from campus.tbl_coodle
+            JOIN campus.tbl_coodle_ressource USING(coodle_id)
+            WHERE zugangscode =".$this->db_add_param($zugangscode, FHC_STRING).';';
+
         if($result = $this->db_query($qry))
         {
             while($row = $this->db_fetch_object($result))
             {
-                $coodle = new coodle(); 
-                
-                $coodle->coodle_id = $row->coodle_id; 
-                $coodle->ersteller_uid = $row->ersteller_uid; 
-                $coodle->titel = $row->titel; 
-                $coodle->beschreibung = $row->beschreibung; 
-                $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz; 
-                $coodle->dauer = $row->dauer; 
-                $coodle->endedatum = $row->endedatum; 
-                $coodle->insertamum = $row->insertamum; 
+                $coodle = new coodle();
+
+                $coodle->coodle_id = $row->coodle_id;
+                $coodle->ersteller_uid = $row->ersteller_uid;
+                $coodle->titel = $row->titel;
+                $coodle->beschreibung = $row->beschreibung;
+                $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz;
+                $coodle->dauer = $row->dauer;
+                $coodle->endedatum = $row->endedatum;
+                $coodle->insertamum = $row->insertamum;
                 $coodle->insertvon = $row->insertvon;
-                $coodle->updateamum = $row->updateamum; 
-                $coodle->updatevon = $row->updatevon; 
-                $coodle->mailversand = $row->mailversand; 
-	            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym; 
-	            $coodle->termine_anonym = $row->termine_anonym; 
-                
-                $this->result[] = $coodle; 
+                $coodle->updateamum = $row->updateamum;
+                $coodle->updatevon = $row->updatevon;
+                $coodle->mailversand = $row->mailversand;
+	            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym;
+	            $coodle->termine_anonym = $row->termine_anonym;
+
+                $this->result[] = $coodle;
             }
-            return true; 
+            return true;
         }
         else
         {
             $this->errormsg = 'Fehler beim Laden der Daten';
-            return false; 
+            return false;
         }
     }
 
@@ -1019,7 +1019,7 @@ class coodle extends basis_db
 	 */
 	public function loadTermin($coodle_termin_id)
 	{
-		$qry = "SELECT * FROM campus.tbl_coodle_termin 
+		$qry = "SELECT * FROM campus.tbl_coodle_termin
                     WHERE coodle_termin_id=".$this->db_add_param($coodle_termin_id, FHC_INTEGER).';';
 
 		if($result = $this->db_query($qry))
@@ -1055,13 +1055,13 @@ class coodle extends basis_db
 	{
         if($coodle_termin_id == '' || !is_numeric($coodle_termin_id))
         {
-            $this->errormsg = 'Ungültige Id übergeben'; 
-            return false; 
+            $this->errormsg = 'Ungültige Id übergeben';
+            return false;
         }
-        
-		$qry = "DELETE FROM campus.tbl_coodle_termin 
+
+		$qry = "DELETE FROM campus.tbl_coodle_termin
                     WHERE coodle_termin_id=".$this->db_add_param($coodle_termin_id, FHC_INTEGER, false).';';
-		
+
 		if($this->db_query($qry))
 			return true;
 		else
@@ -1069,188 +1069,188 @@ class coodle extends basis_db
 			$this->errormsg = 'Fehler beim Löschen des Eintrags';
 		}
 	}
-    
+
     /**
      * Überprüft ob die übergebene Coodleumfrage den Status laufend oder abgeschlossen hat
      * @param Integer $coodle_id
-     * @return boolean 
+     * @return boolean
      */
     public function checkStatus($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = 'Coodle_id muss eine Zahl sein'; 
-            return false; 
+            $this->errormsg = 'Coodle_id muss eine Zahl sein';
+            return false;
         }
-        
-        $qry ="SELECT 1 FROM campus.tbl_coodle 
+
+        $qry ="SELECT 1 FROM campus.tbl_coodle
                 WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
                 AND coodle_status_kurzbz IN('laufend','abgeschlossen');";
-        
+
         if($result = $this->db_query($qry))
         {
             if($this->db_fetch_object($result))
-                return true; 
+                return true;
             else
             {
-                $this->errormsg = "Kein passender Status vorhanden"; 
-                return false; 
+                $this->errormsg = "Kein passender Status vorhanden";
+                return false;
             }
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
     }
 
     /**
      * Setzt die Auswahl aller Termine auf false
      * @param Integer $coodle_id
-     * @return boolean 
+     * @return boolean
      */
     public function setTerminFalse($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
-        $qry ="UPDATE campus.tbl_coodle_termin set auswahl='false' 
-                WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).';'; 
-        
+
+        $qry ="UPDATE campus.tbl_coodle_termin set auswahl='false'
+                WHERE coodle_id=".$this->db_add_param($coodle_id, FHC_INTEGER, false).';';
+
         if($result=$this->db_query($qry))
-            return true; 
+            return true;
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
     }
-    
+
     /**
      * Gibt true zurück wenn der übergeben termin der ausgewählte ist für die übergebene coodle_id
-     * @param Integer $coodle_id 
-     * @param Integer $coodle_termin_id 
-     * @return boolean 
+     * @param Integer $coodle_id
+     * @param Integer $coodle_termin_id
+     * @return boolean
      */
     public function checkTerminAuswahl($coodle_id, $coodle_termin_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
+
         if($coodle_termin_id == '' || !is_numeric($coodle_termin_id))
         {
-            $this->errormsg = "termin_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "termin_id muss eine gültige Zahl sein";
+            return false;
         }
-        
-        $qry = "Select * FROM campus.tbl_coodle_termin 
-                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
+
+        $qry = "Select * FROM campus.tbl_coodle_termin
+                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
                     AND coodle_termin_id = ".$this->db_add_param($coodle_termin_id, FHC_INTEGER, false)."
                     AND auswahl is true";
-        
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
-                return true; 
+                return true;
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
-    
+
+
     /**
      * Gibt die Id des ausgewählten Termines der Coodleumfrage zurück
-     * @param Integer $coodle_id 
-     * @param Integer $coodle_termin_id 
-     * @return boolean 
+     * @param Integer $coodle_id
+     * @param Integer $coodle_termin_id
+     * @return boolean
      */
     public function getTerminAuswahl($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
-        $qry = "Select * FROM campus.tbl_coodle_termin 
-                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
+
+        $qry = "Select * FROM campus.tbl_coodle_termin
+                    WHERE coodle_id = ".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
                     AND auswahl is true";
-        
+
         if($result = $this->db_query($qry))
         {
             if($row = $this->db_fetch_object($result))
-                return $row->coodle_termin_id; 
+                return $row->coodle_termin_id;
         }
         else
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
-        return false; 
+
+        return false;
     }
-    
+
     /**
      * Liefert alle Räume die als Ressource zu einer Umfrage eingetragen sind
      * @param Integer $coodle_id
-     * @return boolean 
+     * @return boolean
      */
     public function getRaumeFromId($coodle_id)
     {
         if($coodle_id == '' || !is_numeric($coodle_id))
         {
-            $this->errormsg = "Coodle_id muss eine gültige Zahl sein"; 
-            return false; 
+            $this->errormsg = "Coodle_id muss eine gültige Zahl sein";
+            return false;
         }
-        
+
         $qry ="SELECT * FROM campus.tbl_coodle_ressource
-                WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false)." 
-                    AND ort_kurzbz is not null"; 
-        
+                WHERE coodle_id =".$this->db_add_param($coodle_id, FHC_INTEGER, false)."
+                    AND ort_kurzbz is not null";
+
         if($result = $this->db_query($qry))
         {
             while($row = $this->db_fetch_object($result))
             {
-                $ressource = new coodle(); 
-                
-                $ressource->coodle_ressource_id = $row->coodle_ressource_id; 
-                $ressource->coodle_id = $row->coodle_id; 
+                $ressource = new coodle();
+
+                $ressource->coodle_ressource_id = $row->coodle_ressource_id;
+                $ressource->coodle_id = $row->coodle_id;
                 $ressource->ort_kurzbz = $row->ort_kurzbz;
-                $ressource->insertamum = $row->insertamum; 
-                $ressource->insertvon = $row->insertvon; 
-                $ressource->updateamum = $row->updateamum; 
-                $ressource->updatevon = $row->updatevon; 
-                
-                $this->result[] = $ressource; 
-                
+                $ressource->insertamum = $row->insertamum;
+                $ressource->insertvon = $row->insertvon;
+                $ressource->updateamum = $row->updateamum;
+                $ressource->updatevon = $row->updatevon;
+
+                $this->result[] = $ressource;
+
             }
-            return true; 
+            return true;
         }
         else
         {
-            $this->erromsg = "Fehler bei der Abfrage aufgetreten"; 
-            return false; 
+            $this->erromsg = "Fehler bei der Abfrage aufgetreten";
+            return false;
         }
     }
-    
+
     /**
      * Laedt alle Stati
      */
     public function loadStatus()
     {
     	$qry = "SELECT * FROM campus.tbl_coodle_status";
-    	
+
     	if($result = $this->db_query($qry))
     	{
     		while($row = $this->db_fetch_object($result))
@@ -1265,48 +1265,70 @@ class coodle extends basis_db
     		return false;
     	}
     }
-    
+
 	/**
-     * Liefert alle Coodle Umfragen die das Beendigungsdatum erreicht haben 
+     * Liefert alle Coodle Umfragen die das Beendigungsdatum erreicht haben
      * und noch nicht abgeschlossen sind
-     * @return true wenn ok, false im Fehlerfall 
+     * @return true wenn ok, false im Fehlerfall
      */
     public function getCoodleBeendet()
     {
-        $qry = "SELECT * 
-                    FROM campus.tbl_coodle 
-                WHERE 
+        $qry = "SELECT *
+                    FROM campus.tbl_coodle
+                WHERE
                     endedatum = CURRENT_DATE - interval '1 day'
-                    AND coodle_status_kurzbz='laufend';"; 
-        
+                    AND coodle_status_kurzbz='laufend';";
+
         if(!$this->db_query($qry))
         {
-            $this->errormsg = 'Fehler bei der Abfrage aufgetreten'; 
-            return false; 
+            $this->errormsg = 'Fehler bei der Abfrage aufgetreten';
+            return false;
         }
-        
+
         while($row = $this->db_fetch_object())
         {
-            $coodle = new coodle(); 
-            $coodle->coodle_id = $row->coodle_id; 
-            $coodle->titel = $row->titel; 
-            $coodle->beschreibung = $row->beschreibung; 
-            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz; 
-            $coodle->dauer = $row->dauer; 
-            $coodle->insertamum = $row->insertamum; 
-            $coodle->insertvon = $row->insertvon; 
-            $coodle->updateamum = $row->updateamum; 
-            $coodle->updatevon = $row->updatevon; 
-            $coodle->endedatum = $row->endedatum; 
-            $coodle->ersteller_uid = $row->ersteller_uid; 
-            $coodle->mailversand = $row->mailversand; 
-            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym; 
-            $coodle->termine_anonym = $row->termine_anonym; 
-            
-            $this->result[] = $coodle; 
+            $coodle = new coodle();
+            $coodle->coodle_id = $row->coodle_id;
+            $coodle->titel = $row->titel;
+            $coodle->beschreibung = $row->beschreibung;
+            $coodle->coodle_status_kurzbz = $row->coodle_status_kurzbz;
+            $coodle->dauer = $row->dauer;
+            $coodle->insertamum = $row->insertamum;
+            $coodle->insertvon = $row->insertvon;
+            $coodle->updateamum = $row->updateamum;
+            $coodle->updatevon = $row->updatevon;
+            $coodle->endedatum = $row->endedatum;
+            $coodle->ersteller_uid = $row->ersteller_uid;
+            $coodle->mailversand = $row->mailversand;
+            $coodle->teilnehmer_anonym = $row->teilnehmer_anonym;
+            $coodle->termine_anonym = $row->termine_anonym;
+
+            $this->result[] = $coodle;
         }
-        
-        return true; 
+
+        return true;
     }
+
+	/**
+	 * Führt 2 Formatierungen bestehender Contentlines durch
+	 * Umwandeln (Maskieren) bestehender Breaks in \n
+	 * Einfügen von breaks nach 74 Zeichen, da content line <= 75 chars sein muss
+	 * @param $contentline zu formatierender Input
+	 * @return param formatierter Output
+	 */
+	public function foldContentLine($contentline)
+	{
+		$linebreaksreplaced = strtr($contentline, array(
+			"\r\n"	=> "\\n",
+			"\r" 	=> "",
+			"\n" 	=> "\\n",
+			"<br>" 	=> "\\n",
+			"<br />"=> "\\n"
+		));
+
+		$foldedcontentline = wordwrap($linebreaksreplaced, 74, "\r\n ", true);
+
+		return $foldedcontentline;
+	}
 }
 ?>

From f5ee097b72eb37c7ce10f976c7b3a6c0ae8709b9 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Fri, 2 Jun 2023 12:01:31 +0200
Subject: [PATCH 028/175] - doppelte benutzer bug fix

---
 application/models/person/Person_model.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 8875fd4c5..ed21082e2 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -326,10 +326,12 @@ class Person_model extends DB_Model
 
 				SELECT p2.person_id
 				FROM tbl_person p1
+				JOIN tbl_prestudent ps ON p1.person_id = ps.person_id
 				INNER JOIN (
-					SELECT vorname, nachname, gebdatum, person_id
-					FROM tbl_person
-					) p2
+					SELECT vorname, nachname, gebdatum, person.person_id
+					FROM tbl_person person
+					JOIN tbl_prestudent sps ON person.person_id = sps.person_id
+				) p2
 					ON (lower(p1.vorname) = lower(p2.vorname) AND lower(p1.nachname) = lower(p2.nachname) AND p1.gebdatum = p2.gebdatum)
 				WHERE p1.person_id != p2.person_id AND (p1.person_id = ?)";
 

From 4e22b1ac1c296cd61e9c33e14b811ad200a3d209 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 19 Jun 2023 15:03:38 +0200
Subject: [PATCH 029/175] Added: New Job sendMailRecommendationRequests

Send Sancho mail to LV-Leitung (fallback Lectors) that were requested for recommendation yesterday.
---
 .../controllers/jobs/AnrechnungJob.php        | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)

diff --git a/application/controllers/jobs/AnrechnungJob.php b/application/controllers/jobs/AnrechnungJob.php
index 7aae80d54..48ee6d4ca 100644
--- a/application/controllers/jobs/AnrechnungJob.php
+++ b/application/controllers/jobs/AnrechnungJob.php
@@ -227,6 +227,74 @@ class AnrechnungJob extends JOB_Controller
 		$this->logInfo('SUCCEDED: Sending emails to STGL about yesterdays new Anrechnungen succeded.');
 	}
 
+    // Send Sancho mail to LV-Leitung (fallback Lectors) that were requested for recommendation yesterday.
+    public function sendMailRecommendationRequests(){
+
+        $this->logInfo('Start AnrechnungJob sendMailRecommendationRequests to inform lecturers about yesterdays requests for recommendation.');
+
+        // Get Anrechnungen, für die gestern eine Empfehlung angefragt worden ist
+        $this->AnrechnungModel->addSelect('astat.anrechnung_id, astat.datum, astat.insertamum');
+        $this->AnrechnungModel->addDistinct('astat.anrechnung_id');
+        $this->AnrechnungModel->addJoin('lehre.tbl_anrechnung_anrechnungstatus astat', 'anrechnung_id');
+
+        $result = $this->AnrechnungModel->loadWhere('
+            studiensemester_kurzbz = (SELECT studiensemester_kurzbz FROM tbl_studiensemester WHERE now()::date BETWEEN start AND ende)
+            AND genehmigt_von IS NULL                             
+            AND empfehlung_anrechnung IS NULL
+            AND status_kurzbz = '. $this->db->escape(self::ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR) .' -- in Bearbeitung durch Lektor
+            AND NOW()::date = (astat.datum + interval \'1 day\')                    -- nur gestrige Empfehlungsanfrage
+            ORDER BY astat.anrechnung_id, astat.datum DESC, astat.insertamum DESC   -- nur letzten status dabei prüfen
+        ');
+
+        // Exit, wenn es gestern keine Empfehlungsanfragen gab
+        if (!hasData($result))
+        {
+            $this->logInfo('End AnrechnungJob sendMailRecommendationRequests, because no recommendations were requested yesterday.');
+            exit;
+        }
+
+        $anrechnung_id_arr = array_column(getData($result), 'anrechnung_id');
+
+        $arr_lvLector_arr = array();
+        foreach ($anrechnung_id_arr as $anrechnung_id)
+        {
+            $arr_lvLector_arr[]= $this->anrechnunglib->getLectors($anrechnung_id); // Returns LV Leitung. If not present, then all lectors of LV.
+        }
+
+        // Unique lector array to send only one mail per lector
+        $arr_lvLector_arr = array_unique($arr_lvLector_arr, SORT_REGULAR);
+
+        // Link to 'Anrechnungen prüfen' dashboard
+        $url =
+            CIS_ROOT. 'cis/index.php?menu='.
+            CIS_ROOT. 'cis/menu.php?content_id=&content='.
+            CIS_ROOT. index_page(). self::REVIEW_ANRECHNUNG_URI;
+
+        foreach ($arr_lvLector_arr as $lvLector_arr)
+        {
+            foreach ($lvLector_arr as $lector)
+            {
+                // Prepare mail content
+                $fields = array(
+                    'vorname'       => $lector->vorname,
+                    'stgl_name'     => 'Die Studiengangsleitung',
+                    'link'          => anchor($url, 'Anrechnungsanträge Übersicht')
+                );
+
+                // Send mail
+                sendSanchoMail(
+                    'AnrechnungEmpfehlungAnfordern',
+                    $fields,
+                    $lector->uid. '@'. DOMAIN,
+                    'Deine Empfehlung wird benötigt zur Anerkennung nachgewiesener Kenntnisse'
+                );
+            }
+        }
+
+        $this->logInfo('SUCCEDED AnrechnungJob sendMailRecommendationRequests');
+
+    }
+
 	/**
 	 * Send Sancho mail to students, whose Anrechnungen were approved 24 hours ago.
 	 */

From 82019bb77ffeb4c0a1562f702b896bc9ccc5f4f2 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 20 Jun 2023 10:45:38 +0200
Subject: [PATCH 030/175] Deactivated: einzelne Empehlungsanfrage-Mails an
 Lektoren deaktiviert

---
 .../anrechnung/ApproveAnrechnungDetail.php    | 36 ++++++++-----------
 .../ApproveAnrechnungUebersicht.php           | 15 +-------
 2 files changed, 15 insertions(+), 36 deletions(-)

diff --git a/application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php b/application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php
index 8f71dc8d0..3a62ff7d9 100644
--- a/application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php
+++ b/application/controllers/lehre/anrechnung/ApproveAnrechnungDetail.php
@@ -242,7 +242,7 @@ class approveAnrechnungDetail extends Auth_Controller
         $empfehlungsanfrage_an = !isEmptyArray($result) ? implode(', ', array_column($result, 'fullname')) : '';
 
         // Request Recommendation
-        if($this->anrechnunglib->requestRecommendation($anrechnung_id))
+        if ($this->anrechnunglib->requestRecommendation($anrechnung_id))
         {
             $retval[]= array(
                 'anrechnung_id' => $anrechnung_id,
@@ -254,31 +254,23 @@ class approveAnrechnungDetail extends Auth_Controller
             );
         }
 
-		/**
-		 * Send mails to lectors
-		 * NOTE: mails are sent at the end to ensure sending only ONE mail to each LV-Leitung or lector
-		 * even if they are required for more recommendations
-		 * */
-		if (!isEmptyArray($retval))
-		{
-            if ($this->config->item('send_mail') === TRUE)
-            {
-                $this->_sendSanchoMailToLectors($anrechnung_id);
-            }
-
-			// Output json to ajax
-			return $this->outputJsonSuccess($retval);
-		}
-
 		// Output json to ajax
+        if ($empfehlungsanfrage_an == '')
+        {
+            $this->terminateWithJsonError(
+                "Empfehlung wurde nicht angefordert,\nDer LV sind keine LektorInnen zugeteilt."
+            );
+        }
+
 		if (isEmptyArray($retval))
 		{
-			$this->terminateWithJsonError(
-				"Empfehlung wurde nicht angefordert,\nDer LV sind keine LektorInnen zugeteilt."
-			);
+            $this->terminateWithJsonError("Empfehlung wurde nicht angefordert");
 		}
-
-		$this->terminateWithJsonError($this->p->t('ui', 'errorNichtAusgefuehrt'));
+        else
+        {
+            // Output json to ajax
+            return $this->outputJsonSuccess($retval);
+        }
 	}
 
 	/**
diff --git a/application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php b/application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php
index f13814e66..b5a44b8f6 100644
--- a/application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php
+++ b/application/controllers/lehre/anrechnung/ApproveAnrechnungUebersicht.php
@@ -249,19 +249,6 @@ class approveAnrechnungUebersicht extends Auth_Controller
 			}
 		}
 
-		/**
-		 * Send mails
-		 * NOTE: mails are sent at the end to ensure sending only ONE mail to each LV-Leitung or lector
-		 * even if they are required for more recommendations
-		 * */
-		if (!isEmptyArray($retval))
-		{
-            if ($this->config->item('send_mail') === TRUE)
-            {
-                $this->_sendSanchoMail($retval);
-            }
-		}
-
 		// Output json to ajax
 		if (isEmptyArray($retval))
 		{
@@ -273,7 +260,7 @@ class approveAnrechnungUebersicht extends Auth_Controller
 			$this->terminateWithJsonError('Es wurden keine Empfehlungen angefordert');
 		}
 
-		return $this->outputJsonSuccess($retval);
+		$this->outputJsonSuccess($retval);
 	}
 
 	/**

From 17c2004a394f78a0f653e7fa91b7968572bfdcab Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 20 Jun 2023 13:36:42 +0200
Subject: [PATCH 031/175] Adapted: Check for config 'fbl' in Job to send
 Sammelmail only to LV-Leitung (no fallback to other lectors)

---
 application/controllers/jobs/AnrechnungJob.php | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/application/controllers/jobs/AnrechnungJob.php b/application/controllers/jobs/AnrechnungJob.php
index 48ee6d4ca..b442c7e56 100644
--- a/application/controllers/jobs/AnrechnungJob.php
+++ b/application/controllers/jobs/AnrechnungJob.php
@@ -37,6 +37,9 @@ class AnrechnungJob extends JOB_Controller
 		$this->load->helper('hlp_sancho_helper');
 
         $this->load->library('AnrechnungLib');
+
+        // Load configs
+        $this->load->config('anrechnung');
 	}
 
 	/**
@@ -258,7 +261,15 @@ class AnrechnungJob extends JOB_Controller
         $arr_lvLector_arr = array();
         foreach ($anrechnung_id_arr as $anrechnung_id)
         {
-            $arr_lvLector_arr[]= $this->anrechnunglib->getLectors($anrechnung_id); // Returns LV Leitung. If not present, then all lectors of LV.
+            // Get full name of Fachbereichsleitung or LV Leitung.
+            if($this->config->item('fbl') === TRUE)
+            {
+                $arr_lvLector_arr[] = $this->anrechnunglib->getLeitungOfLvOe($anrechnung_id);
+            }
+            else
+            {
+                $arr_lvLector_arr[] = $this->anrechnunglib->getLectors($anrechnung_id); // Returns LV Leitung. If not present, then all lectors of LV.
+            }
         }
 
         // Unique lector array to send only one mail per lector

From a81ceb51b8a6c6febc976d7c79f4cf4bcc489650 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 22 Jun 2023 10:23:00 +0200
Subject: [PATCH 032/175] - rt sperre vor dem login moeglich

---
 cis/testtool/login.php                 |  3 ++
 include/pruefling.class.php            | 30 +++++++++---
 vilesci/stammdaten/auswertung_fhtw.php | 67 +++++++++++++++-----------
 3 files changed, 63 insertions(+), 37 deletions(-)

diff --git a/cis/testtool/login.php b/cis/testtool/login.php
index 0b114b8c5..0ff84f4a0 100644
--- a/cis/testtool/login.php
+++ b/cis/testtool/login.php
@@ -362,6 +362,8 @@ if ((isset($_SESSION['prestudent_id']) && !isset($_SESSION['pruefling_id']) &&
 		$pruefling->idnachweis = '';
 		$pruefling->registriert = date('Y-m-d H:i:s');
 		$pruefling->prestudent_id = $_SESSION['prestudent_id'];
+		$pruefling->gesperrt = $pruefling->isGesperrt(null, $_SESSION['prestudent_id']);
+
 		if ($pruefling->save())
 		{
 			$_SESSION['pruefling_id']=$pruefling->pruefling_id;
@@ -385,6 +387,7 @@ if (isset($_POST['save']) && isset($_SESSION['prestudent_id']))
 	$pruefling->registriert = date('Y-m-d H:i:s');
 	$pruefling->prestudent_id = $_SESSION['prestudent_id'];
 	$pruefling->semester = $_POST['semester'];
+	$pruefling->gesperrt = $pruefling->isGesperrt(null, $_SESSION['prestudent_id']);
 	if ($pruefling->save())
 	{
 		$_SESSION['pruefling_id']=$pruefling->pruefling_id;
diff --git a/include/pruefling.class.php b/include/pruefling.class.php
index 2a482d793..efe660ca9 100644
--- a/include/pruefling.class.php
+++ b/include/pruefling.class.php
@@ -108,12 +108,13 @@ class pruefling extends basis_db
 
 		if($this->new) //Wenn new true ist dann ein INSERT absetzen ansonsten ein UPDATE
 		{
-			$qry = 'BEGIN;INSERT INTO testtool.tbl_pruefling (studiengang_kz, idnachweis, registriert, prestudent_id, semester) VALUES('.
+			$qry = 'BEGIN;INSERT INTO testtool.tbl_pruefling (studiengang_kz, idnachweis, registriert, prestudent_id, semester, gesperrt) VALUES('.
 			       $this->db_add_param($this->studiengang_kz).",".
 			       $this->db_add_param($this->idnachweis).",".
 			       $this->db_add_param($this->registriert).",".
 			       $this->db_add_param($this->prestudent_id).",".
-			       $this->db_add_param($this->semester).");";
+			       $this->db_add_param($this->semester).",".
+			       $this->db_add_param($this->gesperrt, FHC_BOOLEAN).");";
 		}
 		else
 		{
@@ -122,7 +123,8 @@ class pruefling extends basis_db
 			       ' idnachweis='.$this->db_add_param($this->idnachweis).','.
 			       ' registriert='.$this->db_add_param($this->registriert).','.
 			       ' semester='.$this->db_add_param($this->semester).','.
-			       ' prestudent_id='.$this->db_add_param($this->prestudent_id, FHC_INTEGER).
+			       ' prestudent_id='.$this->db_add_param($this->prestudent_id, FHC_INTEGER).','.
+			       ' gesperrt='.$this->db_add_param($this->gesperrt, FHC_BOOLEAN).
 			       " WHERE pruefling_id=".$this->db_add_param($this->pruefling_id, FHC_INTEGER, false).";";
 		}
 
@@ -558,18 +560,30 @@ class pruefling extends basis_db
 		}
 	}
 	
-	public function isGesperrt($pruefling_id)
+	public function isGesperrt($pruefling_id = null, $prestudent_id = null)
 	{
+		if (is_null($pruefling_id) && is_null($prestudent_id))
+		{
+			$this->errormsg = 'Falsche Parameterübergabe';
+			return false;
+		}
+
 		$qry = "SELECT spruefling.gesperrt
 				FROM testtool.tbl_pruefling
-				JOIN public.tbl_prestudent USING(prestudent_id)
+				RIGHT JOIN public.tbl_prestudent USING(prestudent_id)
 				JOIN public.tbl_person USING (person_id)
 				JOIN public.tbl_prestudent pss ON pss.person_id = tbl_person.person_id
 				JOIN testtool.tbl_pruefling spruefling ON pss.prestudent_id = spruefling.prestudent_id
-				WHERE tbl_pruefling.pruefling_id = ".$this->db_add_param($pruefling_id, FHC_INTEGER)."
-					AND spruefling.gesperrt
-				LIMIT 1";
+				WHERE spruefling.gesperrt";
+
+		if (!is_null($pruefling_id))
+			$qry .= " AND tbl_pruefling.pruefling_id = ".$this->db_add_param($pruefling_id, FHC_INTEGER);
 		
+		if (!is_null($prestudent_id))
+			$qry .= " AND tbl_prestudent.prestudent_id = ".$this->db_add_param($prestudent_id, FHC_INTEGER);
+		
+		$qry .= " LIMIT 1";
+
 		if($result = $this->db_query($qry))
 		{
 			if ($this->db_num_rows($result) == 0)
diff --git a/vilesci/stammdaten/auswertung_fhtw.php b/vilesci/stammdaten/auswertung_fhtw.php
index e72c03bc5..92470ce84 100644
--- a/vilesci/stammdaten/auswertung_fhtw.php
+++ b/vilesci/stammdaten/auswertung_fhtw.php
@@ -501,46 +501,55 @@ if ($rtprueflingEntSperren)
 						WHERE person_id = ". $db->db_add_param($_POST['person_id']) . "
 				)";
 
-		
 		if ($result = $db->db_query($qry))
 		{
-			
 			if ($db->db_num_rows($result) === 0)
 			{
-				echo json_encode(array(
-					'status' => 'warning',
-					'msg' => 'Kein Pruefling gefunden!'
-				));
-				exit();
+				$ps = new prestudent();
+				$ps->getPrestudenten($_POST['person_id']);
+
+				$prestudent = new prestudent($ps->result[0]->prestudent_id);
+				$prestudent->getLastStatus($prestudent->prestudent_id);
+
+				$pruefling = new pruefling();
+				$pruefling->new = true;
+				$pruefling->studiengang_kz = $prestudent->studiengang_kz;
+				$pruefling->registriert = date('Y-m-d H:i:s');
+				$pruefling->semester = $prestudent->ausbildungssemester;
+				$pruefling->prestudent_id = $prestudent->prestudent_id;
+				$pruefling->gesperrt = true;
+
+				$resultSperre = $pruefling->save();
 			}
 			else
 			{
 				$pruefling_ids = array();
+
 				while ($row = $db->db_fetch_object($result))
-				{
 					$pruefling_ids[] = $row->pruefling_id;
-				}
-				
-				
-				$qry = "UPDATE testtool.tbl_pruefling SET gesperrt =" . $db->db_add_param($_POST['art'], 'BOOLEAN') . "
+
+				$qry = "UPDATE testtool.tbl_pruefling
+						SET gesperrt =" . $db->db_add_param($_POST['art'], 'BOOLEAN') . "
 						WHERE pruefling_id IN (" . $db->db_implode4SQL($pruefling_ids) . ")";
-				
-				if ($result_update = $db->db_query($qry))
-				{
-					$msg = $_POST['art'] === 'false' ? 'Pruefling wurde gesperrt' : 'Pruefling wurde freigeschaltet';
-					echo json_encode(array(
-						'status' => 'ok',
-						'msg' => $msg));
-					exit();
-				}
-				else
-				{
-					echo json_encode(array(
-						'status' => 'fehler',
-						'msg' => 'Fehler beim speichern der Daten'
-					));
-					exit();
-				}
+
+				$resultSperre = $db->db_query($qry);
+			}
+
+			if ($resultSperre)
+			{
+				$msg = $_POST['art'] === 'false' ? 'Pruefling wurde gesperrt' : 'Pruefling wurde freigeschaltet';
+				echo json_encode(array(
+					'status' => 'ok',
+					'msg' => $msg));
+				exit();
+			}
+			else
+			{
+				echo json_encode(array(
+					'status' => 'fehler',
+					'msg' => 'Fehler beim speichern der Daten'
+				));
+				exit();
 			}
 		}
 		else

From a54c7a3492ce5cca896883c7e031a02e93d19470 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Mon, 26 Jun 2023 19:15:27 +0200
Subject: [PATCH 033/175] UHSTAT1 data: added tables

---
 system/dbupdate_3.4.php                       |   1 +
 ...uhstat1_daten_ueber_das_bewerbungstool.php | 124 ++++++++++++++++++
 2 files changed, 125 insertions(+)
 create mode 100644 system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 9fda09bba..5687d4ca3 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -39,6 +39,7 @@ require_once('dbupdate_3.4/27107_vilesci_erfassung_abwesenheiten_reinigung.php')
 require_once('dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php');
 require_once('dbupdate_3.4/28089_plausichecks_in_extension_hinzufuegen.php');
 require_once('dbupdate_3.4/29133_einzelne_studiengaenge_aus_issuechecks_ausnehmen.php');
+require_once('dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
new file mode 100644
index 000000000..c27e068c6
--- /dev/null
+++ b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
@@ -0,0 +1,124 @@
+<?php
+
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+
+if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_abschluss LIMIT 1'))
+{
+	$qry = "CREATE TABLE bis.tbl_abschluss
+			(
+				ausbildung_code integer NOT NULL,
+				abschluss_bez varchar(128),
+				bezeichnung character varying(128)[],
+				aktiv boolean NOT NULL DEFAULT true,
+				in_oesterreich boolean,
+				CONSTRAINT tbl_abschluss_pk PRIMARY KEY (ausbildung_code)
+			);
+
+			COMMENT ON TABLE bis.tbl_abschluss IS 'Key-Table of graduation';
+			COMMENT ON COLUMN bis.tbl_abschluss.aktiv IS 'Shows wether graduation is still valid.';
+			COMMENT ON COLUMN bis.tbl_abschluss.in_oesterreich IS 'Shows if graduation was obtained in Austria.';
+
+			GRANT SELECT ON bis.tbl_abschluss TO web;
+			GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_abschluss TO vilesci;
+
+			-- prefill values
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(110, 'Pflichtschule', '{\"Pflichtschule (mit/ohne Abschluss)\", \"Compulsory school (Completed/not completed)\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(121, 'Lehre', '{\"Lehre\", \"Apprenticeship\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(122, 'Mittlere Schule ohne Matura', '{\"Mittlere Schule ohne Matura (z.B. Handelsschule, Fachschule)\", \"School for intermediate vocational education (without university entrance qualification)\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(123, 'Meisterprüfung', '{\"Meisterprüfung\", \"Master craftsman\'s diploma\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(131, 'AHS', '{\"AHS (allgemein bildende höhere Schule)\", \"Academic secondary school\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(132, 'BHS', '{\"BHS (berufsbildende höhere Schule, z.B. HAK, HTL)\", \"College for higher vocational education\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(133, 'Sonstige Hochschulzugangsberechtigung', '{\"Sonstige Hochschulzugangsberechtigung (z.B. Berufsreifeprüfung)\", \"Other university entrance qualification (e.g. \'Berufsreifeprüfung\')\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(141, 'Akademie', '{\"Akademie (z.B. PÄDAK, SOZAK)\", \"Academy (for example PÄDAK, SOZAK)\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(142, 'Universität/Hochschule', '{\"Universität/Hochschule\", \"University/university of applied sciences/university college of teacher education\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(210, 'Pflichtschule', '{\"Pflichtschule (mit/ohne Abschluss)\", \"Compulsory school (Completed/not completed)\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(220, 'Ausbildung ohne Hochschulzugangsberechtigung', '{\"Lehre oder mittlere Schule ohne Matura/Ausbildung ohne Hochschulzugangsberechtigung\", \"Apprenticeship or school for intermediate vocational education (education without university entrance qualification)\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(230, 'Ausbildung mit Hochschulzugangsberechtigung', '{\"Höhere Schule mit Matura / Ausbildung mit Hochschulzugangsberechtigung (z.B. Abitur)\", \"Higher secondary school with university entrance qualification\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(240, 'Universität/Hochschule', '{\"Universität/Hochschule\", \"University/university of applied sciences/university college of teacher education\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(999, 'unbekannt', '{\"Ich weiß nicht, welchen Abschluss meine erziehungsberechtigte Person erlangt hat.\", \"I do not know what degree my legal guardian got.\"}');
+		";
+
+	if(!$db->db_query($qry))
+		echo '<strong>bis.tbl_abschluss: '.$db->db_last_error().'</strong><br>';
+	else
+		echo ' bis.tbl_abschluss: Tabelle hinzugefuegt<br>';
+}
+
+if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_uhstat1daten LIMIT 1'))
+{
+	$qry = "CREATE SEQUENCE bis.tbl_uhstat1daten_uhstat1daten_id_seq
+				INCREMENT BY 1
+				NO MAXVALUE
+				NO MINVALUE
+				START WITH 1
+				CACHE 1
+				NO CYCLE;
+
+			CREATE TABLE bis.tbl_uhstat1daten
+			(
+				uhstat1daten_id integer DEFAULT nextval('bis.tbl_uhstat1daten_uhstat1daten_id_seq'::regclass),
+				geburtsstaat varchar(3),
+				mutter_geburtsstaat varchar(3),
+				mutter_bildungsstaat varchar(3),
+				mutter_geburtsjahr smallint,
+				mutter_bildungmax integer,
+				vater_geburtsstaat varchar(3),
+				vater_bildungsstaat varchar(3),
+				vater_geburtsjahr smallint,
+				vater_bildungmax integer,
+				person_id integer NOT NULL
+			);
+
+			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_geburtsstaat FOREIGN KEY (geburtsstaat)
+			REFERENCES bis.tbl_nation (nation_code) MATCH SIMPLE
+			ON DELETE RESTRICT ON UPDATE CASCADE;
+
+			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_mutter_geburtsstaat FOREIGN KEY (mutter_geburtsstaat)
+			REFERENCES bis.tbl_nation (nation_code) MATCH SIMPLE
+			ON DELETE RESTRICT ON UPDATE CASCADE;
+
+			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_mutter_bildungsstaat FOREIGN KEY (mutter_bildungsstaat)
+			REFERENCES bis.tbl_nation (nation_code) MATCH SIMPLE
+			ON DELETE RESTRICT ON UPDATE CASCADE;
+
+			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_mutter_bildungmax FOREIGN KEY (mutter_bildungmax)
+			REFERENCES bis.tbl_abschluss (ausbildung_code) MATCH SIMPLE
+			ON DELETE RESTRICT ON UPDATE CASCADE;
+
+			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_vater_geburtsstaat FOREIGN KEY (vater_geburtsstaat)
+			REFERENCES bis.tbl_nation (nation_code) MATCH SIMPLE
+			ON DELETE RESTRICT ON UPDATE CASCADE;
+
+			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_vater_bildungsstaat FOREIGN KEY (vater_bildungsstaat)
+			REFERENCES bis.tbl_nation (nation_code) MATCH SIMPLE
+			ON DELETE RESTRICT ON UPDATE CASCADE;
+
+			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_vater_bildungmax FOREIGN KEY (vater_bildungmax)
+			REFERENCES bis.tbl_abschluss (ausbildung_code) MATCH SIMPLE
+			ON DELETE RESTRICT ON UPDATE CASCADE;
+
+			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_person_id FOREIGN KEY (person_id)
+			REFERENCES public.tbl_person (person_id) MATCH SIMPLE
+			ON DELETE RESTRICT ON UPDATE CASCADE;
+
+			COMMENT ON TABLE bis.tbl_uhstat1daten IS 'UHSTAT1 data for a person (statistical data)';
+			COMMENT ON COLUMN bis.tbl_uhstat1daten.geburtsstaat IS 'Birthplace of person';
+			COMMENT ON COLUMN bis.tbl_uhstat1daten.mutter_geburtsstaat IS 'Birth country of mother of person';
+			COMMENT ON COLUMN bis.tbl_uhstat1daten.mutter_bildungsstaat IS 'Education country of mother of person';
+			COMMENT ON COLUMN bis.tbl_uhstat1daten.mutter_geburtsjahr IS 'Birth year of mother of person';
+			COMMENT ON COLUMN bis.tbl_uhstat1daten.mutter_bildungmax IS 'Highest completed level of education of mother (code)';
+			COMMENT ON COLUMN bis.tbl_uhstat1daten.vater_geburtsstaat IS 'Birth country of father of person';
+			COMMENT ON COLUMN bis.tbl_uhstat1daten.vater_bildungsstaat IS 'Education country of father of person';
+			COMMENT ON COLUMN bis.tbl_uhstat1daten.vater_geburtsjahr IS 'Birth year of father of person';
+			COMMENT ON COLUMN bis.tbl_uhstat1daten.vater_bildungmax IS 'Highest completed level of education of father (code)';
+
+			GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_uhstat1daten TO web;
+			GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_uhstat1daten TO vilesci;
+		";
+
+	if(!$db->db_query($qry))
+		echo '<strong>bis.tbl_uhstat1daten: '.$db->db_last_error().'</strong><br>';
+	else
+		echo ' bis.tbl_uhstat1daten: Tabelle hinzugefuegt<br>';
+}

From 0a961d8e95b33a5e300586d84d598bd7b10c0346 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Tue, 27 Jun 2023 11:00:13 +0200
Subject: [PATCH 034/175] UHSTAT1 bis.tbl_abschluss: added default values for
 in_oesterreich boolean

---
 ...uhstat1_daten_ueber_das_bewerbungstool.php | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
index c27e068c6..7395ac0bc 100644
--- a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
+++ b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
@@ -23,19 +23,19 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_abschluss LIMIT 1'))
 			GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_abschluss TO vilesci;
 
 			-- prefill values
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(110, 'Pflichtschule', '{\"Pflichtschule (mit/ohne Abschluss)\", \"Compulsory school (Completed/not completed)\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(121, 'Lehre', '{\"Lehre\", \"Apprenticeship\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(122, 'Mittlere Schule ohne Matura', '{\"Mittlere Schule ohne Matura (z.B. Handelsschule, Fachschule)\", \"School for intermediate vocational education (without university entrance qualification)\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(123, 'Meisterprüfung', '{\"Meisterprüfung\", \"Master craftsman\'s diploma\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(131, 'AHS', '{\"AHS (allgemein bildende höhere Schule)\", \"Academic secondary school\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(132, 'BHS', '{\"BHS (berufsbildende höhere Schule, z.B. HAK, HTL)\", \"College for higher vocational education\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(133, 'Sonstige Hochschulzugangsberechtigung', '{\"Sonstige Hochschulzugangsberechtigung (z.B. Berufsreifeprüfung)\", \"Other university entrance qualification (e.g. \'Berufsreifeprüfung\')\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(141, 'Akademie', '{\"Akademie (z.B. PÄDAK, SOZAK)\", \"Academy (for example PÄDAK, SOZAK)\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(142, 'Universität/Hochschule', '{\"Universität/Hochschule\", \"University/university of applied sciences/university college of teacher education\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(210, 'Pflichtschule', '{\"Pflichtschule (mit/ohne Abschluss)\", \"Compulsory school (Completed/not completed)\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(220, 'Ausbildung ohne Hochschulzugangsberechtigung', '{\"Lehre oder mittlere Schule ohne Matura/Ausbildung ohne Hochschulzugangsberechtigung\", \"Apprenticeship or school for intermediate vocational education (education without university entrance qualification)\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(230, 'Ausbildung mit Hochschulzugangsberechtigung', '{\"Höhere Schule mit Matura / Ausbildung mit Hochschulzugangsberechtigung (z.B. Abitur)\", \"Higher secondary school with university entrance qualification\"}');
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(240, 'Universität/Hochschule', '{\"Universität/Hochschule\", \"University/university of applied sciences/university college of teacher education\"}');
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(110, 'Pflichtschule', '{\"Pflichtschule (mit/ohne Abschluss)\", \"Compulsory school (Completed/not completed)\"}', true);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(121, 'Lehre', '{\"Lehre\", \"Apprenticeship\"}', true);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(122, 'Mittlere Schule ohne Matura', '{\"Mittlere Schule ohne Matura (z.B. Handelsschule, Fachschule)\", \"School for intermediate vocational education (without university entrance qualification)\"}', true);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(123, 'Meisterprüfung', '{\"Meisterprüfung\", \"Master craftsman\'s diploma\"}', true);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(131, 'AHS', '{\"AHS (allgemein bildende höhere Schule)\", \"Academic secondary school\"}', true);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(132, 'BHS', '{\"BHS (berufsbildende höhere Schule, z.B. HAK, HTL)\", \"College for higher vocational education\"}', true);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(133, 'Sonstige Hochschulzugangsberechtigung', '{\"Sonstige Hochschulzugangsberechtigung (z.B. Berufsreifeprüfung)\", \"Other university entrance qualification (e.g. \'Berufsreifeprüfung\')\"}', true);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(141, 'Akademie', '{\"Akademie (z.B. PÄDAK, SOZAK)\", \"Academy (for example PÄDAK, SOZAK)\"}', true);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(142, 'Universität/Hochschule', '{\"Universität/Hochschule\", \"University/university of applied sciences/university college of teacher education\"}', true);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(210, 'Pflichtschule', '{\"Pflichtschule (mit/ohne Abschluss)\", \"Compulsory school (Completed/not completed)\"}', false);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(220, 'Ausbildung ohne Hochschulzugangsberechtigung', '{\"Lehre oder mittlere Schule ohne Matura/Ausbildung ohne Hochschulzugangsberechtigung\", \"Apprenticeship or school for intermediate vocational education (education without university entrance qualification)\"}', false);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(230, 'Ausbildung mit Hochschulzugangsberechtigung', '{\"Höhere Schule mit Matura / Ausbildung mit Hochschulzugangsberechtigung (z.B. Abitur)\", \"Higher secondary school with university entrance qualification\"}', false);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(240, 'Universität/Hochschule', '{\"Universität/Hochschule\", \"University/university of applied sciences/university college of teacher education\"}', false);
 			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung) VALUES(999, 'unbekannt', '{\"Ich weiß nicht, welchen Abschluss meine erziehungsberechtigte Person erlangt hat.\", \"I do not know what degree my legal guardian got.\"}');
 		";
 

From f49771ec7f433b15f9f17198564c26c392de4587 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 29 Jun 2023 12:10:50 +0200
Subject: [PATCH 035/175] - berechtigungen fuer die sequence hinzugefuegt

---
 system/dbupdate_3.4.php                       |  1 +
 .../29529_infocenter_anpassungen.php          | 34 +++++++++++++++++++
 2 files changed, 35 insertions(+)
 create mode 100644 system/dbupdate_3.4/29529_infocenter_anpassungen.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 106e509a1..aa4221bf4 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -36,6 +36,7 @@ require_once('dbupdate_3.4/19154_beurteilungsformulare_pruefungssenat.php');
 require_once('dbupdate_3.4/27949_infocenter_zurueckstellen_mit_grund.php');
 require_once('dbupdate_3.4/27107_vilesci_erfassung_abwesenheiten_reinigung.php');
 require_once('dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php');
+require_once('dbupdate_3.4/29529_infocenter_anpassungen.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/29529_infocenter_anpassungen.php b/system/dbupdate_3.4/29529_infocenter_anpassungen.php
new file mode 100644
index 000000000..e11f3ed39
--- /dev/null
+++ b/system/dbupdate_3.4/29529_infocenter_anpassungen.php
@@ -0,0 +1,34 @@
+<?php
+
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+// Update Berechtigungen fuer web User erteilen fuer tbl_pruefling_pruefling_id_seq
+if($result = @$db->db_query("SELECT has_sequence_privilege('web', 'testtool.tbl_pruefling_pruefling_id_seq', 'UPDATE')"))
+{
+	
+	if($db->db_fetch_object($result)->has_sequence_privilege === "f")
+	{
+		$qry = "GRANT SELECT, UPDATE ON SEQUENCE testtool.tbl_pruefling_pruefling_id_seq to web;";
+
+		if(!$db->db_query($qry))
+			echo '<strong>testtool.tbl_pruefling Berechtigungen: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>Web User fuer testtool.tbl_pruefling berechtigt';
+	}
+}
+
+// Update Berechtigungen fuer vilesci User erteilen fuer tbl_pruefling_pruefling_id_seq
+if($result = @$db->db_query("SELECT has_sequence_privilege('vilesci', 'testtool.tbl_pruefling_pruefling_id_seq', 'UPDATE')"))
+{
+	if($db->db_fetch_object($result)->has_sequence_privilege === "f")
+	{
+		$qry = "GRANT SELECT, UPDATE ON SEQUENCE testtool.tbl_pruefling_pruefling_id_seq to vilesci;";
+		
+		if(!$db->db_query($qry))
+			echo '<strong>testtool.tbl_pruefling Berechtigungen: '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>vilesci User fuer testtool.tbl_pruefling berechtigt';
+	}
+}
+
+

From 64ce3d1f6af1ce5c1146845d1ab4aa7788c1902d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 4 Jul 2023 10:34:14 +0200
Subject: [PATCH 036/175] Cleaned up commit from
 'feature-27351/Digitalisierung_Formulare_Abmeldung_Unterbrechung_Wiederholung'

---
 application/config/studierendenantrag.php     |  152 ++
 .../components/Antrag/Abmeldung.php           |  201 ++
 .../controllers/components/Antrag/Leitung.php |  358 ++++
 .../components/Antrag/Unterbrechung.php       |  230 +++
 .../components/Antrag/Wiederholung.php        |  369 ++++
 .../controllers/components/Phrasen.php        |   23 +
 application/controllers/jobs/AntragJob.php    |  406 ++++
 .../controllers/lehre/Antrag/Attachment.php   |   82 +
 .../controllers/lehre/Antrag/Wiederholung.php |   49 +
 .../controllers/lehre/Studierendenantrag.php  |  208 ++
 application/helpers/hlp_common_helper.php     |   16 +
 application/libraries/AntragLib.php           | 1476 ++++++++++++++
 application/libraries/DmsLib.php              |    2 +
 application/libraries/PrestudentLib.php       |  356 ++++
 application/models/crm/Konto_model.php        |   43 +-
 .../models/crm/Prestudentstatus_model.php     |   90 +
 .../models/education/Pruefung_model.php       |  139 +-
 .../education/Studierendenantrag_model.php    |  229 +++
 ...dierendenantraglehrveranstaltung_model.php |   79 +
 .../Studierendenantragstatus_model.php        |   52 +
 .../models/education/Zeugnisnote_model.php    |   81 +-
 .../models/organisation/Studiengang_model.php |   53 +-
 .../models/organisation/Studienplan_model.php |   34 +-
 .../organisation/Studiensemester_model.php    |   30 +
 application/models/person/Person_model.php    |   13 +
 application/views/lehre/Antrag/Create.php     |   54 +
 .../views/lehre/Antrag/Leitung/List.php       |   58 +
 .../views/lehre/Antrag/Student/List.php       |  151 ++
 .../lehre/Antrag/Wiederholung/Student.php     |   43 +
 .../lehre/Antrag/Wiederholung/getLvs.rdf.php  |   31 +
 .../lehre/Antrag/Wiederholung/moveLvs.rdf.php |   17 +
 application/views/templates/FHC-Common.php    |    2 +-
 application/views/templates/FHC-Header.php    |    3 +
 cis/private/pdfExport.php                     |    2 +
 cis/private/profile/dokumente.php             |   22 +
 composer.json                                 |   27 +-
 composer.lock                                 |  463 ++++-
 content/fas.xul.php                           |   35 +-
 content/student/studentnotenoverlay.xul.php   |   79 +
 content/student/studentoverlay.js.php         |  320 ++-
 include/dokument_export.class.php             |    4 +
 include/studierendenantrag.class.php          |  147 ++
 locale/de-AT/fas.dtd                          |   12 +
 public/css/Fhc.css                            |   79 +
 public/css/cis_bs5.css                        |   66 +
 public/js/apps/lehre/Antrag.js                |   22 +
 public/js/apps/lehre/Antrag/Leitung.js        |    8 +
 public/js/apps/lehre/Antrag/Lvzuweisung.js    |    8 +
 public/js/apps/lehre/Antrag/Student.js        |    8 +
 public/js/components/Bootstrap/Alert.js       |   44 +
 public/js/components/Bootstrap/Confirm.js     |   22 +
 public/js/components/Bootstrap/Modal.js       |  109 +
 public/js/components/Bootstrap/Prompt.js      |   37 +
 public/js/components/Fetch.js                 |   17 +-
 public/js/components/Loader.js                |   62 +
 .../components/Studierendenantrag/Antrag.js   |   60 +
 .../Studierendenantrag/Form/Abmeldung.js      |  285 +++
 .../Studierendenantrag/Form/Unterbrechung.js  |  359 ++++
 .../Studierendenantrag/Form/Wiederholung.js   |  212 ++
 .../Studierendenantrag/Infoblock.js           |   19 +
 .../components/Studierendenantrag/Leitung.js  |  312 +++
 .../Studierendenantrag/Leitung/Actions.js     |   87 +
 .../Leitung/Actions/Columns.js                |   25 +
 .../Studierendenantrag/Leitung/Actions/New.js |  118 ++
 .../Studierendenantrag/Leitung/GrundPopup.js  |   62 +
 .../Studierendenantrag/Leitung/Header.js      |   24 +
 .../Studierendenantrag/Leitung/LvPopup.js     |  142 ++
 .../Studierendenantrag/Leitung/Table.js       |  388 ++++
 .../Studierendenantrag/Lvzuweisung.js         |  242 +++
 .../components/Studierendenantrag/Status.js   |   15 +
 public/js/components/vueDatepicker.js.php     |   12 +
 public/js/mixins/Phrasen.js                   |   85 +
 public/js/tabulator/filters/Dates.js          |   43 +
 rdf/AntragAbmeldung.xml.php                   |   68 +
 rdf/AntragUnterbrechung.xml.php               |   71 +
 system/dbupdate_3.4.php                       |    1 +
 .../27351_digitalisierung_formulare.php       |  289 +++
 system/phrasesupdate.php                      | 1784 +++++++++++++++++
 system/vorlage_zip/AntragAbmeldung.odt        |  Bin 0 -> 37277 bytes
 system/vorlage_zip/AntragUnterbrechung.odt    |  Bin 0 -> 34155 bytes
 system/xsl/AntragAbmeldung.xsl                |  368 ++++
 system/xsl/AntragUnterbrechung.xsl            |  459 +++++
 82 files changed, 12192 insertions(+), 61 deletions(-)
 create mode 100644 application/config/studierendenantrag.php
 create mode 100644 application/controllers/components/Antrag/Abmeldung.php
 create mode 100644 application/controllers/components/Antrag/Leitung.php
 create mode 100644 application/controllers/components/Antrag/Unterbrechung.php
 create mode 100644 application/controllers/components/Antrag/Wiederholung.php
 create mode 100644 application/controllers/components/Phrasen.php
 create mode 100644 application/controllers/jobs/AntragJob.php
 create mode 100644 application/controllers/lehre/Antrag/Attachment.php
 create mode 100644 application/controllers/lehre/Antrag/Wiederholung.php
 create mode 100644 application/controllers/lehre/Studierendenantrag.php
 create mode 100644 application/libraries/AntragLib.php
 create mode 100644 application/libraries/PrestudentLib.php
 create mode 100644 application/models/education/Studierendenantrag_model.php
 create mode 100644 application/models/education/Studierendenantraglehrveranstaltung_model.php
 create mode 100644 application/models/education/Studierendenantragstatus_model.php
 create mode 100644 application/views/lehre/Antrag/Create.php
 create mode 100644 application/views/lehre/Antrag/Leitung/List.php
 create mode 100644 application/views/lehre/Antrag/Student/List.php
 create mode 100644 application/views/lehre/Antrag/Wiederholung/Student.php
 create mode 100644 application/views/lehre/Antrag/Wiederholung/getLvs.rdf.php
 create mode 100644 application/views/lehre/Antrag/Wiederholung/moveLvs.rdf.php
 create mode 100644 include/studierendenantrag.class.php
 create mode 100644 public/css/Fhc.css
 create mode 100644 public/css/cis_bs5.css
 create mode 100644 public/js/apps/lehre/Antrag.js
 create mode 100644 public/js/apps/lehre/Antrag/Leitung.js
 create mode 100644 public/js/apps/lehre/Antrag/Lvzuweisung.js
 create mode 100644 public/js/apps/lehre/Antrag/Student.js
 create mode 100644 public/js/components/Bootstrap/Alert.js
 create mode 100644 public/js/components/Bootstrap/Confirm.js
 create mode 100644 public/js/components/Bootstrap/Modal.js
 create mode 100644 public/js/components/Bootstrap/Prompt.js
 create mode 100644 public/js/components/Loader.js
 create mode 100644 public/js/components/Studierendenantrag/Antrag.js
 create mode 100644 public/js/components/Studierendenantrag/Form/Abmeldung.js
 create mode 100644 public/js/components/Studierendenantrag/Form/Unterbrechung.js
 create mode 100644 public/js/components/Studierendenantrag/Form/Wiederholung.js
 create mode 100644 public/js/components/Studierendenantrag/Infoblock.js
 create mode 100644 public/js/components/Studierendenantrag/Leitung.js
 create mode 100644 public/js/components/Studierendenantrag/Leitung/Actions.js
 create mode 100644 public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
 create mode 100644 public/js/components/Studierendenantrag/Leitung/Actions/New.js
 create mode 100644 public/js/components/Studierendenantrag/Leitung/GrundPopup.js
 create mode 100644 public/js/components/Studierendenantrag/Leitung/Header.js
 create mode 100644 public/js/components/Studierendenantrag/Leitung/LvPopup.js
 create mode 100644 public/js/components/Studierendenantrag/Leitung/Table.js
 create mode 100644 public/js/components/Studierendenantrag/Lvzuweisung.js
 create mode 100644 public/js/components/Studierendenantrag/Status.js
 create mode 100644 public/js/components/vueDatepicker.js.php
 create mode 100644 public/js/mixins/Phrasen.js
 create mode 100644 public/js/tabulator/filters/Dates.js
 create mode 100644 rdf/AntragAbmeldung.xml.php
 create mode 100644 rdf/AntragUnterbrechung.xml.php
 create mode 100644 system/dbupdate_3.4/27351_digitalisierung_formulare.php
 create mode 100644 system/vorlage_zip/AntragAbmeldung.odt
 create mode 100644 system/vorlage_zip/AntragUnterbrechung.odt
 create mode 100644 system/xsl/AntragAbmeldung.xsl
 create mode 100644 system/xsl/AntragUnterbrechung.xsl

diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
new file mode 100644
index 000000000..85a3e1658
--- /dev/null
+++ b/application/config/studierendenantrag.php
@@ -0,0 +1,152 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+// TODO(chris): review this!
+$config['frist_rueckzahlung_studiengebuer_WS'] = '15.10.';
+$config['frist_rueckzahlung_studiengebuer_SS'] = '15.03.';
+
+// TODO(chris): review this!
+#$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => null];
+$config['unterbrechung_dms'] = ['oe_kurzbz' => null, 'dokument_kurzbz' => null, 'kategorie_kurzbz' => 'Akte'];
+
+/**
+ * UPLOAD
+ */
+
+/**
+ * Allowed filetypes for attachment upload in unterbrechung antrag
+ *
+ * @var array           An array of fileextensions
+ */
+$config['unterbrechung_dms_filetypes'] = ['jpg', 'pdf'];
+
+
+/**
+ * GRADES
+ */
+
+/**
+ * On wiederholung the student must repeat certain lvs.
+ * This lvs will be graded with this id
+ *
+ * @var integer			tbl_note.note
+ */
+$config['wiederholung_note_angerechnet'] = 19;
+
+/**
+ * On wiederholung the student can not attend certain lvs.
+ * Those lvs will be graded with this id
+ *
+ * @var integer			tbl_note.note
+ */
+$config['wiederholung_note_nicht_zugelassen'] = 20;
+
+
+/**
+ * JOBS
+ */
+
+/**
+ * The Job will remind for every Unterbrecher who has a
+ * wiedereinstieg_datum between the date the Job is run
+ * and the modified date
+ * e.g.: If the Job is running on 2023-04-20 and the modifier
+ * is '+3 days' it will remind of everyone that
+ * has a wiedereinstiegs_datum between 2023-04-20 and 2023-04-23
+ *
+ * @var string	        A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['unterbrechung_job_remind_wiedereinstieg_date_modifier'] = '+3 days';
+
+/**
+ * The Job will sent a request to everyone who faild the 3rd committee exam
+ * and respecting the given conditions (not repeated yet, stg not in blacklist)
+ * to decide if he/she will repeat or not
+ *
+ * First request
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['wiederholung_job_request_1_date_modifier'] = '+0 days';
+
+/**
+ * Second request
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['wiederholung_job_request_2_date_modifier'] = '+3 weeks';
+
+/**
+ * Final deadline - after this the student will be abgemeldet if he hasn't chosen yet
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['wiederholung_job_deadline_date_modifier'] = '+1 month';
+
+/**
+ * Objection period - the student will be abgemeldet if he hasn't objected in this period
+ *
+ * @var string           A string formated as PHP DateTime modifier
+ * @see https://www.php.net/manual/de/datetime.modify.php
+ */
+$config['abmeldung_job_deadline_date_modifier'] = '+3 weeks';
+
+
+
+/**
+ * System User - uid of a user that is allowed to set prestudentstatus
+ * TODO(chris): DEBUG! CHANGE THIS!
+ *
+ * @var string
+ */
+$config['antrag_job_systemuser'] = 'ma0168';
+
+
+/**
+ * WHITELISTS
+ */
+
+/**
+ * List of stati who entitle a prestudent to create an Antrag
+ *
+ * @var array			Array of tbl_status.status_kurzbz's
+ */
+$config['antrag_prestudentstatus_whitelist'] = ['Student', 'Diplomand'];
+
+
+/**
+ * BLACKLISTS
+ */
+
+/**
+ * List of Statusgründe that prevent a prestudent from create an Wiederholungsantrag
+ *
+ * @var array			An array of tbl_status_grund.statusgrund_id's
+ */
+$config['status_gruende_wiederholer'] = [16, 15];
+
+/**
+ * Blacklisted for abmeldung anträge
+ *
+ * @var array           An array of tbl_studiengang.studiengang_kz's
+ */
+$config['stgkz_blacklist_abmeldung'] = [];
+
+/**
+ * Blacklisted for unterbrechung anträge
+ *
+ * @var array           An array of tbl_studiengang.studiengang_kz's
+ */
+$config['stgkz_blacklist_unterbrechung'] = [];
+
+/**
+ * Blacklisted for wiederholung anträge
+ *
+ * @var array           An array of tbl_studiengang.studiengang_kz's
+ */
+$config['stgkz_blacklist_wiederholung'] = [];
diff --git a/application/controllers/components/Antrag/Abmeldung.php b/application/controllers/components/Antrag/Abmeldung.php
new file mode 100644
index 000000000..9130c1d7d
--- /dev/null
+++ b/application/controllers/components/Antrag/Abmeldung.php
@@ -0,0 +1,201 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \Studierendenantrag_model as Studierendenantrag_model;
+
+/**
+ *
+ */
+class Abmeldung extends FHC_Controller
+{
+
+	/**
+	 * Calls the parent's constructor and loads the FilterCmptLib
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('AntragLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'studierendenantrag'
+		]);
+	}
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Retrieves data of the current studiengang for the current user
+	 */
+
+	public function getDetailsForNewAntrag($prestudent_id)
+	{
+		if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, true)) {
+			$this->output->set_status_header(403);
+			return $this->outputJsonError('Forbidden');
+		}
+		$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
+		if (isError($result)) {
+			$this->output->set_status_header(500);
+			return $this->outputJsonError(getError($result));
+		}
+		$result = $result->retval;
+		if (!$result) {
+			$this->output->set_status_header(403);
+			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_no_student'));
+		}
+		elseif ($result == -3)
+		{
+			$this->output->set_status_header(403);
+			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_stg_blacklist'));
+		}
+		elseif ($result == -1)
+		{
+			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, Studierendenantrag_model::TYP_ABMELDUNG);
+			if (isError($result)) {
+				return $this->outputJsonError(getError($result));
+			}
+
+			$data = getData($result);
+			$data->canCancel = (boolean)$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id);
+
+			return $this->outputJsonSuccess($data);
+		}
+
+		$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
+		if (isError($result)) {
+			return $this->outputJsonError(getError($result));
+		}
+
+		$this->outputJsonSuccess(getData($result));
+	}
+
+	public function createAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
+		$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
+		$this->form_validation->set_rules('grund', 'Grund', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$grund = $this->input->post('grund');
+		$studiensemester = $this->input->post('studiensemester');
+		$prestudent_id = $this->input->post('prestudent_id');
+
+		$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($prestudent_id);
+		if (isError($result)) {
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+		$result = $result->retval;
+		if (!$result)
+		{
+			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_no_student')]);
+		}
+		elseif ($result == -3)
+		{
+			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_stg_blacklist')]);
+		}
+		elseif ($result < 0)
+		{
+			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_antrag_exists')]);
+		}
+
+		$result = $this->antraglib->createAbmeldung($prestudent_id, $studiensemester, getAuthUID(), $grund);
+		if (isError($result))
+		{
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+
+		$result = $this->antraglib->getDetailsForAntrag(getData($result));
+		if (!hasData($result))
+		return $this->outputJsonSuccess(true);
+
+		$data = getData($result);
+		$data->canCancel = (boolean)$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id);
+
+		$this->outputJsonSuccess($data);
+	}
+
+	public function cancelAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules('antrag_id', 'Antrag ID', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$antrag_id = $this->input->post('antrag_id');
+		if(!$this->antraglib->isEntitledToCancelAntrag($antrag_id))
+		{
+			$this->output->set_status_header(403);
+
+			return $this->outputJsonError('Forbidden');
+		}
+
+		$result = $this->antraglib->cancelAntrag($antrag_id, getAuthUID());
+		if(isError($result))
+		{
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+
+		$result = $this->antraglib->getDetailsForAntrag($antrag_id);
+
+		if (!hasData($result))
+			return $this->outputJsonSuccess($antrag_id);
+		$this->outputJsonSuccess(getData($result));
+	}
+
+	public function getStudiengaengeAssistenz()
+	{
+		$this->load->library('PermissionLib');
+
+		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
+
+		$result = $this->antraglib->getAbmeldeBerechtigtForStg($studiengaenge);
+		if (isError($result)) {
+			return $this->outputJsonError(getError($result));
+		}
+		$result = getData($result);
+		if (!$result) {
+			return $this->outputJsonSuccess([]);
+		}
+
+		$sortedStudents = [];
+		foreach ($result as $item) {
+			if (!isset($sortedStudents[$item->studiengang_kz]))
+				$sortedStudents[$item->studiengang_kz] = [
+					'bezeichnung' => $item->bezeichnung,
+					'orgform' => $item->orgform,
+					'studenten' => []
+				];
+			$sortedStudents[$item->studiengang_kz]['studenten'][] = [
+				'semester' => $item->semester,
+				'prestudent_id' => $item->prestudent_id,
+				'name' => trim($item->vorname . ' ' . $item->nachname),
+				'vorname' => $item->vorname,
+				'nachname' => $item->nachname,
+				'studiensemester_kurzbz' => $item->studiensemester_kurzbz
+			];
+		}
+
+		$this->outputJsonSuccess($sortedStudents);
+	}
+}
diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
new file mode 100644
index 000000000..90a677c31
--- /dev/null
+++ b/application/controllers/components/Antrag/Leitung.php
@@ -0,0 +1,358 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Leitung extends FHC_Controller
+{
+
+	/**
+	 * Calls the parent's constructor and loads the FilterCmptLib
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('AntragLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'studierendenantrag'
+		]);
+	}
+
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getAntraege($studiengang = null)
+	{
+
+		if($studiengang)
+			$studiengaenge = [$studiengang];
+		else {
+			$studiengaenge =$this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
+			if(!is_array($studiengaenge))
+				$studiengaenge = [];
+
+
+			$stgsNeuanlage = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
+			if(!is_array($stgsNeuanlage))
+				$stgsNeuanlage = [];
+
+			$studiengaenge = array_unique(array_merge($studiengaenge, $stgsNeuanlage));
+		}
+
+
+		$antraege = [];
+		if ($studiengaenge) {
+			$result = $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
+			if (isError($result)) {
+				$this->output->set_status_header(500);
+				return $this->outputJson('Internal Server Error');
+			}
+			$antraege = getData($result);
+		}
+
+		$this->outputJson($antraege);
+	}
+
+	public function reopenAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			'required|callback_isEntitledToReopenAntrag',
+			[
+				'isEntitledToReopenAntrag' => $this->p->t('studierendenantrag','error_no_right')
+			]
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->reopenWiederholung($studierendenantrag_id, getAuthUID());
+
+		if (isError($result))
+			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
+
+		$this->outputJsonSuccess($studierendenantrag_id);
+	}
+
+	public function objectAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			'required|callback_isEntitledToObjectAntrag|callback_canBeObjected',
+			[
+				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag','error_no_right'),
+				'canBeObjected' => $this->p->t('studierendenantrag','error_no_objection')
+			]
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->objectAbmeldung($studierendenantrag_id, getAuthUID());
+
+		if (isError($result))
+			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
+
+		$this->outputJsonSuccess($studierendenantrag_id);
+	}
+
+	public function objectionDeny()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			'required|callback_isEntitledToObjectAntrag|callback_isObjected',
+			[
+				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag','error_no_right'),
+				'isObjected' => $this->p->t('studierendenantrag','error_not_objected')
+			]
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->approveAbmeldung([$studierendenantrag_id], getAuthUID());
+
+		if (isError($result))
+			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
+
+		$this->outputJsonSuccess($studierendenantrag_id);
+	}
+
+	public function objectionApprove()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			'required|callback_isEntitledToObjectAntrag|callback_isObjected',
+			[
+				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag','error_no_right'),
+				'isObjected' => $this->p->t('studierendenantrag','error_not_objected')
+			]
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->cancelAntrag($studierendenantrag_id, getAuthUID());
+
+		if (isError($result))
+			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
+
+		$this->outputJsonSuccess($studierendenantrag_id);
+	}
+
+	public function isEntitledToReopenAntrag($studierendenantrag_id)
+	{
+		return $this->antraglib->isEntitledToReopenAntrag($studierendenantrag_id);
+	}
+
+	public function isEntitledToObjectAntrag($studierendenantrag_id)
+	{
+		return $this->antraglib->isEntitledToObjectAntrag($studierendenantrag_id);
+	}
+
+	public function isEntitledToRejectAntrag($studierendenantrag_id)
+	{
+		return $this->antraglib->isEntitledToRejectAntrag($studierendenantrag_id);
+	}
+
+	public function canBeObjected($studierendenantrag_id)
+	{
+		return $this->antraglib->hasStatus($studierendenantrag_id, Studierendenantragstatus_model::STATUS_APPROVED_STGL);
+	}
+
+	public function isObjected($studierendenantrag_id)
+	{
+		return $this->antraglib->hasStatus($studierendenantrag_id, Studierendenantragstatus_model::STATUS_OBJECTED);
+	}
+
+
+	public function approveAbmeldung()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			'required|callback_isEntitledToApproveAntrag',
+			[
+				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag','error_no_right')
+			]
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->approveAbmeldung([$studierendenantrag_id], getAuthUID());
+		if (isError($result))
+		{
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+
+		return $this->outputJsonSuccess($studierendenantrag_id);
+	}
+
+	public function approveUnterbrechung()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			'required|callback_isEntitledToApproveAntrag',
+			[
+				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag','error_no_right')
+			]
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->approveUnterbrechung([$studierendenantrag_id], getAuthUID());
+		if (isError($result))
+		{
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+
+		return $this->outputJsonSuccess($studierendenantrag_id);
+	}
+
+	public function rejectUnterbrechung()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			'required|callback_isEntitledToRejectAntrag',
+			[
+				'isEntitledToRejectAntrag' => $this->p->t('studierendenantrag','error_no_right')
+			]
+		);
+		$this->form_validation->set_rules('grund', 'Grund', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+		$grund = $this->input->post('grund');
+
+		$result = $this->antraglib->rejectUnterbrechung([$studierendenantrag_id], getAuthUID(), $grund);
+		if (isError($result))
+		{
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+
+		return $this->outputJsonSuccess($studierendenantrag_id);
+	}
+
+	public function approveWiederholung()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules(
+			'studierendenantrag_id',
+			'Studierenden Antrag',
+			'required|callback_isEntitledToApproveAntrag',
+			[
+				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag','error_no_right')
+			]
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+
+		$result = $this->antraglib->approveWiederholung($studierendenantrag_id, getAuthUID());
+		if (isError($result))
+		{
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+
+		return $this->outputJsonSuccess($studierendenantrag_id);
+	}
+
+	public function isEntitledToApproveAntrag($studierendenantrag_id)
+	{
+		return $this->antraglib->isEntitledToApproveAntrag($studierendenantrag_id);
+	}
+
+	public function getHistory($studierendenantrag_id)
+	{
+		if (!$this->antraglib->isEntitledToSeeHistoryForAntrag($studierendenantrag_id)) {
+			$this->output->set_status_header(403);
+			return $this->outputJson('Forbidden');
+		}
+
+		$result = $this->antraglib->getAntragHistory($studierendenantrag_id);
+		if (isError($result)) {
+			return $this->outputJsonError(getError($result));
+		}
+
+		$this->outputJsonSuccess(getData($result) ?: []);
+	}
+}
diff --git a/application/controllers/components/Antrag/Unterbrechung.php b/application/controllers/components/Antrag/Unterbrechung.php
new file mode 100644
index 000000000..78594fa65
--- /dev/null
+++ b/application/controllers/components/Antrag/Unterbrechung.php
@@ -0,0 +1,230 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \Studierendenantrag_model as Studierendenantrag_model;
+use \DateTime as DateTime;
+
+/**
+ *
+ */
+class Unterbrechung extends FHC_Controller
+{
+
+	/**
+	 * Calls the parent's constructor and loads the FilterCmptLib
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Configs
+		$this->load->config('studierendenantrag');
+
+		// Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('AntragLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'studierendenantrag'
+		]);
+	}
+
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	public function getDetailsForNewAntrag($prestudent_id)
+	{
+		if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, false)) {
+			$this->output->set_status_header(403);
+			return $this->outputJsonError('Forbidden');
+		}
+		$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($prestudent_id);
+		if (isError($result)) {
+			$this->output->set_status_header(500);
+			return $this->outputJsonError(getError($result));
+		}
+		$result = $result->retval;
+		if (!$result) {
+			$this->output->set_status_header(403);
+			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_no_student'));
+		}
+		elseif ($result == -1)
+		{
+			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, Studierendenantrag_model::TYP_UNTERBRECHUNG);
+			if (isError($result)) {
+				return $this->outputJsonError(getError($result));
+			}
+
+			return $this->outputJsonSuccess(getData($result));
+		}
+		elseif ($result == -2)
+		{
+			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id);
+			if (isError($result)) {
+				return $this->outputJsonError(getError($result));
+			}
+
+			$result = getData($result);
+			$this->output->set_status_header(400);
+			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_antrag_pending', ['typ' => $this->p->t('studierendenantrag','antrag_typ_' . $result->typ)]));
+		}
+		elseif ($result == -3)
+		{
+			$this->output->set_status_header(403);
+			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_stg_blacklist'));
+		}
+		$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
+		if (isError($result)) {
+			return $this->outputJsonError(getError($result));
+		}
+
+		$data = getData($result);
+
+		$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($data->studiengang_kz, $data->studiensemester_kurzbz, $data->semester);
+
+		$this->outputJsonSuccess($data);
+	}
+
+	public function getDetailsForAntrag($studierendenantrag_id)
+	{
+		if (!$this->antraglib->isEntitledToShowAntrag($studierendenantrag_id))	return show_404();
+
+		$result = $this->antraglib->getDetailsForAntrag($studierendenantrag_id);
+		if (isError($result)) {
+			return $this->outputJsonError(getError($result));
+		}
+
+		$data = getData($result);
+
+		if ($data->typ !== Studierendenantrag_model::TYP_UNTERBRECHUNG)
+			return show_404();
+
+		$this->outputJsonSuccess($data);
+	}
+
+	public function createAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
+		$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
+		$this->form_validation->set_rules('grund', 'Grund', 'required');
+		$this->form_validation->set_rules(
+			'datum_wiedereinstieg',
+			'Datum Wiedereinstieg',
+			'required|callback_isValidDate|callback_isDateInFuture',
+			[
+				'isValidDate' => $this->p->t('ui', 'error_invalid_date'),
+				'isDateInFuture' => $this->p->t('ui', 'error_invalid_date')
+			]
+		);
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$grund = $this->input->post('grund');
+		$studiensemester = $this->input->post('studiensemester');
+		$prestudent_id = $this->input->post('prestudent_id');
+		$datum_wiedereinstieg = $this->input->post('datum_wiedereinstieg');
+		$dms_id = null;
+
+		$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($prestudent_id);
+		if (isError($result)) {
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+		$result = $result->retval;
+		if (!$result)
+		{
+			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_no_student')]);
+		}
+		elseif ($result == -3)
+		{
+			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_stg_blacklist')]);
+		}
+		elseif ($result < 0)
+		{
+			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_antrag_exists')]);
+		}
+
+		if(isset($_FILES['attachment']) && (!isset($_FILES['attachment']['error']) || $_FILES['attachment']['error'] != UPLOAD_ERR_NO_FILE))
+		{
+			$this->load->library('DmsLib');
+
+			$dms = $this->config->item('unterbrechung_dms');
+			if (!count(array_filter($dms, function ($v) {
+				return $v !== null;
+			})))
+				$dms = ['kategorie_kurzbz' => 'Akte'];
+			$dms['version'] = 0;
+
+			$allowed_filetypes = $this->config->item('unterbrechung_dms_filetypes') ?: ['*'];
+			$result = $this->dmslib->upload($dms, 'attachment', $allowed_filetypes);
+			if(isError($result))
+			{
+				return $this->outputJsonError(['db' => getError($result)]);
+			}
+			$dms_id = getData($result)['dms_id'];
+		}
+
+		$result = $this->antraglib->createUnterbrechung($prestudent_id, $studiensemester, getAuthUID(), $grund, $datum_wiedereinstieg, $dms_id);
+		if(isError($result))
+		{
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+
+		$antragId = getData($result);
+		$result = $this->antraglib->getDetailsForAntrag($antragId);
+
+		if(!hasData($result))
+			return $this->outputJsonSuccess($antragId);
+		$this->outputJsonSuccess(getData($result));
+	}
+
+	public function cancelAntrag()
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules('antrag_id', 'Antrag ID', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$antrag_id = $this->input->post('antrag_id');
+
+		$result = $this->antraglib->cancelAntrag($antrag_id, getAuthUID());
+		if (isError($result))
+		{
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+
+		$result = $this->antraglib->getDetailsForAntrag($antrag_id);
+
+		if (!hasData($result))
+			return $this->outputJsonSuccess($antrag_id);
+		$this->outputJsonSuccess(getData($result));
+	}
+
+	public function isValidDate($date)
+	{
+		try {
+		    new DateTime($date);
+		} catch (Exception $e) {
+			return false;
+		}
+		return true;
+	}
+
+	public function isDateInFuture($date)
+	{
+		return new DateTime() < new DateTime($date);
+	}
+}
diff --git a/application/controllers/components/Antrag/Wiederholung.php b/application/controllers/components/Antrag/Wiederholung.php
new file mode 100644
index 000000000..7b5d8f887
--- /dev/null
+++ b/application/controllers/components/Antrag/Wiederholung.php
@@ -0,0 +1,369 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \REST_Controller as REST_Controller;
+
+/**
+ *
+ */
+class Wiederholung extends FHC_Controller
+{
+
+	/**
+	 * Calls the parent's constructor and loads the FilterCmptLib
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Configs
+		$this->load->config('studierendenantrag');
+
+		// Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
+		$this->load->library('AntragLib');
+
+		$requiredPermissions = [
+			'saveLvs' => ['student/studierendenantrag:w'],
+			'getLvsAsRdf' => ['student/studierendenantrag:r', 'student/noten:r'],
+			'moveLvsToZeugnis' => ['student/studierendenantrag:w', 'student/noten:w']
+		];
+
+		if (isset($requiredPermissions[$this->router->method])) {
+			if (!$this->permissionlib->isEntitled($requiredPermissions, $this->router->method)) {
+				$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
+				$this->outputJson('Forbidden');
+				exit;
+			}
+		}
+
+		// Load language phrases
+		$this->loadPhrases([
+			'studierendenantrag'
+		]);
+	}
+
+
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * Retrieves data of the current studiengang for the current user
+	 */
+
+	public function getDetailsForNewAntrag($prestudent_id)
+	{
+		if (!$this->antraglib->isEntitledToCreateAntragFor($prestudent_id, false)) {
+			$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
+			return $this->outputJsonError('Forbidden');
+		}
+		$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($prestudent_id);
+		if (isError($result)) {
+			$this->output->set_status_header(REST_Controller::HTTP_INTERNAL_SERVER_ERROR);
+			return $this->outputJsonError(getError($result));
+		}
+		$result = $result->retval;
+		if (!$result) {
+			// TODO(chris): ERROR Message
+			$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
+			return $this->outputJsonError($this->p->t('studierendenantrag','error_no_student_no_failed_exam'));
+		}
+		elseif ($result == -1)
+		{
+			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, Studierendenantrag_model::TYP_WIEDERHOLUNG);
+			if (isError($result)) {
+				return $this->outputJsonError(getError($result));
+			}
+
+			$data = getData($result);
+
+			$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
+			// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
+			$pruefungsdata = current(getData($result));
+
+			$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
+			$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
+			$data->pruefungsdatum = $pruefungsdata->datum;
+
+			return $this->outputJsonSuccess($data);
+		}
+		elseif ($result == -2)
+		{
+			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id);
+			if (isError($result)) {
+				return $this->outputJsonError(getError($result));
+			}
+
+			$result = getData($result);
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_antrag_pending', ['typ' => $this->p->t('studierendenantrag','antrag_typ_' . $result->typ)]));
+		}
+		elseif ($result == -3)
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
+			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_stg_blacklist'));
+		}
+
+		$result = $this->antraglib->getDetailsForNewAntrag($prestudent_id);
+		if (isError($result)) {
+			return $this->outputJsonError(getError($result));
+		}
+
+		$data = getData($result);
+
+		$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
+		// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
+		$pruefungsdata = current(getData($result));
+
+		$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
+		$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
+		$data->pruefungsdatum = $pruefungsdata->datum;
+
+		$this->outputJsonSuccess($data);
+	}
+
+	public function createAntrag()
+	{
+		$this->createAntragWithStatus(true);
+	}
+
+	public function cancelAntrag()
+	{
+		$this->createAntragWithStatus(false);
+	}
+
+	protected function createAntragWithStatus($repeat)
+	{
+		$this->load->library('form_validation');
+
+		$_POST = json_decode($this->input->raw_input_stream, true);
+
+		$this->form_validation->set_rules('prestudent_id', 'Prestudent ID', 'required');
+		$this->form_validation->set_rules('studiensemester', 'Studiensemester', 'required');
+
+		if ($this->form_validation->run() == false)
+		{
+			return $this->outputJsonError($this->form_validation->error_array());
+		}
+
+		$prestudent_id = $this->input->post('prestudent_id');
+		$studiensemester = $this->input->post('studiensemester');
+
+		$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($prestudent_id);
+		if (isError($result)) {
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+		$result = $result->retval;
+		if (!$result)
+		{
+			// TODO(chris): ERROR Message
+			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_no_student')]);
+		}
+		elseif ($result == -2)
+		{
+			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_antrag_exists')]);
+		}
+		elseif ($result == -3)
+		{
+			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_stg_blacklist')]);
+		}
+
+		$result = $this->antraglib->createWiederholung($prestudent_id, $studiensemester, getAuthUID(), $repeat);
+		if(isError($result))
+		{
+			return $this->outputJsonError(['db' => getError($result)]);
+		}
+
+		$antragId = getData($result);
+		$result = $this->antraglib->getDetailsForAntrag($antragId);
+
+		if(!hasData($result))
+			return $this->outputJsonSuccess(true);
+
+		$data = getData($result);
+
+		$result = $this->antraglib->getFailedExamForPrestudent($prestudent_id);
+		// NOTE(chris): error handling for this function should already happenden in antraglib->getPrestudentWiederholungsBerechtigt()
+		$pruefungsdata = current(getData($result));
+
+		$data->studiensemester_kurzbz = $pruefungsdata->studiensemester_kurzbz;
+		$data->lvbezeichnung = $pruefungsdata->lvbezeichnung;
+		$data->pruefungsdatum = $pruefungsdata->datum;
+
+		$this->outputJsonSuccess($data);
+	}
+
+
+	public function getLvs($antrag_id)
+	{
+		$result = $this->antraglib->getLvsForAntrag($antrag_id);
+		if (isError($result)) {
+			$error = getError($result);
+			if ($error == 'Forbidden')
+				$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
+			return $this->outputJsonError(getError($result));
+		}
+		$lvs = getData($result);
+
+		$this->outputJsonSuccess($lvs);
+	}
+
+	public function saveLvs()
+	{
+		$result = $this->getPostJSON();
+		$antragsLvs = array_merge($result->forbiddenLvs, $result->mandatoryLvs);
+
+		$insert = array_map(function ($lv) {
+			return [
+				'studierendenantrag_id' => $lv->studierendenantrag_id,
+				'lehrveranstaltung_id' => $lv->lehrveranstaltung_id,
+				'note' => $lv->zugelassen ? ($lv->zugelassen == 1 ? 0 : $this->config->item('wiederholung_note_angerechnet')) : $this->config->item('wiederholung_note_nicht_zugelassen'),
+				'anmerkung' => $lv->anmerkung,
+				'insertvon' => getAuthUID(),
+				'studiensemester_kurzbz' => $lv->studiensemester_kurzbz
+			];
+		}, $antragsLvs);
+
+		$antrag_ids = array_unique(array_map(function ($lv) {
+			return $lv['studierendenantrag_id'];
+		}, $insert));
+
+		foreach ($antrag_ids as $antrag_id) {
+			$result = $this->StudierendenantragModel->loadIdAndStatusWhere([
+				'studierendenantrag_id' => $antrag_id
+			]);
+			if (isError($result))
+				return $this->outputJsonError(getError($result));
+			if (!hasData($result))
+				return $this->outputJsonError($this->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $antrag_id]));
+			$antrag = current(getData($result));
+			if ($antrag->status != Studierendenantragstatus_model::STATUS_CREATED && $antrag->status != Studierendenantragstatus_model::STATUS_LVSASSIGNED)
+				return $this->outputJsonError($this->p->t('studierendenantrag', 'error_antrag_locked'));
+		}
+
+		if(!$antragsLvs)
+			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_no_lv'));
+
+		$result = $this->antraglib->saveLvs($insert);
+
+		if (isError($result))
+			return $this->outputJsonError(getError($result));
+
+		$this->outputJsonSuccess(getData($result));
+	}
+
+	public function getLvsAsRdf($prestudent_id)
+	{
+		// header für no cache
+		$this->output->set_header("Cache-Control: no-cache");
+		$this->output->set_header("Cache-Control: post-check=0, pre-check=0", false);
+		$this->output->set_header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
+		$this->output->set_header("Pragma: no-cache");
+		$this->output->set_header("Content-type: application/xhtml+xml");
+
+		$this->load->library('VariableLib', ['uid' => getAuthUID()]);
+		$sem_akt = $this->variablelib->getVar('semester_aktuell');
+
+
+		$result = $this->antraglib->getLvsForPrestudent($prestudent_id, $sem_akt);
+		if (isError($result)) {
+			return $this->outputJsonError(getError($result));
+		}
+
+		$lvs = getData($result) ?: [];
+		$rdf_url = 'http://www.technikum-wien.at/antragnote';
+
+		$this->load->view('lehre/Antrag/Wiederholung/getLvs.rdf.php', [
+			'url' => $rdf_url,
+			'lvs' => $lvs
+		]);
+	}
+
+	public function moveLvsToZeugnis()
+	{
+		$anzahl = $this->input->post('anzahl');
+		$student_uid = $this->input->post('student_uid');
+		$this->load->model('education/Studierendenantraglehrveranstaltung_model', 'StudierendenantraglehrveranstaltungModel');
+		$this->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+
+		$errormsg = array();
+
+		for($i=0; $i<$anzahl; $i++)
+		{
+			$id = $this->input->post('studierendenantrag_lehrveranstaltung_id_' . $i);
+			$result =$this->StudierendenantraglehrveranstaltungModel->load($id);
+			if(isError($result))
+			{
+				$errormsg[] = getError($result);
+			}
+			elseif(!hasData($result))
+			{
+				$errormsg[] = $this->p->t('studierendenantrag', 'error_no_lv_in_application');
+			}
+			else
+			{
+				$antragLv = getData($result)[0];
+				$result= $this->ZeugnisnoteModel->load([
+					'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
+					'student_uid'=> $student_uid,
+					'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz
+				]);
+				if(isError($result))
+				{
+					$errormsg[] = getError($result);
+				}
+				else
+				{
+					if (hasData($result))
+					{
+						$result = $this->ZeugnisnoteModel->update(
+							[
+								'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
+								'student_uid'=> $student_uid,
+								'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz
+							],
+							[
+								'note'=> $antragLv->note,
+								'uebernahmedatum' => date('c'),
+								'benotungsdatum' => $antragLv->insertamum,
+								'updateamum' => date('c'),
+								'bemerkung'=>$antragLv->anmerkung,
+								'updatevon'=>getAuthUID()
+							]
+						);
+					}
+					else
+					{
+						$result = $this->ZeugnisnoteModel->insert([
+							'lehrveranstaltung_id'=> $antragLv->lehrveranstaltung_id,
+							'student_uid'=> $student_uid,
+							'studiensemester_kurzbz' => $antragLv->studiensemester_kurzbz,
+							'note'=> $antragLv->note,
+							'uebernahmedatum' => date('c'),
+							'benotungsdatum' => $antragLv->insertamum,
+							'insertamum' => date('c'),
+							'bemerkung'=>$antragLv->anmerkung,
+							'insertvon'=>getAuthUID()
+						]);
+					}
+					if(isError($result))
+					{
+						$errormsg[] = getError($result);
+					}
+				}
+			}
+		}
+
+		if($errormsg)
+			$return = false;
+		else
+			$return = true;
+
+		$this->load->view('lehre/Antrag/Wiederholung/moveLvs.rdf.php', [
+			'return' => $return,
+			'errormsg' => $errormsg
+		]);
+	}
+}
diff --git a/application/controllers/components/Phrasen.php b/application/controllers/components/Phrasen.php
new file mode 100644
index 000000000..52de719f7
--- /dev/null
+++ b/application/controllers/components/Phrasen.php
@@ -0,0 +1,23 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+/**
+ *
+ */
+class Phrasen extends FHC_Controller
+{
+	
+	//------------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param string $module
+	 */
+	public function loadModule($module)
+	{
+		$this->load->library('PhrasesLib', [$module], 'pj');
+		$this->outputJsonSuccess(json_decode($this->pj->getJSON()));
+	}
+
+}
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
new file mode 100644
index 000000000..6b5b018e6
--- /dev/null
+++ b/application/controllers/jobs/AntragJob.php
@@ -0,0 +1,406 @@
+<?php
+
+if (!defined("BASEPATH")) exit("No direct script access allowed");
+
+use \DateTime as DateTime;
+// TODO(chris): Achtung not working
+
+class AntragJob extends JOB_Controller
+{
+	/**
+	 * API constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		// Configs
+		$this->load->config('studierendenantrag');
+
+		// Loads SanchoHelper
+		$this->load->helper('hlp_sancho_helper');
+
+		//Load Model
+		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+		$this->load->model('education/Studierendenantragstatus_model', 'StudierendenantragstatusModel');
+		$this->load->model('education/Pruefung_model', 'PruefungModel');
+		$this->load->model('person/Kontakt_model', 'KontaktModel');
+	}
+
+	/**
+	 * Send reminder to Assistant for Wiedereinstieg Unterbrecher
+	 *
+	 */
+	public function sendReminderWiedereinstieg()
+	{
+		$now = new DateTime();
+		$modifier = $this->config->item('unterbrechung_job_remind_wiedereinstieg_date_modifier');
+		if (!$modifier)
+			return $this->logError('Konnte Job nicht starten: Config "unterbrechung_job_remind_wiedereinstieg_date_modifiers" nicht gesetzt');
+
+		$end = new DateTime();
+		$end->modify($modifier);
+
+		$this->logInfo(sprintf(
+			'Start Job sendReminderWiedereinstieg (Wiedereinstieg zwischen %s - %s)',
+			$now->format('Y-m-d'),
+			$end->format('Y-m-d')
+		));
+
+		$result = $this->StudierendenantragModel->getAntraegeWhereWiedereinstiegBetween($now, $end);
+
+		if(isError($result))
+		{
+			$this->logError(getError($result));
+			$this->logInfo('Ende Job sendReminderWiedereinstieg');
+			return;
+		}
+
+		$antraege = getData($result) ?: [];
+		$count = 0;
+		foreach ($antraege as $antrag)
+		{
+			$datum = new DateTime($antrag->datum_wiedereinstieg);
+			$data = array(
+				'prestudent' => $antrag->prestudent_id,
+				'name' => trim($antrag->vorname . ' '. $antrag->nachname),
+				'datum_wiedereinstieg' => $datum->format('d.m.Y')
+			);
+
+			if(sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg'))
+			{
+				$count++;
+				$this->StudierendenantragstatusModel->insert([
+					'studierendenantrag_id' => $antrag->studierendenantrag_id,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_REMINDERSENT,
+					'insertvon' => 'AntragJob'
+				]);
+			}
+		}
+		$this->logInfo($count . ' Reminder gesendet - Ende Job sendReminderWiedereinstieg');
+	}
+
+	/**
+	 * Set Wiederholer after deadline to Abbrecher
+	 *
+	 */
+	public function handleWiederholerDeadline()
+	{
+		$this->logInfo('Start Job handleWiederholerDeadline');
+
+		$this->load->library('PrestudentLib');
+
+		$insertvon = $this->config->item('antrag_job_systemuser');
+		if (!$insertvon) {
+			$this->logError('Config "antrag_job_systemuser" nicht gesetzt');
+			$this->logInfo('Ende Job handleWiederholerDeadline');
+			return;
+		}
+
+		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');
+		if (!$modifier_deadline) {
+			$this->logError('Config "wiederholung_job_deadline_date_modifier" nicht gesetzt');
+			$this->logInfo('Ende Job handleWiederholerDeadline');
+			return;
+		}
+
+		$dateDeadline = new DateTime();
+		$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
+
+		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed(
+				[
+					null,
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_2
+				],
+				$dateDeadline,
+				null
+			);
+
+		if(isError($result))
+		{
+			$this->logError(getError($result));
+		}
+		else
+		{
+			$prestudents = getData($result) ?: [];
+			$count = 0;
+
+			$prestudents = $this->prestudentsGetUnique($prestudents);
+
+			foreach ($prestudents as $prestudent)
+			{
+				// TODO(chris): DEBUG REMOVE!
+				if ($prestudent->studiensemester_kurzbz == 'WS2021')
+				var_dump([$prestudent->prestudent_id, $prestudent->studiensemester_kurzbz, $prestudent->lvbezeichnung]);
+				$result = success();
+				// TODO(chris): find out how to filter old/wrong datasets!!!
+				#$result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, $prestudent->studiensemester_kurzbz, $insertvon);
+				if (isError($result))
+					$this->logError(getError($result));
+				else
+					$count++;
+			}
+			$this->logInfo($count . " Students set to Abbrecher");
+		}
+
+		$this->logInfo('Ende Job handleWiederholerDeadline');
+
+	}
+
+	/**
+	 * Set Abmeldungen after deadline to Abbrecher
+	 *
+	 */
+	public function handleAbmeldungenStglDeadline()
+	{
+		$this->logInfo('Start Job handleAbmeldungenStglDeadline');
+
+		$this->load->library('AntragLib');
+
+		$insertvon = $this->config->item('antrag_job_systemuser');
+		if (!$insertvon) {
+			$this->logError('Config "antrag_job_systemuser" nicht gesetzt');
+			$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
+			return;
+		}
+
+		$modifier_deadline = $this->config->item('abmeldung_job_deadline_date_modifier');
+		if (!$modifier_deadline) {
+			$this->logError('Config "abmeldung_job_deadline_date_modifier" nicht gesetzt');
+			$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
+			return;
+		}
+
+		$dateDeadline = new DateTime();
+		$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
+
+		$result = $this->StudierendenantragModel->getWithLastStatusWhere(
+				[
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED_STGL,
+					's.insertamum <=' => $dateDeadline->format('c')
+				]
+			);
+
+		if(isError($result))
+		{
+			$this->logError(getError($result));
+		}
+		else
+		{
+			$antraege = getData($result) ?: [];
+			$count = 0;
+
+			foreach ($antraege as $antrag)
+			{
+				$result = $this->antraglib->approveAbmeldung([$antrag->studierendenantrag_id], $insertvon);
+
+				if (isError($result))
+					$this->logError(getError($result));
+				else
+					$count++;
+			}
+			$this->logInfo($count . " Students set to Abbrecher");
+		}
+		$this->logInfo('Ende Job handleAbmeldungenStglDeadline');
+	}
+
+	/**
+	 * Send Request to Student do Decide between Wiederholung and Verzicht
+	 *
+	 */
+	public function sendAufforderungWiederholer()
+	{
+		$this->logInfo('Start Job sendAufforderungWiederholer');
+
+		$modifier_request_1 = $this->config->item('wiederholung_job_request_1_date_modifier');
+		$modifier_request_2 = $this->config->item('wiederholung_job_request_2_date_modifier');
+		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');
+
+		if ($modifier_deadline)
+		{
+			$dateDeadline = new DateTime();
+			$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
+		}
+		else
+			$dateDeadline = null;
+
+		//first request
+		if ($modifier_request_1)
+			$this->sendReminder(
+				'Request1',
+				null,
+				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+				$dateDeadline,
+				$modifier_request_1,
+				$modifier_deadline,
+				'Aufforderung: Bekanntgabe Wiederholung'
+			);
+		else
+			$this->logError('Config "wiederholung_job_request_1_date_modifier" nicht gesetzt');
+
+		//second request
+		if ($modifier_request_2)
+			$this->sendReminder(
+				'Request2',
+				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+				Studierendenantragstatus_model::STATUS_REQUESTSENT_2,
+				$dateDeadline,
+				$modifier_request_2,
+				$modifier_deadline,
+				'Reminder Aufforderung: Bekanntgabe Wiederholung'
+			);
+		else
+			$this->logError('Config "wiederholung_job_request_2_date_modifier" nicht gesetzt');
+
+		$this->logInfo('Ende Job sendAufforderungWiederholer');
+	}
+
+	protected function prestudentsGetUnique($prestudents) {
+		$result = [];
+		foreach ($prestudents as $prestudent) {
+			if (!isset($result[$prestudent->prestudent_id]))
+				$result[$prestudent->prestudent_id] = $prestudent;
+			else {
+				if ($result[$prestudent->prestudent_id]->datum > $prestudent->datum)
+					$result[$prestudent->prestudent_id] = $prestudent;
+			}
+		}
+		return $result;
+	}
+
+	protected function sendReminder($name, $status_from, $status_to, $deadline, $date_modifier, $modifier_deadline, $subject)
+	{
+		$this->logInfo('Start Job sendAufforderungWiederholer ' . $name);
+
+		$dateStichtag = new DateTime();
+		$dateStichtag->sub(DateInterval::createFromDateString($date_modifier));
+
+		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed($status_from, $dateStichtag, $deadline);
+
+		if(isError($result))
+		{
+			$this->logError(getError($result));
+		}
+		else
+		{
+			$prestudents = getData($result) ?: [];
+			$count = 0;
+
+			$prestudents = $this->prestudentsGetUnique($prestudents);
+
+			foreach ($prestudents as $prestudent)
+			{
+				$stg_kz = $prestudent->studiengang_kz;
+				if (in_array($stg_kz, $this->config->item('stgkz_blacklist_wiederholung')))
+					continue;
+				$url = site_url('lehre/Studierendenantrag/wiederholung/' . $prestudent->prestudent_id);
+				$email = $this->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
+				if (isError($email)) {
+					$this->logError(getError($email));
+				} else {
+					$email = getData($email);
+
+					if (!$email) {
+						$this->logError('No email contact found for person_id: ' . $prestudent->person_id);
+					}
+					else
+					{
+						$email = current($email)->kontakt;
+						$fristende = new DateTime($prestudent->datum);
+						$fristende->add(DateInterval::createFromDateString($modifier_deadline));
+
+						$dataMail = array(
+							'name'=> trim($prestudent->vorname . ' '. $prestudent->nachname),
+							'pers_kz'=> $prestudent->matrikelnr,
+							'studiengang' => $prestudent->bezeichnung,
+							'lvbezeichnung' => $prestudent->lvbezeichnung,
+							'datum_kp' => $prestudent->datum,
+							'studiensemester'=> $prestudent->studiensemester_kurzbz,
+							'orgform'=> $prestudent->orgform,
+							'url' => $url,
+							'fristablauf' => $fristende->format('d.m.Y')
+						);
+						if(sendSanchoMail('Sancho_Mail_Antrag_W_' . $name, $dataMail, $email, $subject))
+						{
+							$antrag_id = null;
+							$result = $this->StudierendenantragModel->loadWhere([
+								'prestudent_id' => $prestudent->prestudent_id,
+								'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
+							]);
+							if (isError($result))
+								$this->logError(getError($result));
+							elseif (hasData($result))
+								$antrag_id = current(getData($result) ?: []) -> studierendenantrag_id;
+							if ($antrag_id == null)
+							{
+								$result = $this->StudierendenantragModel->insert([
+									'prestudent_id' => $prestudent->prestudent_id,
+									'studiensemester_kurzbz'=> $prestudent->studiensemester_kurzbz,
+									'datum' => date('c'),
+									'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
+									'insertvon' => 'AntragJob'
+								]);
+								if (isError($result))
+									$this->logError(getError($result));
+								else
+									$antrag_id = getData($result);
+							}
+							if ($antrag_id)
+							{
+								$result = $this->StudierendenantragstatusModel->insert([
+									'studierendenantrag_id' => $antrag_id,
+									'studierendenantrag_statustyp_kurzbz' => $status_to,
+									'insertvon' => 'AntragJob'
+								]);
+								if (isError($result))
+									$this->logError(getError($result));
+							}
+							$count++;
+						}
+					}
+				}
+			}
+			$this->logInfo($count . " Mails '" . $subject . "' sent");
+		}
+		$this->logInfo('Ende Job sendAufforderungWiederholer ' . $name);
+	}
+
+
+
+	// TODO(chris): REMOVE DEBUG!
+
+	/**
+	 * Writes a cronjob info log
+	 */
+	protected function logInfo($response, $parameters = null)
+	{
+		echo $response . "\n";
+	}
+
+	/**
+	 * Writes a cronjob debug log
+	 */
+	protected function logDebug($response, $parameters = null)
+	{
+		echo $response . "\n";
+	}
+
+	/**
+	 * Writes a cronjob warning log
+	 */
+	protected function logWarning($response, $parameters = null)
+	{
+		echo $response . "\n";
+	}
+
+	/**
+	 * Writes a cronjob error log
+	 */
+	protected function logError($response, $parameters = null)
+	{
+		echo $response . "\n";
+	}
+
+
+}
diff --git a/application/controllers/lehre/Antrag/Attachment.php b/application/controllers/lehre/Antrag/Attachment.php
new file mode 100644
index 000000000..073a03df0
--- /dev/null
+++ b/application/controllers/lehre/Antrag/Attachment.php
@@ -0,0 +1,82 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \REST_Controller as REST_Controller;
+
+/**
+ */
+class Attachment extends FHC_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+
+		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+
+		$this->load->library('DmsLib');
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
+	/**
+	 * @param integer		$dms_id
+	 *
+	 * @return void
+	 */
+	public function show($dms_id)
+	{
+		$result = $this->StudierendenantragModel->loadWhere(['dms_id' => $dms_id]);
+		if (!getData($result))
+			return show_404();
+
+		if (!$this->permissionlib->isBerechtigt('student/antragfreigabe'))
+		{
+			$isSamePerson = false;
+			$antraege = getData($result);
+			$this->load->model('crm/Prestudent_model', 'PrestudentModel');
+			foreach ($antraege as $antrag)
+			{
+				$prestudent = $this->PrestudentModel->load($antrag->prestudent_id);
+				if(hasData($prestudent))
+				{
+					if(current(getData($prestudent))->person_id == getAuthPersonId())
+					{
+						$isSamePerson = true;
+						break;
+					}
+				}
+			}
+
+			if ($isSamePerson == false)
+			{
+				$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN); // set the HTTP header as unauthorized
+
+				$this->load->library('EPrintfLib'); // loads the EPrintfLib to format the output
+
+				// Prints the main error message
+				$this->eprintflib->printError('You are not allowed to access to this content');
+				// Prints the called controller name
+				$this->eprintflib->printInfo('Controller name: '.$this->router->class);
+				// Prints the called controller method name
+				$this->eprintflib->printInfo('Method name: '.$this->router->method);
+				// Prints the required permissions needed to access to this method
+				$this->eprintflib->printInfo('Required permissions: student/antragfreigabe');
+
+				return show_error('You are not entitled to read this document');
+			}
+		}
+
+		$result = $this->dmslib->download($dms_id);
+		if (isError($result))
+			return show_error(getError($result));
+
+		$this->outputFile(getData($result));
+	}
+}
diff --git a/application/controllers/lehre/Antrag/Wiederholung.php b/application/controllers/lehre/Antrag/Wiederholung.php
new file mode 100644
index 000000000..5b22641f7
--- /dev/null
+++ b/application/controllers/lehre/Antrag/Wiederholung.php
@@ -0,0 +1,49 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+use \Studierendenantrag_model as Studierendenantrag_model;
+use \REST_Controller as REST_Controller;
+
+/**
+ */
+class Wiederholung extends Auth_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+        parent::__construct([
+			'assistenz'=> 'student/studierendenantrag:w'
+		]);
+
+		$this->load->library('AntragLib');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'studierendenantrag'
+		]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+	public function assistenz($antrag_id, $frame = false)
+	{
+
+		$result = $this->antraglib->getDetailsForAntrag($antrag_id);
+
+		if (isError($result))
+			return show_error(getError($result));
+
+		if (!hasData($result))
+			return show_404();
+
+		$this->load->view('lehre/Antrag/Wiederholung/Student', [
+			'antrag_id' => $antrag_id,
+			'antrag' => getData($result),
+			'frame' => $frame
+		]);
+	}
+}
diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
new file mode 100644
index 000000000..16b47d592
--- /dev/null
+++ b/application/controllers/lehre/Studierendenantrag.php
@@ -0,0 +1,208 @@
+<?php
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \stdClass as stdClass;
+
+/**
+ */
+class Studierendenantrag extends FHC_Controller
+{
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+        parent::__construct();
+
+		// Load Libraries
+		$this->load->library('AuthLib');
+		$this->load->library('AntragLib');
+
+		// Load Models
+		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+
+		// Load language phrases
+		$this->loadPhrases([
+			'studierendenantrag'
+		]);
+
+        if (strtolower($this->router->method) === 'leitung')
+        	$this->_isAllowed([
+        		'leitung' => ['student/studierendenantrag:r', 'student/antragfreigabe:r']
+        	]);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+	public function index()
+	{
+		$dataAntrag = $this->StudierendenantragModel->loadForPerson(getAuthPersonId());
+		if (isError($dataAntrag))
+			return show_error(getError($dataAntrag));
+		$dataAntrag = (getData($dataAntrag) ? : []);
+		$prestudentenArr = array();
+
+		foreach ($dataAntrag as $antrag)
+		{
+			if (!isset($prestudentenArr[$antrag->prestudent_id]))
+			{
+				$prestudentenArr[$antrag->prestudent_id] = array(
+					'allowedNewTypes' => array(),
+					'antraege'=> array(),
+					'bezeichnungStg' => $antrag->bezeichnung,
+					'bezeichnungOrgform' => $antrag->orgform
+				);
+				$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
+
+				$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';
+
+				$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
+				if (getData($result) == 1)
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
+			}
+			if ($antrag->studierendenantrag_id == null)
+				continue;
+			$prestudentenArr[$antrag->prestudent_id]['antraege'][] = $antrag;
+		}
+
+		$this->load->view('lehre/Antrag/Student/List', [
+			'antraege' => $prestudentenArr
+		]);
+	}
+
+	public function leitung()
+	{
+		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
+		$stgsNeuanlage = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
+
+		$stgL = [];
+		if ($studiengaenge) {
+			$result = $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
+			if (isError($result))
+				return show_error(getError($result));
+			$antraege = getData($result) ?: [];
+
+			foreach ($antraege as $antrag) {
+				if (!isset($stgL[$antrag->studiengang_kz])) {
+					$stgL[$antrag->studiengang_kz] = new stdClass();
+					$stgL[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
+					$stgL[$antrag->studiengang_kz]->orgform = $antrag->orgform;
+					$stgL[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
+				}
+			}
+		}
+
+		$stgA = [];
+		if ($stgsNeuanlage) {
+			$result = $this->StudierendenantragModel->loadForStudiengaenge($stgsNeuanlage);
+			if (isError($result))
+				return show_error(getError($result));
+			$antraege = getData($result) ?: [];
+
+			foreach ($antraege as $antrag) {
+				if (!isset($stgA[$antrag->studiengang_kz])) {
+					$stgA[$antrag->studiengang_kz] = new stdClass();
+					$stgA[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
+					$stgA[$antrag->studiengang_kz]->orgform = $antrag->orgform;
+					$stgA[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
+				}
+			}
+		}
+
+		$this->load->view('lehre/Antrag/Leitung/List', [
+			'stgA' => $stgA,
+			'stgL' => $stgL
+		]);
+	}
+
+	public function abmeldung($prestudent_id, $studierendenantrag_id = null)
+	{
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Abmeldung'
+		]);
+	}
+
+	public function unterbrechung($prestudent_id, $studierendenantrag_id = null)
+	{
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Unterbrechung'
+		]);
+	}
+
+	public function wiederholung($prestudent_id, $studierendenantrag_id = null)
+	{
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'Wiederholung'
+		]);
+	}
+
+	/**
+	 * Checks if the caller is allowed to access to this content with the given permissions
+	 * If it is not allowed will set the HTTP header with code 401
+	 * Wrapper for permissionlib->isEntitled
+	 */
+	private function _isAllowed($requiredPermissions)
+	{
+		// Loads permission lib
+		$this->load->library('PermissionLib');
+
+		// Checks if this user is entitled to access to this content
+		if (!$this->permissionlib->isEntitled($requiredPermissions, $this->router->method))
+		{
+			$this->output->set_status_header(REST_Controller::HTTP_UNAUTHORIZED); // set the HTTP header as unauthorized
+
+			$this->load->library('EPrintfLib'); // loads the EPrintfLib to format the output
+
+			// Prints the main error message
+			$this->eprintflib->printError('You are not allowed to access to this content');
+			// Prints the called controller name
+			$this->eprintflib->printInfo('Controller name: '.$this->router->class);
+			// Prints the called controller method name
+			$this->eprintflib->printInfo('Method name: '.$this->router->method);
+			// Prints the required permissions needed to access to this method
+			$this->eprintflib->printInfo('Required permissions: '.$this->_rpsToString($requiredPermissions, $this->router->method));
+
+			exit; // immediately terminate the execution
+		}
+	}
+
+	/**
+	 * Converts an array of permissions to a string that contains them as a comma separated list
+	 * Ex: "<permission 1>, <permission 2>, <permission 3>"
+	 */
+	private function _rpsToString($requiredPermissions, $method)
+	{
+		$strRequiredPermissions = ''; // string that contains all the required permissions needed to access to this method
+
+		if (isset($requiredPermissions[$method])) // if the called method is present in the permissions array
+		{
+			// If it is NOT then convert it into an array
+			$rpsMethod = $requiredPermissions[$method];
+			if (!is_array($rpsMethod))
+			{
+				$rpsMethod = array($rpsMethod);
+			}
+
+			// Copy all the permissions into $strRequiredPermissions separated by a comma
+			for ($i = 0; $i < count($rpsMethod); $i++)
+			{
+				$strRequiredPermissions .= $rpsMethod[$i].', ';
+			}
+
+			$strRequiredPermissions = rtrim($strRequiredPermissions, ', ');
+		}
+
+		return $strRequiredPermissions;
+	}
+}
diff --git a/application/helpers/hlp_common_helper.php b/application/helpers/hlp_common_helper.php
index 913d29b54..707d055ea 100644
--- a/application/helpers/hlp_common_helper.php
+++ b/application/helpers/hlp_common_helper.php
@@ -18,6 +18,8 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \DateTime as DateTime;
+
 // ------------------------------------------------------------------------
 // Collection of utility functions for general purpose
 // ------------------------------------------------------------------------
@@ -405,3 +407,17 @@ function findResource($path, $resource, $subdir = false, $extraDir = null)
 	return null;
 }
 
+/**
+ * check if String can be converted to a date
+ */
+function isValidDate($dateString)
+{
+	try
+	{
+		return (new DateTime($dateString)) !== false;
+	}
+	catch(Exception $e)
+	{
+		return false;
+	}
+}
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
new file mode 100644
index 000000000..38504772c
--- /dev/null
+++ b/application/libraries/AntragLib.php
@@ -0,0 +1,1476 @@
+<?php
+
+/**
+ * FH-Complete
+ *
+ * @package             FHC-Helper
+ * @author              FHC-Team
+ * @copyright           Copyright (c) 2023 fhcomplete.net
+ * @license             GPLv3
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+use \DateTime as DateTime;
+use \DOMDocument as DOMDocument;
+use \XSLTProcessor as XSLTProcessor;
+use \Studierendenantragstatus_model as Studierendenantragstatus_model;
+use \stdClass as stdClass;
+
+class AntragLib
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+
+		// Configs
+		$this->_ci->load->config('studierendenantrag');
+
+		// Models
+		$this->_ci->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+		$this->_ci->load->model('education/Studierendenantragstatus_model', 'StudierendenantragstatusModel');
+		$this->_ci->load->model('education/Studierendenantraglehrveranstaltung_model', 'StudierendenantraglehrveranstaltungModel');
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->_ci->load->model('person/Person_model', 'PersonModel');
+		$this->_ci->load->model('education/Pruefung_model', 'PruefungModel');
+
+		// Helper
+		$this->_ci->load->helper('hlp_sancho_helper');
+
+		// Libraries
+		$this->_ci->load->library('PermissionLib');
+		$this->_ci->load->library('PrestudentLib');
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 * @param string		$insertvon
+	 *
+	 * @return stdClass
+	 */
+	public function cancelAntrag($antrag_id, $insertvon)
+	{
+		$result = $this->_ci->StudierendenantragstatusModel->insert([
+			'studierendenantrag_id' => $antrag_id,
+			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_CANCELLED,
+			'insertvon' => $insertvon
+		]);
+
+		return $result;
+	}
+
+	/**
+	 * NOTE(chris): permissions & verification must be handled outside
+	 *
+	 * @param integer		$prestudent_id
+	 * @param string		$studiensemester_kurzbz
+	 * @param string		$insertvon
+	 * @param string		$grund
+	 *
+	 * @return stdClass
+	 */
+	public function createAbmeldung($prestudent_id, $studiensemester_kurzbz, $insertvon, $grund)
+	{
+		$result = $this->_ci->PrestudentModel->load($prestudent_id);
+		if (isError($result))
+			return $result;
+		if(!hasData($result))
+			return error("Kein Prestudent gefunden: " . $prestudent_id);
+
+		$prestudent = getData($result)[0];
+		if($prestudent->person_id == getAuthPersonId())
+			$status = Studierendenantragstatus_model::STATUS_CREATED;
+		else
+			$status = Studierendenantragstatus_model::STATUS_CREATED_STGL;
+
+		$result = $this->_ci->StudierendenantragModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'studiensemester_kurzbz'=> $studiensemester_kurzbz,
+			'datum' => date('c'),
+			'typ' => Studierendenantrag_model::TYP_ABMELDUNG,
+			'insertvon' => $insertvon,
+			'grund' => $grund
+		]);
+
+		if (isError($result))
+			return $result;
+
+		$antrag_id = getData($result);
+
+		$result = $this->_ci->StudierendenantragstatusModel->insert([
+			'studierendenantrag_id' => $antrag_id,
+			'studierendenantrag_statustyp_kurzbz' => $status,
+			'insertvon' => $insertvon
+		]);
+
+		if (isError($result))
+			return $result;
+
+		return success($antrag_id);
+	}
+
+	/**
+	 * @param array			$studierendenantrag_ids
+	 * @param string		$insertvon
+	 *
+	 * @return stdClass
+	 */
+	public function approveAbmeldung($studierendenantrag_ids, $insertvon)
+	{
+		$errors = [];
+		foreach ($studierendenantrag_ids as $studierendenantrag_id) {
+
+			$result = $this->_ci->StudierendenantragModel->loadIdAndStatusWhere(['studierendenantrag_id' => $studierendenantrag_id]);
+			if (isError($result))
+			{
+				$errors[] = getError($result);
+				continue;
+			}
+			if(!hasData($result))
+			{
+				$errors[] = 'no Antrag found for '. $studierendenantrag_id;
+				continue;
+			}
+			$status = getData($result)[0];
+
+			if($status->status ==  Studierendenantragstatus_model::STATUS_CREATED_STGL)
+			{
+				$status_approved = Studierendenantragstatus_model::STATUS_APPROVED_STGL;
+			}
+			else
+				$status_approved = Studierendenantragstatus_model::STATUS_APPROVED;
+
+			$result = $this->_ci->StudierendenantragstatusModel->insert([
+				'studierendenantrag_id' => $studierendenantrag_id,
+				'studierendenantrag_statustyp_kurzbz' => $status_approved,
+				'insertvon' => $insertvon
+			]);
+			if (isError($result))
+				$errors[] = getError($result);
+			else {
+				$resultPrestudent = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+				if (isError($resultPrestudent))
+				{
+					$errors[] = getError($resultPrestudent);
+					continue;
+				}
+				if ($status_approved == Studierendenantragstatus_model::STATUS_APPROVED)
+				{
+					$antrag = getData($resultPrestudent)[0];
+
+					$resultPrestudentStatus = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail($antrag->prestudent_id);
+					if (isError($resultPrestudentStatus))
+						$errors[] = getError($resultPrestudentStatus);
+
+					else {
+						$prestudent_status = getData($resultPrestudentStatus)[0];
+
+						$vorlage ='Sancho_Mail_Antrag_A_Approve';
+						$subject = 'Abmeldung freigegeben';
+
+						$result = $this->_ci->prestudentlib->setAbbrecher($antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon);
+						if (isError($result))
+						{
+							$errors[] = getError($result);
+							return $errors;
+						}
+
+						$result = $this->_ci->PersonModel->loadPrestudent($antrag->prestudent_id);
+						$data = [
+							'nameStudent' => 'Student*in'
+						];
+						if (hasData($result)) {
+							$person = current(getData($result));
+							$data['nameStudent'] = trim($person->vorname . ' ' . $person->nachname);
+						}
+						// NOTE(chris): Sancho mail
+						sendSanchoMail($vorlage, $data, $prestudent_status->email, $subject);
+					}
+				}
+			}
+		}
+
+		if (count($errors))
+			return error(implode(',', $errors));
+
+		return success();
+	}
+
+	/**
+	 * NOTE(chris): permissions & verification must be handled outside
+	 *
+	 * @param integer		$prestudent_id
+	 * @param string		$studiensemester_kurzbz
+	 * @param string		$insertvon
+	 * @param string		$grund
+	 * @param string		$datum_wiedereinstieg
+	 *
+	 * @return stdClass
+	 */
+	public function createUnterbrechung($prestudent_id, $studiensemester_kurzbz, $insertvon, $grund, $datum_wiedereinstieg, $dms_id)
+	{
+		$datum_wiedereinstieg = new DateTime($datum_wiedereinstieg);
+		$datum_wiedereinstieg = $datum_wiedereinstieg->format("Y-m-d");
+		$result = $this->_ci->StudierendenantragModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'studiensemester_kurzbz'=> $studiensemester_kurzbz,
+			'datum' => date('c'),
+			'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG,
+			'insertvon' => $insertvon,
+			'grund' => $grund,
+			'datum_wiedereinstieg' => $datum_wiedereinstieg,
+			'dms_id' => $dms_id
+		]);
+
+		if (isError($result))
+			return $result;
+
+		$antrag_id = getData($result);
+
+		$result = $this->_ci->StudierendenantragstatusModel->insert([
+			'studierendenantrag_id' => $antrag_id,
+			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_CREATED,
+			'insertvon' => $insertvon
+		]);
+
+		if (isError($result))
+			return $result;
+
+		return success($antrag_id);
+	}
+
+
+	/**
+	 * @param array			$studierendenantrag_ids
+	 * @param string		$insertvon
+	 *
+	 * @return stdClass
+	 */
+	public function approveUnterbrechung($studierendenantrag_ids, $insertvon)
+	{
+		$this->_ci->load->model('person/Kontakt_model', 'KontaktModel');
+
+		$errors = [];
+
+		foreach ($studierendenantrag_ids as $studierendenantrag_id)
+		{
+			$data = $this->getDataForUnterbrechung($studierendenantrag_id);
+
+			if (isError($data)) {
+				$error_msg = getError($data);
+				if (is_array($error_msg) && isset($error_msg['message']))
+					$error_msg = $error_msg['message'];
+
+				$errors['failed_' . $studierendenantrag_id] = 'Could not approve Unterbrechung for studierendenantrag_id: ' .
+				$studierendenantrag_id .
+				'<br>Details:<br>' .
+				$error_msg;
+			} else {
+				$data = getData($data);
+
+				$result = $this->_ci->StudierendenantragstatusModel->insert([
+					'studierendenantrag_id' => $studierendenantrag_id,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
+					'insertvon' => $insertvon
+				]);
+				if (isError($result))
+				{
+					$errors['failed_' . $studierendenantrag_id] = 'Could not approve Unterbrechung for studierendenantrag_id: ' .
+					$studierendenantrag_id .
+					'<br>Details:<br>' .
+					getError($result)['message'];
+				}
+				else
+				{
+					$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+					if (isError($resultAntrag))
+						return $resultAntrag;
+					$resultAntrag = getData($resultAntrag);
+					if (!$resultAntrag)
+						return error('No antrag found with id: ' . $studierendenantrag_id);
+					$resultAntrag = current($resultAntrag);
+
+						// Prestudentstatus und Unterbrechungsfolgeaktionen setzen
+					$result = $this->_ci->prestudentlib->setUnterbrecher($resultAntrag->prestudent_id, $resultAntrag->studiensemester_kurzbz, $studierendenantrag_id);
+
+							//Mail
+					$subject = 'Unterbrechung freigegeben';
+					$mail = [];
+
+					if (isset($data['errors']['person_id']))
+					{
+								//send assistenz mit id
+						$errors[] = 'Mail to student not sent and student name not found<br>Details:<br>' . $data['errors']['person_id'];
+						$mail['ass'] = 'Student/in (' . $data['antrag']->prestudent_id . ')';
+					}
+					elseif (isset($data['errors']['email']))
+					{
+						if (isset($data['errors']['person']))
+						{
+									//send assistenz mit id
+							$errors[] = 'Mail to student not sent and student name not found<br>Details:<br>' .
+							$data['errors']['email'] .
+							'<br>' .
+							$data['errors']['person'];
+							$mail['ass'] = 'Student/in (' . $data['antrag']->prestudent_id . ')';
+						}
+						else
+						{
+									//send assistenz mit name
+							$errors[] = 'Mail to student not sent<br>Details:<br>' . $data['errors']['email'];
+							$mail['ass'] = trim($data['person']->vorname . ' ' . $data['person']->nachname);
+						}
+					}
+					else
+					{
+						if (isset($data['errors']['person']))
+						{
+									//send assistenz mit id & student mit "Student/in"
+							$errors[] = 'Student name not found<br>Details:<br>' . $data['errors']['person'];
+							$mail['ass'] = 'Student/in (' . $data['antrag']->prestudent_id . ')';
+							$mail['stu'] = 'Student/in';
+						}
+						else
+						{
+									//send normal
+							$mail['ass'] = $mail['stu'] = trim($data['person']->vorname . ' ' . $data['person']->nachname);
+						}
+					}
+					$mailVorlage = 'Sancho_Mail_Antrag_U_Approve';
+					if ($data['studienbeitrag'])
+						$mailVorlage .= '_SB';
+					if (isset($mail['ass'])) {
+						// NOTE(chris): Sancho mail
+						if (!sendSanchoMail(
+							$mailVorlage,
+							[
+								'name' => $mail['ass']
+							],
+							$data['prestudent_status']->email,
+							$subject
+						)) {
+							$errors[] = 'Failed to send email to ' . $data['prestudent_status']->email;
+						}
+					}
+					if (isset($mail['stu'])) {
+						// NOTE(chris): Sancho mail
+						if (!sendSanchoMail(
+							$mailVorlage,
+							[
+								'name' => $mail['stu']
+							],
+							$data['email'],
+							$subject
+						)) {
+							$errors[] = 'Failed to send email to ' . $data['email'];
+						}
+					}
+				}
+			}
+		}
+
+		if (count($errors))
+			return error($errors);
+
+		return success();
+	}
+
+	/**
+	 * @param array			$studierendenantrag_ids
+	 * @param string		$insertvon
+	 * @param string		$grund
+	 *
+	 * @return stdClass
+	 */
+	public function rejectUnterbrechung($studierendenantrag_ids, $insertvon, $grund)
+	{
+		$this->_ci->load->model('person/Kontakt_model', 'KontaktModel');
+
+		$errors = [];
+
+		foreach ($studierendenantrag_ids as $studierendenantrag_id) {
+			$data = $this->getDataForUnterbrechung($studierendenantrag_id);
+
+			if (isError($data)) {
+				$error_msg = getError($data);
+				if (is_array($error_msg) && isset($error_msg['message']))
+					$error_msg = $error_msg['message'];
+
+				$errors['failed_' . $studierendenantrag_id] = 'Could not reject Unterbrechung for studierendenantrag_id: ' .
+					$studierendenantrag_id .
+					'<br>Details:<br>' .
+					$error_msg;
+			} else {
+				$data = getData($data);
+
+				$result = $this->_ci->StudierendenantragstatusModel->insert([
+					'studierendenantrag_id' => $studierendenantrag_id,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_REJECTED,
+					'insertvon' => $insertvon,
+					'grund' => $grund
+				]);
+				if (isError($result)) {
+					$errors['failed_' . $studierendenantrag_id] = 'Could not reject Unterbrechung for studierendenantrag_id: ' .
+						$studierendenantrag_id .
+						'<br>Details:<br>' .
+						getError($result)['message'];
+				} else {
+					$name = '';
+
+					if (isset($data['errors']['person_id']) || isset($data['errors']['email'])) {
+						$error_msg = [];
+						if (isset($data['errors']['person_id']))
+							$error_msg[] = $data['errors']['person_id'];
+						if (isset($data['errors']['email']))
+							$error_msg[] = $data['errors']['email'];
+						$error_msg = 'Mail to student not sent<br>Details:<br>' . implode('<br>', $error_msg);
+						$errors[] = $error_msg;
+					} else {
+						if (isset($data['errors']['person'])) {
+							//send student mit "Student/in"
+							$errors[] = 'Student name not found<br>Details:<br>' . $data['errors']['person'];
+							$name = 'Student/in';
+						} else {
+							//send normal
+							$name = trim($data['person']->vorname . ' ' . $data['person']->nachname);
+						}
+					}
+					if ($name)
+						// NOTE(chris): Sancho mail
+						if (!sendSanchoMail(
+							'Sancho_Mail_Antrag_U_Reject',
+							[
+								'name' => $name,
+								'grund' => $grund,
+								'abmeldungLink' => site_url('lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id)
+							],
+							$data['email'],
+							'Unterbrechung abgelehnt'
+						))
+							$errors[] = 'Failed to send email to ' . $data['email'];
+				}
+			}
+		}
+
+		if (count($errors))
+			return error($errors);
+
+		return success();
+	}
+
+	/**
+	 * @param integer		$studierendenantrag_id
+	 *
+	 * @return array
+	 */
+	private function getDataForUnterbrechung($studierendenantrag_id)
+	{
+		$result = [];
+		$errors = [];
+
+		$res = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+		if (isError($res))
+			return $res;
+
+		$res = getData($res);
+		if (!$res)
+			return error('No Studierendenantrag found for studierendenantrag_id: ' . $studierendenantrag_id);
+
+		$result['antrag'] = $antrag = current($res);
+
+
+		$res = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail($antrag->prestudent_id);
+		if (isError($res))
+			return $res;
+
+		$res = getData($res);
+		if (!$res)
+			return error('No Prestudentstatus found for prestudent_id: ' . $antrag->prestudent_id);
+
+		$result['prestudent_status'] = current($res);
+
+
+		$res = $this->_ci->PrestudentModel->load($antrag->prestudent_id);
+
+		if (isError($res)) {
+			$errors['person_id'] = getError($res);
+		} else {
+			$res = getData($res);
+			if (!$res) {
+				$errors['person_id'] = 'No Prestudent found for prestudent_id: ' . $antrag->prestudent_id;
+			} else {
+				$person_id = current($res)->person_id;
+
+				$res = $this->_ci->PersonModel->load($person_id);
+				if (isError($res)) {
+					$errors['person'] = getError($res);
+				} else {
+					$res = getData($res);
+					if (!$res) {
+						$errors['person'] = 'No Person found for person_id: ' . $person_id;
+					} else {
+						$result['person'] = current($res);
+					}
+				}
+
+				$res = $this->_ci->KontaktModel->getZustellKontakt($person_id, ['email']);
+				if (isError($res)) {
+					$errors['email'] = getError($res);
+				} else {
+					$res = getData($res);
+
+					if (!$res) {
+						$errors['email'] = 'No email contact found for person_id: ' . $person_id;
+					} else {
+						$result['email'] = current($res)->kontakt;
+					}
+				}
+			}
+		}
+
+		$result['studienbeitrag'] = false;
+		if (!isset($errors['person_id'])) {
+			$date_target = new DateTime(
+				$this->_ci->config->item('frist_rueckzahlung_studiengebuer_' . substr($result['antrag']->studiensemester_kurzbz, 0, 2)) .
+				substr($result['antrag']->studiensemester_kurzbz, 2)
+			);
+			$date_created = new DateTime($result['antrag']->datum);
+			if ($date_created < $date_target) {
+				$this->_ci->load->model('crm/Konto_model', 'KontoModel');
+				$result['studienbeitrag'] = $this->_ci->KontoModel->checkStudienbeitragFromPerson($person_id, $result['antrag']->studiensemester_kurzbz);
+			}
+		}
+
+		$result['errors'] = $errors;
+
+		return success($result);
+	}
+
+	/**
+	 * @param integer		$prestudent_id
+	 * @param string		$studiensemester_kurzbz
+	 * @param string		$insertvon
+	 * @param boolean		$repeat
+	 *
+	 * @return stdClass
+	 */
+	public function createWiederholung($prestudent_id, $studiensemester_kurzbz, $insertvon, $repeat)
+	{
+		$result = $this->_ci->StudierendenantragModel->loadIdAndStatusWhere([
+			'prestudent_id' => $prestudent_id,
+			'studiensemester_kurzbz'=> $studiensemester_kurzbz,
+			'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
+		]);
+
+		$antrag_id = null;
+		if (hasData($result)) {
+			$antrag = current(getData($result));
+			if ($antrag->status == Studierendenantragstatus_model::STATUS_REOPENED ||
+				$antrag->status == Studierendenantragstatus_model::STATUS_REQUESTSENT_1 ||
+				$antrag->status == Studierendenantragstatus_model::STATUS_REQUESTSENT_2)
+			{
+				$antrag_id = $antrag->studierendenantrag_id;
+			}
+			else
+			{
+				return error('Antrag bereits vorhanden!');
+			}
+		}
+
+		if ($antrag_id === null) {
+			$result = $this->_ci->StudierendenantragModel->insert([
+				'prestudent_id' => $prestudent_id,
+				'studiensemester_kurzbz'=> $studiensemester_kurzbz,
+				'datum' => date('c'),
+				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
+				'insertvon' => $insertvon
+			]);
+
+			if (isError($result))
+				return $result;
+
+			$antrag_id = getData($result);
+		}
+
+		$result = $this->_ci->StudierendenantragstatusModel->insert([
+			'studierendenantrag_id' => $antrag_id,
+			'studierendenantrag_statustyp_kurzbz' => $repeat ? Studierendenantragstatus_model::STATUS_CREATED : Studierendenantragstatus_model::STATUS_PASS,
+			'insertvon' => $insertvon
+		]);
+
+		if ($repeat) {
+			$res = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail($prestudent_id);
+			if (isError($res))
+				return $res;
+			$res = getData($res);
+			if (!$res)
+				return error('No Prestudentstatus found for prestudent_id: ' . $prestudent_id);
+
+			$prestudent_status = current($res);
+			$email = $prestudent_status->email;
+			// NOTE(chris): Sancho mail
+			sendSanchoMail(
+				'Sancho_Mail_Antrag_W_New',
+				[
+					'antrag_id' => $antrag_id,
+					'lvzuweisungLink' => site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id)
+				],
+				$email,
+				'Neue*r Wiederholer*in'
+			);
+		}
+
+		if (isError($result))
+			return $result;
+
+		return success($antrag_id);
+	}
+
+	/**
+	 * @param integer		$studierendenantrag_id
+	 * @param string		$insertvon
+	 *
+	 * @return stdClass
+	 */
+	public function reopenWiederholung($studierendenantrag_id, $insertvon)
+	{
+		$result = $this->_ci->StudierendenantragstatusModel->insert([
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_REOPENED,
+			'insertvon' => $insertvon
+		]);
+		return $result;
+	}
+
+	/**
+	 * @param integer		$studierendenantrag_id
+	 * @param string		$objectedvon
+	 *
+	 * @return stdClass
+	 */
+	public function objectAbmeldung($studierendenantrag_id, $objectedvon)
+	{
+		$result = $this->_ci->StudierendenantragstatusModel->insert([
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_OBJECTED,
+			'insertvon' => $objectedvon
+		]);
+		return $result;
+	}
+
+	public function getWiederholungsAntraege($status)
+	{
+		$studiengaenge = $this->_ci->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
+		$result = $this->_ci->StudierendenantragModel->loadForStudiengaenge(
+			$studiengaenge,
+			Studierendenantrag_model::TYP_WIEDERHOLUNG,
+			$status
+		);
+		if (!getData($result))
+			return $result;
+		$result = getData($result);
+		$grouped = [];
+
+		foreach ($result as $item) {
+			if (!isset($grouped[$item->studiengang_kz])) {
+				$grouped[$item->studiengang_kz] = [
+					'bezeichnung' => $item->bezeichnung,
+					'bezeichnung_mehrsprachig' => $item->bezeichnung_mehrsprachig,
+					'antraege' => []
+				];
+			}
+			$grouped[$item->studiengang_kz]['antraege'][] = $item;
+		}
+
+		return success($grouped);
+	}
+
+	public function getLvsForAntrag($antrag_id)
+	{
+		$this->_ci->load->model('education/Lehrveranstaltung_model', 'LehrveranstaltungModel');
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		$result = $this->_ci->StudierendenantragModel->load($antrag_id);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('No antrag found with id: ' . $antrag_id);
+		$antrag = current($result);
+
+
+		$result = $this->_ci->StudierendenantragModel->getStgAndSem($antrag_id);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('No studiengang and ausbildungssemester found for antrag with id: ' . $antrag_id);
+		$result = current($result);
+		$studiengang_kz = $result->studiengang_kz;
+		$orgform_kurzbz = $result->orgform_kurzbz;
+		$ausbildungssemester = $result->ausbildungssemester;
+
+		// NOTE(chris): check permission
+		$allowedStgs = $this->_ci->permissionlib->getSTG_isEntitledFor('student/studierendenantrag') ?: [];
+		if (!in_array($studiengang_kz, $allowedStgs)) {
+			$allowedStgs = $this->_ci->permissionlib->getSTG_isEntitledFor('student/antragfreigabe') ?: [];
+			if (!in_array($studiengang_kz, $allowedStgs)) {
+				if(!$this->isOwnAntrag($antrag_id))
+					return error('Forbidden');
+			}
+		}
+
+
+		$result = $this->_ci->StudiensemesterModel->getNextFrom($antrag->studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('No studiensemster found after: ' . $antrag->studiensemester_kurzbz);
+		$semA = current($result)->studiensemester_kurzbz;
+
+		$result = $this->_ci->StudiensemesterModel->getNextFrom($semA);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('No studiensemster found after: ' . $semA);
+		$semB = current($result)->studiensemester_kurzbz;
+
+		$result = $this->_ci->StudierendenantraglehrveranstaltungModel->loadWhere(['studierendenantrag_id' => $antrag_id]);
+		if (isError($result))
+			return $result;
+		$result = getData($result) ?: [];
+
+		$lvszugewiesen = array();
+		foreach ($result as $lv)
+		{
+			$lvszugewiesen[$lv->lehrveranstaltung_id] = $lv;
+		}
+
+		$result = $this->getLvsByStgStsemAndSem(
+			$studiengang_kz,
+			$orgform_kurzbz,
+			$semA,
+			$ausbildungssemester + 1,
+			$antrag->prestudent_id,
+			$antrag->studiensemester_kurzbz
+		);
+		if (isError($result))
+			return $result;
+		$lvsA = getData($result) ?: [];
+		foreach($lvsA as $lv)
+		{
+			if (isset($lvszugewiesen[$lv->lehrveranstaltung_id]) &&
+				($lvszugewiesen[$lv->lehrveranstaltung_id]->note == $this->_ci->config->item('wiederholung_note_nicht_zugelassen')))
+			{
+				$lv->antrag_zugelassen = true;
+				$lv->antrag_anmerkung = $lvszugewiesen[$lv->lehrveranstaltung_id]->anmerkung;
+			}
+		}
+
+		$result = $this->getLvsByStgStsemAndSem(
+			$studiengang_kz,
+			$orgform_kurzbz,
+			$semB,
+			$ausbildungssemester,
+			$antrag->prestudent_id,
+			$antrag->studiensemester_kurzbz
+		);
+		if (isError($result))
+			return $result;
+		$lvsB = getData($result) ?: [];
+		foreach($lvsB as $lv)
+		{
+			if(isset($lvszugewiesen[$lv->lehrveranstaltung_id]) && ($lvszugewiesen[$lv->lehrveranstaltung_id]->note == 0))
+			{
+				$lv->antrag_anmerkung = $lvszugewiesen[$lv->lehrveranstaltung_id]->anmerkung;
+				$lv->antrag_zugelassen = true;
+			}
+			// TODO(manu): eventuelle Änderungen taggen
+		}
+
+		return success([
+			'1' . $semA => $lvsA ?: [],
+			'2' . $semB => $lvsB ?: []
+		]);
+	}
+
+	public function getLvsByStgStsemAndSem(
+		$studiengang_kz,
+		$orgform_kurzbz,
+		$studiensemester_kurzbz,
+		$ausbildungssemester,
+		$prestudent_id,
+		$note_stsem
+	) {
+		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
+
+		$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester(
+			$studiengang_kz,
+			$studiensemester_kurzbz,
+			$ausbildungssemester,
+			$orgform_kurzbz
+		);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('No studienplan found for stg: ' .
+				$studiengang_kz .
+				', studiensemester: ' .
+				$studiensemester_kurzbz .
+				', ausbildungssemester: ' .
+				($ausbildungssemester));
+		if (count($result) > 1)
+			return error('Multiple studienplaene found for stg: ' .
+				$studiengang_kz .
+				', studiensemester: ' .
+				$studiensemester_kurzbz .
+				', ausbildungssemester: ' .
+				$ausbildungssemester);
+		$studienplan = current($result);
+
+		return $this->_ci->StudienplanModel->getStudienplanLehrveranstaltungForPrestudent(
+			$studienplan->studienplan_id,
+			$ausbildungssemester,
+			$prestudent_id,
+			$note_stsem
+		);
+	}
+
+	/**
+	 * Checks if a prestudent can submit an Antrag for Abmeldung
+	 *
+	 * @param integer		$prestudent_id
+	 *
+	 * @return \stdClass	on success retval 0 means not a student; retval 1 means Berechtigt; retval -1 means has already an Antrag pending; retval -2 means other Antrag pending; retval -3 means in blacklist stg
+	 */
+	public function getPrestudentAbmeldeBerechtigt($prestudent_id)
+	{
+		$result = $this->_ci->PrestudentModel->load($prestudent_id);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(0);
+		$result = current(getData($result));
+		$stg_kz = $result->studiengang_kz;
+		if (in_array($stg_kz, $this->_ci->config->item('stgkz_blacklist_abmeldung')))
+			return success(-3);
+
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(0);
+		$result = current(getData($result));
+		$datumStatus = $result->datum;
+
+		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
+			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'typ' => Studierendenantrag_model::TYP_ABMELDUNG, 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED]);
+			if (isError($result))
+				return $result;
+			if (hasData($result))
+				return success(-1);
+
+			return success(0);
+		}
+
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(1);
+		$result= getData($result);
+		foreach ($result as $antrag)
+		{
+			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG)
+			{
+				if ($antrag->status == Studierendenantragstatus_model::STATUS_CREATED || $antrag->status == Studierendenantragstatus_model::STATUS_CREATED_STGL)
+					return success(-1);
+				elseif ($antrag->status == Studierendenantragstatus_model::STATUS_APPROVED && $antrag->datum > $datumStatus)
+					return success(-1);
+			}
+			if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG)
+			{
+				if($antrag->status == Studierendenantragstatus_model::STATUS_PASS)
+					return success(-2);
+			}
+		}
+
+		return success(1);
+	}
+
+	/**
+	 * Checks if a prestudent can submit an Antrag for Unterbrechung
+	 *
+	 * @param integer		$prestudent_id
+	 * @param string		$studiensemester_kurzbz		(optional)
+	 *
+	 * @return \stdClass	on success retval 0 means not a student; retval 1 means Berechtigt; retval -1 means has already an Antrag pending; retval -2 means other Antrag pending; retval -3 means in blacklist stg
+	 */
+	public function getPrestudentUnterbrechungsBerechtigt($prestudent_id, $studiensemester_kurzbz = null)
+	{
+		$result = $this->_ci->PrestudentModel->load($prestudent_id);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(0);
+		$result = current(getData($result));
+		$stg_kz = $result->studiengang_kz;
+		if (in_array($stg_kz, $this->_ci->config->item('stgkz_blacklist_unterbrechung')))
+			return success(-3);
+
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(0);
+		$result = current(getData($result));
+		$datumStatus = $result->datum;
+		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
+			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG, 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED]);
+			if (isError($result))
+				return $result;
+			if (hasData($result))
+				return success(-1);
+
+			return success(0);
+		}
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(1);
+		$result= getData($result);
+		foreach ($result as $antrag)
+		{
+			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG)
+			{
+				if($antrag->status == Studierendenantragstatus_model::STATUS_CREATED || $antrag->status == Studierendenantragstatus_model::STATUS_CREATED_STGL)
+					return success(-2);
+				elseif($antrag->status == Studierendenantragstatus_model::STATUS_APPROVED && $antrag->datum > $datumStatus)
+					return success(-2);
+			}
+			if ($studiensemester_kurzbz && $antrag->typ == Studierendenantrag_model::TYP_UNTERBRECHUNG)
+			{
+				// NOTE(chris): check if this is an old or canceled one
+				if ($antrag->studiensemester_kurzbz == $studiensemester_kurzbz && $antrag->status != Studierendenantragstatus_model::STATUS_CANCELLED)
+					return success(-1);
+			}
+			if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG)
+			{
+				if($antrag->status == Studierendenantragstatus_model::STATUS_PASS)
+					return success(-2);
+			}
+		}
+
+		return success(1);
+	}
+
+	/**
+	 * Checks if a prestudent can submit an Antrag for Wiederholung
+	 *
+	 * @param integer		$prestudent_id
+	 *
+	 * @return \stdClass	on success retval 0 means not a student; retval 1 means Berechtigt; retval -1 means has already an Antrag pending; retval -2 means other Antrag pending; retval -3 means in blacklist stg
+	 */
+	public function getPrestudentWiederholungsBerechtigt($prestudent_id)
+	{
+		$result = $this->_ci->PrestudentModel->load($prestudent_id);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(0);
+		$result = current(getData($result));
+		$stg_kz = $result->studiengang_kz;
+		if (in_array($stg_kz, $this->_ci->config->item('stgkz_blacklist_wiederholung')))
+			return success(-3);
+
+		$result = $this->getFailedExamForPrestudent($prestudent_id);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(0);
+
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(0);
+
+		$result = current(getData($result));
+		$datumStatus = $result->datum;
+		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
+			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG, 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED]);
+			if (isError($result))
+				return $result;
+			if (hasData($result))
+				return success(-1);
+
+			return success(0);
+		}
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id]);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return success(1);
+		$result= getData($result);
+		foreach ($result as $antrag)
+		{
+			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG)
+			{
+				if($antrag->status == Studierendenantragstatus_model::STATUS_CREATED || $antrag->status == Studierendenantragstatus_model::STATUS_CREATED_STGL)
+					return success(-2);
+				elseif($antrag->status == Studierendenantragstatus_model::STATUS_APPROVED && $antrag->datum > $datumStatus)
+					return success(-2);
+			}
+			if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG)
+			{
+				return success(-1);
+			}
+		}
+
+		return success(1);
+	}
+
+	/**
+	 * Gets details for a new Antrag
+	 *
+	 * @param integer		$prestudent_id
+	 *
+	 * @return \stdClass
+	 */
+	public function getDetailsForNewAntrag($prestudent_id)
+	{
+		$result = $this->_ci->PrestudentstatusModel->loadLastWithStgDetails($prestudent_id);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error('No Studentstatus found for: ' . $prestudent_id);
+		$result = current(getData($result));
+		return success($result);
+	}
+
+	public function getDetailsForLastAntrag($prestudent_id, $typ = null)
+	{
+		$result = $this->_ci->PrestudentstatusModel->loadLastWithStgDetails($prestudent_id);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error('No Studentstatus found for: ' . $prestudent_id);
+		$resultDetails = current(getData($result));
+
+		$where = [
+			'prestudent_id' => $prestudent_id
+		];
+		if ($typ)
+			$where['typ'] = $typ;
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere($where);
+		if (isError($result))
+			return $result;
+
+		$antraege = getData($result) ?: [];
+		$resultAntrag = null;
+		foreach ($antraege as $antrag) {
+			if ($antrag->status != Studierendenantragstatus_model::STATUS_CANCELLED) {
+				$resultAntrag = $antrag;
+				break;
+			}
+		}
+		if (!$resultAntrag)
+			return error('No Antrag ' . trim(($typ ?: '') . ' ') . 'found for: ' . $prestudent_id);
+
+		$resultDetails->status = $resultAntrag->status;
+		$resultDetails->statustyp = $resultAntrag->statustyp;
+		$resultDetails->grund = $resultAntrag->grund;
+		$resultDetails->studierendenantrag_id = $resultAntrag->studierendenantrag_id;
+		$resultDetails->typ = $resultAntrag->typ;
+
+		return success($resultDetails);
+	}
+
+	public function getDetailsForAntrag($studierendenantrag_id)
+	{
+		$where = [
+			'studierendenantrag_id' => $studierendenantrag_id
+		];
+
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere($where);
+		if (isError($result))
+		return $result;
+
+		if (!hasData($result))
+			return error("No Antrag found with id: " . $studierendenantrag_id);
+		$resultAntrag = current(getData($result));
+
+		$result = $this->_ci->PrestudentstatusModel->loadLastWithStgDetails($resultAntrag->prestudent_id, $resultAntrag->studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		if (!hasData($result)) {
+			$result = $this->_ci->PrestudentstatusModel->loadLastWithStgDetails($resultAntrag->prestudent_id);
+			if (isError($result))
+				return $result;
+			if (!hasData($result))
+				return error('No Studentstatus found for: ' . $resultAntrag->prestudent_id);
+		}
+		$resultDetails = current(getData($result));
+
+		$resultDetails->status = $resultAntrag->status;
+		$resultDetails->statustyp = $resultAntrag->statustyp;
+		$resultDetails->grund = $resultAntrag->grund;
+		$resultDetails->studierendenantrag_id = $resultAntrag->studierendenantrag_id;
+		$resultDetails->typ = $resultAntrag->typ;
+		$resultDetails->dms_id = $resultAntrag->dms_id;
+		$resultDetails->datum_wiedereinstieg = $resultAntrag->datum_wiedereinstieg;
+
+		return success($resultDetails);
+	}
+
+	public function getSemesterForUnterbrechung($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester)
+	{
+		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
+		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+
+		$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester);
+		if (!hasData($result))
+			return [];
+
+		$studienplaene = getData($result);
+		$studienplan_ids = array_map(function ($studienplan) {
+			return $studienplan->studienplan_id;
+		}, $studienplaene);
+
+		$result = $this->_ci->StudiensemesterModel->getFollowingSemester($studienplan_ids, $studiensemester_kurzbz, $ausbildungssemester);
+		if (!hasData($result))
+			return [];
+
+		$stsems = getData($result);
+
+		$result = $this->_ci->StudiensemesterModel->loadWhere();
+		if (!hasData($result))
+			return [];
+		$result = getData($result);
+		usort($result, function($a, $b) {
+			return $a->start > $b->start ? 1 : -1;
+		});
+		foreach ($stsems as $stsem) {
+			$stsem->wiedereinstieg = array_filter($result, function ($sem) use ($stsem) {
+				return $sem->start > $stsem->ende;
+			});
+		}
+
+		return $stsems;
+	}
+
+	public function getAbmeldeBerechtigtForStg($studiengaenge)
+	{
+		$blacklist = $this->_ci->config->item('stgkz_blacklist_abmeldung');
+		$studiengaenge = array_diff($studiengaenge, $blacklist);
+		return $this->_ci->StudiengangModel->getAktivePrestudenten($studiengaenge, [
+			Studierendenantrag_model::TYP_ABMELDUNG
+		]);
+	}
+
+	public function getFailedExamForPrestudent($prestudent_id)
+	{
+		return $this->_ci->PruefungModel->loadWhereCommitteeExamFailedForPrestudent($prestudent_id);
+	}
+
+	public function saveLvs($lvArray)
+	{
+		$result = $this->_ci->StudierendenantraglehrveranstaltungModel->deleteWhere(['studierendenantrag_id' => $lvArray[0]['studierendenantrag_id']]);
+		if (isError($result))
+			return $result;
+
+		$result = $this->_ci->StudierendenantraglehrveranstaltungModel->insertBatch($lvArray);
+		if (isError($result))
+			return $result;
+
+		$result = $this->_ci->StudierendenantragstatusModel->insert([
+			'studierendenantrag_id' => $lvArray[0]['studierendenantrag_id'],
+			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_LVSASSIGNED,
+			'insertvon' => $lvArray[0]['insertvon']
+		]);
+		if (isError($result))
+			return $result;
+
+		$antrag_status_id = getData($result);
+		$result = $this->_ci->StudierendenantragstatusModel->loadWithTyp($antrag_status_id);
+
+		return $result;
+	}
+
+	public function approveWiederholung($antrag_id, $insertvon)
+	{
+		$result = $this->_ci->StudierendenantragstatusModel->insert([
+			'studierendenantrag_id' => $antrag_id,
+			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
+			'insertvon' => $insertvon
+		]);
+
+		if (isError($result)) {
+			return $result;
+		}
+
+		$result = $this->_ci->StudierendenantragModel->getStgEmail($antrag_id);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('No studiengang email found for: ' . $antrag_id);
+
+		$email = current($result)->email;
+
+		$result = $this->_ci->StudierendenantragModel->getStgAndSem($antrag_id);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('No studiengang found for: ' . $antrag_id);
+
+		$result = current($result);
+		$studiengang_kz = $result->studiengang_kz;
+		$semester = $result->ausbildungssemester;
+
+		$result = $this->_ci->StudiengangModel->load($studiengang_kz);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('No studiengang found for: ' . $antrag_id);
+
+		$stg = current($result);
+
+		$result = $this->_ci->StudierendenantragModel->load($antrag_id);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error('No Antrag found for: ' . $antrag_id);
+		$result = current(getData($result));
+		$prestudent_id = $result->prestudent_id;
+
+		$result = $this->_ci->PersonModel->loadPrestudent($prestudent_id);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error('No Person found for prestudent: ' . $prestudent_id);
+		$result = current(getData($result));
+		$student = trim($result->vorname . ' ' . $result->nachname);
+
+		$result = $this->_ci->PersonModel->getFullName($insertvon);
+		if (isError($result))
+			return $result;
+		$mitarbeiter = $insertvon;
+		if (hasData($result)) {
+			$mitarbeiter = getData($result);
+		}
+
+
+		// NOTE(chris): Sancho mail
+		if (!sendSanchoMail(
+			'Sancho_Mail_Antrag_W_Approve',
+			[
+				'antrag_id' => $antrag_id,
+				'stg' => $stg->bezeichnung,
+				'sem' => $semester,
+				'student' => $student,
+				'mitarbeiter' => $mitarbeiter
+			],
+			$email,
+			'Wiederholung von Stgleitung freigegeben'
+		))
+			return error('Email konnte nicht versendet werden an '. $email);
+
+		return success();
+	}
+
+	public function getAntragHistory($antrag_id)
+	{
+		$result = $this->_ci->StudierendenantragstatusModel->loadWithTypWhere([
+			'studierendenantrag_id' => $antrag_id
+		]);
+		return $result;
+	}
+
+
+	/**
+	 * @param integer		$studierendenantrag_id
+	 *
+	 * @return boolean
+	 */
+	protected function isOwnAntrag($studierendenantrag_id)
+	{
+		if ($studierendenantrag_id == null)
+			return false;
+		$result = $this->_ci->StudierendenantragModel->loadForPerson(getAuthPersonId());
+		if (!hasData($result))
+			return false;
+		$antraege = array_map(function ($antrag) {
+			return $antrag->studierendenantrag_id;
+		}, getData($result));
+
+		return in_array($studierendenantrag_id, $antraege);
+	}
+
+	/**
+	 * @param integer		$studierendenantrag_id
+	 * @param string		$permission either 'student/antragfreigabe' or 'student/studierendenantrag'
+	 *
+	 * @return boolean
+	 */
+	protected function hasAccessToAntrag($studierendenantrag_id, $permission)
+	{
+		$studiengaenge = $this->_ci->permissionlib->getSTG_isEntitledFor($permission);
+		if (!$studiengaenge)
+			return false;
+		$result = $this->_ci->StudierendenantragModel->isInStudiengang($studierendenantrag_id, $studiengaenge);
+		return (boolean)getData($result);
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function isEntitledToShowAntrag($antrag_id)
+	{
+		return
+		(
+			$this->isOwnAntrag($antrag_id) ||
+			$this->hasAccessToAntrag($antrag_id, 'student/antragfreigabe') ||
+			$this->hasAccessToAntrag($antrag_id, 'student/studierendenantrag')
+		);
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function isEntitledToSeeHistoryForAntrag($antrag_id)
+	{
+		return
+		(
+			$this->isOwnAntrag($antrag_id) ||
+			$this->hasAccessToAntrag($antrag_id, 'student/antragfreigabe') ||
+			$this->hasAccessToAntrag($antrag_id, 'student/studierendenantrag')
+		);
+	}
+
+	/**
+	 * @param integer		$prestudent_id
+	 * @param boolean		$checkAssistencePermission
+	 *
+	 * @return boolean
+	 */
+	public function isEntitledToCreateAntragFor($prestudent_id, $checkAssistencePermission = false)
+	{
+		$result = $this->_ci->PrestudentModel->load($prestudent_id);
+		if (!hasData($result))
+			return false;
+
+		$result = getData($result)[0];
+		$person_id = $result->person_id;
+
+		if (getAuthPersonId() == $person_id)
+			return true;
+
+		if ($checkAssistencePermission)
+		{
+			$studiengaenge = $this->_ci->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
+			if (in_array($result->studiengang_kz, $studiengaenge ?: []))
+				return true;
+		}
+
+		return false;
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function isEntitledToCancelAntrag($antrag_id)
+	{
+		return $this->isOwnAntrag($antrag_id);
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function isEntitledToReopenAntrag($antrag_id)
+	{
+		return $this->hasAccessToAntrag($antrag_id, 'student/studierendenantrag');
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function isEntitledToObjectAntrag($antrag_id)
+	{
+		return ($this->hasAccessToAntrag($antrag_id, 'student/antragfreigabe') || $this->hasAccessToAntrag($antrag_id, 'student/studierendenantrag'));
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function isEntitledToApproveAntrag($antrag_id)
+	{
+		return $this->hasAccessToAntrag($antrag_id, 'student/antragfreigabe');
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function isEntitledToRejectAntrag($antrag_id)
+	{
+		return $this->hasAccessToAntrag($antrag_id, 'student/antragfreigabe');
+	}
+
+	/**
+	 * @param integer		$antrag_id
+	 * @param string|array	$status
+	 *
+	 * @return boolean
+	 */
+	public function hasStatus($antrag_id, $status)
+	{
+		$result = $this->_ci->StudierendenantragModel->getWithLastStatusWhere(['s.studierendenantrag_id' => $antrag_id]);
+		if (!hasData($result))
+			return false;
+		$lastStatus = getData($result)[0];
+
+		if (!is_array($status))
+			$status = [$status];
+
+		return in_array($lastStatus->studierendenantrag_statustyp_kurzbz, $status);
+	}
+
+
+	/**
+	 * @param integer		$antrag_id
+	 *
+	 * @return boolean
+	 */
+	public function getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz)
+	{
+		$result = $this->_ci->StudierendenantraglehrveranstaltungModel->getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz);
+		return $result;
+	}
+}
diff --git a/application/libraries/DmsLib.php b/application/libraries/DmsLib.php
index fccfe503b..774ebdc79 100644
--- a/application/libraries/DmsLib.php
+++ b/application/libraries/DmsLib.php
@@ -595,6 +595,8 @@ class DmsLib
 		if (isError($insDmsResult)) return $insDmsResult;
 
 		$upload_data['dms_id'] = getData($insDmsResult);
+		if(isset($upload_data['file_type']) && !isset($dms['mimetype']))
+			$dms['mimetype'] = $upload_data['file_type'];
 
 		// Insert DMS version
 		$insVersionResult = $this->_ci->DmsVersionModel->insert(
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
new file mode 100644
index 000000000..6dff4e812
--- /dev/null
+++ b/application/libraries/PrestudentLib.php
@@ -0,0 +1,356 @@
+<?php
+
+/**
+ * FH-Complete
+ *
+ * @package             FHC-Helper
+ * @author              FHC-Team
+ * @copyright           Copyright (c) 2023 fhcomplete.net
+ * @license             GPLv3
+ */
+
+if (! defined('BASEPATH')) exit('No direct script access allowed');
+
+class PrestudentLib
+{
+
+	/**
+	 * Object initialization
+	 */
+	public function __construct()
+	{
+		$this->_ci =& get_instance();
+
+		// // Configs
+		// $this->_ci->load->config('studierendenantrag');
+
+		// // Models
+		$this->_ci->load->model('crm/Prestudent_model', 'PrestudentModel');
+		$this->_ci->load->model('crm/Student_model', 'StudentModel');
+		$this->_ci->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+		$this->_ci->load->model('education/Zeugnisnote_model', 'ZeugnisnoteModel');
+		$this->_ci->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
+		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
+		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+
+	}
+
+	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null)
+	{
+		if (!$insertvon)
+			$insertvon = getAuthUID();
+
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('Kein Prestudent in diesem Studiensemester gefunden');
+
+		$prestudent_status = current($result);
+
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('No student found for ' . $prestudent_id);
+
+		$student = current($result);
+
+		//Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $prestudent_status->ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => $insertvon,
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $insertvon,
+			'bestaetigtam' => date('c')
+		]);
+
+		if (isError($result))
+			return $result;
+
+		//Verband anlegen
+		$result = $this->_ci->LehrverbandModel->load([
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => 0,
+			'verband' => 'A',
+			'gruppe' => ''
+		]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+		{
+			$result = $this->_ci->LehrverbandModel->load([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => '',
+				'gruppe' => ''
+			]);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			if(!$result)
+			{
+				$this->_ci->LehrverbandModel->insert([
+					'studiengang_kz' => $student->studiengang_kz,
+					'semester' => 0,
+					'verband' => '',
+					'gruppe' => '',
+					'bezeichnung' => 'Ab-Unterbrecher',
+					'aktiv' => true,
+				]);
+			}
+
+			$this->_ci->LehrverbandModel->insert([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'A',
+				'gruppe' => '',
+				'bezeichnung' => 'Abbrecher',
+				'aktiv' => true
+			]);
+		}
+
+		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
+		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result) ?: [];
+
+		foreach ($result as $lv)
+		{
+			if (!$lv->note)
+			{
+				$result = $this->_ci->ZeugnisnoteModel->insert([
+					'note' => 9,
+					'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+					'student_uid' => $lv->uid,
+					'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+				]);
+				if (isError($result)) {
+					$result = $this->_ci->ZeugnisnoteModel->update([
+						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+						'student_uid' => $lv->uid,
+						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+					],[
+						'note' => 9
+					]);
+
+					if (isError($result))
+						return $result;
+				}
+			}
+		}
+
+
+		//Update Aktionen
+
+		//StudentModel updaten
+		$this->_ci->StudentModel->update([
+			'student_uid' => $student->student_uid
+		], [
+			'verband' => 'A',
+			'gruppe' => '',
+			'semester' => 0,
+			'updatevon' => $insertvon,
+			'updateamum' => date('c')
+		]);
+
+		//Studentlehrverband setzen
+		$this->_ci->StudentlehrverbandModel->update([
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'student_uid' => $student->student_uid
+		],[
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => 0,
+			'verband' => 'A',
+			'gruppe' => '',
+			'updateamum' => date('c'),
+			'updatevon' => $insertvon
+		]);
+
+		//Benutzer inaktiv setzen
+		$this->_ci->BenutzerModel->update([
+			'uid' =>  $student->student_uid
+		],[
+			'aktiv' => false,
+			'updateaktivvon' => $insertvon,
+			'updateaktivam' => date('c'),
+			'updatevon' => $insertvon,
+			'updateamum' => date('c')
+		]);
+
+		return success();
+	}
+
+	public function setUnterbrecher($prestudent_id, $studiensemester_kurzbz, $studierendenantrag_id, $insertvon = null)
+	{
+		if (!$insertvon)
+			$insertvon = getAuthUID();
+
+		$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('Kein Prestudent in diesem Studiensemester gefunden');
+
+		$prestudent_status = current($result);
+
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+			return error('No student found for ' . $prestudent_id);
+
+		$student = current($result);
+
+		$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+		if (isError($resultAntrag))
+			return $resultAntrag;
+		$resultAntrag = getData($resultAntrag);
+		if (!$resultAntrag)
+			return error('No antrag found with id: ' . $studierendenantrag_id);
+
+		$antrag = current($resultAntrag);
+
+		//Status updaten
+		$result = $this->_ci->PrestudentstatusModel->insert([
+			'prestudent_id' => $prestudent_id,
+			'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'ausbildungssemester' => $prestudent_status->ausbildungssemester,
+			'datum' => date('c'),
+			'insertvon' => $insertvon,
+			'insertamum' => date('c'),
+			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
+			'studienplan_id'=> $prestudent_status->studienplan_id,
+			'bestaetigtvon' => $insertvon,
+			'bestaetigtam' => date('c'),
+			'anmerkung'=> 'Wiedereinstieg ' . $antrag->datum_wiedereinstieg
+		]);
+
+		//error try manu
+		if (isError($result))
+			return $result;
+
+		//Verband anlegen
+		$result = $this->_ci->LehrverbandModel->load([
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => 0,
+			'verband' => 'B',
+			'gruppe' => ''
+		]);
+
+		if (isError($result))
+			return $result;
+		$result = getData($result);
+		if (!$result)
+		{
+			$result = $this->_ci->LehrverbandModel->load([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => '',
+				'gruppe' => ''
+			]);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			if(!$result)
+			{
+				$this->_ci->LehrverbandModel->insert([
+					'studiengang_kz' => $student->studiengang_kz,
+					'semester' => 0,
+					'verband' => '',
+					'gruppe' => '',
+					'bezeichnung' => 'Ab-Unterbrecher',
+					'aktiv' => true,
+				]);
+			}
+
+			$this->_ci->LehrverbandModel->insert([
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'bezeichnung' => 'Unterbrecher',
+				'aktiv' => true
+			]);
+		}
+
+		//noch nicht eingetragene Zeugnisnoten auf 9 setzen
+		$result = $this->_ci->ZeugnisnoteModel->getZeugnisnoten($student->student_uid, $studiensemester_kurzbz);
+		if (isError($result))
+			return $result;
+		$result = getData($result) ?: [];
+
+		foreach ($result as $lv)
+		{
+			if (!$lv->note)
+			{
+				$result = $this->_ci->ZeugnisnoteModel->insert([
+					'note' => 9,
+					'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+					'student_uid' => $lv->uid,
+					'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+				]);
+				if (isError($result)) {
+					$result = $this->_ci->ZeugnisnoteModel->update([
+						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
+						'student_uid' => $lv->uid,
+						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
+					],[
+						'note' => 9
+					]);
+
+					if (isError($result))
+						return $result;
+				}
+			}
+		}
+
+
+		//Update Aktionen
+
+		//StudentModel updaten
+		$this->_ci->StudentModel->update([
+			'student_uid' => $student->student_uid
+		], [
+			'verband' => 'B',
+			'gruppe' => '',
+			'semester' => 0,
+			'updatevon' => $insertvon,
+			'updateamum' => date('c')
+		]);
+
+		//Studentlehrverband setzen
+		$this->_ci->StudentlehrverbandModel->update([
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'student_uid' => $student->student_uid
+		],[
+			'studiengang_kz' => $student->studiengang_kz,
+			'semester' => 0,
+			'verband' => 'B',
+			'gruppe' => '',
+			'updateamum' => date('c'),
+			'updatevon' => $insertvon
+		]);
+
+		return success();
+	}
+
+}
diff --git a/application/models/crm/Konto_model.php b/application/models/crm/Konto_model.php
index 4b2a259c9..e76ed9e7a 100644
--- a/application/models/crm/Konto_model.php
+++ b/application/models/crm/Konto_model.php
@@ -100,8 +100,8 @@ class Konto_model extends DB_Model
 
 	public function checkStudienbeitrag($uid, $stsem, $buchungstypen)
 	{
-		$query = 'SELECT tbl_konto.buchungsnr, 
-       				tbl_konto.buchungsdatum 
+		$query = 'SELECT tbl_konto.buchungsnr,
+       				tbl_konto.buchungsdatum
 					FROM public.tbl_konto,
 					public.tbl_benutzer,
 					public.tbl_student
@@ -117,10 +117,47 @@ class Konto_model extends DB_Model
 							FROM public.tbl_konto skonto
 							WHERE skonto.buchungsnr = tbl_konto.buchungsnr_verweis
 							OR skonto.buchungsnr_verweis = tbl_konto.buchungsnr_verweis
-						)	
+						)
 					ORDER BY buchungsnr DESC LIMIT 1
 					';
 
 		return $this->execQuery($query);
 	}
+
+	/**
+	 * check if student has paid studienbeitrag for certain semester
+	 *
+	 * @param $person_id person_id
+	 * @param $stsem stsem
+	 *
+	 * @return boolean
+	 */
+	public function checkStudienbeitragFromPerson($person_id, $stsem)
+	{
+		$this->addOrder('buchungsnr');
+		$this->addLimit(1);
+		$result = $this->loadWhere([
+			'person_id'=>$person_id,
+			'studiensemester_kurzbz' => $stsem,
+			'buchungstyp_kurzbz' => 'Studiengebuehr'
+		]);
+
+		if (!getData($result))
+			return false;
+
+		$data = getData($result)[0];
+
+		$this->resetQuery();
+
+		$this->addSelect('sum(betrag) as differenz');
+		$this->db->or_where('buchungsnr', $data->buchungsnr);
+		$this->db->or_where('buchungsnr_verweis', $data->buchungsnr);
+
+		$result = $this->load();
+		if (!getData($result))
+			return false;
+
+		$data = getData($result)[0];
+		return $data->differenz >= 0;
+	}
 }
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index f39a41fda..620b897e6 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -2,6 +2,10 @@
 
 class Prestudentstatus_model extends DB_Model
 {
+
+	const STATUS_ABBRECHER = 'Abbrecher';
+	const STATUS_UNTERBRECHER = 'Unterbrecher';
+
 	/**
 	 * Constructor
 	 */
@@ -226,4 +230,90 @@ class Prestudentstatus_model extends DB_Model
 
 		return $this->execQuery($query, $parametersArray);
 	}
+
+	/**
+	 * get Email of relevant Studiengang of prestudent
+	 */
+	public function getLastStatusWithStgEmail($prestudent_id, $studiensemester_kurzbz = '', $status_kurzbz = '')
+	{
+		$this->addSelect('tbl_prestudentstatus.*,
+						tbl_studienplan.bezeichnung AS studienplan_bezeichnung,
+						tbl_studienplan.orgform_kurzbz AS orgform,
+						tbl_studienplan.sprache,
+						tbl_orgform.bezeichnung_mehrsprachig AS bezeichnung_orgform,
+						tbl_status.bezeichnung_mehrsprachig,
+						tbl_status_grund.bezeichnung_mehrsprachig AS bezeichnung_statusgrund,
+						tbl_studiengang.email');
+		$this->addJoin('lehre.tbl_studienplan', 'studienplan_id', 'LEFT');
+		$this->addJoin('lehre.tbl_studienordnung', 'studienordnung_id', 'LEFT');
+		$this->addJoin('public.tbl_studiengang', 'studiengang_kz', 'LEFT');
+		$this->addJoin('public.tbl_status', 'tbl_status.status_kurzbz = tbl_prestudentstatus.status_kurzbz');
+		$this->addJoin('public.tbl_status_grund', 'statusgrund_id', 'LEFT');
+		$this->addJoin('bis.tbl_orgform', 'tbl_studienplan.orgform_kurzbz = tbl_orgform.orgform_kurzbz', 'LEFT');
+		$this->db->where('tbl_status.status_kurzbz = tbl_prestudentstatus.status_kurzbz');
+
+		$where = array('prestudent_id' => $prestudent_id);
+		if ($studiensemester_kurzbz)
+			$where['studiensemester_kurzbz'] = $studiensemester_kurzbz;
+		if ($status_kurzbz)
+			$where['tbl_prestudentstatus.status_kurzbz'] = $status_kurzbz;
+
+		$this->addOrder('datum', 'DESC');
+		$this->addOrder('insertamum', 'DESC');
+		$this->addOrder('ext_id', 'DESC');
+		$this->addLimit(1);
+
+		return $this->loadWhere($where);
+	}
+
+	public function loadLastWithStgDetails($prestudent_id, $studiensemester_kurzbz = null)
+	{
+		$this->load->config('studierendenantrag');
+
+		$lang = getUserLanguage();
+
+		$this->addSelect($this->dbTable . '.prestudent_id');
+		$this->addSelect($this->dbTable . '.ausbildungssemester AS semester');
+		$this->addSelect($this->dbTable . '.studiensemester_kurzbz');
+		$this->addSelect('s.matrikelnr');
+		$this->addSelect('ss.studienjahr_kurzbz');
+		$this->addSelect('pers.vorname');
+		$this->addSelect('pers.nachname');
+		$this->addSelect('TRIM(CONCAT(pers.vorname, \' \', pers.nachname)) AS name');
+		$this->addSelect('pers.person_id');
+		$this->addSelect('g.studiengang_kz');
+		$this->addSelect('g.bezeichnung');
+		$this->addSelect('o.orgform_kurzbz');
+		$this->addSelect(
+			'o.bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=\'' . $lang . '\')] AS orgform_bezeichnung',
+			false
+		);
+
+		$this->addJoin('public.tbl_student s', 'prestudent_id');
+		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
+		$this->addJoin('public.tbl_studiensemester ss', 'studiensemester_kurzbz');
+		$this->addJoin('public.tbl_person pers', 'person_id');
+		$this->addJoin('public.tbl_studiengang g', 'p.studiengang_kz=g.studiengang_kz');
+		$this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
+
+		$this->addOrder($this->dbTable . '.datum', 'DESC');
+		$this->addOrder($this->dbTable . '.insertamum', 'DESC');
+		$this->addOrder($this->dbTable . '.ext_id', 'DESC');
+
+		$this->addLimit(1);
+
+		$this->db->where_in($this->dbTable . '.status_kurzbz', $this->config->item('antrag_prestudentstatus_whitelist'));
+
+		$whereArr = [
+			$this->dbTable . '.prestudent_id' => $prestudent_id,
+			'g.aktiv' => true
+		];
+
+		if ($studiensemester_kurzbz !== null)
+		{
+			$whereArr[$this->dbTable. '.studiensemester_kurzbz'] = $studiensemester_kurzbz;
+		}
+
+		return $this->loadWhere($whereArr);
+	}
 }
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index e3776c4ad..4236a5c6a 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -29,11 +29,148 @@ class Pruefung_model extends DB_Model
 		JOIN lehre.tbl_pruefung prfg USING (student_uid)
 		JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
 		JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
-		JOIN public.tbl_studiengang stg ON prst.studiengang_kz = stg.studiengang_kz 
+		JOIN public.tbl_studiengang stg ON prst.studiengang_kz = stg.studiengang_kz
 		WHERE pers.person_id = ?
 		AND le.studiensemester_kurzbz = ?
 		ORDER BY prfg.datum, pruefung_id';
 
 		return $this->execQuery($qry, array($person_id, $studiensemester_kurzbz));
 	}
+
+	/**
+	 * @param integer		$prestudent_id student_uid
+	 *
+	 * @return stdClass
+	 */
+	public function loadWhereCommitteeExamFailedForPrestudent($prestudent_id)
+	{
+		$this->load->config('studierendenantrag');
+
+		$this->dbTable = 'lehre.tbl_pruefung p';
+
+		$this->addSelect('p.datum');
+		$this->addSelect('pers.vorname');
+		$this->addSelect('pers.nachname');
+		$this->addSelect('s.matrikelnr');
+		$this->addSelect('g.bezeichnung');
+		$this->addSelect('g.studiengang_kz');
+		$this->addSelect('o.bezeichnung_mehrsprachig');
+		$this->addSelect('ps.prestudent_id');
+		$this->addSelect('lv.bezeichnung as lvbezeichnung');
+		$this->addSelect('le.studiensemester_kurzbz');
+		$this->addSelect('a.typ');
+		$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
+
+		$this->addJoin('lehre.tbl_note n', 'note');
+		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+		$this->addJoin('public.tbl_student s', 'student_uid');
+		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
+		$this->addJoin('public.tbl_person pers', 'person_id');
+		$this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
+		$this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
+		$this->addJoin('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id', 'LEFT');
+
+		$this->db->where("n.positiv", false);
+		$this->db->where("p.pruefungstyp_kurzbz", 'kommPruef');
+		$this->db->where("ps.prestudent_id", $prestudent_id);
+		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, NULL)", $this->config->item('antrag_prestudentstatus_whitelist'));
+		$this->db->where("g.aktiv", true);
+
+		$this->db->where('lv.studiengang_kz not in(
+				SELECT ps.studiengang_kz
+				FROM
+				public.tbl_student s
+				JOIN public.tbl_prestudent ps USING (prestudent_id)
+				JOIN public.tbl_prestudentstatus pss USING (prestudent_id)
+				WHERE pss.statusgrund_id in ?
+				and ps.prestudent_id = ?)', null, false);
+
+		$sql = $this->db->get_compiled_select($this->dbTable);
+
+		return $this->execQuery($sql, [$this->config->item('status_gruende_wiederholer'), $prestudent_id]);
+	}
+
+	public function getAllPrestudentsWhereCommitteeExamFailed($status, $maxDate, $minDate)
+	{
+		$this->load->config('studierendenantrag');
+		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+
+		$this->dbTable = 'lehre.tbl_pruefung p';
+
+		$sprache_index = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
+
+		$this->addSelect('p.datum');
+		$this->addSelect('pers.vorname');
+		$this->addSelect('pers.nachname');
+		$this->addSelect('pers.person_id');
+		$this->addSelect('s.matrikelnr');
+		$this->addSelect('g.bezeichnung');
+		$this->addSelect('g.studiengang_kz');
+		$this->addSelect('o.bezeichnung_mehrsprachig[(' . $sprache_index . ')] AS orgform', false);
+		$this->addSelect('ps.prestudent_id');
+		$this->addSelect('lv.bezeichnung as lvbezeichnung');
+		$this->addSelect('le.studiensemester_kurzbz');
+		$this->addSelect('a.typ');
+		$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
+
+		$this->addJoin('lehre.tbl_note n', 'note');
+		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+		$this->addJoin('public.tbl_student s', 'student_uid');
+		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
+		$this->addJoin('public.tbl_person pers', 'person_id');
+		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
+		$this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
+		$this->db->join('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ = ?', 'LEFT', false);
+
+		$this->db->where("n.positiv", false);
+		$this->db->where("p.pruefungstyp_kurzbz", 'kommPruef');
+		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
+		
+		if ($maxDate)
+			$this->db->where("p.datum < ", $maxDate->format('c'));
+		if ($minDate)
+			$this->db->where("p.datum > ", $minDate->format('c'));
+		$this->db->where("g.aktiv", true);
+		$this->db->where("b.aktiv", true);
+
+		$this->db->where('lv.studiengang_kz not in(
+				SELECT ps.studiengang_kz
+				FROM
+				public.tbl_prestudent ps1
+				JOIN public.tbl_prestudentstatus pss USING (prestudent_id)
+				WHERE pss.statusgrund_id in ?
+				AND ps.prestudent_id = ps1.prestudent_id)', null, false);
+
+		// NOTE(chris): is Wiederholer without set statusgrund (legacy?)
+		$this->db->where('(SELECT COUNT(*) FROM (SELECT DISTINCT studiensemester_kurzbz FROM tbl_prestudentstatus _s WHERE ausbildungssemester=get_absem_prestudent(ps.prestudent_id, le.studiensemester_kurzbz) AND prestudent_id=ps.prestudent_id) a) = 1', null, false);
+
+		if (is_array($status)) {
+			if (in_array(null, $status)) {
+				$status = array_filter($status);
+				if (count($status)) {
+					$this->db->group_start();
+					$this->db->where_in('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
+					$this->db->or_where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', null);
+					$this->db->group_end();
+				} else {
+					$this->db->where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', null);
+				}
+			} else {
+				$this->db->where_in('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
+			}
+		} else {
+			$this->db->where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
+		}
+
+		$sql = $this->db->get_compiled_select($this->dbTable);
+
+		$statusgruende = $this->config->item('status_gruende_wiederholer');
+		if (!is_array($statusgruende))
+			$statusgruende = [];
+
+		return $this->execQuery($sql, [Studierendenantrag_model::TYP_WIEDERHOLUNG, $statusgruende]);
+	}
 }
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
new file mode 100644
index 000000000..bf993ca67
--- /dev/null
+++ b/application/models/education/Studierendenantrag_model.php
@@ -0,0 +1,229 @@
+<?php
+class Studierendenantrag_model extends DB_Model
+{
+
+	const TYP_ABMELDUNG = 'Abmeldung';
+	const TYP_UNTERBRECHUNG = 'Unterbrechung';
+	const TYP_WIEDERHOLUNG = 'Wiederholung';
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_studierendenantrag';
+		$this->pk = 'studierendenantrag_id';
+
+		$this->load->config('studierendenantrag');
+
+		$this->load->model('education/Studierendenantragstatus_model', 'StudierendenantragstatusModel');
+	}
+
+	public function loadCreatedForStudiengaenge($studiengaenge, $typ)
+	{
+		return $this->loadForStudiengaenge($studiengaenge, $typ, $this->StudierendenantragstatusModel::STATUS_CREATED);
+	}
+
+	public function loadForStudiengaenge($studiengaenge, $typ = null, $status = null)
+	{
+		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
+
+		$this->addSelect('stg.bezeichnung');
+		$this->addSelect('bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform', false);
+		$this->addSelect('s.studierendenantrag_id');
+		$this->addSelect('matrikelnr');
+		$this->addSelect('studienjahr_kurzbz');
+		$this->addSelect('vorname');
+		$this->addSelect('nachname');
+		$this->addSelect('prestudent_id');
+		$this->addSelect('p.studiengang_kz');
+		$this->addSelect('semester');
+		$this->addSelect($this->dbTable . '.grund');
+		$this->addSelect('datum');
+		$this->addSelect('datum_wiedereinstieg');
+		$this->addSelect($this->dbTable . '.typ');
+		$this->addSelect('st.studierendenantrag_statustyp_kurzbz as status');
+		$this->addSelect('dms_id');
+		$this->addSelect('st.bezeichnung[(' . $sql . ')] as statustyp');
+
+		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
+		$this->addJoin('public.tbl_student', 'prestudent_id');
+		$this->addJoin('public.tbl_person', 'person_id');
+		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
+		$this->addJoin('public.tbl_studiensemester', 'studiensemester_kurzbz');
+		$this->addJoin('bis.tbl_orgform', 'orgform_kurzbz');
+		$this->addJoin('campus.tbl_studierendenantrag_status as s','campus.get_status_id_studierendenantrag('.$this->dbTable .'.studierendenantrag_id) = studierendenantrag_status_id' );
+		$this->addJoin('campus.tbl_studierendenantrag_statustyp as st','studierendenantrag_statustyp_kurzbz' );
+
+		$this->db->where_in('p.studiengang_kz', $studiengaenge);
+
+		$where = [];
+		if ($status !== null)
+			$where['st.studierendenantrag_statustyp_kurzbz'] = $status;
+		if ($typ !== null)
+			$where[$this->dbTable . '.typ'] = $typ;
+
+		return $this->loadWhere($where);
+	}
+
+	public function isInStudiengang($studierendenantrag_id, $studiengaenge)
+	{
+		$this->addJoin('public.tbl_prestudent', 'prestudent_id');
+
+		$this->db->where_in('studiengang_kz', $studiengaenge);
+
+		return $this->load($studierendenantrag_id);
+	}
+
+	public function loadIdAndStatusWhere($where)
+	{
+		$this->addSelect('studierendenantrag_id');
+		$this->addSelect('campus.get_status_studierendenantrag(studierendenantrag_id) status');
+		return $this->loadWhere($where);
+	}
+
+	public function loadWithStatusWhere($where)
+	{
+		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
+
+		$this->addSelect('*');
+		$this->addSelect('campus.get_status_studierendenantrag(studierendenantrag_id) status');
+		$this->addSelect('t.bezeichnung[(' . $lang . ')] statustyp');
+
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_statustyp t',
+			'campus.get_status_studierendenantrag(studierendenantrag_id)=t.studierendenantrag_statustyp_kurzbz'
+		);
+
+		$this->addOrder('datum', 'DESC');
+
+		return $this->loadWhere($where);
+	}
+
+	/**
+	 * Get the studiengang and ausbildungssemester the student was in
+	 * for the studiensemester the antrag was committed for
+	 *
+	 * @param integer		$antrag_id
+	 *
+	 * @return stdClass
+	 */
+	public function getStgAndSem($antrag_id)
+	{
+		$this->addSelect('p.studiengang_kz');
+		$this->addSelect('s.ausbildungssemester');
+		$this->addSelect('s.orgform_kurzbz');
+
+		$this->addJoin(
+			'public.tbl_prestudentstatus s',
+			$this->dbTable . '.prestudent_id=s.prestudent_id AND ' . $this->dbTable . '.studiensemester_kurzbz=s.studiensemester_kurzbz'
+		);
+		$this->addJoin('public.tbl_prestudent p', $this->dbTable . '.prestudent_id=p.prestudent_id');
+
+		$this->addOrder('s.datum', 'DESC');
+		$this->addOrder('s.insertamum', 'DESC');
+		$this->addOrder('s.ext_id', 'DESC');
+
+		$this->addLimit(1);
+
+		$this->db->where_in('s.status_kurzbz', $this->config->item('antrag_prestudentstatus_whitelist'));
+
+		return $this->loadWhere([
+			$this->pk => $antrag_id
+		]);
+	}
+
+	/**
+	 * Get the studiengang the student is in
+	 *
+	 * @param integer		$antrag_id
+	 *
+	 * @return stdClass
+	 */
+	public function getStg($antrag_id)
+	{
+		$this->addSelect('p.studiengang_kz');
+		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
+
+		$this->addLimit(1);
+
+		return $this->load(
+			$antrag_id
+		);
+	}
+
+	public function getStgEmail($antrag_id)
+	{
+		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
+		$this->addJoin('public.tbl_studiengang sg', 'studiengang_kz');
+		$this->addSelect('sg.email');
+
+		return $this->load($antrag_id);
+	}
+
+	public function loadForPerson($person_id)
+	{
+		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
+		$this->addSelect('stg.bezeichnung');
+		$this->addSelect('bezeichnung_mehrsprachig[(' . $lang . ')] as orgform');
+		$this->addSelect('p.studiengang_kz');
+		$this->addSelect('st.studierendenantrag_statustyp_kurzbz as status');
+		$this->addSelect('st.bezeichnung[(' . $lang . ')] as status_bezeichnung');
+		$this->addSelect('p.prestudent_id');
+		$this->addSelect($this->dbTable . '.studierendenantrag_id');
+		$this->addSelect($this->dbTable . '.studiensemester_kurzbz');
+		$this->addSelect($this->dbTable . '.datum');
+		$this->addSelect($this->dbTable . '.typ');
+		$this->addSelect($this->dbTable . '.insertamum');
+		$this->addSelect($this->dbTable . '.insertvon');
+		$this->addSelect($this->dbTable . '.datum_wiedereinstieg');
+		$this->addSelect($this->dbTable . '.grund');
+		$this->addSelect($this->dbTable . '.dms_id');
+
+		$this->addJoin('public.tbl_prestudent p', 'prestudent_id', 'RIGHT');
+		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
+		$this->addJoin('bis.tbl_orgform', 'orgform_kurzbz');
+		$this->addJoin('campus.tbl_studierendenantrag_statustyp st', 'campus.get_status_studierendenantrag(studierendenantrag_id)=st.studierendenantrag_statustyp_kurzbz','LEFT');
+
+		$this->db->where_in('public.get_rolle_prestudent(p.prestudent_id, null)', $this->config->item('antrag_prestudentstatus_whitelist'));
+
+		return $this->loadWhere([
+			'p.person_id' => $person_id
+		]);
+	}
+
+	public function getAntraegeWhereWiedereinstiegBetween($start, $end)
+	{
+		$this->addSelect('sg.email');
+		$this->addSelect('vorname');
+		$this->addSelect('nachname');
+		$this->addSelect($this->dbTable.'.*');
+
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_status s',
+			'campus.get_status_id_studierendenantrag(' . $this->dbTable . '.studierendenantrag_id)=s.studierendenantrag_status_id'
+		);
+		$this->addJoin('public.tbl_prestudent p', 'prestudent_id');
+		$this->addJoin('public.tbl_person', 'person_id');
+		$this->addJoin('public.tbl_studiengang sg', 'studiengang_kz');
+
+		$this->db->where('datum_wiedereinstieg >=', $start->format('Y-m-d'));
+		$this->db->where('datum_wiedereinstieg <=', $end->format('Y-m-d'));
+
+		return $this->loadWhere([
+			's.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
+			$this->dbTable.'.typ' => self::TYP_UNTERBRECHUNG,
+		]);
+	}
+
+	public function getWithLastStatusWhere($where)
+	{
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_status s',
+			'campus.get_status_id_studierendenantrag(' . $this->dbTable . '.studierendenantrag_id)=s.studierendenantrag_status_id'
+		);
+
+		return $this->loadWhere($where);
+	}
+}
diff --git a/application/models/education/Studierendenantraglehrveranstaltung_model.php b/application/models/education/Studierendenantraglehrveranstaltung_model.php
new file mode 100644
index 000000000..88d591053
--- /dev/null
+++ b/application/models/education/Studierendenantraglehrveranstaltung_model.php
@@ -0,0 +1,79 @@
+<?php
+class Studierendenantraglehrveranstaltung_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_studierendenantrag_lehrveranstaltung';
+		$this->pk = 'studierendenantrag_lehrveranstaltung_id';
+	}
+
+	public function insertBatch($data)
+	{
+		// Check class properties
+		if (is_null($this->dbTable)) return error('The given database table name is not valid', EXIT_MODEL);
+
+		// DB-INSERT
+		$insert = $this->db->insert_batch($this->dbTable, $data);
+
+		if ($insert)
+		{
+			return success();
+		}
+		else
+		{
+			return error($this->db->error(), EXIT_DATABASE);
+		}
+	}
+
+	public function deleteWhere($where)
+	{
+		if (is_null($this->dbTable)) return error('The given database table name is not valid', EXIT_MODEL);
+
+		$delete = $this->db->delete($this->dbTable, $where);
+
+		if ($delete)
+		{
+			return success();
+		}
+		else
+		{
+			return error($this->db->error(), EXIT_DATABASE);
+		}
+	}
+
+	public function getLvsForPrestudent($prestudent_id, $studiensemester_kurzbz)
+	{
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('a.prestudent_id');
+		$this->addSelect('lv.bezeichnung as lv_bezeichnung');
+		$this->addSelect('stat.insertamum as freigabedatum');
+		$this->addSelect('n.bezeichnung as note_bezeichnung');
+		$this->addSelect('stg.bezeichnung as stg_bezeichnung');
+
+		$this->addJoin('campus.tbl_studierendenantrag a', 'studierendenantrag_id');
+		$this->addJoin('lehre.tbl_note n', 'note');
+		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
+		$this->addJoin('public.tbl_studiengang stg', 'ps.studiengang_kz = stg.studiengang_kz');
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_status stat',
+			'stat.studierendenantrag_status_id = campus.get_status_id_studierendenantrag(a.studierendenantrag_id)'
+		);
+		$this->addJoin('public.tbl_student s', 'prestudent_id');
+		$this->addJoin('lehre.tbl_zeugnisnote z', 'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid AND z.studiensemester_kurzbz=a.studiensemester_kurzbz', 'LEFT');
+
+		return $this->loadWhere([
+			'ps.prestudent_id' => $prestudent_id,
+			'a.typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
+			'stat.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
+			'n.note <> ' => 0,
+			$this->dbTable . '.studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'(n.note<>19 OR z.note IS NOT NULL)' => null
+		]);
+	}
+}
diff --git a/application/models/education/Studierendenantragstatus_model.php b/application/models/education/Studierendenantragstatus_model.php
new file mode 100644
index 000000000..6994c4624
--- /dev/null
+++ b/application/models/education/Studierendenantragstatus_model.php
@@ -0,0 +1,52 @@
+<?php
+class Studierendenantragstatus_model extends DB_Model
+{
+
+	const STATUS_CREATED = 'Erstellt';
+	const STATUS_CREATED_STGL = 'ErstelltStgl';
+	const STATUS_APPROVED = 'Genehmigt';
+	const STATUS_APPROVED_STGL = 'GenehmigtStgl';
+	const STATUS_REJECTED = 'Abgelehnt';
+	const STATUS_PASS = 'Verzichtet';
+	const STATUS_REOPENED = 'Offen';
+	const STATUS_CANCELLED = 'Zurückgezogen';
+	const STATUS_LVSASSIGNED = 'Lvszugewiesen';
+	const STATUS_REMINDERSENT = 'EmailVersandt';
+	const STATUS_REQUESTSENT_1 = 'ErsteAufforderungVersandt';
+	const STATUS_REQUESTSENT_2 = 'ZweiteAufforderungVersandt';
+	const STATUS_OBJECTED = 'Beeinsprucht';
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'campus.tbl_studierendenantrag_status';
+		$this->pk = 'studierendenantrag_status_id';
+	}
+
+	public function loadWithTyp($studierendenantrag_status_id)
+	{
+		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
+
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('bezeichnung[(' . $lang . ')] AS typ');
+
+		$this->addJoin('campus.tbl_studierendenantrag_statustyp', 'studierendenantrag_statustyp_kurzbz');
+
+		return $this->load($studierendenantrag_status_id);
+	}
+
+	public function loadWithTypWhere($where)
+	{
+		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
+
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('bezeichnung[(' . $lang . ')] AS typ');
+
+		$this->addJoin('campus.tbl_studierendenantrag_statustyp', 'studierendenantrag_statustyp_kurzbz');
+
+		return $this->loadWhere($where);
+	}
+}
diff --git a/application/models/education/Zeugnisnote_model.php b/application/models/education/Zeugnisnote_model.php
index a4185a7f4..b4d909e37 100644
--- a/application/models/education/Zeugnisnote_model.php
+++ b/application/models/education/Zeugnisnote_model.php
@@ -102,7 +102,7 @@ class Zeugnisnote_model extends DB_Model
 				JOIN lehre.tbl_zeugnisnote zgnisnote USING (student_uid)
 				JOIN lehre.tbl_note note ON zgnisnote.note = note.note
 				JOIN lehre.tbl_lehrveranstaltung lv USING (lehrveranstaltung_id)
-				JOIN public.tbl_studiengang stg ON prst.studiengang_kz = stg.studiengang_kz 
+				JOIN public.tbl_studiengang stg ON prst.studiengang_kz = stg.studiengang_kz
 				WHERE pers.person_id = ?
 				AND zgnisnote.studiensemester_kurzbz = ?";
 
@@ -140,4 +140,83 @@ class Zeugnisnote_model extends DB_Model
 
 		return $this->execQuery($qry, $params);
 	}
+
+	/**
+	 * Gets courses (Zeugnisnoten) for a student.
+	 * @param string $student_uid,
+	 * @param string $studiensemester_kurzbz
+	 *
+	 * @return object
+	 */
+	public function getZeugnisnoten($student_uid, $studiensemester_kurzbz)
+	{
+		$params = array();
+		$where='';
+
+		if ($student_uid != null)
+		{
+			$where .= " AND uid=?";
+			$params[] = $student_uid;
+		}
+		if ($studiensemester_kurzbz !=null)
+		{
+			$where.=" AND vw_student_lehrveranstaltung.studiensemester_kurzbz= ?";
+			$params[] = $studiensemester_kurzbz;
+		}
+
+		$where2='';
+
+		if ($student_uid != null)
+		{
+			$where2 .= " AND student_uid=?";
+			$params[] = $student_uid;
+		}
+		if ($studiensemester_kurzbz !=null)
+		{
+			$where2 .= " AND studiensemester_kurzbz= ?";
+			$params[] = $studiensemester_kurzbz;
+		}
+
+		$qry = "SELECT vw_student_lehrveranstaltung.lehrveranstaltung_id, uid,
+					   vw_student_lehrveranstaltung.studiensemester_kurzbz, note, punkte, uebernahmedatum, benotungsdatum,
+					   vw_student_lehrveranstaltung.ects, vw_student_lehrveranstaltung.semesterstunden,
+					   tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum,
+					   tbl_zeugnisnote.insertvon, tbl_zeugnisnote.ext_id,
+					   vw_student_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung,
+					   vw_student_lehrveranstaltung.bezeichnung_english as lehrveranstaltung_bezeichnung_english,
+					   tbl_note.bezeichnung as note_bezeichnung,
+					   tbl_note.positiv as note_positiv,
+					   tbl_zeugnisnote.bemerkung as bemerkung,
+					   vw_student_lehrveranstaltung.sort,
+					   vw_student_lehrveranstaltung.zeugnis,
+					   vw_student_lehrveranstaltung.studiengang_kz,
+					   vw_student_lehrveranstaltung.lv_lehrform_kurzbz,
+					   tbl_lehrveranstaltung.sws
+				FROM
+				(
+					campus.vw_student_lehrveranstaltung LEFT JOIN lehre.tbl_zeugnisnote
+						ON(uid=student_uid
+						   AND vw_student_lehrveranstaltung.studiensemester_kurzbz=tbl_zeugnisnote.studiensemester_kurzbz
+						   AND vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_zeugnisnote.lehrveranstaltung_id
+						  )
+				) LEFT JOIN lehre.tbl_note USING(note)
+				JOIN lehre.tbl_lehrveranstaltung ON(vw_student_lehrveranstaltung.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id)
+				WHERE true $where
+
+				UNION
+				SELECT lehre.tbl_lehrveranstaltung.lehrveranstaltung_id,student_uid AS uid,studiensemester_kurzbz, note, punkte,
+					uebernahmedatum, benotungsdatum,lehre.tbl_lehrveranstaltung.ects,lehre.tbl_lehrveranstaltung.semesterstunden, tbl_zeugnisnote.updateamum, tbl_zeugnisnote.updatevon, tbl_zeugnisnote.insertamum,
+					tbl_zeugnisnote.insertvon, tbl_zeugnisnote.ext_id, lehre.tbl_lehrveranstaltung.bezeichnung as lehrveranstaltung_bezeichnung, lehre.tbl_lehrveranstaltung.bezeichnung_english as lehrveranstaltung_bezeichnung_english,
+					tbl_note.bezeichnung as note_bezeichnung, tbl_note.positiv as note_positiv, tbl_zeugnisnote.bemerkung as bemerkung, tbl_lehrveranstaltung.sort, tbl_lehrveranstaltung.zeugnis, tbl_lehrveranstaltung.studiengang_kz,
+					tbl_lehrveranstaltung.lehrform_kurzbz as lv_lehrform_kurzbz, tbl_lehrveranstaltung.sws
+				FROM
+					lehre.tbl_zeugnisnote
+					JOIN lehre.tbl_lehrveranstaltung USING (lehrveranstaltung_id)
+					JOIN lehre.tbl_note USING(note)
+				WHERE true $where2
+
+				ORDER BY sort";
+
+		return $this->execQuery($qry, $params);
+	}
 }
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index f4f8b3c9e..ea9e5857e 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -511,10 +511,10 @@ class Studiengang_model extends DB_Model
 	public function getStudiengangTyp($studiengang_kz, $typ = null)
 	{
 		$query = "SELECT DISTINCT(sgt.*)
-					FROM tbl_studiengangstyp sgt JOIN tbl_studiengang sg on sgt.typ = sg.typ 
+					FROM tbl_studiengangstyp sgt JOIN tbl_studiengang sg on sgt.typ = sg.typ
 					WHERE studiengang_kz IN ?";
 
-		$params[] = $studiengang_kz;
+		$params = [$studiengang_kz];
 
 		if (!is_null($typ))
 		{
@@ -524,4 +524,53 @@ class Studiengang_model extends DB_Model
 
 		return $this->execQuery($query, $params);
 	}
+
+	/**
+	 * @param array		$studiengang_kzs
+	 * @param array		$not_antrag_typ		(optional) If the prestudent has an antrag with one of the specified types it will be excluded from the result
+	 * @param array		$prestudent_stati	(optional)
+	 *
+	 * @return stdClass
+	 */
+	public function getAktivePrestudenten($studiengang_kzs, $not_antrag_typ = null)
+	{
+		$this->load->config('studierendenantrag');
+
+		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
+
+		$this->addSelect($this->dbTable . '.studiengang_kz');
+		$this->addSelect($this->dbTable . '.bezeichnung');
+		$this->addSelect('o.orgform_kurzbz');
+		$this->addSelect('o.bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform', false);
+		$this->addSelect('ps.ausbildungssemester AS semester');
+		$this->addSelect('ps.studiensemester_kurzbz');
+		$this->addSelect('p.prestudent_id');
+		$this->addSelect('pers.vorname');
+		$this->addSelect('pers.nachname');
+
+		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
+		$this->addJoin(
+			'public.tbl_prestudentstatus ps',
+			'ps.prestudent_id=p.prestudent_id
+				AND ps.studiensemester_kurzbz=get_stdsem_prestudent(p.prestudent_id, NULL)
+				AND ps.ausbildungssemester=get_absem_prestudent(p.prestudent_id, NULL)
+				AND ps.status_kurzbz=get_rolle_prestudent(p.prestudent_id, NULL)'
+		);
+		$this->addJoin('bis.tbl_orgform o', $this->dbTable . '.orgform_kurzbz=o.orgform_kurzbz');
+		$this->addJoin('public.tbl_person pers', 'person_id');
+
+		$this->db->where_in($this->dbTable . '.studiengang_kz', $studiengang_kzs);
+		$this->db->where_in('ps.status_kurzbz', $this->config->item('antrag_prestudentstatus_whitelist'));
+		$this->db->where($this->dbTable . ".aktiv", true);
+
+		if ($not_antrag_typ !== null && is_array($not_antrag_typ)) {
+			$this->addJoin('campus.tbl_studierendenantrag a', 'a.prestudent_id=p.prestudent_id', 'LEFT');
+			$this->db->group_start();
+			$this->db->where_not_in('a.typ', $not_antrag_typ);
+			$this->db->or_where('a.typ IS NULL');
+			$this->db->group_end();
+		}
+
+		return $this->load();
+	}
 }
diff --git a/application/models/organisation/Studienplan_model.php b/application/models/organisation/Studienplan_model.php
index 0cc23b85d..66ec06ba8 100644
--- a/application/models/organisation/Studienplan_model.php
+++ b/application/models/organisation/Studienplan_model.php
@@ -45,7 +45,7 @@ class Studienplan_model extends DB_Model
 			$whereArray["tbl_studienplan.sprache"] = $sprache;
 		}
 
-		return $this->StudienplanModel->loadWhere($whereArray);
+		return $this->loadWhere($whereArray);
 	}
 
 	public function getStudienplanLehrveranstaltung($studienplan_id, $semester)
@@ -53,6 +53,38 @@ class Studienplan_model extends DB_Model
 		$this->addJoin('lehre.tbl_studienplan_lehrveranstaltung', 'studienplan_id');
 		$this->addJoin('lehre.tbl_lehrveranstaltung', 'lehrveranstaltung_id');
 		$this->addOrder('tbl_lehrveranstaltung.sort');
+
+		return $this->loadWhere(array(
+			'studienplan_id' => $studienplan_id,
+			'tbl_studienplan_lehrveranstaltung.semester' => $semester
+		));
+	}
+
+	public function getStudienplanLehrveranstaltungForPrestudent($studienplan_id, $semester, $prestudent_id, $note_stsem)
+	{
+		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
+		$sql = 'SELECT student_uid FROM public.tbl_student WHERE prestudent_id=' . $this->escape($prestudent_id);
+
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('lv.*');
+		$this->addSelect('COALESCE(n.bezeichnung_mehrsprachig[(' . $lang . ')], NULL) AS note');
+		$this->addSelect('n.positiv');
+		$this->addSelect('lehre.tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id');
+		$this->addSelect('lehre.tbl_studienplan_lehrveranstaltung.sort plan_sort');
+		$this->addSelect('lehre.tbl_studienplan_lehrveranstaltung.studienplan_lehrveranstaltung_id_parent');
+
+		$this->addJoin('lehre.tbl_studienplan_lehrveranstaltung', 'studienplan_id');
+		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+		$this->addJoin(
+			'lehre.tbl_zeugnisnote zn',
+			'zn.lehrveranstaltung_id=lv.lehrveranstaltung_id AND zn.student_uid=(' . $sql . ') AND zn.studiensemester_kurzbz=' . $this->escape($note_stsem),
+			'LEFT'
+		);
+		$this->addJoin('lehre.tbl_note n', 'n.note=zn.note', 'LEFT');
+
+		$this->addOrder('lehre.tbl_studienplan_lehrveranstaltung.sort');
+		$this->addOrder('lv.sort');
+
 		return $this->loadWhere(array(
 			'studienplan_id' => $studienplan_id,
 			'tbl_studienplan_lehrveranstaltung.semester' => $semester
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index bb9b94c92..6daa76b59 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -204,4 +204,34 @@ class Studiensemester_model extends DB_Model
 
 		return $this->execQuery($query, array($studiensemester_kurzbz));
 	}
+
+	public function getFollowingSemester($studienplan_ids, $studiensemester_kurzbz, $ausbildungssemester)
+	{
+		$query = '
+			WITH RECURSIVE following(studiensemester_kurzbz, semester, start) AS (
+				SELECT studiensemester_kurzbz, ?, start
+				FROM public.tbl_studiensemester
+				WHERE studiensemester_kurzbz=?
+			UNION ALL
+				SELECT * FROM (
+					SELECT s.studiensemester_kurzbz, s.semester, ss.start
+					FROM lehre.tbl_studienplan_semester s
+					JOIN public.tbl_studiensemester ss USING(studiensemester_kurzbz)
+					INNER JOIN following a ON(s.semester=a.semester+1 AND ss.start > a.start)
+					WHERE studienplan_id IN ?
+					ORDER BY start ASC
+					LIMIT 1
+				) wrapper
+			)
+			SELECT sem.*, following.semester
+			FROM following
+			LEFT JOIN ' . $this->dbTable . ' sem USING(studiensemester_kurzbz)
+			ORDER BY start';
+
+		return $this->execQuery($query, [
+			$ausbildungssemester,
+			$studiensemester_kurzbz,
+			$studienplan_ids
+		]);
+	}
 }
diff --git a/application/models/person/Person_model.php b/application/models/person/Person_model.php
index 8875fd4c5..b946ad11f 100644
--- a/application/models/person/Person_model.php
+++ b/application/models/person/Person_model.php
@@ -335,4 +335,17 @@ class Person_model extends DB_Model
 
 		return $this->execQuery($qry, array($person_id, $person_id, $person_id));
 	}
+
+	public function loadPrestudent($prestudent_id)
+	{
+		$this->addSelect($this->dbTable . '.*');
+		
+		$this->addJoin('public.tbl_prestudent p', 'person_id');
+
+		$this->addLimit(1);
+
+		return $this->loadWhere([
+			'prestudent_id' => $prestudent_id
+		]);
+	}
 }
diff --git a/application/views/lehre/Antrag/Create.php b/application/views/lehre/Antrag/Create.php
new file mode 100644
index 000000000..87c9c3af6
--- /dev/null
+++ b/application/views/lehre/Antrag/Create.php
@@ -0,0 +1,54 @@
+<?php
+$sitesettings = array(
+	'title' => 'Antrag auf Änderung des Studierendenstatus',
+	'cis' => true,
+	'vue3' => true,
+	'axios027' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'phrases' => array(
+	),
+	'customJSModules' => array('public/js/apps/lehre/Antrag.js'),
+	'customCSSs' => array(
+		'public/css/Fhc.css',
+		'vendor/vuepic/vue-datepicker-css/main.css'
+	),
+	'customJSs' => array(
+	)
+);
+
+$this->load->view(
+	'templates/FHC-Header',
+	$sitesettings
+);
+?>
+
+<div id="wrapper">
+	<div class="fhc-header">
+		<h1 class="h2"><?= $this->p->t('studierendenantrag', 'antrag_header'); ?></h1>
+	</div>
+
+	<div class="fhc-container row">
+		<div class="col-sm-8 mb-3">
+			<studierendenantrag-antrag
+				prestudent-id="<?= $prestudent_id; ?>"
+				antrag-type="<?= $antrag_type; ?>"
+				studierendenantrag-id="<?= $studierendenantrag_id; ?>"
+				v-model:info-array="infoArray"
+				v-model:status-msg="statusMsg"
+				v-model:status-severity="statusSeverity"
+				>
+			</studierendenantrag-antrag>
+		</div>
+		<div class="col-sm-4 mb-3">
+			<studierendenantrag-status :msg="statusMsg" :severity="statusSeverity"></studierendenantrag-status>
+			<studierendenantrag-infoblock :infos="infoArray"></studierendenantrag-infoblock>
+		</div>
+	</div>
+</div>
+
+<?php
+$this->load->view(
+	'templates/FHC-Footer',
+	$sitesettings
+);
diff --git a/application/views/lehre/Antrag/Leitung/List.php b/application/views/lehre/Antrag/Leitung/List.php
new file mode 100644
index 000000000..a0c6cdab0
--- /dev/null
+++ b/application/views/lehre/Antrag/Leitung/List.php
@@ -0,0 +1,58 @@
+<?php
+
+use \DateTime as DateTime;
+
+$sitesettings = array(
+	'title' => 'Anträge auf Änderung des Studierendenstatus',
+	'cis' => true,
+	'vue3' => true,
+	'axios027' => true,
+	'bootstrap5' => true,
+	'tabulator5' => true,
+	'fontawesome6' => true,
+	'primevue3' => true,
+	'phrases' => array(
+		'global',
+		'studierendenantrag',
+		'lehre',
+		'person',
+	),
+	'customJSModules' => array('public/js/apps/lehre/Antrag/Leitung.js'),
+	'customCSSs' => array(
+		'public/css/Fhc.css'
+	),
+	'customJSs' => array(
+	)
+);
+
+$this->load->view(
+	'templates/FHC-Header',
+	$sitesettings
+);
+?>
+
+<div id="wrapper">
+	<div class="fhc-header">
+		<h1><?= $this->p->t('studierendenantrag', 'antraege_header'); ?></h1>
+	</div>
+
+	<div class="fhc-container row">
+		<div class="col-xs-8">
+
+			<studierendenantrag-leitung
+				:stg-a="<?= htmlspecialchars(json_encode(array_values($stgA))); ?>"
+				:stg-l="<?= htmlspecialchars(json_encode(array_values($stgL))); ?>"
+				>
+			</studierendenantrag-leitung>
+
+		</div>
+		<div class="col-xs-4">
+		</div>
+	</div>
+</div>
+
+<?php
+$this->load->view(
+	'templates/FHC-Footer',
+	$sitesettings
+);
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
new file mode 100644
index 000000000..26b0ec3f1
--- /dev/null
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -0,0 +1,151 @@
+<?php
+$sitesettings = array(
+	'title' => 'Antrag auf Änderung des Studierendenstatus',
+	'cis' => true,
+	'vue3' => true,
+	'axios027' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'phrases' => array(
+	),
+	'customJSModules' => array('public/js/apps/lehre/Antrag/Student.js'),
+	'customCSSs' => array(
+		'public/css/Fhc.css'
+	),
+	'customJSs' => array(
+	)
+);
+
+$this->load->view(
+	'templates/FHC-Header',
+	$sitesettings
+);
+?>
+
+<div id="wrapper">
+
+	<div class="fhc-header">
+		<h1 class="h2"><?= $this->p->t('studierendenantrag', 'antraege_header'); ?></h1>
+	</div>
+
+	<div class="fhc-container row">
+		<div class="col-xs-8">
+			<?php if ($antraege) { ?>
+				<?php foreach($antraege as $prestudent_id => $array){ ?>
+					<h4><?= $array['bezeichnungStg']; ?> (<?= $array['bezeichnungOrgform']; ?>)</h4>
+					<?php switch(count($array['allowedNewTypes'])) {
+						case 0: ?>
+							<button class="btn btn-outline-secondary" type="button" disabled>
+								<i class="fa-regular fa-plus fa-xl"></i> <?= $this->p->t('studierendenantrag', 'btn_new'); ?>
+							</button>
+							<?php
+							break;
+						case 1:
+						?>
+							<a class="btn btn-outline-secondary" href="<?= site_url('lehre/Studierendenantrag/' . strtolower($array['allowedNewTypes'][0]) . '/' . $prestudent_id); ?>"><i class="fa-regular fa-plus fa-xl"></i> <?= $array['allowedNewTypes'][0]; ?> <?= $this->p->t('studierendenantrag', 'btn_new'); ?></a>
+							<?php
+							break;
+						default:
+						?>
+						<div class="dropdown">
+							<button class="btn btn-outline-secondary dropdown-toggle" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
+								<i class="fa-regular fa-plus fa-xl"></i> <?= $this->p->t('studierendenantrag', 'btn_new'); ?>
+							</button>
+							<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
+								<?php foreach($array['allowedNewTypes'] as $type){ ?>
+									<li><a class="dropdown-item" href="<?= site_url('lehre/Studierendenantrag/' . strtolower($type) . '/' . $prestudent_id); ?>"><?= $this->p->t('studierendenantrag', 'antrag_typ_' . $type); ?></a></li>
+								<?php } ?>
+							</ul>
+						</div>
+					<?php } ?>
+
+					<table class="table">
+						<thead>
+							<tr>
+								<th>#</th>
+								<th><?= $this->p->t('studierendenantrag', 'antrag_typ'); ?></th>
+								<th><?= $this->p->t('studierendenantrag', 'antrag_status'); ?></th>
+								<th><?= $this->p->t('studierendenantrag', 'antrag_studiensemester'); ?></th>
+								<th><?= $this->p->t('studierendenantrag', 'antrag_erstelldatum'); ?></th>
+								<th><?= $this->p->t('studierendenantrag', 'antrag_datum_wiedereinstieg'); ?></th>
+								<th><?= $this->p->t('studierendenantrag', 'antrag_grund'); ?></th>
+								<th><?= $this->p->t('studierendenantrag', 'antrag_dateianhaenge'); ?></th>
+								<th>&nbsp;</th>
+							</tr>
+						</thead>
+						<tbody>
+							<?php foreach($array['antraege'] as $antrag){ ?>
+							<tr>
+								<td><?= $antrag->studierendenantrag_id; ?></td>
+								<td><?= $this->p->t('studierendenantrag', 'antrag_typ_' . $antrag->typ); ?></td>
+								<td><?= $antrag->status_bezeichnung; ?></td>
+								<td><?= $antrag->studiensemester_kurzbz; ?></td>
+								<td><?= (new DateTime($antrag->datum))->format('d.m.Y'); ?></td>
+								<td><?= $antrag->datum_wiedereinstieg ? (new DateTime($antrag->datum_wiedereinstieg))->format('d.m.Y') : ''; ?></td>
+								<td><!-- Button trigger modal -->
+									<?php if($antrag->grund){ ?>
+									<a href="#modalgrund<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal">
+										<?= $this->p->t('studierendenantrag', 'antrag_grund'); ?>
+									</a>
+
+									<!-- Modal -->
+									<div class="modal fade" id="modalgrund<?= $antrag->studierendenantrag_id; ?>" tabindex="-1" aria-labelledby="modalgrundLabel<?= $antrag->studierendenantrag_id; ?>" aria-hidden="true">
+										<div class="modal-dialog modal-dialog modal-lg">
+											<div class="modal-content">
+												<div class="modal-header">
+													<h5 class="modal-title" id="modalgrundLabel<?= $antrag->studierendenantrag_id; ?>"><?= $this->p->t('studierendenantrag', 'antrag_grund'); ?></h5>
+													<button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+												</div>
+												<div class="modal-body">
+													<pre><?= $antrag->grund; ?></pre>
+												</div>
+											</div>
+										</div>
+									</div>
+									<?php } ?>
+								</td>
+								<td>
+									<?php if($antrag->dms_id) {?>
+									<a
+										class="text-decoration-none"
+										href="<?= site_url('lehre/Antrag/Attachment/show/' . $antrag->dms_id) ?>"
+										target="_blank">
+										<i class="fa fa-paperclip" aria-hidden="true"></i> <?= $this->p->t('studierendenantrag', 'antrag_anhang'); ?>
+									</a>
+									<?php } ?>
+								</td>
+								<td>
+									<a href="<?= site_url('lehre/Studierendenantrag/' . strtolower($antrag->typ) . '/' . $antrag->prestudent_id . '/' . $antrag->studierendenantrag_id); ?>"><i class="fa-solid fa-pen" title="<?= $this->p->t('studierendenantrag', 'btn_edit'); ?>"></i></a>
+									<?php if ($antrag->typ != Studierendenantrag_model::TYP_WIEDERHOLUNG && $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED) { ?>
+										<a class="ms-2" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' . $antrag->typ . '.xml.php&xsl=Antrag' . $antrag->typ . '&id=' . $antrag->studierendenantrag_id . '&uid=' . getAuthUID()); ?>"><i class="fa-solid fa-download" title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"></i></a>
+									<?php } ?>
+									<?php if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG && $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED) { ?>
+										<a class="btn btn-outline-secondary" href="#modalgrund<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal">
+											<?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?>
+										</a>
+										<lv-popup id="modalgrund<?= $antrag->studierendenantrag_id; ?>" antrag-id = "<?= $antrag->studierendenantrag_id; ?>">
+											<?= $this->p->t('studierendenantrag', 'my_lvs'); ?>
+										</lv-popup>
+									<?php } ?>
+								</td>
+							</tr>
+							<?php } ?>
+						</tbody>
+					</table>
+				<?php } ?>
+			<?php } else { ?>
+				<p class="alert alert-danger" role="alert">
+					<?= $this->p->t('studierendenantrag', 'error_no_student'); ?>
+				</p>
+			<?php } ?>
+		</div>
+		<div class="col-xs-4">
+		</div>
+	</div>
+</div>
+
+<?php
+$this->load->view(
+	'templates/FHC-Footer',
+	$sitesettings
+);
diff --git a/application/views/lehre/Antrag/Wiederholung/Student.php b/application/views/lehre/Antrag/Wiederholung/Student.php
new file mode 100644
index 000000000..1aa72ee69
--- /dev/null
+++ b/application/views/lehre/Antrag/Wiederholung/Student.php
@@ -0,0 +1,43 @@
+<?php
+$sitesettings = array(
+	'title' => 'Antrag Wiederholung vom Studium',
+	'cis' => true,
+	'vue3' => true,
+	'axios027' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'tabulator5' => true,
+	'phrases' => array(
+		'ui',
+		'lehre',
+		'global'
+	),
+	'customJSModules' => array('public/js/apps/lehre/Antrag/Lvzuweisung.js'),
+	'customCSSs' => array(
+	),
+	'customJSs' => array(
+	)
+);
+
+$this->load->view(
+	'templates/FHC-Header',
+	$sitesettings
+);
+?>
+
+<div id="wrapper" class="overflow-hidden">
+	<?php if (!$frame) { ?>
+	<div class="fhc-header">
+		<h1 class="h2"><?= $this->p->t('studierendenantrag', 'title_lvzuweisen', ['name' => $antrag->name]);?></h1>
+	</div>
+	<?php } ?>
+	<div class="fhc-container row mt-3">
+		<lv-zuweisung antrag-id="<?= $antrag_id; ?>" initial-status-code="<?= $antrag->status; ?>" initial-status-msg="<?= $antrag->statustyp; ?>"<?= ($antrag->status != Studierendenantragstatus_model::STATUS_CREATED && $antrag->status != Studierendenantragstatus_model::STATUS_LVSASSIGNED) ? ' disabled' : ''; ?>></lv-zuweisung>
+	</div>
+</div>
+
+<?php
+$this->load->view(
+	'templates/FHC-Footer',
+	$sitesettings
+);
diff --git a/application/views/lehre/Antrag/Wiederholung/getLvs.rdf.php b/application/views/lehre/Antrag/Wiederholung/getLvs.rdf.php
new file mode 100644
index 000000000..24eb1e23f
--- /dev/null
+++ b/application/views/lehre/Antrag/Wiederholung/getLvs.rdf.php
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:NOTE="<?= $url; ?>/rdf#"
+>
+<?php if($lvs) { ?>
+	<RDF:Seq about="<?= $url; ?>/liste">
+		<?php foreach($lvs as $row) { ?>
+			<?php $freigabedatum = new DateTime($row->freigabedatum); ?>
+			<?php $benotungsdatum = new DateTime($row->insertamum); ?>
+			<RDF:li>
+					<RDF:Description  id="<?= $row->studierendenantrag_lehrveranstaltung_id; ?>/<?= $row->prestudent_id; ?>/<?= $row->studiensemester_kurzbz; ?>"  about="<?= $url; ?>/<?= $row->studierendenantrag_lehrveranstaltung_id; ?>/<?= $row->prestudent_id; ?>/<?= $row->studiensemester_kurzbz; ?>" >
+						<NOTE:studierendenantrag_lehrveranstaltung_id><![CDATA[<?= $row->studierendenantrag_lehrveranstaltung_id; ?>]]></NOTE:studierendenantrag_lehrveranstaltung_id>
+						<NOTE:lehrveranstaltung_id><![CDATA[<?= $row->lehrveranstaltung_id; ?>]]></NOTE:lehrveranstaltung_id>
+						<NOTE:prestudent_id><![CDATA[<?= $row->prestudent_id; ?>]]></NOTE:prestudent_id>
+						<NOTE:mitarbeiter_uid><![CDATA[<?= $row->insertvon; ?>]]></NOTE:mitarbeiter_uid>
+						<NOTE:studiensemester_kurzbz><![CDATA[<?= $row->studiensemester_kurzbz; ?>]]></NOTE:studiensemester_kurzbz>
+						<NOTE:note><![CDATA[<?= $row->note; ?>]]></NOTE:note>
+						<NOTE:freigabedatum_iso><![CDATA[<?= $freigabedatum->format('c'); ?>]]></NOTE:freigabedatum_iso>
+						<NOTE:freigabedatum><![CDATA[<?= $freigabedatum->format('d.m.Y'); ?>]]></NOTE:freigabedatum>
+						<NOTE:benotungsdatum_iso><![CDATA[<?= $benotungsdatum->format('c'); ?>]]></NOTE:benotungsdatum_iso>
+						<NOTE:benotungsdatum><![CDATA[<?= $benotungsdatum->format('d.m.Y'); ?>]]></NOTE:benotungsdatum>
+						<NOTE:note_bezeichnung><![CDATA[<?= $row->note_bezeichnung; ?>]]></NOTE:note_bezeichnung>
+						<NOTE:lehrveranstaltung_bezeichnung><![CDATA[<?= $row->lv_bezeichnung; ?>]]></NOTE:lehrveranstaltung_bezeichnung>
+						<NOTE:studiengang><![CDATA[<?= $row->stg_bezeichnung; ?>]]></NOTE:studiengang>
+					</RDF:Description>
+			</RDF:li>
+		<?php } ?>
+	</RDF:Seq>
+<?php } ?>
+</RDF:RDF>
diff --git a/application/views/lehre/Antrag/Wiederholung/moveLvs.rdf.php b/application/views/lehre/Antrag/Wiederholung/moveLvs.rdf.php
new file mode 100644
index 000000000..4ed31218d
--- /dev/null
+++ b/application/views/lehre/Antrag/Wiederholung/moveLvs.rdf.php
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<RDF:RDF
+	xmlns:RDF="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+	xmlns:NC="http://home.netscape.com/NC-rdf#"
+	xmlns:DBDML="http://www.technikum-wien.at/dbdml/rdf#"
+>
+  <RDF:Seq RDF:about="http://www.technikum-wien.at/dbdml/msg">
+	<RDF:li>
+		<RDF:Description RDF:about="http://www.technikum-wien.at/dbdml/0" >
+			<DBDML:return><?= $return ? 'true' : 'false'; ?></DBDML:return>
+			<DBDML:errormsg><![CDATA[<?= implode("/n", $errormsg);?>]]></DBDML:errormsg>
+			<DBDML:warning><![CDATA[]]></DBDML:warning>
+			<DBDML:data><![CDATA[]]></DBDML:data>
+		</RDF:Description>
+	</RDF:li>
+  </RDF:Seq>
+</RDF:RDF>
diff --git a/application/views/templates/FHC-Common.php b/application/views/templates/FHC-Common.php
index dd1d8ae1c..0928f516a 100644
--- a/application/views/templates/FHC-Common.php
+++ b/application/views/templates/FHC-Common.php
@@ -34,6 +34,7 @@
 	// Internal resources
 	$ajaxlib = isset($ajaxlib) ? $ajaxlib : false;
 	$bootstrapper = isset($bootstrapper) ? $bootstrapper : false;
+	$cis = isset($cis) ? $cis : false;
 	$dialoglib = isset($dialoglib) ? $dialoglib : false;
 	$filtercomponent = isset($filtercomponent) ? $filtercomponent : false;
 	$filterwidget = isset($filterwidget) ? $filterwidget : false;
@@ -43,4 +44,3 @@
 	$tablewidget = isset($tablewidget) ? $tablewidget : false;
 	$udfs = isset($udfs) ? $udfs : false;
 	$widgets = isset($widgets) ? $widgets : false;
-
diff --git a/application/views/templates/FHC-Header.php b/application/views/templates/FHC-Header.php
index aa63541c5..b87a6e6d0 100644
--- a/application/views/templates/FHC-Header.php
+++ b/application/views/templates/FHC-Header.php
@@ -118,6 +118,9 @@
 			// HTML Widget CSS
 			if ($widgets === true) generateCSSsInclude('public/css/Widgets.css');
 
+			// CIS
+			if ($cis === true) generateCSSsInclude('public/css/cis_bs5.css');
+
 			// Eventually required CSS
 			generateCSSsInclude($customCSSs); // Eventually required CSS
 		?>
diff --git a/cis/private/pdfExport.php b/cis/private/pdfExport.php
index 4535ff74d..6db6f885a 100644
--- a/cis/private/pdfExport.php
+++ b/cis/private/pdfExport.php
@@ -144,6 +144,8 @@ if (isset($_GET['projektarbeit_id']))
 	$params .= '&projektarbeit_id='. $_GET['projektarbeit_id'];
 if (isset($_GET['betreuerart_kurzbz']))
 	$params .= '&betreuerart_kurzbz='. $_GET['betreuerart_kurzbz'];
+if (isset($_GET['id']))
+	$params .= '&id='. $_GET['id'];
 
 
 // Logeintrag bei Download von Zahlungsbestaetigungen
diff --git a/cis/private/profile/dokumente.php b/cis/private/profile/dokumente.php
index f75529561..16fc9a085 100644
--- a/cis/private/profile/dokumente.php
+++ b/cis/private/profile/dokumente.php
@@ -31,6 +31,7 @@ require_once('../../../include/akte.class.php');
 require_once('../../../include/datum.class.php');
 require_once('../../../include/benutzerberechtigung.class.php');
 require_once('../../../include/webservicelog.class.php');
+require_once('../../../include/studierendenantrag.class.php');
 
 $sprache = getSprache();
 $p = new phrasen($sprache);
@@ -228,6 +229,27 @@ echo '</SELECT><br /><br />';
 // Wenn es für das übergebene Studiensemester keinen PreStudentStatus gibt, werden nur Abschlussdokumente angezeigt 
 if (in_array($stsem, $stsem_arr))
 {
+	$studierendenantrag = new studierendenantrag();
+	if ($studierendenantrag->loadUserAntrag($student_studiengang->prestudent_id, $stsem) && $studierendenantrag->result) {
+		// TODO(chris): Phrasen!
+		echo '<h2>' . $p->t('tools/studierendenantrag') . '</h2>';
+		echo '<table class="tablesorter" style="width:auto;">
+				<thead>
+				<tr>
+					<th></th>
+					<th>'.$p->t('global/name').'</th>
+				</tr>
+				</thead>
+				<tbody><tr>';
+		foreach ($studierendenantrag->result as $antrag) {
+			$path = "../pdfExport.php?xsl=Antrag" . $antrag->typ . "&xml=Antrag" . $antrag->typ . ".xml.php&uid=" . $uid . "&id=" . $antrag->studierendenantrag_id;
+			echo '<td><img src="../../../skin/images/pdfpic.gif" /></td>';
+			echo '<td><a href="'.$path.'">' . $p->t('tools/studierendenantrag_' . $antrag->typ) . '</a></td>';
+		}
+		echo '</tr></tbody></table>';
+	}
+
+
 	$konto = new konto();
 	
 	$buchungstypen = array();
diff --git a/composer.json b/composer.json
index 825ed5625..739ee4492 100644
--- a/composer.json
+++ b/composer.json
@@ -26,6 +26,28 @@
 		"wiki": "https://wiki.fhcomplete.info/doku.php"
 	},
 	"repositories": [
+		{
+			"type": "package",
+			"package": {
+				"name": "vuepic/vue-datepicker-js",
+				"version": "4.0.0",
+				"dist": {
+					"url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/vue-datepicker.iife.js",
+					"type": "file"
+				}
+			}
+		},
+		{
+			"type": "package",
+			"package": {
+				"name": "vuepic/vue-datepicker-css",
+				"version": "4.0.0",
+				"dist": {
+					"url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/main.css",
+					"type": "file"
+				}
+			}
+		},
 		{
 			"type": "package",
 			"package": {
@@ -420,7 +442,9 @@
 		"twbs/bootstrap5": "5.1.*",
 
 		"vuejs/vuejs3": "3.2.33",
-		"vuejs/vuerouter4": "4.1.3"
+		"vuejs/vuerouter4": "4.1.3",
+		"vuepic/vue-datepicker-js": "4.*",
+		"vuepic/vue-datepicker-css": "4.*"
 	},
 	"config": {
 		"bin-dir": "vendor/bin"
@@ -432,4 +456,3 @@
 		"sebastian/phpcpd": "3.*"
 	}
 }
-
diff --git a/composer.lock b/composer.lock
index 72f13c76f..30d011aae 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "d530cc4d7bd81812535eb64e87ba04f4",
+    "content-hash": "03cfe5f5e33ab66a5009b6ffcb2c5fa0",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -35,6 +35,10 @@
             ],
             "description": "Defacto way to enable use of HTML5 sectioning elements in legacy Internet Explorer.",
             "homepage": "http://paulirish.com/2011/the-history-of-the-html5-shiv/",
+            "support": {
+                "issues": "https://github.com/aFarkas/html5shiv/issues",
+                "source": "https://github.com/aFarkas/html5shiv/tree/3.7.3"
+            },
             "time": "2015-07-20T20:04:00+00:00"
         },
         {
@@ -130,6 +134,16 @@
             "keywords": [
                 "qr code"
             ],
+            "support": {
+                "issues": "https://github.com/chillerlan/php-qrcode/issues",
+                "source": "https://github.com/chillerlan/php-qrcode/tree/v2.0.x"
+            },
+            "funding": [
+                {
+                    "url": "https://ko-fi.com/codemasher",
+                    "type": "ko_fi"
+                }
+            ],
             "time": "2020-04-12T07:38:35+00:00"
         },
         {
@@ -178,6 +192,10 @@
                 "helper",
                 "trait"
             ],
+            "support": {
+                "issues": "https://github.com/chillerlan/php-traits/issues",
+                "source": "https://github.com/chillerlan/php-traits"
+            },
             "abandoned": true,
             "time": "2018-06-22T00:30:47+00:00"
         },
@@ -218,6 +236,10 @@
             ],
             "description": "REST Server for the CodeIgniter framework",
             "homepage": "https://github.com/chriskacerguis/codeigniter-restserver",
+            "support": {
+                "issues": "https://github.com/chriskacerguis/codeigniter-restserver/issues",
+                "source": "https://github.com/chriskacerguis/codeigniter-restserver"
+            },
             "time": "2017-09-23T16:44:55+00:00"
         },
         {
@@ -236,6 +258,10 @@
             },
             "type": "library",
             "notification-url": "https://packagist.org/downloads/",
+            "support": {
+                "issues": "https://github.com/akiyatkin/tablesorter/issues",
+                "source": "https://github.com/akiyatkin/tablesorter/tree/master"
+            },
             "time": "2016-09-02T11:31:54+00:00"
         },
         {
@@ -269,6 +295,13 @@
             ],
             "description": "The CodeIgniter framework",
             "homepage": "https://codeigniter.com",
+            "support": {
+                "forum": "http://forum.codeigniter.com/",
+                "issues": "https://github.com/bcit-ci/CodeIgniter/issues",
+                "slack": "https://codeigniterchat.slack.com",
+                "source": "https://github.com/bcit-ci/CodeIgniter",
+                "wiki": "https://github.com/bcit-ci/CodeIgniter/wiki"
+            },
             "time": "2022-03-03T13:21:49+00:00"
         },
         {
@@ -573,6 +606,10 @@
             ],
             "description": "Shim repository for Angular.js",
             "homepage": "http://angularjs.org",
+            "support": {
+                "issues": "https://github.com/components/angular.js/issues",
+                "source": "https://github.com/components/angular.js/tree/master"
+            },
             "time": "2015-06-07T20:10:38+00:00"
         },
         {
@@ -615,6 +652,13 @@
             ],
             "description": "jQuery JavaScript Library",
             "homepage": "http://jquery.com",
+            "support": {
+                "forum": "http://forum.jquery.com",
+                "irc": "irc://irc.freenode.org/jquery",
+                "issues": "https://github.com/jquery/jquery/issues",
+                "source": "https://github.com/jquery/jquery",
+                "wiki": "http://docs.jquery.com/"
+            },
             "time": "2021-03-20T19:13:42+00:00"
         },
         {
@@ -700,6 +744,10 @@
                 }
             ],
             "description": "jQuery UI is a curated set of user interface interactions, effects, widgets, and themes built on top of the jQuery JavaScript Library. Whether you're building highly interactive web applications or you just need to add a date picker to a form control, jQuery UI is the perfect choice.",
+            "support": {
+                "issues": "https://github.com/components/jqueryui/issues",
+                "source": "https://github.com/components/jqueryui/tree/master"
+            },
             "time": "2016-09-16T05:47:55+00:00"
         },
         {
@@ -749,6 +797,10 @@
                 "captcha",
                 "security"
             ],
+            "support": {
+                "issues": "https://github.com/dapphp/securimage/issues",
+                "source": "https://github.com/dapphp/securimage/tree/master"
+            },
             "abandoned": true,
             "time": "2018-03-09T06:07:41+00:00"
         },
@@ -812,6 +864,12 @@
                 "rdfa",
                 "sparql"
             ],
+            "support": {
+                "forum": "http://groups.google.com/group/easyrdf/",
+                "irc": "irc://chat.freenode.net/easyrdf",
+                "issues": "http://github.com/njh/easyrdf/issues",
+                "source": "https://github.com/easyrdf/easyrdf/tree/0.9.1"
+            },
             "time": "2015-02-27T09:45:49+00:00"
         },
         {
@@ -890,6 +948,10 @@
                 "faker",
                 "fixtures"
             ],
+            "support": {
+                "issues": "https://github.com/fzaninotto/Faker/issues",
+                "source": "https://github.com/fzaninotto/Faker/tree/v1.9.2"
+            },
             "abandoned": true,
             "time": "2020-12-11T09:56:16+00:00"
         },
@@ -1012,6 +1074,10 @@
                 "json",
                 "schema"
             ],
+            "support": {
+                "issues": "https://github.com/justinrainbow/json-schema/issues",
+                "source": "https://github.com/justinrainbow/json-schema/tree/master"
+            },
             "time": "2014-08-25T02:48:14+00:00"
         },
         {
@@ -1046,6 +1112,10 @@
                 }
             ],
             "description": "A framework-agnostic PHP Implementation for generating simple forms based on json-schema",
+            "support": {
+                "issues": "https://github.com/kingsquare/json-schema-form/issues",
+                "source": "https://github.com/kingsquare/json-schema-form/tree/master"
+            },
             "time": "2014-07-10T12:27:19+00:00"
         },
         {
@@ -1106,6 +1176,10 @@
             "keywords": [
                 "markdown"
             ],
+            "support": {
+                "issues": "https://github.com/michelf/php-markdown/issues",
+                "source": "https://github.com/michelf/php-markdown/tree/lib"
+            },
             "time": "2015-03-01T12:03:08+00:00"
         },
         {
@@ -1153,20 +1227,24 @@
                 "uri",
                 "url"
             ],
+            "support": {
+                "issues": "https://github.com/lanthaler/IRI/issues",
+                "source": "https://github.com/lanthaler/IRI/tree/master"
+            },
             "time": "2014-01-21T13:43:39+00:00"
         },
         {
             "name": "ml/json-ld",
-            "version": "1.2.0",
+            "version": "1.2.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/lanthaler/JsonLD.git",
-                "reference": "c74a1aed5979ed1cfb1be35a55a305fd30e30b93"
+                "reference": "537e68e87a6bce23e57c575cd5dcac1f67ce25d8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/c74a1aed5979ed1cfb1be35a55a305fd30e30b93",
-                "reference": "c74a1aed5979ed1cfb1be35a55a305fd30e30b93",
+                "url": "https://api.github.com/repos/lanthaler/JsonLD/zipball/537e68e87a6bce23e57c575cd5dcac1f67ce25d8",
+                "reference": "537e68e87a6bce23e57c575cd5dcac1f67ce25d8",
                 "shasum": ""
             },
             "require": {
@@ -1202,7 +1280,11 @@
                 "JSON-LD",
                 "jsonld"
             ],
-            "time": "2020-06-16T17:45:06+00:00"
+            "support": {
+                "issues": "https://github.com/lanthaler/JsonLD/issues",
+                "source": "https://github.com/lanthaler/JsonLD/tree/1.2.1"
+            },
+            "time": "2022-09-29T08:45:17+00:00"
         },
         {
             "name": "moment/momentjs",
@@ -1262,6 +1344,14 @@
                 "sorting",
                 "table"
             ],
+            "support": {
+                "docs": "https://mottie.github.io/tablesorter/docs/index.html",
+                "email": "wowmotty@gmail.com",
+                "irc": "irc://irc.freenode.org/tablesorter",
+                "issues": "https://github.com/Mottie/tablesorter/issues",
+                "source": "https://github.com/Mottie/tablesorter",
+                "wiki": "https://github.com/Mottie/tablesorter/wiki"
+            },
             "time": "2020-03-03T13:46:03+00:00"
         },
         {
@@ -1312,6 +1402,10 @@
                 "rest",
                 "restful"
             ],
+            "support": {
+                "issues": "https://github.com/nategood/httpful/issues",
+                "source": "https://github.com/nategood/httpful/tree/v0.2.20"
+            },
             "time": "2015-10-26T16:11:30+00:00"
         },
         {
@@ -1365,6 +1459,12 @@
                 "plaintext",
                 "textile"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.net/textile",
+                "issues": "https://github.com/textile/php-textile/issues",
+                "source": "https://github.com/textile/php-textile",
+                "wiki": "https://github.com/textile/php-textile/wiki"
+            },
             "time": "2022-05-01T17:05:16+00:00"
         },
         {
@@ -1390,10 +1490,10 @@
         },
         {
             "name": "npm-asset/primevue",
-            "version": "3.15.0",
+            "version": "3.29.2",
             "dist": {
                 "type": "tar",
-                "url": "https://registry.npmjs.org/primevue/-/primevue-3.15.0.tgz"
+                "url": "https://registry.npmjs.org/primevue/-/primevue-3.29.2.tgz"
             },
             "type": "npm-asset",
             "license": [
@@ -1420,16 +1520,16 @@
         },
         {
             "name": "phpseclib/phpseclib",
-            "version": "2.0.37",
+            "version": "2.0.44",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpseclib/phpseclib.git",
-                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c"
+                "reference": "149f608243f8133c61926aae26ce67d2b22b37e5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
-                "reference": "c812fbb4d6b4d7f30235ab7298a12f09ba13b37c",
+                "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/149f608243f8133c61926aae26ce67d2b22b37e5",
+                "reference": "149f608243f8133c61926aae26ce67d2b22b37e5",
                 "shasum": ""
             },
             "require": {
@@ -1444,7 +1544,8 @@
                 "ext-gmp": "Install the GMP (GNU Multiple Precision) extension in order to speed up arbitrary precision integer arithmetic operations.",
                 "ext-libsodium": "SSH2/SFTP can make use of some algorithms provided by the libsodium-php extension.",
                 "ext-mcrypt": "Install the Mcrypt extension in order to speed up a few other cryptographic operations.",
-                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations."
+                "ext-openssl": "Install the OpenSSL extension in order to speed up a wide variety of cryptographic operations.",
+                "ext-xml": "Install the XML extension to load XML formatted public keys."
             },
             "type": "library",
             "autoload": {
@@ -1507,7 +1608,34 @@
                 "x.509",
                 "x509"
             ],
-            "time": "2022-04-04T04:57:45+00:00"
+            "support": {
+                "issues": "https://github.com/phpseclib/phpseclib/issues",
+                "source": "https://github.com/phpseclib/phpseclib/tree/2.0.44"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/terrafrost",
+                    "type": "github"
+                },
+                {
+                    "url": "https://www.patreon.com/phpseclib",
+                    "type": "patreon"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpseclib/phpseclib",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-06-13T08:41:47+00:00"
+        },
+        {
+            "name": "popperjs/core",
+            "version": "2.10.2",
+            "dist": {
+                "type": "file",
+                "url": "https://cdn.jsdelivr.net/npm/@popperjs/core@2.10.2/dist/umd/popper.min.js"
+            },
+            "type": "library"
         },
         {
             "name": "rmariuzzo/jquery-checkboxes",
@@ -1587,6 +1715,23 @@
                 "polyfill",
                 "portable"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-ctype/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T09:01:57+00:00"
         },
         {
@@ -1706,6 +1851,10 @@
             "keywords": [
                 "templating"
             ],
+            "support": {
+                "issues": "https://github.com/twigphp/Twig/issues",
+                "source": "https://github.com/twigphp/Twig/tree/1.x"
+            },
             "time": "2020-02-11T05:59:23+00:00"
         },
         {
@@ -1725,6 +1874,24 @@
                 "url": "https://unpkg.com/vue-router@4.1.3/dist/vue-router.global.js"
             },
             "type": "library"
+        },
+        {
+            "name": "vuepic/vue-datepicker-css",
+            "version": "4.0.0",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/main.css"
+            },
+            "type": "library"
+        },
+        {
+            "name": "vuepic/vue-datepicker-js",
+            "version": "4.0.0",
+            "dist": {
+                "type": "file",
+                "url": "https://unpkg.com/@vuepic/vue-datepicker@4.0.0/dist/vue-datepicker.iife.js"
+            },
+            "type": "library"
         }
     ],
     "packages-dev": [
@@ -1779,6 +1946,24 @@
                 "regex",
                 "regular expression"
             ],
+            "support": {
+                "issues": "https://github.com/composer/pcre/issues",
+                "source": "https://github.com/composer/pcre/tree/1.0.1"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2022-01-21T20:24:37+00:00"
         },
         {
@@ -1826,20 +2011,39 @@
                 "Xdebug",
                 "performance"
             ],
+            "support": {
+                "irc": "irc://irc.freenode.org/composer",
+                "issues": "https://github.com/composer/xdebug-handler/issues",
+                "source": "https://github.com/composer/xdebug-handler/tree/2.0.5"
+            },
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2022-02-24T20:20:32+00:00"
         },
         {
             "name": "nikic/php-parser",
-            "version": "v4.14.0",
+            "version": "v4.16.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/nikic/PHP-Parser.git",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1"
+                "reference": "19526a33fb561ef417e822e85f08a00db4059c17"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/34bea19b6e03d8153165d8f30bba4c3be86184c1",
-                "reference": "34bea19b6e03d8153165d8f30bba4c3be86184c1",
+                "url": "https://api.github.com/repos/nikic/PHP-Parser/zipball/19526a33fb561ef417e822e85f08a00db4059c17",
+                "reference": "19526a33fb561ef417e822e85f08a00db4059c17",
                 "shasum": ""
             },
             "require": {
@@ -1878,20 +2082,24 @@
                 "parser",
                 "php"
             ],
-            "time": "2022-05-31T20:59:12+00:00"
+            "support": {
+                "issues": "https://github.com/nikic/PHP-Parser/issues",
+                "source": "https://github.com/nikic/PHP-Parser/tree/v4.16.0"
+            },
+            "time": "2023-06-25T14:52:30+00:00"
         },
         {
             "name": "pdepend/pdepend",
-            "version": "2.10.3",
+            "version": "2.14.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/pdepend/pdepend.git",
-                "reference": "da3166a06b4a89915920a42444f707122a1584c9"
+                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/da3166a06b4a89915920a42444f707122a1584c9",
-                "reference": "da3166a06b4a89915920a42444f707122a1584c9",
+                "url": "https://api.github.com/repos/pdepend/pdepend/zipball/1121d4b04af06e33e9659bac3a6741b91cab1de1",
+                "reference": "1121d4b04af06e33e9659bac3a6741b91cab1de1",
                 "shasum": ""
             },
             "require": {
@@ -1925,26 +2133,42 @@
                 "BSD-3-Clause"
             ],
             "description": "Official version of pdepend to be handled with Composer",
-            "time": "2022-02-23T07:53:09+00:00"
+            "keywords": [
+                "PHP Depend",
+                "PHP_Depend",
+                "dev",
+                "pdepend"
+            ],
+            "support": {
+                "issues": "https://github.com/pdepend/pdepend/issues",
+                "source": "https://github.com/pdepend/pdepend/tree/2.14.0"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/pdepend/pdepend",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2023-05-26T13:15:18+00:00"
         },
         {
             "name": "phpmd/phpmd",
-            "version": "2.12.0",
+            "version": "2.13.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmd/phpmd.git",
-                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec"
+                "reference": "dad0228156856b3ad959992f9748514fa943f3e3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/c0b678ba71902f539c27c14332aa0ddcf14388ec",
-                "reference": "c0b678ba71902f539c27c14332aa0ddcf14388ec",
+                "url": "https://api.github.com/repos/phpmd/phpmd/zipball/dad0228156856b3ad959992f9748514fa943f3e3",
+                "reference": "dad0228156856b3ad959992f9748514fa943f3e3",
                 "shasum": ""
             },
             "require": {
                 "composer/xdebug-handler": "^1.0 || ^2.0 || ^3.0",
                 "ext-xml": "*",
-                "pdepend/pdepend": "^2.10.3",
+                "pdepend/pdepend": "^2.12.1",
                 "php": ">=5.3.9"
             },
             "require-dev": {
@@ -1997,20 +2221,31 @@
                 "phpmd",
                 "pmd"
             ],
-            "time": "2022-03-24T13:33:01+00:00"
+            "support": {
+                "irc": "irc://irc.freenode.org/phpmd",
+                "issues": "https://github.com/phpmd/phpmd/issues",
+                "source": "https://github.com/phpmd/phpmd/tree/2.13.0"
+            },
+            "funding": [
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/phpmd/phpmd",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-09-10T08:44:15+00:00"
         },
         {
             "name": "phpmetrics/phpmetrics",
-            "version": "v2.8.1",
+            "version": "v2.8.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpmetrics/PhpMetrics.git",
-                "reference": "e279f7317390f642339941b693359e9a181817a7"
+                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/e279f7317390f642339941b693359e9a181817a7",
-                "reference": "e279f7317390f642339941b693359e9a181817a7",
+                "url": "https://api.github.com/repos/phpmetrics/PhpMetrics/zipball/4b77140a11452e63c7a9b98e0648320bf6710090",
+                "reference": "4b77140a11452e63c7a9b98e0648320bf6710090",
                 "shasum": ""
             },
             "require": {
@@ -2061,7 +2296,11 @@
                 "quality",
                 "testing"
             ],
-            "time": "2022-03-24T10:19:51+00:00"
+            "support": {
+                "issues": "https://github.com/PhpMetrics/PhpMetrics/issues",
+                "source": "https://github.com/phpmetrics/PhpMetrics/tree/v2.8.2"
+            },
+            "time": "2023-03-08T15:03:36+00:00"
         },
         {
             "name": "phpunit/php-timer",
@@ -2110,6 +2349,10 @@
             "keywords": [
                 "timer"
             ],
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/php-timer/issues",
+                "source": "https://github.com/sebastianbergmann/php-timer/tree/master"
+            },
             "time": "2017-02-26T11:10:40+00:00"
         },
         {
@@ -2159,6 +2402,10 @@
                 "container-interop",
                 "psr"
             ],
+            "support": {
+                "issues": "https://github.com/php-fig/container/issues",
+                "source": "https://github.com/php-fig/container/tree/master"
+            },
             "time": "2017-02-14T16:28:37+00:00"
         },
         {
@@ -2206,6 +2453,9 @@
                 "psr",
                 "psr-3"
             ],
+            "support": {
+                "source": "https://github.com/php-fig/log/tree/1.1.4"
+            },
             "time": "2021-05-03T11:20:27+00:00"
         },
         {
@@ -2245,6 +2495,10 @@
             ],
             "description": "FinderFacade is a convenience wrapper for Symfony's Finder component.",
             "homepage": "https://github.com/sebastianbergmann/finder-facade",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/finder-facade/issues",
+                "source": "https://github.com/sebastianbergmann/finder-facade/tree/master"
+            },
             "abandoned": true,
             "time": "2017-11-18T17:31:49+00:00"
         },
@@ -2296,6 +2550,11 @@
             ],
             "description": "Copy/Paste Detector (CPD) for PHP code.",
             "homepage": "https://github.com/sebastianbergmann/phpcpd",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/phpcpd/issues",
+                "source": "https://github.com/sebastianbergmann/phpcpd/tree/master"
+            },
+            "abandoned": true,
             "time": "2017-11-16T08:49:28+00:00"
         },
         {
@@ -2339,6 +2598,10 @@
             ],
             "description": "Library that helps with managing the version number of Git-hosted PHP projects",
             "homepage": "https://github.com/sebastianbergmann/version",
+            "support": {
+                "issues": "https://github.com/sebastianbergmann/version/issues",
+                "source": "https://github.com/sebastianbergmann/version/tree/master"
+            },
             "time": "2016-10-03T07:35:21+00:00"
         },
         {
@@ -2390,6 +2653,11 @@
                 "phpcs",
                 "standards"
             ],
+            "support": {
+                "issues": "https://github.com/squizlabs/PHP_CodeSniffer/issues",
+                "source": "https://github.com/squizlabs/PHP_CodeSniffer",
+                "wiki": "https://github.com/squizlabs/PHP_CodeSniffer/wiki"
+            },
             "time": "2021-12-12T21:44:58+00:00"
         },
         {
@@ -2449,6 +2717,23 @@
             ],
             "description": "Symfony Config Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/config/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2516,6 +2801,23 @@
             ],
             "description": "Symfony Console Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/console/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2567,6 +2869,23 @@
             ],
             "description": "Symfony Debug Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/debug/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "abandoned": "symfony/error-handler",
             "time": "2020-10-24T10:57:07+00:00"
         },
@@ -2634,6 +2953,23 @@
             ],
             "description": "Symfony DependencyInjection Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/dependency-injection/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2679,6 +3015,23 @@
             ],
             "description": "Symfony Filesystem Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/filesystem/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-24T10:57:07+00:00"
         },
         {
@@ -2723,6 +3076,23 @@
             ],
             "description": "Symfony Finder Component",
             "homepage": "https://symfony.com",
+            "support": {
+                "source": "https://github.com/symfony/finder/tree/v3.4.47"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-11-16T17:02:08+00:00"
         },
         {
@@ -2786,6 +3156,23 @@
                 "portable",
                 "shim"
             ],
+            "support": {
+                "source": "https://github.com/symfony/polyfill-mbstring/tree/v1.19.0"
+            },
+            "funding": [
+                {
+                    "url": "https://symfony.com/sponsor",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/fabpot",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/symfony/symfony",
+                    "type": "tidelift"
+                }
+            ],
             "time": "2020-10-23T09:01:57+00:00"
         },
         {
@@ -2829,6 +3216,10 @@
             ],
             "description": "The classes contained within this repository extend the standard DOM to use exceptions at all occasions of errors instead of PHP warnings or notices. They also add various custom methods and shortcuts for convenience and to simplify the usage of DOM.",
             "homepage": "https://github.com/theseer/fDOMDocument",
+            "support": {
+                "issues": "https://github.com/theseer/fDOMDocument/issues",
+                "source": "https://github.com/theseer/fDOMDocument/tree/1.6.7"
+            },
             "abandoned": true,
             "time": "2022-01-25T23:10:35+00:00"
         }
@@ -2842,5 +3233,5 @@
         "php": ">=5.6.40"
     },
     "platform-dev": [],
-    "plugin-api-version": "2.3.0"
+    "plugin-api-version": "2.2.0"
 }
diff --git a/content/fas.xul.php b/content/fas.xul.php
index 80efdb2f9..abe7f613e 100644
--- a/content/fas.xul.php
+++ b/content/fas.xul.php
@@ -140,6 +140,8 @@ foreach($addon_obj->result as $addon)
   <command id="menu-dokumente-studienerfolgeng-allesemester-finanzamt:command" oncommand="StudentCreateStudienerfolg(event, 'StudienerfolgEng','finanzamt', '', 'true');"/>
   <command id="menu-dokumente-accountinfoblatt:command" oncommand="PrintAccountInfoBlatt(event);"/>
   <command id="menu-dokumente-zutrittskarte:command" oncommand="PrintZutrittskarte();"/>
+  <command id="menu-dokumente-antrag-abmeldung:command" oncommand="StudentPrintAntragAbmeldung(event);"/>
+  <command id="menu-dokumente-antrag-unterbrechung:command" oncommand="StudentPrintAntragUnterbrechung(event);"/>
   <command id="menu-dokumente-studienblatt:command" oncommand="PrintStudienblatt(event);"/>
   <command id="menu-dokumente-studienblatt_englisch:command" oncommand="PrintStudienblattEnglisch(event);"/>
   <command id="menu-dokumente-pruefungsprotokoll:command" oncommand="StudentAbschlusspruefungPrintPruefungsprotokollMultiple(event,'de');"/>
@@ -507,19 +509,38 @@ foreach($addon_obj->result as $addon)
                label     = "&menu-dokumente-zutrittskarte.label;"
                command   =  "menu-dokumente-zutrittskarte:command"
                accesskey = "&menu-dokumente-zutrittskarte.accesskey;"/>
+          <menu id="menu-dokumente-antrag" label="&menu-dokumente-antrag.label;" accesskey="&menu-dokumente-antrag.accesskey;">
+            <menupopup id="menu-dokumente-antrag-popup">
+              <menuitem
+                id        =  "menu-dokumente-antrag-abmeldung"
+                key       =  "menu-dokumente-antrag-abmeldung:key"
+                label     = "&menu-dokumente-antrag-abmeldung.label;"
+                command   =  "menu-dokumente-antrag-abmeldung:command"
+                accesskey = "&menu-dokumente-antrag-abmeldung.accesskey;"
+                />
+              <menuitem
+                id        =  "menu-dokumente-antrag-unterbrechung"
+                key       =  "menu-dokumente-antrag-unterbrechung:key"
+                label     = "&menu-dokumente-antrag-unterbrechung.label;"
+                command   =  "menu-dokumente-antrag-unterbrechung:command"
+                accesskey = "&menu-dokumente-antrag-unterbrechung.accesskey;"
+                />
+            </menupopup>
+          </menu>
           <menuseparator/>
           <menuitem
-               id        =  "menu-dokumente-inskriptionsbestaetigung"
-               key       =  "menu-dokumente-inskriptionsbestaetigung:key"
-               label     = "&menu-dokumente-inskriptionsbestaetigung.label;"
-               command   =  "menu-dokumente-inskriptionsbestaetigung:command"
-               accesskey = "&menu-dokumente-inskriptionsbestaetigung.accesskey;"/>
-		  <menuitem
+            id        =  "menu-dokumente-inskriptionsbestaetigung"
+            key       =  "menu-dokumente-inskriptionsbestaetigung:key"
+            label     = "&menu-dokumente-inskriptionsbestaetigung.label;"
+            command   =  "menu-dokumente-inskriptionsbestaetigung:command"
+            accesskey = "&menu-dokumente-inskriptionsbestaetigung.accesskey;"/>
+          <menuitem
 					  id        =  "menu-dokumente-inskriptionsbestaetigungeng"
 					  key       =  "menu-dokumente-inskriptionsbestaetigungeng:key"
 					  label     = "&menu-dokumente-inskriptionsbestaetigungeng.label;"
 					  command   =  "menu-dokumente-inskriptionsbestaetigungeng:command"
-					  accesskey = "&menu-dokumente-inskriptionsbestaetigungeng.accesskey;"/>
+					  accesskey = "&menu-dokumente-inskriptionsbestaetigungeng.accesskey;"
+            />
           <menuitem
                id        =  "menu-statistic-lehrauftraege"
                key       =  "menu-statistic-lehrauftraege:key"
diff --git a/content/student/studentnotenoverlay.xul.php b/content/student/studentnotenoverlay.xul.php
index 395667bd7..241bdf616 100644
--- a/content/student/studentnotenoverlay.xul.php
+++ b/content/student/studentnotenoverlay.xul.php
@@ -181,6 +181,8 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 	<vbox>
 		<spacer flex="1"/>
 		<button id="student-note-copy" label="&lt;=" style="font-weight: bold;" oncommand="StudentNotenMove();"/>
+		<spacer id="student-note-copy-antrag-spacer" flex="2"/>
+		<button id="student-note-copy-antrag" label="&lt;=" style="font-weight: bold;" oncommand="StudentNotenMoveFromAntrag();"/>
 		<spacer flex="1"/>
 	</vbox>
 
@@ -262,6 +264,83 @@ echo "<?xml-stylesheet href=\"".APP_ROOT."content/bindings.css\" type=\"text/css
 			</treechildren>
 		</template>
 	</tree>
+	<label id="student-antragnoten-tree-label" value="Wiederholung" hidden="true"/>
+	<tree id="student-antragnoten-tree" seltype="multi" hidecolumnpicker="false" flex="1"
+		datasources="rdf:null" ref="http://www.technikum-wien.at/antragnote/liste"
+		style="margin-bottom:5px;" height="100%" enableColumnDrag="true"
+		flags="dont-build-content"
+	>
+
+		<treecols>
+			<treecol id="student-antragnoten-tree-lehrveranstaltung_bezeichnung" label="Lehrveranstaltung" flex="2" hidden="false" primary="true"
+				class="sortDirectionIndicator"
+				sortActive="true"
+				sortDirection="ascending"
+				sort="rdf:http://www.technikum-wien.at/antragnote/rdf#lehrveranstaltung_bezeichnung"
+				onclick="StudentAntragNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-antragnoten-tree-note_bezeichnung" label="Note" flex="5" hidden="false"
+			   class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/antragnote/rdf#note_bezeichnung" onclick="StudentAntragNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-antragnoten-tree-mitarbeiter_uid" label="MitarbeiterInUID" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/antragnote/rdf#mitarbeiter_uid"  onclick="StudentAntragNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-antragnoten-tree-benotungsdatum" label="Benotungsdatum" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/antragnote/rdf#benotungsdatum_iso"  onclick="StudentAntragNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-antragnoten-tree-benotungsdatum-iso" label="BenotungsdatumISO" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/antragnote/rdf#benotungsdatum_iso"  onclick="StudentAntragNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-antragnoten-tree-freigabedatum" label="Freigabedatum" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/antragnote/rdf#freigabedatum_iso"  onclick="StudentAntragNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-antragnoten-tree-studiensemester_kurzbz" label="Studiensemester" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/antragnote/rdf#studiensemester_kurzbz"  onclick="StudentAntragNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-antragnoten-tree-note" label="NoteID" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/antragnote/rdf#note"  onclick="StudentAntragNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-antragnoten-tree-prestudent_id" label="PrestudentInID" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/antragnote/rdf#prestudent_id"  onclick="StudentAntragNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-antragnoten-tree-lehrveranstaltung_id" label="LehrveranstaltungID" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/antragnote/rdf#lehrveranstaltung_id"  onclick="StudentAntragNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+			<treecol id="student-antragnoten-tree-studierendenantrag_lehrveranstaltung_id" label="StudierendenantragLehrveranstaltungID" flex="2" hidden="true"
+				class="sortDirectionIndicator"
+				sort="rdf:http://www.technikum-wien.at/antragnote/rdf#studierendenantrag_lehrveranstaltung_id"  onclick="StudentAntragNotenTreeSort()"/>
+			<splitter class="tree-splitter"/>
+		</treecols>
+
+		<template>
+			<treechildren flex="1" >
+					<treeitem uri="rdf:*">
+					<treerow>
+						<treecell label="rdf:http://www.technikum-wien.at/antragnote/rdf#lehrveranstaltung_bezeichnung"/>
+						<treecell label="rdf:http://www.technikum-wien.at/antragnote/rdf#note_bezeichnung"/>
+						<treecell label="rdf:http://www.technikum-wien.at/antragnote/rdf#mitarbeiter_uid"/>
+						<treecell label="rdf:http://www.technikum-wien.at/antragnote/rdf#benotungsdatum"/>
+						<treecell label="rdf:http://www.technikum-wien.at/antragnote/rdf#benotungsdatum_iso"/>
+						<treecell label="rdf:http://www.technikum-wien.at/antragnote/rdf#freigabedatum"/>
+						<treecell label="rdf:http://www.technikum-wien.at/antragnote/rdf#studiensemester_kurzbz"/>
+						<treecell label="rdf:http://www.technikum-wien.at/antragnote/rdf#note"/>
+						<treecell label="rdf:http://www.technikum-wien.at/antragnote/rdf#prestudent_id"/>
+						<treecell label="rdf:http://www.technikum-wien.at/antragnote/rdf#lehrveranstaltung_id"/>
+						<treecell label="rdf:http://www.technikum-wien.at/antragnote/rdf#studierendenantrag_lehrveranstaltung_id"/>
+					</treerow>
+				</treeitem>
+			</treechildren>
+		</template>
+	</tree>
 	</vbox>
 </hbox>
 <hbox>
diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index d9686d5e3..8afe58929 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -47,6 +47,8 @@ var StudentNotenTreeDatasource; //Datasource des Noten Trees
 var StudentNotenSelectLehrveranstaltungID=null; //LehreinheitID des Noten Eintrages der nach dem Refresh markiert werden soll
 var StudentLvGesamtNotenTreeDatasource; //Datasource des Noten Trees
 var StudentLvGesamtNotenSelectLehrveranstaltungID=null; //LehreinheitID des Noten Eintrages der nach dem Refresh markiert werden soll
+var StudentAntragNotenTreeDatasource; //Datasource des Noten Trees
+var StudentAntragNotenSelectLehrveranstaltungID=null; //LehreinheitID des Noten Eintrages der nach dem Refresh markiert werden soll
 var StudentPruefungTreeDatasource; //Datasource des Pruefung Trees
 var StudentPruefungSelectID=null; //ID der Pruefung die nach dem Refresh markiert werden soll
 var StudentAnrechnungTreeDatasource; //Datasource des Anrechnung Trees
@@ -56,6 +58,7 @@ var StudentAkteTreeDatasource=null;
 var doublerebuildkonto='false';
 var StudentNotenTreeloaded=false;
 var StudentGesamtNotenTreeloaded=false;
+var StudentAntragNotenTreeloaded=false;
 // ********** Observer und Listener ************* //
 
 // ****
@@ -342,6 +345,54 @@ var StudentLvGesamtNotenTreeListener =
   }
 };
 
+// ****
+// * Observer fuer LvGesamtNoten Tree
+// * startet Rebuild nachdem das Refresh
+// * der datasource fertig ist
+// ****
+var StudentAntragNotenTreeSinkObserver =
+{
+	onBeginLoad : function(pSink) {},
+	onInterrupt : function(pSink) {},
+	onResume : function(pSink) {},
+	onError : function(pSink, pStatus, pError) {},
+	onEndLoad : function(pSink)
+	{
+		StudentAntragNotenTreeloaded=false;
+		netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+		var dsResources = StudentAntragNotenTreeDatasource.GetAllResources();
+		if (dsResources.hasMoreElements()) {
+			document.getElementById('student-antragnoten-tree').hidden = false;
+			document.getElementById('student-antragnoten-tree-label').hidden = false;
+			document.getElementById('student-note-copy-antrag').hidden = false;
+			document.getElementById('student-note-copy-antrag-spacer').hidden = false;
+		} else {
+			document.getElementById('student-antragnoten-tree').hidden = true;
+			document.getElementById('student-antragnoten-tree-label').hidden = true;
+			document.getElementById('student-note-copy-antrag').hidden = true;
+			document.getElementById('student-note-copy-antrag-spacer').hidden = true;
+		}
+		document.getElementById('student-antragnoten-tree').builder.rebuild();
+	}
+};
+
+// ****
+// * Nach dem Rebuild wird der Eintrag wieder
+// * markiert
+// ****
+var StudentAntragNotenTreeListener =
+{
+  willRebuild : function(builder) {  },
+  didRebuild : function(builder)
+  {
+  	  //timeout nur bei Mozilla notwendig da sonst die rows
+  	  //noch keine values haben. Ab Seamonkey funktionierts auch
+  	  //ohne dem setTimeout
+  	  StudentAntragNotenTreeloaded=true;
+      window.setTimeout(StudentAntragNotenTreeSelectID,10);
+  }
+};
+
 // ****
 // * Observer fuer Pruefung Tree
 // * startet Rebuild nachdem das Refresh
@@ -1604,6 +1655,36 @@ function StudentAuswahl()
 		lvgesamtnotentree.database.AddDataSource(StudentLvGesamtNotenTreeDatasource);
 		StudentLvGesamtNotenTreeDatasource.addXMLSinkObserver(StudentLvGesamtNotenTreeSinkObserver);
 		lvgesamtnotentree.builder.addListener(StudentLvGesamtNotenTreeListener);
+
+		// *** AntragNoten Tree MANU***
+		var antragnotentree = document.getElementById('student-antragnoten-tree');
+		// TODO(chris): semester übergeben
+		url='<?php echo APP_ROOT;?>index.ci.php/components/Antrag/Wiederholung/getLvsAsRdf/'+prestudent_id+"?"+gettimestamp();
+
+		try
+		{
+			StudentAntragNotenTreeDatasource.removeXMLSinkObserver(StudentAntragNotenTreeSinkObserver);
+			antragnotentree.builder.removeListener(StudentAntragNotenTreeListener);
+		}
+		catch(e)
+		{}
+
+		//Alte DS entfernen
+		var oldDatasources = antragnotentree.database.GetDataSources();
+		while(oldDatasources.hasMoreElements())
+		{
+			antragnotentree.database.RemoveDataSource(oldDatasources.getNext());
+		}
+		//Refresh damit die entfernten DS auch wirklich entfernt werden
+		antragnotentree.builder.rebuild();
+
+		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
+		StudentAntragNotenTreeDatasource = rdfService.GetDataSource(url);
+		StudentAntragNotenTreeDatasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
+		StudentAntragNotenTreeDatasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
+		antragnotentree.database.AddDataSource(StudentAntragNotenTreeDatasource);
+		StudentAntragNotenTreeDatasource.addXMLSinkObserver(StudentAntragNotenTreeSinkObserver);
+		antragnotentree.builder.addListener(StudentAntragNotenTreeListener);
 	}
 
 	// ***** KONTAKTE *****
@@ -4379,6 +4460,77 @@ function StudentNotenTreeSelectDifferent()
 	}
 }
 
+// ****
+// * Selectiert die Noten im AntragNoteTree welche nicht gleich denen
+// * im ZeugnisNoteTree sind
+// ****
+function StudentAntragNotenTreeSelectDifferent()
+{
+	var zeugnistree = document.getElementById("student-noten-tree");
+	var antragnotentree = document.getElementById("student-antragnoten-tree");
+	//bestehende markierung entfernen
+	antragnotentree.view.selection.clearSelection();
+
+	if(StudentNotenTreeloaded && StudentAntragNotenTreeloaded)
+	{
+		if(antragnotentree.view)
+			var antragitems = antragnotentree.view.rowCount; //Anzahl der Zeilen ermitteln
+		else
+			return false;
+
+		if(zeugnistree.view)
+			var zeugnisitems = zeugnistree.view.rowCount; //Anzahl der Zeilen ermitteln
+		else
+			return false;
+
+		for(var i=0;i<antragitems;i++)
+		{
+			//Daten aus AntragNotenTree holen
+			col = antragnotentree.columns ? antragnotentree.columns["student-antragnoten-tree-lehrveranstaltung_id"] : "student-antragnoten-tree-lehrveranstaltung_id";
+			var antraglehrveranstaltung_id=antragnotentree.view.getCellText(i,col);
+			col = antragnotentree.columns ? antragnotentree.columns["student-antragnoten-tree-note"] : "student-antragnoten-tree-note";
+			var antragnote=antragnotentree.view.getCellText(i,col);
+			col = antragnotentree.columns ? antragnotentree.columns["student-antragnoten-tree-benotungsdatum-iso"] : "student-antragnoten-tree-benotungsdatum-iso";
+			var antragbenotungsdatum=antragnotentree.view.getCellText(i,col);
+
+			found=false;
+			//Schauen ob die gleiche Zeile im Zeugnisnoten Tree vorkommt
+			for(var j=0;j<zeugnisitems;j++)
+			{
+				col = zeugnistree.columns ? zeugnistree.columns["student-noten-tree-lehrveranstaltung_id"] : "student-noten-tree-lehrveranstaltung_id";
+				var zeugnislehrveranstaltung_id=zeugnistree.view.getCellText(j,col);
+				col = zeugnistree.columns ? zeugnistree.columns["student-noten-tree-note"] : "student-noten-tree-note";
+				var zeugnisnote=zeugnistree.view.getCellText(j,col);
+				col = zeugnistree.columns ? zeugnistree.columns["student-noten-tree-benotungsdatum-iso"] : "student-noten-tree-benotungsdatum-iso";
+				var zeugnisbenotungsdatum=zeugnistree.view.getCellText(j,col);
+
+				if(zeugnislehrveranstaltung_id==antraglehrveranstaltung_id && zeugnisnote==antragnote && zeugnisbenotungsdatum==antragbenotungsdatum)
+				{
+					found=true;
+					break;
+				}
+
+				//Wenn das benotungsdatum im Zeugnis
+				//nach dem benotungsdatum des antrags liegt, dann wird die zeile auch nicht markiert.
+				//damit wird verhindert, dass pruefungsnoten die nur von der assistenz eingetragen wurden,
+				//durch den alten eintrag des antrags wieder ueberschrieben werden
+				if(zeugnislehrveranstaltung_id==antraglehrveranstaltung_id
+					&& zeugnisbenotungsdatum>antragbenotungsdatum)
+				{
+					found=true;
+					break;
+				}
+			}
+
+			if(!found)
+			{
+				//Zeile markieren
+				antragnotentree.view.selection.rangedSelect(i,i,true);
+			}
+		}
+	}
+}
+
 // ****
 // * Selectiert den Noten Eintrag nachdem der Tree
 // * rebuildet wurde.
@@ -4389,11 +4541,12 @@ function StudentLvGesamtNotenTreeSelectID()
 }
 
 // ***
-// * Disabled/Enabled die Nodenfelder
+// * Disabled/Enabled die Notenfelder
 // ***
 function StudentNoteDisableFields(val)
 {
 	document.getElementById('student-note-copy').disabled=val;
+	document.getElementById('student-note-copy-antrag').disabled=val;
 }
 
 // ***
@@ -4577,6 +4730,68 @@ function StudentNotenMove()
 	}
 }
 
+// ****
+// * Uebernimmt die Noten der Antraege fuer die Zeugnisnote
+// ****
+function StudentNotenMoveFromAntrag()
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('student-antragnoten-tree');
+
+	var start = new Object();
+	var end = new Object();
+	var numRanges = tree.view.selection.getRangeCount();
+	var paramList= '';
+	var i = 0;
+
+	var url = '<?php echo APP_ROOT ?>index.ci.php/components/Antrag/Wiederholung/moveLvsToZeugnis';
+	var req = new phpRequest(url,'','');
+
+	for (var t = 0; t < numRanges; t++)
+	{
+		tree.view.selection.getRangeAt(t,start,end);
+		for (var v = start.value; v <= end.value; v++)
+		{
+			col = tree.columns ? tree.columns["student-antragnoten-tree-studierendenantrag_lehrveranstaltung_id"] : "student-antragnoten-tree-studierendenantrag_lehrveranstaltung_id";
+			studierendenantrag_lehrveranstaltung_id = tree.view.getCellText(v,col);
+
+			req.add('studierendenantrag_lehrveranstaltung_id_'+i, studierendenantrag_lehrveranstaltung_id);
+			i++;
+		}
+	}
+	req.add('anzahl', i);
+
+	var uid = document.getElementById('student-detail-textbox-uid').value;
+	req.add('student_uid', uid);
+	
+	var txt = "?";
+	for(var q in req.parms) {
+		txt = txt+'&'+req.parms[q].name+'='+encodeURIComponent(req.parms[q].value);
+	}
+
+	var response = req.executePOST();
+
+	var val =  new ParseReturnValue(response)
+
+	if (!val.dbdml_return)
+	{
+		if(val.dbdml_errormsg=='')
+			alert(response);
+		else
+			alert(val.dbdml_errormsg);
+
+		StudentNotenTreeDatasource.Refresh(false); //non blocking
+		SetStatusBarText('Daten wurden gespeichert');
+		StudentNoteDetailDisableFields(true);
+	}
+	else
+	{
+		StudentNotenTreeDatasource.Refresh(false); //non blocking
+		SetStatusBarText('Daten wurden gespeichert');
+		StudentNoteDetailDisableFields(true);
+	}
+}
+
 // ****
 // * Loescht die markierte Note
 // ****
@@ -5942,6 +6157,102 @@ function StudentCreateDiplSupplement(event)
 	window.open('<?php echo APP_ROOT; ?>content/pdfExport.php?xml=diplomasupplement.xml.php&output='+output+'&xsl=DiplSupplement&xsl_stg_kz='+stg_kz+'&uid='+paramList,'DiplomaSupplement', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
 }
 
+function StudentPrintAntragAbmeldung(event)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('student-tree');
+
+
+	if (tree.currentIndex==-1)
+		return alert('Bitte eine/n Studierende/n auswaehlen');
+
+	//Uids aller markierten Studenten holen
+	var start = new Object();
+	var end = new Object();
+	var numRanges = tree.view.selection.getRangeCount();
+	var prestudent_id= '';
+	var student_uid= '';
+
+	for (var t = 0; t < numRanges; t++)
+	{
+		tree.view.selection.getRangeAt(t,start,end);
+		for (var v = start.value; v <= end.value; v++)
+		{
+			var col = tree.columns ? tree.columns["student-treecol-prestudent_id"] : "student-treecol-prestudent_id";
+			var prestudentId=tree.view.getCellText(v,col);
+			prestudent_id += ';'+prestudentId;
+
+			col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
+			var uid=tree.view.getCellText(v,col);
+			student_uid += ';'+uid;
+
+		}
+	}
+
+	if (event.shiftKey)
+	{
+		var output='odt';
+	}
+	else if (event.ctrlKey)
+	{
+		var output='doc';
+	}
+	else
+	{
+		var output='pdf';
+	}
+
+	window.open('<?php echo APP_ROOT; ?>/content/pdfExport.php?xml=AntragAbmeldung.xml.php&xsl=AntragAbmeldung&uid='+student_uid+'&prestudent_id='+prestudent_id+'&output='+output,'AntragAbmeldung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
+}
+
+function StudentPrintAntragUnterbrechung(event)
+{
+	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
+	var tree = document.getElementById('student-tree');
+
+
+	if (tree.currentIndex==-1)
+		return alert('Bitte eine/n Studierende/n auswaehlen');
+
+	//Uids aller markierten Studenten holen
+	var start = new Object();
+	var end = new Object();
+	var numRanges = tree.view.selection.getRangeCount();
+	var prestudent_id= '';
+	var student_uid= '';
+
+	for (var t = 0; t < numRanges; t++)
+	{
+		tree.view.selection.getRangeAt(t,start,end);
+		for (var v = start.value; v <= end.value; v++)
+		{
+			var col = tree.columns ? tree.columns["student-treecol-prestudent_id"] : "student-treecol-prestudent_id";
+			var prestudentId=tree.view.getCellText(v,col);
+			prestudent_id += ';'+prestudentId;
+
+			col = tree.columns ? tree.columns["student-treecol-uid"] : "student-treecol-uid";
+			var uid=tree.view.getCellText(v,col);
+			student_uid += ';'+uid;
+
+		}
+	}
+
+	if (event.shiftKey)
+	{
+		var output='odt';
+	}
+	else if (event.ctrlKey)
+	{
+		var output='doc';
+	}
+	else
+	{
+		var output='pdf';
+	}
+
+	window.open('<?php echo APP_ROOT; ?>/content/pdfExport.php?xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&uid='+student_uid+'&prestudent_id='+prestudent_id+'&output='+output,'AntragUnterbrechung', 'height=200,width=350,left=0,top=0,hotkeys=0,resizable=yes,status=no,scrollbars=yes,toolbar=no,location=no,menubar=no,dependent=yes');
+}
+
 // ****
 // * Erstellt den Ausbildungsvertrag fuer einen oder mehrere Studenten
 // ****
@@ -6370,6 +6681,13 @@ function StudentLVGesamtNotenTreeSort()
 	window.setTimeout(StudentNotenTreeSelectDifferent,20);
 }
 
+function StudentAntragNotenTreeSort()
+{
+	// Nach dem Sortieren der Noten die Unterschiede erneut markieren
+	// da sonst nach dem sortieren falsche Eintraege markiert sind
+	window.setTimeout(StudentAntragNotenTreeSelectDifferent,20);
+}
+
 //****
 //* Exportiert den Bescheid fuer alle markierten Studierenden
 //****
diff --git a/include/dokument_export.class.php b/include/dokument_export.class.php
index 7e4aef40e..458cd7c02 100644
--- a/include/dokument_export.class.php
+++ b/include/dokument_export.class.php
@@ -200,6 +200,10 @@ class dokument_export
 		chdir($this->temp_folder);
 		file_put_contents($this->temp_folder . '/content.xml', $contentbuffer);
 
+		if ($this->xml_data->firstChild->tagName == 'error') {
+			$this->errormsg = $this->xml_data->firstChild->textContent;
+			return false;
+		}
 		// styles.xml erstellen
 		if(!is_null($this->styles_xsl))
 		{
diff --git a/include/studierendenantrag.class.php b/include/studierendenantrag.class.php
new file mode 100644
index 000000000..a491e4ba2
--- /dev/null
+++ b/include/studierendenantrag.class.php
@@ -0,0 +1,147 @@
+<?php
+/* Copyright (C) 2011 fhcomplete.org
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA.
+ *
+ * Authors: Christopher Gerbrich <christopher.gerbrich@technikum-wien.at> and Manuela Thamer <manuela.thamer@technikum-wien.at
+ */
+/**
+ * Klasse Studierendenantrag
+ *  
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+
+class studierendenantrag extends basis_db
+{
+	public $new;
+	public $result = array();
+
+	//Tabellenspalten
+	public $studierendenantrag_id;		// bigint
+	public $prestudent_id;				// bigint
+	public $studiensemester_kurzbz;		// varchar(32)
+	public $datum;						// timestamp
+	public $typ;						// varchar(32)
+	public $insertamum;					// timestamp
+	public $insertvon;					// varchar(32)
+	public $datum_wiedereinstieg;		// timestamp
+	public $grund;						// text
+	public $dms_id;						// bigint
+	 
+	/**
+	 * Konstruktor - Laedt optional eine Ampel
+	 * @param $amepl_id
+	 */
+	public function __construct($studierendenantrag_id=null)
+	{
+		parent::__construct();
+		
+		if(!is_null($studierendenantrag_id))
+			$this->load($studierendenantrag_id);
+	}
+
+	/**
+	 * Laedt einen Antrag mit der uebergebenen ID
+	 * 
+	 * @param $studierendenantrag_id
+	 * @return boolean
+	 */
+	public function load($studierendenantrag_id)
+	{
+		if(!is_numeric($studierendenantrag_id))
+		{
+			$this->errormsg = 'Studierendenantrag ID ist ungueltig';
+			return false;
+		}
+		
+		$qry = "SELECT * FROM campus.tbl_studierendenantrag WHERE studierendenantrag_id=" . $this->db_add_param($studierendenantrag_id, FHC_INTEGER);
+
+		if($result = $this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object($result))
+			{
+				$this->studierendenantrag_id = $row->studierendenantrag_id;
+				$this->prestudent_id = $row->prestudent_id;
+				$this->studiensemester_kurzbz = $row->studiensemester_kurzbz;
+				$this->datum = $row->datum;
+				$this->typ = $row->typ;
+				$this->insertamum = $row->insertamum;
+				$this->insertvon = $row->insertvon;
+				$this->datum_wiedereinstieg = $row->datum_wiedereinstieg;
+				$this->grund = $row->grund;
+				$this->dms_id = $row->dms_id;
+
+				return true;
+			}
+			else
+			{
+				$this->errormsg = 'Studierendenantrag mit dieser ID exisitert nicht';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Studierendenantrag';
+			return false;
+		}
+	}
+	
+	/**
+	 * Laedt alle aktuellen Anträge eines Users
+	 * 
+	 * @param integer	$prestudent_id
+	 * @param string 	$stsem
+	 * 
+	 * @return boolean
+	 */
+	public function loadUserAntrag($prestudent_id, $stsem = null)
+	{
+		$qry = "SELECT * FROM campus.tbl_studierendenantrag WHERE prestudent_id=" . $this->db_add_param($prestudent_id, FHC_INTEGER);
+		
+		if ($stsem)
+		{
+			$qry .= " AND studiensemester_kurzbz=" . $this->db_add_param($stsem, FHC_STRING);
+		}
+
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$obj = new studierendenantrag();
+				
+				$obj->studierendenantrag_id = $row->studierendenantrag_id;
+				$obj->prestudent_id = $row->prestudent_id;
+				$obj->studiensemester_kurzbz = $row->studiensemester_kurzbz;
+				$obj->datum = $row->datum;
+				$obj->typ = $row->typ;
+				$obj->insertamum = $row->insertamum;
+				$obj->insertvon = $row->insertvon;
+				$obj->datum_wiedereinstieg = $row->datum_wiedereinstieg;
+				$obj->grund = $row->grund;
+				$obj->dms_id = $row->dms_id;
+				
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+	
+}
+?>
diff --git a/locale/de-AT/fas.dtd b/locale/de-AT/fas.dtd
index c3d420ede..53008a4e6 100644
--- a/locale/de-AT/fas.dtd
+++ b/locale/de-AT/fas.dtd
@@ -211,6 +211,18 @@
 		<!ENTITY menu-dokumente-diplsupplement.label	"Diploma Supplement">
 		<!ENTITY menu-dokumente-diplsupplement.accesskey	"S">
 
+		<!ENTITY menu-dokumente-antrag.key		"N">
+		<!ENTITY menu-dokumente-antrag.label	"Antrag">
+		<!ENTITY menu-dokumente-antrag.accesskey	"N">
+
+		<!ENTITY menu-dokumente-antrag-abmeldung.key		"A">
+		<!ENTITY menu-dokumente-antrag-abmeldung.label	"Abmeldung">
+		<!ENTITY menu-dokumente-antrag-abmeldung.accesskey	"A">
+
+		<!ENTITY menu-dokumente-antrag-unterbrechung.key		"U">
+		<!ENTITY menu-dokumente-antrag-unterbrechung.label	"Unterbrecher">
+		<!ENTITY menu-dokumente-antrag-unterbrechung.accesskey	"U">
+
 		<!ENTITY menu-dokumente-ausbildungsvertrag.key		"A">
 		<!ENTITY menu-dokumente-ausbildungsvertrag.label	"Ausbildungsvertrag Deutsch">
 		<!ENTITY menu-dokumente-ausbildungsvertrag.accesskey	"A">
diff --git a/public/css/Fhc.css b/public/css/Fhc.css
new file mode 100644
index 000000000..2c3491767
--- /dev/null
+++ b/public/css/Fhc.css
@@ -0,0 +1,79 @@
+.accordion-button-primary {
+  background-color: #e7f1ff;
+  color: #0c63e4;
+}
+.accordion-button-primary:not(.collapsed) {
+  background-color: #cfe2ff;
+  color: #0a58ca;
+}
+
+.accordion-button-secondary {
+  background-color: #f0f1f2;
+  color: #616971;
+}
+.accordion-button-secondary:not(.collapsed) {
+  background-color: #e2e3e5;
+  color: #565e64;
+}
+
+.accordion-button-success {
+  background-color: #e8f3ee;
+  color: #177a4c;
+}
+.accordion-button-success:not(.collapsed) {
+  background-color: #d1e7dd;
+  color: #146c43;
+}
+
+.accordion-button-info {
+  background-color: #e7fafe;
+  color: #0cb6d8;
+}
+.accordion-button-info:not(.collapsed) {
+  background-color: #cff4fc;
+  color: #0aa2c0;
+}
+
+.accordion-button-warning {
+  background-color: #fff9e6;
+  color: #e6ae06;
+}
+.accordion-button-warning:not(.collapsed) {
+  background-color: #fff3cd;
+  color: #cc9a06;
+}
+
+.accordion-button-danger {
+  background-color: #fcebec;
+  color: #c6303e;
+}
+.accordion-button-danger:not(.collapsed) {
+  background-color: #f8d7da;
+  color: #b02a37;
+}
+
+.accordion-button-light {
+  background-color: #fefeff;
+  color: #dfe0e1;
+}
+.accordion-button-light:not(.collapsed) {
+  background-color: #fefefe;
+  color: #c6c7c8;
+}
+
+.accordion-button-dark {
+  background-color: #e9e9ea;
+  color: #1e2125;
+}
+.accordion-button-dark:not(.collapsed) {
+  background-color: #d3d3d4;
+  color: #1a1e21;
+}
+
+.tabulator-edit-list .tabulator-edit-list-item {
+  background-color: white;
+}
+.tabulator-edit-list .tabulator-edit-list-item:hover,
+.tabulator-edit-list .tabulator-edit-list-item.active {
+  color: white;
+}
\ No newline at end of file
diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
new file mode 100644
index 000000000..9ee7cd848
--- /dev/null
+++ b/public/css/cis_bs5.css
@@ -0,0 +1,66 @@
+:root {
+	--bs-body-font-family: "Helvetica Neue",Helvetica,Arial,sans-serif;
+	--bs-body-font-size: 14px;
+	--bs-body-line-height: 1.42857143;
+	--bs-body-color: #333;
+}
+html {
+	font-size: var(--bs-body-font-size);
+}
+
+h1, .h1 {
+	margin-top: 0;
+	font-size: 1.4rem;
+}
+h2, .h2 {
+	margin-top: 0;
+	font-size: 1.4rem;
+}
+h3, .h3 {
+	margin-top: 0;
+	font-size: 1.3rem;
+}
+h4, .h4 {
+	margin-top: 0;
+	font-size: 1.2rem;
+}
+h5, .h5 {
+	margin-top: 0;
+	font-size: 1.1rem;
+}
+h6, .h6 {
+	margin-top: 0;
+	font-size: 1rem;
+}
+
+.btn {
+	padding: 6px 12px;
+}
+
+.fhc-header {
+	display: flex;
+	justify-content: between;
+	flex: wrap;
+	align-items: center;
+	padding: 20px 15px 19px;
+	margin: 40px 0 20px;
+	border-bottom: solid 1px #eee;
+}
+@media (min-width:768px) { /* NOTE(chris): size "md" from bs5 */
+	.fhc-header {
+		flex-wrap: nowrap!important;
+	}
+}
+.fhc-header h1,
+.fhc-header h2 {
+	font-size: 24px;
+	margin: 0;
+}
+
+.fhc-container {
+	padding: 0 15px;
+}
+
+.tabulator {
+	font-size: var(--bs-body-font-size);
+}
diff --git a/public/js/apps/lehre/Antrag.js b/public/js/apps/lehre/Antrag.js
new file mode 100644
index 000000000..e5a4814f8
--- /dev/null
+++ b/public/js/apps/lehre/Antrag.js
@@ -0,0 +1,22 @@
+import StudierendenantragAntrag from "../../components/Studierendenantrag/Antrag.js";
+import StudierendenantragStatus from "../../components/Studierendenantrag/Status.js";
+import StudierendenantragInfoblock from "../../components/Studierendenantrag/Infoblock.js";
+import VueDatePicker from "../../components/vueDatepicker.js.php";
+
+const app = Vue.createApp({
+	components: {
+		VueDatePicker,
+		StudierendenantragAntrag,
+		StudierendenantragStatus,
+		StudierendenantragInfoblock
+	},
+	data() {
+		return {
+			statusMsg: "",
+			statusSeverity: "",
+			infoArray: []
+		}
+
+	}
+});
+app.mount('#wrapper');
diff --git a/public/js/apps/lehre/Antrag/Leitung.js b/public/js/apps/lehre/Antrag/Leitung.js
new file mode 100644
index 000000000..0e68cccba
--- /dev/null
+++ b/public/js/apps/lehre/Antrag/Leitung.js
@@ -0,0 +1,8 @@
+import StudierendenantragLeitung from '../../../components/Studierendenantrag/Leitung.js';
+
+const app = Vue.createApp({
+	components: {
+		StudierendenantragLeitung
+	}
+});
+app.mount('#wrapper');
diff --git a/public/js/apps/lehre/Antrag/Lvzuweisung.js b/public/js/apps/lehre/Antrag/Lvzuweisung.js
new file mode 100644
index 000000000..2cbe2f1c8
--- /dev/null
+++ b/public/js/apps/lehre/Antrag/Lvzuweisung.js
@@ -0,0 +1,8 @@
+import LvZuweisung from '../../../components/Studierendenantrag/Lvzuweisung.js';
+
+const app = Vue.createApp({
+	components: {
+		LvZuweisung
+	}
+});
+app.mount('#wrapper');
diff --git a/public/js/apps/lehre/Antrag/Student.js b/public/js/apps/lehre/Antrag/Student.js
new file mode 100644
index 000000000..f06143149
--- /dev/null
+++ b/public/js/apps/lehre/Antrag/Student.js
@@ -0,0 +1,8 @@
+import LvPopup from '../../../components/Studierendenantrag/Leitung/LvPopup.js';
+
+const app = Vue.createApp({
+	components: {
+		LvPopup
+	}
+});
+app.mount('#wrapper');
diff --git a/public/js/components/Bootstrap/Alert.js b/public/js/components/Bootstrap/Alert.js
new file mode 100644
index 000000000..075c9cf86
--- /dev/null
+++ b/public/js/components/Bootstrap/Alert.js
@@ -0,0 +1,44 @@
+import BsModal from './Modal.js';
+
+export default {
+	components: {
+		BsModal
+	},
+	mixins: [
+		BsModal
+	],
+	props: {
+		dialogClass: {
+			type: [String,Array,Object],
+			default: 'modal-dialog-centered'
+		},
+		/*
+		 * NOTE(chris):
+		 * Hack to expose in "emits" declared events to $props which we use
+		 * in the v-bind directive to forward all events.
+		 * @see: https://github.com/vuejs/core/issues/3432
+		*/
+		onHideBsModal: Function,
+		onHiddenBsModal: Function,
+		onHidePreventedBsModal: Function,
+		onShowBsModal: Function,
+		onShownBsModal: Function
+	},
+	data: () => ({
+		result: true
+	}),
+	mounted() {
+		this.modal = this.$refs.modalContainer.modal;
+	},
+	popup(msg, options) {
+		return BsModal.popup.bind(this)(msg, options);
+	},
+	template: `<bs-modal ref="modalContainer" class="bootstrap-alert" v-bind="$props">
+		<template v-slot:default>
+			<slot></slot>
+		</template>
+		<template v-slot:footer>
+			<button type="button" class="btn btn-primary" data-bs-dismiss="modal">OK</button>
+		</template>
+	</bs-modal>`
+}
diff --git a/public/js/components/Bootstrap/Confirm.js b/public/js/components/Bootstrap/Confirm.js
new file mode 100644
index 000000000..1c609d457
--- /dev/null
+++ b/public/js/components/Bootstrap/Confirm.js
@@ -0,0 +1,22 @@
+import BsAlert from './Alert';
+
+export default {
+	mixins: [
+		BsAlert
+	],
+	data: () => ({
+		result: false
+	}),
+	popup(msg, options) {
+		return BsAlert.popup.bind(this)(msg, options);
+	},
+	template: `<bs-modal ref="modalContainer" class="bootstrap-confirm" v-bind="$props">
+		<template v-slot:default>
+			<slot></slot>
+		</template>
+		<template v-slot:footer>
+			<button type="button" class="btn btn-primary" @click="result=true;this.hide()">OK</button>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+		</template>
+	</bs-modal>`
+}
diff --git a/public/js/components/Bootstrap/Modal.js b/public/js/components/Bootstrap/Modal.js
new file mode 100644
index 000000000..90cec2d50
--- /dev/null
+++ b/public/js/components/Bootstrap/Modal.js
@@ -0,0 +1,109 @@
+export default {
+	data: () => ({
+		modal: null
+	}),
+	props: {
+		backdrop: {
+			type: [Boolean,String],
+			default: true,
+			validator(value) {
+				return ['static', true, false].includes(value);
+			}
+		},
+		focus: {
+			type: Boolean,
+			default: true
+		},
+		keyboard: {
+			type: Boolean,
+			default: true
+		},
+		noCloseBtn: Boolean,
+		dialogClass: [String,Array,Object]
+	},
+	emits: [
+		"hideBsModal",
+		"hiddenBsModal",
+		"hidePreventedBsModal",
+		"showBsModal",
+		"shownBsModal"
+	],
+	methods: {
+		dispose() {
+			return this.modal.dispose();
+		},
+		handleUpdate() {
+			return this.modal.handleUpdate();
+		},
+		hide() {
+			return this.modal.hide();
+		},
+		show(relatedTarget) {
+			return this.modal.show(relatedTarget);
+		},
+		toggle() {
+			return this.modal.toggle();
+		}
+	},
+	mounted() {
+		if(this.$refs.modal)
+		{
+			this.modal = new bootstrap.Modal(this.$refs.modal, {
+				backdrop: this.backdrop,
+				focus: this.focus,
+				keyboard: this.keyboard
+			});
+		}
+	},
+	popup(body, options, title, footer) {
+		const BsModal = this,
+			slots = {};
+		if (body !== undefined)
+			slots.default = () => body;
+		if (title !== undefined)
+			slots.title = () => title;
+		if (footer !== undefined)
+			slots.footer = () => footer;
+		return new Promise((resolve,reject) => {
+			const instance = Vue.createApp({
+				setup() {
+					return () => Vue.h(BsModal, {...{
+						class: 'fade'
+					},...options, ...{
+						ref: 'modal',
+						'onHidden.bs.modal': instance.unmount
+					}}, slots);
+				},
+				mounted() {
+					this.$refs.modal.show();
+				},
+				beforeUnmount() {
+					if (this.$refs.modal)
+						this.$refs.modal.result !== false ? resolve(this.$refs.modal.result) : reject();
+				},
+				unmounted() {
+					wrapper.parentElement.removeChild(wrapper);
+				}
+			});
+			const wrapper = document.createElement("div");
+			instance.mount(wrapper);
+			document.body.appendChild(wrapper);
+		});
+	},
+	template: `<div ref="modal" class="bootstrap-modal modal" tabindex="-1" @[\`hide.bs.modal\`]="$emit('hideBsModal')" @[\`hidden.bs.modal\`]="$emit('hiddenBsModal')" @[\`hidePrevented.bs.modal\`]="$emit('hidePreventedBsModal')" @[\`show.bs.modal\`]="$emit('showBsModal')" @[\`shown.bs.modal\`]="$emit('shownBsModal')">
+		<div class="modal-dialog" :class="dialogClass">
+			<div class="modal-content">
+				<div v-if="$slots.title" class="modal-header">
+					<h5 class="modal-title"><slot name="title"/></h5>
+					<button v-if="!noCloseBtn" type="button" class="btn-close" data-bs-dismiss="modal" aria-label="Close"></button>
+				</div>
+				<div class="modal-body">
+					<slot></slot>
+				</div>
+				<div v-if="$slots.footer" class="modal-footer">
+					<slot name="footer"/>
+				</div>
+			</div>
+		</div>
+	</div>`
+}
diff --git a/public/js/components/Bootstrap/Prompt.js b/public/js/components/Bootstrap/Prompt.js
new file mode 100644
index 000000000..74e5c8b3f
--- /dev/null
+++ b/public/js/components/Bootstrap/Prompt.js
@@ -0,0 +1,37 @@
+
+import BsAlert from './Alert';
+
+export default {
+	mixins: [
+		BsAlert
+	],
+	props: {
+		placeholder: String,
+		default: String
+	},
+	data: () => ({
+		value: '',
+		result: false
+	}),
+	created() {
+		if (this.default)
+			this.value = this.default;
+	},
+	popup(msg, options) {
+		if (typeof options === 'string')
+			options = { default: options };
+		return BsAlert.popup.bind(this)(msg, options);
+	},
+	template: `<bs-modal ref="modalContainer" class="bootstrap-prompt" v-bind="$props">
+		<template v-slot:default>
+			<slot></slot>
+			<div>
+				<input ref="input" type="text" class="form-control" :placeholder="placeholder" v-model="value">
+			</div>
+		</template>
+		<template v-slot:footer>
+			<button type="button" class="btn btn-primary" @click="result=value;this.hide()">OK</button>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">Cancel</button>
+		</template>
+	</bs-modal>`
+}
diff --git a/public/js/components/Fetch.js b/public/js/components/Fetch.js
index 32d5616d0..9a34e1a3f 100644
--- a/public/js/components/Fetch.js
+++ b/public/js/components/Fetch.js
@@ -53,7 +53,9 @@ export const CoreFetchCmpt = {
 		 *
 		 */
 		fetchData: function() {
-	        	this.loading = true; // loader started
+			this.loading = true; // loader started
+			this.error = false;
+			this.errorMessage = null;
 
 			// Checks if the apifunction is a callable function
 			if (typeof this.apiFunction == "function")
@@ -91,13 +93,16 @@ export const CoreFetchCmpt = {
 		 *
 		 */
 		successHandler: function(response) {
-			this.$emit('dataFetched', response.data); // trigger the event dataFetched
+			this.$emit('dataFetched', response ? response.data : undefined); // trigger the event dataFetched
 		},
 		/**
 		 *
 		 */
 		errorHandler: function(error) {
-			this.setError(error.message);
+			if (error.response.data.retval)
+				this.setError(error.response.data.retval);
+			else
+				this.setError(error.message);
 		},
 		/**
 		 *
@@ -107,12 +112,12 @@ export const CoreFetchCmpt = {
 		}
 	},
 	template: `
-		<slot v-if="loading">
+		<slot v-if="loading" name="loading">
 			<div class="fetch-loader">Loading...</div>
 		</slot>
-		<slot v-if="error">
+		<slot v-else-if="error" name="error" :error-message="errorMessage">
 			<div class="fetch-error">{{ errorMessage }}</div>
 		</slot>
+		<slot v-else></slot>
 	`
 };
-
diff --git a/public/js/components/Loader.js b/public/js/components/Loader.js
new file mode 100644
index 000000000..ce4dee638
--- /dev/null
+++ b/public/js/components/Loader.js
@@ -0,0 +1,62 @@
+import BsModal from './Bootstrap/Modal.js';
+
+export default {
+	components: {
+		BsModal
+	},
+	props: {
+		timeout: {
+			type: Number,
+			default: 300
+		}
+	},
+	data() {
+		return {
+			t: null,
+			state: 0
+		}
+	},
+	methods: {
+		show() {
+			switch (this.state) {
+				case 0:
+					if (this.timeout) {
+						this.state = 1;
+						this.t = window.setTimeout(() => this.$refs.modal.show(), this.timeout);
+						return;
+					} else
+						return this.$refs.modal.show();
+				case 4:
+					return window.setTimeout(() => this.show(), 1);
+			}
+		},
+		hide() {
+			switch (this.state) {
+				case 1:
+					return window.clearTimeout(this.t);
+				case 2:
+					return window.setTimeout(() => this.hide(), 1);
+				case 3:
+					this.$refs.modal.hide();
+			}
+		}
+	},
+	mounted() {
+		this.$refs.modal.$refs.modal.addEventListener('show.bs.modal', () => {
+			this.state = 2;
+		});
+		this.$refs.modal.$refs.modal.addEventListener('shown.bs.modal', () => {
+			this.state = 3;
+		});
+		this.$refs.modal.$refs.modal.addEventListener('hide.bs.modal', () => {
+			this.state = 4;
+		});
+		this.$refs.modal.$refs.modal.addEventListener('hidden.bs.modal', () => {
+			this.state = 0;
+		});
+	},
+	template: `
+	<bs-modal ref="modal" class="fade text-center" dialog-class="modal-dialog-centered" backdrop="static" :keyboard="false">
+		Loading...
+	</bs-modal>`
+}
\ No newline at end of file
diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js
new file mode 100644
index 000000000..6619b74e7
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Antrag.js
@@ -0,0 +1,60 @@
+import StudierendenantragAbmeldung from './Form/Abmeldung.js';
+import StudierendenantragUnterbrechung from './Form/Unterbrechung.js';
+import StudierendenantragWiederholung from './Form/Wiederholung.js';
+import Phrasen from '../../mixins/Phrasen.js';
+
+export default {
+	components: {
+		StudierendenantragAbmeldung,
+		StudierendenantragUnterbrechung,
+		StudierendenantragWiederholung
+	},
+	mixins: [
+		Phrasen
+	],
+	emits: [
+		'update:infoArray',
+		'update:statusMsg',
+		'update:statusSeverity'
+	],
+	props: {
+		antragType: String,
+		prestudentId: Number,
+		studierendenantragId: Number,
+		infoArray: Array,
+		statusMsg: String,
+		statusSeverity: String
+	},
+	data() {
+		return {
+			status: ''
+		};
+	},
+	computed: {
+		typeComponent() {
+			return 'Studierendenantrag' + this.antragType;
+		},
+		infoText() {
+			return this.p.t('studierendenantrag/info_' + this.antragType + '_' + this.status);
+		}
+	},
+	template: `
+	<div class="studierendenantrag-antrag card">
+		<div class="card-header">
+		    {{p.t('studierendenantrag', 'title_' + antragType)}}
+		</div>
+		<div v-if="infoText && infoText.substr(0, 9) != '<< PHRASE'" class="alert alert-primary m-3" role="alert" v-html="infoText">
+		</div>
+		<component
+			:is="typeComponent"
+			class="card-body"
+			v-model:status="status"
+			:prestudent-id="prestudentId"
+			:studierendenantrag-id="studierendenantragId"
+			@setInfos="$emit('update:infoArray', $event)"
+			@setStatus="$emit('update:statusMsg', $event.msg);$emit('update:statusSeverity', $event.severity)"
+			>
+		</component>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js
new file mode 100644
index 000000000..0de6e3d16
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Form/Abmeldung.js
@@ -0,0 +1,285 @@
+import {CoreFetchCmpt} from '../../Fetch.js';
+import Phrasen from '../../../mixins/Phrasen.js';
+
+var _uuid = 0;
+
+export default {
+	components: {
+		CoreFetchCmpt
+	},
+	mixins: [
+		Phrasen
+	],
+	emits: [
+		'setInfos',
+		'setStatus'
+	],
+	props: {
+		prestudentId: Number
+	},
+	data() {
+		return {
+			data: null,
+			saving: false,
+			errors: {
+				grund: [],
+				default: []
+			}
+		}
+	},
+	computed: {
+		statusSeverity() {
+			switch (this.data.status)
+			{
+				case 'Erstellt': return 'info';
+				case 'Genehmigt': return 'success';
+				default: return 'info';
+			}
+		}
+	},
+	methods: {
+		load() {
+			return axios.get(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Abmeldung/getDetailsForNewAntrag/' +
+				this.prestudentId
+			).then(
+				result => {
+					this.data = result.data.retval;
+					if (this.data.status) {
+						this.$emit("setStatus", {
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							severity: this.statusSeverity
+						});
+					}
+					return result;
+				}
+			);
+		},
+		createAntrag() {
+			bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide();
+			this.$emit('setStatus', {
+				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+				severity: 'warning'
+			});
+			this.saving = true;
+			for(var k in this.errors)
+				this.errors[k] = [];
+			axios.post(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Abmeldung/createAntrag/', {
+					studiensemester: this.data.studiensemester_kurzbz,
+					prestudent_id: this.data.prestudent_id,
+					grund: this.$refs.grund.value
+				}
+			).then(
+				result => {
+					if (result.data.error)
+					{
+						for (var k in result.data.retval)
+						{
+							if (this.errors[k] !== undefined)
+								this.errors[k].push(result.data.retval[k]);
+							else
+								this.errors.default.push(result.data.retval[k]);
+						}
+						this.$emit('setStatus', {
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							severity: 'danger'
+						});
+					}
+					else
+					{
+						if (result.data.retval === true)
+							document.location += "";
+						this.data = result.data.retval;
+						if (this.data.status) {
+							this.$emit("setStatus", {
+								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								severity: this.statusSeverity
+							});
+						}
+						else
+							this.$emit('setStatus', {
+								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_open')}),
+								severity:'success'
+							});
+					}
+					this.saving = false;
+				}
+			);
+		},
+		cancelAntrag() {
+			this.$emit('setStatus', {
+				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelling')}),
+				severity: 'warning'
+			});
+			this.saving = true;
+			for(var k in this.errors)
+				this.errors[k] = [];
+			axios.post(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Abmeldung/cancelAntrag/', {
+					antrag_id: this.data.studierendenantrag_id
+				}
+			).then(
+				result => {
+					if (result.data.error)
+					{
+						for (var k in result.data.retval)
+						{
+							if (this.errors[k] !== undefined)
+								this.errors[k].push(result.data.retval[k]);
+							else
+								this.errors.default.push(result.data.retval[k]);
+						}
+						this.$emit('setStatus', {
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							severity:'danger'
+						});
+					}
+					else
+					{
+						if (Number.isInteger(result.data.retval)) {
+							document.location = document.location.replace(/abmeldung\/([0-9]*)\/[0-9]*[\/]?$/, 'abmeldung/$1') +  "/" + result.data.retval;
+						}
+						this.data = result.data.retval;
+						if (this.data.status) {
+							this.$emit("setStatus", {
+								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								severity: this.statusSeverity
+							});
+						}
+						else
+							this.$emit('setStatus', {
+								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelled')}),
+								severity: 'danger'
+							});
+					}
+					this.saving = false;
+				}
+			);
+		}
+	},
+	created() {
+		this.uuid = _uuid++;
+	},
+	template: `
+	<div class="studierendenantrag-form-abmeldung">
+		<core-fetch-cmpt :api-function="load">
+			<div class="row">
+				<div class="col-12">
+					<div v-for="error in errors.default" class="alert alert-danger" role="alert" v-html="error">
+					</div>
+					<table class="table">
+						<tr>
+							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<td align="right">{{data.bezeichnung}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<td align="right">{{data.orgform_bezeichnung}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<td align="right">{{data.name}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<td align="right">{{data.matrikelnr}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre', 'studienjahr')}}</th>
+							<td align="right">{{data.studienjahr_kurzbz}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre', 'semester')}}</th>
+							<td align="right">{{data.semester}}</td>
+						</tr>
+					</table>
+				</div>
+				<div v-if="data.grund" class="mb-3">
+					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
+					<pre>{{data.grund}}</pre>
+				</div>
+				<div v-else class="col-sm-6 mb-3">
+					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-grund'" class="form-label">Grund:</label>
+					<textarea
+						class="form-control"
+						:class="{'is-invalid': errors.grund.length}"
+						:id="'studierendenantrag-form-abmeldung-' + uuid + '-grund'"
+						rows="5"
+						:disabled="saving"
+						ref="grund"
+						required
+						></textarea>
+					<div v-if="errors.grund.length" class="invalid-feedback">
+						{{errors.grund.join(".")}}
+					</div>
+				</div>
+				<div class="col-12 text-end">
+					<button
+						v-if="data.studierendenantrag_id && data.canCancel"
+						type="button"
+						class="btn btn-danger"
+						@click="cancelAntrag"
+						:disabled="saving"
+						>
+						{{p.t('studierendenantrag', 'btn_cancel')}}
+					</button>
+					<button
+						v-else-if="!data.studierendenantrag_id"
+						type="button"
+						class="btn btn-primary"
+						data-bs-toggle="modal"
+						:data-bs-target="'#studierendenantrag-form-abmeldung-' + uuid + '-modal'"
+						:disabled="saving"
+						>
+						{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+					</button>
+
+					<div
+						ref="modal"
+						class="modal fade text-start"
+						:id="'studierendenantrag-form-abmeldung-' + uuid + '-modal'"
+						tabindex="-1"
+						:aria-labelledby="'studierendenantrag-form-abmeldung-' + uuid + '-modal-label'"
+						aria-hidden="true">
+						<div class="modal-dialog">
+							<div class="modal-content">
+								<div class="modal-header">
+									<h5
+										class="modal-title"
+										:id="'studierendenantrag-form-abmeldung-' + uuid + '-modal-label'"
+										>
+										{{p.t('studierendenantrag', 'title_Abmeldung')}}
+									</h5>
+									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui', 'schliessen')"></button>
+								</div>
+								<div class="modal-body" v-html="p.t('studierendenantrag', 'warning_Abmeldung')">
+								</div>
+								<div class="modal-footer">
+									<button
+										type="button"
+										class="btn btn-primary"
+										@click="createAntrag">
+										{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+									</button>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<template v-slot:error="{errorMessage}">
+				<div class="alert alert-danger m-0" role="alert">
+					{{ errorMessage }}
+				</div>
+			</template>
+		</core-fetch-cmpt>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
new file mode 100644
index 000000000..2034361bc
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -0,0 +1,359 @@
+import {CoreFetchCmpt} from '../../Fetch.js';
+import VueDatepicker from '../../vueDatepicker.js.php';
+import Phrasen from '../../../mixins/Phrasen.js';
+
+var _uuid = 0;
+
+export default {
+	components: {
+		CoreFetchCmpt,
+		VueDatepicker
+	},
+	mixins: [
+		Phrasen
+	],
+	emits: [
+		'setInfos',
+		'setStatus'
+	],
+	props: {
+		prestudentId: Number,
+		studierendenantragId: Number
+	},
+	data() {
+		return {
+			data: null,
+			saving: false,
+			errors: {
+				grund: [],
+				studiensemester: [],
+				datum_wiedereinstieg: [],
+				default: []
+			},
+			stsem: null,
+			siteUrl: FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router
+		}
+	},
+	computed: {
+		statusSeverity() {
+			switch (this.data.status)
+			{
+				case 'Erstellt': return 'info';
+				case 'Genehmigt': return 'success';
+				case 'Zurückgezogen': return 'danger';
+				default: return 'info';
+			}
+		},
+		loadUrl() {
+			if (this.studierendenantragId)
+				return '/components/Antrag/Unterbrechung/getDetailsForAntrag/'+
+				this.studierendenantragId;
+			return '/components/Antrag/Unterbrechung/getDetailsForNewAntrag/' +
+				this.prestudentId;
+		},
+		datumWsFormatted() {
+			if(!this.data.datum_wiedereinstieg)
+				return '';
+			let datum = new Date(this.data.datum_wiedereinstieg);
+			return datum.toLocaleDateString();
+		}
+	},
+	methods: {
+		load() {
+			return axios.get(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				this.loadUrl
+			).then(
+				result => {
+					this.data = result.data.retval;
+					if (this.data.status) {
+						this.$emit("setStatus", {
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							severity: this.statusSeverity
+						});
+					}
+					return result;
+				}
+			);
+		},
+		createAntrag() {
+			this.$emit('setStatus', {
+				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+				severity: 'warning'
+			});
+			this.saving = true;
+			for(var k in this.errors)
+				this.errors[k] = [];
+
+			var formData = new FormData();
+			var attachment = this.$refs.attachment;
+			formData.append("attachment", attachment.files[0]);
+			formData.append("studiensemester", this.stsem !== null && this.data.studiensemester[this.stsem].studiensemester_kurzbz);
+			formData.append("prestudent_id", this.data.prestudent_id);
+			formData.append("grund", this.$refs.grund.value);
+			formData.append("datum_wiedereinstieg", this.$refs.datum_wiedereinstieg && this.$refs.datum_wiedereinstieg.value);
+
+			axios.post(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Unterbrechung/createAntrag/',
+				formData,
+				{
+					headers: {
+						'Content-Type': 'multipart/form-data'
+					}
+				}
+			).then(
+				result => {
+					if (result.data.error)
+					{
+						for (var k in result.data.retval)
+						{
+							if (this.errors[k] !== undefined)
+								this.errors[k].push(result.data.retval[k]);
+							else
+								this.errors.default.push(result.data.retval[k]);
+						}
+						this.$emit('setStatus', {
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							severity: 'danger'
+						});
+					}
+					else
+					{
+						if (Number.isInteger(result.data.retval))
+							document.location += "/" + result.data.retval;
+						this.data = result.data.retval;
+						if (this.data.status) {
+							this.$emit("setStatus", {
+								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								severity: this.statusSeverity
+							});
+						}
+						else
+							this.$emit('setStatus', {
+								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_created')}),
+								severity: 'info'
+							});
+					}
+					this.saving = false;
+				}
+			);
+		},
+		cancelAntrag() {
+			this.$emit('setStatus', {
+				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelling')}),
+				severity: 'warning'
+			});
+			this.saving = true;
+			for(var k in this.errors)
+				this.errors[k] = [];
+			axios.post(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Unterbrechung/cancelAntrag/', {
+					antrag_id: this.data.studierendenantrag_id
+				}
+			).then(
+				result => {
+					if (result.data.error)
+					{
+						for (var k in result.data.retval)
+						{
+							if (this.errors[k] !== undefined)
+								this.errors[k].push(result.data.retval[k]);
+							else
+								this.errors.default.push(result.data.retval[k]);
+						}
+						this.$emit('setStatus', {
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							severity: 'danger'
+						});
+					}
+					else
+					{
+						if (Number.isInteger(result.data.retval)) {
+							document.location = document.location.replace(/unterbrechung\/([0-9]*)\/[0-9]*[\/]?$/, 'unterbrechung/$1') +  "/" + result.data.retval;
+						}
+						this.data = result.data.retval;
+						if (this.data.status) {
+							this.$emit("setStatus", {
+								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								severity: this.statusSeverity
+							});
+						}
+						else
+							this.$emit('setStatus', {
+								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_cancelled')}),
+								severity: 'danger'
+							});
+					}
+					this.saving = false;
+				}
+			);
+		}
+	},
+	created() {
+		this.uuid = _uuid++;
+	},
+	template: `
+	<div class="studierendenantrag-form-unterbrechung">
+		<core-fetch-cmpt :api-function="load">
+			<div class="row">
+				<div class="col-12">
+					<div v-for="error in errors.default" class="alert alert-danger" role="alert" v-html="error">
+					</div>
+					<table class="table">
+						<tr>
+							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<td align="right">{{data.bezeichnung}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<td align="right">{{data.orgform_bezeichnung}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<td align="right">{{data.name}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<td align="right">{{data.matrikelnr}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre', 'studienjahr')}}</th>
+							<td align="right" v-if="data.studierendenantrag_id">{{data.studienjahr_kurzbz}}</td>
+							<td align="right" v-else>{{stsem === null ? '' : data.studiensemester[stsem].studienjahr_kurzbz}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre', 'semester')}}</th>
+							<td align="right" v-if="data.studierendenantrag_id">{{data.semester}}</td>
+							<td align="right" v-else>{{stsem === null ? '' : data.studiensemester[stsem].semester}}</td>
+						</tr>
+					</table>
+				</div>
+
+				<div class="col-sm-6 mb-3">
+					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-stsem'" class="form-label">
+						{{p.t('lehre', 'studiensemester')}}
+					</label>
+					<div v-if="data.studierendenantrag_id">
+						{{data.studiensemester_kurzbz}}
+					</div>
+					<div v-else>
+						<select
+							class="form-select"
+							:class="{'is-invalid': errors.studiensemester.length}"
+							v-model="stsem"
+							required
+							:id="'studierendenantrag-form-abmeldung-' + uuid + '-stsem'"
+							>
+							<option v-for="(stsem, index) in data.studiensemester" :key="index" :value="index">
+								{{stsem.studiensemester_kurzbz}}
+							</option>
+						</select>
+						<div v-if="errors.studiensemester.length" class="invalid-feedback">
+							{{errors.studiensemester.join(".")}}
+						</div>
+					</div>
+				</div>
+				<div class="col-sm-6 mb-3">
+					<label class="form-label">
+						{{p.t('studierendenantrag', 'antrag_datum_wiedereinstieg')}}
+					</label>
+
+					<div v-if="data.studierendenantrag_id">
+						{{datumWsFormatted}}
+					</div>
+					<div v-else>
+						<select v-if="stsem === null" class="form-select" disabled>
+							<option value="" disabled selected>
+								{{p.t('ui/select_studiensemester')}}
+							</option>
+						</select>
+						<select v-else ref="datum_wiedereinstieg" class="form-select">
+							<option
+								v-for="sem in data.studiensemester[stsem].wiedereinstieg"
+								:key="sem.studiensemester_kurzbz"
+								:value="sem.start"
+							>
+								{{sem.studiensemester_kurzbz}}
+							</option>
+						</select>
+					</div>
+
+					<div v-if="errors.datum_wiedereinstieg.length" class="invalid-feedback d-block">
+						{{errors.datum_wiedereinstieg.join(".")}}
+					</div>
+				</div>
+				<div v-if="data.studierendenantrag_id" class="mb-3">
+					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
+					<pre>{{data.grund}}</pre>
+				</div>
+				<div v-else class="col-sm-6 mb-3">
+					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-grund'" class="form-label">Grund:</label>
+					<textarea
+						class="form-control"
+						:class="{'is-invalid': errors.grund.length}"
+						:id="'studierendenantrag-form-abmeldung-' + uuid + '-grund'"
+						rows="5"
+						:disabled="saving"
+						ref="grund"
+						required
+						></textarea>
+					<div v-if="errors.grund.length" class="invalid-feedback">
+						{{errors.grund.join(".")}}
+					</div>
+				</div>
+				<div class="col-12 mb-3">
+
+					<div v-if="data.studierendenantrag_id">
+						<a v-if="data.dms_id" target="_blank" :href="siteUrl + '/lehre/Antrag/Attachment/Show/' + data.dms_id"> {{p.t('studierendenantrag', 'antrag_dateianhaenge')}} </a>
+						<span v-else>{{p.t('studierendenantrag', 'no_attachments')}}</span>
+					</div>
+					<div v-else>
+						<label
+							:for="'studierendenantrag-form-abmeldung-' + uuid + '-attachment'"
+							class="form-label">
+							{{p.t('studierendenantrag', 'antrag_dateianhaenge')}}
+						</label>
+						<input
+							class="form-control"
+							type="file"
+							ref="attachment"
+							:id="'studierendenantrag-form-abmeldung-' + uuid + '-attachment'"
+							name="attachment">
+					</div>
+				</div>
+				<div class="col-12 text-end">
+					<button
+						v-if="!data.studierendenantrag_id"
+						type="button"
+						class="btn btn-primary"
+						@click="createAntrag"
+						:disabled="saving"
+						>
+						{{p.t('studierendenantrag', 'btn_create_Unterbrechung')}}
+					</button>
+					<button
+						v-else-if="data.status == 'Erstellt'"
+						type="button"
+						class="btn btn-danger"
+						@click="cancelAntrag"
+						:disabled="saving"
+						>
+						{{p.t('studierendenantrag', 'btn_cancel')}}
+					</button>
+				</div>
+			</div>
+			<template v-slot:error="{errorMessage}">
+				<div class="alert alert-danger m-0" role="alert">
+					{{ errorMessage }}
+				</div>
+			</template>
+		</core-fetch-cmpt>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Form/Wiederholung.js b/public/js/components/Studierendenantrag/Form/Wiederholung.js
new file mode 100644
index 000000000..4cbc32d88
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Form/Wiederholung.js
@@ -0,0 +1,212 @@
+import {CoreFetchCmpt} from '../../Fetch.js';
+import VueDatepicker from '../../vueDatepicker.js.php';
+import Phrasen from '../../../mixins/Phrasen.js';
+
+var _uuid = 0;
+
+export default {
+	components: {
+		CoreFetchCmpt,
+		VueDatepicker
+	},
+	mixins: [
+		Phrasen
+	],
+	emits: [
+		'setInfos',
+		'setStatus',
+		'update:status'
+	],
+	props: {
+		status: String,
+		prestudentId: Number,
+		studierendenantragId: Number
+	},
+	data() {
+		return {
+			data: null,
+			saving: false,
+			errors: {
+				grund: [],
+				default: []
+			},
+			siteUrl: FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router,
+			infos: []
+		}
+	},
+	computed: {
+		statusSeverity() {
+			switch (this.data.status)
+			{
+				case 'Erstellt': return 'info';
+				case 'Genehmigt': return 'success';
+				case 'Verzichtet': return 'danger';
+				default: return 'info';
+			}
+		},
+		loadUrl() {
+			return '/components/Antrag/Wiederholung/getDetailsForNewAntrag/' +
+				this.prestudentId;
+		},
+		datumPruefungFormatted() {
+			if(!this.data.pruefungsdatum)
+				return '';
+			let datum = new Date(this.data.pruefungsdatum);
+			return datum.toLocaleDateString();
+		}
+	},
+	methods: {
+		load() {
+			return axios.get(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				this.loadUrl
+			).then(
+				result => {
+					this.data = result.data.retval;
+					if (!this.data.status || this.data.status == 'ErsteAufforderungVersandt' || this.data.status == 'ZweiteAufforderungVersandt')
+						this.data.status = 'Offen';
+					this.$emit('update:status', this.data.status);
+					this.$emit("setStatus", {
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							severity: this.statusSeverity
+						});
+					return result;
+				}
+			);
+		},
+		createAntrag() {
+			this.createAntragWithStatus(true);
+		},
+		cancelAntrag() {
+			this.createAntragWithStatus(false);
+		},
+		createAntragWithStatus(repeat) {
+			let func = repeat ? 'createAntrag' : 'cancelAntrag';
+			let nextState = repeat ? 'Erstellt' : 'Verzichtet';
+
+			this.$emit('setStatus', {
+				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t_ref('studierendenantrag', 'status_saving')}),
+				severity: 'warning'
+			});
+			this.saving = true;
+			for(var k in this.errors)
+				this.errors[k] = [];
+
+			axios.post(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Wiederholung/' + func + '/',
+				{
+					prestudent_id: this.data.prestudent_id,
+					studiensemester: this.data.studiensemester_kurzbz
+				}
+			).then(
+				result => {
+					if (result.data.error)
+					{
+						for (var k in result.data.retval)
+						{
+							if (this.errors[k] !== undefined)
+								this.errors[k].push(result.data.retval[k]);
+							else
+								this.errors.default.push(result.data.retval[k]);
+						}
+						this.$emit('setStatus', {
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t_ref('studierendenantrag', 'status_error')}),
+							severity: 'danger'
+						});
+					}
+					else
+					{
+						if (result.data.retval === true)
+							document.location += "";
+						this.data = result.data.retval;
+						if (!this.data.status)
+							this.data.status = nextState;
+						this.$emit('update:status', this.data.status);
+						this.$emit("setStatus", {
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							severity: this.statusSeverity
+						});
+					}
+					this.saving = false;
+				}
+			);
+		}
+	},
+	created() {
+		this.uuid = _uuid++;
+	},
+	mounted() {
+		this.infos = [...Array(5).keys()].map(n => ({
+			body: this.p.t_ref('studierendenantrag', 'infotext_Wiederholung_' + n)
+		}));
+		this.$emit('setInfos', this.infos);
+	},
+	template: `
+	<div class="studierendenantrag-form-wiederholung">
+		<core-fetch-cmpt :api-function="load">
+			<div class="row">
+				<div class="col-12">
+					<div v-for="error in errors.default" class="alert alert-danger" role="alert" v-html="error">
+					</div>
+					<table class="table">
+						<tr>
+							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<td align="right">{{data.bezeichnung}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<td align="right">{{data.orgform_bezeichnung}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<td align="right">{{data.name}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<td align="right">{{data.matrikelnr}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('studierendenantrag', 'antrag_Wiederholung_pruefung')}}</th>
+							<td align="right">{{data.lvbezeichnung}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('studierendenantrag', 'antrag_Wiederholung_pruefung_date')}}</th>
+							<td align="right">{{datumPruefungFormatted}}</td>
+						</tr>
+					</table>
+				</div>
+
+				<div class="col-12 d-flex justify-content-end gap-2">
+					<button
+						v-if="!data.studierendenantrag_id || data.status == 'Offen'"
+						type="button"
+						class="btn btn-primary"
+						@click="createAntrag"
+						:disabled="saving"
+					>
+						{{p.t('studierendenantrag/antrag_Wiederholung_button_yes')}}
+					</button>
+					<button
+						v-if="!data.studierendenantrag_id || data.status == 'Offen'"
+						type="button"
+						class="btn btn-danger"
+						@click="cancelAntrag"
+						:disabled="saving"
+					>
+						{{p.t('studierendenantrag/antrag_Wiederholung_button_no')}}
+					</button>
+				</div>
+			</div>
+			<template v-slot:error="{errorMessage}">
+				<div class="alert alert-danger m-0" role="alert">
+					{{ errorMessage }}
+				</div>
+			</template>
+		</core-fetch-cmpt>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Infoblock.js b/public/js/components/Studierendenantrag/Infoblock.js
new file mode 100644
index 000000000..59e3cce96
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Infoblock.js
@@ -0,0 +1,19 @@
+export default {
+	props: {
+		infos: Array,
+	},
+	template: `
+	<div class="studierendenantrag-infoblock">
+		<div v-for="(info, index) in infos" :key="index" class="alert d-flex align-items-center" :class="'alert-' + (info.severity || 'info')" role="alert">
+			<i class="fa fa-lg flex-shrink-0 me-3" :class="'fa-' + (info.icon || 'info-circle')" role="img" aria-label="Info:"></i>
+			<div v-if="info.title">
+				<h4 v-if="info.title" class="alert-heading">
+					{{info.title}}
+				</h4>
+				<p class="mb-0" v-html="info.body"></p>
+			</div>
+			<p v-else class="mb-0" v-html="info.body"></p>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
new file mode 100644
index 000000000..f08da3879
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -0,0 +1,312 @@
+import LeitungHeader from './Leitung/Header.js';
+import LeitungActions from './Leitung/Actions.js';
+import LeitungTable from './Leitung/Table.js';
+import GrundPopup from './Leitung/GrundPopup.js';
+import LvPopup from './Leitung/LvPopup.js';
+import BsAlert from '../Bootstrap/Alert.js';
+import FhcLoader from '../Loader.js';
+import Phrasen from '../../mixins/Phrasen.js';
+
+export default {
+	components: {
+		LeitungHeader,
+		LeitungTable,
+		LeitungActions,
+		FhcLoader
+	},
+	mixins: [Phrasen],
+	props: {
+		stgL: Array,
+		stgA: Array
+	},
+	data() {
+		return {
+			filter: undefined,
+			selectedData: [],
+			columns: []
+		}
+	},
+	computed: {
+		stgs(){
+			if(!this.stgL || !this.stgA)
+				return[];
+			let undesiredOutput = [...this.stgL, ...this.stgA];
+			let desiredOutput = undesiredOutput.reduce(
+				(accumulator, currentValue)=>
+				{
+					accumulator[currentValue.studiengang_kz] = currentValue;
+					return accumulator;
+				},
+				{}
+			);
+			return Object.values(desiredOutput);
+
+		},
+		stgkzL()
+		{
+			if (!this.stgL)
+				return [];
+			return this.stgL.map(stg => stg.studiengang_kz);
+		},
+		stgkzA()
+		{
+			if (!this.stgA)
+				return [];
+			return this.stgA.map(stg => stg.studiengang_kz);
+		}
+	},
+	methods: {
+		changeFilter(evt) {
+			this.filter = evt.target.value || undefined;
+			this.reload();
+		},
+		reload() {
+			this.$refs.table.reload(this.filter);
+		},
+		download() {
+			this.$refs.table.download();
+		},
+		actionApprove(evt, oks) {
+			var antraege = evt || [...this.selectedData];
+
+			if (!oks) {
+				oks = [];
+			}
+			var currentAntrag = antraege.shift();
+			if (currentAntrag) {
+				if (currentAntrag.typ != 'Wiederholung')
+				{
+					oks.push(currentAntrag);
+					this.actionApprove(antraege, oks);
+				}
+				else
+				{
+					let countAntrage = 0;
+					LvPopup
+						.popup(this.p.t('studierendenantrag','title_show_lvs', currentAntrag), {
+							antragId: currentAntrag.studierendenantrag_id,
+							footer: true,
+							dialogClass: 'modal-lg',
+							countRemaining : antraege.filter(antrag => antrag.typ == 'Wiederholung').length
+						})
+						.then(result => {
+							if (result[0]) {
+								oks.push(currentAntrag);
+								if (result[1])
+									while (antraege.length)
+										oks.push(antraege.pop());
+							} else if (result[1]) {
+								while (antraege.length) {
+									currentAntrag = antraege.pop();
+									if (currentAntrag.typ != 'Wiederholung')
+										oks.push(currentAntrag);
+								}
+							}
+							this.actionApprove(antraege, oks);
+						})
+						.catch(() => {});
+				}
+			} else {
+				this.$refs.loader.show();
+				axios
+					.all(
+						oks.map(
+							antrag => axios.post(
+								FHC_JS_DATA_STORAGE_OBJECT.app_root +
+								FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+								'/components/Antrag/Leitung/approve' + antrag.typ,
+								{
+									studierendenantrag_id: antrag.studierendenantrag_id
+								}
+							)
+						)
+					)
+					.then(this.showValidation)
+					.catch(this.showError);
+			}
+		},
+		actionReject(evt, gruende) {
+			var antraege = evt || this.selectedData;
+			if(!gruende)
+			{
+				gruende = [];
+			}
+			var currentAntrag = antraege.pop();
+			if(currentAntrag)
+				GrundPopup.popup(this.p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id})).then(result =>
+				{
+					currentAntrag.grund = result[0];
+					gruende.push(currentAntrag);
+					if(result[1])
+					{
+						while (antraege.length)
+						{
+							currentAntrag = antraege.pop();
+							currentAntrag.grund = result[0];
+							gruende.push(currentAntrag);
+						}
+					}
+					this.actionReject(antraege, gruende);
+				})
+				.catch(() => {});
+			else
+			{
+				this.$refs.loader.show();
+				axios
+					.all(
+						gruende.map(
+							antrag => axios.post(
+								FHC_JS_DATA_STORAGE_OBJECT.app_root +
+								FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+								'/components/Antrag/Leitung/reject' + antrag.typ,
+								{
+									studierendenantrag_id: antrag.studierendenantrag_id,
+									grund: antrag.grund
+								}
+							)
+						)
+					)
+					.then(this.showValidation)
+					.catch(this.showError);
+			}
+		},
+		actionReopen(evt) {
+			var antraege = evt || this.selectedData;
+			this.$refs.loader.show();
+			axios
+				.all(
+					antraege.map(
+						antrag => axios.post(
+							FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+							'/components/Antrag/Leitung/reopenAntrag/',
+							{
+								studierendenantrag_id: antrag.studierendenantrag_id
+							}
+						)
+					)
+				)
+				.then(this.showValidation)
+				.catch(this.showError);
+		},
+		actionObject(evt) {
+			var antraege = evt || this.selectedData;
+			this.$refs.loader.show();
+			axios
+				.all(
+					antraege.map(
+						antrag => axios.post(
+							FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+							'/components/Antrag/Leitung/objectAntrag/',
+							{
+								studierendenantrag_id: antrag.studierendenantrag_id
+							}
+						)
+					)
+				)
+				.then(this.showValidation)
+				.catch(this.showError);
+		},
+		actionoObjectionDeny(evt, gruende) {
+			var antraege = evt || this.selectedData;
+			this.$refs.loader.show();
+			axios
+				.all(
+					antraege.map(
+						antrag => axios.post(
+							FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+							'/components/Antrag/Leitung/objectionDeny/',
+							{
+								studierendenantrag_id: antrag.studierendenantrag_id
+							}
+						)
+					)
+				)
+				.then(this.showValidation)
+				.catch(this.showError);
+		},
+		actionObjectionApprove(evt, gruende) {
+			var antraege = evt || this.selectedData;
+			this.$refs.loader.show();
+			axios
+				.all(
+					antraege.map(
+						antrag => axios.post(
+							FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+							'/components/Antrag/Leitung/objectionApprove/',
+							{
+								studierendenantrag_id: antrag.studierendenantrag_id
+							}
+						)
+					)
+				)
+				.then(this.showValidation)
+				.catch(this.showError);
+		},
+		showValidation(results) {
+			var errors = results.filter(res => res.data.error);
+			this.$refs.loader.hide();
+			if (errors.length) {
+				let errorMsg = errors.map(
+					error =>
+					'Antrag ' +
+					JSON.parse(error.config.data).studierendenantrag_id +
+					'\n' +
+					Object.values(error.data.retval).join('\n')
+				).join('\n');
+
+				BsAlert.popup(errorMsg, {dialogClass: 'alert alert-danger'});
+			}
+			this.reload();
+		},
+		showError(error) {
+			this.$refs.loader.hide();
+			let msg = error.response.data;
+			if (msg.replace(/^\s+/, '').substr(0, 9) == '<!DOCTYPE' || msg.replace(/^\s+/, '').substr(0, 4).toLowerCase() == '<div')
+				msg = error.message;
+			BsAlert.popup(msg, {dialogClass: 'alert alert-danger'});
+		}
+	},
+	template: `
+	<div class="studierendenantrag-leitung fhc-table">
+		<leitung-header
+			:stgs="stgs"
+			@input="changeFilter"
+			>
+		</leitung-header>
+
+		<leitung-actions
+			:stg-a="stgkzA"
+			:stg-l="stgkzL"
+			:selectedData="selectedData"
+			:columns="columns"
+			@reload="reload"
+			@action:approve="actionApprove"
+			@action:reject="actionReject"
+			@action:reopen="actionReopen"
+			@download="download"
+			>
+		</leitung-actions>
+
+		<leitung-table
+			ref="table"
+			:stg-a="stgkzA"
+			:stg-l="stgkzL"
+			v-model:columnData="columns"
+			v-model:selectedData="selectedData"
+			@action:approve="actionApprove"
+			@action:reject="actionReject"
+			@action:reopen="actionReopen"
+			@action:object="actionObject"
+			@action:objectionDeny="actionoObjectionDeny"
+			@action:objectionApprove="actionObjectionApprove"
+			>
+		</leitung-table>
+
+		<fhc-loader ref="loader"></fhc-loader>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions.js b/public/js/components/Studierendenantrag/Leitung/Actions.js
new file mode 100644
index 000000000..71ada5c20
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Leitung/Actions.js
@@ -0,0 +1,87 @@
+import ActionsNew from './Actions/New.js';
+import ActionsColumns from './Actions/Columns.js';
+import Phrasen from '../../../mixins/Phrasen.js';
+
+export default {
+	components: {
+		ActionsNew,
+		ActionsColumns
+	},
+	mixins: [Phrasen],
+	props: {
+		selectedData: Array,
+		columns: Array,
+		stgL: Array,
+		stgA: Array
+	},
+	emits: [
+		'reload',
+		'download',
+		'action:approve',
+		'action:reject',
+		'action:reopen'
+	],
+	data() {
+		return {
+			currentStudent: ''
+		}
+	},
+	computed: {
+		selectedCanBeApproved() {
+			if (!this.selectedData.length)
+				return false;
+			if (!this.selectedData.every(val => this.stgL.includes(val.studiengang_kz)))
+				return false;
+			return this.selectedData.filter(row => {
+				return (row.typ == 'Wiederholung' && row.status == 'Lvszugewiesen') || (row.typ != 'Wiederholung' && (row.status == 'Erstellt' || row.status == 'ErstelltStgl'));
+			}).length == this.selectedData.length;
+		},
+		selectedCanBeRejected() {
+			if (!this.selectedData.length)
+				return false;
+			if (!this.selectedData.every(val => this.stgL.includes(val.studiengang_kz)))
+				return false;
+			return this.selectedData.filter(row => {
+				return (row.typ == 'Unterbrechung' && row.status == 'Erstellt');
+			}).length == this.selectedData.length;
+		},
+		selectedCanBeReopened() {
+			if (!this.selectedData.length)
+				return false;
+			if (!this.selectedData.every(val => this.stgA.includes(val.studiengang_kz)))
+				return false;
+			return this.selectedData.filter(row => {
+				return (row.typ == 'Wiederholung' && row.status == 'Verzichtet');
+			}).length == this.selectedData.length;
+		},
+		newUrl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + this.currentStudent;
+		}
+	},
+	methods: {
+		hideModal() {
+			bootstrap.Modal.getInstance(this.$refs.modal).hide();
+		}
+	},
+	template: `
+	<div class="studierendenantrag-leitung-actions fhc-table-actions d-flex flex-wrap justify-content-between mb-2">
+		<div class="d-flex align-items-center gap-2">
+			<actions-new @reload="$emit('reload')"></actions-new>
+			<button type="button" class="btn btn-outline-secondary" @click="$emit('reload')" :title="p.t('table','reload')">
+				<i class="fa-solid fa-rotate-right"></i>
+			</button>
+			<span>{{p.t('table', 'with_selected', {count: selectedData.length})}}</span>
+			<button v-if="stgL.length" :disabled="!selectedCanBeApproved" type="button" class="btn btn-outline-secondary" @click="$emit('action:approve')">{{p.t('studierendenantrag', 'btn_approve')}}</button>
+			<button v-if="stgL.length" :disabled="!selectedCanBeRejected" type="button" class="btn btn-outline-secondary" @click="$emit('action:reject')">{{p.t('studierendenantrag', 'btn_reject')}}</button>
+			<button v-if="stgA.length" :disabled="!selectedCanBeReopened" type="button" class="btn btn-outline-secondary" @click="$emit('action:reopen')">{{p.t('studierendenantrag', 'btn_reopen')}}</button>
+		</div>
+		<div>
+			<button type="button" class="btn btn-link" data-bs-toggle="collapse" href="#columns" :title="p.t('table','spaltenEinAusblenden')"><i class="fa fa-table-columns"></i></button>
+			<button type="button" class="btn btn-link" @click="$emit('download')" :title="p.t('table','download')"><i class="fa fa-download"></i></button>
+		</div>
+		<div class="col-12">
+			<actions-columns id="columns" class="collapse" :columns="columns"></actions-columns>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
new file mode 100644
index 000000000..df2b2a0de
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
@@ -0,0 +1,25 @@
+export default {
+	props: {
+		columns: Array
+	},
+	methods: {
+		toggleColumn(col) {
+			col.visible = !col.visible;
+			col.original.toggle()
+		},
+		show() {
+
+		}
+	},
+	template: `
+	<div class="studierendenantrag-leitung-actions-columns">
+		<div class="card mt-3">
+			<div class="card-body d-flex flex-wrap gap-2 justify-content-center">
+				<a v-for="col in columns" class="btn" :class="col.visible ? 'btn-dark' : 'btn-outline-dark'" href="#" @click.prevent="toggleColumn(col)">
+					{{col.title}}
+				</a>
+			</div>
+		</div>
+	</div>
+	`
+}
\ No newline at end of file
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
new file mode 100644
index 000000000..8a98a6aa5
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
@@ -0,0 +1,118 @@
+import BsAlert from '../../../Bootstrap/Alert.js';
+import BsModal from '../../../Bootstrap/Modal.js';
+import Phrasen from '../../../../mixins/Phrasen.js';
+
+export default {
+	components: {
+		BsModal
+	},
+	mixins: [
+		Phrasen
+	],
+	emits: [
+		'reload'
+	],
+	data() {
+		return {
+			data: [],
+			student: '',
+			stg: ''
+		}
+	},
+	computed: {
+		newUrl() {
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/lehre/Studierendenantrag/abmeldung/' + this.student;
+		},
+		students() {
+			if (!this.stg)
+				return [];
+			if (!this.data[this.stg])
+				return [];
+			return this.data[this.stg].studenten.sort(
+				(a, b) => a.nachname == b.nachname ?
+					a.vorname > b.vorname :
+					a.nachname > b.nachname
+			);
+		},
+		hasNoData() {
+			return !Object.values(this.data).length;
+		}
+	},
+	methods: {
+		openForm() {
+			bootstrap.Modal.getInstance(this.$refs.modal).hide();
+			BsModal.popup(Vue.h('iframe', {
+				src: this.newUrl,
+				class: 'position-absolute top-0 start-0 w-100 h-100'
+			}), {
+				dialogClass: 'modal-fullscreen'
+			}, this.p.t('studierendenantrag', 'antrag_header')).then(() => {
+				this.loadSelects();
+				this.$emit('reload');
+			});
+		},
+		loadSelects() {
+			return axios.get(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Abmeldung/getStudiengaengeAssistenz/'
+			).then(
+				result => {
+					if (result.data.error) {
+						BsAlert.popup(result.data.retval, {dialogClass: 'alert alert-danger'});
+					} else {
+						this.data = result.data.retval;
+					}
+					return result;
+				}
+			);
+		}
+	},
+	created() {
+		return this.loadSelects();
+	},
+	template: `
+	<div class="studierendenantrag-leitung-actions-new" v-if="data">
+		<button type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#newAntragModal" :disabled="hasNoData">
+			<i class="fa fa-plus"></i>
+			{{p.t('studierendenantrag','btn_new')}}
+		</button>
+		<div ref="modal" class="modal fade" id="newAntragModal" tabindex="-1" aria-labelledby="newAntragModalLabel" aria-hidden="true">
+			<div class="modal-dialog">
+				<div class="modal-content">
+					<div class="modal-header">
+						<h5 class="modal-title" id="newAntragModalLabel">{{p.t('studierendenantrag','title_new_Abmeldung')}}</h5>
+						<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui','schliessen')"></button>
+					</div>
+					<div class="modal-body">
+						<div class="mb-3">
+							<label for="newAntragModalStg">{{p.t('lehre','studiengang')}}</label>
+							<select id="newAntragModalStg" class="form-select" v-model="stg">
+								<option v-for="(stg, stg_kz) in data" :value="stg_kz" :key="stg_kz">
+									{{stg.bezeichnung}} ({{stg.orgform}})
+								</option>
+							</select>
+						</div>
+						<div class="mb-3">
+							<label for="newAntragModalStudent">{{p.t('person','studentIn')}}</label>
+							<select v-model="student" id="newAntragModalStudent" class="form-select">
+								<option  v-for="(stg, stg_kz) in students" :value="stg.prestudent_id" :key="stg.prestudent_id">
+									{{stg.nachname}} {{stg.vorname}}
+								</option>
+							</select>
+						</div>
+					</div>
+					<div class="modal-footer">
+						<a :href="newUrl"
+							class="btn btn-primary"
+							target="_blank"
+							@click.prevent="openForm">
+							{{p.t('studierendenantrag','btn_create')}}
+						</a>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Leitung/GrundPopup.js b/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
new file mode 100644
index 000000000..d560dfb00
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
@@ -0,0 +1,62 @@
+
+import BsAlert from '../../Bootstrap/Alert.js';
+import Phrasen from '../../../mixins/Phrasen.js';
+
+export default {
+	mixins: [
+		BsAlert,
+		Phrasen
+	],
+	props: {
+		placeholder: String,
+		default: String
+	},
+	data: () => ({
+		value: '',
+		result: false,
+		check: false,
+		isInvalid: false
+	}),
+	methods: {
+		submit(){
+			if(!this.value)	{
+				this.isInvalid = true;
+					}
+			else {
+				this.result = [this.value, this.check];
+				this.hide();
+			}
+			return
+		}
+	},
+	created() {
+		if (this.default)
+			this.value = this.default;
+	},
+	popup(msg, options) {
+		if (typeof options === 'string')
+			options = { default: options };
+		return BsAlert.popup.bind(this)(msg, options);
+	},
+	template: `<bs-modal ref="modalContainer" class="bootstrap-prompt" v-bind="$props">
+		<template v-slot:title>
+			<slot></slot>
+		</template>
+		<template v-slot:default>
+			<div>
+				<textarea ref="input" class="form-control" :class="{'is-invalid' : isInvalid}" v-model="value"></textarea>
+				<div v-if="isInvalid" class="invalid-feedback">
+					{{p.t('kvp','new.error.required')}}
+				</div>
+			</div>
+			<div class="form-check">
+				<input ref="check" type="checkbox" class="form-check-input" id="cbid" v-model="check">
+				<label class="form-check-label" for="cbid">{{p.t('studierendenantrag','fuer_alle_uebernehmen')}}</label>
+			</div>
+		</template>
+		<template v-slot:footer>
+			<button type="button" class="btn btn-primary" @click="submit">{{p.t('ui','ok')}}</button>
+			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{p.t('ui','cancel')}}</button>
+		</template>
+	</bs-modal>`
+}
diff --git a/public/js/components/Studierendenantrag/Leitung/Header.js b/public/js/components/Studierendenantrag/Leitung/Header.js
new file mode 100644
index 000000000..388a93b7d
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Leitung/Header.js
@@ -0,0 +1,24 @@
+import Phrasen from '../../../mixins/Phrasen.js';
+
+export default {
+	mixins: [Phrasen],
+	props: {
+		stgs: Array
+	},
+	emits: [
+		'input'
+	],
+	template: `
+	<div class="studierendenantrag-leitung-header fhc-table-header d-flex align-items-center mb-2 gap-2">
+		<h3 class="h5 col m-0">{{p.t('studierendenantrag', 'studierendenantraege')}}</h3>
+		<div v-if="stgs.length > 1" class="col-auto">
+			<select ref="stg_select" class="form-select" @input="$emit('input', $event)">
+				<option value="">{{p.t('global', 'alle')}}</option>
+				<option v-for="stg in stgs" :key="stg.studiengang_kz" :value="stg.studiengang_kz">
+					{{stg.bezeichnung}} ({{stg.orgform}})
+				</option>
+			</select>
+		</div>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Leitung/LvPopup.js b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
new file mode 100644
index 000000000..045e98729
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
@@ -0,0 +1,142 @@
+import BsAlert from '../../Bootstrap/Alert.js';
+import {CoreFetchCmpt} from "../../Fetch.js";
+import Phrasen from '../../../mixins/Phrasen.js';
+
+export default {
+	components: {
+		CoreFetchCmpt
+	},
+	mixins: [
+		BsAlert,
+		Phrasen
+	],
+	props: {
+		footer: Boolean,
+		antragId: Number,
+		countRemaining: Number
+	},
+	data: () => ({
+		lvs: null,
+		refresh: true,
+		result: false,
+		check: false
+	}),
+	computed: {
+		lvzugelassen() {
+			let zwischen = {};
+			for (let k in this.lvs){
+				zwischen[k] = this.lvs[k].filter(lv=>lv.antrag_zugelassen);
+			}
+			return zwischen;
+		},
+		lvzugelassenLength() {
+			return Object.values(this.lvzugelassen).reduce((result, current) => result + current.length, 0);
+		}
+	},
+	methods: {
+		setlvs(param) {
+			if(param.error)
+			{
+				this.$refs.fetchCompt.error = true;
+				this.$refs.fetchCompt.errorMessage = param.retval;
+			}
+			else
+				this.lvs = param.retval;
+		},
+		loadlvs() {
+			if (!this.antragId)
+				return new Promise(() => {});
+			return axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Antrag/Wiederholung/getLvs/' + this.antragId);
+		},
+		submit(result) {
+			this.result = [result, this.check];
+			this.hide();
+		}
+	},
+	watch: {
+		antragId() {
+			Vue.nextTick(() => {
+				this.refresh = !this.refresh;
+			});
+		}
+	},
+	popup(msg, options) {
+		if (typeof options === 'string')
+			options = { default: options };
+		return BsAlert.popup.bind(this)(msg, options);
+	},
+	template: `<bs-modal ref="modalContainer" class="bootstrap-prompt" v-bind="$props">
+		<template v-slot:title>
+			<slot></slot>
+		</template>
+		<template v-slot:default>
+			<core-fetch-cmpt
+				ref="fetchCompt"
+				:refresh="refresh"
+				:api-function="loadlvs"
+				@data-fetched="setlvs">
+				<template #default>
+					<div v-if="lvzugelassenLength == 0">
+						{{p.t('studierendenantrag','error_no_lvs')}}
+					</div>
+					<table v-else class="table caption-top" v-for="(lv_arr, sem) in lvzugelassen" :key="sem">
+						<caption>
+							<span class="d-flex justify-content-between">
+								<span>{{ p.t('studierendenantrag',['title_lv_nicht_zugelassen', 'title_lv_wiederholen'][sem.substr(0,1)-1]) }}</span>
+								<span>{{sem.substr(1)}}</span>
+							</span>
+						</caption>
+						<thead>
+							<tr>
+								<th scope="col">{{p.t('ui','bezeichnung')}}</th>
+								<th scope="col">{{p.t('lehre','lehrform')}}</th>
+								<th scope="col">ECTS</th>
+								<th scope="col">{{p.t('lehre','note')}}</th>
+								<th scope="col">
+									{{p.t('global','anmerkung')}}
+								</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr v-for="lv in lv_arr">
+								<td>
+									<label class="w-100 m-1" :for="'flexSwitchCheckLv_' + lv.lehrveranstaltung_id">
+										{{lv.bezeichnung}}
+									</label>
+								</td>
+								<td>
+									<div class="m-1">
+										{{lv.lehrform_kurzbz}}
+									</div>
+								</td>
+								<td>
+									<div class="m-1">
+										{{lv.ects}}
+									</div>
+								</td>
+								<td>
+									<div class="m-1">
+										{{lv.note || '---'}}
+									</div>
+								</td>
+								<td>
+									<div class="m-1">
+									{{lv.antrag_anmerkung}}
+									</div>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+				</template>
+			</core-fetch-cmpt>
+		</template>
+		<template v-if="footer" v-slot:footer>
+			<div v-if="countRemaining > 0" class="form-check flex-grow-1">
+				<input ref="check" type="checkbox" class="form-check-input" id="cbid" v-model="check">
+				<label class="form-check-label" for="cbid">{{p.t('studierendenantrag','fuer_x_uebernehmen', {count: countRemaining})}}</label>
+			</div>
+			<button type="button" class="btn btn-primary" @click="submit(true)">{{p.t('studierendenantrag','btn_approve')}}</button>
+			<button type="button" class="btn btn-secondary" @click="submit(false)">{{p.t('ui','skip')}}</button>
+		</template>
+	</bs-modal>`
+}
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
new file mode 100644
index 000000000..309678ae1
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -0,0 +1,388 @@
+import BsModal from '../../Bootstrap/Modal.js';
+import {CoreFetchCmpt} from '../../Fetch.js';
+import LvPopup from './LvPopup.js';
+import Phrasen from '../../../mixins/Phrasen.js';
+import { dateFilter } from '../../../tabulator/filters/Dates.js';
+
+export default {
+	components: {
+		BsModal,
+		CoreFetchCmpt,
+		LvPopup
+	},
+	mixins: [Phrasen],
+	props: {
+		selectedData: Array,
+		columnData: Array,
+		stgL: Array,
+		stgA: Array
+	},
+	emits: [
+		'update:columnData',
+		'update:selectedData',
+		'action:approve',
+		'action:reject',
+		'action:reopen',
+		'action:object',
+		'action:objectionDeny',
+		'action:objectionApprove'
+	],
+	data() {
+		return {
+			ajaxUrl: FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Leitung/getAntraege/',
+			table: null,
+			lastHistoryClickedId: null,
+			historyData: [],
+			lvsData: null
+		}
+	},
+	methods: {
+		reload(stg) {
+			this.table.replaceData(this.ajaxUrl + (stg || ''));
+		},
+		download() {
+			this.table.download("csv", "data.csv");
+		},
+		getHistory() {
+			if (this.lastHistoryClickedId === null)
+				return null;
+			return axios.get(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Leitung/getHistory/' +
+				this.lastHistoryClickedId
+			).then(res => {
+				this.historyData = res.data.retval.sort((a, b) => a.insertamum > b.insertamum);
+			});
+		},
+		showHistoryGrund(grund) {
+			this.$refs.modalGrund.$el.addEventListener(
+				'hidden.bs.modal',
+				this.$refs.history.show,
+				{
+					once: true
+				}
+			);
+			this.$refs.modalGrundPre.innerHTML = grund;
+		},
+		showLVs(data) {
+			this.lvsData = data;
+			this.$refs.lvList.show();
+		}
+	},
+	mounted() {
+		function dateFormatter (cell) {
+			let val = cell.getValue();
+			if (!val)
+				return '';
+			let date = new Date(val);
+			return date.toLocaleDateString();
+		}
+
+		this.table = new Tabulator(this.$refs.table, {
+			placeholder:"Keine zu bearbeitenden Datensätze",
+			movableColumns: true,
+			maxHeight: '50vh',
+			layout: "fitDataStretch", // TODO(chris): wont work when changed
+			ajaxURL: this.ajaxUrl,
+			persistence: { // NOTE(chris): do not store column titles
+				sort: true, //persist column sorting
+				filter: true, //persist filters
+				headerFilter: true, //persist header filters
+				group: true, //persist row grouping
+				page: true, //persist page
+				columns: ["width", "visible"], //persist columns
+			},
+			persistenceID: 'studierendenantrag_leitung',
+			columns: [
+				{
+					formatter: 'rowSelection',
+					titleFormatter: 'rowSelection',
+					titleFormatterParams: {
+						rowRange: 'active'
+					},
+					hozAlign: 'center',
+					headerSort: false
+				},
+				{
+					field: 'studierendenantrag_id',
+					title: '#'
+				},
+				{
+					field: 'bezeichnung',
+					title: this.p.t('lehre', 'studiengang'),
+					headerFilter: 'list',
+					headerFilterParams: {
+						valuesLookup: true,
+						clearable: true,
+						autocomplete: true,
+					}
+				},
+				{
+					field: 'orgform',
+					title: this.p.t('lehre', 'organisationsform'),
+					headerFilter: 'list',
+					headerFilterParams: {
+						valuesLookup: true,
+						clearable: true,
+						autocomplete: true,
+					}
+				},
+				{
+					field: 'typ',
+					title: this.p.t('studierendenantrag', 'antrag_typ'),
+					headerFilter: 'list',
+					headerFilterParams: {
+						valuesLookup: true,
+						clearable: true,
+						autocomplete: true,
+					},
+					formatter: (cell, formatterParams, onRendered) => {
+						return this.p.t('studierendenantrag','antrag_typ_' + cell.getValue());
+					}
+				},
+				{
+					field: 'statustyp',
+					title: this.p.t('studierendenantrag', 'antrag_status'),
+					headerFilter: 'list',
+					headerFilterParams: {
+						valuesLookup: true,
+						clearable: true,
+						autocomplete: true,
+					}
+				},
+				{
+					field: 'matrikelnr',
+					title: this.p.t('person', 'personenkennzeichen'),
+					headerFilter: 'input'
+				},
+				{
+					field: 'prestudent_id',
+					title: this.p.t('lehre', 'prestudent'),
+					headerFilter: 'input'
+				},
+				{
+					field: 'name',
+					title: this.p.t('global', 'name'),
+					mutator: (value, data) => (data.vorname + ' ' + data.nachname).replace(/^\s*(.*)\s*$/, '$1'),
+					headerFilter: 'input'
+				},
+				{
+					field: 'datum',
+					title: this.p.t('global', 'datum'),
+					formatter: dateFormatter,
+					headerFilterFunc: 'dates',
+					headerFilter: dateFilter
+				},
+				{
+					field: 'datum_wiedereinstieg',
+					title: this.p.t('studierendenantrag', 'antrag_datum_wiedereinstieg'),
+					formatter: dateFormatter,
+					headerFilterFunc: 'dates',
+					headerFilter: dateFilter
+				},
+				{
+					field: 'grund',
+					title: this.p.t('studierendenantrag', 'antrag_grund'),
+					formatter: (cell, formatterParams, onRendered) => {
+						let link = document.createElement('a'),
+							val = cell.getValue();
+						link.href = "#modal-grund";
+						link.setAttribute('data-bs-toggle', 'modal');
+						link.innerHTML = this.p.t('studierendenantrag', 'antrag_grund');
+						link.addEventListener('click', () => {
+							this.$refs.modalGrundPre.innerHTML = val;
+						});
+
+						return val ? link : '';
+					}
+				},
+				{
+					field: 'dms_id',
+					title: this.p.t('studierendenantrag', 'antrag_dateianhaenge'),
+					formatter: (cell, formatterParams, onRendered) => {
+						let val = cell.getValue();
+						if (!val)
+							return '';
+						return '<a href="' + FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+							'/lehre/Antrag/Attachment/show/' + val + '" target="_blank"><i class="fa fa-paperclip" aria-hidden="true"></i> ' + this.p.t('studierendenantrag', 'antrag_anhang') + '</a>';
+					}
+				},
+				{
+					field: 'actions',
+					formatter: (cell, formatterParams, onRendered) => {
+						let container = document.createElement('div'),
+							data = cell.getData();
+
+						container.className = "d-flex gap-2";
+
+						if((data.typ == 'Abmeldung' || data.typ == 'Unterbrechung') && (data.status == 'Genehmigt'))
+						{
+							// NOTE(chris): Download PDF
+							let button = document.createElement('a');
+							button.innerHTML = '<i class="fa-solid fa-download" title="' + this.p.t('studierendenantrag', 'btn_download_antrag') + '"></i>';
+							button.className = "btn btn-outline-secondary";
+							button.target = "_blank";
+							button.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							'content/pdfExport.php?xml=Antrag' + data.typ + '.xml.php&xsl=Antrag' + data.typ + '&id='+ data.studierendenantrag_id +'&output=pdf';
+							container.append(button);
+						}
+						if(data.typ == 'Abmeldung' && data.status == 'GenehmigtStgl')
+						{
+							// NOTE(chris): Object
+							let button = document.createElement('button');
+							button.innerHTML = this.p.t('studierendenantrag', 'btn_object');
+							button.className = "btn btn-outline-secondary";
+							button.addEventListener('click',() => this.$emit('action:object', [cell.getData()]));
+							container.append(button);
+						}
+
+						if(data.typ == 'Abmeldung' && data.status == 'Beeinsprucht')
+						{
+							// NOTE(chris): Deny Objection
+							let button = document.createElement('button');
+							button.innerHTML = this.p.t('studierendenantrag', 'btn_objection_deny');
+							button.className = "btn btn-outline-secondary";
+							button.addEventListener('click',() => this.$emit('action:objectionDeny', [cell.getData()]));
+							container.append(button);
+
+							// NOTE(chris): Approve Objection
+							button = document.createElement('button');
+							button.innerHTML = this.p.t('studierendenantrag', 'btn_objection_approve');
+							button.className = "btn btn-outline-secondary";
+							button.addEventListener('click',() => this.$emit('action:objectionApprove', [cell.getData()]));
+							container.append(button);
+						}
+
+						if (this.stgA.includes(data.studiengang_kz))
+						{
+							// NOTE(chris): Reopen
+							if (data.typ == 'Wiederholung' && data.status == 'Verzichtet') {
+								let button = document.createElement('button');
+								button.innerHTML = this.p.t('studierendenantrag', 'btn_reopen');
+								button.className = "btn btn-outline-secondary";
+								button.addEventListener('click',() => this.$emit('action:reopen', [cell.getData()]));
+								container.append(button);
+							}
+							// NOTE(chris): Lv Zuweisen
+							if (data.typ == 'Wiederholung' && (data.status == 'Erstellt' || data.status == 'Lvszugewiesen')) {
+								let button = document.createElement('a');
+								button.innerHTML = this.p.t('studierendenantrag', 'btn_lvzuweisen');
+								button.className = "btn btn-outline-secondary";
+								button.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+								FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+								'/lehre/Antrag/Wiederholung/assistenz/' +
+								cell.getData().studierendenantrag_id + '/frame';
+								button.onclick = e => {
+									e.preventDefault();
+									BsModal.popup(Vue.h('iframe', {
+										src: button.href,
+										class: 'position-absolute top-0 start-0 w-100 h-100'
+									}), {
+										dialogClass: 'modal-fullscreen'
+									}, this.p.t('studierendenantrag', 'title_lvzuweisen', cell.getData())).then(() => {
+										this.$emit('reload');
+									});
+								};
+								container.append(button);
+							}
+						}
+
+						if (this.stgL.includes(data.studiengang_kz))
+						{
+							// NOTE(chris): Approve
+							if ((data.typ == 'Wiederholung' && data.status == 'Lvszugewiesen') || (data.typ != 'Wiederholung' && (data.status == 'Erstellt' || data.status == 'ErstelltStgl'))) {
+								let button = document.createElement('button');
+								button.innerHTML = this.p.t('studierendenantrag', 'btn_approve');
+								button.className = "btn btn-outline-secondary";
+								button.addEventListener('click', () => this.$emit('action:approve', [cell.getData()]));
+								container.append(button);
+							}
+							// NOTE(chris): Reject (Unterbrechung braucht grund)
+							if (data.status == 'Erstellt' && data.typ == 'Unterbrechung') {
+								let button = document.createElement('button');
+								button.innerHTML = this.p.t('studierendenantrag', 'btn_reject');
+								button.className = "btn btn-outline-secondary";
+								button.addEventListener('click', () => this.$emit('action:reject', [cell.getData()]));
+								container.append(button);
+							}
+						}
+
+						// NOTE(chris): Show LVs
+						if (data.typ == 'Wiederholung' && (data.status == 'Lvszugewiesen' || data.status == 'Genehmigt')) {
+							let button = document.createElement('button');
+							button.innerHTML = this.p.t('studierendenantrag', 'btn_show_lvs');
+							button.className = "btn btn-outline-secondary";
+							button.addEventListener('click', () => this.showLVs(cell.getData()));
+							container.append(button);
+						}
+
+						// TODO(chris): not yet perfect
+						onRendered(() => {
+							cell.getColumn().setWidth(true);
+						});
+
+						return container;
+					}
+				}
+			]
+		});
+		this.table.on("tableBuilt", () => {
+			let columns = this.table.getColumns();
+			let columnData = [];
+			for (let col of columns) {
+				let def = col.getDefinition();
+				if (def.title) {
+					columnData.push({
+						title: def.title,
+						visible: col.isVisible(),
+						original: col
+					});
+				}
+			}
+			this.$emit('update:columnData', columnData);
+		});
+		this.table.on("rowSelectionChanged", data => {
+			this.$emit('update:selectedData', data);
+		});
+		this.table.on("cellClick", (e, cell) => {
+			if (cell.getColumn().getField() == 'statustyp') {
+				this.lastHistoryClickedId = cell.getData().studierendenantrag_id;
+				this.$refs.historyLoader.fetchData();
+				this.$refs.history.show();
+			}
+		});
+	},
+	template: `
+	<div class="studierendenantrag-leitung-table">
+		<div ref="table"></div>
+		<bs-modal ref="modalGrund" id="modal-grund" class="fade">
+			<template #title>{{p.t('studierendenantrag', 'antrag_grund')}}</template>
+			<pre ref="modalGrundPre"></pre>
+		</bs-modal>
+		<bs-modal ref="history" class="fade">
+			<template #title>{{p.t('studierendenantrag', 'title_history', {id: lastHistoryClickedId})}}</template>
+			<core-fetch-cmpt ref="historyLoader" :api-function="getHistory">
+				<table v-if="historyData.length" class="table">
+					<tr v-for="status in historyData" :key="status.studierendenantrag_status_id">
+						<td>{{(new Date(status.insertamum)).toLocaleString()}}</td>
+						<td>{{status.insertvon}}</td>
+						<td>{{status.typ}}</td>
+						<td>
+							<a v-if="status.grund" href="#modal-grund" data-bs-toggle="modal" @click="showHistoryGrund(status.grund)">
+								{{p.t('studierendenantrag', 'antrag_grund')}}
+							</a>
+						</td>
+					</tr>
+				</table>
+			</core-fetch-cmpt>
+		</bs-modal>
+		<lv-popup ref="lvList" class="fade" :antrag-id="lvsData ? lvsData.studierendenantrag_id : null" dialog-class="modal-lg">
+			{{p.t('studierendenantrag', 'title_show_lvs', lvsData ? lvsData : {name: ''}) }}
+		</lv-popup>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js
new file mode 100644
index 000000000..cbc97b79e
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Lvzuweisung.js
@@ -0,0 +1,242 @@
+import StudierendenantragStatus from './Status.js';
+import Phrasen from '../../mixins/Phrasen.js';
+
+export default {
+	components: {
+		StudierendenantragStatus
+	},
+	mixins: [Phrasen],
+	props: {
+		antragId: Number,
+		initialStatusCode: String,
+		initialStatusMsg: String,
+		disabled: Boolean
+	},
+	data() {
+		return {
+			lvs: [],
+			isloading: false,
+			statusCode: '',
+			statusMsg: ''
+		}
+	},
+	computed: {
+		lvs1() {
+			return this.lvs[Object.keys(this.lvs).filter(key => key.substr(0, 1) == 1)] || [];
+		},
+		lvs2() {
+			return this.lvs[Object.keys(this.lvs).filter(key => key.substr(0, 1) == 2)] || [];
+		},
+		lvs1sem(){
+			return (Object.keys(this.lvs).filter(key => key.substr(0, 1) == 1).pop() || "1").substr(1);
+		},
+		lvs2sem(){
+			return (Object.keys(this.lvs).filter(key => key.substr(0, 1) == 2).pop() || "2").substr(1);
+		},
+		statusSeverity() {
+			switch (this.statusCode) {
+				case 0: return 'danger';
+				default: return 'info';
+			}
+		}
+	},
+	methods: {
+		save() {
+			this.isloading = true;
+			const forbiddenLvs = this.lvs1.filter(lv => lv.antrag_zugelassen && !lv._children).map(lv => ({
+				studierendenantrag_id: this.antragId,
+				lehrveranstaltung_id: lv.lehrveranstaltung_id,
+				zugelassen: 0,
+				anmerkung: lv.antrag_anmerkung || "",
+				studiensemester_kurzbz: this.lvs1sem
+			}));
+			const mandatoryLvs = this.lvs2.filter(lv => !lv._children).map(lv => ({
+				studierendenantrag_id: this.antragId,
+				lehrveranstaltung_id: lv.lehrveranstaltung_id,
+				zugelassen:lv.antrag_zugelassen ? 1 : 2,
+				anmerkung: lv.antrag_anmerkung || "",
+				studiensemester_kurzbz: this.lvs2sem
+			}));
+			axios.post(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Antrag/Wiederholung/saveLvs/', {forbiddenLvs, mandatoryLvs})
+				.then(response => {
+					if(!response.data.error) {
+						this.addAlert('Speichern erfolgreich', 'alert-success');
+						this.statusCode = response.data.retval[0].studierendenantrag_statustyp_kurzbz;
+						this.statusMsg = response.data.retval[0].typ;
+					} else {
+						this.addAlert(response.data.retval, 'alert-danger');
+						this.statusCode = 0;
+						this.statusMsg = 'Error';
+					}
+					this.isloading = false;
+				}).catch(error => {
+					this.addAlert(error.message, 'alert-danger');
+					this.statusCode = 0;
+					this.statusMsg = 'Error';
+					this.isloading = false;
+				}).finally(() => {
+					window.scrollTo(0, 0);
+				});
+		},
+		addAlert(text, type) {
+			const para = document.createElement("p");
+			para.innerText = text;
+			para.className = "alert " + type + " alert-dismissible fade show";
+			const btn =  document.createElement("button");
+			btn.className = "btn-close";
+			btn.type = "button";
+			btn.setAttribute("aria-label", "Close");
+			btn.setAttribute("data-bs-dismiss", "alert");
+			para.appendChild(btn);
+
+			this.$refs.alertbox.appendChild(para);
+		}
+	},
+	created() {
+		this.statusCode = this.initialStatusCode;
+		this.statusMsg = this.initialStatusMsg;
+	},
+	mounted() {
+		axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Antrag/Wiederholung/getLvs/' + this.antragId).then(
+			result => {
+				if(result.data.error)
+				{
+					this.addAlert(result.data.retval, 'alert-danger');
+					this.isloading = true;
+				}
+				else
+				{
+					let res = {};
+					for (var k in result.data.retval) {
+						let lvs = result.data.retval[k].reduce((obj,lv) => {
+							obj[lv.studienplan_lehrveranstaltung_id] = lv;
+							return obj;
+						}, {});
+						for (var lv of Object.values(lvs)) {
+							if (!lv.studienplan_lehrveranstaltung_id_parent)
+								continue;
+							if (!lvs[lv.studienplan_lehrveranstaltung_id_parent])
+								console.error('parent not available');
+							else {
+								if (!lvs[lv.studienplan_lehrveranstaltung_id_parent]._children)
+									lvs[lv.studienplan_lehrveranstaltung_id_parent]._children = [];
+								lvs[lv.studienplan_lehrveranstaltung_id_parent]._children.push(lv);
+							}
+						}
+						res[k] = Object.values(lvs).filter(lv => !lv.studienplan_lehrveranstaltung_id_parent);
+						let current = res[k];
+						let index = k.substr(0,1);
+						var table = new Tabulator(this.$refs["lvtable" + k.substr(0,1)], {
+							data: current,
+							dataTree: true,
+							dataTreeStartExpanded:true, //start with an expanded tree
+							dataTreeChildIndent:15,
+							columns: [
+								{title: this.p.t('ui','bezeichnung'), field: "bezeichnung"},
+								{title: this.p.t('lehre','lehrform'), field: "lehrform_kurzbz"},
+								{title: "ECTS", field: "ects"},
+								{title: this.p.t('lehre','note'), field: "note", formatter:(cell, formatterParams, onRendered)=>cell.getValue() || "---"},
+								{title: (index==1) ? this.p.t('studierendenantrag','lv_nicht_zulassen') : this.p.t('studierendenantrag','lv_wiederholen'), field: "antrag_zugelassen", formatter: (cell, formatterParams, onRendered) => {
+									let data = cell.getData();
+									if(data._children || !data.zeugnis)
+										return "";
+									let input = document.createElement('input');
+									input.className = "form-check-input";
+									input.type = "checkbox";
+									input.role = "switch";
+									input.checked = cell.getValue();
+									input.addEventListener('input', () => {
+										lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen = input.checked;
+										cell.getRow().reformat();
+									});
+									if (this.disabled) {
+										input.disabled = true;
+									}
+
+									let div =  document.createElement('div');
+									div.className = 'form-check form-switch';
+									div.append(input);
+
+									return div;
+								}},
+								{
+									title: this.p.t('global','anmerkung'),
+									field: "antrag_anmerkung",
+									headerSort:false,
+									titleFormatter:(cell, formatterParams, onRendered)=>{
+										let link =  document.createElement('a');
+										link.addEventListener('click', (e) => {
+											e.preventDefault();
+										});
+
+										link.href ="#";
+										link.title = this.p.t('studierendenantrag','anmerkung_tooltip');
+										new bootstrap.Tooltip(link);
+										let tooltip = document.createElement('span');
+										tooltip.innerHTML = this.p.t('global','anmerkung') + " ";
+										tooltip.append(link);
+
+										let icon =  document.createElement('i');
+										link.append(icon);
+										icon.className = "fa fa-info-circle";
+										icon.setAttribute("aria-hidden", "true");
+										icon.style.minWidth = '1em';
+
+										return tooltip;
+
+									},
+									formatter: (cell, formatterParams, onRendered) => {
+										if (this.disabled) {
+											return cell.getValue() || "";
+										}
+										var data = cell.getData();
+										if (lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen)
+										{
+											let input = document.createElement('input');
+											input.className = "form-control";
+											input.type = "text";
+											input.value = cell.getValue() || "";
+											input.addEventListener('input', () => {
+												lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen = input.value;
+											});
+											return input;
+										}
+										else
+										{
+											return "";
+										}
+									}
+								}
+							]
+						});
+					}
+					this.lvs = result.data.retval;
+				}
+			}
+		);
+	},
+	template: `
+	<div class="col-sm-8">
+		<div ref="alertbox"></div>
+
+		<span class="d-flex justify-content-between h4">
+			<span>{{p.t('studierendenantrag', 'title_lv_nicht_zugelassen')}}</span>
+			<span>{{lvs1sem}}</span>
+		</span>
+		<div ref="lvtable1" class="mb-3">
+		</div>
+
+		<span class="d-flex justify-content-between h4">
+			<span>{{p.t('studierendenantrag', 'title_lv_wiederholen')}}</span>
+			<span>{{lvs2sem}}</span>
+		</span>
+		<div ref="lvtable2">
+		</div>
+
+		<button type="button" @click="save" :disabled="isloading || disabled"  class="btn btn-primary my-3">{{p.t('studierendenantrag', 'btn_save_lvs')}}</button>
+	</div>
+	<div class="col-sm-4">
+		<studierendenantrag-status :msg="statusMsg" :severity="statusSeverity"></studierendenantrag-status>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Status.js b/public/js/components/Studierendenantrag/Status.js
new file mode 100644
index 000000000..7449fd376
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Status.js
@@ -0,0 +1,15 @@
+export default {
+	props: {
+		msg: String,
+		severity: String
+	},
+	computed: {
+		severityClass() {
+			return 'alert-' + this.severity;
+		}
+	},
+	template: `
+	<div v-if="msg && severity" class="studierendenantrag-status alert text-center mb-3" :class="severityClass" role="alert" v-html="msg">
+	</div>
+	`
+}
diff --git a/public/js/components/vueDatepicker.js.php b/public/js/components/vueDatepicker.js.php
new file mode 100644
index 000000000..e0814ac53
--- /dev/null
+++ b/public/js/components/vueDatepicker.js.php
@@ -0,0 +1,12 @@
+<?php
+
+if(file_exists("../../../vendor/vuepic/vue-datepicker-js/vue-datepicker.iife.js"))
+{
+	header('Content-Type: application/javascript');
+	echo file_get_contents("../../../vendor/vuepic/vue-datepicker-js/vue-datepicker.iife.js");
+	echo "export default VueDatePicker";
+}
+else
+{
+	header('HTTP/1.0 404 Not Found');
+}
diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
new file mode 100644
index 000000000..fd954579a
--- /dev/null
+++ b/public/js/mixins/Phrasen.js
@@ -0,0 +1,85 @@
+const categories = {};
+const loadingModules = {};
+
+function extractCategory(obj, category) {
+	return obj.filter(e => e.category == category).reduce((res, elem) => {
+		if (!res[elem.phrase])
+			res[elem.phrase] = elem.text;
+		return res;
+	}, {});
+}
+function reloadRefs(category) {
+	while (loadingModules[category].length) {
+		var v = loadingModules[category].pop();
+		v[0].value = getValueForLoadedPhrase(category, v[1], v[2]);
+		Vue.triggerRef(v[0]);
+		/*Vue.unref(v);*/
+	}
+}
+function loadLazy(category, val, phrase, params) {
+	// NOTE(chris): load module if it's not loaded yet
+	if (loadingModules[category]) {
+		loadingModules[category].push([val, phrase, params]);
+		if (categories[category]) // NOTE(chris): this is for safety in case the loading finished the moment before the val was pushed into the array
+			reloadRefs(category);
+		return;
+	}
+	loadingModules[category] = [[val, phrase, params]];
+
+	axios.get(FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/components/Phrasen/loadModule/' + category).then(res => {
+		if (res.data.retval)
+			categories[category] = extractCategory(res.data.retval, category);
+		else
+			categories[category] = {};
+
+		reloadRefs(category);
+	}).catch(err => console.error(err));
+}
+function getValueForLoadedPhrase(category, phrase, params) {
+	let result = categories[category][phrase];
+	if (!result)
+		return '<< PHRASE ' + phrase + '>>';
+	if (params)
+		result = result.replace(/\{([^}]*)\}/g, (match, p1) => params[p1] === undefined ? match : params[p1]);
+	return result;
+}
+
+const phrasen = {
+	t_ref(category, phrase, params) {
+		if (params === undefined && (
+			(Array.isArray(category) && category.length == 2) ||
+			(category.split && category.split('/').length == 2))
+			) {
+			params = phrase;
+			[category, phrase] = category.split ? category.split('/') : category;
+		}
+		if (phrase === undefined) {
+			console.error('invalid input');
+			return '';
+		}
+		if (!categories[category]) {
+			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined)
+				categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+			
+			if (!categories[category] || Object.keys(categories[category]).length === 0) {
+				categories[category] = undefined;
+				let val = Vue.ref('');
+				loadLazy(category, val, phrase, params);
+				return val;
+			}
+		}
+		var result = getValueForLoadedPhrase(category, phrase, params);
+		return Vue.ref(result);
+	},
+	t(category, phrase, params) {
+		return Vue.unref(this.t_ref(category, phrase, params));
+	}
+};
+
+export default {
+	data: () => {
+		return {
+			p: phrasen
+		}
+	}
+}
diff --git a/public/js/tabulator/filters/Dates.js b/public/js/tabulator/filters/Dates.js
new file mode 100644
index 000000000..7c9f268f0
--- /dev/null
+++ b/public/js/tabulator/filters/Dates.js
@@ -0,0 +1,43 @@
+if (!primevue) {
+	console.error('PrimeVue not loaded!');
+}
+
+// NOTE(chris): Click on clear button gives an error. This is a bug in primevue => fixed in current version
+Tabulator.extendModule('filter', 'filters', {
+	"dates": (headerValue, rowValue) => {
+		if (!headerValue)
+			return true;
+		let v = new Date(rowValue);
+		if (Array.isArray(headerValue)) {
+			if (headerValue[1]) {
+				return v >= headerValue[0] && v <= headerValue[1].setHours(23, 59, 59, 999);
+			}
+			return v.toDateString() == headerValue[0].toDateString();
+		}
+		return v.toDateString() == headerValue.toDateString();
+	}
+});
+function dateFilter(cell, onRendered, success) {
+	let div = document.createElement('div');
+
+	Vue.createApp({
+		components: {
+			PrimevueCalendar: primevue.calendar
+		},
+		data() {
+			return {
+				val: null
+			}
+		},
+		watch: {
+			val(n) {
+				success(n);
+			}
+		},
+		template: `<primevue-calendar v-model="val" selection-mode="range" :manual-input="false" show-button-bar></primevue-calendar>`
+	}).use(primevue.config.default).mount(div);
+
+	return div;
+}
+
+export { dateFilter as 'dateFilter' };
diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
new file mode 100644
index 000000000..b89fa51df
--- /dev/null
+++ b/rdf/AntragAbmeldung.xml.php
@@ -0,0 +1,68 @@
+<?php
+
+header("Content-type: application/xhtml+xml");
+require_once('../config/vilesci.config.inc.php');
+require_once('../include/functions.inc.php');
+require_once('../include/basis_db.class.php');
+
+$db = new basis_db();
+
+if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
+{
+
+	if(isset($_GET['id'])) {
+		$id = $_GET['id'];
+
+		$where = " WHERE studierendenantrag_id = " . $db->db_add_param($id) . "
+					AND campus.tbl_studierendenantrag.typ = 'Abmeldung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) = 'Genehmigt';";
+		$not_found_error = 'Studierendenantrag not found'. $id;
+	} elseif(isset($_GET['uid']) && isset($_GET['prestudent_id'])) {
+		$uid = $_GET['uid'];
+		$uid = explode(';', $uid);
+		$uid  = (array_filter($uid, 'strlen'));
+
+		$prestudent_id = $_GET['prestudent_id'];
+		$prestudent_id = explode(';', $prestudent_id);
+		$prestudent_id  = (array_filter($prestudent_id, 'strlen'));
+
+		$where = " WHERE  campus.tbl_studierendenantrag.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
+					AND campus.tbl_studierendenantrag.typ = 'Abmeldung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) = 'Genehmigt';";
+		$not_found_error = 'Studierendenantrag not found for: ' . implode(',', $uid);
+	} else
+		die('<error>wrong parameters</error>');
+}
+else
+	die('<error>Format not supported</error>');
+
+
+// TODO(chris): mehrsprachig
+$query = "
+	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[1], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, semester, tbl_studierendenantrag.grund
+	FROM
+	campus.tbl_studierendenantrag
+	JOIN public.tbl_student USING (prestudent_id)
+	JOIN public.tbl_benutzer ON tbl_student.student_uid=uid
+	JOIN public.tbl_person USING (person_id)
+	JOIN public.tbl_studiengang USING (studiengang_kz)
+	JOIN public.tbl_studiensemester USING (studiensemester_kurzbz)
+	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = tbl_studiengang.orgform_kurzbz)" . $where;
+
+
+if (!$db->db_query($query) || !$db->db_num_rows())
+	die('<error>' . $not_found_error . '</error>');
+
+?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<antraege>
+	<?php while($row = $db->db_fetch_object()) { ?>
+	<antrag>
+		<studiengang><?=$row->bezeichnung;?></studiengang>
+		<organisationsform><?=$row->bezeichnung_mehrsprachig;?> </organisationsform>
+		<name><?= trim($row->vorname. " " . $row->nachname);?></name>
+		<personenkz><?=$row->matrikelnr;?></personenkz>
+		<studienjahr><?php echo $row->studienjahr_kurzbz;?></studienjahr>
+		<semester><?=$row->semester;?></semester>
+		<grund><?=$row->grund;?></grund>
+	</antrag>
+	<?php } ?>
+</antraege>
diff --git a/rdf/AntragUnterbrechung.xml.php b/rdf/AntragUnterbrechung.xml.php
new file mode 100644
index 000000000..50c9f4c6a
--- /dev/null
+++ b/rdf/AntragUnterbrechung.xml.php
@@ -0,0 +1,71 @@
+<?php
+
+header("Content-type: application/xhtml+xml");
+require_once('../config/vilesci.config.inc.php');
+require_once('../include/functions.inc.php');
+require_once('../include/basis_db.class.php');
+
+
+$db = new basis_db();
+
+if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
+{
+
+	if(isset($_GET['id'])) {
+		$id = $_GET['id'];
+
+		$where = " WHERE studierendenantrag_id = " . $db->db_add_param($id) . "
+					AND campus.tbl_studierendenantrag.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) = 'Genehmigt';";
+		$not_found_error = 'Studierendenantrag not found'. $id;
+	} elseif(isset($_GET['uid']) && isset($_GET['prestudent_id'])) {
+		$uid = $_GET['uid'];
+		$uid = explode(';', $uid);
+		$uid  = (array_filter($uid, 'strlen'));
+
+		$prestudent_id = $_GET['prestudent_id'];
+		$prestudent_id = explode(';', $prestudent_id);
+		$prestudent_id  = (array_filter($prestudent_id, 'strlen'));
+
+		$where = " WHERE  campus.tbl_studierendenantrag.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
+					AND campus.tbl_studierendenantrag.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) = 'Genehmigt';";
+		$not_found_error = 'Studierendenantrag not found for: ' . implode(',', $uid);
+	} else
+		die('<error>wrong parameters</error>');
+}
+else
+	die('<error>Format not supported</error>');
+
+
+// TODO(chris): mehrsprachig
+$query = "
+	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[1], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, semester, tbl_studierendenantrag.grund, datum_wiedereinstieg, datum
+	FROM
+	campus.tbl_studierendenantrag
+	JOIN public.tbl_student USING (prestudent_id)
+	JOIN public.tbl_benutzer ON tbl_student.student_uid=uid
+	JOIN public.tbl_person USING (person_id)
+	JOIN public.tbl_studiengang USING (studiengang_kz)
+	JOIN public.tbl_studiensemester USING (studiensemester_kurzbz)
+	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = tbl_studiengang.orgform_kurzbz)" . $where;
+
+
+if (!$db->db_query($query) || !$db->db_num_rows())
+	die('<error>' . $not_found_error . '</error>');
+
+?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<antraege>
+	<?php while($row = $db->db_fetch_object()) { ?>
+	<antrag>
+		<studiengang><?=$row->bezeichnung;?></studiengang>
+		<organisationsform><?=$row->bezeichnung_mehrsprachig;?> </organisationsform>
+		<name><?= trim($row->vorname. " " . $row->nachname);?></name>
+		<personenkz><?=$row->matrikelnr;?></personenkz>
+		<studienjahr><?php echo $row->studienjahr_kurzbz;?></studienjahr>
+		<semester><?=$row->semester;?></semester>
+		<grund><?=$row->grund;?></grund>
+		<returndate><?=(new DateTime($row->datum_wiedereinstieg))->format('d.m.Y');?></returndate>
+		<createdate><?= (new DateTime($row->datum))->format('d.m.Y');?></createdate>
+	</antrag>
+	<?php } ?>
+</antraege>
diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index 9fda09bba..013972154 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -39,6 +39,7 @@ require_once('dbupdate_3.4/27107_vilesci_erfassung_abwesenheiten_reinigung.php')
 require_once('dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php');
 require_once('dbupdate_3.4/28089_plausichecks_in_extension_hinzufuegen.php');
 require_once('dbupdate_3.4/29133_einzelne_studiengaenge_aus_issuechecks_ausnehmen.php');
+require_once('dbupdate_3.4/27351_digitalisierung_formulare.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
new file mode 100644
index 000000000..a40b457e2
--- /dev/null
+++ b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
@@ -0,0 +1,289 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+
+if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statustyp LIMIT 1"))
+{
+	$qry = "CREATE TABLE campus.tbl_studierendenantrag_statustyp (
+			studierendenantrag_statustyp_kurzbz			VARCHAR(32) NOT NULL,
+			bezeichnung									VARCHAR(128)[] NOT NULL,
+			CONSTRAINT tbl_studierendenantrag_statustyp_pk PRIMARY KEY(studierendenantrag_statustyp_kurzbz)
+		);
+
+		GRANT SELECT, INSERT ON campus.tbl_studierendenantrag_statustyp TO vilesci;
+		GRANT SELECT ON campus.tbl_studierendenantrag_statustyp TO web;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.tbl_studierendenantrag_statustyp: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>campus.tbl_studierendenantrag_statustyp: table created';
+}
+
+if($result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statustyp WHERE studierendenantrag_statustyp_kurzbz = 'Erstellt' "))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO campus.tbl_studierendenantrag_statustyp
+			(studierendenantrag_statustyp_kurzbz, bezeichnung)
+			VALUES
+			('Erstellt', '{\"Erstellt\",\"Created\"}'),
+			('ErstelltStgl', '{\"Erstellt\",\"Created\"}'),
+			('Genehmigt', '{\"Genehmigt\",\"Approved\"}'),
+			('GenehmigtStgl', '{\"Vorläufig Genehmigt\",\"Provisionally Approved\"}'),
+			('Beeinsprucht', '{\"Beeinsprucht\",\"Objected\"}'),
+			('Abgelehnt', '{\"Abgelehnt\",\"Rejected\"}'),
+			('Verzichtet', '{\"Verzichtet\",\"Pass\"}'),
+			('Offen', '{\"Offen\",\"Reopened\"}'),
+			('Zurückgezogen', '{\"Zurückgezogen\",\"Cancelled\"}'),
+			('EmailVersandt', '{\"Email Versandt\",\"Reminder Sent\"}'),
+			('ErsteAufforderungVersandt', '{\"1.Aufforderung Versandt\",\"1st Request Sent\"}'),
+			('ZweiteAufforderungVersandt', '{\"2.Aufforderung Versandt\",\"2nd Request Sent\"}'),
+			('Lvszugewiesen', '{\"Lvszugewiesen\",\"Lvsassigned\"}');
+			";
+		if (!$db->db_query($qry))
+			echo '<strong>campus.tbl_studierendenantrag_statustyp (insert): '.$db->db_last_error().'</strong><br>';
+		else
+			echo '<br>campus.tbl_studierendenantrag_statustyp: table prefilled';
+	}
+}
+
+if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag LIMIT 1"))
+{
+	$qry = "CREATE TABLE campus.tbl_studierendenantrag (
+			studierendenantrag_id						INTEGER NOT NULL,
+			prestudent_id								INTEGER NOT NULL,
+			studiensemester_kurzbz						VARCHAR(32) NOT NULL,
+			datum										TIMESTAMP NULL,
+			typ											VARCHAR(32) NOT NULL,
+			insertamum									TIMESTAMP	DEFAULT NOW(),
+			insertvon									VARCHAR(32) NOT NULL,
+			datum_wiedereinstieg						TIMESTAMP NULL,
+			grund										TEXT NULL,
+			dms_id										INTEGER NULL,
+			CONSTRAINT tbl_studierendenantrag_pk PRIMARY KEY(studierendenantrag_id)
+		);
+		CREATE SEQUENCE campus.tbl_studierendenantrag_studierendenantrag_id_seq
+			 INCREMENT BY 1
+			 NO MAXVALUE
+			 NO MINVALUE
+			 CACHE 1;
+		ALTER TABLE campus.tbl_studierendenantrag ALTER COLUMN studierendenantrag_id SET DEFAULT nextval('campus.tbl_studierendenantrag_studierendenantrag_id_seq');
+
+		GRANT SELECT, INSERT ON campus.tbl_studierendenantrag TO vilesci;
+		GRANT SELECT, INSERT ON campus.tbl_studierendenantrag TO web;
+		GRANT SELECT, UPDATE ON campus.tbl_studierendenantrag_studierendenantrag_id_seq TO vilesci;
+		GRANT SELECT, UPDATE ON campus.tbl_studierendenantrag_studierendenantrag_id_seq TO web;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.tbl_studierendenantrag: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>campus.tbl_studierendenantrag: table created';
+}
+
+if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_status LIMIT 1"))
+{
+	$qry = "CREATE TABLE campus.tbl_studierendenantrag_status (
+			studierendenantrag_status_id				INTEGER NOT NULL,
+			studierendenantrag_id						INTEGER NOT NULL,
+			studierendenantrag_statustyp_kurzbz			VARCHAR(32) NOT NULL,
+			insertamum									TIMESTAMP            DEFAULT NOW(),
+			insertvon									VARCHAR(32) NOT NULL,
+			grund										TEXT NULL,
+			CONSTRAINT tbl_studierendenantrag_status_pk PRIMARY KEY(studierendenantrag_status_id),
+			CONSTRAINT tbl_studierendenantrag_fk FOREIGN KEY (studierendenantrag_id) REFERENCES campus.tbl_studierendenantrag(studierendenantrag_id) ON UPDATE CASCADE ON DELETE RESTRICT,
+			CONSTRAINT tbl_studierendenantrag_statustyp_fk FOREIGN KEY (studierendenantrag_statustyp_kurzbz) REFERENCES campus.tbl_studierendenantrag_statustyp(studierendenantrag_statustyp_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT
+		);
+		CREATE SEQUENCE campus.tbl_studierendenantrag_status_studierendenantrag_status_id_seq
+			 INCREMENT BY 1
+			 NO MAXVALUE
+			 NO MINVALUE
+			 CACHE 1;
+		ALTER TABLE campus.tbl_studierendenantrag_status ALTER COLUMN studierendenantrag_status_id SET DEFAULT nextval('campus.tbl_studierendenantrag_status_studierendenantrag_status_id_seq');
+
+		GRANT SELECT, INSERT ON campus.tbl_studierendenantrag_status TO vilesci;
+		GRANT SELECT, INSERT ON campus.tbl_studierendenantrag_status TO web;
+		GRANT SELECT, UPDATE ON campus.tbl_studierendenantrag_status_studierendenantrag_status_id_seq TO vilesci;
+		GRANT SELECT, UPDATE ON campus.tbl_studierendenantrag_status_studierendenantrag_status_id_seq TO web;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.tbl_studierendenantrag_status: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>campus.tbl_studierendenantrag_status: table created';
+}
+
+if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_lehrveranstaltung LIMIT 1"))
+{
+	$qry = "CREATE TABLE campus.tbl_studierendenantrag_lehrveranstaltung (
+			studierendenantrag_lehrveranstaltung_id		INTEGER NOT NULL,
+			studierendenantrag_id						INTEGER NOT NULL,
+			lehrveranstaltung_id						INTEGER NOT NULL,
+			studiensemester_kurzbz						VARCHAR(16) NOT NULL,
+			note										SMALLINT NOT NULL,
+			anmerkung									TEXT NULL,
+			insertamum									TIMESTAMP            DEFAULT NOW(),
+			insertvon									VARCHAR(32) NOT NULL,
+			CONSTRAINT tbl_studierendenantrag_lehrveranstaltung_pk PRIMARY KEY(studierendenantrag_lehrveranstaltung_id),
+			CONSTRAINT tbl_studiensemester_fk FOREIGN KEY (studiensemester_kurzbz) REFERENCES public.tbl_studiensemester(studiensemester_kurzbz) ON UPDATE CASCADE ON DELETE RESTRICT,
+			CONSTRAINT tbl_note_fk FOREIGN KEY (note) REFERENCES lehre.tbl_note(note) ON UPDATE CASCADE ON DELETE RESTRICT,
+			CONSTRAINT tbl_studierendenantrag_fk FOREIGN KEY (studierendenantrag_id) REFERENCES campus.tbl_studierendenantrag(studierendenantrag_id) ON UPDATE CASCADE ON DELETE RESTRICT
+		);
+		CREATE SEQUENCE campus.tbl_studierendenantrag_lehrveranstaltung_studierendenantrag_lehrveranstaltung_id_seq
+			 INCREMENT BY 1
+			 NO MAXVALUE
+			 NO MINVALUE
+			 CACHE 1;
+		ALTER TABLE campus.tbl_studierendenantrag_lehrveranstaltung ALTER COLUMN studierendenantrag_lehrveranstaltung_id SET DEFAULT nextval('campus.tbl_studierendenantrag_lehrveranstaltung_studierendenantrag_lehrveranstaltung_id_seq');
+
+		GRANT SELECT, INSERT, DELETE ON campus.tbl_studierendenantrag_lehrveranstaltung TO vilesci;
+		GRANT SELECT, INSERT ON campus.tbl_studierendenantrag_lehrveranstaltung TO web;
+		GRANT SELECT, UPDATE ON campus.tbl_studierendenantrag_lehrveranstaltung_studierendenantrag_lehrveranstaltung_id_seq TO vilesci;
+		GRANT SELECT, UPDATE ON campus.tbl_studierendenantrag_lehrveranstaltung_studierendenantrag_lehrveranstaltung_id_seq TO web;";
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.tbl_studierendenantrag_lehrveranstaltung: '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>campus.tbl_studierendenantrag_lehrveranstaltung: table created';
+}
+
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'student/studierendenantrag';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('student/studierendenantrag', 'Berechtigung für Bearbeiten Studierendenanträge');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' system.tbl_berechtigung: Added permission for student/studierendenantrag<br>';
+	}
+}
+
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'student/antragfreigabe';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('student/antragfreigabe', 'Berechtigung für Freigabe der Studierendenanträge');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' system.tbl_berechtigung: Added permission for student/antragfreigabe<br>';
+	}
+}
+
+if (!$result = @$db->db_query("SELECT campus.get_status_studierendenantrag(0)")) {
+	$qry = 'CREATE FUNCTION campus.get_status_studierendenantrag(integer) RETURNS character varying
+    LANGUAGE plpgsql
+    AS $_$
+        DECLARE i_studierendenantrag_id ALIAS FOR $1;
+        DECLARE rec RECORD;
+        BEGIN
+            SELECT INTO rec studierendenantrag_statustyp_kurzbz
+            FROM campus.tbl_studierendenantrag_status
+            WHERE studierendenantrag_id=i_studierendenantrag_id
+            ORDER BY insertamum desc
+            LIMIT 1;
+
+        RETURN rec.studierendenantrag_statustyp_kurzbz;
+        END;
+        $_$;
+
+	ALTER FUNCTION campus.get_status_studierendenantrag(integer) OWNER TO fhcomplete;';
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.get_status_studierendenantrag(integer): '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>campus.get_status_studierendenantrag(integer): function created';
+}
+
+if (!$result = @$db->db_query("SELECT campus.get_status_id_studierendenantrag(0)")) {
+	$qry = 'CREATE FUNCTION campus.get_status_id_studierendenantrag(integer) RETURNS integer
+    LANGUAGE plpgsql
+    AS $_$
+        DECLARE i_studierendenantrag_id ALIAS FOR $1;
+        DECLARE rec RECORD;
+        BEGIN
+            SELECT INTO rec studierendenantrag_status_id
+            FROM campus.tbl_studierendenantrag_status
+            WHERE studierendenantrag_id=i_studierendenantrag_id
+            ORDER BY insertamum desc
+            LIMIT 1;
+
+        RETURN rec.studierendenantrag_status_id;
+        END;
+        $_$;
+
+	ALTER FUNCTION campus.get_status_id_studierendenantrag(integer) OWNER TO fhcomplete;';
+
+	if(!$db->db_query($qry))
+		echo '<strong>campus.get_status_id_studierendenantrag(integer): '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>campus.get_status_id_studierendenantrag(integer): function created';
+}
+
+if (!$result = @$db->db_query("SELECT public.get_absem_prestudent(0, null)")) {
+	$qry = 'CREATE FUNCTION public.get_absem_prestudent(integer, character varying) RETURNS integer
+    LANGUAGE plpgsql
+    AS $_$
+        DECLARE i_prestudent_id ALIAS FOR $1;
+        DECLARE cv_studiensemester_kurzbz ALIAS FOR $2;
+        DECLARE rec RECORD;
+        BEGIN
+            IF (cv_studiensemester_kurzbz IS NULL) THEN
+                SELECT INTO rec ausbildungssemester
+                FROM public.tbl_prestudentstatus
+                WHERE prestudent_id=i_prestudent_id
+                ORDER BY datum desc,insertamum desc, ext_id desc
+                LIMIT 1;
+            ELSE
+                SELECT INTO rec ausbildungssemester
+                FROM tbl_prestudentstatus
+                WHERE prestudent_id=i_prestudent_id AND studiensemester_kurzbz=cv_studiensemester_kurzbz
+                ORDER BY datum desc,insertamum desc, ext_id desc
+                LIMIT 1;
+            END IF;
+
+        RETURN rec.ausbildungssemester;
+        END;
+        $_$;
+
+	ALTER FUNCTION public.get_absem_prestudent(integer, character varying) OWNER TO fhcomplete;';
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.get_absem_prestudent(integer, character varying): '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.get_absem_prestudent(integer, character varying): function created';
+}
+if (!$result = @$db->db_query("SELECT public.get_stdsem_prestudent(0, null)")) {
+	$qry = 'CREATE FUNCTION public.get_stdsem_prestudent(integer, character varying) RETURNS character varying
+    LANGUAGE plpgsql
+    AS $_$
+        DECLARE i_prestudent_id ALIAS FOR $1;
+        DECLARE cv_studiensemester_kurzbz ALIAS FOR $2;
+        DECLARE rec RECORD;
+        BEGIN
+            IF (cv_studiensemester_kurzbz IS NULL) THEN
+                SELECT INTO rec studiensemester_kurzbz
+                FROM public.tbl_prestudentstatus
+                WHERE prestudent_id=i_prestudent_id
+                ORDER BY datum desc,insertamum desc, ext_id desc
+                LIMIT 1;
+            ELSE
+                SELECT INTO rec studiensemester_kurzbz
+                FROM tbl_prestudentstatus
+                WHERE prestudent_id=i_prestudent_id AND studiensemester_kurzbz=cv_studiensemester_kurzbz
+                ORDER BY datum desc,insertamum desc, ext_id desc
+                LIMIT 1;
+            END IF;
+
+        RETURN rec.studiensemester_kurzbz;
+        END;
+        $_$;
+
+	ALTER FUNCTION public.get_stdsem_prestudent(integer, character varying) OWNER TO fhcomplete;';
+
+	if(!$db->db_query($qry))
+		echo '<strong>public.get_stdsem_prestudent(integer, character varying): '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>public.get_stdsem_prestudent(integer, character varying): function created';
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0bc748c80..f6df3afad 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -5774,6 +5774,26 @@ When on hold, the date is only a reminder.',
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'error_invalid_date',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Datumsformat ist ungültig oder liegt außerhalb des gültigen Bereichs.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The date format is invalid or out of range.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'ui',
@@ -14446,6 +14466,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'schliessen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "Schließen",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "Close",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'global',
@@ -18123,6 +18163,1750 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'infotext_Wiederholung_0',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Gemäß § 16 Abs. 1 FHG steht Studierenden einmalig das Recht auf Wiederholung eines Studienjahres in Folge einer negativ beurteilten kommissionellen Prüfung zu.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'According to § 16 paragraph 1 FHG, students have the right to repeat an academic year as a result of a negative examination before a committee.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'infotext_Wiederholung_1',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Wiederholung ist bei der Studiengangsleitung binnen eines Monats ab Mitteilung des negativen Prüfungsergebnisses bekannt zu geben.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The head of the degree program must be notified of the repetition within one month of notification of the negative examination result.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'infotext_Wiederholung_2',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Infolge der Weiterentwicklung der Qualität des Studienganges kann es zu Änderungen der Studienbedingungen im Zuge der Wiederholung eines Studienjahres kommen (z.B. Studienplan, Prüfungsordnung etc.).',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'As a result of the further development of the quality of the course, there may be changes to the study conditions in the course of repeating an academic year (e.g. study plan, examination regulations, etc.).',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'infotext_Wiederholung_3',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Studiengangsleitung legt Prüfungen und Lehrveranstaltungen für die Wiederholung des Studienjahres fest.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The head of the degree program determines examinations and courses for the repetition of the academic year.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'infotext_Wiederholung_4',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nicht bestandene Prüfungen und Lehrveranstaltungen sind jedenfalls, bestandene Prüfungen und Lehrveranstaltungen nur, sofern es der Zweck des Studiums erforderlich macht, zu wiederholen oder erneut zu besuchen. Wird eine Lehrveranstaltung nach der letzten Wiederholungsmöglichkeit negativ beurteilt, darf dieder Studierende an keiner kommissionellen Wiederholungsprüfung im Semester der negativ beurteilen Lehrveranstaltung und im Folgesemester mehr teilnehmen (nicht-kommissionelle Wiederholungsprüfungen können wahrgenommen werden)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'In any case, failed examinations and courses are to be repeated or attended again only if the purpose of the course makes it necessary. If a course is assessed negatively after the last opportunity to repeat it, the student may no longer take part in a board re-examination in the semester in which the course was assessed as negative and in the following semester (non-board re-examinations can be taken).',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'info_Wiederholung_Erstellt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Info für Wiederholung Erstellt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Info for Wiederholung Erstellt',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_Wiederholung_pruefung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Negativ beurteilte kommissionelle Prüfung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Negative assessment by a committee',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_Wiederholung_pruefung_date',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datum der Beurteilung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'date of assessment',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_Wiederholung_button_yes',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ich gebe hiermit die Wiederholung des Studienjahres bekannt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'I hereby announce the repetition of the academic year',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_Wiederholung_button_no',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ich werde das Studienjahr nicht wiederholen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'I will not repeat the academic year',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antraege_header',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anträge auf Änderung des Studierendenstatus',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Requests for changing the Studierendenstatus',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_header',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Antrag auf Änderung des Studierendenstatus',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Request for changing the Studierendenstatus',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_new',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neu Anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create new',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'cancel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abbrechen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Cancel',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'ok',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ok',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Ok',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_create',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anlegen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Create',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_create_Abmeldung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Vom Studium abmelden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deregister from your studies',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_create_Unterbrechung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Studium unterbrechen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Interrupt your studies',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_cancel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Antrag zurückziehen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Cancel Application',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'warning_Abmeldung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ihr CIS-Account ist noch 21 Tage aktiv. Wir bitten Sie, alle benötigten Dateien (Zeugnisse, Studienerfolgsbestätigungen, Studienbestätigungen, etc.) innerhalb dieses Zeitraums herunterzuladen. Für die Ausstellung von Duplikaten fallen nach Inaktivsetzung des CIS-Accounts Kosten an.' . "<br>\n" .
+					'Bitte retournieren Sie baldmöglichst entlehnte Bücher an die Bibliothek.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Your CIS account is still active for 21 days. We ask you to download all required files (certificates, confirmations of academic success, confirmation of studies, etc.) within this period. There is a charge for issuing duplicates after the CIS account has been deactivated.' . "<br>\n" .
+					'Please return borrowed books to the library as soon as possible.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'title_Abmeldung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abmeldung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'De-registration',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'title_Unterbrechung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unterbrechung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Interruption',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'title_Wiederholung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wiederholung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Repetition',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'title_new_Abmeldung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue Abmeldung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New de-registration',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_typ',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Typ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Type',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_status',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Status',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Status',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_studiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studiensemester',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_erstelldatum',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erstelldatum',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Createdate',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'studierendenantraege',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studierendenanträge',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Applications',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_datum_wiedereinstieg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Datum Wiedereinstieg',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Date of return',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_grund',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Grund',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_dateianhaenge',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dateianhänge',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attachments',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_anhang',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Anhang',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Attachment',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_typ_Abmeldung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abmeldung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deregistration',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_typ_Unterbrechung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unterbrechung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Break',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_typ_Wiederholung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wiederholung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Repetition',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_show_lvs',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LVs anzeigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Show LVs',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_edit',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Edit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_reopen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erneut Freischalten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reopen',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_object',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Beeinspruchen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Object',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_objection_deny',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Einspruch abgelehnt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Objection rejected',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_objection_approve',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Einspruch stattgegeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Objection granted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_lvzuweisen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'LVs zuweisen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Assign Lvs',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_approve',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Genehmigen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Approve',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_reject',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ablehnen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reject',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'skip',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Überspringen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Skip',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'select_studiensemester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studiensemester auswählen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Select a semester',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_save_lvs',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zuweisungen speichern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Save assignments',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'btn_download_antrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'PDF herunterladen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Download PDF',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'table',
+		'phrase' => 'download',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Download',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Download',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'table',
+		'phrase' => 'reload',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Tabelle neu laden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reload table',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_student',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie sind derzeit in keinem Studium',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You are currently not enrolled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_student_no_failed_exam',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Sie sind derzeit in keinem Studium oder haben keine negativ beurteilte kommissionelle Prüfung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You are not currently studying or have not passed a board examination with negative reasons',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'no_attachments',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Dateianhänge',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Attachments',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'prestudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prestudent',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Prestudent',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'lehre',
+		'phrase' => 'studienjahr',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studienjahr',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Academic year',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'title_lvzuweisen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrveranstaltungen zuweisen für {name}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Assign Courses for {name}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'title_lv_nicht_zugelassen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Angabe aller Lehrveranstaltungen, zu denen die Person nicht zugelassen ist',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Details of all courses to which the person is not admitted',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'title_lv_wiederholen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Angabe aller zu wiederholenden bzw. erneut zu besuchenden Lehrveranstaltungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Specification of all courses to be repeated or attended again',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'title_show_lvs',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Lehrveranstaltungen für {name}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Courses for {name}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'my_lvs',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Meine Lehrveranstaltungen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'My Courses',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'table',
+		'phrase' => 'with_selected',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mit {count} ausgewählten: ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'With {count} selected: ',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'lv_nicht_zulassen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nicht zulassen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Don\'t allow ',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'lv_wiederholen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wiederholen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Repeat',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'title_history',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Statusverlauf für Antrag #{id} ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'History for Application #{id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'anmerkung_tooltip',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Spalte Anmerkung kann verwendet werden, um Besonderheiten z.B. bei einem Studienplanwechsel zu dokumentieren (Änderung von LV-Titel, ECTS…) ',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The Comment column can be used to document special features, e.g. when changing the curriculum (change of course title, ECTS...)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'fuer_alle_uebernehmen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'für alle übernehmen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'apply for all',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'fuer_x_uebernehmen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Auswahl für {count} weitere(n) Wiederholungsanträge übernehmen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Adopt selection for {count} further repeat applications',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'title_grund',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Grund für Ablehnung von Antrag #{id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason for rejection of Application #{id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_lvs',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Lehrveranstaltungen zugewiesen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No courses assigned',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'status_x',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '<b>Status:</b> {status}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '<b>Status:</b> {status}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'status_saving',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Daten werden gespeichert...',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Saving...',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'status_error',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'status_open',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Offen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Open',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'status_created',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erstellt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Created',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'status_cancelling',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zurückziehen...',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Cancelling...',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'status_cancelled',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zurückgezogen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Cancelled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_stg_blacklist',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Für diesen Studiengang sind keine Anträge möglich',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No applications are accepted for this course',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_antrag_exists',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es gibt bereits einen bestehenden Antrag',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'There is already an existing application',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_antrag_pending',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Es gibt bereits einen bestehenden Antrag vom Typ {typ}' ,
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'There is already an existing application of type {typ}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_antrag_found',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Antrag mit AntragsId {id} gefunden' ,
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No application found with ApplicationId {id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_antrag_locked',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Dieser Antrag ist gesperrt' ,
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'This request is locked',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_lv',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Lehrveranstaltung ausgewählt' ,
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No course selected',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_lv_in_application',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Lehrveranstaltung im Antrag gefunden' ,
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No course found in application',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_right',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Berechtigung, den Antrag zu bearbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No authorization to edit the application',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_objection',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Berechtigung, den Antrag zu beeinspruchen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No authorization to object the application',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_not_objected',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Antrag ist nicht beeinsprucht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Application is not objected',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+
 );
 
 
diff --git a/system/vorlage_zip/AntragAbmeldung.odt b/system/vorlage_zip/AntragAbmeldung.odt
new file mode 100644
index 0000000000000000000000000000000000000000..2e11ca60ae49eb67a843672bf6e2c87e5d31517c
GIT binary patch
literal 37277
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

literal 0
HcmV?d00001

diff --git a/system/vorlage_zip/AntragUnterbrechung.odt b/system/vorlage_zip/AntragUnterbrechung.odt
new file mode 100644
index 0000000000000000000000000000000000000000..aeaa82105e7a130979d9a86f82ee5d622b610b7c
GIT binary patch
literal 34155
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

literal 0
HcmV?d00001

diff --git a/system/xsl/AntragAbmeldung.xsl b/system/xsl/AntragAbmeldung.xsl
new file mode 100644
index 000000000..7996e3745
--- /dev/null
+++ b/system/xsl/AntragAbmeldung.xsl
@@ -0,0 +1,368 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+	xmlns:fo="http://www.w3.org/1999/XSL/Format"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	version="1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+	xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+	xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0">
+
+	<xsl:output method="xml" version="1.0" indent="yes"/>
+
+	<xsl:template match="antraege">
+		<office:document-content
+			xmlns:officeooo="http://openoffice.org/2009/office"
+			xmlns:css3t="http://www.w3.org/TR/css3-text/"
+			xmlns:grddl="http://www.w3.org/2003/g/data-view#"
+			xmlns:xhtml="http://www.w3.org/1999/xhtml"
+			xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
+			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			xmlns:rpt="http://openoffice.org/2005/report"
+			xmlns:dc="http://purl.org/dc/elements/1.1/"
+			xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+			xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+			xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+			xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+			xmlns:oooc="http://openoffice.org/2004/calc"
+			xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+			xmlns:ooow="http://openoffice.org/2004/writer"
+			xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+			xmlns:xlink="http://www.w3.org/1999/xlink"
+			xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+			xmlns:ooo="http://openoffice.org/2004/office"
+			xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+			xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+			xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+			xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+			xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
+			xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
+			xmlns:tableooo="http://openoffice.org/2009/table"
+			xmlns:drawooo="http://openoffice.org/2010/draw"
+			xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
+			xmlns:dom="http://www.w3.org/2001/xml-events"
+			xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:math="http://www.w3.org/1998/Math/MathML"
+			xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+			xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
+			xmlns:xforms="http://www.w3.org/2002/xforms" office:version="1.3">
+
+			<office:scripts/>
+			<office:font-face-decls>
+				<style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/>
+				<style:font-face style:name="Liberation Sans" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
+				<style:font-face style:name="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+				<style:font-face style:name="Lohit Devanagari" svg:font-family="&apos;Lohit Devanagari&apos;"/>
+				<style:font-face style:name="Lohit Devanagari1" svg:font-family="&apos;Lohit Devanagari&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+				<style:font-face style:name="Noto Sans CJK SC" svg:font-family="&apos;Noto Sans CJK SC&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+				<style:font-face style:name="Noto Serif CJK SC" svg:font-family="&apos;Noto Serif CJK SC&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+				<style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-family-generic="swiss" style:font-pitch="variable"/>
+				<style:font-face style:name="Times New Roman" svg:font-family="&apos;Times New Roman&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+			</office:font-face-decls>
+			<office:automatic-styles>
+				<style:style style:name="Tabelle1" style:family="table">
+					<style:table-properties style:width="16.245cm" fo:margin-left="-0.191cm" table:align="left" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle1.A" style:family="table-column">
+					<style:table-column-properties style:column-width="16.245cm"/>
+				</style:style>
+				<style:style style:name="Tabelle1.1" style:family="table-row">
+					<style:table-row-properties fo:keep-together="auto"/>
+				</style:style>
+				<style:style style:name="Tabelle1.A1" style:family="table-cell">
+					<style:table-cell-properties style:vertical-align="top" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="none" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle2" style:family="table">
+					<style:table-properties style:width="16.245cm" fo:margin-left="-0.191cm" table:align="left" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle2.A" style:family="table-column">
+					<style:table-column-properties style:column-width="4.41cm"/>
+				</style:style>
+				<style:style style:name="Tabelle2.B" style:family="table-column">
+					<style:table-column-properties style:column-width="11.836cm"/>
+				</style:style>
+				<style:style style:name="Tabelle2.1" style:family="table-row">
+					<style:table-row-properties fo:keep-together="auto"/>
+				</style:style>
+				<style:style style:name="Tabelle2.A1" style:family="table-cell">
+					<style:table-cell-properties style:vertical-align="top" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #000000" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle2.5" style:family="table-row">
+					<style:table-row-properties style:min-row-height="8.301cm" fo:keep-together="auto"/>
+				</style:style>
+				<style:style style:name="Tabelle3" style:family="table">
+					<style:table-properties style:width="16.245cm" fo:margin-left="-0.191cm" table:align="left" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle3.A" style:family="table-column">
+					<style:table-column-properties style:column-width="7.528cm"/>
+				</style:style>
+				<style:style style:name="Tabelle3.B" style:family="table-column">
+					<style:table-column-properties style:column-width="0.416cm"/>
+				</style:style>
+				<style:style style:name="Tabelle3.C" style:family="table-column">
+					<style:table-column-properties style:column-width="8.301cm"/>
+				</style:style>
+				<style:style style:name="Tabelle3.1" style:family="table-row">
+					<style:table-row-properties fo:keep-together="auto"/>
+				</style:style>
+				<style:style style:name="Tabelle3.A1" style:family="table-cell">
+					<style:table-cell-properties style:vertical-align="top" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.5pt solid #000000" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle3.B1" style:family="table-cell">
+					<style:table-cell-properties style:vertical-align="top" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="none" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle3.A2" style:family="table-cell">
+					<style:table-cell-properties style:vertical-align="top" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="0.5pt solid #000000" fo:border-bottom="none" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="P1" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:line-height="150%">
+						<style:tab-stops>
+							<style:tab-stop style:position="3.501cm"/>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="14.753cm"/>
+							<style:tab-stop style:position="15.503cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+				</style:style>
+				<style:style style:name="P2" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:line-height="150%">
+						<style:tab-stops>
+							<style:tab-stop style:position="3.501cm"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+				</style:style>
+				<style:style style:name="P3" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false">
+						<style:tab-stops>
+							<style:tab-stop style:position="7.502cm"/>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="14.753cm"/>
+							<style:tab-stop style:position="15.503cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+				</style:style>
+				<style:style style:name="P4" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:margin-top="0.494cm" fo:margin-bottom="0.882cm" style:contextual-spacing="false" fo:line-height="0.776cm">
+						<style:tab-stops>
+							<style:tab-stop style:position="7.502cm"/>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="14.753cm"/>
+							<style:tab-stop style:position="15.503cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+					<style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
+				</style:style>
+				<style:style style:name="P5" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false">
+						<style:tab-stops>
+							<style:tab-stop style:position="7.502cm"/>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="14.753cm"/>
+							<style:tab-stop style:position="15.503cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+					<style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="P6" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false">
+						<style:tab-stops>
+							<style:tab-stop style:position="7.502cm"/>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="14.753cm"/>
+							<style:tab-stop style:position="15.503cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+					<style:text-properties fo:font-size="9pt" fo:language="none" fo:country="none" style:font-size-asian="9pt" style:language-asian="none" style:country-asian="none" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="P7" style:family="paragraph" style:parent-style-name="Header">
+					<style:text-properties fo:language="none" fo:country="none" style:language-asian="none" style:country-asian="none"/>
+				</style:style>
+				<style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false" fo:line-height="0.776cm">
+						<style:tab-stops>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+					<style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="P9" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false"/>
+					<style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false">
+						<style:tab-stops>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+					<style:text-properties fo:font-size="9pt" fo:language="none" fo:country="none" style:font-size-asian="9pt" style:language-asian="none" style:country-asian="none" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="P11" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false"/>
+				</style:style>
+				<style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false" style:snap-to-layout-grid="false"/>
+				</style:style>
+				<style:style style:name="P13" style:family="paragraph" style:parent-style-name="Standard">
+					<style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+				</style:style>
+				<style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:break-after="page"/>
+					<style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+				</style:style>
+				<style:style style:name="T1" style:family="text">
+					<style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
+				</style:style>
+				<style:style style:name="T2" style:family="text">
+					<style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+				</style:style>
+				<style:style style:name="T3" style:family="text">
+					<style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="T4" style:family="text">
+					<style:text-properties fo:font-size="9pt" fo:language="none" fo:country="none" style:font-size-asian="9pt" style:language-asian="none" style:country-asian="none" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="T5" style:family="text">
+					<style:text-properties fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+				</style:style>
+				<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
+					<style:graphic-properties fo:margin-left="0.319cm" fo:margin-right="0.319cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:run-through="background" style:wrap="parallel" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="true" style:wrap-contour-mode="outside" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" fo:background-color="transparent" draw:fill="none" draw:fill-color="#ffffff" fo:padding="0.002cm" fo:border="none" style:mirror="none" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>
+				</style:style>
+				<style:style style:name="Sect1" style:family="section">
+					<style:section-properties text:dont-balance-text-columns="true" style:writing-mode="lr-tb" style:editable="false">
+						<style:columns fo:column-count="1" fo:column-gap="0cm"/>
+					</style:section-properties>
+				</style:style>
+			</office:automatic-styles>
+			<office:body>
+				<xsl:apply-templates match="antrag"/>
+			</office:body>
+
+		</office:document-content>
+	</xsl:template>
+	
+	<xsl:template match="antrag">
+		<office:text>
+			<office:forms form:automatic-focus="false" form:apply-design-mode="false"/>
+			<text:tracked-changes text:track-changes="true"/>
+			<text:sequence-decls>
+				<text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
+			</text:sequence-decls>
+			<text:section text:style-name="Sect1" text:name="Bereich1" text:protected="true">
+				<table:table table:name="Tabelle1" table:style-name="Tabelle1">
+					<table:table-column table:style-name="Tabelle1.A"/>
+					<table:table-row table:style-name="Tabelle1.1">
+						<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
+							<text:p text:style-name="P1">
+
+								<text:span text:style-name="T2">Studiengang: 
+									<text:s text:c="13"/>
+								</text:span>
+								<text:span text:style-name="T4"><xsl:value-of select="studiengang"/></text:span>
+							</text:p>
+							<text:p text:style-name="P2">
+								<text:span text:style-name="T2">Organisationsform:
+									<text:tab/>
+								</text:span>
+								<text:span text:style-name="T4"><xsl:value-of select="organisationsform"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+				</table:table>
+				<text:p text:style-name="P4">Abmeldung vom Studium durch Studierende</text:p>
+				<table:table table:name="Tabelle2" table:style-name="Tabelle2">
+					<table:table-column table:style-name="Tabelle2.A"/>
+					<table:table-column table:style-name="Tabelle2.B"/>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P3">
+								<text:span text:style-name="T3">Name der*des Studierenden</text:span>
+							</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P6">
+								<text:span text:style-name="T4"><xsl:value-of select="name"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">Personenkennzeichen</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">
+								<text:span text:style-name="T4"><xsl:value-of select="personenkz"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">Studienjahr</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">
+								<text:span text:style-name="T4"><xsl:value-of select="studienjahr"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">Semester</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">
+								<text:span text:style-name="T4"><xsl:value-of select="semester"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.5">
+						<table:table-cell table:style-name="Tabelle2.A1" table:number-columns-spanned="2" office:value-type="string">
+							<text:p text:style-name="P8">Grund der Abmeldung:</text:p>
+							<text:p text:style-name="P10">
+								<text:span text:style-name="T4"><xsl:value-of select="grund"/></text:span>
+							</text:p>
+						</table:table-cell>
+						<table:covered-table-cell/>
+					</table:table-row>
+				</table:table>
+				<text:p text:style-name="Standard"/>
+
+				<text:p text:style-name="Standard"/>
+				<text:p text:style-name="Standard"/>
+				<text:p text:style-name="Standard"/>
+				<text:p text:style-name="P13"/>
+				<text:p text:style-name="Standard">
+					<text:span text:style-name="T2">Wir weisen Sie darauf hin, dass Ihr FHTW Account noch 21 Tage aktiv ist. Wir bitten Sie, alle benötigte Dateien (Zeugnisse, Studienerfolgsbestätigungen, Studienbestätigungen, etc.) innerhalb dieses Zeitraums herunterzuladen. Für die Ausstellung von Duplikaten fallen nach Inaktivsetzung des CIS-Accounts Kosten an.
+						<text:line-break/>
+					</text:span>
+					<text:span text:style-name="T1">Sie sind gem. Ausbildungsvertrag verpflichtet, unverzüglich alle zur Verfügung gestellten Gerätschaften, Bücher, Schlüssel und sonstige Materialien zurückzugeben.</text:span>
+					<text:span text:style-name="T2">
+						<text:line-break/>Bei Abmeldung vor dem 01.09. bzw. 15.02. und bereits eingezahltem Studienbeitrag für das kommende Semester: Wir informieren Sie darüber, dass der Studienbeitrag für das kommende Semester von Ihnen zurückgefordert werden kann. Bitte geben Sie uns dafür innerhalb von 14 Tagen Ihre Bankdaten an folgende E-Mail-Adresse bekannt: billing@technikum-wien.at.
+					</text:span>
+				</text:p>
+				<text:p text:style-name="P14"/>
+			</text:section>
+		</office:text>
+	</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/system/xsl/AntragUnterbrechung.xsl b/system/xsl/AntragUnterbrechung.xsl
new file mode 100644
index 000000000..f1ab10d91
--- /dev/null
+++ b/system/xsl/AntragUnterbrechung.xsl
@@ -0,0 +1,459 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+	xmlns:fo="http://www.w3.org/1999/XSL/Format"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	version="1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+	xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+	xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0">
+
+	<xsl:output method="xml" version="1.0" indent="yes"/>
+
+	<xsl:template match="antraege">
+<office:document-content
+	xmlns:officeooo="http://openoffice.org/2009/office"
+	xmlns:css3t="http://www.w3.org/TR/css3-text/"
+	xmlns:grddl="http://www.w3.org/2003/g/data-view#"
+	xmlns:xhtml="http://www.w3.org/1999/xhtml"
+	xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+	xmlns:rpt="http://openoffice.org/2005/report"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	xmlns:oooc="http://openoffice.org/2004/calc"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+	xmlns:ooow="http://openoffice.org/2004/writer"
+	xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+	xmlns:ooo="http://openoffice.org/2004/office"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+	xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
+	xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
+	xmlns:tableooo="http://openoffice.org/2009/table"
+	xmlns:drawooo="http://openoffice.org/2010/draw"
+	xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
+	xmlns:dom="http://www.w3.org/2001/xml-events"
+	xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:math="http://www.w3.org/1998/Math/MathML"
+	xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+	xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
+	xmlns:xforms="http://www.w3.org/2002/xforms" office:version="1.3">
+	<office:scripts/>
+	<office:font-face-decls>
+		<style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="roman" style:font-pitch="variable"/>
+		<style:font-face style:name="Arial1" svg:font-family="Arial" style:font-family-generic="system" style:font-pitch="variable"/>
+		<style:font-face style:name="Liberation Sans" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
+		<style:font-face style:name="Lohit Devanagari" svg:font-family="&apos;Lohit Devanagari&apos;"/>
+		<style:font-face style:name="Lohit Devanagari1" svg:font-family="&apos;Lohit Devanagari&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+		<style:font-face style:name="Noto Sans CJK SC" svg:font-family="&apos;Noto Sans CJK SC&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+		<style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-family-generic="roman" style:font-pitch="variable"/>
+		<style:font-face style:name="Tahoma1" svg:font-family="Tahoma" style:font-family-generic="system" style:font-pitch="variable"/>
+		<style:font-face style:name="Times New Roman" svg:font-family="&apos;Times New Roman&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+		<style:font-face style:name="Times New Roman1" svg:font-family="&apos;Times New Roman&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+	</office:font-face-decls>
+	<office:automatic-styles>
+		<style:style style:name="Tabelle1" style:family="table">
+			<style:table-properties style:width="16.245cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
+		</style:style>
+		<style:style style:name="Tabelle1.A" style:family="table-column">
+			<style:table-column-properties style:column-width="16.245cm"/>
+		</style:style>
+		<style:style style:name="Tabelle1.1" style:family="table-row">
+			<style:table-row-properties fo:keep-together="auto"/>
+		</style:style>
+		<style:style style:name="Tabelle1.A1" style:family="table-cell">
+			<style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="none">
+				<style:background-image/>
+			</style:table-cell-properties>
+		</style:style>
+		<style:style style:name="Tabelle2" style:family="table">
+			<style:table-properties style:width="17.126cm" fo:margin-left="0.009cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
+		</style:style>
+		<style:style style:name="Tabelle2.A" style:family="table-column">
+			<style:table-column-properties style:column-width="6.909cm"/>
+		</style:style>
+		<style:style style:name="Tabelle2.B" style:family="table-column">
+			<style:table-column-properties style:column-width="10.215cm"/>
+		</style:style>
+		<style:style style:name="Tabelle2.1" style:family="table-row">
+			<style:table-row-properties style:min-row-height="0.679cm" fo:keep-together="auto"/>
+		</style:style>
+		<style:style style:name="Tabelle2.A1" style:family="table-cell">
+			<style:table-cell-properties style:vertical-align="middle" fo:padding-left="0.123cm" fo:padding-right="0.123cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #000000"/>
+		</style:style>
+		<style:style style:name="Tabelle2.B1" style:family="table-cell">
+			<style:table-cell-properties style:vertical-align="bottom" fo:padding-left="0.123cm" fo:padding-right="0.123cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #000000"/>
+		</style:style>
+		<style:style style:name="Tabelle2.2" style:family="table-row">
+			<style:table-row-properties style:row-height="0.658cm" fo:keep-together="auto"/>
+		</style:style>
+		<style:style style:name="Tabelle2.3" style:family="table-row">
+			<style:table-row-properties style:row-height="0.626cm" fo:keep-together="auto"/>
+		</style:style>
+		<style:style style:name="Tabelle2.4" style:family="table-row">
+			<style:table-row-properties style:row-height="0.642cm" fo:keep-together="auto"/>
+		</style:style>
+		<style:style style:name="Tabelle2.5" style:family="table-row">
+			<style:table-row-properties style:min-row-height="7.502cm" fo:keep-together="auto"/>
+		</style:style>
+		<style:style style:name="Tabelle2.A5" style:family="table-cell">
+			<style:table-cell-properties fo:padding-left="0.123cm" fo:padding-right="0.123cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border-left="0.75pt solid #000000" fo:border-right="0.75pt solid #000000" fo:border-top="0.75pt solid #000000" fo:border-bottom="0.5pt solid #000000"/>
+		</style:style>
+		<style:style style:name="Tabelle2.6" style:family="table-row">
+			<style:table-row-properties style:min-row-height="0.801cm" fo:keep-together="auto"/>
+		</style:style>
+		<style:style style:name="Tabelle3" style:family="table">
+			<style:table-properties style:width="15.998cm" fo:margin-left="0cm" fo:margin-top="0cm" fo:margin-bottom="0cm" table:align="left" style:writing-mode="lr-tb"/>
+		</style:style>
+		<style:style style:name="Tabelle3.A" style:family="table-column">
+			<style:table-column-properties style:column-width="6.863cm"/>
+		</style:style>
+		<style:style style:name="Tabelle3.B" style:family="table-column">
+			<style:table-column-properties style:column-width="0.591cm"/>
+		</style:style>
+		<style:style style:name="Tabelle3.C" style:family="table-column">
+			<style:table-column-properties style:column-width="8.544cm"/>
+		</style:style>
+		<style:style style:name="Tabelle3.1" style:family="table-row">
+			<style:table-row-properties fo:keep-together="auto"/>
+		</style:style>
+		<style:style style:name="Tabelle3.A1" style:family="table-cell">
+			<style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="none">
+				<style:background-image/>
+			</style:table-cell-properties>
+		</style:style>
+		<style:style style:name="Tabelle3.2" style:family="table-row">
+			<style:table-row-properties style:min-row-height="2.611cm" fo:keep-together="auto"/>
+		</style:style>
+		<style:style style:name="Tabelle3.A2" style:family="table-cell">
+			<style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.5pt solid #000000">
+				<style:background-image/>
+			</style:table-cell-properties>
+		</style:style>
+		<style:style style:name="Tabelle3.A3" style:family="table-cell">
+			<style:table-cell-properties fo:background-color="transparent" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="0.5pt solid #000000" fo:border-bottom="none">
+				<style:background-image/>
+			</style:table-cell-properties>
+		</style:style>
+		<style:style style:name="P1" style:family="paragraph" style:parent-style-name="Header">
+			<style:paragraph-properties fo:line-height="130%" fo:orphans="0" fo:widows="0">
+				<style:tab-stops>
+					<style:tab-stop style:position="7.502cm"/>
+					<style:tab-stop style:position="9.502cm"/>
+					<style:tab-stop style:position="14.753cm"/>
+					<style:tab-stop style:position="15.503cm"/>
+					<style:tab-stop style:position="16.002cm" style:type="right"/>
+				</style:tab-stops>
+			</style:paragraph-properties>
+		</style:style>
+		<style:style style:name="P2" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties fo:text-align="center" style:justify-single-word="false"/>
+			<style:text-properties fo:font-size="2pt" fo:font-style="italic" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold" style:font-size-asian="2pt" style:font-style-asian="italic" style:font-weight-asian="bold"/>
+		</style:style>
+		<style:style style:name="P3" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties fo:line-height="130%" fo:orphans="0" fo:widows="0"/>
+		</style:style>
+		<style:style style:name="P4" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false" fo:line-height="130%" fo:orphans="0" fo:widows="0">
+				<style:tab-stops>
+					<style:tab-stop style:position="9.502cm"/>
+					<style:tab-stop style:position="16.002cm" style:type="right"/>
+				</style:tab-stops>
+			</style:paragraph-properties>
+		</style:style>
+		<style:style style:name="P5" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties fo:margin-top="0.494cm" fo:margin-bottom="0.882cm" style:contextual-spacing="false">
+				<style:tab-stops>
+					<style:tab-stop style:position="7.502cm"/>
+					<style:tab-stop style:position="9.502cm"/>
+					<style:tab-stop style:position="14.753cm"/>
+					<style:tab-stop style:position="15.503cm"/>
+					<style:tab-stop style:position="16.002cm" style:type="right"/>
+				</style:tab-stops>
+			</style:paragraph-properties>
+		</style:style>
+		<style:style style:name="P6" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false" fo:orphans="0" fo:widows="0">
+				<style:tab-stops>
+					<style:tab-stop style:position="7.502cm"/>
+					<style:tab-stop style:position="9.502cm"/>
+					<style:tab-stop style:position="14.753cm"/>
+					<style:tab-stop style:position="15.503cm"/>
+					<style:tab-stop style:position="16.002cm" style:type="right"/>
+				</style:tab-stops>
+			</style:paragraph-properties>
+		</style:style>
+		<style:style style:name="P7" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" fo:orphans="0" fo:widows="0">
+				<style:tab-stops>
+					<style:tab-stop style:position="7.502cm"/>
+					<style:tab-stop style:position="9.502cm"/>
+					<style:tab-stop style:position="14.753cm"/>
+					<style:tab-stop style:position="15.503cm"/>
+					<style:tab-stop style:position="16.002cm" style:type="right"/>
+				</style:tab-stops>
+			</style:paragraph-properties>
+		</style:style>
+		<style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard" style:list-style-name="">
+			<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false" fo:orphans="0" fo:widows="0" fo:keep-with-next="always">
+				<style:tab-stops>
+					<style:tab-stop style:position="9.502cm"/>
+					<style:tab-stop style:position="16.002cm" style:type="right"/>
+				</style:tab-stops>
+			</style:paragraph-properties>
+		</style:style>
+		<style:style style:name="P9" style:family="paragraph" style:parent-style-name="Standard" style:list-style-name="">
+			<style:paragraph-properties fo:margin-top="0.212cm" fo:margin-bottom="0.212cm" style:contextual-spacing="false" fo:orphans="0" fo:widows="0" fo:keep-with-next="always">
+				<style:tab-stops>
+					<style:tab-stop style:position="9.502cm"/>
+					<style:tab-stop style:position="16.002cm" style:type="right"/>
+				</style:tab-stops>
+			</style:paragraph-properties>
+		</style:style>
+		<style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties>
+				<style:tab-stops>
+					<style:tab-stop style:position="9.502cm"/>
+					<style:tab-stop style:position="16.002cm" style:type="right"/>
+				</style:tab-stops>
+			</style:paragraph-properties>
+			<style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+		</style:style>
+		<style:style style:name="P11" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties fo:line-height="0.706cm" fo:orphans="0" fo:widows="0"/>
+			<style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+		</style:style>
+		<style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties fo:margin-top="0.494cm" fo:margin-bottom="0.706cm" style:contextual-spacing="false">
+				<style:tab-stops>
+					<style:tab-stop style:position="9.502cm"/>
+					<style:tab-stop style:position="16.002cm" style:type="right"/>
+				</style:tab-stops>
+			</style:paragraph-properties>
+		</style:style>
+		<style:style style:name="P13" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties fo:line-height="0.706cm" fo:orphans="0" fo:widows="0"/>
+		</style:style>
+		<style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties fo:line-height="130%"/>
+			<style:text-properties fo:font-size="11pt" fo:language="de" fo:country="DE" style:font-size-asian="11pt" style:font-name-complex="Times New Roman1"/>
+		</style:style>
+		<style:style style:name="P15" style:family="paragraph" style:parent-style-name="Standard">
+			<style:paragraph-properties fo:margin-top="0.494cm" fo:margin-bottom="0.706cm" style:contextual-spacing="false" fo:break-after="page">
+				<style:tab-stops>
+					<style:tab-stop style:position="9.502cm"/>
+					<style:tab-stop style:position="16.002cm" style:type="right"/>
+				</style:tab-stops>
+			</style:paragraph-properties>
+		</style:style>
+		<style:style style:name="T1" style:family="text">
+			<style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+		</style:style>
+		<style:style style:name="T2" style:family="text">
+			<style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
+		</style:style>
+		<style:style style:name="T3" style:family="text">
+			<style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+		</style:style>
+		<style:style style:name="T4" style:family="text">
+			<style:text-properties fo:font-size="9pt" style:font-size-complex="9pt"/>
+		</style:style>
+		<style:style style:name="T5" style:family="text">
+			<style:text-properties fo:font-size="9pt" fo:language="de" fo:country="DE" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+		</style:style>
+		<style:style style:name="T6" style:family="text">
+			<style:text-properties fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+		</style:style>
+		<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
+			<style:graphic-properties fo:margin-left="0.318cm" fo:margin-right="0.318cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:run-through="foreground" style:wrap="parallel" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="true" style:wrap-contour-mode="outside" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" fo:background-color="transparent" draw:fill="none" draw:fill-color="#ffffff" fo:padding="0cm" fo:border="none" style:mirror="none" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>
+		</style:style>
+		<style:style style:name="Sect1" style:family="section">
+			<style:section-properties style:editable="false">
+				<style:columns fo:column-count="1" fo:column-gap="0cm"/>
+			</style:section-properties>
+		</style:style>
+	</office:automatic-styles>
+	<office:body>
+		<xsl:apply-templates match="antrag"/>	
+	</office:body>
+</office:document-content>
+</xsl:template> 
+
+<xsl:template match="antrag">
+	<office:text>
+			<text:tracked-changes text:track-changes="true"/>
+			<text:sequence-decls>
+				<text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
+			</text:sequence-decls>
+			<text:section text:style-name="Sect1" text:name="TextSection" text:protected="true">
+				<text:p text:style-name="P2"/>
+				<table:table table:name="Tabelle1" table:style-name="Tabelle1">
+					<table:table-column table:style-name="Tabelle1.A"/>
+					<table:table-row table:style-name="Tabelle1.1">
+						<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
+							<text:p text:style-name="P1">
+								<text:span text:style-name="T1">Studiengang: 
+									<text:s text:c="16"/>
+								</text:span>
+					
+								<text:span text:style-name="T1"><xsl:value-of select="studiengang"/></text:span>
+		
+							</text:p>
+							<text:p text:style-name="P3">
+								<text:span text:style-name="T1">Organisationsform:
+									<text:tab/>
+								</text:span>
+								<text:span text:style-name="T1"><xsl:value-of select="organisationsform"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+				</table:table>
+				<text:p text:style-name="P5">
+					<text:span text:style-name="T2">Antrag auf Unterbrechung des Studiums</text:span>
+				</text:p>
+				<table:table table:name="Tabelle2" table:style-name="Tabelle2">
+					<table:table-column table:style-name="Tabelle2.A"/>
+					<table:table-column table:style-name="Tabelle2.B"/>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P6">
+								<text:span text:style-name="T3">Name der*des Studierenden</text:span>
+							</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
+							<text:h text:style-name="P8" text:outline-level="1">
+
+								<text:span text:style-name="T5"><xsl:value-of select="name"/></text:span>
+
+							</text:h>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.2">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P6">
+								<text:span text:style-name="T3">Personenkennzeichen</text:span>
+							</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
+							<text:h text:style-name="P8" text:outline-level="1">
+
+								<text:span text:style-name="T5"><xsl:value-of select="personenkz"/></text:span>
+			
+							</text:h>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.3">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P6">
+								<text:span text:style-name="T3">Studienjahr</text:span>
+							</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
+							<text:h text:style-name="P8" text:outline-level="1">
+
+							<text:span text:style-name="T5"><xsl:value-of select="studienjahr"/></text:span>
+
+							</text:h>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.4">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P6">
+								<text:span text:style-name="T3">Aktuelles Semester</text:span>
+							</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
+							<text:h text:style-name="P8" text:outline-level="1">
+								<text:span text:style-name="T5"><xsl:value-of select="semester"/></text:span>
+							</text:h>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.5">
+						<table:table-cell table:style-name="Tabelle2.A5" table:number-columns-spanned="2" office:value-type="string">
+							<text:p text:style-name="P4">
+								<text:span text:style-name="T3">Grund der Unterbrechung:</text:span>
+							</text:p>
+							<text:p text:style-name="P4">
+
+								<text:span text:style-name="T3"><xsl:value-of select="grund"/></text:span>
+
+							</text:p>
+						</table:table-cell>
+						<table:covered-table-cell/>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.6">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P7">
+								<text:span text:style-name="T3">Wiedereinstieg am</text:span>
+							</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.B1" office:value-type="string">
+							<text:h text:style-name="P9" text:outline-level="1">
+	
+								<text:span text:style-name="T5"><xsl:value-of select="returndate"/></text:span>
+
+							</text:h>
+						</table:table-cell>
+					</table:table-row>
+				</table:table>
+				<text:p text:style-name="P10"/>
+				<table:table table:name="Tabelle3" table:style-name="Tabelle3">
+					<table:table-column table:style-name="Tabelle3.A"/>
+					<table:table-column table:style-name="Tabelle3.B"/>
+					<table:table-column table:style-name="Tabelle3.C"/>
+					<table:table-row table:style-name="Tabelle3.1">
+						<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
+							<text:p text:style-name="P13">
+								<text:span text:style-name="T3">Datum: </text:span>
+		
+								<text:span text:style-name="T5"><xsl:value-of select="createdate"/></text:span>
+	
+							</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
+							<text:p text:style-name="P11"/>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
+							<text:p text:style-name="P11"/>
+						</table:table-cell>
+					</table:table-row>
+				</table:table>
+				<text:p text:style-name="P14"/>
+				<text:p text:style-name="P12">
+					<text:span text:style-name="T3">Infolge der Weiterentwicklung der Qualität des Studienganges kann es zu Änderungen der Studienbedingungen beim Wiedereinstieg kommen (z. B. Studienplan, Prüfungsordnung etc.)</text:span>
+				</text:p>
+				<text:p text:style-name="P12">
+					<text:span text:style-name="T3">Falls Sie das Studium im Wintersemester vor dem 15.10. bzw. im Sommersemester vor dem 15.3. beenden, wird Ihnen der Studienbeitrag für das aktuelle Semester rückerstattet. Bitte geben Sie uns innerhalb von 14 Tagen Ihre Bankdaten an folgende E-Mail-Adresse bekannt: </text:span>
+					<text:a xlink:type="simple" xlink:href="mailto:billing@technikum-wien.at" text:style-name="Internet_20_link" text:visited-style-name="Visited_20_Internet_20_Link">
+						<text:span text:style-name="Internet_20_link">
+							<text:span text:style-name="T3">billing@technikum-wien.at</text:span>
+						</text:span>
+					</text:a>
+					<text:span text:style-name="T3">. </text:span>
+				</text:p>
+				<text:p text:style-name="P15"/>
+			</text:section>
+		</office:text>
+</xsl:template>
+</xsl:stylesheet>
\ No newline at end of file

From b39fa7667e4f36d4db15a95007631bc0bc9c46c5 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 4 Jul 2023 11:09:55 +0200
Subject: [PATCH 037/175] Remove TODO

---
 application/controllers/components/Antrag/Wiederholung.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/controllers/components/Antrag/Wiederholung.php b/application/controllers/components/Antrag/Wiederholung.php
index 7b5d8f887..941d6e51a 100644
--- a/application/controllers/components/Antrag/Wiederholung.php
+++ b/application/controllers/components/Antrag/Wiederholung.php
@@ -66,7 +66,6 @@ class Wiederholung extends FHC_Controller
 		}
 		$result = $result->retval;
 		if (!$result) {
-			// TODO(chris): ERROR Message
 			$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
 			return $this->outputJsonError($this->p->t('studierendenantrag','error_no_student_no_failed_exam'));
 		}

From ff93cb26fe07985fcc0b29263c419c7b75b5d759 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 4 Jul 2023 11:10:26 +0200
Subject: [PATCH 038/175] Bug: status

---
 .../Studierendenantrag/Form/Wiederholung.js        | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Form/Wiederholung.js b/public/js/components/Studierendenantrag/Form/Wiederholung.js
index 4cbc32d88..ff37540bb 100644
--- a/public/js/components/Studierendenantrag/Form/Wiederholung.js
+++ b/public/js/components/Studierendenantrag/Form/Wiederholung.js
@@ -65,13 +65,15 @@ export default {
 			).then(
 				result => {
 					this.data = result.data.retval;
-					if (!this.data.status || this.data.status == 'ErsteAufforderungVersandt' || this.data.status == 'ZweiteAufforderungVersandt')
+					if (!this.data.status || this.data.status == 'ErsteAufforderungVersandt' || this.data.status == 'ZweiteAufforderungVersandt') {
 						this.data.status = 'Offen';
+						this.data.statustyp = this.p.t('studierendenantrag', 'status_open');
+					}
 					this.$emit('update:status', this.data.status);
 					this.$emit("setStatus", {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
-							severity: this.statusSeverity
-						});
+						msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+						severity: this.statusSeverity
+					});
 					return result;
 				}
 			);
@@ -87,7 +89,7 @@ export default {
 			let nextState = repeat ? 'Erstellt' : 'Verzichtet';
 
 			this.$emit('setStatus', {
-				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t_ref('studierendenantrag', 'status_saving')}),
+				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
 				severity: 'warning'
 			});
 			this.saving = true;
@@ -114,7 +116,7 @@ export default {
 								this.errors.default.push(result.data.retval[k]);
 						}
 						this.$emit('setStatus', {
-							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t_ref('studierendenantrag', 'status_error')}),
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
 							severity: 'danger'
 						});
 					}

From 7eed07a68295d8b83db19e915983140282123ddb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 4 Jul 2023 13:37:54 +0200
Subject: [PATCH 039/175] LV zuweisung & anzeige: handle semester above
 max_semester & anmerkung bug

---
 application/libraries/AntragLib.php           | 30 ++++++---
 .../Studierendenantrag/Leitung/LvPopup.js     | 63 ++++++++++---------
 .../Studierendenantrag/Lvzuweisung.js         | 15 ++++-
 system/phrasesupdate.php                      | 20 ++++++
 4 files changed, 87 insertions(+), 41 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 38504772c..f1a757bc2 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -765,14 +765,16 @@ class AntragLib
 		);
 		if (isError($result))
 			return $result;
-		$lvsA = getData($result) ?: [];
-		foreach($lvsA as $lv)
-		{
-			if (isset($lvszugewiesen[$lv->lehrveranstaltung_id]) &&
-				($lvszugewiesen[$lv->lehrveranstaltung_id]->note == $this->_ci->config->item('wiederholung_note_nicht_zugelassen')))
+		$lvsA = $result->retval; // NOTE(chris): don't use getData() because we want to differenciate [] and null
+		if ($lvsA) {
+			foreach($lvsA as $lv)
 			{
-				$lv->antrag_zugelassen = true;
-				$lv->antrag_anmerkung = $lvszugewiesen[$lv->lehrveranstaltung_id]->anmerkung;
+				if (isset($lvszugewiesen[$lv->lehrveranstaltung_id]) &&
+					($lvszugewiesen[$lv->lehrveranstaltung_id]->note == $this->_ci->config->item('wiederholung_note_nicht_zugelassen')))
+				{
+					$lv->antrag_zugelassen = true;
+					$lv->antrag_anmerkung = $lvszugewiesen[$lv->lehrveranstaltung_id]->anmerkung;
+				}
 			}
 		}
 
@@ -798,7 +800,7 @@ class AntragLib
 		}
 
 		return success([
-			'1' . $semA => $lvsA ?: [],
+			'1' . $semA => $lvsA,
 			'2' . $semB => $lvsB ?: []
 		]);
 	}
@@ -822,13 +824,23 @@ class AntragLib
 		if (isError($result))
 			return $result;
 		$result = getData($result);
-		if (!$result)
+		if (!$result) {
+			$result = $this->_ci->StudiengangModel->load($studiengang_kz);
+			if (isError($result))
+				return $result;
+			if (!hasData($result))
+				return error('No Studiengang found with studiengang_kz: ' . $studiengang_kz);
+			$stg = current(getData($result));
+			
+			if ($ausbildungssemester > $stg->max_semester)
+				return success();
 			return error('No studienplan found for stg: ' .
 				$studiengang_kz .
 				', studiensemester: ' .
 				$studiensemester_kurzbz .
 				', ausbildungssemester: ' .
 				($ausbildungssemester));
+		}
 		if (count($result) > 1)
 			return error('Multiple studienplaene found for stg: ' .
 				$studiengang_kz .
diff --git a/public/js/components/Studierendenantrag/Leitung/LvPopup.js b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
index 045e98729..c3f2aa118 100644
--- a/public/js/components/Studierendenantrag/Leitung/LvPopup.js
+++ b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
@@ -25,12 +25,12 @@ export default {
 		lvzugelassen() {
 			let zwischen = {};
 			for (let k in this.lvs){
-				zwischen[k] = this.lvs[k].filter(lv=>lv.antrag_zugelassen);
+				zwischen[k] = this.lvs[k] ? this.lvs[k].filter(lv=>lv.antrag_zugelassen) : null;
 			}
 			return zwischen;
 		},
 		lvzugelassenLength() {
-			return Object.values(this.lvzugelassen).reduce((result, current) => result + current.length, 0);
+			return Object.values(this.lvzugelassen).reduce((result, current) => result + (current ? current.length : 0), 0);
 		}
 	},
 	methods: {
@@ -86,7 +86,7 @@ export default {
 								<span>{{sem.substr(1)}}</span>
 							</span>
 						</caption>
-						<thead>
+						<thead v-if="lv_arr !== null">
 							<tr>
 								<th scope="col">{{p.t('ui','bezeichnung')}}</th>
 								<th scope="col">{{p.t('lehre','lehrform')}}</th>
@@ -98,33 +98,38 @@ export default {
 							</tr>
 						</thead>
 						<tbody>
-							<tr v-for="lv in lv_arr">
-								<td>
-									<label class="w-100 m-1" :for="'flexSwitchCheckLv_' + lv.lehrveranstaltung_id">
-										{{lv.bezeichnung}}
-									</label>
-								</td>
-								<td>
-									<div class="m-1">
-										{{lv.lehrform_kurzbz}}
-									</div>
-								</td>
-								<td>
-									<div class="m-1">
-										{{lv.ects}}
-									</div>
-								</td>
-								<td>
-									<div class="m-1">
-										{{lv.note || '---'}}
-									</div>
-								</td>
-								<td>
-									<div class="m-1">
-									{{lv.antrag_anmerkung}}
-									</div>
-								</td>
+							<tr v-if="lv_arr === null" class="table-warning">
+								<td colspan="5">{{p.t('studierendenantrag/error_stg_last_semester')}}</td>
 							</tr>
+							<template v-else>
+								<tr v-for="lv in lv_arr">
+									<td>
+										<label class="w-100 m-1" :for="'flexSwitchCheckLv_' + lv.lehrveranstaltung_id">
+											{{lv.bezeichnung}}
+										</label>
+									</td>
+									<td>
+										<div class="m-1">
+											{{lv.lehrform_kurzbz}}
+										</div>
+									</td>
+									<td>
+										<div class="m-1">
+											{{lv.ects}}
+										</div>
+									</td>
+									<td>
+										<div class="m-1">
+											{{lv.note || '---'}}
+										</div>
+									</td>
+									<td>
+										<div class="m-1">
+										{{lv.antrag_anmerkung}}
+										</div>
+									</td>
+								</tr>
+							</template>
 						</tbody>
 					</table>
 				</template>
diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js
index cbc97b79e..d987f55be 100644
--- a/public/js/components/Studierendenantrag/Lvzuweisung.js
+++ b/public/js/components/Studierendenantrag/Lvzuweisung.js
@@ -108,6 +108,14 @@ export default {
 				{
 					let res = {};
 					for (var k in result.data.retval) {
+						if (result.data.retval[k] === null) {
+							const alert = document.createElement('div');
+							alert.innerHTML = this.p.t('studierendenantrag', 'error_stg_last_semester');
+							alert.className = 'alert alert-warning';
+							alert.role = 'alert';
+							this.$refs["lvtable" + k.substr(0,1)].append(alert);
+							continue;
+						}
 						let lvs = result.data.retval[k].reduce((obj,lv) => {
 							obj[lv.studienplan_lehrveranstaltung_id] = lv;
 							return obj;
@@ -129,8 +137,9 @@ export default {
 						var table = new Tabulator(this.$refs["lvtable" + k.substr(0,1)], {
 							data: current,
 							dataTree: true,
-							dataTreeStartExpanded:true, //start with an expanded tree
-							dataTreeChildIndent:15,
+							dataTreeStartExpanded: true, //start with an expanded tree
+							dataTreeChildIndent: 15,
+							layout: "fitDataStretch",
 							columns: [
 								{title: this.p.t('ui','bezeichnung'), field: "bezeichnung"},
 								{title: this.p.t('lehre','lehrform'), field: "lehrform_kurzbz"},
@@ -197,7 +206,7 @@ export default {
 											input.type = "text";
 											input.value = cell.getValue() || "";
 											input.addEventListener('input', () => {
-												lvs[data.studienplan_lehrveranstaltung_id].antrag_zugelassen = input.value;
+												lvs[data.studienplan_lehrveranstaltung_id].antrag_anmerkung = input.value;
 											});
 											return input;
 										}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f6df3afad..562e4e5c2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -19906,6 +19906,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_stg_last_semester',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Der Studiengang hat nicht genügend Semester',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The course does not have enough semesters',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 );
 

From 3ca80904eafa3080bb9615426514db987dd1ced4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 4 Jul 2023 15:59:43 +0200
Subject: [PATCH 040/175] =?UTF-8?q?Verbesserungen=20Unterbrecher=20best?=
 =?UTF-8?q?=C3=A4tigen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/libraries/AntragLib.php           |  6 ++++++
 application/libraries/PrestudentLib.php       | 19 +++++++++++++++++--
 .../27351_digitalisierung_formulare.php       |  4 ++--
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index f1a757bc2..e3119d65b 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -288,6 +288,7 @@ class AntragLib
 				}
 				else
 				{
+					$studierendenantrag_status_id = getData($result);
 					$resultAntrag = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
 					if (isError($resultAntrag))
 						return $resultAntrag;
@@ -299,6 +300,11 @@ class AntragLib
 						// Prestudentstatus und Unterbrechungsfolgeaktionen setzen
 					$result = $this->_ci->prestudentlib->setUnterbrecher($resultAntrag->prestudent_id, $resultAntrag->studiensemester_kurzbz, $studierendenantrag_id);
 
+					if (isError($result)) {
+						$this->_ci->StudierendenantragstatusModel->delete($studierendenantrag_status_id);
+						return $result;
+					}
+
 							//Mail
 					$subject = 'Unterbrechung freigegeben';
 					$mail = [];
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 6dff4e812..2597b40d0 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -203,8 +203,23 @@ class PrestudentLib
 		if (isError($result))
 			return $result;
 		$result = getData($result);
-		if (!$result)
-			return error('Kein Prestudent in diesem Studiensemester gefunden');
+		if (!$result) {
+			/** TODO(chris): Zukünftige Unterbrecher so nicht möglich
+			 * - Verband und Gruppe dürfen noch nicht gesetzt werden
+			 * - Keine Garantie das Ausbildungssemester gleich bleibt (weiter Unterbrechungen oder eine Wiederholung in der Zwischenzeit)
+			 * - LVs eventuell nicht zugewießen
+			 * Mögliche Lösung: JOB!
+
+			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+			if (!$result) {
+				return error('Kein Prestudent status gefunden');
+			}
+			$result->studiensemester_kurzbz*/
+			return error('Kein Prestudent status gefunden');
+		}
 
 		$prestudent_status = current($result);
 
diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
index a40b457e2..e94bd2b61 100644
--- a/system/dbupdate_3.4/27351_digitalisierung_formulare.php
+++ b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
@@ -100,8 +100,8 @@ if(!$result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_status
 			 CACHE 1;
 		ALTER TABLE campus.tbl_studierendenantrag_status ALTER COLUMN studierendenantrag_status_id SET DEFAULT nextval('campus.tbl_studierendenantrag_status_studierendenantrag_status_id_seq');
 
-		GRANT SELECT, INSERT ON campus.tbl_studierendenantrag_status TO vilesci;
-		GRANT SELECT, INSERT ON campus.tbl_studierendenantrag_status TO web;
+		GRANT SELECT, INSERT, DELETE ON campus.tbl_studierendenantrag_status TO vilesci;
+		GRANT SELECT, INSERT, DELETE ON campus.tbl_studierendenantrag_status TO web;
 		GRANT SELECT, UPDATE ON campus.tbl_studierendenantrag_status_studierendenantrag_status_id_seq TO vilesci;
 		GRANT SELECT, UPDATE ON campus.tbl_studierendenantrag_status_studierendenantrag_status_id_seq TO web;";
 

From 61856473eaf40242128fd170c23d156bc0b3c0ba Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 5 Jul 2023 08:30:33 +0200
Subject: [PATCH 041/175] Leitungsansicht Autocomplete 1st draft

---
 .../components/Antrag/Abmeldung.php           |  7 +-
 application/libraries/AntragLib.php           | 10 ++-
 .../models/organisation/Studiengang_model.php | 17 +++-
 application/views/templates/FHC-Footer.php    |  1 +
 public/js/apps/lehre/Antrag/Leitung.js        |  2 +-
 .../Studierendenantrag/Leitung/Actions/New.js | 84 ++++++++++++-------
 6 files changed, 86 insertions(+), 35 deletions(-)

diff --git a/application/controllers/components/Antrag/Abmeldung.php b/application/controllers/components/Antrag/Abmeldung.php
index 9130c1d7d..44d1b5c4a 100644
--- a/application/controllers/components/Antrag/Abmeldung.php
+++ b/application/controllers/components/Antrag/Abmeldung.php
@@ -167,9 +167,12 @@ class Abmeldung extends FHC_Controller
 	{
 		$this->load->library('PermissionLib');
 
+		$_POST = json_decode($this->input->raw_input_stream, true);
+		$query = $this->input->post('query');
+
 		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
 
-		$result = $this->antraglib->getAbmeldeBerechtigtForStg($studiengaenge);
+		$result = $this->antraglib->getAktivePrestudentenInStgs($studiengaenge, $query);
 		if (isError($result)) {
 			return $this->outputJsonError(getError($result));
 		}
@@ -178,6 +181,8 @@ class Abmeldung extends FHC_Controller
 			return $this->outputJsonSuccess([]);
 		}
 
+		return $this->outputJsonSuccess($result);
+
 		$sortedStudents = [];
 		foreach ($result as $item) {
 			if (!isset($sortedStudents[$item->studiengang_kz]))
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index e3119d65b..e06c57544 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1188,13 +1188,15 @@ class AntragLib
 		return $stsems;
 	}
 
-	public function getAbmeldeBerechtigtForStg($studiengaenge)
+	public function getAktivePrestudentenInStgs($studiengaenge, $query)
 	{
 		$blacklist = $this->_ci->config->item('stgkz_blacklist_abmeldung');
 		$studiengaenge = array_diff($studiengaenge, $blacklist);
-		return $this->_ci->StudiengangModel->getAktivePrestudenten($studiengaenge, [
-			Studierendenantrag_model::TYP_ABMELDUNG
-		]);
+		return $this->_ci->StudiengangModel->getAktivePrestudenten(
+			$studiengaenge,
+			[ Studierendenantrag_model::TYP_ABMELDUNG ],
+			$query
+		);
 	}
 
 	public function getFailedExamForPrestudent($prestudent_id)
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index ea9e5857e..1e5c16cc5 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -532,7 +532,7 @@ class Studiengang_model extends DB_Model
 	 *
 	 * @return stdClass
 	 */
-	public function getAktivePrestudenten($studiengang_kzs, $not_antrag_typ = null)
+	public function getAktivePrestudenten($studiengang_kzs, $not_antrag_typ = null, $query = null)
 	{
 		$this->load->config('studierendenantrag');
 
@@ -571,6 +571,21 @@ class Studiengang_model extends DB_Model
 			$this->db->group_end();
 		}
 
+		if ($query) {
+			$query = explode(' ', $query);
+			$this->db->group_start();
+			foreach ($query as $q) {
+				$this->db->group_start();
+					$this->db->where('pers.vorname ILIKE', "%" . $q . "%");
+					$this->db->or_where('pers.nachname ILIKE', "%" . $q . "%");
+					$this->db->or_where($this->dbTable . '.bezeichnung ILIKE', "%" . $q . "%");
+					if (is_numeric($q))
+						$this->db->or_where('p.prestudent_id', $q);
+				$this->db->group_end();
+			}
+			$this->db->group_end();
+		}
+
 		return $this->load();
 	}
 }
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index c461dd8b0..f4d66a9b9 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -122,6 +122,7 @@
 		generateJSsInclude('vendor/npm-asset/primevue/column/column.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/calendar/calendar.min.js');
 		generateJSsInclude('vendor/npm-asset/primevue/skeleton/skeleton.min.js');
+		generateJSsInclude('vendor/npm-asset/primevue/autocomplete/autocomplete.min.js');
 	}
 
 	// --------------------------------------------------------------------------------------------------------
diff --git a/public/js/apps/lehre/Antrag/Leitung.js b/public/js/apps/lehre/Antrag/Leitung.js
index 0e68cccba..e243aad93 100644
--- a/public/js/apps/lehre/Antrag/Leitung.js
+++ b/public/js/apps/lehre/Antrag/Leitung.js
@@ -5,4 +5,4 @@ const app = Vue.createApp({
 		StudierendenantragLeitung
 	}
 });
-app.mount('#wrapper');
+app.use(primevue.config.default).mount('#wrapper');
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
index 8a98a6aa5..b9c21b05f 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/New.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
@@ -4,7 +4,8 @@ import Phrasen from '../../../../mixins/Phrasen.js';
 
 export default {
 	components: {
-		BsModal
+		BsModal,
+		AutoComplete: primevue.autocomplete
 	},
 	mixins: [
 		Phrasen
@@ -15,8 +16,7 @@ export default {
 	data() {
 		return {
 			data: [],
-			student: '',
-			stg: ''
+			student: ''
 		}
 	},
 	computed: {
@@ -24,13 +24,13 @@ export default {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/lehre/Studierendenantrag/abmeldung/' + this.student;
 		},
 		students() {
-			if (!this.stg)
-				return [];
-			if (!this.data[this.stg])
-				return [];
-			return this.data[this.stg].studenten.sort(
+			return this.data.sort(
 				(a, b) => a.nachname == b.nachname ?
-					a.vorname > b.vorname :
+					(
+						a.vorname == b.vorname ?
+							a.bezeichnung > b.bezeichnung :
+							a.vorname > b.vorname
+					) :
 					a.nachname > b.nachname
 			);
 		},
@@ -47,15 +47,17 @@ export default {
 			}), {
 				dialogClass: 'modal-fullscreen'
 			}, this.p.t('studierendenantrag', 'antrag_header')).then(() => {
+				this.data = [];
 				this.loadSelects();
 				this.$emit('reload');
 			});
 		},
-		loadSelects() {
-			return axios.get(
+		loadData(evt) {
+			axios.post(
 				FHC_JS_DATA_STORAGE_OBJECT.app_root +
 				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-				'/components/Antrag/Abmeldung/getStudiengaengeAssistenz/'
+				'/components/Antrag/Abmeldung/getStudiengaengeAssistenz/',
+				evt
 			).then(
 				result => {
 					if (result.data.error) {
@@ -66,14 +68,30 @@ export default {
 					return result;
 				}
 			);
+		},
+		loadSelects() {
+			if (this.hasNoData) {
+				return axios.post(
+					FHC_JS_DATA_STORAGE_OBJECT.app_root +
+					FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+					'/components/Antrag/Abmeldung/getStudiengaengeAssistenz/',
+					{query: 'felix'}
+				).then(
+					result => {
+						if (result.data.error) {
+							BsAlert.popup(result.data.retval, {dialogClass: 'alert alert-danger'});
+						} else {
+							this.data = result.data.retval;
+						}
+						return result;
+					}
+				);
+			}
 		}
 	},
-	created() {
-		return this.loadSelects();
-	},
 	template: `
 	<div class="studierendenantrag-leitung-actions-new" v-if="data">
-		<button type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#newAntragModal" :disabled="hasNoData">
+		<button type="button" class="btn btn-outline-secondary" data-bs-toggle="modal" data-bs-target="#newAntragModal">
 			<i class="fa fa-plus"></i>
 			{{p.t('studierendenantrag','btn_new')}}
 		</button>
@@ -85,22 +103,32 @@ export default {
 						<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui','schliessen')"></button>
 					</div>
 					<div class="modal-body">
-						<div class="mb-3">
-							<label for="newAntragModalStg">{{p.t('lehre','studiengang')}}</label>
-							<select id="newAntragModalStg" class="form-select" v-model="stg">
-								<option v-for="(stg, stg_kz) in data" :value="stg_kz" :key="stg_kz">
-									{{stg.bezeichnung}} ({{stg.orgform}})
-								</option>
-							</select>
+						<label for="newAntragModalAutoComplete">{{p.t('person','studentIn')}}</label>
+						<!-- TODO(chris): IMPLEMENT!! -->
+						<auto-complete
+							v-model="student"
+							:suggestions="data"
+							@complete="loadData"
+							inputId="newAntragModalAutoComplete"
+							dropdown
+							>
+							<template #option="slotProps">
+								<div>
+									{{slotProps.nachname}} {{slotProps.vorname}} ({{slotProps.bezeichnung}}) [{{slotProps.prestudent_id}}]
+								</div>
+							</template>
+						</auto-complete>
+						<!--div v-if="hasNoData">
+							loading...
 						</div>
-						<div class="mb-3">
+						<div v-else class="mb-3">
 							<label for="newAntragModalStudent">{{p.t('person','studentIn')}}</label>
-							<select v-model="student" id="newAntragModalStudent" class="form-select">
-								<option  v-for="(stg, stg_kz) in students" :value="stg.prestudent_id" :key="stg.prestudent_id">
-									{{stg.nachname}} {{stg.vorname}}
+							<select id="newAntragModalStudent" class="form-select" v-model="student">
+								<option v-for="item in students" :value="item.prestudent_id" :key="item.prestudent_id">
+									{{item.nachname}} {{item.vorname}} ({{item.bezeichnung}}) [{{item.prestudent_id}}]
 								</option>
 							</select>
-						</div>
+						</div-->
 					</div>
 					<div class="modal-footer">
 						<a :href="newUrl"

From 1e0e93dfa3f101564240c002f34021b78e0638e3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 5 Jul 2023 13:20:46 +0200
Subject: [PATCH 042/175] Autocomplete Add-Button Finish

---
 .../models/organisation/Studiengang_model.php |  9 +-
 composer.json                                 |  2 +-
 public/js/apps/lehre/Antrag/Leitung.js        |  2 +-
 .../Studierendenantrag/Leitung/Actions/New.js | 86 ++++++-------------
 4 files changed, 33 insertions(+), 66 deletions(-)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 1e5c16cc5..89941aeb1 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -564,11 +564,10 @@ class Studiengang_model extends DB_Model
 		$this->db->where($this->dbTable . ".aktiv", true);
 
 		if ($not_antrag_typ !== null && is_array($not_antrag_typ)) {
-			$this->addJoin('campus.tbl_studierendenantrag a', 'a.prestudent_id=p.prestudent_id', 'LEFT');
-			$this->db->group_start();
-			$this->db->where_not_in('a.typ', $not_antrag_typ);
-			$this->db->or_where('a.typ IS NULL');
-			$this->db->group_end();
+			foreach($not_antrag_typ as $k => $v)
+				$not_antrag_typ[$k] = $this->db->escape($v);
+			$this->addJoin('campus.tbl_studierendenantrag a', 'a.prestudent_id=p.prestudent_id and a.typ in ('. implode(',', $not_antrag_typ ).')', 'LEFT');
+			$this->db->where('a.typ IS NULL');
 		}
 
 		if ($query) {
diff --git a/composer.json b/composer.json
index 739ee4492..9ee2904ba 100644
--- a/composer.json
+++ b/composer.json
@@ -422,7 +422,7 @@
 		"nategood/httpful": "0.2.*",
 		"netcarver/textile": "3.7.*",
 		"nicolaskruchten/pivottable": "2.23.0",
-		"npm-asset/primevue": "3.15.*",
+		"npm-asset/primevue": "3.29.*",
 		"npm-asset/primeicons": "5.0.0",
 
 		"olifolkerd/tabulator4": "4.9.*",
diff --git a/public/js/apps/lehre/Antrag/Leitung.js b/public/js/apps/lehre/Antrag/Leitung.js
index e243aad93..25e4afaa0 100644
--- a/public/js/apps/lehre/Antrag/Leitung.js
+++ b/public/js/apps/lehre/Antrag/Leitung.js
@@ -5,4 +5,4 @@ const app = Vue.createApp({
 		StudierendenantragLeitung
 	}
 });
-app.use(primevue.config.default).mount('#wrapper');
+app.use(primevue.config.default,{zIndex: {overlay: 9999}}).mount('#wrapper');
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
index b9c21b05f..490e62548 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/New.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
@@ -21,21 +21,16 @@ export default {
 	},
 	computed: {
 		newUrl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/lehre/Studierendenantrag/abmeldung/' + this.student;
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/lehre/Studierendenantrag/abmeldung/' + this.student.prestudent_id;
 		},
 		students() {
-			return this.data.sort(
-				(a, b) => a.nachname == b.nachname ?
-					(
-						a.vorname == b.vorname ?
-							a.bezeichnung > b.bezeichnung :
-							a.vorname > b.vorname
-					) :
-					a.nachname > b.nachname
+			return this.data.map((current)=>
+			{
+				current.name = current.nachname.toUpperCase() + " " + current.vorname + " (" + current.bezeichnung + ")";
+				return current;
+			}).sort(
+				(a, b) => a.name > b.name ? 1 : -1
 			);
-		},
-		hasNoData() {
-			return !Object.values(this.data).length;
 		}
 	},
 	methods: {
@@ -47,9 +42,8 @@ export default {
 			}), {
 				dialogClass: 'modal-fullscreen'
 			}, this.p.t('studierendenantrag', 'antrag_header')).then(() => {
-				this.data = [];
-				this.loadSelects();
 				this.$emit('reload');
+				this.student = '';
 			});
 		},
 		loadData(evt) {
@@ -68,25 +62,6 @@ export default {
 					return result;
 				}
 			);
-		},
-		loadSelects() {
-			if (this.hasNoData) {
-				return axios.post(
-					FHC_JS_DATA_STORAGE_OBJECT.app_root +
-					FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-					'/components/Antrag/Abmeldung/getStudiengaengeAssistenz/',
-					{query: 'felix'}
-				).then(
-					result => {
-						if (result.data.error) {
-							BsAlert.popup(result.data.retval, {dialogClass: 'alert alert-danger'});
-						} else {
-							this.data = result.data.retval;
-						}
-						return result;
-					}
-				);
-			}
 		}
 	},
 	template: `
@@ -105,38 +80,31 @@ export default {
 					<div class="modal-body">
 						<label for="newAntragModalAutoComplete">{{p.t('person','studentIn')}}</label>
 						<!-- TODO(chris): IMPLEMENT!! -->
-						<auto-complete
-							v-model="student"
-							:suggestions="data"
-							@complete="loadData"
-							inputId="newAntragModalAutoComplete"
-							dropdown
-							>
-							<template #option="slotProps">
-								<div>
-									{{slotProps.nachname}} {{slotProps.vorname}} ({{slotProps.bezeichnung}}) [{{slotProps.prestudent_id}}]
-								</div>
-							</template>
-						</auto-complete>
-						<!--div v-if="hasNoData">
-							loading...
+						<div>
+							<auto-complete
+								class="w-100"
+								v-model="student"
+								:suggestions="students"
+								optionLabel = "name"
+								@complete="loadData"
+								inputId="newAntragModalAutoComplete"
+								dropdown
+								>
+								<template #option="slotProps">
+									<div :title="slotProps.option.prestudent_id">
+									{{slotProps.option.name}}
+									</div>
+								</template>
+							</auto-complete>
 						</div>
-						<div v-else class="mb-3">
-							<label for="newAntragModalStudent">{{p.t('person','studentIn')}}</label>
-							<select id="newAntragModalStudent" class="form-select" v-model="student">
-								<option v-for="item in students" :value="item.prestudent_id" :key="item.prestudent_id">
-									{{item.nachname}} {{item.vorname}} ({{item.bezeichnung}}) [{{item.prestudent_id}}]
-								</option>
-							</select>
-						</div-->
 					</div>
 					<div class="modal-footer">
-						<a :href="newUrl"
+						<button
 							class="btn btn-primary"
-							target="_blank"
+							:disabled="!this.student"
 							@click.prevent="openForm">
 							{{p.t('studierendenantrag','btn_create')}}
-						</a>
+						</button>
 					</div>
 				</div>
 			</div>

From 573a8d8e333a056136b7f80640143a432b00ae35 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 09:09:46 +0200
Subject: [PATCH 043/175] composer lock

---
 composer.lock | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/composer.lock b/composer.lock
index 30d011aae..c88612d1b 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "03cfe5f5e33ab66a5009b6ffcb2c5fa0",
+    "content-hash": "1105a07a83f98040eedbe34b23e11ee3",
     "packages": [
         {
             "name": "afarkas/html5shiv",
@@ -1628,15 +1628,6 @@
             ],
             "time": "2023-06-13T08:41:47+00:00"
         },
-        {
-            "name": "popperjs/core",
-            "version": "2.10.2",
-            "dist": {
-                "type": "file",
-                "url": "https://cdn.jsdelivr.net/npm/@popperjs/core@2.10.2/dist/umd/popper.min.js"
-            },
-            "type": "library"
-        },
         {
             "name": "rmariuzzo/jquery-checkboxes",
             "version": "1.0.7",

From 761af30a7525515e8ca66018d77d15279e042d5e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 09:21:12 +0200
Subject: [PATCH 044/175] speed up student selection

---
 .../models/organisation/Studiengang_model.php        |  3 +++
 .../Studierendenantrag/Leitung/Actions/New.js        | 12 +-----------
 2 files changed, 4 insertions(+), 11 deletions(-)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 89941aeb1..e06965bea 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -547,6 +547,7 @@ class Studiengang_model extends DB_Model
 		$this->addSelect('p.prestudent_id');
 		$this->addSelect('pers.vorname');
 		$this->addSelect('pers.nachname');
+		$this->addSelect("CONCAT(UPPER(pers.nachname), ' ', pers.vorname, ' (', " . $this->dbTable . ".bezeichnung, ')') AS name");
 
 		$this->addJoin('public.tbl_prestudent p', 'studiengang_kz');
 		$this->addJoin(
@@ -585,6 +586,8 @@ class Studiengang_model extends DB_Model
 			$this->db->group_end();
 		}
 
+		$this->addOrder('name');
+
 		return $this->load();
 	}
 }
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
index 490e62548..6169fef72 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/New.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
@@ -22,15 +22,6 @@ export default {
 	computed: {
 		newUrl() {
 			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/lehre/Studierendenantrag/abmeldung/' + this.student.prestudent_id;
-		},
-		students() {
-			return this.data.map((current)=>
-			{
-				current.name = current.nachname.toUpperCase() + " " + current.vorname + " (" + current.bezeichnung + ")";
-				return current;
-			}).sort(
-				(a, b) => a.name > b.name ? 1 : -1
-			);
 		}
 	},
 	methods: {
@@ -79,12 +70,11 @@ export default {
 					</div>
 					<div class="modal-body">
 						<label for="newAntragModalAutoComplete">{{p.t('person','studentIn')}}</label>
-						<!-- TODO(chris): IMPLEMENT!! -->
 						<div>
 							<auto-complete
 								class="w-100"
 								v-model="student"
-								:suggestions="students"
+								:suggestions="data"
 								optionLabel = "name"
 								@complete="loadData"
 								inputId="newAntragModalAutoComplete"

From 5eca0349118c7aed57b234b3ab9033ee3fde28a9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 09:29:00 +0200
Subject: [PATCH 045/175] clean up

---
 .../components/Antrag/Abmeldung.php           | 20 -------------------
 1 file changed, 20 deletions(-)

diff --git a/application/controllers/components/Antrag/Abmeldung.php b/application/controllers/components/Antrag/Abmeldung.php
index 44d1b5c4a..b7235f4eb 100644
--- a/application/controllers/components/Antrag/Abmeldung.php
+++ b/application/controllers/components/Antrag/Abmeldung.php
@@ -182,25 +182,5 @@ class Abmeldung extends FHC_Controller
 		}
 
 		return $this->outputJsonSuccess($result);
-
-		$sortedStudents = [];
-		foreach ($result as $item) {
-			if (!isset($sortedStudents[$item->studiengang_kz]))
-				$sortedStudents[$item->studiengang_kz] = [
-					'bezeichnung' => $item->bezeichnung,
-					'orgform' => $item->orgform,
-					'studenten' => []
-				];
-			$sortedStudents[$item->studiengang_kz]['studenten'][] = [
-				'semester' => $item->semester,
-				'prestudent_id' => $item->prestudent_id,
-				'name' => trim($item->vorname . ' ' . $item->nachname),
-				'vorname' => $item->vorname,
-				'nachname' => $item->nachname,
-				'studiensemester_kurzbz' => $item->studiensemester_kurzbz
-			];
-		}
-
-		$this->outputJsonSuccess($sortedStudents);
 	}
 }

From 3fce44845152d8a9c917625309e67ff3c3858cd7 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 10:19:06 +0200
Subject: [PATCH 046/175] Abmeldung durch Stgl: status => typ

---
 .../components/Antrag/Abmeldung.php           | 17 ++++
 .../controllers/components/Antrag/Leitung.php |  7 +-
 .../controllers/lehre/Studierendenantrag.php  |  9 ++
 application/libraries/AntragLib.php           | 31 ++++--
 .../education/Studierendenantrag_model.php    |  1 +
 .../models/organisation/Studiengang_model.php |  2 +-
 .../components/Studierendenantrag/Antrag.js   |  2 +
 .../Studierendenantrag/Form/AbmeldungStgl.js  | 99 +++++++++++++++++++
 .../Studierendenantrag/Leitung/Actions/New.js |  1 +
 .../Studierendenantrag/Leitung/Table.js       |  6 +-
 .../27351_digitalisierung_formulare.php       |  2 -
 system/phrasesupdate.php                      | 40 ++++++++
 12 files changed, 204 insertions(+), 13 deletions(-)
 create mode 100644 public/js/components/Studierendenantrag/Form/AbmeldungStgl.js

diff --git a/application/controllers/components/Antrag/Abmeldung.php b/application/controllers/components/Antrag/Abmeldung.php
index b7235f4eb..8c728c804 100644
--- a/application/controllers/components/Antrag/Abmeldung.php
+++ b/application/controllers/components/Antrag/Abmeldung.php
@@ -76,6 +76,23 @@ class Abmeldung extends FHC_Controller
 		$this->outputJsonSuccess(getData($result));
 	}
 
+	public function getDetailsForAntrag($studierendenantrag_id)
+	{
+		if (!$this->antraglib->isEntitledToShowAntrag($studierendenantrag_id))	return show_404();
+
+		$result = $this->antraglib->getDetailsForAntrag($studierendenantrag_id);
+		if (isError($result)) {
+			return $this->outputJsonError(getError($result));
+		}
+
+		$data = getData($result);
+
+		if ($data->typ !== Studierendenantrag_model::TYP_ABMELDUNG_STGL)
+			return show_404();
+
+		$this->outputJsonSuccess($data);
+	}
+
 	public function createAntrag()
 	{
 		$this->load->library('form_validation');
diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
index 90a677c31..9df8fdb75 100644
--- a/application/controllers/components/Antrag/Leitung.php
+++ b/application/controllers/components/Antrag/Leitung.php
@@ -201,7 +201,7 @@ class Leitung extends FHC_Controller
 
 	public function canBeObjected($studierendenantrag_id)
 	{
-		return $this->antraglib->hasStatus($studierendenantrag_id, Studierendenantragstatus_model::STATUS_APPROVED_STGL);
+		return $this->antraglib->hasType($studierendenantrag_id, Studierendenantrag_model::TYP_ABMELDUNG_STGL);
 	}
 
 	public function isObjected($studierendenantrag_id)
@@ -241,6 +241,11 @@ class Leitung extends FHC_Controller
 		return $this->outputJsonSuccess($studierendenantrag_id);
 	}
 
+	public function approveAbmeldungStgl()
+	{
+		return $this->approveAbmeldung();
+	}
+
 	public function approveUnterbrechung()
 	{
 		$this->load->library('form_validation');
diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
index 16b47d592..f27350e9a 100644
--- a/application/controllers/lehre/Studierendenantrag.php
+++ b/application/controllers/lehre/Studierendenantrag.php
@@ -129,6 +129,15 @@ class Studierendenantrag extends FHC_Controller
 		]);
 	}
 
+	public function abmeldungstgl($prestudent_id, $studierendenantrag_id)
+	{
+		$this->load->view('lehre/Antrag/Create', [
+			'prestudent_id' => $prestudent_id,
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'antrag_type' => 'AbmeldungStgl'
+		]);
+	}
+
 	public function unterbrechung($prestudent_id, $studierendenantrag_id = null)
 	{
 		$this->load->view('lehre/Antrag/Create', [
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index e06c57544..01ca7f894 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -85,15 +85,15 @@ class AntragLib
 
 		$prestudent = getData($result)[0];
 		if($prestudent->person_id == getAuthPersonId())
-			$status = Studierendenantragstatus_model::STATUS_CREATED;
+			$typ = Studierendenantrag_model::TYP_ABMELDUNG;
 		else
-			$status = Studierendenantragstatus_model::STATUS_CREATED_STGL;
+			$typ = Studierendenantrag_model::TYP_ABMELDUNG_STGL;
 
 		$result = $this->_ci->StudierendenantragModel->insert([
 			'prestudent_id' => $prestudent_id,
 			'studiensemester_kurzbz'=> $studiensemester_kurzbz,
 			'datum' => date('c'),
-			'typ' => Studierendenantrag_model::TYP_ABMELDUNG,
+			'typ' => $typ,
 			'insertvon' => $insertvon,
 			'grund' => $grund
 		]);
@@ -105,7 +105,7 @@ class AntragLib
 
 		$result = $this->_ci->StudierendenantragstatusModel->insert([
 			'studierendenantrag_id' => $antrag_id,
-			'studierendenantrag_statustyp_kurzbz' => $status,
+			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_CREATED,
 			'insertvon' => $insertvon
 		]);
 
@@ -148,7 +148,7 @@ class AntragLib
 
 			$result = $this->_ci->StudierendenantragstatusModel->insert([
 				'studierendenantrag_id' => $studierendenantrag_id,
-				'studierendenantrag_statustyp_kurzbz' => $status_approved,
+				'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
 				'insertvon' => $insertvon
 			]);
 			if (isError($result))
@@ -160,7 +160,7 @@ class AntragLib
 					$errors[] = getError($resultPrestudent);
 					continue;
 				}
-				if ($status_approved == Studierendenantragstatus_model::STATUS_APPROVED)
+				if ($status->typ == Studierendenantrag_model::TYP_ABMELDUNG)
 				{
 					$antrag = getData($resultPrestudent)[0];
 
@@ -1482,6 +1482,25 @@ class AntragLib
 		return in_array($lastStatus->studierendenantrag_statustyp_kurzbz, $status);
 	}
 
+	/**
+	 * @param integer		$antrag_id
+	 * @param string|array	$type
+	 *
+	 * @return boolean
+	 */
+	public function hasType($antrag_id, $type)
+	{
+		$result = $this->_ci->StudierendenantragModel->load($antrag_id);
+		if (!hasData($result))
+			return false;
+		$antrag = getData($result)[0];
+
+		if (!is_array($type))
+			$type = [$type];
+
+		return in_array($antrag->typ, $type);
+	}
+
 
 	/**
 	 * @param integer		$antrag_id
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index bf993ca67..1d2537a92 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -3,6 +3,7 @@ class Studierendenantrag_model extends DB_Model
 {
 
 	const TYP_ABMELDUNG = 'Abmeldung';
+	const TYP_ABMELDUNG_STGL = 'AbmeldungStgl';
 	const TYP_UNTERBRECHUNG = 'Unterbrechung';
 	const TYP_WIEDERHOLUNG = 'Wiederholung';
 
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index e06965bea..0d2328b14 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -567,7 +567,7 @@ class Studiengang_model extends DB_Model
 		if ($not_antrag_typ !== null && is_array($not_antrag_typ)) {
 			foreach($not_antrag_typ as $k => $v)
 				$not_antrag_typ[$k] = $this->db->escape($v);
-			$this->addJoin('campus.tbl_studierendenantrag a', 'a.prestudent_id=p.prestudent_id and a.typ in ('. implode(',', $not_antrag_typ ).')', 'LEFT');
+			$this->addJoin('campus.tbl_studierendenantrag a', 'a.prestudent_id=p.prestudent_id and a.typ in ('. implode(',', $not_antrag_typ ).") AND campus.get_status_studierendenantrag (a.studierendenantrag_id)<>'" . Studierendenantragstatus_model::STATUS_CANCELLED . "'", 'LEFT');
 			$this->db->where('a.typ IS NULL');
 		}
 
diff --git a/public/js/components/Studierendenantrag/Antrag.js b/public/js/components/Studierendenantrag/Antrag.js
index 6619b74e7..d5989b521 100644
--- a/public/js/components/Studierendenantrag/Antrag.js
+++ b/public/js/components/Studierendenantrag/Antrag.js
@@ -1,4 +1,5 @@
 import StudierendenantragAbmeldung from './Form/Abmeldung.js';
+import StudierendenantragAbmeldungStgl from './Form/AbmeldungStgl.js';
 import StudierendenantragUnterbrechung from './Form/Unterbrechung.js';
 import StudierendenantragWiederholung from './Form/Wiederholung.js';
 import Phrasen from '../../mixins/Phrasen.js';
@@ -6,6 +7,7 @@ import Phrasen from '../../mixins/Phrasen.js';
 export default {
 	components: {
 		StudierendenantragAbmeldung,
+		StudierendenantragAbmeldungStgl,
 		StudierendenantragUnterbrechung,
 		StudierendenantragWiederholung
 	},
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
new file mode 100644
index 000000000..7665c7353
--- /dev/null
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -0,0 +1,99 @@
+import {CoreFetchCmpt} from '../../Fetch.js';
+import Phrasen from '../../../mixins/Phrasen.js';
+
+export default {
+	components: {
+		CoreFetchCmpt
+	},
+	mixins: [
+		Phrasen
+	],
+	emits: [
+		'setInfos',
+		'setStatus'
+	],
+	props: {
+		studierendenantragId: Number
+	},
+	data() {
+		return {
+			data: null
+		}
+	},
+	computed: {
+		statusSeverity() {
+			switch (this.data.status)
+			{
+				case 'Erstellt': return 'info';
+				case 'Genehmigt': return 'success';
+				default: return 'info';
+			}
+		}
+	},
+	methods: {
+		load() {
+			return axios.get(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Abmeldung/getDetailsForAntrag/' +
+				this.studierendenantragId
+			).then(
+				result => {
+					this.data = result.data.retval;
+					if (this.data.status) {
+						this.$emit("setStatus", {
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+							severity: this.statusSeverity
+						});
+					}
+					return result;
+				}
+			);
+		}
+	},
+	template: `
+	<div class="studierendenantrag-form-abmeldung">
+		<core-fetch-cmpt :api-function="load">
+			<div class="row">
+				<div class="col-12">
+					<table class="table">
+						<tr>
+							<th>{{p.t('lehre', 'studiengang')}}</th>
+							<td align="right">{{data.bezeichnung}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre', 'organisationsform')}}</th>
+							<td align="right">{{data.orgform_bezeichnung}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('projektarbeitsbeurteilung', 'nameStudierende')}}</th>
+							<td align="right">{{data.name}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('person', 'personenkennzeichen')}}</th>
+							<td align="right">{{data.matrikelnr}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre', 'studienjahr')}}</th>
+							<td align="right">{{data.studienjahr_kurzbz}}</td>
+						</tr>
+						<tr>
+							<th>{{p.t('lehre', 'semester')}}</th>
+							<td align="right">{{data.semester}}</td>
+						</tr>
+					</table>
+				</div>
+				<div class="mb-3">
+					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
+					<pre>{{data.grund}}</pre>
+				</div>
+			</div>
+			<template v-slot:error="{errorMessage}">
+				<div class="alert alert-danger m-0" role="alert">
+					{{ errorMessage }}
+				</div>
+			</template>
+		</core-fetch-cmpt>
+	</div>
+	`
+}
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
index 6169fef72..9fb5e7a64 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/New.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
@@ -79,6 +79,7 @@ export default {
 								@complete="loadData"
 								inputId="newAntragModalAutoComplete"
 								dropdown
+								dropdown-mode="current"
 								>
 								<template #option="slotProps">
 									<div :title="slotProps.option.prestudent_id">
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 309678ae1..01c473f91 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -230,7 +230,7 @@ export default {
 							'content/pdfExport.php?xml=Antrag' + data.typ + '.xml.php&xsl=Antrag' + data.typ + '&id='+ data.studierendenantrag_id +'&output=pdf';
 							container.append(button);
 						}
-						if(data.typ == 'Abmeldung' && data.status == 'GenehmigtStgl')
+						if(data.typ == 'AbmeldungStgl' && data.status == 'Genehmigt')
 						{
 							// NOTE(chris): Object
 							let button = document.createElement('button');
@@ -240,7 +240,7 @@ export default {
 							container.append(button);
 						}
 
-						if(data.typ == 'Abmeldung' && data.status == 'Beeinsprucht')
+						if(data.typ == 'AbmeldungStgl' && data.status == 'Beeinsprucht')
 						{
 							// NOTE(chris): Deny Objection
 							let button = document.createElement('button');
@@ -294,7 +294,7 @@ export default {
 						if (this.stgL.includes(data.studiengang_kz))
 						{
 							// NOTE(chris): Approve
-							if ((data.typ == 'Wiederholung' && data.status == 'Lvszugewiesen') || (data.typ != 'Wiederholung' && (data.status == 'Erstellt' || data.status == 'ErstelltStgl'))) {
+							if ((data.typ == 'Wiederholung' && data.status == 'Lvszugewiesen') || (data.typ != 'Wiederholung' && data.status == 'Erstellt')) {
 								let button = document.createElement('button');
 								button.innerHTML = this.p.t('studierendenantrag', 'btn_approve');
 								button.className = "btn btn-outline-secondary";
diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
index e94bd2b61..1fbe56945 100644
--- a/system/dbupdate_3.4/27351_digitalisierung_formulare.php
+++ b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
@@ -27,9 +27,7 @@ if($result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statust
 			(studierendenantrag_statustyp_kurzbz, bezeichnung)
 			VALUES
 			('Erstellt', '{\"Erstellt\",\"Created\"}'),
-			('ErstelltStgl', '{\"Erstellt\",\"Created\"}'),
 			('Genehmigt', '{\"Genehmigt\",\"Approved\"}'),
-			('GenehmigtStgl', '{\"Vorläufig Genehmigt\",\"Provisionally Approved\"}'),
 			('Beeinsprucht', '{\"Beeinsprucht\",\"Objected\"}'),
 			('Abgelehnt', '{\"Abgelehnt\",\"Rejected\"}'),
 			('Verzichtet', '{\"Verzichtet\",\"Pass\"}'),
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 562e4e5c2..734c1e6cc 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18585,6 +18585,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'title_AbmeldungStgl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abmeldung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'De-registration',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -18845,6 +18865,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'antrag_typ_AbmeldungStgl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abmeldung (durch Studiengangsleitung)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Cancellation (by course director)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From 10061324518d3f80741abcf4fd9b50986174ddd0 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 11:19:21 +0200
Subject: [PATCH 047/175] Infomail

---
 application/libraries/AntragLib.php           | 50 +++++++++++++------
 .../Studierendenantragstatus_model.php        |  2 -
 .../views/lehre/Antrag/Student/List.php       |  2 +-
 3 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 01ca7f894..6fda962ed 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -126,7 +126,7 @@ class AntragLib
 		$errors = [];
 		foreach ($studierendenantrag_ids as $studierendenantrag_id) {
 
-			$result = $this->_ci->StudierendenantragModel->loadIdAndStatusWhere(['studierendenantrag_id' => $studierendenantrag_id]);
+			$result = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
 			if (isError($result))
 			{
 				$errors[] = getError($result);
@@ -139,13 +139,6 @@ class AntragLib
 			}
 			$status = getData($result)[0];
 
-			if($status->status ==  Studierendenantragstatus_model::STATUS_CREATED_STGL)
-			{
-				$status_approved = Studierendenantragstatus_model::STATUS_APPROVED_STGL;
-			}
-			else
-				$status_approved = Studierendenantragstatus_model::STATUS_APPROVED;
-
 			$result = $this->_ci->StudierendenantragstatusModel->insert([
 				'studierendenantrag_id' => $studierendenantrag_id,
 				'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
@@ -193,6 +186,33 @@ class AntragLib
 						sendSanchoMail($vorlage, $data, $prestudent_status->email, $subject);
 					}
 				}
+				if ($status->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL) {
+					$res = $this->_ci->PrestudentModel->load($status->prestudent_id);
+					if (hasData($res)) {
+						$prestudent = current(getData($res));
+						$res = $this->_ci->PersonModel->load($prestudent->person_id);
+						if (hasData($res)) {
+							$person = current(getData($res));
+							$name = trim($person->vorname . ' ' . $person->nachname);
+						} else {
+							$name = 'Student*in';
+						}
+						$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
+						if (hasData($res)) {
+							$kontakt = current(getData($res));
+							$email = $kontakt->kontakt;
+							sendSanchoMail(
+								'Sancho_Mail_Antrag_A_Stgl',
+								[
+									'name' => $name,
+									'grund' => $status->grund
+								],
+								$email,
+								'Abmeldung durch Studiengangsleitung'
+							);
+						}
+					}
+				}
 			}
 		}
 
@@ -892,7 +912,7 @@ class AntragLib
 		$datumStatus = $result->datum;
 
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
-			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'typ' => Studierendenantrag_model::TYP_ABMELDUNG, 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED]);
+			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'typ IN' => [Studierendenantrag_model::TYP_ABMELDUNG, Studierendenantrag_model::TYP_ABMELDUNG_STGL], 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED]);
 			if (isError($result))
 				return $result;
 			if (hasData($result))
@@ -909,9 +929,9 @@ class AntragLib
 		$result= getData($result);
 		foreach ($result as $antrag)
 		{
-			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG)
+			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG || $antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL)
 			{
-				if ($antrag->status == Studierendenantragstatus_model::STATUS_CREATED || $antrag->status == Studierendenantragstatus_model::STATUS_CREATED_STGL)
+				if ($antrag->status == Studierendenantragstatus_model::STATUS_CREATED)
 					return success(-1);
 				elseif ($antrag->status == Studierendenantragstatus_model::STATUS_APPROVED && $antrag->datum > $datumStatus)
 					return success(-1);
@@ -970,9 +990,9 @@ class AntragLib
 		$result= getData($result);
 		foreach ($result as $antrag)
 		{
-			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG)
+			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG || $antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL)
 			{
-				if($antrag->status == Studierendenantragstatus_model::STATUS_CREATED || $antrag->status == Studierendenantragstatus_model::STATUS_CREATED_STGL)
+				if($antrag->status == Studierendenantragstatus_model::STATUS_CREATED)
 					return success(-2);
 				elseif($antrag->status == Studierendenantragstatus_model::STATUS_APPROVED && $antrag->datum > $datumStatus)
 					return success(-2);
@@ -1043,9 +1063,9 @@ class AntragLib
 		$result= getData($result);
 		foreach ($result as $antrag)
 		{
-			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG)
+			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG || $antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL)
 			{
-				if($antrag->status == Studierendenantragstatus_model::STATUS_CREATED || $antrag->status == Studierendenantragstatus_model::STATUS_CREATED_STGL)
+				if($antrag->status == Studierendenantragstatus_model::STATUS_CREATED)
 					return success(-2);
 				elseif($antrag->status == Studierendenantragstatus_model::STATUS_APPROVED && $antrag->datum > $datumStatus)
 					return success(-2);
diff --git a/application/models/education/Studierendenantragstatus_model.php b/application/models/education/Studierendenantragstatus_model.php
index 6994c4624..8f737f458 100644
--- a/application/models/education/Studierendenantragstatus_model.php
+++ b/application/models/education/Studierendenantragstatus_model.php
@@ -3,9 +3,7 @@ class Studierendenantragstatus_model extends DB_Model
 {
 
 	const STATUS_CREATED = 'Erstellt';
-	const STATUS_CREATED_STGL = 'ErstelltStgl';
 	const STATUS_APPROVED = 'Genehmigt';
-	const STATUS_APPROVED_STGL = 'GenehmigtStgl';
 	const STATUS_REJECTED = 'Abgelehnt';
 	const STATUS_PASS = 'Verzichtet';
 	const STATUS_REOPENED = 'Offen';
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 26b0ec3f1..aeedf9ca4 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -117,7 +117,7 @@ $this->load->view(
 								<td>
 									<a href="<?= site_url('lehre/Studierendenantrag/' . strtolower($antrag->typ) . '/' . $antrag->prestudent_id . '/' . $antrag->studierendenantrag_id); ?>"><i class="fa-solid fa-pen" title="<?= $this->p->t('studierendenantrag', 'btn_edit'); ?>"></i></a>
 									<?php if ($antrag->typ != Studierendenantrag_model::TYP_WIEDERHOLUNG && $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED) { ?>
-										<a class="ms-2" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' . $antrag->typ . '.xml.php&xsl=Antrag' . $antrag->typ . '&id=' . $antrag->studierendenantrag_id . '&uid=' . getAuthUID()); ?>"><i class="fa-solid fa-download" title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"></i></a>
+										<a class="ms-2" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' . str_replace('AbmeldungStgl', 'Abmeldung', $antrag->typ) . '.xml.php&xsl=Antrag' . str_replace('AbmeldungStgl', 'Abmeldung', $antrag->typ) . '&id=' . $antrag->studierendenantrag_id . '&uid=' . getAuthUID()); ?>"><i class="fa-solid fa-download" title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"></i></a>
 									<?php } ?>
 									<?php if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG && $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED) { ?>
 										<a class="btn btn-outline-secondary" href="#modalgrund<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal">

From eee3aa08e4e1b0eb35a22777dd5104146074bcdf Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 13:52:05 +0200
Subject: [PATCH 048/175] =?UTF-8?q?Zugriffsrechte=20f=C3=BCr=20Abbrecher?=
 =?UTF-8?q?=20&=20Unterbrecher?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/libraries/AntragLib.php                       | 2 +-
 application/models/education/Studierendenantrag_model.php | 8 +++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 6fda962ed..2b920bfcd 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -912,7 +912,7 @@ class AntragLib
 		$datumStatus = $result->datum;
 
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
-			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'typ IN' => [Studierendenantrag_model::TYP_ABMELDUNG, Studierendenantrag_model::TYP_ABMELDUNG_STGL], 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED]);
+			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED], [Studierendenantrag_model::TYP_ABMELDUNG, Studierendenantrag_model::TYP_ABMELDUNG_STGL]);
 			if (isError($result))
 				return $result;
 			if (hasData($result))
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 1d2537a92..d9313263f 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -84,7 +84,7 @@ class Studierendenantrag_model extends DB_Model
 		return $this->loadWhere($where);
 	}
 
-	public function loadWithStatusWhere($where)
+	public function loadWithStatusWhere($where, $types = null)
 	{
 		$lang = 'SELECT index FROM public.tbl_sprache WHERE sprache=' . $this->escape(getUserLanguage());
 
@@ -97,6 +97,10 @@ class Studierendenantrag_model extends DB_Model
 			'campus.get_status_studierendenantrag(studierendenantrag_id)=t.studierendenantrag_statustyp_kurzbz'
 		);
 
+		if ($types && is_array($types)) {
+			$this->db->where_in('typ' => $types);
+		}
+
 		$this->addOrder('datum', 'DESC');
 
 		return $this->loadWhere($where);
@@ -187,8 +191,6 @@ class Studierendenantrag_model extends DB_Model
 		$this->addJoin('bis.tbl_orgform', 'orgform_kurzbz');
 		$this->addJoin('campus.tbl_studierendenantrag_statustyp st', 'campus.get_status_studierendenantrag(studierendenantrag_id)=st.studierendenantrag_statustyp_kurzbz','LEFT');
 
-		$this->db->where_in('public.get_rolle_prestudent(p.prestudent_id, null)', $this->config->item('antrag_prestudentstatus_whitelist'));
-
 		return $this->loadWhere([
 			'p.person_id' => $person_id
 		]);

From e6a1ea621efa8f0c9d7a6e2a7a40a0ae73f31de4 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 13:52:29 +0200
Subject: [PATCH 049/175] Bug: Semester in PDFs

---
 rdf/AntragAbmeldung.xml.php     | 2 +-
 rdf/AntragUnterbrechung.xml.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
index b89fa51df..8e70e9dcb 100644
--- a/rdf/AntragAbmeldung.xml.php
+++ b/rdf/AntragAbmeldung.xml.php
@@ -37,7 +37,7 @@ else
 
 // TODO(chris): mehrsprachig
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[1], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, semester, tbl_studierendenantrag.grund
+	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[1], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
 	FROM
 	campus.tbl_studierendenantrag
 	JOIN public.tbl_student USING (prestudent_id)
diff --git a/rdf/AntragUnterbrechung.xml.php b/rdf/AntragUnterbrechung.xml.php
index 50c9f4c6a..e8bc23b58 100644
--- a/rdf/AntragUnterbrechung.xml.php
+++ b/rdf/AntragUnterbrechung.xml.php
@@ -38,7 +38,7 @@ else
 
 // TODO(chris): mehrsprachig
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[1], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, semester, tbl_studierendenantrag.grund, datum_wiedereinstieg, datum
+	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[1], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund, datum_wiedereinstieg, datum
 	FROM
 	campus.tbl_studierendenantrag
 	JOIN public.tbl_student USING (prestudent_id)

From 15786dd772b96278c8b8320edbb4c59b825fb8eb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 14:03:03 +0200
Subject: [PATCH 050/175] CIS URLs in Sancho mails

---
 application/controllers/jobs/AntragJob.php | 6 ++++++
 application/libraries/AntragLib.php        | 7 +++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 6b5b018e6..7af0f55af 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -67,6 +67,7 @@ class AntragJob extends JOB_Controller
 				'datum_wiedereinstieg' => $datum->format('d.m.Y')
 			);
 
+			// NOTE(chris): Sancho mail
 			if(sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg'))
 			{
 				$count++;
@@ -295,6 +296,7 @@ class AntragJob extends JOB_Controller
 				if (in_array($stg_kz, $this->config->item('stgkz_blacklist_wiederholung')))
 					continue;
 				$url = site_url('lehre/Studierendenantrag/wiederholung/' . $prestudent->prestudent_id);
+				$urlCIS = CIS_ROOT . 'index.ci.php/lehre/Studierendenantrag/wiederholung/' . $prestudent->prestudent_id;
 				$email = $this->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
 				if (isError($email)) {
 					$this->logError(getError($email));
@@ -318,9 +320,13 @@ class AntragJob extends JOB_Controller
 							'datum_kp' => $prestudent->datum,
 							'studiensemester'=> $prestudent->studiensemester_kurzbz,
 							'orgform'=> $prestudent->orgform,
+							'prestudent_id' => $prestudent->prestudent_id,
 							'url' => $url,
+							'urlCIS' => $urlCIS,
 							'fristablauf' => $fristende->format('d.m.Y')
 						);
+						
+						// NOTE(chris): Sancho mail
 						if(sendSanchoMail('Sancho_Mail_Antrag_W_' . $name, $dataMail, $email, $subject))
 						{
 							$antrag_id = null;
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 2b920bfcd..cbcfc6fdb 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -474,7 +474,9 @@ class AntragLib
 							[
 								'name' => $name,
 								'grund' => $grund,
-								'abmeldungLink' => site_url('lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id)
+								'prestudent_id' => $data['prestudent_status']->prestudent_id,
+								'abmeldungLink' => site_url('lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id),
+								'abmeldungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id
 							],
 							$data['email'],
 							'Unterbrechung abgelehnt'
@@ -645,7 +647,8 @@ class AntragLib
 				'Sancho_Mail_Antrag_W_New',
 				[
 					'antrag_id' => $antrag_id,
-					'lvzuweisungLink' => site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id)
+					'lvzuweisungLink' => site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id),
+					'lvzuweisungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id
 				],
 				$email,
 				'Neue*r Wiederholer*in'

From 25258f7d8776786907dd72e4782bc2f39ecd0106 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 14:27:50 +0200
Subject: [PATCH 051/175] =?UTF-8?q?E-Mail=20Reminder=20f=C3=BCr=20Wiederho?=
 =?UTF-8?q?ler=20sollen=20an=20die=20FH=20Adresse=20des=20Studierenden=20g?=
 =?UTF-8?q?eschickt=20werden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/jobs/AntragJob.php    | 117 ++++++++----------
 application/models/crm/Student_model.php      |  10 ++
 .../education/Studierendenantrag_model.php    |   2 +-
 3 files changed, 64 insertions(+), 65 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 7af0f55af..71068fbe9 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -25,6 +25,7 @@ class AntragJob extends JOB_Controller
 		$this->load->model('education/Studierendenantragstatus_model', 'StudierendenantragstatusModel');
 		$this->load->model('education/Pruefung_model', 'PruefungModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
+		$this->load->model('crm/Student_model', 'StudentModel');
 	}
 
 	/**
@@ -297,74 +298,62 @@ class AntragJob extends JOB_Controller
 					continue;
 				$url = site_url('lehre/Studierendenantrag/wiederholung/' . $prestudent->prestudent_id);
 				$urlCIS = CIS_ROOT . 'index.ci.php/lehre/Studierendenantrag/wiederholung/' . $prestudent->prestudent_id;
-				$email = $this->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
-				if (isError($email)) {
-					$this->logError(getError($email));
-				} else {
-					$email = getData($email);
+				$email = $this->StudentModel->getEmailFH($this->StudentModel->getUID($prestudent->prestudent_id));
 
-					if (!$email) {
-						$this->logError('No email contact found for person_id: ' . $prestudent->person_id);
-					}
-					else
+				$fristende = new DateTime($prestudent->datum);
+				$fristende->add(DateInterval::createFromDateString($modifier_deadline));
+
+				$dataMail = array(
+					'name'=> trim($prestudent->vorname . ' '. $prestudent->nachname),
+					'pers_kz'=> $prestudent->matrikelnr,
+					'studiengang' => $prestudent->bezeichnung,
+					'lvbezeichnung' => $prestudent->lvbezeichnung,
+					'datum_kp' => $prestudent->datum,
+					'studiensemester'=> $prestudent->studiensemester_kurzbz,
+					'orgform'=> $prestudent->orgform,
+					'prestudent_id' => $prestudent->prestudent_id,
+					'url' => $url,
+					'urlCIS' => $urlCIS,
+					'fristablauf' => $fristende->format('d.m.Y')
+				);
+				
+				// NOTE(chris): Sancho mail
+				if(sendSanchoMail('Sancho_Mail_Antrag_W_' . $name, $dataMail, $email, $subject))
+				{
+					$antrag_id = null;
+					$result = $this->StudierendenantragModel->loadWhere([
+						'prestudent_id' => $prestudent->prestudent_id,
+						'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
+					]);
+					if (isError($result))
+						$this->logError(getError($result));
+					elseif (hasData($result))
+						$antrag_id = current(getData($result) ?: []) -> studierendenantrag_id;
+					if ($antrag_id == null)
 					{
-						$email = current($email)->kontakt;
-						$fristende = new DateTime($prestudent->datum);
-						$fristende->add(DateInterval::createFromDateString($modifier_deadline));
-
-						$dataMail = array(
-							'name'=> trim($prestudent->vorname . ' '. $prestudent->nachname),
-							'pers_kz'=> $prestudent->matrikelnr,
-							'studiengang' => $prestudent->bezeichnung,
-							'lvbezeichnung' => $prestudent->lvbezeichnung,
-							'datum_kp' => $prestudent->datum,
-							'studiensemester'=> $prestudent->studiensemester_kurzbz,
-							'orgform'=> $prestudent->orgform,
+						$result = $this->StudierendenantragModel->insert([
 							'prestudent_id' => $prestudent->prestudent_id,
-							'url' => $url,
-							'urlCIS' => $urlCIS,
-							'fristablauf' => $fristende->format('d.m.Y')
-						);
-						
-						// NOTE(chris): Sancho mail
-						if(sendSanchoMail('Sancho_Mail_Antrag_W_' . $name, $dataMail, $email, $subject))
-						{
-							$antrag_id = null;
-							$result = $this->StudierendenantragModel->loadWhere([
-								'prestudent_id' => $prestudent->prestudent_id,
-								'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG
-							]);
-							if (isError($result))
-								$this->logError(getError($result));
-							elseif (hasData($result))
-								$antrag_id = current(getData($result) ?: []) -> studierendenantrag_id;
-							if ($antrag_id == null)
-							{
-								$result = $this->StudierendenantragModel->insert([
-									'prestudent_id' => $prestudent->prestudent_id,
-									'studiensemester_kurzbz'=> $prestudent->studiensemester_kurzbz,
-									'datum' => date('c'),
-									'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
-									'insertvon' => 'AntragJob'
-								]);
-								if (isError($result))
-									$this->logError(getError($result));
-								else
-									$antrag_id = getData($result);
-							}
-							if ($antrag_id)
-							{
-								$result = $this->StudierendenantragstatusModel->insert([
-									'studierendenantrag_id' => $antrag_id,
-									'studierendenantrag_statustyp_kurzbz' => $status_to,
-									'insertvon' => 'AntragJob'
-								]);
-								if (isError($result))
-									$this->logError(getError($result));
-							}
-							$count++;
-						}
+							'studiensemester_kurzbz'=> $prestudent->studiensemester_kurzbz,
+							'datum' => date('c'),
+							'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
+							'insertvon' => 'AntragJob'
+						]);
+						if (isError($result))
+							$this->logError(getError($result));
+						else
+							$antrag_id = getData($result);
 					}
+					if ($antrag_id)
+					{
+						$result = $this->StudierendenantragstatusModel->insert([
+							'studierendenantrag_id' => $antrag_id,
+							'studierendenantrag_statustyp_kurzbz' => $status_to,
+							'insertvon' => 'AntragJob'
+						]);
+						if (isError($result))
+							$this->logError(getError($result));
+					}
+					$count++;
 				}
 			}
 			$this->logInfo($count . " Mails '" . $subject . "' sent");
diff --git a/application/models/crm/Student_model.php b/application/models/crm/Student_model.php
index 4404beb54..e27fa68dc 100644
--- a/application/models/crm/Student_model.php
+++ b/application/models/crm/Student_model.php
@@ -82,4 +82,14 @@ class Student_model extends DB_Model
 
 		return $result;
 	}
+
+	/**
+	 * Get the FH-Email for a student (not the private kontakt emailt)
+	 * @param $student_uid
+	 * @return string
+	 */
+	public function getEmailFH($student_uid)
+	{
+		return $student_uid . '@' . DOMAIN;
+	}
 }
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index d9313263f..a4dfb0d59 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -98,7 +98,7 @@ class Studierendenantrag_model extends DB_Model
 		);
 
 		if ($types && is_array($types)) {
-			$this->db->where_in('typ' => $types);
+			$this->db->where_in('typ', $types);
 		}
 
 		$this->addOrder('datum', 'DESC');

From 3219f43e6db8ac32e194e52bacee6d15c941a280 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 14:36:54 +0200
Subject: [PATCH 052/175] =?UTF-8?q?Fehlerhafte=20Anzeige=20bei=20Download?=
 =?UTF-8?q?=20von=20Antr=C3=A4gen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/profile/dokumente.php    | 6 ++++--
 include/studierendenantrag.class.php | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/cis/private/profile/dokumente.php b/cis/private/profile/dokumente.php
index 16fc9a085..89727cec8 100644
--- a/cis/private/profile/dokumente.php
+++ b/cis/private/profile/dokumente.php
@@ -240,13 +240,15 @@ if (in_array($stsem, $stsem_arr))
 					<th>'.$p->t('global/name').'</th>
 				</tr>
 				</thead>
-				<tbody><tr>';
+				<tbody>';
 		foreach ($studierendenantrag->result as $antrag) {
 			$path = "../pdfExport.php?xsl=Antrag" . $antrag->typ . "&xml=Antrag" . $antrag->typ . ".xml.php&uid=" . $uid . "&id=" . $antrag->studierendenantrag_id;
+			echo '<tr>';
 			echo '<td><img src="../../../skin/images/pdfpic.gif" /></td>';
 			echo '<td><a href="'.$path.'">' . $p->t('tools/studierendenantrag_' . $antrag->typ) . '</a></td>';
+			echo '</tr>';
 		}
-		echo '</tr></tbody></table>';
+		echo '</tbody></table>';
 	}
 
 
diff --git a/include/studierendenantrag.class.php b/include/studierendenantrag.class.php
index a491e4ba2..e556136e3 100644
--- a/include/studierendenantrag.class.php
+++ b/include/studierendenantrag.class.php
@@ -108,7 +108,7 @@ class studierendenantrag extends basis_db
 	 */
 	public function loadUserAntrag($prestudent_id, $stsem = null)
 	{
-		$qry = "SELECT * FROM campus.tbl_studierendenantrag WHERE prestudent_id=" . $this->db_add_param($prestudent_id, FHC_INTEGER);
+		$qry = "SELECT * FROM campus.tbl_studierendenantrag WHERE typ IN ('Abmeldung','AbmeldungStgl','Unterbrechung') AND campus.get_status_studierendenantrag(studierendenantrag_id)='Genehmigt' AND prestudent_id=" . $this->db_add_param($prestudent_id, FHC_INTEGER);
 		
 		if ($stsem)
 		{

From cb1c4d01e0f922e85684cb1639d2b81d2fa22bde Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 14:45:31 +0200
Subject: [PATCH 053/175] phrasen: dokumente

---
 cis/private/profile/dokumente.php   | 4 ++--
 locale/de-AT/studierendenantrag.php | 7 +++++++
 locale/en-US/studierendenantrag.php | 7 +++++++
 3 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 locale/de-AT/studierendenantrag.php
 create mode 100644 locale/en-US/studierendenantrag.php

diff --git a/cis/private/profile/dokumente.php b/cis/private/profile/dokumente.php
index 89727cec8..da1a6e495 100644
--- a/cis/private/profile/dokumente.php
+++ b/cis/private/profile/dokumente.php
@@ -232,7 +232,7 @@ if (in_array($stsem, $stsem_arr))
 	$studierendenantrag = new studierendenantrag();
 	if ($studierendenantrag->loadUserAntrag($student_studiengang->prestudent_id, $stsem) && $studierendenantrag->result) {
 		// TODO(chris): Phrasen!
-		echo '<h2>' . $p->t('tools/studierendenantrag') . '</h2>';
+		echo '<h2>' . $p->t('studierendenantrag/antraege_header') . '</h2>';
 		echo '<table class="tablesorter" style="width:auto;">
 				<thead>
 				<tr>
@@ -245,7 +245,7 @@ if (in_array($stsem, $stsem_arr))
 			$path = "../pdfExport.php?xsl=Antrag" . $antrag->typ . "&xml=Antrag" . $antrag->typ . ".xml.php&uid=" . $uid . "&id=" . $antrag->studierendenantrag_id;
 			echo '<tr>';
 			echo '<td><img src="../../../skin/images/pdfpic.gif" /></td>';
-			echo '<td><a href="'.$path.'">' . $p->t('tools/studierendenantrag_' . $antrag->typ) . '</a></td>';
+			echo '<td><a href="'.$path.'">' . $p->t('studierendenantrag/title_' . $antrag->typ) . '</a></td>';
 			echo '</tr>';
 		}
 		echo '</tbody></table>';
diff --git a/locale/de-AT/studierendenantrag.php b/locale/de-AT/studierendenantrag.php
new file mode 100644
index 000000000..7dabe2ae5
--- /dev/null
+++ b/locale/de-AT/studierendenantrag.php
@@ -0,0 +1,7 @@
+<?php
+$this->phrasen['global/studiengang']='Studiengang';
+$this->phrasen['studierendenantrag/antraege_header']='Anträge auf Änderung des Studierendenstatus';
+$this->phrasen['studierendenantrag/title_Abmeldung']='Abmeldung';
+$this->phrasen['studierendenantrag/title_AbmeldungStgl']='Abmeldung';
+$this->phrasen['studierendenantrag/title_Unterbrechung']='Unterbrechung';
+?>
\ No newline at end of file
diff --git a/locale/en-US/studierendenantrag.php b/locale/en-US/studierendenantrag.php
new file mode 100644
index 000000000..341aa5a11
--- /dev/null
+++ b/locale/en-US/studierendenantrag.php
@@ -0,0 +1,7 @@
+<?php
+$this->phrasen['global/studiengang']='Studiengang';
+$this->phrasen['studierendenantrag/antraege_header']='Requests for changing the Studierendenstatus';
+$this->phrasen['studierendenantrag/title_Abmeldung']='De-registration';
+$this->phrasen['studierendenantrag/title_AbmeldungStgl']='De-registration';
+$this->phrasen['studierendenantrag/title_Unterbrechung']='Interruption';
+?>
\ No newline at end of file

From 2213fed5b27a2c263f608ef42153b48c3f9366f1 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 10 Jul 2023 16:39:20 +0200
Subject: [PATCH 054/175] Phrasen

---
 .../components/Antrag/Wiederholung.php        |   1 -
 application/libraries/AntragLib.php           | 146 +++--
 application/libraries/PrestudentLib.php       |  16 +-
 cis/private/profile/dokumente.php             |   1 -
 rdf/AntragAbmeldung.xml.php                   |   3 +-
 rdf/AntragUnterbrechung.xml.php               |   3 +-
 system/phrasesupdate.php                      | 570 +++++++++++++++++-
 7 files changed, 650 insertions(+), 90 deletions(-)

diff --git a/application/controllers/components/Antrag/Wiederholung.php b/application/controllers/components/Antrag/Wiederholung.php
index 941d6e51a..a2252a7f5 100644
--- a/application/controllers/components/Antrag/Wiederholung.php
+++ b/application/controllers/components/Antrag/Wiederholung.php
@@ -157,7 +157,6 @@ class Wiederholung extends FHC_Controller
 		$result = $result->retval;
 		if (!$result)
 		{
-			// TODO(chris): ERROR Message
 			return $this->outputJsonError(['db' => $this->p->t('studierendenantrag', 'error_no_student')]);
 		}
 		elseif ($result == -2)
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index cbcfc6fdb..190997c19 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -81,7 +81,7 @@ class AntragLib
 		if (isError($result))
 			return $result;
 		if(!hasData($result))
-			return error("Kein Prestudent gefunden: " . $prestudent_id);
+			return error($this->_ci->p->t('studierendenantrag', "error_no_prestudent", ['prestudent_id' => $prestudent_id]));
 
 		$prestudent = getData($result)[0];
 		if($prestudent->person_id == getAuthPersonId())
@@ -134,7 +134,7 @@ class AntragLib
 			}
 			if(!hasData($result))
 			{
-				$errors[] = 'no Antrag found for '. $studierendenantrag_id;
+				$errors[] = $this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]);
 				continue;
 			}
 			$status = getData($result)[0];
@@ -165,7 +165,7 @@ class AntragLib
 						$prestudent_status = getData($resultPrestudentStatus)[0];
 
 						$vorlage ='Sancho_Mail_Antrag_A_Approve';
-						$subject = 'Abmeldung freigegeben';
+						$subject = $this->_ci->p->t('studierendenantrag', 'mail_subject_A_Approve');
 
 						$result = $this->_ci->prestudentlib->setAbbrecher($antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon);
 						if (isError($result))
@@ -176,7 +176,7 @@ class AntragLib
 
 						$result = $this->_ci->PersonModel->loadPrestudent($antrag->prestudent_id);
 						$data = [
-							'nameStudent' => 'Student*in'
+							'nameStudent' => $this->_ci->p->t('person', 'studentIn')
 						];
 						if (hasData($result)) {
 							$person = current(getData($result));
@@ -195,7 +195,7 @@ class AntragLib
 							$person = current(getData($res));
 							$name = trim($person->vorname . ' ' . $person->nachname);
 						} else {
-							$name = 'Student*in';
+							$name = $this->_ci->p->t('person', 'studentIn');
 						}
 						$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
 						if (hasData($res)) {
@@ -208,7 +208,7 @@ class AntragLib
 									'grund' => $status->grund
 								],
 								$email,
-								'Abmeldung durch Studiengangsleitung'
+								$this->_ci->p->t('studierendenantrag', 'mail_subject_A_Stgl')
 							);
 						}
 					}
@@ -301,10 +301,10 @@ class AntragLib
 				]);
 				if (isError($result))
 				{
-					$errors['failed_' . $studierendenantrag_id] = 'Could not approve Unterbrechung for studierendenantrag_id: ' .
-					$studierendenantrag_id .
-					'<br>Details:<br>' .
-					getError($result)['message'];
+					$errors['failed_' . $studierendenantrag_id] = $this->_ci->p->t('studierendenantrag', 'error_U_Approve', [
+						'studierendenantrag_id' => $studierendenantrag_id,
+						'message' => getError($result)['message']
+					]);
 				}
 				else
 				{
@@ -314,7 +314,7 @@ class AntragLib
 						return $resultAntrag;
 					$resultAntrag = getData($resultAntrag);
 					if (!$resultAntrag)
-						return error('No antrag found with id: ' . $studierendenantrag_id);
+						return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
 					$resultAntrag = current($resultAntrag);
 
 						// Prestudentstatus und Unterbrechungsfolgeaktionen setzen
@@ -326,30 +326,27 @@ class AntragLib
 					}
 
 							//Mail
-					$subject = 'Unterbrechung freigegeben';
+					$subject = $this->_ci->p->t('studierendenantrag', 'mail_subject_U_Approve');
 					$mail = [];
 
 					if (isset($data['errors']['person_id']))
 					{
 								//send assistenz mit id
-						$errors[] = 'Mail to student not sent and student name not found<br>Details:<br>' . $data['errors']['person_id'];
-						$mail['ass'] = 'Student/in (' . $data['antrag']->prestudent_id . ')';
+						$errors[] = $this->_ci->p->t('studierendenantrag', 'error_mail_and_name', ['message' => $data['errors']['person_id']]);
+						$mail['ass'] = $this->_ci->p->t('studierendenantrag', 'StudentIn', ['prestudent_id' => $data['antrag']->prestudent_id]);
 					}
 					elseif (isset($data['errors']['email']))
 					{
 						if (isset($data['errors']['person']))
 						{
 									//send assistenz mit id
-							$errors[] = 'Mail to student not sent and student name not found<br>Details:<br>' .
-							$data['errors']['email'] .
-							'<br>' .
-							$data['errors']['person'];
-							$mail['ass'] = 'Student/in (' . $data['antrag']->prestudent_id . ')';
+							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_mail_and_name', ['message' => $data['errors']['email'] . '<br>' . $data['errors']['person']]);
+							$mail['ass'] = $this->_ci->p->t('studierendenantrag', 'StudentIn', ['prestudent_id' => $data['antrag']->prestudent_id]);
 						}
 						else
 						{
 									//send assistenz mit name
-							$errors[] = 'Mail to student not sent<br>Details:<br>' . $data['errors']['email'];
+							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_mail', ['message' => $data['errors']['email']]);
 							$mail['ass'] = trim($data['person']->vorname . ' ' . $data['person']->nachname);
 						}
 					}
@@ -358,9 +355,9 @@ class AntragLib
 						if (isset($data['errors']['person']))
 						{
 									//send assistenz mit id & student mit "Student/in"
-							$errors[] = 'Student name not found<br>Details:<br>' . $data['errors']['person'];
-							$mail['ass'] = 'Student/in (' . $data['antrag']->prestudent_id . ')';
-							$mail['stu'] = 'Student/in';
+							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_name', ['message' => $data['errors']['person']]);
+							$mail['ass'] = $this->_ci->p->t('studierendenantrag', 'StudentIn', ['prestudent_id' => $data['antrag']->prestudent_id]);
+							$mail['stu'] = $this->_ci->p->t('person', 'StudentIn');
 						}
 						else
 						{
@@ -381,7 +378,7 @@ class AntragLib
 							$data['prestudent_status']->email,
 							$subject
 						)) {
-							$errors[] = 'Failed to send email to ' . $data['prestudent_status']->email;
+							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_mail_to', $data['prestudent_status']);
 						}
 					}
 					if (isset($mail['stu'])) {
@@ -394,7 +391,7 @@ class AntragLib
 							$data['email'],
 							$subject
 						)) {
-							$errors[] = 'Failed to send email to ' . $data['email'];
+							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_mail_to', $data);
 						}
 					}
 				}
@@ -428,10 +425,10 @@ class AntragLib
 				if (is_array($error_msg) && isset($error_msg['message']))
 					$error_msg = $error_msg['message'];
 
-				$errors['failed_' . $studierendenantrag_id] = 'Could not reject Unterbrechung for studierendenantrag_id: ' .
-					$studierendenantrag_id .
-					'<br>Details:<br>' .
-					$error_msg;
+				$errors['failed_' . $studierendenantrag_id] = $this->_ci->p->t('studierendenantrag', 'error_U_Reject', [
+					'studierendenantrag_id' => $studierendenantrag_id,
+					'message' => $error_msg
+				]);
 			} else {
 				$data = getData($data);
 
@@ -442,10 +439,10 @@ class AntragLib
 					'grund' => $grund
 				]);
 				if (isError($result)) {
-					$errors['failed_' . $studierendenantrag_id] = 'Could not reject Unterbrechung for studierendenantrag_id: ' .
-						$studierendenantrag_id .
-						'<br>Details:<br>' .
-						getError($result)['message'];
+					$errors['failed_' . $studierendenantrag_id] = $this->_ci->p->t('studierendenantrag', 'error_U_Reject', [
+					'studierendenantrag_id' => $studierendenantrag_id,
+					'message' => getError($result)['message']
+				]);
 				} else {
 					$name = '';
 
@@ -455,12 +452,12 @@ class AntragLib
 							$error_msg[] = $data['errors']['person_id'];
 						if (isset($data['errors']['email']))
 							$error_msg[] = $data['errors']['email'];
-						$error_msg = 'Mail to student not sent<br>Details:<br>' . implode('<br>', $error_msg);
+						$error_msg = $this->_ci->p->t('studierendenantrag', 'error_mail', ['message' => implode('<br>', $error_msg)]);
 						$errors[] = $error_msg;
 					} else {
 						if (isset($data['errors']['person'])) {
 							//send student mit "Student/in"
-							$errors[] = 'Student name not found<br>Details:<br>' . $data['errors']['person'];
+							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_name', ['message' => $data['errors']['person']]);
 							$name = 'Student/in';
 						} else {
 							//send normal
@@ -479,9 +476,9 @@ class AntragLib
 								'abmeldungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id
 							],
 							$data['email'],
-							'Unterbrechung abgelehnt'
+							$this->_ci->p->t('studierendenantrag', 'mail_subject_U_Reject')
 						))
-							$errors[] = 'Failed to send email to ' . $data['email'];
+							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_mail_to', $data);
 				}
 			}
 		}
@@ -508,7 +505,7 @@ class AntragLib
 
 		$res = getData($res);
 		if (!$res)
-			return error('No Studierendenantrag found for studierendenantrag_id: ' . $studierendenantrag_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
 
 		$result['antrag'] = $antrag = current($res);
 
@@ -519,7 +516,7 @@ class AntragLib
 
 		$res = getData($res);
 		if (!$res)
-			return error('No Prestudentstatus found for prestudent_id: ' . $antrag->prestudent_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', $antrag));
 
 		$result['prestudent_status'] = current($res);
 
@@ -531,7 +528,7 @@ class AntragLib
 		} else {
 			$res = getData($res);
 			if (!$res) {
-				$errors['person_id'] = 'No Prestudent found for prestudent_id: ' . $antrag->prestudent_id;
+				$errors['person_id'] = $this->_ci->p->t('studierendenantrag', 'error_no_prestudent', $antrag);
 			} else {
 				$person_id = current($res)->person_id;
 
@@ -541,7 +538,7 @@ class AntragLib
 				} else {
 					$res = getData($res);
 					if (!$res) {
-						$errors['person'] = 'No Person found for person_id: ' . $person_id;
+						$errors['person'] = $this->_ci->p->t('studierendenantrag', 'error_no_person', ['person_id' => $person_id]);
 					} else {
 						$result['person'] = current($res);
 					}
@@ -554,7 +551,7 @@ class AntragLib
 					$res = getData($res);
 
 					if (!$res) {
-						$errors['email'] = 'No email contact found for person_id: ' . $person_id;
+						$errors['email'] = $this->_ci->p->t('studierendenantrag', 'error_no_email', ['person_id' => $person_id]);
 					} else {
 						$result['email'] = current($res)->kontakt;
 					}
@@ -607,7 +604,7 @@ class AntragLib
 			}
 			else
 			{
-				return error('Antrag bereits vorhanden!');
+				return error($this->_ci->p->t('global', 'antragBereitsGestellt'));
 			}
 		}
 
@@ -638,7 +635,7 @@ class AntragLib
 				return $res;
 			$res = getData($res);
 			if (!$res)
-				return error('No Prestudentstatus found for prestudent_id: ' . $prestudent_id);
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', ['prestudent_id' => $prestudent_id]));
 
 			$prestudent_status = current($res);
 			$email = $prestudent_status->email;
@@ -651,7 +648,7 @@ class AntragLib
 					'lvzuweisungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id
 				],
 				$email,
-				'Neue*r Wiederholer*in'
+				$this->_ci->p->t('studierendenantrag', 'mail_subject_W_New')
 			);
 		}
 
@@ -731,7 +728,7 @@ class AntragLib
 			return $result;
 		$result = getData($result);
 		if (!$result)
-			return error('No antrag found with id: ' . $antrag_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $antrag_id]));
 		$antrag = current($result);
 
 
@@ -740,7 +737,7 @@ class AntragLib
 			return $result;
 		$result = getData($result);
 		if (!$result)
-			return error('No studiengang and ausbildungssemester found for antrag with id: ' . $antrag_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_and_sem', ['id' => $antrag_id]));
 		$result = current($result);
 		$studiengang_kz = $result->studiengang_kz;
 		$orgform_kurzbz = $result->orgform_kurzbz;
@@ -762,7 +759,7 @@ class AntragLib
 			return $result;
 		$result = getData($result);
 		if (!$result)
-			return error('No studiensemster found after: ' . $antrag->studiensemester_kurzbz);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_sem_after', ['semester' => $antrag->studiensemester_kurzbz]));
 		$semA = current($result)->studiensemester_kurzbz;
 
 		$result = $this->_ci->StudiensemesterModel->getNextFrom($semA);
@@ -770,7 +767,7 @@ class AntragLib
 			return $result;
 		$result = getData($result);
 		if (!$result)
-			return error('No studiensemster found after: ' . $semA);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_sem_after', ['semester' => $semA]));
 		$semB = current($result)->studiensemester_kurzbz;
 
 		$result = $this->_ci->StudierendenantraglehrveranstaltungModel->loadWhere(['studierendenantrag_id' => $antrag_id]);
@@ -858,25 +855,23 @@ class AntragLib
 			if (isError($result))
 				return $result;
 			if (!hasData($result))
-				return error('No Studiengang found with studiengang_kz: ' . $studiengang_kz);
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_stg', ['studiengang_kz' => $studiengang_kz]));
 			$stg = current(getData($result));
 			
 			if ($ausbildungssemester > $stg->max_semester)
 				return success();
-			return error('No studienplan found for stg: ' .
-				$studiengang_kz .
-				', studiensemester: ' .
-				$studiensemester_kurzbz .
-				', ausbildungssemester: ' .
-				($ausbildungssemester));
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_studienplan', [
+				'studiengang_kz' => $studiengang_kz,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'semester' => $ausbildungssemester
+			]));
 		}
 		if (count($result) > 1)
-			return error('Multiple studienplaene found for stg: ' .
-				$studiengang_kz .
-				', studiensemester: ' .
-				$studiensemester_kurzbz .
-				', ausbildungssemester: ' .
-				$ausbildungssemester);
+			return error($this->_ci->p->t('studierendenantrag', 'error_multiple_studienplan', [
+				'studiengang_kz' => $studiengang_kz,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'semester' => $ausbildungssemester
+			]));
 		$studienplan = current($result);
 
 		return $this->_ci->StudienplanModel->getStudienplanLehrveranstaltungForPrestudent(
@@ -1095,7 +1090,7 @@ class AntragLib
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
-			return error('No Studentstatus found for: ' . $prestudent_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', ['prestudent_id' => $prestudent_id]));
 		$result = current(getData($result));
 		return success($result);
 	}
@@ -1106,7 +1101,7 @@ class AntragLib
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
-			return error('No Studentstatus found for: ' . $prestudent_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', ['prestudent_id' => $prestudent_id]));
 		$resultDetails = current(getData($result));
 
 		$where = [
@@ -1127,7 +1122,10 @@ class AntragLib
 			}
 		}
 		if (!$resultAntrag)
-			return error('No Antrag ' . trim(($typ ?: '') . ' ') . 'found for: ' . $prestudent_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found_prestudent', [
+				'typ' => $typ ?: '',
+				'prestudent_id' => $prestudent_id
+			]));
 
 		$resultDetails->status = $resultAntrag->status;
 		$resultDetails->statustyp = $resultAntrag->statustyp;
@@ -1149,7 +1147,7 @@ class AntragLib
 		return $result;
 
 		if (!hasData($result))
-			return error("No Antrag found with id: " . $studierendenantrag_id);
+			return error($this->_ci->p->t('studierendenantrag', "error_no_antrag_found", ['id' => $studierendenantrag_id]));
 		$resultAntrag = current(getData($result));
 
 		$result = $this->_ci->PrestudentstatusModel->loadLastWithStgDetails($resultAntrag->prestudent_id, $resultAntrag->studiensemester_kurzbz);
@@ -1160,7 +1158,7 @@ class AntragLib
 			if (isError($result))
 				return $result;
 			if (!hasData($result))
-				return error('No Studentstatus found for: ' . $resultAntrag->prestudent_id);
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', $resultAntrag));
 		}
 		$resultDetails = current(getData($result));
 
@@ -1268,7 +1266,7 @@ class AntragLib
 			return $result;
 		$result = getData($result);
 		if (!$result)
-			return error('No studiengang email found for: ' . $antrag_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_email', ['id' => $antrag_id]));
 
 		$email = current($result)->email;
 
@@ -1277,7 +1275,7 @@ class AntragLib
 			return $result;
 		$result = getData($result);
 		if (!$result)
-			return error('No studiengang found for: ' . $antrag_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_antrag', ['id' => $antrag_id]));
 
 		$result = current($result);
 		$studiengang_kz = $result->studiengang_kz;
@@ -1288,7 +1286,7 @@ class AntragLib
 			return $result;
 		$result = getData($result);
 		if (!$result)
-			return error('No studiengang found for: ' . $antrag_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_antrag', ['id' => $antrag_id]));
 
 		$stg = current($result);
 
@@ -1296,7 +1294,7 @@ class AntragLib
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
-			return error('No Antrag found for: ' . $antrag_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $antrag_id]));
 		$result = current(getData($result));
 		$prestudent_id = $result->prestudent_id;
 
@@ -1304,7 +1302,7 @@ class AntragLib
 		if (isError($result))
 			return $result;
 		if (!hasData($result))
-			return error('No Person found for prestudent: ' . $prestudent_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_person_prestudent', ['prestudent_id' => $prestudent_id]));
 		$result = current(getData($result));
 		$student = trim($result->vorname . ' ' . $result->nachname);
 
@@ -1328,9 +1326,9 @@ class AntragLib
 				'mitarbeiter' => $mitarbeiter
 			],
 			$email,
-			'Wiederholung von Stgleitung freigegeben'
+			$this->_ci->p->t('studierendenantrag', 'mail_subject_W_Approve')
 		))
-			return error('Email konnte nicht versendet werden an '. $email);
+			return error($this->_ci->p->t('studierendenantrag', 'error_mail_to', ['email' => $email]));
 
 		return success();
 	}
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 2597b40d0..5024c6c22 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -45,7 +45,10 @@ class PrestudentLib
 			return $result;
 		$result = getData($result);
 		if (!$result)
-			return error('Kein Prestudent in diesem Studiensemester gefunden');
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
+				'prestudent_id' => $prestudent_id,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			]));
 
 		$prestudent_status = current($result);
 
@@ -55,7 +58,7 @@ class PrestudentLib
 			return $result;
 		$result = getData($result);
 		if (!$result)
-			return error('No student found for ' . $prestudent_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
 		$student = current($result);
 
@@ -218,7 +221,10 @@ class PrestudentLib
 				return error('Kein Prestudent status gefunden');
 			}
 			$result->studiensemester_kurzbz*/
-			return error('Kein Prestudent status gefunden');
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
+				'prestudent_id' => $prestudent_id,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz
+			]));
 		}
 
 		$prestudent_status = current($result);
@@ -229,7 +235,7 @@ class PrestudentLib
 			return $result;
 		$result = getData($result);
 		if (!$result)
-			return error('No student found for ' . $prestudent_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_student_for_prestudent', ['prestudent_id' => $prestudent_id]));
 
 		$student = current($result);
 
@@ -238,7 +244,7 @@ class PrestudentLib
 			return $resultAntrag;
 		$resultAntrag = getData($resultAntrag);
 		if (!$resultAntrag)
-			return error('No antrag found with id: ' . $studierendenantrag_id);
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
 
 		$antrag = current($resultAntrag);
 
diff --git a/cis/private/profile/dokumente.php b/cis/private/profile/dokumente.php
index da1a6e495..9e7f6bf5b 100644
--- a/cis/private/profile/dokumente.php
+++ b/cis/private/profile/dokumente.php
@@ -231,7 +231,6 @@ if (in_array($stsem, $stsem_arr))
 {
 	$studierendenantrag = new studierendenantrag();
 	if ($studierendenantrag->loadUserAntrag($student_studiengang->prestudent_id, $stsem) && $studierendenantrag->result) {
-		// TODO(chris): Phrasen!
 		echo '<h2>' . $p->t('studierendenantrag/antraege_header') . '</h2>';
 		echo '<table class="tablesorter" style="width:auto;">
 				<thead>
diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
index 8e70e9dcb..13e99dff2 100644
--- a/rdf/AntragAbmeldung.xml.php
+++ b/rdf/AntragAbmeldung.xml.php
@@ -35,9 +35,8 @@ else
 	die('<error>Format not supported</error>');
 
 
-// TODO(chris): mehrsprachig
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[1], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
+	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
 	FROM
 	campus.tbl_studierendenantrag
 	JOIN public.tbl_student USING (prestudent_id)
diff --git a/rdf/AntragUnterbrechung.xml.php b/rdf/AntragUnterbrechung.xml.php
index e8bc23b58..bb47018d6 100644
--- a/rdf/AntragUnterbrechung.xml.php
+++ b/rdf/AntragUnterbrechung.xml.php
@@ -36,9 +36,8 @@ else
 	die('<error>Format not supported</error>');
 
 
-// TODO(chris): mehrsprachig
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[1], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund, datum_wiedereinstieg, datum
+	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund, datum_wiedereinstieg, datum
 	FROM
 	campus.tbl_studierendenantrag
 	JOIN public.tbl_student USING (prestudent_id)
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 734c1e6cc..a754cf277 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -19246,6 +19246,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_student_for_prestudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Student gefunden für Prestudent #{prestudent_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No student found for prestudent #{prestudent_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -19794,7 +19814,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Es gibt bereits einen bestehenden Antrag vom Typ {typ}' ,
+				'text' => 'Es gibt bereits einen bestehenden Antrag vom Typ {typ}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -19814,7 +19834,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Kein Antrag mit AntragsId {id} gefunden' ,
+				'text' => 'Kein Antrag mit AntragsId {id} gefunden',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -19826,6 +19846,166 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_antrag_found_prestudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein {typ} Antrag gefunden für Prestudent {prestudent_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No {typ} application found for prestudent {prestudent_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_stg_and_sem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Studiengang und Ausbildungssemester gefunden für Antrag mit AntragsId {id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No studiengang and ausbildungssemester found for antrag with id: {id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_stg',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Studiengang gefunden: {studiengang_kz}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No studiengang found: {studiengang_kz}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_stg_antrag',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Studiengang gefunden für Antrag #{id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No studiengang found for Application #{id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_stg_email',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Studiengang-Email gefunden für Antrag #{id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No studiengang-email found for Application #{id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_studienplan',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Studienplan gefunden für Studiengang: {studiengang_kz}, Studiensemester: {studiensemester_kurzbz}, Ausbildungssemester: {semester}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No studienplan found for stg: {studiengang_kz}, studiensemester: {studiensemester_kurzbz}, ausbildungssemester: {semester}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_multiple_studienplan',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Mehrere Studienpläne gefunden für Studiengang: {studiengang_kz}, Studiensemester: {studiensemester_kurzbz}, Ausbildungssemester: {semester}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Multiple studienplans found for stg: {studiengang_kz}, studiensemester: {studiensemester_kurzbz}, ausbildungssemester: {semester}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_sem_after',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Studiensemester nach {semester} gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No studiensemester found after: {semester}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -19834,7 +20014,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Dieser Antrag ist gesperrt' ,
+				'text' => 'Dieser Antrag ist gesperrt',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -19854,7 +20034,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine Lehrveranstaltung ausgewählt' ,
+				'text' => 'Keine Lehrveranstaltung ausgewählt',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -19874,7 +20054,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine Lehrveranstaltung im Antrag gefunden' ,
+				'text' => 'Keine Lehrveranstaltung im Antrag gefunden',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -19966,6 +20146,386 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_person',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Person gefunden mit id {person_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Person found with id {person_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_person_prestudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Person gefunden für Prestudent #{prestudent_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Person found for prestudent #{prestudent_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_email',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Email kontakt gefunden für Person mit id {person_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No email contact found for Person with id {person_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_prestudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Prestudent gefunden: {prestudent_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No Prestudent found: {prestudent_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_prestudent_in_sem',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Status für Prestudent #{prestudent_id} in Semester {studiensemester_kurzbz} gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No status found for prestudent #{prestudent_id} in semester {studiensemester_kurzbz}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_prestudentstatus',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Status gefunden für Prestudent: {prestudent_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No status found for Prestudent: {prestudent_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_mail_to',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Email an {email} konnte nicht versandt werden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Failed to send email to {email}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_mail',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Email wurde nicht an den Studenten versendet<br>Details:<br>{message}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Mail to student not sent<br>Details:<br>{message}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_name',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Name des Studenten nicht gefunden<br>Details:<br>{message}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Name of student not found<br>Details:<br>{message}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_mail_and_name',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Email wurde nicht an den Studenten versendet da kein Name gefunden wurde<br>Details:<br>{message}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Mail to student not sent and student name not found<br>Details:<br>{message}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'studentIn',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'StudentIn ({prestudent_id})',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student ({prestudent_id})',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_U_Approve',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unterbrechung mit id {studierendenantrag_id} konnte nicht genehmigt werden.<br>Details:<br>{message}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Could not approve Unterbrechung for studierendenantrag_id: {studierendenantrag_id}<br>Details:<br>{message}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_U_Reject',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unterbrechung mit id {studierendenantrag_id} konnte nicht abgelehnt werden.<br>Details:<br>{message}',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Could not reject Unterbrechung for studierendenantrag_id: {studierendenantrag_id}<br>Details:<br>{message}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_subject_A_Approve',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abmeldung freigegeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unsubscribe released',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_subject_A_Stgl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abmeldung durch Studiengangsleitung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'De-registration by the course director',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_subject_U_Approve',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unterbrechung freigegeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Interruption enabled',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_subject_U_Reject',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Unterbrechung abgelehnt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Interruption rejected',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_subject_W_New',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Neue*r Wiederholer*in',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'New Repeater',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_subject_W_Approve',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wiederholung von Studiengangsleitung freigegeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Repetition approved by course director',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 );
 

From 1aa78386f4cb5bd45ab3a117c7882cd70b6955bb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 11 Jul 2023 08:33:05 +0200
Subject: [PATCH 055/175] erledigte TODOs entfernt

---
 content/student/studentoverlay.js.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index 8afe58929..d6ce57ea3 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -1656,9 +1656,8 @@ function StudentAuswahl()
 		StudentLvGesamtNotenTreeDatasource.addXMLSinkObserver(StudentLvGesamtNotenTreeSinkObserver);
 		lvgesamtnotentree.builder.addListener(StudentLvGesamtNotenTreeListener);
 
-		// *** AntragNoten Tree MANU***
 		var antragnotentree = document.getElementById('student-antragnoten-tree');
-		// TODO(chris): semester übergeben
+
 		url='<?php echo APP_ROOT;?>index.ci.php/components/Antrag/Wiederholung/getLvsAsRdf/'+prestudent_id+"?"+gettimestamp();
 
 		try

From f438d240f9a8c620a9cc7836f16350fa1c437015 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 11 Jul 2023 13:07:54 +0200
Subject: [PATCH 056/175] =?UTF-8?q?Update=20Wording=20Antrag=20->=20Verwal?=
 =?UTF-8?q?tung,=20Genehmigen->=20Best=C3=A4tigen,=20=C3=9Cberspringen=20B?=
 =?UTF-8?q?utton=20Ausblenden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/lehre/Antrag/Leitung/List.php       |  2 +-
 .../views/lehre/Antrag/Student/List.php       |  2 +-
 locale/de-AT/studierendenantrag.php           |  4 +--
 locale/en-US/studierendenantrag.php           |  4 +--
 .../Studierendenantrag/Leitung/LvPopup.js     |  2 +-
 system/phrasesupdate.php                      | 28 +++----------------
 6 files changed, 11 insertions(+), 31 deletions(-)

diff --git a/application/views/lehre/Antrag/Leitung/List.php b/application/views/lehre/Antrag/Leitung/List.php
index a0c6cdab0..3dffacf3f 100644
--- a/application/views/lehre/Antrag/Leitung/List.php
+++ b/application/views/lehre/Antrag/Leitung/List.php
@@ -33,7 +33,7 @@ $this->load->view(
 
 <div id="wrapper">
 	<div class="fhc-header">
-		<h1><?= $this->p->t('studierendenantrag', 'antraege_header'); ?></h1>
+		<h1><?= $this->p->t('studierendenantrag', 'antrag_header'); ?></h1>
 	</div>
 
 	<div class="fhc-container row">
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index aeedf9ca4..b1ec9e061 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -25,7 +25,7 @@ $this->load->view(
 <div id="wrapper">
 
 	<div class="fhc-header">
-		<h1 class="h2"><?= $this->p->t('studierendenantrag', 'antraege_header'); ?></h1>
+		<h1 class="h2"><?= $this->p->t('studierendenantrag', 'antrag_header'); ?></h1>
 	</div>
 
 	<div class="fhc-container row">
diff --git a/locale/de-AT/studierendenantrag.php b/locale/de-AT/studierendenantrag.php
index 7dabe2ae5..82c9887c0 100644
--- a/locale/de-AT/studierendenantrag.php
+++ b/locale/de-AT/studierendenantrag.php
@@ -1,7 +1,7 @@
 <?php
 $this->phrasen['global/studiengang']='Studiengang';
-$this->phrasen['studierendenantrag/antraege_header']='Anträge auf Änderung des Studierendenstatus';
+$this->phrasen['studierendenantrag/antraege_header']='Änderungen des Studierendenstatus';
 $this->phrasen['studierendenantrag/title_Abmeldung']='Abmeldung';
 $this->phrasen['studierendenantrag/title_AbmeldungStgl']='Abmeldung';
 $this->phrasen['studierendenantrag/title_Unterbrechung']='Unterbrechung';
-?>
\ No newline at end of file
+?>
diff --git a/locale/en-US/studierendenantrag.php b/locale/en-US/studierendenantrag.php
index 341aa5a11..9ac07af32 100644
--- a/locale/en-US/studierendenantrag.php
+++ b/locale/en-US/studierendenantrag.php
@@ -1,7 +1,7 @@
 <?php
 $this->phrasen['global/studiengang']='Studiengang';
-$this->phrasen['studierendenantrag/antraege_header']='Requests for changing the Studierendenstatus';
+$this->phrasen['studierendenantrag/antraege_header']='Changes of student status';
 $this->phrasen['studierendenantrag/title_Abmeldung']='De-registration';
 $this->phrasen['studierendenantrag/title_AbmeldungStgl']='De-registration';
 $this->phrasen['studierendenantrag/title_Unterbrechung']='Interruption';
-?>
\ No newline at end of file
+?>
diff --git a/public/js/components/Studierendenantrag/Leitung/LvPopup.js b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
index c3f2aa118..c09101c03 100644
--- a/public/js/components/Studierendenantrag/Leitung/LvPopup.js
+++ b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
@@ -141,7 +141,7 @@ export default {
 				<label class="form-check-label" for="cbid">{{p.t('studierendenantrag','fuer_x_uebernehmen', {count: countRemaining})}}</label>
 			</div>
 			<button type="button" class="btn btn-primary" @click="submit(true)">{{p.t('studierendenantrag','btn_approve')}}</button>
-			<button type="button" class="btn btn-secondary" @click="submit(false)">{{p.t('ui','skip')}}</button>
+			<button v-if="countRemaining > 0" type="button" class="btn btn-secondary" @click="submit(false)">{{p.t('ui','skip')}}</button>
 		</template>
 	</bs-modal>`
 }
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index a754cf277..155ef3217 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18363,26 +18363,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'studierendenantrag',
-		'phrase' => 'antraege_header',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Anträge auf Änderung des Studierendenstatus',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Requests for changing the Studierendenstatus',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -18391,13 +18371,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Antrag auf Änderung des Studierendenstatus',
+				'text' => 'Verwaltung des Studierendenstatus',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Request for changing the Studierendenstatus',
+				'text' => 'Management of student status',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -19073,13 +19053,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Genehmigen',
+				'text' => 'Bestätigen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Approve',
+				'text' => 'Confirm',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 6f1eed669643690be9c472b5f147aed3654d76b9 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 11 Jul 2023 17:01:22 +0200
Subject: [PATCH 057/175] =?UTF-8?q?Abbrecher=202dos:=20=C3=84nderungen=20W?=
 =?UTF-8?q?ordings,=20neue=20Statusgr=C3=BCnde=20preabbrecher,=20durchStgl?=
 =?UTF-8?q?,=20durchStud,=20update=20setAbbrecher?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/jobs/AntragJob.php    | 11 ++--
 application/libraries/AntragLib.php           | 54 +++++++++++++------
 application/libraries/PrestudentLib.php       | 17 ++++--
 .../models/crm/Prestudentstatus_model.php     | 16 ++++++
 .../27351_digitalisierung_formulare.php       | 39 ++++++++++++++
 5 files changed, 113 insertions(+), 24 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 71068fbe9..39c2519af 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -177,9 +177,14 @@ class AntragJob extends JOB_Controller
 		$dateDeadline = new DateTime();
 		$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
 
+		$this->StudierendenantragModel->addSelect('prestudent_id');
+		$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
+		$this->StudierendenantragModel->addSelect('s.insertamum');
+
 		$result = $this->StudierendenantragModel->getWithLastStatusWhere(
 				[
-					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED_STGL,
+					'typ' => Studierendenantrag_model::TYP_ABMELDUNG_STGL,
+					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
 					's.insertamum <=' => $dateDeadline->format('c')
 				]
 			);
@@ -195,8 +200,8 @@ class AntragJob extends JOB_Controller
 
 			foreach ($antraege as $antrag)
 			{
-				$result = $this->antraglib->approveAbmeldung([$antrag->studierendenantrag_id], $insertvon);
 
+				$result = $this->prestudentlib->setAbbrecher($antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon, 'abbrecherStgl', $antrag->insertamum);
 				if (isError($result))
 					$this->logError(getError($result));
 				else
@@ -316,7 +321,7 @@ class AntragJob extends JOB_Controller
 					'urlCIS' => $urlCIS,
 					'fristablauf' => $fristende->format('d.m.Y')
 				);
-				
+
 				// NOTE(chris): Sancho mail
 				if(sendSanchoMail('Sancho_Mail_Antrag_W_' . $name, $dataMail, $email, $subject))
 				{
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 190997c19..d02ce9012 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -137,26 +137,21 @@ class AntragLib
 				$errors[] = $this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]);
 				continue;
 			}
-			$status = getData($result)[0];
+			$antrag = getData($result)[0];
+
+			$insertam = date('c');
 
 			$result = $this->_ci->StudierendenantragstatusModel->insert([
 				'studierendenantrag_id' => $studierendenantrag_id,
 				'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
-				'insertvon' => $insertvon
+				'insertvon' => $insertvon,
+				'insertam' => $insertam
 			]);
 			if (isError($result))
 				$errors[] = getError($result);
 			else {
-				$resultPrestudent = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
-				if (isError($resultPrestudent))
+				if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG)
 				{
-					$errors[] = getError($resultPrestudent);
-					continue;
-				}
-				if ($status->typ == Studierendenantrag_model::TYP_ABMELDUNG)
-				{
-					$antrag = getData($resultPrestudent)[0];
-
 					$resultPrestudentStatus = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail($antrag->prestudent_id);
 					if (isError($resultPrestudentStatus))
 						$errors[] = getError($resultPrestudentStatus);
@@ -167,7 +162,7 @@ class AntragLib
 						$vorlage ='Sancho_Mail_Antrag_A_Approve';
 						$subject = $this->_ci->p->t('studierendenantrag', 'mail_subject_A_Approve');
 
-						$result = $this->_ci->prestudentlib->setAbbrecher($antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon);
+						$result = $this->_ci->prestudentlib->setAbbrecher($antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon, 'abbrecherStud', $antrag->datum, $insertam) ;
 						if (isError($result))
 						{
 							$errors[] = getError($result);
@@ -186,8 +181,35 @@ class AntragLib
 						sendSanchoMail($vorlage, $data, $prestudent_status->email, $subject);
 					}
 				}
-				if ($status->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL) {
-					$res = $this->_ci->PrestudentModel->load($status->prestudent_id);
+				if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL) {
+					$result = $this->_ci->PrestudentstatusModel->getLastStatus($antrag->prestudent_id, '', 'Student');
+					if (isError($result))
+					{
+						$errors[] = getError($result);
+						continue;
+					}
+					if(!hasData($result))
+					{
+						$errors[] = $this->_ci->p->t('studierendenantrag', 'error_no_prestudentstatus', ['prestudent_id' => $antrag->prestudent_id]);
+						continue;
+					}
+					$prestudentstatus = getData($result)[0];
+
+					$result = $this->_ci->PrestudentstatusModel->withGrund('preabbrecher')->update([
+						'prestudent_id' => $prestudentstatus->prestudent_id,
+						'status_kurzbz'=>$prestudentstatus->status_kurzbz,
+						'studiensemester_kurzbz'=>$prestudentstatus->studiensemester_kurzbz,
+						'ausbildungssemester'=>$prestudentstatus->ausbildungssemester
+					],[]);
+					if (isError($result))
+					{
+						$errors[] = getError($result);
+						continue;
+					}
+
+
+					$res = $this->_ci->PrestudentModel->load($antrag->prestudent_id);
+
 					if (hasData($res)) {
 						$prestudent = current(getData($res));
 						$res = $this->_ci->PersonModel->load($prestudent->person_id);
@@ -205,7 +227,7 @@ class AntragLib
 								'Sancho_Mail_Antrag_A_Stgl',
 								[
 									'name' => $name,
-									'grund' => $status->grund
+									'grund' => $antrag->grund
 								],
 								$email,
 								$this->_ci->p->t('studierendenantrag', 'mail_subject_A_Stgl')
@@ -857,7 +879,7 @@ class AntragLib
 			if (!hasData($result))
 				return error($this->_ci->p->t('studierendenantrag', 'error_no_stg', ['studiengang_kz' => $studiengang_kz]));
 			$stg = current(getData($result));
-			
+
 			if ($ausbildungssemester > $stg->max_semester)
 				return success();
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_studienplan', [
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 5024c6c22..bb1250a62 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -35,7 +35,7 @@ class PrestudentLib
 
 	}
 
-	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null)
+	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null)
 	{
 		if (!$insertvon)
 			$insertvon = getAuthUID();
@@ -62,24 +62,31 @@ class PrestudentLib
 
 		$student = current($result);
 
-		//Status updaten
-		$result = $this->_ci->PrestudentstatusModel->insert([
+		if(!$datum)
+			$datum = date('c');
+
+		if(!$bestaetigtam)
+			$bestaetigtam = date('c');
+
+		//Status und Statusgrund updaten
+		$result = $this->_ci->PrestudentstatusModel->withGrund($statusgrund_kurzbz)->insert([
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_ABBRECHER,
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'ausbildungssemester' => $prestudent_status->ausbildungssemester,
-			'datum' => date('c'),
+			'datum' => $datum,
 			'insertvon' => $insertvon,
 			'insertamum' => date('c'),
 			'orgform_kurzbz'=> $prestudent_status->orgform_kurzbz,
 			'studienplan_id'=> $prestudent_status->studienplan_id,
 			'bestaetigtvon' => $insertvon,
-			'bestaetigtam' => date('c')
+			'bestaetigtam' => $bestaetigtam
 		]);
 
 		if (isError($result))
 			return $result;
 
+
 		//Verband anlegen
 		$result = $this->_ci->LehrverbandModel->load([
 			'studiengang_kz' => $student->studiengang_kz,
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 620b897e6..ddf8d3a7a 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -316,4 +316,20 @@ class Prestudentstatus_model extends DB_Model
 
 		return $this->loadWhere($whereArr);
 	}
+
+	/**
+	 * call like this:
+	 * $this->PrestudentstatusModel->withGrund('grund_kurzbz')->update($id, $otherData);
+	 * or:
+	 * $this->PrestudentstatusModel->withGrund('grund_kurzbz')->insert($otherData);
+	 * @param string $statusgrund_kurzbz
+	 * @return object $this
+	 */
+	public function withGrund($statusgrund_kurzbz)
+	{
+		if($statusgrund_kurzbz)
+			$this->db->set('statusgrund_id', '(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz =' . $this->db->escape($statusgrund_kurzbz) .')', FALSE);
+
+		return $this;
+	}
 }
diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
index 1fbe56945..5041b86f5 100644
--- a/system/dbupdate_3.4/27351_digitalisierung_formulare.php
+++ b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
@@ -285,3 +285,42 @@ if (!$result = @$db->db_query("SELECT public.get_stdsem_prestudent(0, null)")) {
 	else
 		echo '<br>public.get_stdsem_prestudent(integer, character varying): function created';
 }
+
+if($result = @$db->db_query("SELECT 1 FROM public.tbl_status_grund WHERE statusgrund_kurzbz = 'abbrecherStgl';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO public.tbl_status_grund(statusgrund_kurzbz, status_kurzbz, aktiv, beschreibung, bezeichnung_mehrsprachig) VALUES('abbrecherStgl', 'Abbrecher', TRUE, '{\"durch Stgl\", \"by Course Director\"}', '{\"durch Stgl\", \"by Course Director\"}');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>public.tbl_status_grund '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' public.tbl_status_grund: Added Statusgrund abbrecherStgl for Abbrecher<br>';
+	}
+}
+
+if($result = @$db->db_query("SELECT 1 FROM public.tbl_status_grund WHERE statusgrund_kurzbz = 'abbrecherStud';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO public.tbl_status_grund(statusgrund_kurzbz, status_kurzbz, aktiv, beschreibung, bezeichnung_mehrsprachig) VALUES('abbrecherStud', 'Abbrecher', TRUE, '{\"durch Stud\", \"by Student\"}', '{\"durch Stud\", \"by Student\"}');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>public.tbl_status_grund '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' public.tbl_status_grund: Added Statusgrund abbrecherStud for Abbrecher<br>';
+	}
+}
+
+if($result = @$db->db_query("SELECT 1 FROM public.tbl_status_grund WHERE statusgrund_kurzbz = 'preabbrecher';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO public.tbl_status_grund(statusgrund_kurzbz, status_kurzbz, aktiv, beschreibung, bezeichnung_mehrsprachig) VALUES('preabbrecher', 'Student', TRUE, '{\"Pre-Abbrecher\", \"Pre-Aborted\"}', '{\"Pre-Abbrecher\", \"Pre-Aborted\"}');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>public.tbl_status_grund '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' public.tbl_status_grund: Added Statusgrund pre-abbrecher for Student<br>';
+	}
+}

From 3192a1b3f2ebd7f4717a90e16ac728a93e9a2698 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 12 Jul 2023 09:47:01 +0200
Subject: [PATCH 058/175] - job hinzugefuegt um bewerber status automatisch zu
 setzen - fas filter hinzugefugt

---
 include/prestudent.class.php   | 36 +++++++++++++++++++++++
 rdf/lehrverbandsgruppe.rdf.php | 52 ++++++++++++++++++++++++++++++++--
 rdf/student.rdf.php            |  2 +-
 3 files changed, 86 insertions(+), 4 deletions(-)

diff --git a/include/prestudent.class.php b/include/prestudent.class.php
index 13f3e5e00..557412413 100644
--- a/include/prestudent.class.php
+++ b/include/prestudent.class.php
@@ -870,6 +870,42 @@ class prestudent extends person
 							AND tbl_reihungstest.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
 					)";
 				break;
+			case "bewerberrtnichtangemeldet":
+				$qry.=" AND a.rolle='Bewerber'
+					AND NOT EXISTS (
+						SELECT
+							1
+						FROM
+							public.tbl_rt_person
+							JOIN public.tbl_reihungstest ON (rt_id = reihungstest_id)
+						WHERE
+							person_id=a.person_id
+							AND studienplan_id IN (
+								SELECT studienplan_id FROM lehre.tbl_studienplan
+								JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+								WHERE tbl_studienordnung.studiengang_kz=a.studiengang_kz
+							)
+							AND tbl_reihungstest.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
+					)";
+				break;
+			case "bewerberrtangemeldet":
+				$qry.=" AND a.rolle='Bewerber'
+					AND EXISTS (
+						SELECT
+							1
+						FROM
+							public.tbl_rt_person
+							JOIN public.tbl_reihungstest ON (rt_id = reihungstest_id)
+						WHERE
+							person_id=a.person_id
+							AND studienplan_id IN (
+								SELECT studienplan_id FROM lehre.tbl_studienplan
+								JOIN lehre.tbl_studienordnung USING(studienordnung_id)
+								WHERE tbl_studienordnung.studiengang_kz=a.studiengang_kz
+							)
+							AND tbl_reihungstest.studiensemester_kurzbz=".$this->db_add_param($studiensemester_kurzbz)."
+					)";
+				break;
 			case "zgv":
 				$stg_obj = new studiengang();
 				$stg_obj->load($studiengang_kz);
diff --git a/rdf/lehrverbandsgruppe.rdf.php b/rdf/lehrverbandsgruppe.rdf.php
index 20956d279..19affa245 100644
--- a/rdf/lehrverbandsgruppe.rdf.php
+++ b/rdf/lehrverbandsgruppe.rdf.php
@@ -290,6 +290,24 @@ function draw_orgformsubmenu($stg_kz, $orgform)
 						<VERBAND:typ>bewerber</VERBAND:typ>
 						<VERBAND:orgform><![CDATA['.$orgform.']]></VERBAND:orgform>
 					</RDF:Description>
+					
+					<RDF:Description RDF:about="'.$rdf_url.$stg_kurzbz.'/'.$orgform.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestnichtangemeldet" >
+						<VERBAND:name>Nicht zum Reihungstest angemeldet</VERBAND:name>
+						<VERBAND:stg><![CDATA['.$stg_kurzbz.']]></VERBAND:stg>
+						<VERBAND:stg_kz><![CDATA['.$stg_kz.']]></VERBAND:stg_kz>
+						<VERBAND:stsem><![CDATA['.$stsem->studiensemester_kurzbz.']]></VERBAND:stsem>
+						<VERBAND:typ>bewerberrtnichtangemeldet</VERBAND:typ>
+						<VERBAND:orgform><![CDATA['.$orgform.']]></VERBAND:orgform>
+					</RDF:Description>
+
+					<RDF:Description RDF:about="'.$rdf_url.$stg_kurzbz.'/'.$orgform.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestangemeldet" >
+						<VERBAND:name>Reihungstest angemeldet</VERBAND:name>
+						<VERBAND:stg><![CDATA['.$stg_kurzbz.']]></VERBAND:stg>
+						<VERBAND:stg_kz><![CDATA['.$stg_kz.']]></VERBAND:stg_kz>
+						<VERBAND:stsem><![CDATA['.$stsem->studiensemester_kurzbz.']]></VERBAND:stsem>
+						<VERBAND:typ>bewerberrtangemeldet</VERBAND:typ>
+						<VERBAND:orgform><![CDATA['.$orgform.']]></VERBAND:orgform>
+					</RDF:Description>
 
 					<RDF:Description RDF:about="'.$rdf_url.$stg_kurzbz.'/'.$orgform.'/'.$stsem->studiensemester_kurzbz.'/aufgenommen" >
 						<VERBAND:name>Aufgenommen</VERBAND:name>
@@ -344,8 +362,14 @@ function draw_orgformsubmenu($stg_kz, $orgform)
 			$orgform_sequence[$stg_kz].= "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/interessenten/reihungstestangemeldet\" />\n";
 			$orgform_sequence[$stg_kz].= "\t\t\t\t</RDF:Seq>";
 			$orgform_sequence[$stg_kz].= "\n\t\t\t</RDF:li>\n";
-
-			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber\" />\n";
+			
+			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li>";
+			$orgform_sequence[$stg_kz].= "\n\t\t\t\t<RDF:Seq RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber\">\n";
+			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestnichtangemeldet\" />\n";
+			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet\" />\n";
+			$orgform_sequence[$stg_kz].= "\t\t\t\t</RDF:Seq>";
+			$orgform_sequence[$stg_kz].= "\n\t\t\t</RDF:li>\n";
+			
 			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/aufgenommen\" />\n";
 			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/warteliste\" />\n";
 			$orgform_sequence[$stg_kz].= "\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$orgform/$stsem->studiensemester_kurzbz/absage\" />\n";
@@ -624,6 +648,22 @@ while ($row=$dbo->db_fetch_object())
 				<VERBAND:typ><![CDATA[bewerber]]></VERBAND:typ>
 			</RDF:Description>
 
+			<RDF:Description RDF:about="<?php echo $rdf_url.$stg_kurzbz.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestnichtangemeldet'; ?>" >
+				<VERBAND:name><![CDATA[Nicht zum Reihungstest angemeldet]]></VERBAND:name>
+				<VERBAND:stg><![CDATA[<?php echo $stg_kurzbz; ?>]]></VERBAND:stg>
+				<VERBAND:stg_kz><![CDATA[<?php echo $row->studiengang_kz; ?>]]></VERBAND:stg_kz>
+				<VERBAND:stsem><![CDATA[<?php echo $stsem->studiensemester_kurzbz; ?>]]></VERBAND:stsem>
+				<VERBAND:typ><![CDATA[bewerberrtnichtangemeldet]]></VERBAND:typ>
+			</RDF:Description>
+
+			<RDF:Description RDF:about="<?php echo $rdf_url.$stg_kurzbz.'/'.$stsem->studiensemester_kurzbz.'/bewerber/reihungstestangemeldet'; ?>" >
+				<VERBAND:name><![CDATA[Reihungstest angemeldet]]></VERBAND:name>
+				<VERBAND:stg><![CDATA[<?php echo $stg_kurzbz; ?>]]></VERBAND:stg>
+				<VERBAND:stg_kz><![CDATA[<?php echo $row->studiengang_kz; ?>]]></VERBAND:stg_kz>
+				<VERBAND:stsem><![CDATA[<?php echo $stsem->studiensemester_kurzbz; ?>]]></VERBAND:stsem>
+				<VERBAND:typ><![CDATA[bewerberrtangemeldet]]></VERBAND:typ>
+			</RDF:Description>
+
 			<RDF:Description RDF:about="<?php echo $rdf_url.$stg_kurzbz.'/'.$stsem->studiensemester_kurzbz.'/aufgenommen'; ?>" >
 				<VERBAND:name><![CDATA[Aufgenommen]]></VERBAND:name>
 				<VERBAND:stg><![CDATA[<?php echo $stg_kurzbz; ?>]]></VERBAND:stg>
@@ -832,8 +872,14 @@ draw_orgformpart($stg_kz);
 					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/interessenten/reihungstestangemeldet\" />\n";
 					echo "\t\t\t\t</RDF:Seq>";
 					echo "\n\t\t\t</RDF:li>\n";
+					
+					echo "\t\t\t<RDF:li>";
+					echo "\t\t\t\t<RDF:Seq RDF:about=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber\">\n";
+					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestnichtangemeldet\" />\n";
+					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber/reihungstestangemeldet\" />\n";
+					echo "\t\t\t\t</RDF:Seq>";
+					echo "\n\t\t\t</RDF:li>\n";
 
-					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/bewerber\" />\n";
 					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/aufgenommen\" />\n";
 					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/warteliste\" />\n";
 					echo "\t\t\t\t<RDF:li RDF:resource=\"$rdf_url$stg_kurzbz/$stsem->studiensemester_kurzbz/absage\" />\n";
diff --git a/rdf/student.rdf.php b/rdf/student.rdf.php
index 11e841c2b..1625f161c 100644
--- a/rdf/student.rdf.php
+++ b/rdf/student.rdf.php
@@ -737,7 +737,7 @@ if($xmlformat=='rdf')
 	}
 	elseif(in_array($typ, array('prestudent', 'interessenten', 'bewerber', 'aufgenommen',
 		'warteliste', 'absage', 'zgv', 'reihungstestangemeldet', 'reihungstestnichtangemeldet', 'absolvent',
-		'diplomand', 'bewerbungnichtabgeschickt', 'bewerbungabgeschickt', 'statusbestaetigt', 'statusbestaetigtrtnichtangemeldet', 'statusbestaetigtrtangemeldet')))
+		'diplomand', 'bewerbungnichtabgeschickt', 'bewerbungabgeschickt', 'statusbestaetigt', 'statusbestaetigtrtnichtangemeldet', 'statusbestaetigtrtangemeldet', 'bewerberrtangemeldet', 'bewerberrtnichtangemeldet')))
 	{
 		$prestd = new prestudent();
 

From f8da119ad78917de274dc7e11e12131592b02874 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 13 Jul 2023 11:48:25 +0200
Subject: [PATCH 059/175] Abmeldung: Einspruch Abgelehnt handling

---
 .../controllers/components/Antrag/Leitung.php |  2 +-
 application/controllers/jobs/AntragJob.php    |  1 -
 application/libraries/AntragLib.php           | 77 ++++++++++++++++++-
 .../Studierendenantragstatus_model.php        |  1 +
 .../27351_digitalisierung_formulare.php       |  5 +-
 system/phrasesupdate.php                      | 40 ++++++++++
 6 files changed, 121 insertions(+), 5 deletions(-)

diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
index 9df8fdb75..c107fbb63 100644
--- a/application/controllers/components/Antrag/Leitung.php
+++ b/application/controllers/components/Antrag/Leitung.php
@@ -145,7 +145,7 @@ class Leitung extends FHC_Controller
 
 		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
 
-		$result = $this->antraglib->approveAbmeldung([$studierendenantrag_id], getAuthUID());
+		$result = $this->antraglib->denyObjectionAbmeldung($studierendenantrag_id, getAuthUID());
 
 		if (isError($result))
 			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 39c2519af..ca4f06690 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -200,7 +200,6 @@ class AntragJob extends JOB_Controller
 
 			foreach ($antraege as $antrag)
 			{
-
 				$result = $this->prestudentlib->setAbbrecher($antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon, 'abbrecherStgl', $antrag->insertamum);
 				if (isError($result))
 					$this->logError(getError($result));
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index d02ce9012..c725c6ea9 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -145,7 +145,7 @@ class AntragLib
 				'studierendenantrag_id' => $studierendenantrag_id,
 				'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
 				'insertvon' => $insertvon,
-				'insertam' => $insertam
+				'insertamum' => $insertam
 			]);
 			if (isError($result))
 				$errors[] = getError($result);
@@ -244,6 +244,81 @@ class AntragLib
 		return success();
 	}
 
+	/**
+	 * @param integer		$studierendenantrag_id
+	 * @param string		$insertvon
+	 *
+	 * @return stdClass
+	 */
+	public function denyObjectionAbmeldung($studierendenantrag_id, $insertvon)
+	{
+		$result = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
+		if (isError($result))
+		{
+			return $result;
+		}
+		if(!hasData($result))
+		{
+			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
+		}
+		$antrag = getData($result)[0];
+
+		$result = $this->_ci->StudierendenantragstatusModel->loadWhere([
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED
+		]);
+		if (isError($result))
+			return $result;
+		if (!hasData($result))
+			return error($this->_ci->p->t('studierendenantrag', 'error_not_approved'));
+
+		$status = current(getData($result));
+
+		$result = $this->_ci->StudierendenantragstatusModel->insert([
+			'studierendenantrag_id' => $studierendenantrag_id,
+			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
+			'insertvon' => $insertvon
+		]);
+		if (isError($result))
+			return $result;
+		else {
+			$result = $this->_ci->prestudentlib->setAbbrecher($antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon, 'abbrecherStgl', $status->insertamum);
+
+			if (isError($result))
+				return $result;
+
+			$res = $this->_ci->PrestudentModel->load($antrag->prestudent_id);
+
+			if (hasData($res)) {
+				$prestudent = current(getData($res));
+				$res = $this->_ci->PersonModel->load($prestudent->person_id);
+				if (hasData($res)) {
+					$person = current(getData($res));
+					$name = trim($person->vorname . ' ' . $person->nachname);
+				} else {
+					$name = $this->_ci->p->t('person', 'studentIn');
+				}
+				$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
+				if (hasData($res)) {
+					$kontakt = current(getData($res));
+					$email = $kontakt->kontakt;
+					sendSanchoMail(
+						// TODO(chris): Vorlage erstellen
+						'Sancho_Mail_Antrag_A_ObjectionDenied',
+						[
+							'name' => $name,
+							'grund' => $antrag->grund
+						],
+						$email,
+						$this->_ci->p->t('studierendenantrag', 'mail_subject_A_ObjectionDenied')
+					);
+				}
+			}
+		}
+
+		return success();
+	}
+
 	/**
 	 * NOTE(chris): permissions & verification must be handled outside
 	 *
diff --git a/application/models/education/Studierendenantragstatus_model.php b/application/models/education/Studierendenantragstatus_model.php
index 8f737f458..5355ecdba 100644
--- a/application/models/education/Studierendenantragstatus_model.php
+++ b/application/models/education/Studierendenantragstatus_model.php
@@ -13,6 +13,7 @@ class Studierendenantragstatus_model extends DB_Model
 	const STATUS_REQUESTSENT_1 = 'ErsteAufforderungVersandt';
 	const STATUS_REQUESTSENT_2 = 'ZweiteAufforderungVersandt';
 	const STATUS_OBJECTED = 'Beeinsprucht';
+	const STATUS_OBJECTION_DENIED = 'EinspruchAbgelehnt';
 
 	/**
 	 * Constructor
diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
index 5041b86f5..341b34b67 100644
--- a/system/dbupdate_3.4/27351_digitalisierung_formulare.php
+++ b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
@@ -28,15 +28,16 @@ if($result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statust
 			VALUES
 			('Erstellt', '{\"Erstellt\",\"Created\"}'),
 			('Genehmigt', '{\"Genehmigt\",\"Approved\"}'),
-			('Beeinsprucht', '{\"Beeinsprucht\",\"Objected\"}'),
 			('Abgelehnt', '{\"Abgelehnt\",\"Rejected\"}'),
 			('Verzichtet', '{\"Verzichtet\",\"Pass\"}'),
 			('Offen', '{\"Offen\",\"Reopened\"}'),
 			('Zurückgezogen', '{\"Zurückgezogen\",\"Cancelled\"}'),
+			('Lvszugewiesen', '{\"Lvszugewiesen\",\"Lvsassigned\"}'),
 			('EmailVersandt', '{\"Email Versandt\",\"Reminder Sent\"}'),
 			('ErsteAufforderungVersandt', '{\"1.Aufforderung Versandt\",\"1st Request Sent\"}'),
 			('ZweiteAufforderungVersandt', '{\"2.Aufforderung Versandt\",\"2nd Request Sent\"}'),
-			('Lvszugewiesen', '{\"Lvszugewiesen\",\"Lvsassigned\"}');
+			('Beeinsprucht', '{\"Beeinsprucht\",\"Objected\"}'),
+			('EinspruchAbgelehnt', '{\"Einspruch abgelehnt\",\"Objection denied\"}');
 			";
 		if (!$db->db_query($qry))
 			echo '<strong>campus.tbl_studierendenantrag_statustyp (insert): '.$db->db_last_error().'</strong><br>';
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 155ef3217..18a61f1d1 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20106,6 +20106,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_not_approved',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Antrag ist nicht bestätigt worden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Application is not approved',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -20426,6 +20446,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_subject_A_ObjectionDenied',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ihr Einspruch wurde Abgelehnt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Your objection was denied',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From c8fc6c747ffea3803de12716469e593378c925ae Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 13 Jul 2023 13:57:17 +0200
Subject: [PATCH 060/175] Table height & Bug: Allowed/Shown Stgs in Component

---
 .../controllers/components/Antrag/Leitung.php | 44 +++++++++++++++++++
 .../controllers/lehre/Studierendenantrag.php  |  4 +-
 .../models/organisation/Studiengang_model.php | 14 ++++++
 .../components/Studierendenantrag/Leitung.js  | 39 ++++++++--------
 .../Studierendenantrag/Leitung/Table.js       |  2 +-
 5 files changed, 80 insertions(+), 23 deletions(-)

diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
index c107fbb63..54e5b65e6 100644
--- a/application/controllers/components/Antrag/Leitung.php
+++ b/application/controllers/components/Antrag/Leitung.php
@@ -29,6 +29,50 @@ class Leitung extends FHC_Controller
 	//------------------------------------------------------------------------------------------------------------------
 	// Public methods
 
+	public function getActiveStgs()
+	{
+		$studiengaenge = $this->permissionlib->getSTG_isEntitledFor('student/antragfreigabe');
+		$stgsNeuanlage = $this->permissionlib->getSTG_isEntitledFor('student/studierendenantrag');
+
+		$stgs = [];
+
+		if ($studiengaenge) {
+			$result = $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
+
+			if (isError($result))
+				return $this->outputJson($result);
+			$antraege = getData($result) ?: [];
+
+			foreach ($antraege as $antrag) {
+				if (!isset($stgs[$antrag->studiengang_kz])) {
+					$stgs[$antrag->studiengang_kz] = new stdClass();
+					$stgs[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
+					$stgs[$antrag->studiengang_kz]->orgform = $antrag->orgform;
+					$stgs[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
+				}
+			}
+		}
+
+		if ($stgsNeuanlage) {
+			$result = $this->StudierendenantragModel->loadForStudiengaenge($stgsNeuanlage);
+
+			if (isError($result))
+				return $this->outputJson($result);
+			$antraege = getData($result) ?: [];
+
+			foreach ($antraege as $antrag) {
+				if (!isset($stgs[$antrag->studiengang_kz])) {
+					$stgs[$antrag->studiengang_kz] = new stdClass();
+					$stgs[$antrag->studiengang_kz]->bezeichnung = $antrag->bezeichnung;
+					$stgs[$antrag->studiengang_kz]->orgform = $antrag->orgform;
+					$stgs[$antrag->studiengang_kz]->studiengang_kz = $antrag->studiengang_kz;
+				}
+			}
+		}
+
+		$this->outputJsonSuccess($stgs);
+	}
+
 	public function getAntraege($studiengang = null)
 	{
 
diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
index f27350e9a..c0ac284b3 100644
--- a/application/controllers/lehre/Studierendenantrag.php
+++ b/application/controllers/lehre/Studierendenantrag.php
@@ -82,7 +82,7 @@ class Studierendenantrag extends FHC_Controller
 
 		$stgL = [];
 		if ($studiengaenge) {
-			$result = $this->StudierendenantragModel->loadForStudiengaenge($studiengaenge);
+			$result = $this->StudiengangModel->loadWithOrgform($studiengaenge);
 			if (isError($result))
 				return show_error(getError($result));
 			$antraege = getData($result) ?: [];
@@ -99,7 +99,7 @@ class Studierendenantrag extends FHC_Controller
 
 		$stgA = [];
 		if ($stgsNeuanlage) {
-			$result = $this->StudierendenantragModel->loadForStudiengaenge($stgsNeuanlage);
+			$result = $this->StudiengangModel->loadWithOrgform($stgsNeuanlage);
 			if (isError($result))
 				return show_error(getError($result));
 			$antraege = getData($result) ?: [];
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 0d2328b14..1fb733d04 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -525,6 +525,20 @@ class Studiengang_model extends DB_Model
 		return $this->execQuery($query, $params);
 	}
 
+	public function loadWithOrgform($studiengang_kzs)
+	{
+		$sql = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
+
+		$this->addSelect($this->dbTable . '.*');
+		$this->addSelect('o.bezeichnung_mehrsprachig[(' . $sql . ')] AS orgform');
+		
+		$this->addJoin('bis.tbl_orgform o', 'orgform_kurzbz');
+
+		$this->db->where_in($this->dbTable . '.studiengang_kz', $studiengang_kzs);
+
+		return $this->load();
+	}
+
 	/**
 	 * @param array		$studiengang_kzs
 	 * @param array		$not_antrag_typ		(optional) If the prestudent has an antrag with one of the specified types it will be excluded from the result
diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index f08da3879..ba7af0a2c 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -23,45 +23,41 @@ export default {
 		return {
 			filter: undefined,
 			selectedData: [],
-			columns: []
+			columns: [],
+			stgs: []
 		}
 	},
 	computed: {
-		stgs(){
-			if(!this.stgL || !this.stgA)
-				return[];
-			let undesiredOutput = [...this.stgL, ...this.stgA];
-			let desiredOutput = undesiredOutput.reduce(
-				(accumulator, currentValue)=>
-				{
-					accumulator[currentValue.studiengang_kz] = currentValue;
-					return accumulator;
-				},
-				{}
-			);
-			return Object.values(desiredOutput);
-
-		},
-		stgkzL()
-		{
+		stgkzL() {
 			if (!this.stgL)
 				return [];
 			return this.stgL.map(stg => stg.studiengang_kz);
 		},
-		stgkzA()
-		{
+		stgkzA() {
 			if (!this.stgA)
 				return [];
 			return this.stgA.map(stg => stg.studiengang_kz);
 		}
 	},
 	methods: {
+		loadFilter() {
+			axios.get(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Leitung/getActiveStgs'
+			).then(result => {
+				this.stgs = Object.values(result.data.retval).sort((a,b) => a.bezeichnung == b.bezeichnung ? (a.orgform == b.orgform ? 0 : (a.orgform > b.orgform ? 1 : -1)) : (a.bezeichnung > b.bezeichnung ? 1 : -1));
+			}).catch(error => {
+				console.error(error);
+			});
+		},
 		changeFilter(evt) {
 			this.filter = evt.target.value || undefined;
 			this.reload();
 		},
 		reload() {
 			this.$refs.table.reload(this.filter);
+			this.loadFilter();
 		},
 		download() {
 			this.$refs.table.download();
@@ -270,6 +266,9 @@ export default {
 			BsAlert.popup(msg, {dialogClass: 'alert alert-danger'});
 		}
 	},
+	created() {
+		this.loadFilter();
+	},
 	template: `
 	<div class="studierendenantrag-leitung fhc-table">
 		<leitung-header
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 01c473f91..7cc83e0ea 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -84,7 +84,7 @@ export default {
 		this.table = new Tabulator(this.$refs.table, {
 			placeholder:"Keine zu bearbeitenden Datensätze",
 			movableColumns: true,
-			maxHeight: '50vh',
+			height: '50vh',
 			layout: "fitDataStretch", // TODO(chris): wont work when changed
 			ajaxURL: this.ajaxUrl,
 			persistence: { // NOTE(chris): do not store column titles

From 9d0801676d0d64e9f7602142f92a315b8a2ba494 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 13 Jul 2023 14:44:51 +0200
Subject: [PATCH 061/175] Bug: Studierenden-Ansicht: Abmeldung bearbeiten bei
 mehrfachen Abmeldungen

---
 .../controllers/components/Antrag/Abmeldung.php     | 10 +++++++---
 application/libraries/AntragLib.php                 |  8 ++++++--
 .../components/Studierendenantrag/Form/Abmeldung.js | 13 ++++++++++---
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/application/controllers/components/Antrag/Abmeldung.php b/application/controllers/components/Antrag/Abmeldung.php
index 8c728c804..55435c1f6 100644
--- a/application/controllers/components/Antrag/Abmeldung.php
+++ b/application/controllers/components/Antrag/Abmeldung.php
@@ -57,13 +57,17 @@ class Abmeldung extends FHC_Controller
 		}
 		elseif ($result == -1)
 		{
-			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, Studierendenantrag_model::TYP_ABMELDUNG);
+			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, [Studierendenantrag_model::TYP_ABMELDUNG, Studierendenantrag_model::TYP_ABMELDUNG_STGL]);
 			if (isError($result)) {
 				return $this->outputJsonError(getError($result));
 			}
 
 			$data = getData($result);
-			$data->canCancel = (boolean)$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id);
+			
+			$data->canCancel = (
+				$data->status == Studierendenantragstatus_model::STATUS_CREATED &&
+				$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id)
+			);
 
 			return $this->outputJsonSuccess($data);
 		}
@@ -87,7 +91,7 @@ class Abmeldung extends FHC_Controller
 
 		$data = getData($result);
 
-		if ($data->typ !== Studierendenantrag_model::TYP_ABMELDUNG_STGL)
+		if ($data->typ !== Studierendenantrag_model::TYP_ABMELDUNG_STGL && $data->typ !== Studierendenantrag_model::TYP_ABMELDUNG)
 			return show_404();
 
 		$this->outputJsonSuccess($data);
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index c725c6ea9..bda165e0f 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1204,8 +1204,12 @@ class AntragLib
 		$where = [
 			'prestudent_id' => $prestudent_id
 		];
-		if ($typ)
-			$where['typ'] = $typ;
+		if ($typ) {
+			if (is_array($typ))
+				$this->_ci->StudierendenantragModel->db->where_in('typ', $typ);
+			else
+				$where['typ'] = $typ;
+		}
 		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere($where);
 		if (isError($result))
 			return $result;
diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js
index 0de6e3d16..7018237fb 100644
--- a/public/js/components/Studierendenantrag/Form/Abmeldung.js
+++ b/public/js/components/Studierendenantrag/Form/Abmeldung.js
@@ -15,7 +15,8 @@ export default {
 		'setStatus'
 	],
 	props: {
-		prestudentId: Number
+		prestudentId: Number,
+		studierendenantragId: Number
 	},
 	data() {
 		return {
@@ -35,6 +36,13 @@ export default {
 				case 'Genehmigt': return 'success';
 				default: return 'info';
 			}
+		},
+		loadUrl() {
+			if (this.studierendenantragId)
+				return '/components/Antrag/Abmeldung/getDetailsForAntrag/'+
+				this.studierendenantragId;
+			return '/components/Antrag/Abmeldung/getDetailsForNewAntrag/' +
+				this.prestudentId;
 		}
 	},
 	methods: {
@@ -42,8 +50,7 @@ export default {
 			return axios.get(
 				FHC_JS_DATA_STORAGE_OBJECT.app_root +
 				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-				'/components/Antrag/Abmeldung/getDetailsForNewAntrag/' +
-				this.prestudentId
+				this.loadUrl
 			).then(
 				result => {
 					this.data = result.data.retval;

From b04aefc105bc922c219099052f976ec0fc8a1765 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 13 Jul 2023 16:13:40 +0200
Subject: [PATCH 062/175] =?UTF-8?q?Unterbrechung=20nur=20f=C3=BCr=20das=20?=
 =?UTF-8?q?Aktuelle=20und=20kommende=20Semester?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/libraries/AntragLib.php           | 45 ++++++++++---------
 .../organisation/Studiensemester_model.php    | 30 -------------
 .../Studierendenantrag/Form/Unterbrechung.js  | 37 ++++++++-------
 3 files changed, 42 insertions(+), 70 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index bda165e0f..6e05380a5 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1279,35 +1279,38 @@ class AntragLib
 		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
+		$semester = [];
+
 		$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester);
 		if (!hasData($result))
-			return [];
+			return $semester;
 
-		$studienplaene = getData($result);
-		$studienplan_ids = array_map(function ($studienplan) {
-			return $studienplan->studienplan_id;
-		}, $studienplaene);
-
-		$result = $this->_ci->StudiensemesterModel->getFollowingSemester($studienplan_ids, $studiensemester_kurzbz, $ausbildungssemester);
+		$result = $this->_ci->StudiensemesterModel->getNextFrom($studiensemester_kurzbz);
 		if (!hasData($result))
-			return [];
+			return $semester;
+		$nextSem = current(getData($result));
 
-		$stsems = getData($result);
+		$semester[] = [
+			'studiensemester_kurzbz' => $studiensemester_kurzbz,
+			'wiedereinstieg' => $nextSem->start
+		];
 
-		$result = $this->_ci->StudiensemesterModel->loadWhere();
+		$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $nextSem->studiensemester_kurzbz, $ausbildungssemester+1);
 		if (!hasData($result))
-			return [];
-		$result = getData($result);
-		usort($result, function($a, $b) {
-			return $a->start > $b->start ? 1 : -1;
-		});
-		foreach ($stsems as $stsem) {
-			$stsem->wiedereinstieg = array_filter($result, function ($sem) use ($stsem) {
-				return $sem->start > $stsem->ende;
-			});
-		}
+			return $semester;
 
-		return $stsems;
+		$result = $this->_ci->StudiensemesterModel->getNextFrom($nextSem->studiensemester_kurzbz);
+		if (!hasData($result))
+			return $semester;
+
+		$semAfterNext = current(getData($result));
+
+		$semester[] = [
+			'studiensemester_kurzbz' => $nextSem->studiensemester_kurzbz,
+			'wiedereinstieg' => $semAfterNext->start
+		];
+
+		return $semester;
 	}
 
 	public function getAktivePrestudentenInStgs($studiengaenge, $query)
diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index 6daa76b59..bb9b94c92 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -204,34 +204,4 @@ class Studiensemester_model extends DB_Model
 
 		return $this->execQuery($query, array($studiensemester_kurzbz));
 	}
-
-	public function getFollowingSemester($studienplan_ids, $studiensemester_kurzbz, $ausbildungssemester)
-	{
-		$query = '
-			WITH RECURSIVE following(studiensemester_kurzbz, semester, start) AS (
-				SELECT studiensemester_kurzbz, ?, start
-				FROM public.tbl_studiensemester
-				WHERE studiensemester_kurzbz=?
-			UNION ALL
-				SELECT * FROM (
-					SELECT s.studiensemester_kurzbz, s.semester, ss.start
-					FROM lehre.tbl_studienplan_semester s
-					JOIN public.tbl_studiensemester ss USING(studiensemester_kurzbz)
-					INNER JOIN following a ON(s.semester=a.semester+1 AND ss.start > a.start)
-					WHERE studienplan_id IN ?
-					ORDER BY start ASC
-					LIMIT 1
-				) wrapper
-			)
-			SELECT sem.*, following.semester
-			FROM following
-			LEFT JOIN ' . $this->dbTable . ' sem USING(studiensemester_kurzbz)
-			ORDER BY start';
-
-		return $this->execQuery($query, [
-			$ausbildungssemester,
-			$studiensemester_kurzbz,
-			$studienplan_ids
-		]);
-	}
 }
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index 2034361bc..e1322067f 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -53,9 +53,18 @@ export default {
 				this.prestudentId;
 		},
 		datumWsFormatted() {
-			if(!this.data.datum_wiedereinstieg)
-				return '';
-			let datum = new Date(this.data.datum_wiedereinstieg);
+			let datumUnformatted = '';
+
+			if (this.studierendenantragId) {
+				if (this.data.datum_wiedereinstieg)
+					datumUnformatted = this.data.datum_wiedereinstieg;
+			} else {
+				if (this.stsem !== null && this.data.studiensemester[this.stsem].wiedereinstieg)
+					datumUnformatted = this.data.studiensemester[this.stsem].wiedereinstieg;
+			}
+			if (datumUnformatted === '')
+				return datumUnformatted;
+			let datum = new Date(datumUnformatted);
 			return datum.toLocaleDateString();
 		}
 	},
@@ -93,7 +102,7 @@ export default {
 			formData.append("studiensemester", this.stsem !== null && this.data.studiensemester[this.stsem].studiensemester_kurzbz);
 			formData.append("prestudent_id", this.data.prestudent_id);
 			formData.append("grund", this.$refs.grund.value);
-			formData.append("datum_wiedereinstieg", this.$refs.datum_wiedereinstieg && this.$refs.datum_wiedereinstieg.value);
+			formData.append("datum_wiedereinstieg", this.stsem !== null && this.data.studiensemester[this.stsem].wiedereinstieg);
 
 			axios.post(
 				FHC_JS_DATA_STORAGE_OBJECT.app_root +
@@ -267,21 +276,11 @@ export default {
 					<div v-if="data.studierendenantrag_id">
 						{{datumWsFormatted}}
 					</div>
-					<div v-else>
-						<select v-if="stsem === null" class="form-select" disabled>
-							<option value="" disabled selected>
-								{{p.t('ui/select_studiensemester')}}
-							</option>
-						</select>
-						<select v-else ref="datum_wiedereinstieg" class="form-select">
-							<option
-								v-for="sem in data.studiensemester[stsem].wiedereinstieg"
-								:key="sem.studiensemester_kurzbz"
-								:value="sem.start"
-							>
-								{{sem.studiensemester_kurzbz}}
-							</option>
-						</select>
+					<div v-else-if="stsem === null" class="form-control">
+						{{p.t('ui/select_studiensemester')}}
+					</div>
+					<div v-else class="form-control">
+						{{datumWsFormatted}}
 					</div>
 
 					<div v-if="errors.datum_wiedereinstieg.length" class="invalid-feedback d-block">

From a53ca81784deea0b6b63e5f051cccf3486d24cff Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 13 Jul 2023 16:51:14 +0200
Subject: [PATCH 063/175] =?UTF-8?q?Wording=20=C3=84nderung=20bei=20Studier?=
 =?UTF-8?q?endenansicht=20Wiederholung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/phrasesupdate.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 18a61f1d1..e3bee6643 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18351,13 +18351,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ich werde das Studienjahr nicht wiederholen',
+				'text' => 'Ich werde das Studienjahr nicht wiederholen und Abbrechen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'I will not repeat the academic year',
+				'text' => 'I will not repeat the academic year and will drop out',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From a96d99bcd15f8f085675dd439a64cb867ca3aba3 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 13 Jul 2023 16:51:54 +0200
Subject: [PATCH 064/175] Sammelmails: draft

---
 application/controllers/jobs/AntragJob.php | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index ca4f06690..61c3a2eaa 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -28,6 +28,18 @@ class AntragJob extends JOB_Controller
 		$this->load->model('crm/Student_model', 'StudentModel');
 	}
 
+	/**
+	 * Send infomail to Stgl
+	 */
+	public function sendStglSammelmail()
+	{
+		// TODO(chris): get all Abmeldung:Created, Unterbrechung:Created, Wiederholung:LvZugeordnet
+		// TODO(chris): get stgs for all these
+		// TODO(chris): get stgls for all these
+		// TODO(chris): sort antraege in stgls
+		// TODO(chris): send email
+	}
+
 	/**
 	 * Send reminder to Assistant for Wiedereinstieg Unterbrecher
 	 *

From 68fbc13a691c6f791f72faa711f128d9682e2204 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Sat, 15 Jul 2023 19:57:51 +0200
Subject: [PATCH 065/175] added first version of uhstat1 form, added unique
 constraint for person_id in uhstat1daten table, added permissions for
 uhstat1daten sequence

---
 application/controllers/codex/UHSTAT1.php     | 301 ++++++++++++++++++
 application/models/codex/Abschluss_model.php  |  28 ++
 .../models/codex/Uhstat1daten_model.php       |  14 +
 application/views/codex/uhstat1.php           | 217 +++++++++++++
 ...uhstat1_daten_ueber_das_bewerbungstool.php |   6 +-
 5 files changed, 565 insertions(+), 1 deletion(-)
 create mode 100644 application/controllers/codex/UHSTAT1.php
 create mode 100644 application/models/codex/Abschluss_model.php
 create mode 100644 application/models/codex/Uhstat1daten_model.php
 create mode 100644 application/views/codex/uhstat1.php

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
new file mode 100644
index 000000000..071368aae
--- /dev/null
+++ b/application/controllers/codex/UHSTAT1.php
@@ -0,0 +1,301 @@
+<?php
+
+if (! defined("BASEPATH")) exit("No direct script access allowed");
+
+class UHSTAT1 extends FHC_Controller
+{
+	const CODEX_OESTERREICH = 'A';
+	const LOWER_BOUNDARY_YEARS = 160;
+	const UPPER_BOUNDARY_YEARS = 20;
+
+	public function __construct()
+	{
+		parent::__construct(
+			array(
+				'index' => 'admin:r',
+				'saveUHSTAT1Data' => 'admin:rw'
+			)
+		);
+
+		// load ci libs
+		$this->load->library('form_validation');
+
+		// load ci helpers
+		$this->load->helper(array('form', 'url'));
+
+		// load models
+		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$this->load->model('codex/Abschluss_model', 'AbschlussModel');
+		$this->load->model('codex/Uhstat1daten_model', 'Uhstat1datenModel');
+
+		$this->loadPhrases(
+			array(
+				'ui',
+				'uhstat'
+			)
+		);
+	}
+
+	public function index()
+	{
+		$formData = $this->_getFormData();
+
+		if (!hasData($formData)) show_error("No form data could be loaded");
+
+		$this->load->view("codex/uhstat1.php", array('formData' => getData($formData)));
+	}
+
+	/**
+	 * Add or update UHSTAT1 data
+	 */
+	public function saveUHSTAT1Data()
+	{
+		$person_id = $this->input->get('person_id');
+
+		if (!isset($person_id) || !is_numeric($person_id)) show_error("Person Id missing");
+
+		$this->form_validation->set_error_delimiters('<span class="text-danger">', '</span>');
+
+		// check required fields
+		$this->form_validation->set_rules('geburtsstaat', 'Geburtsstaat', 'required', array('required' => $this->p->t('uhstat', 'feldFehlt')));
+		$this->form_validation->set_rules(
+			'mutter_geburtsstaat',
+			'Geburtsstaat Mutter',
+			'required',
+			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+		);
+		$this->form_validation->set_rules(
+			'mutter_bildungsstaat',
+			'Bildungsstaat Mutter',
+			'required',
+			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+		);
+		$this->form_validation->set_rules(
+			'mutter_geburtsjahr',
+			'Geburtsjahr Mutter',
+			'required',
+			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+		);
+		$this->form_validation->set_rules(
+			'mutter_bildungmax',
+			'Höchste Ausbildung Mutter',
+			'required|callback_bildungsstaat_bildungmax_check[m]',
+			array(
+				'required' => $this->p->t('uhstat', 'feldFehlt'),
+				'bildungsstaat_bildungmax_check' => $this->p->t('uhstat', 'ausbildungBildungsstaatUebereinstimmung')
+				//'Land der höchsten Ausbildung muss mit Bildungsstaat übereinstimmen'
+				// Bildungsstaat should correspond to state of bildung max
+			)
+		);
+		$this->form_validation->set_rules(
+			'vater_geburtsstaat',
+			'Geburtsstaat Vater',
+			'required',
+			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+		);
+		$this->form_validation->set_rules(
+			'vater_bildungsstaat',
+			'Bildungsstaat Vater',
+			'required',
+			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+		);
+		$this->form_validation->set_rules(
+			'vater_geburtsjahr',
+			'Geburtsjahr Vater',
+			'required',
+			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+		);
+		$this->form_validation->set_rules(
+			'vater_bildungmax',
+			'Höchste Ausbildung Vater',
+			'required|callback_bildungsstaat_bildungmax_check[v]',
+			array(
+				'required' => $this->p->t('uhstat', 'feldFehlt'),
+				'bildungsstaat_bildungmax_check' => $this->p->t('uhstat', 'ausbildungBildungsstaatUebereinstimmung')
+			)
+		);
+
+		$uhstat1datenRes = null;
+		if ($this->form_validation->run()) // if valid
+		{
+			// get post fields
+			$geburtsstaat = $this->input->post('geburtsstaat');
+			$mutter_geburtsstaat = $this->input->post('mutter_geburtsstaat');
+			$mutter_geburtsjahr = $this->input->post('mutter_geburtsjahr');
+			$mutter_bildungsstaat = $this->input->post('mutter_bildungsstaat');
+			$mutter_bildungmax = $this->input->post('mutter_bildungmax');
+			$vater_geburtsstaat = $this->input->post('vater_geburtsstaat');
+			$vater_geburtsjahr = $this->input->post('vater_geburtsjahr');
+			$vater_bildungsstaat = $this->input->post('vater_bildungsstaat');
+			$vater_bildungmax = $this->input->post('vater_bildungmax');
+
+			$uhstat1datenloadRes = $this->Uhstat1datenModel->loadWhere(array('person_id' => $person_id));
+
+			if (hasData($uhstat1datenloadRes))
+			{
+				$uhstat1datenRes = $this->Uhstat1datenModel->update(
+					array('person_id' => $person_id),
+					array(
+						'geburtsstaat' => $geburtsstaat,
+						'mutter_geburtsstaat' => $mutter_geburtsstaat,
+						'mutter_geburtsjahr' => $mutter_geburtsjahr,
+						'mutter_bildungsstaat' => $mutter_bildungsstaat,
+						'mutter_bildungmax' => $mutter_bildungmax,
+						'vater_geburtsstaat' => $vater_geburtsstaat,
+						'vater_geburtsjahr' => $vater_geburtsjahr,
+						'vater_bildungsstaat' => $vater_bildungsstaat,
+						'vater_bildungmax' => $vater_bildungmax
+					)
+				);
+			}
+			else
+			{
+				$uhstat1datenRes = $this->Uhstat1datenModel->insert(
+					array(
+						'geburtsstaat' => $geburtsstaat,
+						'mutter_geburtsstaat' => $mutter_geburtsstaat,
+						'mutter_geburtsjahr' => $mutter_geburtsjahr,
+						'mutter_bildungsstaat' => $mutter_bildungsstaat,
+						'mutter_bildungmax' => $mutter_bildungmax,
+						'vater_geburtsstaat' => $vater_geburtsstaat,
+						'vater_geburtsjahr' => $vater_geburtsjahr,
+						'vater_bildungsstaat' => $vater_bildungsstaat,
+						'vater_bildungmax' => $vater_bildungmax,
+						'person_id' =>$person_id
+					)
+				);
+			}
+		}
+
+		$formData = $this->_getFormData();
+
+		if (!hasData($formData)) show_error("No data found");
+
+		// pass success/error messages to view
+		$successMessage = isset($uhstat1datenRes) && isSuccess($uhstat1datenRes) ? $this->p->t('uhstat', 'erfolgreichGespeichert') : '';
+		$errorMessage = isset($uhstat1datenRes) && isError($uhstat1datenRes) ? $this->p->t('uhstat', 'fehlerBeimSpeichern') : '';
+
+		// load view with form data
+		$this->load->view("codex/uhstat1.php", array(
+			'formData' => getData($formData),
+			'successMessage' => $successMessage,
+			'errorMessage' => $errorMessage
+		));
+	}
+
+	/**
+	 * Check callback for Bildungsstaat - if Bildungsstaat is Austria, a highest education should be in Austria.
+	 * @param $bildungmax
+	 * @param $bildungsstaat_typ - mother (m) or father (v)
+	 * @return bool true if valid, false otherwise
+	 */
+	public function bildungsstaat_bildungmax_check($bildungmax, $bildungsstaat_typ)
+	{
+		// valid if no type passed
+		if (!isset($bildungsstaat_typ)) return true;
+
+		// get correct input
+		if ($bildungsstaat_typ == 'm') // mutter
+			$bildungsstaat = $this->input->post('mutter_bildungsstaat');
+		elseif ($bildungsstaat_typ == 'v') // vater
+			$bildungsstaat = $this->input->post('vater_bildungsstaat');
+		else
+			return true;
+
+		if (!isset($bildungsstaat)) return true;
+
+		// find out if abschluss is in Austria
+		$this->AbschlussModel->addSelect("in_oesterreich");
+		$abschlussRes = $this->AbschlussModel->load($bildungmax);
+
+		if (hasData($abschlussRes))
+		{
+			$in_oesterreich = getData($abschlussRes)[0]->in_oesterreich;
+			// invalid if abschluss in Austria, but not Bildungsstaat, or abschluss not in Austria, but Bildungsstaat in Austria
+			return ($in_oesterreich && $bildungsstaat == self::CODEX_OESTERREICH) || (!$in_oesterreich && $bildungsstaat != self::CODEX_OESTERREICH);
+		}
+
+		return false;
+	}
+
+	/**
+	 * Gets initial data needed to display UHSTAT1 form.
+	 */
+	private function _getFormData()
+	{
+		$person_id = $this->input->get('person_id');
+
+		if (!isset($person_id) || !is_numeric($person_id)) return error("Person Id missing");
+
+		$formData = array(
+			'nation' => array(),
+			'abschluss_oesterreich' => array(),
+			'abschluss_nicht_oesterreich' => array(),
+			'jahre' => array(),
+			'languageIdx' => $this->_getLanguageIndex(),
+			'person_id' => $person_id
+		);
+
+		$nationTextFieldName = $formData['languageIdx'] == 1 ? 'langtext' : 'engltext';
+
+		// get nation list
+		$this->load->model('codex/Nation_model', 'NationModel');
+
+		$this->NationModel->addSelect("nation_code, $nationTextFieldName AS nation_text");
+		$this->NationModel->addOrder("nation_text");
+		$nationRes = $this->NationModel->load();
+
+		if (isError($nationRes)) return $nationRes;
+
+		if (hasData($nationRes)) $formData['nation'] = getData($nationRes);
+
+		// get abschluss list
+		$abschlussRes = $this->AbschlussModel->getActiveAbschluesse();
+
+		if (isError($abschlussRes)) return $abschlussRes;
+
+		$abschlussData = getData($abschlussRes);
+
+		if (hasData($abschlussRes))
+		{
+			foreach (getData($abschlussRes) as $abschluss)
+			{
+				if ($abschluss->in_oesterreich === true)
+					$formData['abschluss_oesterreich'][] = $abschluss;
+				elseif ($abschluss->in_oesterreich === false)
+					$formData['abschluss_nicht_oesterreich'][] = $abschluss;
+				else
+				{
+					$formData['abschluss_oesterreich'][] = $abschluss;
+					$formData['abschluss_nicht_oesterreich'][] = $abschluss;
+				}
+			}
+		}
+
+		// get realistic birth years, dated back from current year
+		$currYear = date("Y");
+		$formData['jahre'] = range($currYear - self::UPPER_BOUNDARY_YEARS, $currYear - self::LOWER_BOUNDARY_YEARS);
+
+		return success($formData);
+	}
+
+	/**
+	 * Gets language index of currently logged in user.
+	 * @return int (the index, start at 1)
+	 */
+	private function _getLanguageIndex()
+	{
+		$idx = 1;
+		$this->SpracheModel->addSelect('index');
+		$langRes = $this->SpracheModel->loadWhere(array('sprache' => getUserLanguage()));
+
+		if (hasData($langRes))
+		{
+			$idx = getData($langRes)[0]->index;
+		}
+
+		return $idx;
+	}
+}
diff --git a/application/models/codex/Abschluss_model.php b/application/models/codex/Abschluss_model.php
new file mode 100644
index 000000000..93b940ed2
--- /dev/null
+++ b/application/models/codex/Abschluss_model.php
@@ -0,0 +1,28 @@
+<?php
+class Abschluss_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_abschluss';
+		$this->pk = 'ausbildung_code';
+	}
+
+	public function getActiveAbschluesse()
+	{
+		return $this->execQuery(
+			'
+				SELECT
+					ausbildung_code, bezeichnung, in_oesterreich
+				FROM
+					bis.tbl_abschluss
+				WHERE
+					aktiv
+				ORDER BY CASE WHEN in_oesterreich THEN 0 ELSE 1 END, ausbildung_code'
+		);
+	}
+}
diff --git a/application/models/codex/Uhstat1daten_model.php b/application/models/codex/Uhstat1daten_model.php
new file mode 100644
index 000000000..9bca44b58
--- /dev/null
+++ b/application/models/codex/Uhstat1daten_model.php
@@ -0,0 +1,14 @@
+<?php
+class Uhstat1daten_model extends DB_Model
+{
+
+	/**
+	 * Constructor
+	 */
+	public function __construct()
+	{
+		parent::__construct();
+		$this->dbTable = 'bis.tbl_uhstat1daten';
+		$this->pk = 'uhstat1daten_id';
+	}
+}
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
new file mode 100644
index 000000000..48397a387
--- /dev/null
+++ b/application/views/codex/uhstat1.php
@@ -0,0 +1,217 @@
+<?php
+$this->load->view(
+	'templates/FHC-Header',
+	array(
+		'title' => 'UHSTAT1Formular',
+		'jquery3' => true,
+		'bootstrap3' => true,
+		'fontawesome4' => true,
+		'dialoglib' => true,
+		'phrases' => array(
+			'ui' => array('speichern')
+		)
+	)
+);
+?>
+
+<div class="container">
+	<div class="tab-content">
+		<h3>
+			<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungUeberschrift') ?>
+		</h3>
+		<form class="form-horizontal" method="POST" action="<?php echo site_url('codex/UHSTAT1/saveUHSTAT1Data').'?person_id='.$formData['person_id'] ?>">
+			<fieldset>
+				<legend><?php echo $this->p->t('uhstat', 'persoenlicheAngaben') ?></legend>
+				<div class="form-group">
+					<label for="geburtsstaat" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'geburtsstaat') ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="geburtsstaat" id="geburtsstaat" class="form-control">
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo set_value('geburtsstaat') == $nation->nation_code ? " selected" : "" ?>>
+									<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('geburtsstaat'); ?>
+					</div>
+				</div>
+			</fieldset>
+			<fieldset>
+				<legend><?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigte') ?></legend>
+				<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonEins') ?></h4>
+				<div class="form-group">
+					<label for="mutter_geburtsjahr" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'mutterGeburtsjahr') ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control">
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formData['jahre'] as $jahr): ?>
+								<option
+									value="<?php echo $jahr ?>"
+									<?php echo set_value('mutter_geburtsjahr') == $jahr ? " selected" : "" ?>>
+									<?php echo $jahr ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('mutter_geburtsjahr'); ?>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="mutter_geburtsstaat" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'mutterGeburtsstaat') ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control">
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo set_value('mutter_geburtsstaat') == $nation->nation_code ? " selected" : "" ?>>
+									<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('mutter_geburtsstaat'); ?>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="mutter_bildungsstaat" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'hoechsterAbschlussStaat') ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control">
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo set_value('mutter_bildungsstaat') == $nation->nation_code ? " selected" : "" ?>>
+									<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('mutter_bildungsstaat'); ?>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="mutter_bildungmax" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'hoechsterAbschluss') ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="mutter_bildungmax" id="mutter_bildungmax" class="form-control">
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
+								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+							</optgroup>
+							<?php foreach ($formData['abschluss_oesterreich'] as $abschluss): ?>
+								<option
+									value="<?php echo $abschluss->ausbildung_code ?>"
+									<?php echo set_value('mutter_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $abschluss->bezeichnung[$formData['languageIdx']] ?>
+								</option>
+							<?php endforeach; ?>
+							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
+								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+							</optgroup>
+							<?php foreach ($formData['abschluss_nicht_oesterreich'] as $abschluss): ?>
+								<option
+									value="<?php echo $abschluss->ausbildung_code ?>"
+									<?php echo set_value('mutter_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $abschluss->bezeichnung[$formData['languageIdx']] ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('mutter_bildungmax'); ?>
+					</div>
+				</div>
+				<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonZwei') ?></h4>
+				<div class="form-group">
+					<label for="vater_geburtsjahr" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'vaterGeburtsjahr') ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control">
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formData['jahre'] as $jahr): ?>
+								<option
+									value="<?php echo $jahr ?>"
+									<?php echo set_value('vater_geburtsjahr') == $jahr ? " selected" : "" ?>>
+										<?php echo $jahr ?>
+									</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('vater_geburtsjahr'); ?>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="vater_geburtsstaat" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'vaterGeburtsstaat') ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control">
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo set_value('vater_geburtsstaat') == $nation->nation_code ? " selected" : "" ?>>
+										<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('vater_geburtsstaat'); ?>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="vater_bildungsstaat" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'hoechsterAbschlussStaat') ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control">
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo set_value('vater_bildungsstaat') == $nation->nation_code ? " selected" : "" ?>>
+										<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('vater_bildungsstaat'); ?>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="vater_bildungmax" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'hoechsterAbschluss') ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="vater_bildungmax" id="vater_bildungmax" class="form-control">
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
+								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+							</optgroup>
+							<?php foreach ($formData['abschluss_oesterreich'] as $abschluss): ?>
+								<option
+									value="<?php echo $abschluss->ausbildung_code ?>"
+									<?php echo set_value('vater_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $abschluss->bezeichnung[$formData['languageIdx']] ?>
+								</option>
+							<?php endforeach; ?>
+							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
+								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+							</optgroup>
+							<?php foreach ($formData['abschluss_nicht_oesterreich'] as $abschluss): ?>
+								<option
+									value="<?php echo $abschluss->ausbildung_code ?>"
+									<?php echo set_value('vater_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $abschluss->bezeichnung[$formData['languageIdx']] ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('vater_bildungmax'); ?>
+					</div>
+				</div>
+			</fieldset>
+			<div class="text-right">
+				<?php if (isset($successMessage)): ?>
+					<span class='text-success'><?php echo $successMessage ?></span>
+				<?php endif; ?>
+				<?php if (isset($errorMessage)): ?>
+					<span class='text-danger'><?php echo $errorMessage ?></span>
+				<?php endif; ?>
+				<button class="btn btn-success" type="submit">
+					<?php echo $this->p->t('ui', 'speichern') ?>
+				</button>
+			</div>
+		</form>
+	</div>
+
+</div>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
index 7395ac0bc..bbd168073 100644
--- a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
+++ b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
@@ -12,7 +12,7 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_abschluss LIMIT 1'))
 				bezeichnung character varying(128)[],
 				aktiv boolean NOT NULL DEFAULT true,
 				in_oesterreich boolean,
-				CONSTRAINT tbl_abschluss_pk PRIMARY KEY (ausbildung_code)
+				CONSTRAINT pk_tbl_abschluss PRIMARY KEY (ausbildung_code)
 			);
 
 			COMMENT ON TABLE bis.tbl_abschluss IS 'Key-Table of graduation';
@@ -102,6 +102,8 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_uhstat1daten LIMIT 1'))
 			REFERENCES public.tbl_person (person_id) MATCH SIMPLE
 			ON DELETE RESTRICT ON UPDATE CASCADE;
 
+			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT uk_uhstat1daten_person_id UNIQUE(person_id);
+
 			COMMENT ON TABLE bis.tbl_uhstat1daten IS 'UHSTAT1 data for a person (statistical data)';
 			COMMENT ON COLUMN bis.tbl_uhstat1daten.geburtsstaat IS 'Birthplace of person';
 			COMMENT ON COLUMN bis.tbl_uhstat1daten.mutter_geburtsstaat IS 'Birth country of mother of person';
@@ -115,6 +117,8 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_uhstat1daten LIMIT 1'))
 
 			GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_uhstat1daten TO web;
 			GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_uhstat1daten TO vilesci;
+			GRANT SELECT, UPDATE ON bis.tbl_uhstat1daten_uhstat1daten_id_seq TO vilesci;
+			GRANT SELECT, UPDATE ON bis.tbl_uhstat1daten_uhstat1daten_id_seq TO web;
 		";
 
 	if(!$db->db_query($qry))

From 5f096b58b7739e43eecb2dfeff84c9ed22d9088f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 17 Jul 2023 13:52:06 +0200
Subject: [PATCH 066/175] - STG beim nicht vorhanden Master RT anzeigen

---
 include/reihungstest.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/include/reihungstest.class.php b/include/reihungstest.class.php
index 633ddf1da..8cc9495fd 100644
--- a/include/reihungstest.class.php
+++ b/include/reihungstest.class.php
@@ -688,8 +688,8 @@ class reihungstest extends basis_db
 					tbl_reihungstest.aufnahmegruppe_kurzbz,
 					tbl_studiengang.typ,
 					UPPER(typ::varchar(1) || kurzbz) AS stg_kuerzel,
-					so.studiengangbezeichnung as bezeichnung,
-       				so.studiengangbezeichnung_englisch as english
+					so.studiengangbezeichnung,
+       				so.studiengangbezeichnung_englisch
 				FROM
 					public.tbl_rt_person
 				JOIN public.tbl_reihungstest ON (rt_id=reihungstest_id)
@@ -736,8 +736,8 @@ class reihungstest extends basis_db
 				$obj->aufnahmegruppe_kurzbz = $row->aufnahmegruppe_kurzbz;
 				$obj->typ = $row->typ;
 				$obj->stg_kuerzel = $row->stg_kuerzel;
-				$obj->bezeichnung = $row->bezeichnung;
-				$obj->english = $row->english;
+				$obj->studiengangbezeichnung = $row->studiengangbezeichnung;
+				$obj->studiengangbezeichnung_englisch = $row->studiengangbezeichnung_englisch;
 
 				$this->result[] = $obj;
 			}

From 5e6262da56208a7d300078ea051d026e1a05aca6 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 17 Jul 2023 16:29:03 +0200
Subject: [PATCH 067/175] =?UTF-8?q?Config=20f=C3=BCr=20Datum=20Start=20Dig?=
 =?UTF-8?q?italisierung,=20finish=20handleWiederholerDeadline,=20start=20S?=
 =?UTF-8?q?ammelmail=20an=20Stgl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/config/studierendenantrag.php     |  11 ++
 application/controllers/jobs/AntragJob.php    | 156 ++++++++++++----
 .../models/education/Pruefung_model.php       | 172 ++++++++----------
 3 files changed, 210 insertions(+), 129 deletions(-)

diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
index 85a3e1658..89b066d33 100644
--- a/application/config/studierendenantrag.php
+++ b/application/config/studierendenantrag.php
@@ -88,6 +88,17 @@ $config['wiederholung_job_request_2_date_modifier'] = '+3 weeks';
  */
 $config['wiederholung_job_deadline_date_modifier'] = '+1 month';
 
+/**
+ * before this exam dates for Wiederholer will be ignored
+ *
+ * @var string           A string formated as Date
+ *
+ */
+$config['digitalization_start'] = '2022-07-01';
+
+
+
+
 /**
  * Objection period - the student will be abgemeldet if he hasn't objected in this period
  *
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 61c3a2eaa..e0c88ac3a 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -3,11 +3,12 @@
 if (!defined("BASEPATH")) exit("No direct script access allowed");
 
 use \DateTime as DateTime;
-// TODO(chris): Achtung not working
 
 class AntragJob extends JOB_Controller
 {
-	/**
+    private $allPrestudentsWhereCommitteeExamFailed;
+
+    /**
 	 * API constructor
 	 */
 	public function __construct()
@@ -33,11 +34,102 @@ class AntragJob extends JOB_Controller
 	 */
 	public function sendStglSammelmail()
 	{
-		// TODO(chris): get all Abmeldung:Created, Unterbrechung:Created, Wiederholung:LvZugeordnet
-		// TODO(chris): get stgs for all these
-		// TODO(chris): get stgls for all these
-		// TODO(chris): sort antraege in stgls
-		// TODO(chris): send email
+        $this->logInfo('Start Job sendStglSammelmail');
+
+        // TODO(chris): get all Abmeldung:Created, Unterbrechung:Created, Wiederholung:LvZugeordnet
+        $this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+        $this->StudierendenantragModel->addJoin('public.tbl_prestudent','prestudent_id');
+        $this->db->group_start();
+        $this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
+        $this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+        $this->db->group_end();
+
+        $this->db->or_group_start();
+        $this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
+        $this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+        $this->db->group_end();
+
+        $this->db->or_group_start();
+        $this->db->where('typ', Studierendenantrag_model::TYP_UNTERBRECHUNG);
+        $this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+        $this->db->group_end();
+
+        $this->db->or_group_start();
+        $this->db->where('typ', Studierendenantrag_model::TYP_WIEDERHOLUNG);
+        $this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_LVSASSIGNED);
+        $this->db->group_end();
+
+        $result =  $this->StudierendenantragModel->load();
+        if(isError($result))
+            return $this->logError(getError($result));
+
+        if(!hasData($result))
+            return $this->logInfo('End Job sendStglSammelmail: 0 Mails sent');
+
+        $antraege = getData($result);
+
+        $stgs = array();
+        $stgLeitungen = array();
+
+        foreach($antraege as $antrag)
+        {
+            if(!isset($stgs[$antrag->studiengang_kz]))
+            {
+                $result = $this->StudiengangModel->getLeitung($antrag->studiengang_kz);
+                if(isError($result))
+                {
+                    $this->logError(getError($result));
+                    continue;
+                }
+                if(!hasData($result))
+                {
+                    $this->logError('Keine Leitung für Studiengang ' . $antrag->studiengang_kz . ' gefunden!');
+                    continue;
+                }
+
+                $leitung = current(getData($result));
+                if(!isset($stgLeitungen[$leitung->uid]))
+                {
+                    $stgLeitungen[$leitung->uid] = [ 'Details' => $leitung, 'stgs' => [] ];
+                }
+                $stgLeitungen[$leitung->uid] ['stgs'][] = $antrag->studiengang_kz;
+
+                $result = $this->StudiengangModel->load($antrag->studiengang_kz);
+                if(isError($result))
+                {
+                    $this->logError(getError($result));
+                    continue;
+                }
+                if(!hasData($result))
+                {
+                    $this->logError('Keine Details für Studiengang ' . $antrag->studiengang_kz . ' gefunden!');
+                    continue;
+                }
+                $details = current(getData($result));
+
+                $stgs[$antrag->studiengang_kz] = [ 'Abmeldung' => [], 'Unterbrechung' => [], 'Wiederholung' => [], 'Details' => $details ];
+            }
+            $stgs[$antrag->studiengang_kz] [$antrag->typ] = $antrag;
+        }
+
+/*        var_dump($stgs);
+        var_dump($stgLeitungen);*/
+
+        $count = 0;
+        foreach($stgLeitungen as $leitung)
+        {
+            $data = array();
+            if(sendSanchoMail("Sancho_Mail_Antrag_Stgl",$data,$leitung['Details']->email, 'Anträge - Aktion(en) erforderlich'))
+                $count++;
+        }
+
+        $this->logInfo($count . " Emails erfolgreich versandt");
+
+		// TODO(chris): Emailadresse stg
+		// TODO(chris): data Fertig
+
+        $this->logInfo('End Job sendStglSammelmail');
 	}
 
 	/**
@@ -118,19 +210,22 @@ class AntragJob extends JOB_Controller
 			return;
 		}
 
+        $digi_start= $this->config->item('digitalization_start');
+        if($digi_start)
+            $digi_start = new DateTime($digi_start);
+
 		$dateDeadline = new DateTime();
 		$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
 
-		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed(
-				[
-					null,
-					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
-					Studierendenantragstatus_model::STATUS_REQUESTSENT_2
-				],
-				$dateDeadline,
-				null
-			);
-
+        $result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed(
+            [
+                null,
+                Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+                Studierendenantragstatus_model::STATUS_REQUESTSENT_2
+            ],
+            $dateDeadline,
+            $digi_start
+        );
 		if(isError($result))
 		{
 			$this->logError(getError($result));
@@ -142,24 +237,19 @@ class AntragJob extends JOB_Controller
 
 			$prestudents = $this->prestudentsGetUnique($prestudents);
 
-			foreach ($prestudents as $prestudent)
-			{
-				// TODO(chris): DEBUG REMOVE!
-				if ($prestudent->studiensemester_kurzbz == 'WS2021')
-				var_dump([$prestudent->prestudent_id, $prestudent->studiensemester_kurzbz, $prestudent->lvbezeichnung]);
-				$result = success();
-				// TODO(chris): find out how to filter old/wrong datasets!!!
-				#$result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, $prestudent->studiensemester_kurzbz, $insertvon);
-				if (isError($result))
-					$this->logError(getError($result));
-				else
-					$count++;
-			}
-			$this->logInfo($count . " Students set to Abbrecher");
-		}
 
-		$this->logInfo('Ende Job handleWiederholerDeadline');
+            foreach ($prestudents as $prestudent)
+            {
+                $result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, $prestudent->studiensemester_kurzbz, $insertvon);
+                if (isError($result))
+                    $this->logError(getError($result));
+                else
+                    $count++;
+            }
+            $this->logInfo($count . " Students set to Abbrecher");
+        }
 
+        $this->logInfo('Ende Job handleWiederholerDeadline');
 	}
 
 	/**
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index 4236a5c6a..047cac02f 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -37,106 +37,52 @@ class Pruefung_model extends DB_Model
 		return $this->execQuery($qry, array($person_id, $studiensemester_kurzbz));
 	}
 
-	/**
-	 * @param integer		$prestudent_id student_uid
-	 *
-	 * @return stdClass
-	 */
-	public function loadWhereCommitteeExamFailedForPrestudent($prestudent_id)
-	{
-		$this->load->config('studierendenantrag');
 
-		$this->dbTable = 'lehre.tbl_pruefung p';
+    /**
+     * @return string
+     */
+    protected function loadWhereThreeExamsFailed()
+    {
+        $this->load->config('studierendenantrag');
 
-		$this->addSelect('p.datum');
-		$this->addSelect('pers.vorname');
-		$this->addSelect('pers.nachname');
-		$this->addSelect('s.matrikelnr');
-		$this->addSelect('g.bezeichnung');
-		$this->addSelect('g.studiengang_kz');
-		$this->addSelect('o.bezeichnung_mehrsprachig');
-		$this->addSelect('ps.prestudent_id');
-		$this->addSelect('lv.bezeichnung as lvbezeichnung');
-		$this->addSelect('le.studiensemester_kurzbz');
-		$this->addSelect('a.typ');
-		$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
+        $this->dbTable = 'lehre.tbl_pruefung p';
 
-		$this->addJoin('lehre.tbl_note n', 'note');
-		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
-		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
-		$this->addJoin('public.tbl_student s', 'student_uid');
-		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
-		$this->addJoin('public.tbl_person pers', 'person_id');
-		$this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
-		$this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
-		$this->addJoin('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id', 'LEFT');
+        $sprache_index = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
 
-		$this->db->where("n.positiv", false);
-		$this->db->where("p.pruefungstyp_kurzbz", 'kommPruef');
-		$this->db->where("ps.prestudent_id", $prestudent_id);
-		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, NULL)", $this->config->item('antrag_prestudentstatus_whitelist'));
-		$this->db->where("g.aktiv", true);
+        $this->addSelect('max(p.datum) as datum');
+        $this->addSelect('pers.vorname');
+        $this->addSelect('pers.nachname');
+        $this->addSelect('pers.person_id');
+        $this->addSelect('s.matrikelnr');
+        $this->addSelect('g.bezeichnung');
+        $this->addSelect('g.studiengang_kz');
+        $this->addSelect('o.bezeichnung_mehrsprachig[(' . $sprache_index . ')] AS orgform', false);
+        $this->addSelect('ps.prestudent_id');
+        $this->addSelect('lv.bezeichnung as lvbezeichnung');
+        $this->addSelect('le.studiensemester_kurzbz');
+        $this->addSelect('a.typ');
+        $this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
+        $this->addSelect('count(1) as count');
 
-		$this->db->where('lv.studiengang_kz not in(
-				SELECT ps.studiengang_kz
-				FROM
-				public.tbl_student s
-				JOIN public.tbl_prestudent ps USING (prestudent_id)
-				JOIN public.tbl_prestudentstatus pss USING (prestudent_id)
-				WHERE pss.statusgrund_id in ?
-				and ps.prestudent_id = ?)', null, false);
+        $this->addGroupBy(['pers.vorname','pers.nachname','pers.person_id', 's.matrikelnr','g.bezeichnung', 'g.studiengang_kz','o.bezeichnung_mehrsprachig','ps.prestudent_id', 'lv.bezeichnung', 'le.studiensemester_kurzbz', 'a.typ', 'a.studierendenantrag_id']);
+        $this->addJoin('lehre.tbl_note n', 'note');
+        $this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+        $this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+        $this->addJoin('public.tbl_student s', 'student_uid');
+        $this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
+        $this->addJoin('public.tbl_person pers', 'person_id');
+        $this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+        $this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
+        $this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
+        $this->db->join('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ = ?', 'LEFT', false);
 
-		$sql = $this->db->get_compiled_select($this->dbTable);
+        $this->db->where("n.positiv", false);
+        /*		$this->db->where_in("p.pruefungstyp_kurzbz1", ['kommPruef','zusKommPruef']);*/
+        $this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
 
-		return $this->execQuery($sql, [$this->config->item('status_gruende_wiederholer'), $prestudent_id]);
-	}
+        $this->db->where("g.aktiv", true);
 
-	public function getAllPrestudentsWhereCommitteeExamFailed($status, $maxDate, $minDate)
-	{
-		$this->load->config('studierendenantrag');
-		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
-
-		$this->dbTable = 'lehre.tbl_pruefung p';
-
-		$sprache_index = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
-
-		$this->addSelect('p.datum');
-		$this->addSelect('pers.vorname');
-		$this->addSelect('pers.nachname');
-		$this->addSelect('pers.person_id');
-		$this->addSelect('s.matrikelnr');
-		$this->addSelect('g.bezeichnung');
-		$this->addSelect('g.studiengang_kz');
-		$this->addSelect('o.bezeichnung_mehrsprachig[(' . $sprache_index . ')] AS orgform', false);
-		$this->addSelect('ps.prestudent_id');
-		$this->addSelect('lv.bezeichnung as lvbezeichnung');
-		$this->addSelect('le.studiensemester_kurzbz');
-		$this->addSelect('a.typ');
-		$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
-
-		$this->addJoin('lehre.tbl_note n', 'note');
-		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
-		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
-		$this->addJoin('public.tbl_student s', 'student_uid');
-		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
-		$this->addJoin('public.tbl_person pers', 'person_id');
-		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
-		$this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
-		$this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
-		$this->db->join('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ = ?', 'LEFT', false);
-
-		$this->db->where("n.positiv", false);
-		$this->db->where("p.pruefungstyp_kurzbz", 'kommPruef');
-		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
-		
-		if ($maxDate)
-			$this->db->where("p.datum < ", $maxDate->format('c'));
-		if ($minDate)
-			$this->db->where("p.datum > ", $minDate->format('c'));
-		$this->db->where("g.aktiv", true);
-		$this->db->where("b.aktiv", true);
-
-		$this->db->where('lv.studiengang_kz not in(
+        $this->db->where('lv.studiengang_kz not in(
 				SELECT ps.studiengang_kz
 				FROM
 				public.tbl_prestudent ps1
@@ -144,8 +90,42 @@ class Pruefung_model extends DB_Model
 				WHERE pss.statusgrund_id in ?
 				AND ps.prestudent_id = ps1.prestudent_id)', null, false);
 
-		// NOTE(chris): is Wiederholer without set statusgrund (legacy?)
-		$this->db->where('(SELECT COUNT(*) FROM (SELECT DISTINCT studiensemester_kurzbz FROM tbl_prestudentstatus _s WHERE ausbildungssemester=get_absem_prestudent(ps.prestudent_id, le.studiensemester_kurzbz) AND prestudent_id=ps.prestudent_id) a) = 1', null, false);
+        // NOTE(chris): is Wiederholer without set statusgrund (legacy?)
+        $this->db->where('(SELECT COUNT(*) FROM (SELECT DISTINCT studiensemester_kurzbz FROM tbl_prestudentstatus _s WHERE ausbildungssemester=get_absem_prestudent(ps.prestudent_id, le.studiensemester_kurzbz) AND prestudent_id=ps.prestudent_id) a) = 1', null, false);
+
+        return $this->db->get_compiled_select($this->dbTable);
+    }
+
+
+
+
+	/**
+	 * @param integer		$prestudent_id student_uid
+	 *
+	 * @return stdClass
+	 */
+	public function loadWhereCommitteeExamFailedForPrestudent($prestudent_id)
+	{
+
+		$sql = $this->loadWhereThreeExamsFailed();
+
+        $statusgruende = $this->config->item('status_gruende_wiederholer');
+        if (!is_array($statusgruende))
+            $statusgruende = [];
+
+        return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3 AND prestudent_id = ?' , [Studierendenantrag_model::TYP_WIEDERHOLUNG, $statusgruende, $prestudent_id]);
+	}
+
+	public function getAllPrestudentsWhereCommitteeExamFailed($status, $maxDate, $minDate)
+	{
+		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+
+		if ($maxDate)
+			$this->db->where("p.datum < ", $maxDate->format('c'));
+		if ($minDate)
+			$this->db->where("p.datum > ", $minDate->format('c'));
+
+		$this->db->where("b.aktiv", true);
 
 		if (is_array($status)) {
 			if (in_array(null, $status)) {
@@ -165,12 +145,12 @@ class Pruefung_model extends DB_Model
 			$this->db->where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
 		}
 
-		$sql = $this->db->get_compiled_select($this->dbTable);
+		$sql = $this->loadWhereThreeExamsFailed();
 
 		$statusgruende = $this->config->item('status_gruende_wiederholer');
 		if (!is_array($statusgruende))
 			$statusgruende = [];
 
-		return $this->execQuery($sql, [Studierendenantrag_model::TYP_WIEDERHOLUNG, $statusgruende]);
+		return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3', [Studierendenantrag_model::TYP_WIEDERHOLUNG, $statusgruende]);
 	}
 }

From 8bb3b6d53c4b0ff03759acab4d30d94236895a60 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 20 Jul 2023 10:48:03 +0200
Subject: [PATCH 068/175] DB Update: added 2 attributes to tbl_anrechnung

- begruendung_ects (text)
- begruendung_lvinhalt (text)
---
 system/dbupdate_3.4.php                       |  3 +-
 ...chnung_neue_attribute_fuer_begruendung.php | 28 +++++++++++++++++++
 2 files changed, 30 insertions(+), 1 deletion(-)
 create mode 100644 system/dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php

diff --git a/system/dbupdate_3.4.php b/system/dbupdate_3.4.php
index ed60aeddf..5c6a3d5d1 100644
--- a/system/dbupdate_3.4.php
+++ b/system/dbupdate_3.4.php
@@ -40,6 +40,7 @@ require_once('dbupdate_3.4/24913_tabelle_raumtyp_neues_attribut_aktiv.php');
 require_once('dbupdate_3.4/28089_plausichecks_in_extension_hinzufuegen.php');
 require_once('dbupdate_3.4/29133_einzelne_studiengaenge_aus_issuechecks_ausnehmen.php');
 require_once('dbupdate_3.4/30537_anmerkung_in_tbl_rolleberechtigung.php');
+require_once('dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php');
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
@@ -150,7 +151,7 @@ $tabellen=array(
 	"lehre.tbl_abschlusspruefung"  => array("abschlusspruefung_id","student_uid","vorsitz","pruefer1","pruefer2","pruefer3","abschlussbeurteilung_kurzbz","akadgrad_id","pruefungstyp_kurzbz","datum","uhrzeit","sponsion","anmerkung","updateamum","updatevon","insertamum","insertvon","ext_id","note","protokoll","endezeit","pruefungsantritt_kurzbz","freigabedatum"),
 	"lehre.tbl_abschlusspruefung_antritt"  => array("pruefungsantritt_kurzbz","bezeichnung","bezeichnung_english","sort"),
 	"lehre.tbl_akadgrad"  => array("akadgrad_id","akadgrad_kurzbz","studiengang_kz","titel","geschlecht"),
-	"lehre.tbl_anrechnung"  => array("anrechnung_id","prestudent_id","lehrveranstaltung_id","begruendung_id","lehrveranstaltung_id_kompatibel","genehmigt_von","insertamum","insertvon","updateamum","updatevon","ext_id", "dms_id", "studiensemester_kurzbz", "anmerkung_student", "empfehlung_anrechnung"),
+	"lehre.tbl_anrechnung"  => array("anrechnung_id","prestudent_id","lehrveranstaltung_id","begruendung_id","lehrveranstaltung_id_kompatibel","genehmigt_von","insertamum","insertvon","updateamum","updatevon","ext_id", "dms_id", "studiensemester_kurzbz", "anmerkung_student", "empfehlung_anrechnung", "begruendung_ects", "begruendung_lvinhalt"),
 	"lehre.tbl_anrechnungstatus"  => array("status_kurzbz", "bezeichnung_mehrsprachig"),
 	"lehre.tbl_anrechnung_anrechnungstatus"  => array("anrechnungstatus_id", "anrechnung_id", "status_kurzbz", "datum", "insertamum", "insertvon"),
 	"lehre.tbl_anrechnung_begruendung"  => array("begruendung_id","bezeichnung"),
diff --git a/system/dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php b/system/dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php
new file mode 100644
index 000000000..922920071
--- /dev/null
+++ b/system/dbupdate_3.4/30181_tabelle_anrechnung_neue_attribute_fuer_begruendung.php
@@ -0,0 +1,28 @@
+<?php
+if (! defined('DB_NAME')) exit('No direct script access allowed');
+
+//Add column begruendung_ects to lehre.tbl_anrechnung
+if(!@$db->db_query("SELECT begruendung_ects FROM lehre.tbl_anrechnung LIMIT 1"))
+{
+	$qry = "ALTER TABLE lehre.tbl_anrechnung ADD COLUMN begruendung_ects text;
+			COMMENT ON COLUMN lehre.tbl_anrechnung.begruendung_ects IS 'Begruendung gleichwertiger ECTS';
+			";
+
+	if(!$db->db_query($qry))
+		echo '<strong>lehre.tbl_anrechnung '.$db->db_last_error().'</strong><br>';
+	else
+		echo '<br>Spalte begruendung_ects zu Tabelle lehre.tbl_anrechnung hinzugefügt';
+}
+
+//Add column begruendung_lvinhalt to lehre.tbl_anrechnung
+if(!@$db->db_query("SELECT begruendung_lvinhalt FROM lehre.tbl_anrechnung LIMIT 1"))
+{
+    $qry = "ALTER TABLE lehre.tbl_anrechnung ADD COLUMN begruendung_lvinhalt text;
+			COMMENT ON COLUMN lehre.tbl_anrechnung.begruendung_lvinhalt IS 'Begruendung gleichwertiger LV-Inhalte';
+			";
+
+    if(!$db->db_query($qry))
+        echo '<strong>lehre.tbl_anrechnung '.$db->db_last_error().'</strong><br>';
+    else
+        echo '<br>Spalte begruendung_lvinhalt zu Tabelle lehre.tbl_anrechnung hinzugefügt';
+}
\ No newline at end of file

From 54d819e1eaf1dc8d96b5f2ccfb22307d36b7c67b Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 20 Jul 2023 13:38:52 +0200
Subject: [PATCH 069/175] Adapted GUI to display and save begruendung_ects and
 begruendung_lvinhalt

---
 .../lehre/anrechnung/requestAnrechnung.php    | 49 +++++++++++++++++--
 .../js/lehre/anrechnung/requestAnrechnung.js  | 25 ++++++++--
 2 files changed, 66 insertions(+), 8 deletions(-)

diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index cfd9058f5..839e659a8 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -1,5 +1,7 @@
 <?php
-const HERKUNFT_DER_KENNTNISSE_MAX_LENGTH = 125;
+const CHAR_LENGTH125 = 125;
+const CHAR_LENGTH500 = 500;
+const CHAR_LENGTH1500 = 1500;
 
 $this->load->view(
 	'templates/FHC-Header',
@@ -197,6 +199,47 @@ $this->load->view(
 									</div>
 								</div>
 							</div>
+                            <!-- Begruendung ECTS -->
+                            <div class="row">
+                                <div class="col-lg-12">
+                                    <div class="panel panel-default">
+                                        <div class="panel-heading">
+                                            <b><?php echo $this->p->t('anrechnung', 'begruendungEcts'); ?></b>&emsp;
+                                            <span class="requestAnrechnung-anrechnungInfoTooltip" data-toggle="tooltip" data-placement="right"
+                                                  title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungEctsTooltipText'); ?>">
+                                                <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
+                                            </span>
+                                            <a href="https://www.technikum-wien.at" target="_blank" class="pull-right">ECTS Berechnung Referenzbeispiele</a>
+                                        </div>
+                                        <div class="panel-body">
+                                            <textarea class="form-control" name="begruendung_ects" rows="3" id="requestAnrechnung-begruendungEcts"
+                                                      maxlength="<?php echo CHAR_LENGTH125 ?>" required><?php echo $anrechnungData->begruendung_ects; ?></textarea>
+                                            <small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungEcts-charCounter"><?php echo CHAR_LENGTH125 ?></span></span></small>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
+                            <!-- Begruendung LV Inhalt -->
+                            <div class="row">
+                                <div class="col-lg-12">
+                                    <div class="panel panel-default">
+                                        <div class="panel-heading">
+                                            <b><?php echo $this->p->t('anrechnung', 'begruendungLvinhalt'); ?></b>&emsp;
+                                            <span class="requestAnrechnung-anrechnungInfoTooltip" data-toggle="tooltip" data-placement="right"
+                                                  title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungLvinhaltTooltipText'); ?>">
+                                                <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
+                                            </span>
+                                        </div>
+                                        <div class="panel-body">
+                                            <textarea class="form-control" name="begruendung_lvinhalt" rows="7" id="requestAnrechnung-begruendungLvinhalt"
+                                                      minlength="<?php echo CHAR_LENGTH500 ?>"
+                                                      maxlength="<?php echo CHAR_LENGTH1500 ?>" required><?php echo $anrechnungData->begruendung_lvinhalt; ?></textarea>
+                                            <small><span class="text-muted pull-right">&nbsp;/&nbsp;<?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungLvinhalt-charCounterMax"><?php echo CHAR_LENGTH1500 ?></span></span></small>
+                                            <small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'fehlendeMinZeichen'); ?> :<span id="requestAnrechnung-begruendungLvinhalt-charCounterMin"><?php echo CHAR_LENGTH500 ?></span></span></small>
+                                        </div>
+                                    </div>
+                                </div>
+                            </div>
 							<!-- Dokument Upload-->
 							<div class="row">
 								<div class="col-lg-12">
@@ -242,8 +285,8 @@ $this->load->view(
 												</div>
 												<div class="panel-body">
 													<textarea class="form-control" name="anmerkung" rows="1" id="requestAnrechnung-herkunftDerKenntnisse"
-															  maxlength="<?php echo HERKUNFT_DER_KENNTNISSE_MAX_LENGTH ?>" required><?php echo $anrechnungData->anmerkung; ?></textarea>
-													<small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-herkunftDerKenntnisse-charCounter"><?php echo HERKUNFT_DER_KENNTNISSE_MAX_LENGTH ?></span></span></small>
+                                                              maxlength="<?php echo CHAR_LENGTH125 ?>" required><?php echo $anrechnungData->anmerkung; ?></textarea>
+													<small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-herkunftDerKenntnisse-charCounter"><?php echo CHAR_LENGTH125 ?></span></span></small>
 												</div>
 											</div>
 										</div>
diff --git a/public/js/lehre/anrechnung/requestAnrechnung.js b/public/js/lehre/anrechnung/requestAnrechnung.js
index 5edb4e162..01453f52d 100644
--- a/public/js/lehre/anrechnung/requestAnrechnung.js
+++ b/public/js/lehre/anrechnung/requestAnrechnung.js
@@ -1,6 +1,8 @@
 const ANRECHNUNGSTATUS_APPROVED = 'approved';
 const ANRECHNUNGSTATUS_REJECTED = 'rejected';
-const HERKUNFT_DER_KENNTNISSE_MAX_LENGTH = 125;
+const CHAR_LENGTH125 = 125;
+const CHAR_LENGTH500 = 500;
+const CHAR_LENGTH1500 = 1500;
 
 const COLOR_DANGER = '#f2dede';
 
@@ -25,7 +27,7 @@ $(function(){
     // Alert message inside Begruendungsbox, if maximum ECTS exceeded
     requestAnrechnung.alertIfMaxEctsExceededInsideBegruendungsbox();
 
-    // Set chars counter for textarea 'Herkunft der Kenntnisse'
+    // Set chars counter for textareas
     requestAnrechnung.setCharsCounter();
 
     // If Sperregrund exists: display Sperre panel, hide Status panel and disable all form elements
@@ -98,6 +100,8 @@ $(function(){
                 begruendung: this.begruendung.value,
                 lv_id: this.lv_id.value,
                 studiensemester: this.studiensemester.value,
+                begruendung_ects: this.begruendung_ects.value,
+                begruendung_lvinhalt: this.begruendung_lvinhalt.value,
                 bestaetigung: this.bestaetigung.value,
                 uploadfile: this.uploadfile.files
             },
@@ -207,11 +211,22 @@ var requestAnrechnung = {
     },
     setCharsCounter: function(){
         $('#requestAnrechnung-herkunftDerKenntnisse').keyup(function() {
-
-            let length = HERKUNFT_DER_KENNTNISSE_MAX_LENGTH - $(this).val().length;
-
+            let length = CHAR_LENGTH125 - $(this).val().length;
             $('#requestAnrechnung-herkunftDerKenntnisse-charCounter').text(length);
         });
+
+        $('#requestAnrechnung-begruendungEcts').keyup(function() {
+            let length = CHAR_LENGTH125 - $(this).val().length;
+            $('#requestAnrechnung-begruendungEcts-charCounter').text(length);
+        });
+
+        $('#requestAnrechnung-begruendungLvinhalt').keyup(function() {
+            let maxlength = CHAR_LENGTH1500 - $(this).val().length;
+            $('#requestAnrechnung-begruendungLvinhalt-charCounterMax').text(maxlength);
+
+            let minlength = CHAR_LENGTH500 - $(this).val().length;
+            $('#requestAnrechnung-begruendungLvinhalt-charCounterMin').text(minlength);
+        });
     },
     formatAnrechnungIsApplied: function (antragdatum, dms_id, filename){
         $('#requestAnrechnung-antragdatum').text(antragdatum);

From 110d6bace3637d2783f83be301ac86991b3d83b2 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Thu, 20 Jul 2023 13:42:53 +0200
Subject: [PATCH 070/175] Adapted backend logic to save/retrieve
 begruendung_ects and begruendung_lvinhalt

---
 .../controllers/lehre/anrechnung/RequestAnrechnung.php | 10 ++++++++--
 application/libraries/AnrechnungLib.php                |  4 ++++
 application/models/education/Anrechnung_model.php      |  4 +++-
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/application/controllers/lehre/anrechnung/RequestAnrechnung.php b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
index e9059720b..1922bacda 100644
--- a/application/controllers/lehre/anrechnung/RequestAnrechnung.php
+++ b/application/controllers/lehre/anrechnung/RequestAnrechnung.php
@@ -111,6 +111,8 @@ class requestAnrechnung extends Auth_Controller
 		$lehrveranstaltung_id = $this->input->post('lv_id');
 		$studiensemester_kurzbz = $this->input->post('studiensemester');
 		$bestaetigung = $this->input->post('bestaetigung');
+		$begruendung_ects = $this->input->post('begruendung_ects');
+		$begruendung_lvinhalt = $this->input->post('begruendung_lvinhalt');
 
 		// Validate data
 		if (empty($_FILES['uploadfile']['name']))
@@ -121,7 +123,9 @@ class requestAnrechnung extends Auth_Controller
 		if (isEmptyString($begruendung_id) ||
 			isEmptyString($anmerkung) ||
 			isEmptyString($lehrveranstaltung_id) ||
-			isEmptyString($studiensemester_kurzbz))
+			isEmptyString($studiensemester_kurzbz) ||
+			isEmptyString($begruendung_ects) ||
+			isEmptyString($begruendung_lvinhalt))
 		{
 			return $this->outputJsonError($this->p->t('ui', 'errorFelderFehlen'));
 		}
@@ -172,7 +176,9 @@ class requestAnrechnung extends Auth_Controller
 			$lehrveranstaltung_id,
 			$begruendung_id,
 			$lastInsert_dms_id,
-			$anmerkung
+			$anmerkung,
+            $begruendung_ects,
+            $begruendung_lvinhalt
 		);
 		
 		if (isError($result))
diff --git a/application/libraries/AnrechnungLib.php b/application/libraries/AnrechnungLib.php
index d8c4b1fd3..8ee1891b5 100644
--- a/application/libraries/AnrechnungLib.php
+++ b/application/libraries/AnrechnungLib.php
@@ -174,6 +174,8 @@ class AnrechnungLib
 		$anrechnung_data->insertvon = '';
 		$anrechnung_data->studiensemester_kurzbz = '';
 		$anrechnung_data->empfehlung = '';
+		$anrechnung_data->begruendung_ects = '';
+		$anrechnung_data->begruendung_lvinhalt = '';
 		$anrechnung_data->status_kurzbz = '';
 		$anrechnung_data->status = getUserLanguage() == 'German' ? 'neu' : 'new';
 		$anrechnung_data->dokumentname = '';
@@ -894,6 +896,8 @@ class AnrechnungLib
 		$anrechnung_data->insertvon= $anrechnung->insertvon;
 		$anrechnung_data->studiensemester_kurzbz= $anrechnung->studiensemester_kurzbz;
 		$anrechnung_data->empfehlung= $anrechnung->empfehlung_anrechnung;
+        $anrechnung_data->begruendung_ects = $anrechnung->begruendung_ects;
+        $anrechnung_data->begruendung_lvinhalt = $anrechnung->begruendung_lvinhalt;
 
 		// Get last status_kurzbz
 		$result = $this->ci->AnrechnungModel->getLastAnrechnungstatus($anrechnung->anrechnung_id);
diff --git a/application/models/education/Anrechnung_model.php b/application/models/education/Anrechnung_model.php
index ebecf4118..cbfdb6607 100644
--- a/application/models/education/Anrechnung_model.php
+++ b/application/models/education/Anrechnung_model.php
@@ -30,7 +30,7 @@ class Anrechnung_model extends DB_Model
 	 */
 	public function createAnrechnungsantrag(
 		$prestudent_id, $studiensemester_kurzbz, $lehrveranstaltung_id,
-		$begruendung_id, $dms_id, $anmerkung_student = null
+		$begruendung_id, $dms_id, $anmerkung_student = null, $begruendung_ects = null, $begruendung_lvinhalt = null
 	)
 	{
 		// Start DB transaction
@@ -44,6 +44,8 @@ class Anrechnung_model extends DB_Model
 			'dms_id' => $dms_id,
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'anmerkung_student' => $anmerkung_student,
+			'begruendung_ects' => $begruendung_ects,
+			'begruendung_lvinhalt' => $begruendung_lvinhalt,
 			'insertvon' => $this->_uid
 		));
 		

From 35d01b042eaaa97aa769554c6a35e37672434cda Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 20 Jul 2023 15:00:42 +0200
Subject: [PATCH 071/175] Bug canCancel in abmeldung->edit missing

---
 application/controllers/components/Antrag/Abmeldung.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/controllers/components/Antrag/Abmeldung.php b/application/controllers/components/Antrag/Abmeldung.php
index 55435c1f6..c55820437 100644
--- a/application/controllers/components/Antrag/Abmeldung.php
+++ b/application/controllers/components/Antrag/Abmeldung.php
@@ -94,6 +94,11 @@ class Abmeldung extends FHC_Controller
 		if ($data->typ !== Studierendenantrag_model::TYP_ABMELDUNG_STGL && $data->typ !== Studierendenantrag_model::TYP_ABMELDUNG)
 			return show_404();
 
+		$data->canCancel = (
+			$data->status == Studierendenantragstatus_model::STATUS_CREATED &&
+			$this->antraglib->isEntitledToCancelAntrag($data->studierendenantrag_id)
+		);
+
 		$this->outputJsonSuccess($data);
 	}
 

From 5670bac3f682376582be954e826d3722f1bde20f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 20 Jul 2023 15:04:18 +0200
Subject: [PATCH 072/175] Don't allow canceling of Stg Abmeldungen

---
 application/libraries/AntragLib.php | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 6e05380a5..c1cab664f 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1545,7 +1545,16 @@ class AntragLib
 	 */
 	public function isEntitledToCancelAntrag($antrag_id)
 	{
-		return $this->isOwnAntrag($antrag_id);
+		$result = $this->_ci->StudierendenantragModel->load($antrag_id);
+		if (!hasData($result))
+			return false;
+		$antrag = current(getData($result));
+
+		if ($antrag->typ != Studierendenantrag_model::TYP_ABMELDUNG_STGL)
+			return $this->isOwnAntrag($antrag_id);
+		
+		// TODO(chris): assistenz can not cancel - should they be able to?
+		return false;
 	}
 
 	/**

From 8923a099cc257544aba56fdc2fb0c16703350f6d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 20 Jul 2023 15:04:49 +0200
Subject: [PATCH 073/175] Sammelmail Stgl & Calltoactions in Student view

---
 application/controllers/jobs/AntragJob.php    | 245 ++++++++++--------
 .../views/lehre/Antrag/Student/List.php       |  31 +--
 system/phrasesupdate.php                      | 140 ++++++++++
 3 files changed, 289 insertions(+), 127 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index e0c88ac3a..8130f8a95 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -6,9 +6,9 @@ use \DateTime as DateTime;
 
 class AntragJob extends JOB_Controller
 {
-    private $allPrestudentsWhereCommitteeExamFailed;
+	private $allPrestudentsWhereCommitteeExamFailed;
 
-    /**
+	/**
 	 * API constructor
 	 */
 	public function __construct()
@@ -21,7 +21,7 @@ class AntragJob extends JOB_Controller
 		// Loads SanchoHelper
 		$this->load->helper('hlp_sancho_helper');
 
-		//Load Model
+		// Load Model
 		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
 		$this->load->model('education/Studierendenantragstatus_model', 'StudierendenantragstatusModel');
 		$this->load->model('education/Pruefung_model', 'PruefungModel');
@@ -34,102 +34,139 @@ class AntragJob extends JOB_Controller
 	 */
 	public function sendStglSammelmail()
 	{
-        $this->logInfo('Start Job sendStglSammelmail');
+		$this->load->model('person/Person_model', 'PersonModel');
 
-        // TODO(chris): get all Abmeldung:Created, Unterbrechung:Created, Wiederholung:LvZugeordnet
-        $this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+		$this->logInfo('Start Job sendStglSammelmail');
 
-        $this->StudierendenantragModel->addJoin('public.tbl_prestudent','prestudent_id');
-        $this->db->group_start();
-        $this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
-        $this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-        $this->db->group_end();
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 
-        $this->db->or_group_start();
-        $this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
-        $this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-        $this->db->group_end();
+		$this->StudierendenantragModel->addJoin('public.tbl_prestudent','prestudent_id');
+		$this->db->group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();
 
-        $this->db->or_group_start();
-        $this->db->where('typ', Studierendenantrag_model::TYP_UNTERBRECHUNG);
-        $this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
-        $this->db->group_end();
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG_STGL);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();
 
-        $this->db->or_group_start();
-        $this->db->where('typ', Studierendenantrag_model::TYP_WIEDERHOLUNG);
-        $this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_LVSASSIGNED);
-        $this->db->group_end();
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_UNTERBRECHUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
+		$this->db->group_end();
 
-        $result =  $this->StudierendenantragModel->load();
-        if(isError($result))
-            return $this->logError(getError($result));
+		$this->db->or_group_start();
+		$this->db->where('typ', Studierendenantrag_model::TYP_WIEDERHOLUNG);
+		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_LVSASSIGNED);
+		$this->db->group_end();
 
-        if(!hasData($result))
-            return $this->logInfo('End Job sendStglSammelmail: 0 Mails sent');
+		$result =  $this->StudierendenantragModel->load();
+		if(isError($result))
+			return $this->logError(getError($result));
 
-        $antraege = getData($result);
+		if(!hasData($result))
+			return $this->logInfo('End Job sendStglSammelmail: 0 Mails sent');
 
-        $stgs = array();
-        $stgLeitungen = array();
+		$antraege = getData($result);
 
-        foreach($antraege as $antrag)
-        {
-            if(!isset($stgs[$antrag->studiengang_kz]))
-            {
-                $result = $this->StudiengangModel->getLeitung($antrag->studiengang_kz);
-                if(isError($result))
-                {
-                    $this->logError(getError($result));
-                    continue;
-                }
-                if(!hasData($result))
-                {
-                    $this->logError('Keine Leitung für Studiengang ' . $antrag->studiengang_kz . ' gefunden!');
-                    continue;
-                }
+		$stgs = array();
+		$stgLeitungen = array();
 
-                $leitung = current(getData($result));
-                if(!isset($stgLeitungen[$leitung->uid]))
-                {
-                    $stgLeitungen[$leitung->uid] = [ 'Details' => $leitung, 'stgs' => [] ];
-                }
-                $stgLeitungen[$leitung->uid] ['stgs'][] = $antrag->studiengang_kz;
+		foreach ($antraege as $antrag)
+		{
+			if (!isset($stgs[$antrag->studiengang_kz]))
+			{
+				$result = $this->StudiengangModel->getLeitung($antrag->studiengang_kz);
+				if (isError($result))
+				{
+					$this->logError(getError($result));
+					continue;
+				}
+				if (!hasData($result))
+				{
+					$this->logError('Keine Leitung für Studiengang ' . $antrag->studiengang_kz . ' gefunden!');
+					continue;
+				}
 
-                $result = $this->StudiengangModel->load($antrag->studiengang_kz);
-                if(isError($result))
-                {
-                    $this->logError(getError($result));
-                    continue;
-                }
-                if(!hasData($result))
-                {
-                    $this->logError('Keine Details für Studiengang ' . $antrag->studiengang_kz . ' gefunden!');
-                    continue;
-                }
-                $details = current(getData($result));
+				$leitung = current(getData($result));
+				if (!isset($stgLeitungen[$leitung->uid]))
+				{
+					$stgLeitungen[$leitung->uid] = [ 'Details' => $leitung, 'stgs' => [] ];
+				}
+				$stgLeitungen[$leitung->uid]['stgs'][] = $antrag->studiengang_kz;
 
-                $stgs[$antrag->studiengang_kz] = [ 'Abmeldung' => [], 'Unterbrechung' => [], 'Wiederholung' => [], 'Details' => $details ];
-            }
-            $stgs[$antrag->studiengang_kz] [$antrag->typ] = $antrag;
-        }
+				$result = $this->StudiengangModel->load($antrag->studiengang_kz);
+				if (isError($result))
+				{
+					$this->logError(getError($result));
+					continue;
+				}
+				if (!hasData($result))
+				{
+					$this->logError('Keine Details für Studiengang ' . $antrag->studiengang_kz . ' gefunden!');
+					continue;
+				}
+				$details = current(getData($result));
 
-/*        var_dump($stgs);
-        var_dump($stgLeitungen);*/
+				$stgs[$antrag->studiengang_kz] = [
+					'Abmeldung' => [],
+					'Unterbrechung' => [],
+					'Wiederholung' => [],
+					'Details' => $details
+				];
+			}
+			$stgs[$antrag->studiengang_kz][str_replace('Stgl', '', $antrag->typ)] = $antrag;
+		}
 
-        $count = 0;
-        foreach($stgLeitungen as $leitung)
-        {
-            $data = array();
-            if(sendSanchoMail("Sancho_Mail_Antrag_Stgl",$data,$leitung['Details']->email, 'Anträge - Aktion(en) erforderlich'))
-                $count++;
-        }
+		$this->load->model('system/Sprache_model', 'SpracheModel');
+		$result = $this->SpracheModel->loadWhere(['content' => true]);
+		if (isError($result)) {
+			$this->logError(getError($result));
+			$languages = [DEFAULT_LANGUAGE];
+		} else if (!hasData($result)) {
+			$languages = [DEFAULT_LANGUAGE];
+		} else {
+			$languages = array_map(function ($row) {
+				return $row->sprache;
+			}, getData($result));
+		}
 
-        $this->logInfo($count . " Emails erfolgreich versandt");
+		$count = 0;
+		foreach ($stgLeitungen as $leitung)
+		{
+			$data = [
+				'name' => trim($leitung['Details']->vorname . ' ' . $leitung['Details']->nachname)
+			];
 
-		// TODO(chris): Emailadresse stg
-		// TODO(chris): data Fertig
+			foreach ($languages as $lang) {
+				unset($this->p);
+				$this->loadPhrases(['studierendenantrag'], $lang);
 
-        $this->logInfo('End Job sendStglSammelmail');
+				$table = '';
+				foreach ($leitung['stgs'] as $studiengang_kz) {
+					$rows = '';
+					$stg = $stgs[$studiengang_kz];
+					foreach (['Abmeldung', 'Unterbrechung', 'Wiederholung'] as $typ) {
+						$c = count($stg[$typ]);
+						if ($c) {
+							$rows .= $this->p->t('studierendenantrag', 'mail_part_x_new_' . $typ, ['count' => $c]);
+						}
+					}
+					$table .= $this->p->t('studierendenantrag', 'mail_part_table', ['stg_bezeichnung' => $stg['Details']->bezeichnung, 'stg_orgform_kurzbz' => $stg['Details']->orgform_kurzbz, 'rows' => $rows]);
+				}
+				$data['table_' . $lang] = $table;
+			}
+
+			$data['table'] = $data['table_' . DEFAULT_LANGUAGE];
+
+			if (sendSanchoMail("Sancho_Mail_Antrag_Stgl", $data, $leitung['Details']->uid . '@' . DOMAIN, 'Anträge - Aktion(en) erforderlich'))
+				$count++;
+		}
+
+		$this->logInfo($count . " Emails erfolgreich versandt");
+
+		$this->logInfo('End Job sendStglSammelmail');
 	}
 
 	/**
@@ -210,22 +247,22 @@ class AntragJob extends JOB_Controller
 			return;
 		}
 
-        $digi_start= $this->config->item('digitalization_start');
-        if($digi_start)
-            $digi_start = new DateTime($digi_start);
+		$digi_start= $this->config->item('digitalization_start');
+		if($digi_start)
+			$digi_start = new DateTime($digi_start);
 
 		$dateDeadline = new DateTime();
 		$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
 
-        $result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed(
-            [
-                null,
-                Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
-                Studierendenantragstatus_model::STATUS_REQUESTSENT_2
-            ],
-            $dateDeadline,
-            $digi_start
-        );
+		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed(
+			[
+				null,
+				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+				Studierendenantragstatus_model::STATUS_REQUESTSENT_2
+			],
+			$dateDeadline,
+			$digi_start
+		);
 		if(isError($result))
 		{
 			$this->logError(getError($result));
@@ -238,18 +275,18 @@ class AntragJob extends JOB_Controller
 			$prestudents = $this->prestudentsGetUnique($prestudents);
 
 
-            foreach ($prestudents as $prestudent)
-            {
-                $result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, $prestudent->studiensemester_kurzbz, $insertvon);
-                if (isError($result))
-                    $this->logError(getError($result));
-                else
-                    $count++;
-            }
-            $this->logInfo($count . " Students set to Abbrecher");
-        }
+			foreach ($prestudents as $prestudent)
+			{
+				$result = $this->prestudentlib->setAbbrecher($prestudent->prestudent_id, $prestudent->studiensemester_kurzbz, $insertvon);
+				if (isError($result))
+					$this->logError(getError($result));
+				else
+					$count++;
+			}
+			$this->logInfo($count . " Students set to Abbrecher");
+		}
 
-        $this->logInfo('Ende Job handleWiederholerDeadline');
+		$this->logInfo('Ende Job handleWiederholerDeadline');
 	}
 
 	/**
diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index b1ec9e061..52242d7d6 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -33,29 +33,14 @@ $this->load->view(
 			<?php if ($antraege) { ?>
 				<?php foreach($antraege as $prestudent_id => $array){ ?>
 					<h4><?= $array['bezeichnungStg']; ?> (<?= $array['bezeichnungOrgform']; ?>)</h4>
-					<?php switch(count($array['allowedNewTypes'])) {
-						case 0: ?>
-							<button class="btn btn-outline-secondary" type="button" disabled>
-								<i class="fa-regular fa-plus fa-xl"></i> <?= $this->p->t('studierendenantrag', 'btn_new'); ?>
-							</button>
-							<?php
-							break;
-						case 1:
-						?>
-							<a class="btn btn-outline-secondary" href="<?= site_url('lehre/Studierendenantrag/' . strtolower($array['allowedNewTypes'][0]) . '/' . $prestudent_id); ?>"><i class="fa-regular fa-plus fa-xl"></i> <?= $array['allowedNewTypes'][0]; ?> <?= $this->p->t('studierendenantrag', 'btn_new'); ?></a>
-							<?php
-							break;
-						default:
-						?>
-						<div class="dropdown">
-							<button class="btn btn-outline-secondary dropdown-toggle" type="button" id="dropdownMenuButton1" data-bs-toggle="dropdown" aria-expanded="false">
-								<i class="fa-regular fa-plus fa-xl"></i> <?= $this->p->t('studierendenantrag', 'btn_new'); ?>
-							</button>
-							<ul class="dropdown-menu" aria-labelledby="dropdownMenuButton1">
-								<?php foreach($array['allowedNewTypes'] as $type){ ?>
-									<li><a class="dropdown-item" href="<?= site_url('lehre/Studierendenantrag/' . strtolower($type) . '/' . $prestudent_id); ?>"><?= $this->p->t('studierendenantrag', 'antrag_typ_' . $type); ?></a></li>
-								<?php } ?>
-							</ul>
+
+					<?php foreach ($array['allowedNewTypes'] as $type) { ?>
+						<div class="alert alert-secondary">
+							<p><?= $this->p->t('studierendenantrag', 'calltoaction_' . $type); ?></p>
+							<hr>
+							<a href="<?= site_url('lehre/Studierendenantrag/' . strtolower($type) . '/' . $prestudent_id); ?>" class="btn btn-outline-secondary">
+								<i class="fa-regular fa-plus fa-xl"></i> <?= $this->p->t('studierendenantrag', 'antrag_typ_' . $type); ?>
+							</a>
 						</div>
 					<?php } ?>
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index e3bee6643..9e86b0bdc 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20546,6 +20546,146 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_part_table',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '<table><tr><th>{stg_bezeichnung} ({stg_orgform_kurzbz})</th></tr>{rows}</table>',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '<table><tr><th>{stg_bezeichnung} ({stg_orgform_kurzbz})</th></tr>{rows}</table>',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_part_x_new_Abmeldung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '<tr><td>{count} neue Abmeldung(en)</td></tr>',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '<tr><td>{count} new De-registration(s)</td></tr>',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_part_x_new_Unterbrechung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '<tr><td>{count} neue(r) Antrag/Anträge auf Unterbrechung</td></tr>',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '<tr><td>{count} new application(s) for Interruption</td></tr>',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_part_x_new_Wiederholung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '<tr><td>{count} neue LV Zuweisung(en) für Wiederholer</td></tr>',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '<tr><td>{count} new LV assignment(s) for repeaters</td></tr>',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'calltoaction_Abmeldung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die Abmeldung vom Studium kannst du hier durchführen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You can deregister from your studies here.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'calltoaction_Unterbrechung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Eine Unterbrechung des Studiums ist hier zu beantragen. Die Gründe der Unterbrechung und die beabsichtigte Fortsetzung des Studiums sind nachzuweisen oder glaubhaft zu machen. In der Entscheidung über den Antrag sind zwingende persönliche, gesundheitliche oder berufliche Gründe zu berücksichtigen. Während der Unterbrechung können keine Prüfungen abgelegt werden.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'You can apply for an interruption of your studies here. The reasons for the interruption and the intended continuation of the course must be proven or made credible. Compelling personal, health or professional reasons must be taken into account when deciding on the application. No exams can be taken during the interruption.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'calltoaction_Wiederholung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Studierenden steht einmalig das Recht auf Wiederholung eines Studienjahres in Folge einer negativ beurteilten kommissionellen Prüfung zu. Die Wiederholung ist bei der Studiengangsleitung binnen eines Monats ab Mitteilung des Prüfungsergebnisses bekannt zu geben. Die Studiengangsleitung hat Prüfungen und Lehrveranstaltungen für die Wiederholung des Studienjahres festzulegen, wobei nicht bestandene Prüfungen und Lehrveranstaltungen jedenfalls, bestandene Prüfungen und Lehrveranstaltungen nur, sofern es der Zweck des Studiums erforderlich macht, zu wiederholen oder erneut zu besuchen sind.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Students have the one-time right to repeat an academic year as a result of a negative examination by a committee. The head of the degree program must be notified of the repetition within one month of notification of the examination result. The head of the degree program must determine examinations and courses for the repetition of the academic year, whereby failed examinations and courses are to be repeated or attended again, in any case, passed examinations and courses only if the purpose of the course makes it necessary.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 
 );
 

From b4370ece82a603fabb0a7484fba264b0475ef0ea Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 20 Jul 2023 15:07:46 +0200
Subject: [PATCH 074/175] Comment added

---
 application/controllers/jobs/AntragJob.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 8130f8a95..a4be6da8b 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -160,6 +160,7 @@ class AntragJob extends JOB_Controller
 
 			$data['table'] = $data['table_' . DEFAULT_LANGUAGE];
 
+			// NOTE(chris): Sancho mail
 			if (sendSanchoMail("Sancho_Mail_Antrag_Stgl", $data, $leitung['Details']->uid . '@' . DOMAIN, 'Anträge - Aktion(en) erforderlich'))
 				$count++;
 		}

From 5d97abc6acaf730cbf124856c143910e1ad6f84c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 20 Jul 2023 16:55:09 +0200
Subject: [PATCH 075/175] Mails

---
 application/libraries/AntragLib.php | 87 ++++++++++++++++++-----------
 system/phrasesupdate.php            | 40 +++++++++++++
 2 files changed, 95 insertions(+), 32 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index c1cab664f..628068498 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -180,8 +180,7 @@ class AntragLib
 						// NOTE(chris): Sancho mail
 						sendSanchoMail($vorlage, $data, $prestudent_status->email, $subject);
 					}
-				}
-				if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL) {
+				} else { // ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL)
 					$result = $this->_ci->PrestudentstatusModel->getLastStatus($antrag->prestudent_id, '', 'Student');
 					if (isError($result))
 					{
@@ -206,33 +205,35 @@ class AntragLib
 						$errors[] = getError($result);
 						continue;
 					}
+				}
 
+				$res = $this->_ci->PrestudentModel->load($antrag->prestudent_id);
 
-					$res = $this->_ci->PrestudentModel->load($antrag->prestudent_id);
-
+				if (hasData($res)) {
+					$prestudent = current(getData($res));
+					$res = $this->_ci->PersonModel->load($prestudent->person_id);
 					if (hasData($res)) {
-						$prestudent = current(getData($res));
-						$res = $this->_ci->PersonModel->load($prestudent->person_id);
-						if (hasData($res)) {
-							$person = current(getData($res));
-							$name = trim($person->vorname . ' ' . $person->nachname);
-						} else {
-							$name = $this->_ci->p->t('person', 'studentIn');
-						}
-						$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
-						if (hasData($res)) {
-							$kontakt = current(getData($res));
-							$email = $kontakt->kontakt;
-							sendSanchoMail(
-								'Sancho_Mail_Antrag_A_Stgl',
-								[
-									'name' => $name,
-									'grund' => $antrag->grund
-								],
-								$email,
-								$this->_ci->p->t('studierendenantrag', 'mail_subject_A_Stgl')
-							);
-						}
+						$person = current(getData($res));
+						$name = trim($person->vorname . ' ' . $person->nachname);
+					} else {
+						$name = $this->_ci->p->t('person', 'studentIn');
+					}
+					$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
+					if (hasData($res)) {
+						$kontakt = current(getData($res));
+						$email = $kontakt->kontakt;
+						$vorlage = $antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG ? 'Student' : 'Stgl';
+
+						// NOTE(chris): Sancho mail
+						sendSanchoMail(
+							'Sancho_Mail_Antrag_A_' . $vorlage,
+							[
+								'name' => $name,
+								'grund' => $antrag->grund
+							],
+							$email,
+							$this->_ci->p->t('studierendenantrag', 'mail_subject_A_' . $vorlage)
+						);
 					}
 				}
 			}
@@ -250,8 +251,9 @@ class AntragLib
 	 *
 	 * @return stdClass
 	 */
-	public function denyObjectionAbmeldung($studierendenantrag_id, $insertvon)
+	public function denyObjectionAbmeldung($studierendenantrag_id, $insertvon, $grund = null)
 	{
+		// TODO(chris): grund?
 		$result = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
 		if (isError($result))
 		{
@@ -277,6 +279,7 @@ class AntragLib
 		$result = $this->_ci->StudierendenantragstatusModel->insert([
 			'studierendenantrag_id' => $studierendenantrag_id,
 			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
+			'grund' => $grund,
 			'insertvon' => $insertvon
 		]);
 		if (isError($result))
@@ -303,11 +306,10 @@ class AntragLib
 					$kontakt = current(getData($res));
 					$email = $kontakt->kontakt;
 					sendSanchoMail(
-						// TODO(chris): Vorlage erstellen
-						'Sancho_Mail_Antrag_A_ObjectionDenied',
+						'Sancho_Mail_Antrag_A_ObjDenied',
 						[
 							'name' => $name,
-							'grund' => $antrag->grund
+							'grund' => $grund
 						],
 						$email,
 						$this->_ci->p->t('studierendenantrag', 'mail_subject_A_ObjectionDenied')
@@ -1407,8 +1409,8 @@ class AntragLib
 			return $result;
 		if (!hasData($result))
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_person_prestudent', ['prestudent_id' => $prestudent_id]));
-		$result = current(getData($result));
-		$student = trim($result->vorname . ' ' . $result->nachname);
+		$person = current(getData($result));
+		$student = trim($person->vorname . ' ' . $person->nachname);
 
 		$result = $this->_ci->PersonModel->getFullName($insertvon);
 		if (isError($result))
@@ -1434,6 +1436,27 @@ class AntragLib
 		))
 			return error($this->_ci->p->t('studierendenantrag', 'error_mail_to', ['email' => $email]));
 
+		$result = $this->_ci->KontaktModel->getZustellKontakt($person->person_id, ['email']);
+		if (hasData($result)) {
+			$kontakt = current(getData($result));
+			$email = $kontakt->kontakt;
+			
+			// NOTE(chris): Sancho mail
+			sendSanchoMail(
+				'Sancho_Mail_Antrag_W_Student',
+				[
+					'antrag_id' => $antrag_id,
+					'stg' => $stg->bezeichnung,
+					'sem' => $semester,
+					'mitarbeiter' => $mitarbeiter,
+					'name' => $student
+				],
+				$email,
+				$this->_ci->p->t('studierendenantrag', 'mail_subject_W_Student')
+			);
+		}
+
+
 		return success();
 	}
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9e86b0bdc..aa16ea77b 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20426,6 +20426,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_subject_A_Student',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Abmeldung freigegeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Unsubscribe released',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -20546,6 +20566,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_subject_W_Student',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wiederholung von Studiengangsleitung freigegeben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Repetition approved by course director',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From 74b1ca06147bf89f2383916eec3b2711cb338971 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 24 Jul 2023 10:24:21 +0200
Subject: [PATCH 076/175] Added phrases for Begruendung ECTS and Begruendung
 LVinhalt

---
 system/phrasesupdate.php | 60 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 28735e07f..6b0990b9f 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -10908,6 +10908,46 @@ Any unusual occurrences
                 'insertvon' => 'system'
             )
         )
+    ),
+    array(
+        'app' => 'core',
+        'category' => 'anrechnung',
+        'phrase' => 'begruendungEcts',
+        'insertvon' => 'system',
+        'phrases' => array(
+            array(
+                'sprache' => 'German',
+                'text' => 'Begründen Sie die Gleichwertigkeit der ECTS',
+                'description' => '',
+                'insertvon' => 'system'
+            ),
+            array(
+                'sprache' => 'English',
+                'text' => 'Give reasons for the equivalence of ECTS',
+                'description' => '',
+                'insertvon' => 'system'
+            )
+        )
+    ),
+    array(
+        'app' => 'core',
+        'category' => 'anrechnung',
+        'phrase' => 'begruendungLvinhalt',
+        'insertvon' => 'system',
+        'phrases' => array(
+            array(
+                'sprache' => 'German',
+                'text' => 'Begründen Sie die Gleichwertigkeit der Lehrveranstaltungsinhalte',
+                'description' => '',
+                'insertvon' => 'system'
+            ),
+            array(
+                'sprache' => 'English',
+                'text' => 'Give reasons for the equivalence of the course contents',
+                'description' => '',
+                'insertvon' => 'system'
+            )
+        )
     ),
 	array(
 		'app' => 'core',
@@ -13745,6 +13785,26 @@ array(
 			)
 		)
 	),
+    array(
+        'app' => 'core',
+        'category' => 'ui',
+        'phrase' => 'fehlendeMinZeichen',
+        'insertvon' => 'system',
+        'phrases' => array(
+            array(
+                'sprache' => 'German',
+                'text' => "Fehlende min. Zeichen",
+                'description' => '',
+                'insertvon' => 'system'
+            ),
+            array(
+                'sprache' => 'English',
+                'text' => "Missing min. Characters",
+                'description' => '',
+                'insertvon' => 'system'
+            )
+        )
+    ),
 	array(
 		'app' => 'core',
 		'category' => 'anrechnung',

From f5ace15f7b9c39519377e1c1edc1e8957976f1c3 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Mon, 24 Jul 2023 14:15:22 +0200
Subject: [PATCH 077/175] added phrases to UHSTAT1 form

---
 application/controllers/codex/UHSTAT1.php |  24 +-
 application/views/codex/uhstat1.php       |  81 +++--
 system/phrasesupdate.php                  | 420 ++++++++++++++++++++++
 3 files changed, 494 insertions(+), 31 deletions(-)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index 071368aae..7deeb9eea 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -42,6 +42,8 @@ class UHSTAT1 extends FHC_Controller
 	{
 		$formData = $this->_getFormData();
 
+		if (isError($formData)) show_error(getError($formData));
+
 		if (!hasData($formData)) show_error("No form data could be loaded");
 
 		$this->load->view("codex/uhstat1.php", array('formData' => getData($formData)));
@@ -59,31 +61,31 @@ class UHSTAT1 extends FHC_Controller
 		$this->form_validation->set_error_delimiters('<span class="text-danger">', '</span>');
 
 		// check required fields
-		$this->form_validation->set_rules('geburtsstaat', 'Geburtsstaat', 'required', array('required' => $this->p->t('uhstat', 'feldFehlt')));
+		$this->form_validation->set_rules('geburtsstaat', 'Geburtsstaat', 'required', array('required' => $this->p->t('uhstat', 'angabeFehlt')));
 		$this->form_validation->set_rules(
 			'mutter_geburtsstaat',
 			'Geburtsstaat Mutter',
 			'required',
-			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
 		);
 		$this->form_validation->set_rules(
 			'mutter_bildungsstaat',
 			'Bildungsstaat Mutter',
 			'required',
-			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
 		);
 		$this->form_validation->set_rules(
 			'mutter_geburtsjahr',
 			'Geburtsjahr Mutter',
 			'required',
-			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
 		);
 		$this->form_validation->set_rules(
 			'mutter_bildungmax',
 			'Höchste Ausbildung Mutter',
 			'required|callback_bildungsstaat_bildungmax_check[m]',
 			array(
-				'required' => $this->p->t('uhstat', 'feldFehlt'),
+				'required' => $this->p->t('uhstat', 'angabeFehlt'),
 				'bildungsstaat_bildungmax_check' => $this->p->t('uhstat', 'ausbildungBildungsstaatUebereinstimmung')
 				//'Land der höchsten Ausbildung muss mit Bildungsstaat übereinstimmen'
 				// Bildungsstaat should correspond to state of bildung max
@@ -93,26 +95,26 @@ class UHSTAT1 extends FHC_Controller
 			'vater_geburtsstaat',
 			'Geburtsstaat Vater',
 			'required',
-			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
 		);
 		$this->form_validation->set_rules(
 			'vater_bildungsstaat',
 			'Bildungsstaat Vater',
 			'required',
-			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
 		);
 		$this->form_validation->set_rules(
 			'vater_geburtsjahr',
 			'Geburtsjahr Vater',
 			'required',
-			array('required' => $this->p->t('uhstat', 'feldFehlt'))
+			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
 		);
 		$this->form_validation->set_rules(
 			'vater_bildungmax',
 			'Höchste Ausbildung Vater',
 			'required|callback_bildungsstaat_bildungmax_check[v]',
 			array(
-				'required' => $this->p->t('uhstat', 'feldFehlt'),
+				'required' => $this->p->t('uhstat', 'angabeFehlt'),
 				'bildungsstaat_bildungmax_check' => $this->p->t('uhstat', 'ausbildungBildungsstaatUebereinstimmung')
 			)
 		);
@@ -171,7 +173,9 @@ class UHSTAT1 extends FHC_Controller
 
 		$formData = $this->_getFormData();
 
-		if (!hasData($formData)) show_error("No data found");
+		if (isError($formData)) show_error(getError($formData));
+
+		if (!hasData($formData)) show_error("No form data could be loaded");
 
 		// pass success/error messages to view
 		$successMessage = isset($uhstat1datenRes) && isSuccess($uhstat1datenRes) ? $this->p->t('uhstat', 'erfolgreichGespeichert') : '';
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index 48397a387..918364cf6 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -19,11 +19,22 @@ $this->load->view(
 		<h3>
 			<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungUeberschrift') ?>
 		</h3>
+		<p>
+			<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungEinleitungstext') ?>
+		</p>
+		<br>
 		<form class="form-horizontal" method="POST" action="<?php echo site_url('codex/UHSTAT1/saveUHSTAT1Data').'?person_id='.$formData['person_id'] ?>">
 			<fieldset>
 				<legend><?php echo $this->p->t('uhstat', 'persoenlicheAngaben') ?></legend>
+				<p>
+					<?php echo $this->p->t('uhstat', 'persoenlicheAngabenEinleitungstext') ?>
+				</p>
 				<div class="form-group">
-					<label for="geburtsstaat" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'geburtsstaat') ?></label>
+					<label for="geburtsstaat" class="col-sm-3 control-label">
+						<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
+						<br>
+						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+					</label>
 					<div class="col-sm-9">
 						<select type="text" name="geburtsstaat" id="geburtsstaat" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
@@ -39,11 +50,16 @@ $this->load->view(
 					</div>
 				</div>
 			</fieldset>
+			<br>
 			<fieldset>
 				<legend><?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigte') ?></legend>
+				<p>
+					<?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigteEinleitungstext') ?>
+				</p>
+				<br>
 				<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonEins') ?></h4>
 				<div class="form-group">
-					<label for="mutter_geburtsjahr" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'mutterGeburtsjahr') ?></label>
+					<label for="mutter_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
 					<div class="col-sm-9">
 						<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
@@ -59,7 +75,11 @@ $this->load->view(
 					</div>
 				</div>
 				<div class="form-group">
-					<label for="mutter_geburtsstaat" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'mutterGeburtsstaat') ?></label>
+					<label for="mutter_geburtsstaat" class="col-sm-3 control-label">
+						<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
+						<br>
+						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+					</label>
 					<div class="col-sm-9">
 						<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
@@ -75,7 +95,11 @@ $this->load->view(
 					</div>
 				</div>
 				<div class="form-group">
-					<label for="mutter_bildungsstaat" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'hoechsterAbschlussStaat') ?></label>
+					<label for="mutter_bildungsstaat" class="col-sm-3 control-label">
+						<?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschlussStaat')) ?>
+						<br>
+						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+					</label>
 					<div class="col-sm-9">
 						<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
@@ -91,7 +115,7 @@ $this->load->view(
 					</div>
 				</div>
 				<div class="form-group">
-					<label for="mutter_bildungmax" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'hoechsterAbschluss') ?></label>
+					<label for="mutter_bildungmax" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?></label>
 					<div class="col-sm-9">
 						<select type="text" name="mutter_bildungmax" id="mutter_bildungmax" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
@@ -119,9 +143,10 @@ $this->load->view(
 						<?php echo form_error('mutter_bildungmax'); ?>
 					</div>
 				</div>
+				<br>
 				<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonZwei') ?></h4>
 				<div class="form-group">
-					<label for="vater_geburtsjahr" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'vaterGeburtsjahr') ?></label>
+					<label for="vater_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
 					<div class="col-sm-9">
 						<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
@@ -137,7 +162,11 @@ $this->load->view(
 					</div>
 				</div>
 				<div class="form-group">
-					<label for="vater_geburtsstaat" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'vaterGeburtsstaat') ?></label>
+					<label for="vater_geburtsstaat" class="col-sm-3 control-label">
+						<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
+						<br>
+						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+					</label>
 					<div class="col-sm-9">
 						<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
@@ -153,7 +182,11 @@ $this->load->view(
 					</div>
 				</div>
 				<div class="form-group">
-					<label for="vater_bildungsstaat" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'hoechsterAbschlussStaat') ?></label>
+					<label for="vater_bildungsstaat" class="col-sm-3 control-label">
+						<?php echo $this->p->t('uhstat', 'hoechsterAbschlussStaat') ?>
+						<br>
+						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+					</label>
 					<div class="col-sm-9">
 						<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
@@ -169,7 +202,9 @@ $this->load->view(
 					</div>
 				</div>
 				<div class="form-group">
-					<label for="vater_bildungmax" class="col-sm-3 control-label"><?php echo $this->p->t('uhstat', 'hoechsterAbschluss') ?></label>
+					<label for="vater_bildungmax" class="col-sm-3 control-label">
+						<?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?>
+					</label>
 					<div class="col-sm-9">
 						<select type="text" name="vater_bildungmax" id="vater_bildungmax" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
@@ -198,20 +233,24 @@ $this->load->view(
 					</div>
 				</div>
 			</fieldset>
-			<div class="text-right">
-				<?php if (isset($successMessage)): ?>
-					<span class='text-success'><?php echo $successMessage ?></span>
-				<?php endif; ?>
-				<?php if (isset($errorMessage)): ?>
-					<span class='text-danger'><?php echo $errorMessage ?></span>
-				<?php endif; ?>
-				<button class="btn btn-success" type="submit">
-					<?php echo $this->p->t('ui', 'speichern') ?>
-				</button>
-			</div>
+			<br>
+			<fieldset>
+				<div class="form-group">
+					<div class="col-sm-12 text-right">
+						<?php if (isset($successMessage)): ?>
+							<span class='text-success'><?php echo $successMessage ?></span>
+						<?php endif; ?>
+						<?php if (isset($errorMessage)): ?>
+							<span class='text-danger'><?php echo $errorMessage ?></span>
+						<?php endif; ?>
+						<button class="btn btn-success btn-md" type="submit">
+							<?php echo $this->p->t('uhstat', 'pruefenUndSpeichern') ?>
+						</button>
+					</div>
+				</div>
+			</fieldset>
 		</form>
 	</div>
-
 </div>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0bc748c80..09f2633b8 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18123,6 +18123,426 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'angabeFehlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Angabe fehlt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Value is missing',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'ausbildungBildungsstaatUebereinstimmung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Höchster Abschluss (unterteilt in Österreich oder im Ausland/unbekannt) passt nicht zum Staat des höchsten Abschlusses.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Highest completed level of education (divided into those acquired in Austria and those abroad/unknown) does not match country of the highest completed level of education',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'erfolgreichGespeichert',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erfolgreich gespeichert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Saved successfully',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'fehlerBeimSpeichern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Fehler beim Speichern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Error when saving',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'uhstat1AnmeldungUeberschrift',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erhebung bei der Anmeldung zu einem Studium oder bei Studienbeginn',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Survey when applying for a study or at the start of studies',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'uhstat1AnmeldungEinleitungstext',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Das Senden der Daten ist nur möglich, wenn die Sozialversicherungsnummer (bzw. das Ersatzkennzeichen) gültig ist und alle Fragen beantwortet worden sind. Wenn Sie etwas nicht wissen, wählen Sie die Antwortmöglichkeit „unbekannt“, aber beantworten Sie bitte alle Fragen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Sending the data is only possible if the social security number (or the substitute code) is valid and all questions have been answered. If you don\'t know something, choose the answer option “unknown”, but please answer all questions.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'persoenlicheAngaben',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Persönliche Angaben',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Personal data',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'persoenlicheAngabenEinleitungstext',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Wenn Sie keine österreichische Sozialversicherungsnummer haben, dann fragen Sie bitte die Hochschule, an der Sie studieren möchten, nach Ihrem Ersatzkennzeichen.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'If you do not have an Austrian \'Sozialversicherungsnummer\' (social security number), please ask the university or university college at which you would like to study for your substitute code (\'Ersatzkennzeichen\').',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'angabenErziehungsberechtigte',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Angaben zu Ihren Erziehungsberechtigten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Information about your legal guardians',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'angabenErziehungsberechtigteEinleitungstext',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Die folgenden Fragen beziehen sich auf Personen, welche für Sie erziehungsberechtigt waren oder sind (Eltern oder jene Personen, die für Sie eine entsprechende Rolle übernommen haben, wie z.B. Stief- oder Pflegeeltern).',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'The following issues refer to your legal guardians (parents or persons who were in the role of the parents, e.g. stepparents or foster parents).',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'bitteAuswaehlen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte auswählen...',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'please select...',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'erziehungsberechtigtePersonEins',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erziehungsberechtigte Person 1/Mutter',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Legal guardian 1/mother',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'geburtsjahr',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Geburtsjahr',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'year of birth',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'geburtsstaat',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Geburtsstaat',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'country of birth',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'inDenHeutigenGrenzen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'in den heutigen Grenzen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'in today\'s borders',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'hoechsterAbschlussStaat',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Staat des höchsten Abschlusses',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Country of the highest completed level of education',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'hoechsterAbschluss',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Höchster Abschluss',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Highest completed level of education',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'wennAbschlussInOesterreich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Falls der höchste Bildungsabschluss in Österreich erworben wurde',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'If the highest level of education was completed in Austria:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'wennAbschlussNichtInOesterreich',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Falls das Land des höchsten erworbenen Bildungsabschlusses unbekannt oder nicht Österreich ist',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'If the country of the highest completed level of education is unknown or not Austria:',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'erziehungsberechtigtePersonZwei',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erziehungsberechtigte Person 2/Vater',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Legal guardian 2/father',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'pruefenUndSpeichern',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Prüfen und Speichern',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Check and submit',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	)
 );
 
 

From 6eaa8c4c010abf724283cdd2f6c803697f40edb4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Mon, 24 Jul 2023 16:04:46 +0200
Subject: [PATCH 078/175] Codesniffer and MassDetector

---
 application/config/studierendenantrag.php     |   1 -
 .../components/Antrag/Abmeldung.php           |   8 +-
 .../controllers/components/Antrag/Leitung.php |  24 +-
 .../components/Antrag/Unterbrechung.php       |   4 +-
 .../components/Antrag/Wiederholung.php        |  10 +-
 .../controllers/components/Phrasen.php        |   1 -
 application/controllers/jobs/AntragJob.php    |  73 +--
 .../controllers/lehre/Antrag/Wiederholung.php |   5 +-
 application/libraries/AntragLib.php           |  83 +++-
 application/libraries/PrestudentLib.php       |  26 +-
 .../models/crm/Prestudentstatus_model.php     |   6 +-
 .../models/education/Pruefung_model.php       |  31 +-
 .../education/Studierendenantrag_model.php    |  13 +-
 ...dierendenantraglehrveranstaltung_model.php |   6 +-
 .../models/organisation/Studiengang_model.php |   9 +-
 .../lehre/Antrag/Wiederholung/Student.php     |   4 +-
 public/js/apps/lehre/Antrag.js                |   3 +-
 public/js/apps/lehre/Antrag/Lvzuweisung.js    |   5 +
 .../Leitung/Actions/Columns.js                |   2 +-
 .../Studierendenantrag/Leitung/LvPopup.js     |  14 +-
 .../Studierendenantrag/Leitung/Table.js       | 419 +++++++++---------
 21 files changed, 396 insertions(+), 351 deletions(-)

diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
index 89b066d33..786256a82 100644
--- a/application/config/studierendenantrag.php
+++ b/application/config/studierendenantrag.php
@@ -2,7 +2,6 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
-// TODO(chris): review this!
 $config['frist_rueckzahlung_studiengebuer_WS'] = '15.10.';
 $config['frist_rueckzahlung_studiengebuer_SS'] = '15.03.';
 
diff --git a/application/controllers/components/Antrag/Abmeldung.php b/application/controllers/components/Antrag/Abmeldung.php
index c55820437..f30de6803 100644
--- a/application/controllers/components/Antrag/Abmeldung.php
+++ b/application/controllers/components/Antrag/Abmeldung.php
@@ -57,7 +57,13 @@ class Abmeldung extends FHC_Controller
 		}
 		elseif ($result == -1)
 		{
-			$result = $this->antraglib->getDetailsForLastAntrag($prestudent_id, [Studierendenantrag_model::TYP_ABMELDUNG, Studierendenantrag_model::TYP_ABMELDUNG_STGL]);
+			$result = $this->antraglib->getDetailsForLastAntrag(
+                $prestudent_id,
+                [
+                    Studierendenantrag_model::TYP_ABMELDUNG,
+                    Studierendenantrag_model::TYP_ABMELDUNG_STGL
+                ]
+            );
 			if (isError($result)) {
 				return $this->outputJsonError(getError($result));
 			}
diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
index 54e5b65e6..6cc25f87d 100644
--- a/application/controllers/components/Antrag/Leitung.php
+++ b/application/controllers/components/Antrag/Leitung.php
@@ -2,6 +2,8 @@
 
 if (! defined('BASEPATH')) exit('No direct script access allowed');
 
+use \stdClass as stdClass;
+
 /**
  *
  */
@@ -116,7 +118,7 @@ class Leitung extends FHC_Controller
 			'Studierenden Antrag',
 			'required|callback_isEntitledToReopenAntrag',
 			[
-				'isEntitledToReopenAntrag' => $this->p->t('studierendenantrag','error_no_right')
+				'isEntitledToReopenAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
 			]
 		);
 
@@ -146,8 +148,8 @@ class Leitung extends FHC_Controller
 			'Studierenden Antrag',
 			'required|callback_isEntitledToObjectAntrag|callback_canBeObjected',
 			[
-				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag','error_no_right'),
-				'canBeObjected' => $this->p->t('studierendenantrag','error_no_objection')
+				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
+				'canBeObjected' => $this->p->t('studierendenantrag', 'error_no_objection')
 			]
 		);
 
@@ -177,8 +179,8 @@ class Leitung extends FHC_Controller
 			'Studierenden Antrag',
 			'required|callback_isEntitledToObjectAntrag|callback_isObjected',
 			[
-				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag','error_no_right'),
-				'isObjected' => $this->p->t('studierendenantrag','error_not_objected')
+				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
+				'isObjected' => $this->p->t('studierendenantrag', 'error_not_objected')
 			]
 		);
 
@@ -208,8 +210,8 @@ class Leitung extends FHC_Controller
 			'Studierenden Antrag',
 			'required|callback_isEntitledToObjectAntrag|callback_isObjected',
 			[
-				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag','error_no_right'),
-				'isObjected' => $this->p->t('studierendenantrag','error_not_objected')
+				'isEntitledToObjectAntrag' => $this->p->t('studierendenantrag', 'error_no_right'),
+				'isObjected' => $this->p->t('studierendenantrag', 'error_not_objected')
 			]
 		);
 
@@ -265,7 +267,7 @@ class Leitung extends FHC_Controller
 			'Studierenden Antrag',
 			'required|callback_isEntitledToApproveAntrag',
 			[
-				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag','error_no_right')
+				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
 			]
 		);
 
@@ -301,7 +303,7 @@ class Leitung extends FHC_Controller
 			'Studierenden Antrag',
 			'required|callback_isEntitledToApproveAntrag',
 			[
-				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag','error_no_right')
+				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
 			]
 		);
 
@@ -332,7 +334,7 @@ class Leitung extends FHC_Controller
 			'Studierenden Antrag',
 			'required|callback_isEntitledToRejectAntrag',
 			[
-				'isEntitledToRejectAntrag' => $this->p->t('studierendenantrag','error_no_right')
+				'isEntitledToRejectAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
 			]
 		);
 		$this->form_validation->set_rules('grund', 'Grund', 'required');
@@ -365,7 +367,7 @@ class Leitung extends FHC_Controller
 			'Studierenden Antrag',
 			'required|callback_isEntitledToApproveAntrag',
 			[
-				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag','error_no_right')
+				'isEntitledToApproveAntrag' => $this->p->t('studierendenantrag', 'error_no_right')
 			]
 		);
 
diff --git a/application/controllers/components/Antrag/Unterbrechung.php b/application/controllers/components/Antrag/Unterbrechung.php
index 78594fa65..f0c269617 100644
--- a/application/controllers/components/Antrag/Unterbrechung.php
+++ b/application/controllers/components/Antrag/Unterbrechung.php
@@ -69,7 +69,9 @@ class Unterbrechung extends FHC_Controller
 
 			$result = getData($result);
 			$this->output->set_status_header(400);
-			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_antrag_pending', ['typ' => $this->p->t('studierendenantrag','antrag_typ_' . $result->typ)]));
+			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_antrag_pending', [
+                'typ' => $this->p->t('studierendenantrag', 'antrag_typ_' . $result->typ)
+            ]));
 		}
 		elseif ($result == -3)
 		{
diff --git a/application/controllers/components/Antrag/Wiederholung.php b/application/controllers/components/Antrag/Wiederholung.php
index a2252a7f5..e7fde6031 100644
--- a/application/controllers/components/Antrag/Wiederholung.php
+++ b/application/controllers/components/Antrag/Wiederholung.php
@@ -67,7 +67,7 @@ class Wiederholung extends FHC_Controller
 		$result = $result->retval;
 		if (!$result) {
 			$this->output->set_status_header(REST_Controller::HTTP_FORBIDDEN);
-			return $this->outputJsonError($this->p->t('studierendenantrag','error_no_student_no_failed_exam'));
+			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_no_student_no_failed_exam'));
 		}
 		elseif ($result == -1)
 		{
@@ -97,7 +97,9 @@ class Wiederholung extends FHC_Controller
 
 			$result = getData($result);
 			$this->output->set_status_header(REST_Controller::HTTP_BAD_REQUEST);
-			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_antrag_pending', ['typ' => $this->p->t('studierendenantrag','antrag_typ_' . $result->typ)]));
+			return $this->outputJsonError($this->p->t('studierendenantrag', 'error_antrag_pending', [
+                'typ' => $this->p->t('studierendenantrag', 'antrag_typ_' . $result->typ)
+            ]));
 		}
 		elseif ($result == -3)
 		{
@@ -217,7 +219,9 @@ class Wiederholung extends FHC_Controller
 			return [
 				'studierendenantrag_id' => $lv->studierendenantrag_id,
 				'lehrveranstaltung_id' => $lv->lehrveranstaltung_id,
-				'note' => $lv->zugelassen ? ($lv->zugelassen == 1 ? 0 : $this->config->item('wiederholung_note_angerechnet')) : $this->config->item('wiederholung_note_nicht_zugelassen'),
+				'note' => $lv->zugelassen
+                    ? ($lv->zugelassen == 1 ? 0 : $this->config->item('wiederholung_note_angerechnet'))
+                    : $this->config->item('wiederholung_note_nicht_zugelassen'),
 				'anmerkung' => $lv->anmerkung,
 				'insertvon' => getAuthUID(),
 				'studiensemester_kurzbz' => $lv->studiensemester_kurzbz
diff --git a/application/controllers/components/Phrasen.php b/application/controllers/components/Phrasen.php
index 52de719f7..87516ce00 100644
--- a/application/controllers/components/Phrasen.php
+++ b/application/controllers/components/Phrasen.php
@@ -19,5 +19,4 @@ class Phrasen extends FHC_Controller
 		$this->load->library('PhrasesLib', [$module], 'pj');
 		$this->outputJsonSuccess(json_decode($this->pj->getJSON()));
 	}
-
 }
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index a4be6da8b..f932a420c 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -6,8 +6,6 @@ use \DateTime as DateTime;
 
 class AntragJob extends JOB_Controller
 {
-	private $allPrestudentsWhereCommitteeExamFailed;
-
 	/**
 	 * API constructor
 	 */
@@ -40,7 +38,7 @@ class AntragJob extends JOB_Controller
 
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 
-		$this->StudierendenantragModel->addJoin('public.tbl_prestudent','prestudent_id');
+		$this->StudierendenantragModel->addJoin('public.tbl_prestudent', 'prestudent_id');
 		$this->db->group_start();
 		$this->db->where('typ', Studierendenantrag_model::TYP_ABMELDUNG);
 		$this->db->where('campus.get_status_studierendenantrag(studierendenantrag_id)', Studierendenantragstatus_model::STATUS_CREATED);
@@ -124,7 +122,7 @@ class AntragJob extends JOB_Controller
 		if (isError($result)) {
 			$this->logError(getError($result));
 			$languages = [DEFAULT_LANGUAGE];
-		} else if (!hasData($result)) {
+		} elseif (!hasData($result)) {
 			$languages = [DEFAULT_LANGUAGE];
 		} else {
 			$languages = array_map(function ($row) {
@@ -153,7 +151,11 @@ class AntragJob extends JOB_Controller
 							$rows .= $this->p->t('studierendenantrag', 'mail_part_x_new_' . $typ, ['count' => $c]);
 						}
 					}
-					$table .= $this->p->t('studierendenantrag', 'mail_part_table', ['stg_bezeichnung' => $stg['Details']->bezeichnung, 'stg_orgform_kurzbz' => $stg['Details']->orgform_kurzbz, 'rows' => $rows]);
+					$table .= $this->p->t('studierendenantrag', 'mail_part_table', [
+                        'stg_bezeichnung' => $stg['Details']->bezeichnung,
+                        'stg_orgform_kurzbz' => $stg['Details']->orgform_kurzbz,
+                        'rows' => $rows
+                    ]);
 				}
 				$data['table_' . $lang] = $table;
 			}
@@ -321,13 +323,11 @@ class AntragJob extends JOB_Controller
 		$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
 		$this->StudierendenantragModel->addSelect('s.insertamum');
 
-		$result = $this->StudierendenantragModel->getWithLastStatusWhere(
-				[
-					'typ' => Studierendenantrag_model::TYP_ABMELDUNG_STGL,
-					'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
-					's.insertamum <=' => $dateDeadline->format('c')
-				]
-			);
+		$result = $this->StudierendenantragModel->getWithLastStatusWhere([
+            'typ' => Studierendenantrag_model::TYP_ABMELDUNG_STGL,
+            'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
+            's.insertamum <=' => $dateDeadline->format('c')
+        ]);
 
 		if(isError($result))
 		{
@@ -340,7 +340,13 @@ class AntragJob extends JOB_Controller
 
 			foreach ($antraege as $antrag)
 			{
-				$result = $this->prestudentlib->setAbbrecher($antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon, 'abbrecherStgl', $antrag->insertamum);
+				$result = $this->prestudentlib->setAbbrecher(
+                    $antrag->prestudent_id,
+                    $antrag->studiensemester_kurzbz,
+                    $insertvon,
+                    'abbrecherStgl',
+                    $antrag->insertamum
+                );
 				if (isError($result))
 					$this->logError(getError($result));
 				else
@@ -402,7 +408,8 @@ class AntragJob extends JOB_Controller
 		$this->logInfo('Ende Job sendAufforderungWiederholer');
 	}
 
-	protected function prestudentsGetUnique($prestudents) {
+	protected function prestudentsGetUnique($prestudents)
+    {
 		$result = [];
 		foreach ($prestudents as $prestudent) {
 			if (!isset($result[$prestudent->prestudent_id]))
@@ -504,42 +511,4 @@ class AntragJob extends JOB_Controller
 		}
 		$this->logInfo('Ende Job sendAufforderungWiederholer ' . $name);
 	}
-
-
-
-	// TODO(chris): REMOVE DEBUG!
-
-	/**
-	 * Writes a cronjob info log
-	 */
-	protected function logInfo($response, $parameters = null)
-	{
-		echo $response . "\n";
-	}
-
-	/**
-	 * Writes a cronjob debug log
-	 */
-	protected function logDebug($response, $parameters = null)
-	{
-		echo $response . "\n";
-	}
-
-	/**
-	 * Writes a cronjob warning log
-	 */
-	protected function logWarning($response, $parameters = null)
-	{
-		echo $response . "\n";
-	}
-
-	/**
-	 * Writes a cronjob error log
-	 */
-	protected function logError($response, $parameters = null)
-	{
-		echo $response . "\n";
-	}
-
-
 }
diff --git a/application/controllers/lehre/Antrag/Wiederholung.php b/application/controllers/lehre/Antrag/Wiederholung.php
index 5b22641f7..2aa57d733 100644
--- a/application/controllers/lehre/Antrag/Wiederholung.php
+++ b/application/controllers/lehre/Antrag/Wiederholung.php
@@ -29,7 +29,7 @@ class Wiederholung extends Auth_Controller
 
 	// -----------------------------------------------------------------------------------------------------------------
 	// Public methods
-	public function assistenz($antrag_id, $frame = false)
+	public function assistenz($antrag_id)
 	{
 
 		$result = $this->antraglib->getDetailsForAntrag($antrag_id);
@@ -42,8 +42,7 @@ class Wiederholung extends Auth_Controller
 
 		$this->load->view('lehre/Antrag/Wiederholung/Student', [
 			'antrag_id' => $antrag_id,
-			'antrag' => getData($result),
-			'frame' => $frame
+			'antrag' => getData($result)
 		]);
 	}
 }
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 628068498..753432edf 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -125,7 +125,6 @@ class AntragLib
 	{
 		$errors = [];
 		foreach ($studierendenantrag_ids as $studierendenantrag_id) {
-
 			$result = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
 			if (isError($result))
 			{
@@ -162,7 +161,14 @@ class AntragLib
 						$vorlage ='Sancho_Mail_Antrag_A_Approve';
 						$subject = $this->_ci->p->t('studierendenantrag', 'mail_subject_A_Approve');
 
-						$result = $this->_ci->prestudentlib->setAbbrecher($antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon, 'abbrecherStud', $antrag->datum, $insertam) ;
+						$result = $this->_ci->prestudentlib->setAbbrecher(
+                            $antrag->prestudent_id,
+                            $antrag->studiensemester_kurzbz,
+                            $insertvon,
+                            'abbrecherStud',
+                            $antrag->datum,
+                            $insertam
+                        );
 						if (isError($result))
 						{
 							$errors[] = getError($result);
@@ -199,7 +205,7 @@ class AntragLib
 						'status_kurzbz'=>$prestudentstatus->status_kurzbz,
 						'studiensemester_kurzbz'=>$prestudentstatus->studiensemester_kurzbz,
 						'ausbildungssemester'=>$prestudentstatus->ausbildungssemester
-					],[]);
+					], []);
 					if (isError($result))
 					{
 						$errors[] = getError($result);
@@ -285,7 +291,13 @@ class AntragLib
 		if (isError($result))
 			return $result;
 		else {
-			$result = $this->_ci->prestudentlib->setAbbrecher($antrag->prestudent_id, $antrag->studiensemester_kurzbz, $insertvon, 'abbrecherStgl', $status->insertamum);
+			$result = $this->_ci->prestudentlib->setAbbrecher(
+                $antrag->prestudent_id,
+                $antrag->studiensemester_kurzbz,
+                $insertvon,
+                'abbrecherStgl',
+                $status->insertamum
+            );
 
 			if (isError($result))
 				return $result;
@@ -417,7 +429,11 @@ class AntragLib
 					$resultAntrag = current($resultAntrag);
 
 						// Prestudentstatus und Unterbrechungsfolgeaktionen setzen
-					$result = $this->_ci->prestudentlib->setUnterbrecher($resultAntrag->prestudent_id, $resultAntrag->studiensemester_kurzbz, $studierendenantrag_id);
+					$result = $this->_ci->prestudentlib->setUnterbrecher(
+                        $resultAntrag->prestudent_id,
+                        $resultAntrag->studiensemester_kurzbz,
+                        $studierendenantrag_id
+                    );
 
 					if (isError($result)) {
 						$this->_ci->StudierendenantragstatusModel->delete($studierendenantrag_status_id);
@@ -439,7 +455,9 @@ class AntragLib
 						if (isset($data['errors']['person']))
 						{
 									//send assistenz mit id
-							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_mail_and_name', ['message' => $data['errors']['email'] . '<br>' . $data['errors']['person']]);
+							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_mail_and_name', [
+                                'message' => $data['errors']['email'] . '<br>' . $data['errors']['person']
+                            ]);
 							$mail['ass'] = $this->_ci->p->t('studierendenantrag', 'StudentIn', ['prestudent_id' => $data['antrag']->prestudent_id]);
 						}
 						else
@@ -539,9 +557,9 @@ class AntragLib
 				]);
 				if (isError($result)) {
 					$errors['failed_' . $studierendenantrag_id] = $this->_ci->p->t('studierendenantrag', 'error_U_Reject', [
-					'studierendenantrag_id' => $studierendenantrag_id,
-					'message' => getError($result)['message']
-				]);
+                        'studierendenantrag_id' => $studierendenantrag_id,
+                        'message' => getError($result)['message']
+                    ]);
 				} else {
 					$name = '';
 
@@ -667,7 +685,10 @@ class AntragLib
 			$date_created = new DateTime($result['antrag']->datum);
 			if ($date_created < $date_target) {
 				$this->_ci->load->model('crm/Konto_model', 'KontoModel');
-				$result['studienbeitrag'] = $this->_ci->KontoModel->checkStudienbeitragFromPerson($person_id, $result['antrag']->studiensemester_kurzbz);
+				$result['studienbeitrag'] = $this->_ci->KontoModel->checkStudienbeitragFromPerson(
+                    $person_id,
+                    $result['antrag']->studiensemester_kurzbz
+                );
 			}
 		}
 
@@ -986,7 +1007,11 @@ class AntragLib
 	 *
 	 * @param integer		$prestudent_id
 	 *
-	 * @return \stdClass	on success retval 0 means not a student; retval 1 means Berechtigt; retval -1 means has already an Antrag pending; retval -2 means other Antrag pending; retval -3 means in blacklist stg
+	 * @return \stdClass	on success retval 0 means not a student;
+     *                      retval 1 means Berechtigt;
+     *                      retval -1 means has already an Antrag pending;
+     *                      retval -2 means other Antrag pending;
+     *                      retval -3 means in blacklist stg
 	 */
 	public function getPrestudentAbmeldeBerechtigt($prestudent_id)
 	{
@@ -1009,7 +1034,13 @@ class AntragLib
 		$datumStatus = $result->datum;
 
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
-			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED], [Studierendenantrag_model::TYP_ABMELDUNG, Studierendenantrag_model::TYP_ABMELDUNG_STGL]);
+			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
+                'prestudent_id' => $prestudent_id,
+                'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED
+            ], [
+                Studierendenantrag_model::TYP_ABMELDUNG,
+                Studierendenantrag_model::TYP_ABMELDUNG_STGL
+            ]);
 			if (isError($result))
 				return $result;
 			if (hasData($result))
@@ -1049,7 +1080,11 @@ class AntragLib
 	 * @param integer		$prestudent_id
 	 * @param string		$studiensemester_kurzbz		(optional)
 	 *
-	 * @return \stdClass	on success retval 0 means not a student; retval 1 means Berechtigt; retval -1 means has already an Antrag pending; retval -2 means other Antrag pending; retval -3 means in blacklist stg
+	 * @return \stdClass	on success retval 0 means not a student;
+     *                      retval 1 means Berechtigt;
+	 * 						retval -1 means has already an Antrag pending;
+	 * 						retval -2 means other Antrag pending;
+	 * 						retval -3 means in blacklist stg
 	 */
 	public function getPrestudentUnterbrechungsBerechtigt($prestudent_id, $studiensemester_kurzbz = null)
 	{
@@ -1071,7 +1106,11 @@ class AntragLib
 		$result = current(getData($result));
 		$datumStatus = $result->datum;
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
-			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG, 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED]);
+			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
+				'prestudent_id' => $prestudent_id,
+				'typ' => Studierendenantrag_model::TYP_UNTERBRECHUNG,
+				'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED
+			]);
 			if (isError($result))
 				return $result;
 			if (hasData($result))
@@ -1115,7 +1154,11 @@ class AntragLib
 	 *
 	 * @param integer		$prestudent_id
 	 *
-	 * @return \stdClass	on success retval 0 means not a student; retval 1 means Berechtigt; retval -1 means has already an Antrag pending; retval -2 means other Antrag pending; retval -3 means in blacklist stg
+	 * @return \stdClass	on success retval 0 means not a student;
+	 * 						retval 1 means Berechtigt;
+	 * 						retval -1 means has already an Antrag pending;
+	 * 						retval -2 means other Antrag pending;
+	 * 						retval -3 means in blacklist stg
 	 */
 	public function getPrestudentWiederholungsBerechtigt($prestudent_id)
 	{
@@ -1144,7 +1187,11 @@ class AntragLib
 		$result = current(getData($result));
 		$datumStatus = $result->datum;
 		if (!in_array($result->status_kurzbz, $this->_ci->config->item('antrag_prestudentstatus_whitelist'))) {
-			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere(['prestudent_id' => $prestudent_id, 'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG, 'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED]);
+			$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere([
+				'prestudent_id' => $prestudent_id,
+				'typ' => Studierendenantrag_model::TYP_WIEDERHOLUNG,
+				'campus.get_status_studierendenantrag(studierendenantrag_id)' => Studierendenantragstatus_model::STATUS_APPROVED
+			]);
 			if (isError($result))
 				return $result;
 			if (hasData($result))
@@ -1333,7 +1380,9 @@ class AntragLib
 
 	public function saveLvs($lvArray)
 	{
-		$result = $this->_ci->StudierendenantraglehrveranstaltungModel->deleteWhere(['studierendenantrag_id' => $lvArray[0]['studierendenantrag_id']]);
+		$result = $this->_ci->StudierendenantraglehrveranstaltungModel->deleteWhere([
+			'studierendenantrag_id' => $lvArray[0]['studierendenantrag_id']
+		]);
 		if (isError($result))
 			return $result;
 
diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index bb1250a62..59cba0df1 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -32,7 +32,6 @@ class PrestudentLib
 		$this->_ci->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
-
 	}
 
 	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null)
@@ -153,7 +152,7 @@ class PrestudentLib
 						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
 						'student_uid' => $lv->uid,
 						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
-					],[
+					], [
 						'note' => 9
 					]);
 
@@ -181,7 +180,7 @@ class PrestudentLib
 		$this->_ci->StudentlehrverbandModel->update([
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'student_uid' => $student->student_uid
-		],[
+		], [
 			'studiengang_kz' => $student->studiengang_kz,
 			'semester' => 0,
 			'verband' => 'A',
@@ -193,7 +192,7 @@ class PrestudentLib
 		//Benutzer inaktiv setzen
 		$this->_ci->BenutzerModel->update([
 			'uid' =>  $student->student_uid
-		],[
+		], [
 			'aktiv' => false,
 			'updateaktivvon' => $insertvon,
 			'updateaktivam' => date('c'),
@@ -214,20 +213,6 @@ class PrestudentLib
 			return $result;
 		$result = getData($result);
 		if (!$result) {
-			/** TODO(chris): Zukünftige Unterbrecher so nicht möglich
-			 * - Verband und Gruppe dürfen noch nicht gesetzt werden
-			 * - Keine Garantie das Ausbildungssemester gleich bleibt (weiter Unterbrechungen oder eine Wiederholung in der Zwischenzeit)
-			 * - LVs eventuell nicht zugewießen
-			 * Mögliche Lösung: JOB!
-
-			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
-			if (isError($result))
-				return $result;
-			$result = getData($result);
-			if (!$result) {
-				return error('Kein Prestudent status gefunden');
-			}
-			$result->studiensemester_kurzbz*/
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
 				'prestudent_id' => $prestudent_id,
 				'studiensemester_kurzbz' => $studiensemester_kurzbz
@@ -341,7 +326,7 @@ class PrestudentLib
 						'studiensemester_kurzbz' => $lv->studiensemester_kurzbz,
 						'student_uid' => $lv->uid,
 						'lehrveranstaltung_id' => $lv->lehrveranstaltung_id
-					],[
+					], [
 						'note' => 9
 					]);
 
@@ -369,7 +354,7 @@ class PrestudentLib
 		$this->_ci->StudentlehrverbandModel->update([
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'student_uid' => $student->student_uid
-		],[
+		], [
 			'studiengang_kz' => $student->studiengang_kz,
 			'semester' => 0,
 			'verband' => 'B',
@@ -380,5 +365,4 @@ class PrestudentLib
 
 		return success();
 	}
-
 }
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index ddf8d3a7a..16f82fea5 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -328,7 +328,11 @@ class Prestudentstatus_model extends DB_Model
 	public function withGrund($statusgrund_kurzbz)
 	{
 		if($statusgrund_kurzbz)
-			$this->db->set('statusgrund_id', '(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz =' . $this->db->escape($statusgrund_kurzbz) .')', FALSE);
+			$this->db->set(
+				'statusgrund_id',
+				'(SELECT statusgrund_id FROM public.tbl_status_grund WHERE statusgrund_kurzbz =' . $this->db->escape($statusgrund_kurzbz) .')',
+				false
+			);
 
 		return $this;
 	}
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index 047cac02f..813a74179 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -64,7 +64,20 @@ class Pruefung_model extends DB_Model
         $this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
         $this->addSelect('count(1) as count');
 
-        $this->addGroupBy(['pers.vorname','pers.nachname','pers.person_id', 's.matrikelnr','g.bezeichnung', 'g.studiengang_kz','o.bezeichnung_mehrsprachig','ps.prestudent_id', 'lv.bezeichnung', 'le.studiensemester_kurzbz', 'a.typ', 'a.studierendenantrag_id']);
+        $this->addGroupBy([
+			'pers.vorname',
+			'pers.nachname',
+			'pers.person_id',
+			's.matrikelnr',
+			'g.bezeichnung',
+			'g.studiengang_kz',
+			'o.bezeichnung_mehrsprachig',
+			'ps.prestudent_id',
+			'lv.bezeichnung',
+			'le.studiensemester_kurzbz',
+			'a.typ',
+			'a.studierendenantrag_id'
+		]);
         $this->addJoin('lehre.tbl_note n', 'note');
         $this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
         $this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
@@ -91,7 +104,15 @@ class Pruefung_model extends DB_Model
 				AND ps.prestudent_id = ps1.prestudent_id)', null, false);
 
         // NOTE(chris): is Wiederholer without set statusgrund (legacy?)
-        $this->db->where('(SELECT COUNT(*) FROM (SELECT DISTINCT studiensemester_kurzbz FROM tbl_prestudentstatus _s WHERE ausbildungssemester=get_absem_prestudent(ps.prestudent_id, le.studiensemester_kurzbz) AND prestudent_id=ps.prestudent_id) a) = 1', null, false);
+        $this->db->where(
+			'(SELECT COUNT(*) 
+				FROM (SELECT DISTINCT studiensemester_kurzbz 
+					FROM tbl_prestudentstatus _s 	
+					WHERE ausbildungssemester=get_absem_prestudent(ps.prestudent_id, le.studiensemester_kurzbz) 
+					AND prestudent_id=ps.prestudent_id) a) = 1',
+			null,
+			false
+		);
 
         return $this->db->get_compiled_select($this->dbTable);
     }
@@ -113,7 +134,11 @@ class Pruefung_model extends DB_Model
         if (!is_array($statusgruende))
             $statusgruende = [];
 
-        return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3 AND prestudent_id = ?' , [Studierendenantrag_model::TYP_WIEDERHOLUNG, $statusgruende, $prestudent_id]);
+        return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3 AND prestudent_id = ?', [
+			Studierendenantrag_model::TYP_WIEDERHOLUNG,
+			$statusgruende,
+			$prestudent_id
+		]);
 	}
 
 	public function getAllPrestudentsWhereCommitteeExamFailed($status, $maxDate, $minDate)
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index a4dfb0d59..67adca855 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -54,8 +54,11 @@ class Studierendenantrag_model extends DB_Model
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
 		$this->addJoin('public.tbl_studiensemester', 'studiensemester_kurzbz');
 		$this->addJoin('bis.tbl_orgform', 'orgform_kurzbz');
-		$this->addJoin('campus.tbl_studierendenantrag_status as s','campus.get_status_id_studierendenantrag('.$this->dbTable .'.studierendenantrag_id) = studierendenantrag_status_id' );
-		$this->addJoin('campus.tbl_studierendenantrag_statustyp as st','studierendenantrag_statustyp_kurzbz' );
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_status as s',
+			'campus.get_status_id_studierendenantrag('. $this->dbTable .'.studierendenantrag_id) = studierendenantrag_status_id'
+		);
+		$this->addJoin('campus.tbl_studierendenantrag_statustyp as st', 'studierendenantrag_statustyp_kurzbz');
 
 		$this->db->where_in('p.studiengang_kz', $studiengaenge);
 
@@ -189,7 +192,11 @@ class Studierendenantrag_model extends DB_Model
 		$this->addJoin('public.tbl_prestudent p', 'prestudent_id', 'RIGHT');
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
 		$this->addJoin('bis.tbl_orgform', 'orgform_kurzbz');
-		$this->addJoin('campus.tbl_studierendenantrag_statustyp st', 'campus.get_status_studierendenantrag(studierendenantrag_id)=st.studierendenantrag_statustyp_kurzbz','LEFT');
+		$this->addJoin(
+			'campus.tbl_studierendenantrag_statustyp st',
+			'campus.get_status_studierendenantrag(studierendenantrag_id)=st.studierendenantrag_statustyp_kurzbz',
+			'LEFT'
+		);
 
 		return $this->loadWhere([
 			'p.person_id' => $person_id
diff --git a/application/models/education/Studierendenantraglehrveranstaltung_model.php b/application/models/education/Studierendenantraglehrveranstaltung_model.php
index 88d591053..9445b8cf8 100644
--- a/application/models/education/Studierendenantraglehrveranstaltung_model.php
+++ b/application/models/education/Studierendenantraglehrveranstaltung_model.php
@@ -65,7 +65,11 @@ class Studierendenantraglehrveranstaltung_model extends DB_Model
 			'stat.studierendenantrag_status_id = campus.get_status_id_studierendenantrag(a.studierendenantrag_id)'
 		);
 		$this->addJoin('public.tbl_student s', 'prestudent_id');
-		$this->addJoin('lehre.tbl_zeugnisnote z', 'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid AND z.studiensemester_kurzbz=a.studiensemester_kurzbz', 'LEFT');
+		$this->addJoin(
+			'lehre.tbl_zeugnisnote z',
+			'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid AND z.studiensemester_kurzbz=a.studiensemester_kurzbz',
+			'LEFT'
+		);
 
 		return $this->loadWhere([
 			'ps.prestudent_id' => $prestudent_id,
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 1fb733d04..8b7d93035 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -581,7 +581,14 @@ class Studiengang_model extends DB_Model
 		if ($not_antrag_typ !== null && is_array($not_antrag_typ)) {
 			foreach($not_antrag_typ as $k => $v)
 				$not_antrag_typ[$k] = $this->db->escape($v);
-			$this->addJoin('campus.tbl_studierendenantrag a', 'a.prestudent_id=p.prestudent_id and a.typ in ('. implode(',', $not_antrag_typ ).") AND campus.get_status_studierendenantrag (a.studierendenantrag_id)<>'" . Studierendenantragstatus_model::STATUS_CANCELLED . "'", 'LEFT');
+			$this->addJoin(
+				'campus.tbl_studierendenantrag a',
+				'a.prestudent_id=p.prestudent_id and a.typ in ('.
+				implode(',', $not_antrag_typ).
+				") AND campus.get_status_studierendenantrag (a.studierendenantrag_id)<>'" .
+				Studierendenantragstatus_model::STATUS_CANCELLED . "'",
+				'LEFT'
+			);
 			$this->db->where('a.typ IS NULL');
 		}
 
diff --git a/application/views/lehre/Antrag/Wiederholung/Student.php b/application/views/lehre/Antrag/Wiederholung/Student.php
index 1aa72ee69..9c2db040e 100644
--- a/application/views/lehre/Antrag/Wiederholung/Student.php
+++ b/application/views/lehre/Antrag/Wiederholung/Student.php
@@ -26,11 +26,9 @@ $this->load->view(
 ?>
 
 <div id="wrapper" class="overflow-hidden">
-	<?php if (!$frame) { ?>
-	<div class="fhc-header">
+	<div class="fhc-header" v-if="notinframe">
 		<h1 class="h2"><?= $this->p->t('studierendenantrag', 'title_lvzuweisen', ['name' => $antrag->name]);?></h1>
 	</div>
-	<?php } ?>
 	<div class="fhc-container row mt-3">
 		<lv-zuweisung antrag-id="<?= $antrag_id; ?>" initial-status-code="<?= $antrag->status; ?>" initial-status-msg="<?= $antrag->statustyp; ?>"<?= ($antrag->status != Studierendenantragstatus_model::STATUS_CREATED && $antrag->status != Studierendenantragstatus_model::STATUS_LVSASSIGNED) ? ' disabled' : ''; ?>></lv-zuweisung>
 	</div>
diff --git a/public/js/apps/lehre/Antrag.js b/public/js/apps/lehre/Antrag.js
index e5a4814f8..bcb7b37a7 100644
--- a/public/js/apps/lehre/Antrag.js
+++ b/public/js/apps/lehre/Antrag.js
@@ -15,8 +15,7 @@ const app = Vue.createApp({
 			statusMsg: "",
 			statusSeverity: "",
 			infoArray: []
-		}
-
+		};
 	}
 });
 app.mount('#wrapper');
diff --git a/public/js/apps/lehre/Antrag/Lvzuweisung.js b/public/js/apps/lehre/Antrag/Lvzuweisung.js
index 2cbe2f1c8..836d1168e 100644
--- a/public/js/apps/lehre/Antrag/Lvzuweisung.js
+++ b/public/js/apps/lehre/Antrag/Lvzuweisung.js
@@ -3,6 +3,11 @@ import LvZuweisung from '../../../components/Studierendenantrag/Lvzuweisung.js';
 const app = Vue.createApp({
 	components: {
 		LvZuweisung
+	},
+	computed: {
+		notinframe() {
+			return window.self === window.top;
+		}
 	}
 });
 app.mount('#wrapper');
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
index df2b2a0de..7128761d7 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/Columns.js
@@ -22,4 +22,4 @@ export default {
 		</div>
 	</div>
 	`
-}
\ No newline at end of file
+}
diff --git a/public/js/components/Studierendenantrag/Leitung/LvPopup.js b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
index c09101c03..8efee8ae4 100644
--- a/public/js/components/Studierendenantrag/Leitung/LvPopup.js
+++ b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
@@ -15,12 +15,14 @@ export default {
 		antragId: Number,
 		countRemaining: Number
 	},
-	data: () => ({
-		lvs: null,
-		refresh: true,
-		result: false,
-		check: false
-	}),
+	data(){
+		return {
+			lvs: null,
+			refresh: true,
+			result: false,
+			check: false
+		};
+	},
 	computed: {
 		lvzugelassen() {
 			let zwischen = {};
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 7cc83e0ea..cb469ee57 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -73,7 +73,8 @@ export default {
 		}
 	},
 	mounted() {
-		function dateFormatter (cell) {
+		function dateFormatter(cell)
+		{
 			let val = cell.getValue();
 			if (!val)
 				return '';
@@ -96,239 +97,219 @@ export default {
 				columns: ["width", "visible"], //persist columns
 			},
 			persistenceID: 'studierendenantrag_leitung',
-			columns: [
-				{
-					formatter: 'rowSelection',
-					titleFormatter: 'rowSelection',
-					titleFormatterParams: {
-						rowRange: 'active'
-					},
-					hozAlign: 'center',
-					headerSort: false
+			columns: [{
+				formatter: 'rowSelection',
+				titleFormatter: 'rowSelection',
+				titleFormatterParams: {
+					rowRange: 'active'
 				},
-				{
-					field: 'studierendenantrag_id',
-					title: '#'
+				hozAlign: 'center',
+				headerSort: false
+			}, {
+				field: 'studierendenantrag_id',
+				title: '#'
+			}, {
+				field: 'bezeichnung',
+				title: this.p.t('lehre', 'studiengang'),
+				headerFilter: 'list',
+				headerFilterParams: {
+					valuesLookup: true,
+					clearable: true,
+					autocomplete: true,
+				}
+			}, {
+				field: 'orgform',
+				title: this.p.t('lehre', 'organisationsform'),
+				headerFilter: 'list',
+				headerFilterParams: {
+					valuesLookup: true,
+					clearable: true,
+					autocomplete: true,
+				}
+			}, {
+				field: 'typ',
+				title: this.p.t('studierendenantrag', 'antrag_typ'),
+				headerFilter: 'list',
+				headerFilterParams: {
+					valuesLookup: true,
+					clearable: true,
+					autocomplete: true,
 				},
-				{
-					field: 'bezeichnung',
-					title: this.p.t('lehre', 'studiengang'),
-					headerFilter: 'list',
-					headerFilterParams: {
-						valuesLookup: true,
-						clearable: true,
-						autocomplete: true,
-					}
-				},
-				{
-					field: 'orgform',
-					title: this.p.t('lehre', 'organisationsform'),
-					headerFilter: 'list',
-					headerFilterParams: {
-						valuesLookup: true,
-						clearable: true,
-						autocomplete: true,
-					}
-				},
-				{
-					field: 'typ',
-					title: this.p.t('studierendenantrag', 'antrag_typ'),
-					headerFilter: 'list',
-					headerFilterParams: {
-						valuesLookup: true,
-						clearable: true,
-						autocomplete: true,
-					},
-					formatter: (cell, formatterParams, onRendered) => {
-						return this.p.t('studierendenantrag','antrag_typ_' + cell.getValue());
-					}
-				},
-				{
-					field: 'statustyp',
-					title: this.p.t('studierendenantrag', 'antrag_status'),
-					headerFilter: 'list',
-					headerFilterParams: {
-						valuesLookup: true,
-						clearable: true,
-						autocomplete: true,
-					}
-				},
-				{
-					field: 'matrikelnr',
-					title: this.p.t('person', 'personenkennzeichen'),
-					headerFilter: 'input'
-				},
-				{
-					field: 'prestudent_id',
-					title: this.p.t('lehre', 'prestudent'),
-					headerFilter: 'input'
-				},
-				{
-					field: 'name',
-					title: this.p.t('global', 'name'),
-					mutator: (value, data) => (data.vorname + ' ' + data.nachname).replace(/^\s*(.*)\s*$/, '$1'),
-					headerFilter: 'input'
-				},
-				{
-					field: 'datum',
-					title: this.p.t('global', 'datum'),
-					formatter: dateFormatter,
-					headerFilterFunc: 'dates',
-					headerFilter: dateFilter
-				},
-				{
-					field: 'datum_wiedereinstieg',
-					title: this.p.t('studierendenantrag', 'antrag_datum_wiedereinstieg'),
-					formatter: dateFormatter,
-					headerFilterFunc: 'dates',
-					headerFilter: dateFilter
-				},
-				{
-					field: 'grund',
-					title: this.p.t('studierendenantrag', 'antrag_grund'),
-					formatter: (cell, formatterParams, onRendered) => {
-						let link = document.createElement('a'),
-							val = cell.getValue();
-						link.href = "#modal-grund";
-						link.setAttribute('data-bs-toggle', 'modal');
-						link.innerHTML = this.p.t('studierendenantrag', 'antrag_grund');
-						link.addEventListener('click', () => {
-							this.$refs.modalGrundPre.innerHTML = val;
-						});
+				formatter: (cell, formatterParams, onRendered) => {
+					return this.p.t('studierendenantrag','antrag_typ_' + cell.getValue());
+				}
+			}, {
+				field: 'statustyp',
+				title: this.p.t('studierendenantrag', 'antrag_status'),
+				headerFilter: 'list',
+				headerFilterParams: {
+					valuesLookup: true,
+					clearable: true,
+					autocomplete: true,
+				}
+			}, {
+				field: 'matrikelnr',
+				title: this.p.t('person', 'personenkennzeichen'),
+				headerFilter: 'input'
+			}, {
+				field: 'prestudent_id',
+				title: this.p.t('lehre', 'prestudent'),
+				headerFilter: 'input'
+			}, {
+				field: 'name',
+				title: this.p.t('global', 'name'),
+				mutator: (value, data) => (data.vorname + ' ' + data.nachname).replace(/^\s*(.*)\s*$/, '$1'),
+				headerFilter: 'input'
+			}, {
+				field: 'datum',
+				title: this.p.t('global', 'datum'),
+				formatter: dateFormatter,
+				headerFilterFunc: 'dates',
+				headerFilter: dateFilter
+			}, {
+				field: 'datum_wiedereinstieg',
+				title: this.p.t('studierendenantrag', 'antrag_datum_wiedereinstieg'),
+				formatter: dateFormatter,
+				headerFilterFunc: 'dates',
+				headerFilter: dateFilter
+			}, {
+				field: 'grund',
+				title: this.p.t('studierendenantrag', 'antrag_grund'),
+				formatter: (cell, formatterParams, onRendered) => {
+					let link = document.createElement('a'),
+						val = cell.getValue();
+					link.href = "#modal-grund";
+					link.setAttribute('data-bs-toggle', 'modal');
+					link.innerHTML = this.p.t('studierendenantrag', 'antrag_grund');
+					link.addEventListener('click', () => {
+						this.$refs.modalGrundPre.innerHTML = val;
+					});
 
-						return val ? link : '';
-					}
-				},
-				{
-					field: 'dms_id',
-					title: this.p.t('studierendenantrag', 'antrag_dateianhaenge'),
-					formatter: (cell, formatterParams, onRendered) => {
-						let val = cell.getValue();
-						if (!val)
-							return '';
-						return '<a href="' + FHC_JS_DATA_STORAGE_OBJECT.app_root +
-							FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-							'/lehre/Antrag/Attachment/show/' + val + '" target="_blank"><i class="fa fa-paperclip" aria-hidden="true"></i> ' + this.p.t('studierendenantrag', 'antrag_anhang') + '</a>';
-					}
-				},
-				{
-					field: 'actions',
-					formatter: (cell, formatterParams, onRendered) => {
-						let container = document.createElement('div'),
-							data = cell.getData();
+					return val ? link : '';
+				}
+			}, {
+				field: 'dms_id',
+				title: this.p.t('studierendenantrag', 'antrag_dateianhaenge'),
+				formatter: (cell, formatterParams, onRendered) => {
+					let val = cell.getValue();
+					if (!val)
+						return '';
+					return '<a href="' + FHC_JS_DATA_STORAGE_OBJECT.app_root +
+						FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+						'/lehre/Antrag/Attachment/show/' + val + '" target="_blank"><i class="fa fa-paperclip" aria-hidden="true"></i> ' + this.p.t('studierendenantrag', 'antrag_anhang') + '</a>';
+				}
+			}, {
+				field: 'actions',
+				formatter: (cell, formatterParams, onRendered) => {
+					let container = document.createElement('div'),
+						data = cell.getData();
 
-						container.className = "d-flex gap-2";
+					container.className = "d-flex gap-2";
 
-						if((data.typ == 'Abmeldung' || data.typ == 'Unterbrechung') && (data.status == 'Genehmigt'))
-						{
-							// NOTE(chris): Download PDF
+					if ((data.typ == 'Abmeldung' || data.typ == 'Unterbrechung') && (data.status == 'Genehmigt')) {
+						// NOTE(chris): Download PDF
+						let button = document.createElement('a');
+						button.innerHTML = '<i class="fa-solid fa-download" title="' + this.p.t('studierendenantrag', 'btn_download_antrag') + '"></i>';
+						button.className = "btn btn-outline-secondary";
+						button.target = "_blank";
+						button.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							'content/pdfExport.php?xml=Antrag' + data.typ + '.xml.php&xsl=Antrag' + data.typ + '&id=' + data.studierendenantrag_id + '&output=pdf';
+						container.append(button);
+					}
+					if (data.typ == 'AbmeldungStgl' && data.status == 'Genehmigt') {
+						// NOTE(chris): Object
+						let button = document.createElement('button');
+						button.innerHTML = this.p.t('studierendenantrag', 'btn_object');
+						button.className = "btn btn-outline-secondary";
+						button.addEventListener('click', () => this.$emit('action:object', [cell.getData()]));
+						container.append(button);
+					}
+
+					if (data.typ == 'AbmeldungStgl' && data.status == 'Beeinsprucht') {
+						// NOTE(chris): Deny Objection
+						let button = document.createElement('button');
+						button.innerHTML = this.p.t('studierendenantrag', 'btn_objection_deny');
+						button.className = "btn btn-outline-secondary";
+						button.addEventListener('click', () => this.$emit('action:objectionDeny', [cell.getData()]));
+						container.append(button);
+
+						// NOTE(chris): Approve Objection
+						button = document.createElement('button');
+						button.innerHTML = this.p.t('studierendenantrag', 'btn_objection_approve');
+						button.className = "btn btn-outline-secondary";
+						button.addEventListener('click', () => this.$emit('action:objectionApprove', [cell.getData()]));
+						container.append(button);
+					}
+
+					if (this.stgA.includes(data.studiengang_kz)) {
+						// NOTE(chris): Reopen
+						if (data.typ == 'Wiederholung' && data.status == 'Verzichtet') {
+							let button = document.createElement('button');
+							button.innerHTML = this.p.t('studierendenantrag', 'btn_reopen');
+							button.className = "btn btn-outline-secondary";
+							button.addEventListener('click', () => this.$emit('action:reopen', [cell.getData()]));
+							container.append(button);
+						}
+						// NOTE(chris): Lv Zuweisen
+						if (data.typ == 'Wiederholung' && (data.status == 'Erstellt' || data.status == 'Lvszugewiesen')) {
 							let button = document.createElement('a');
-							button.innerHTML = '<i class="fa-solid fa-download" title="' + this.p.t('studierendenantrag', 'btn_download_antrag') + '"></i>';
+							button.innerHTML = this.p.t('studierendenantrag', 'btn_lvzuweisen');
 							button.className = "btn btn-outline-secondary";
-							button.target = "_blank";
 							button.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
-							'content/pdfExport.php?xml=Antrag' + data.typ + '.xml.php&xsl=Antrag' + data.typ + '&id='+ data.studierendenantrag_id +'&output=pdf';
-							container.append(button);
-						}
-						if(data.typ == 'AbmeldungStgl' && data.status == 'Genehmigt')
-						{
-							// NOTE(chris): Object
-							let button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_object');
-							button.className = "btn btn-outline-secondary";
-							button.addEventListener('click',() => this.$emit('action:object', [cell.getData()]));
-							container.append(button);
-						}
-
-						if(data.typ == 'AbmeldungStgl' && data.status == 'Beeinsprucht')
-						{
-							// NOTE(chris): Deny Objection
-							let button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_objection_deny');
-							button.className = "btn btn-outline-secondary";
-							button.addEventListener('click',() => this.$emit('action:objectionDeny', [cell.getData()]));
-							container.append(button);
-
-							// NOTE(chris): Approve Objection
-							button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_objection_approve');
-							button.className = "btn btn-outline-secondary";
-							button.addEventListener('click',() => this.$emit('action:objectionApprove', [cell.getData()]));
-							container.append(button);
-						}
-
-						if (this.stgA.includes(data.studiengang_kz))
-						{
-							// NOTE(chris): Reopen
-							if (data.typ == 'Wiederholung' && data.status == 'Verzichtet') {
-								let button = document.createElement('button');
-								button.innerHTML = this.p.t('studierendenantrag', 'btn_reopen');
-								button.className = "btn btn-outline-secondary";
-								button.addEventListener('click',() => this.$emit('action:reopen', [cell.getData()]));
-								container.append(button);
-							}
-							// NOTE(chris): Lv Zuweisen
-							if (data.typ == 'Wiederholung' && (data.status == 'Erstellt' || data.status == 'Lvszugewiesen')) {
-								let button = document.createElement('a');
-								button.innerHTML = this.p.t('studierendenantrag', 'btn_lvzuweisen');
-								button.className = "btn btn-outline-secondary";
-								button.href = FHC_JS_DATA_STORAGE_OBJECT.app_root +
 								FHC_JS_DATA_STORAGE_OBJECT.ci_router +
 								'/lehre/Antrag/Wiederholung/assistenz/' +
 								cell.getData().studierendenantrag_id + '/frame';
-								button.onclick = e => {
-									e.preventDefault();
-									BsModal.popup(Vue.h('iframe', {
-										src: button.href,
-										class: 'position-absolute top-0 start-0 w-100 h-100'
-									}), {
-										dialogClass: 'modal-fullscreen'
-									}, this.p.t('studierendenantrag', 'title_lvzuweisen', cell.getData())).then(() => {
-										this.$emit('reload');
-									});
-								};
-								container.append(button);
-							}
-						}
-
-						if (this.stgL.includes(data.studiengang_kz))
-						{
-							// NOTE(chris): Approve
-							if ((data.typ == 'Wiederholung' && data.status == 'Lvszugewiesen') || (data.typ != 'Wiederholung' && data.status == 'Erstellt')) {
-								let button = document.createElement('button');
-								button.innerHTML = this.p.t('studierendenantrag', 'btn_approve');
-								button.className = "btn btn-outline-secondary";
-								button.addEventListener('click', () => this.$emit('action:approve', [cell.getData()]));
-								container.append(button);
-							}
-							// NOTE(chris): Reject (Unterbrechung braucht grund)
-							if (data.status == 'Erstellt' && data.typ == 'Unterbrechung') {
-								let button = document.createElement('button');
-								button.innerHTML = this.p.t('studierendenantrag', 'btn_reject');
-								button.className = "btn btn-outline-secondary";
-								button.addEventListener('click', () => this.$emit('action:reject', [cell.getData()]));
-								container.append(button);
-							}
-						}
-
-						// NOTE(chris): Show LVs
-						if (data.typ == 'Wiederholung' && (data.status == 'Lvszugewiesen' || data.status == 'Genehmigt')) {
-							let button = document.createElement('button');
-							button.innerHTML = this.p.t('studierendenantrag', 'btn_show_lvs');
-							button.className = "btn btn-outline-secondary";
-							button.addEventListener('click', () => this.showLVs(cell.getData()));
+							button.onclick = e => {
+								e.preventDefault();
+								BsModal.popup(Vue.h('iframe', {
+									src: button.href,
+									class: 'position-absolute top-0 start-0 w-100 h-100'
+								}), {
+									dialogClass: 'modal-fullscreen'
+								}, this.p.t('studierendenantrag', 'title_lvzuweisen', cell.getData())).then(() => {
+									this.$emit('reload');
+								});
+							};
 							container.append(button);
 						}
-
-						// TODO(chris): not yet perfect
-						onRendered(() => {
-							cell.getColumn().setWidth(true);
-						});
-
-						return container;
 					}
+
+					if (this.stgL.includes(data.studiengang_kz)) {
+						// NOTE(chris): Approve
+						if ((data.typ == 'Wiederholung' && data.status == 'Lvszugewiesen') || (data.typ != 'Wiederholung' && data.status == 'Erstellt')) {
+							let button = document.createElement('button');
+							button.innerHTML = this.p.t('studierendenantrag', 'btn_approve');
+							button.className = "btn btn-outline-secondary";
+							button.addEventListener('click', () => this.$emit('action:approve', [cell.getData()]));
+							container.append(button);
+						}
+						// NOTE(chris): Reject (Unterbrechung braucht grund)
+						if (data.status == 'Erstellt' && data.typ == 'Unterbrechung') {
+							let button = document.createElement('button');
+							button.innerHTML = this.p.t('studierendenantrag', 'btn_reject');
+							button.className = "btn btn-outline-secondary";
+							button.addEventListener('click', () => this.$emit('action:reject', [cell.getData()]));
+							container.append(button);
+						}
+					}
+
+					// NOTE(chris): Show LVs
+					if (data.typ == 'Wiederholung' && (data.status == 'Lvszugewiesen' || data.status == 'Genehmigt')) {
+						let button = document.createElement('button');
+						button.innerHTML = this.p.t('studierendenantrag', 'btn_show_lvs');
+						button.className = "btn btn-outline-secondary";
+						button.addEventListener('click', () => this.showLVs(cell.getData()));
+						container.append(button);
+					}
+
+					// TODO(chris): not yet perfect
+					onRendered(() => {
+						cell.getColumn().setWidth(true);
+					});
+
+					return container;
 				}
-			]
+			}]
 		});
 		this.table.on("tableBuilt", () => {
 			let columns = this.table.getColumns();

From 8c98cea114545b78589ff2620172b6fc015859da Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 25 Jul 2023 13:37:03 +0200
Subject: [PATCH 079/175] semicolon

---
 public/js/components/Studierendenantrag/Lvzuweisung.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js
index d987f55be..f70812209 100644
--- a/public/js/components/Studierendenantrag/Lvzuweisung.js
+++ b/public/js/components/Studierendenantrag/Lvzuweisung.js
@@ -18,7 +18,7 @@ export default {
 			isloading: false,
 			statusCode: '',
 			statusMsg: ''
-		}
+		};
 	},
 	computed: {
 		lvs1() {

From 72391138477cbf773a5181920cfdf04ffd580b91 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 25 Jul 2023 13:42:38 +0200
Subject: [PATCH 080/175] Optionaler Grund bei Einspruch ablehnen

---
 .../controllers/components/Antrag/Leitung.php |  3 +-
 application/libraries/AntragLib.php           |  4 +-
 .../components/Studierendenantrag/Leitung.js  | 91 ++++++++++++-------
 .../Studierendenantrag/Leitung/GrundPopup.js  | 18 ++--
 system/phrasesupdate.php                      | 20 ++++
 5 files changed, 92 insertions(+), 44 deletions(-)

diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
index 6cc25f87d..a429625ae 100644
--- a/application/controllers/components/Antrag/Leitung.php
+++ b/application/controllers/components/Antrag/Leitung.php
@@ -190,8 +190,9 @@ class Leitung extends FHC_Controller
 		}
 
 		$studierendenantrag_id = $this->input->post('studierendenantrag_id');
+		$grund = $this->input->post('grund');
 
-		$result = $this->antraglib->denyObjectionAbmeldung($studierendenantrag_id, getAuthUID());
+		$result = $this->antraglib->denyObjectionAbmeldung($studierendenantrag_id, getAuthUID(), $grund);
 
 		if (isError($result))
 			return $this->outputJsonError(['studierendenantrag_id' => getError($result)]);
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 753432edf..a04a03d84 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -259,7 +259,6 @@ class AntragLib
 	 */
 	public function denyObjectionAbmeldung($studierendenantrag_id, $insertvon, $grund = null)
 	{
-		// TODO(chris): grund?
 		$result = $this->_ci->StudierendenantragModel->load($studierendenantrag_id);
 		if (isError($result))
 		{
@@ -282,6 +281,9 @@ class AntragLib
 
 		$status = current(getData($result));
 
+		if ($grund)
+			$grund = $this->_ci->p->t('studierendenantrag', 'mail_part_grund', ['grund' => $grund]);
+
 		$result = $this->_ci->StudierendenantragstatusModel->insert([
 			'studierendenantrag_id' => $studierendenantrag_id,
 			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index ba7af0a2c..2b2a53d61 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -123,30 +123,30 @@ export default {
 		},
 		actionReject(evt, gruende) {
 			var antraege = evt || this.selectedData;
-			if(!gruende)
-			{
+			if (!gruende)
 				gruende = [];
-			}
 			var currentAntrag = antraege.pop();
-			if(currentAntrag)
-				GrundPopup.popup(this.p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id})).then(result =>
-				{
-					currentAntrag.grund = result[0];
-					gruende.push(currentAntrag);
-					if(result[1])
-					{
-						while (antraege.length)
+			if (currentAntrag) {
+				GrundPopup
+					.popup(this.p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), {
+						countRemaining: antraege.length
+					})
+					.then(result => {
+						currentAntrag.grund = result[0];
+						gruende.push(currentAntrag);
+						if (result[1])
 						{
-							currentAntrag = antraege.pop();
-							currentAntrag.grund = result[0];
-							gruende.push(currentAntrag);
+							while (antraege.length)
+							{
+								currentAntrag = antraege.pop();
+								currentAntrag.grund = result[0];
+								gruende.push(currentAntrag);
+							}
 						}
-					}
-					this.actionReject(antraege, gruende);
-				})
-				.catch(() => {});
-			else
-			{
+						this.actionReject(antraege, gruende);
+					})
+					.catch(() => {});
+			} else {
 				this.$refs.loader.show();
 				axios
 					.all(
@@ -206,22 +206,47 @@ export default {
 		},
 		actionoObjectionDeny(evt, gruende) {
 			var antraege = evt || this.selectedData;
-			this.$refs.loader.show();
-			axios
-				.all(
-					antraege.map(
-						antrag => axios.post(
-							FHC_JS_DATA_STORAGE_OBJECT.app_root +
-							FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-							'/components/Antrag/Leitung/objectionDeny/',
-							{
-								studierendenantrag_id: antrag.studierendenantrag_id
+			if (!gruende)
+				gruende = [];
+			var currentAntrag = antraege.pop();
+			if (currentAntrag) {
+				GrundPopup
+					.popup(this.p.t('studierendenantrag', 'title_grund', {id: currentAntrag.studierendenantrag_id}), {
+						countRemaining : antraege.length,
+						optional: true
+					})
+					.then(result => {
+						currentAntrag.grund = result[0];
+						gruende.push(currentAntrag);
+						if (result[1]) {
+							while (antraege.length) {
+								currentAntrag = antraege.pop();
+								currentAntrag.grund = result[0];
+								gruende.push(currentAntrag);
 							}
+						}
+						this.actionoObjectionDeny(antraege, gruende);
+					})
+					.catch(() => {});
+			} else {
+				this.$refs.loader.show();
+				axios
+					.all(
+						gruende.map(
+							antrag => axios.post(
+								FHC_JS_DATA_STORAGE_OBJECT.app_root +
+								FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+								'/components/Antrag/Leitung/objectionDeny/',
+								{
+									studierendenantrag_id: antrag.studierendenantrag_id,
+									grund: antrag.grund
+								}
+							)
 						)
 					)
-				)
-				.then(this.showValidation)
-				.catch(this.showError);
+					.then(this.showValidation)
+					.catch(this.showError);
+			}
 		},
 		actionObjectionApprove(evt, gruende) {
 			var antraege = evt || this.selectedData;
diff --git a/public/js/components/Studierendenantrag/Leitung/GrundPopup.js b/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
index d560dfb00..3a7b40f2d 100644
--- a/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
+++ b/public/js/components/Studierendenantrag/Leitung/GrundPopup.js
@@ -9,7 +9,9 @@ export default {
 	],
 	props: {
 		placeholder: String,
-		default: String
+		default: String,
+		countRemaining: Number,
+		optional: Boolean
 	},
 	data: () => ({
 		value: '',
@@ -18,15 +20,13 @@ export default {
 		isInvalid: false
 	}),
 	methods: {
-		submit(){
-			if(!this.value)	{
+		submit() {
+			if (!this.value && !this.optional) {
 				this.isInvalid = true;
-					}
-			else {
+			} else {
 				this.result = [this.value, this.check];
 				this.hide();
 			}
-			return
 		}
 	},
 	created() {
@@ -49,12 +49,12 @@ export default {
 					{{p.t('kvp','new.error.required')}}
 				</div>
 			</div>
-			<div class="form-check">
+		</template>
+		<template v-slot:footer>
+			<div v-if="countRemaining > 0" class="form-check flex-grow-1">
 				<input ref="check" type="checkbox" class="form-check-input" id="cbid" v-model="check">
 				<label class="form-check-label" for="cbid">{{p.t('studierendenantrag','fuer_alle_uebernehmen')}}</label>
 			</div>
-		</template>
-		<template v-slot:footer>
 			<button type="button" class="btn btn-primary" @click="submit">{{p.t('ui','ok')}}</button>
 			<button type="button" class="btn btn-secondary" data-bs-dismiss="modal">{{p.t('ui','cancel')}}</button>
 		</template>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index aa16ea77b..442ef7f81 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20666,6 +20666,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_part_grund',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => '<h4>Grund:</h4><p>{grund}</p>',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => '<h4>Reason:</h4><p>{grund}</p>',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From 02b64ad6a7c8690e95dc9b88166ca1443ee6f8ce Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 25 Jul 2023 13:59:18 +0200
Subject: [PATCH 081/175] =?UTF-8?q?Assistenz=20kann=20eigene=20Abmeldungen?=
 =?UTF-8?q?=20Zur=C3=BCckziehen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/libraries/AntragLib.php           |  3 +--
 .../components/Studierendenantrag/Leitung.js  | 20 +++++++++++++++++++
 .../Studierendenantrag/Leitung/Table.js       | 11 +++++++++-
 3 files changed, 31 insertions(+), 3 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index a04a03d84..0b5ec1957 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1627,8 +1627,7 @@ class AntragLib
 		if ($antrag->typ != Studierendenantrag_model::TYP_ABMELDUNG_STGL)
 			return $this->isOwnAntrag($antrag_id);
 		
-		// TODO(chris): assistenz can not cancel - should they be able to?
-		return false;
+		return $this->hasAccessToAntrag($antrag_id, 'student/studierendenantrag');
 	}
 
 	/**
diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index 2b2a53d61..747ad7123 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -267,6 +267,25 @@ export default {
 				.then(this.showValidation)
 				.catch(this.showError);
 		},
+		actionCancel(evt) {
+			var antraege = evt || this.selectedData;
+			this.$refs.loader.show();
+			axios
+				.all(
+					antraege.map(
+						antrag => axios.post(
+							FHC_JS_DATA_STORAGE_OBJECT.app_root +
+							FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+							'/components/Antrag/Abmeldung/cancelAntrag/',
+							{
+								antrag_id: antrag.studierendenantrag_id
+							}
+						)
+					)
+				)
+				.then(this.showValidation)
+				.catch(this.showError);
+		},
 		showValidation(results) {
 			var errors = results.filter(res => res.data.error);
 			this.$refs.loader.hide();
@@ -327,6 +346,7 @@ export default {
 			@action:object="actionObject"
 			@action:objectionDeny="actionoObjectionDeny"
 			@action:objectionApprove="actionObjectionApprove"
+			@action:cancel="actionCancel"
 			>
 		</leitung-table>
 
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index cb469ee57..ba665c6f9 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -25,7 +25,8 @@ export default {
 		'action:reopen',
 		'action:object',
 		'action:objectionDeny',
-		'action:objectionApprove'
+		'action:objectionApprove',
+		'action:cancel'
 	],
 	data() {
 		return {
@@ -272,6 +273,14 @@ export default {
 							};
 							container.append(button);
 						}
+						// NOTE(chris): Cancel
+						if (data.typ == 'AbmeldungStgl' && data.status == 'Erstellt') {
+							let button = document.createElement('button');
+							button.innerHTML = this.p.t('studierendenantrag', 'btn_cancel');
+							button.className = "btn btn-outline-secondary";
+							button.addEventListener('click',() => this.$emit('action:cancel', [cell.getData()]));
+							container.append(button);
+						}
 					}
 
 					if (this.stgL.includes(data.studiengang_kz)) {

From 91f79b202186032d9404f5edf4f38aa510268ed6 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 26 Jul 2023 13:27:51 +0200
Subject: [PATCH 082/175] - aufgenommen filter infocenter fuer lehrgaenge

---
 .../system/infocenter/InfoCenter.php          | 31 +++++-
 .../infocenter/infocenterAufgenommen.php      | 50 ++++++++++
 .../infocenter/infocenterAufgenommenData.php  | 95 +++++++++++++++++++
 system/filtersupdate.php                      | 21 ++++
 4 files changed, 196 insertions(+), 1 deletion(-)
 create mode 100644 application/views/system/infocenter/infocenterAufgenommen.php
 create mode 100644 application/views/system/infocenter/infocenterAufgenommenData.php

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 548b071d3..e6d307322 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -21,6 +21,7 @@ class InfoCenter extends Auth_Controller
 	const FREIGEGEBEN_PAGE = 'freigegeben';
 	const REIHUNGSTESTABSOLVIERT_PAGE = 'reihungstestAbsolviert';
 	const ABGEWIESEN_PAGE = 'abgewiesen';
+	const AUFGENOMMEN_PAGE = 'aufgenommen';
 	const SHOW_DETAILS_PAGE = 'showDetails';
 	const SHOW_ZGV_DETAILS_PAGE = 'showZGVDetails';
 	const ZGV_UBERPRUEFUNG_PAGE = 'ZGVUeberpruefung';
@@ -115,6 +116,7 @@ class InfoCenter extends Auth_Controller
 				'index' => 'infocenter:r',
 				'freigegeben' => 'infocenter:r',
 				'abgewiesen' => 'infocenter:r',
+				'aufgenommen' => 'infocenter:r',
 				'reihungstestAbsolviert' => 'infocenter:r',
 				'showDetails' => 'infocenter:r',
 				'showZGVDetails' => 'lehre/zgvpruefung:r',
@@ -228,6 +230,16 @@ class InfoCenter extends Auth_Controller
 
 		$this->load->view('system/infocenter/infocenterAbgewiesen.php');
 	}
+	
+	/**
+	 * Aufgenommene page of the InfoCenter tool
+	 */
+	public function aufgenommen()
+	{
+		$this->_setNavigationMenu(self::AUFGENOMMEN_PAGE); // define the navigation menu for this page
+		
+		$this->load->view('system/infocenter/infocenterAufgenommen.php');
+	}
 
 	/**
 	 *
@@ -1526,6 +1538,7 @@ class InfoCenter extends Auth_Controller
 		$freigegebenLink = site_url(self::INFOCENTER_URI.'/'.self::FREIGEGEBEN_PAGE);
 		$reihungstestAbsolviertLink = site_url(self::INFOCENTER_URI.'/'.self::REIHUNGSTESTABSOLVIERT_PAGE);
 		$abgewiesenLink = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
+		$aufgenommenLink = site_url(self::INFOCENTER_URI.'/'.self::AUFGENOMMEN_PAGE);
 
 		$currentFilterId = $this->input->get(self::FILTER_ID);
 		if (isset($currentFilterId))
@@ -1533,6 +1546,7 @@ class InfoCenter extends Auth_Controller
 			$freigegebenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 			$reihungstestAbsolviertLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 			$abgewiesenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
+			$aufgenommenLink .= '?'.self::PREV_FILTER_ID.'='.$currentFilterId;
 		}
 
 		$this->navigationlib->setSessionMenu(
@@ -1583,7 +1597,19 @@ class InfoCenter extends Auth_Controller
 					null, 				// subscriptLinkValue
 					'', 				// target
 					30   				// sort
-				)
+				),
+				'aufgenommen' => $this->navigationlib->oneLevel(
+					'Aufgenommene',		// description
+					$aufgenommenLink,				// link
+					null,				// children
+					'check',					// icon
+					null,				// subscriptDescription
+					false,				// expand
+					null,				// subscriptLinkClass
+					null, 				// subscriptLinkValue
+					'', 				// target
+					40   				// sort
+				),
 			)
 		);
 	}
@@ -1611,6 +1637,9 @@ class InfoCenter extends Auth_Controller
 		if ($origin_page === self::ABGEWIESEN_PAGE)
 			$link = site_url(self::INFOCENTER_URI.'/'.self::ABGEWIESEN_PAGE);
 
+		if ($origin_page === self::AUFGENOMMEN_PAGE)
+			$link = site_url(self::INFOCENTER_URI.'/'.self::AUFGENOMMEN_PAGE);
+
 		$prevFilterId = $this->input->get(self::PREV_FILTER_ID);
 		if (isset($prevFilterId))
 		{
diff --git a/application/views/system/infocenter/infocenterAufgenommen.php b/application/views/system/infocenter/infocenterAufgenommen.php
new file mode 100644
index 000000000..6d65c0f7c
--- /dev/null
+++ b/application/views/system/infocenter/infocenterAufgenommen.php
@@ -0,0 +1,50 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Info Center',
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'jquerycheckboxes1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'tablesorter2' => true,
+			'ajaxlib' => true,
+			'filterwidget' => true,
+			'navigationwidget' => true,
+			'dialoglib' => true,
+			'phrases' => array(
+				'person' => array('vorname', 'nachname'),
+				'global' => array('mailAnXversandt'),
+				'ui' => array('bitteEintragWaehlen')
+			),
+			'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css'),
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/infocenterPersonDataset.js')
+		)
+	);
+?>
+
+<body>
+	<div id="wrapper">
+
+		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
+
+		<div id="page-wrapper">
+			<div class="container-fluid">
+				<div class="row">
+					<div class="col-lg-12">
+						<h3 class="page-header">
+							Aufgenommen
+						</h3>
+					</div>
+				</div>
+				<div>
+					<?php $this->load->view('system/infocenter/infocenterAufgenommenData.php'); ?>
+				</div>
+			</div>
+		</div>
+	</div>
+</body>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/application/views/system/infocenter/infocenterAufgenommenData.php b/application/views/system/infocenter/infocenterAufgenommenData.php
new file mode 100644
index 000000000..720d118e3
--- /dev/null
+++ b/application/views/system/infocenter/infocenterAufgenommenData.php
@@ -0,0 +1,95 @@
+<?php
+
+	$this->config->load('infocenter');
+	$AUFGENOMMENER_STATUS = '\'Aufgenommener\'';
+	$REJECTED_STATUS = '\'Abgewiesener\'';
+	$STUDIENGANG_TYP = '\'l\'';
+	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
+	$LOGDATA_NAME = '\'Message sent\'';
+	$LOGDATA_VON = '\'online\'';
+
+$query = '
+		SELECT
+			p.person_id AS "PersonId",
+			p.vorname AS "Vorname",
+			p.nachname AS "Nachname",
+			(
+				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ) || UPPER(sg.kurzbz)), \', \')
+				FROM public.tbl_prestudentstatus pss
+					JOIN public.tbl_prestudent ps USING(prestudent_id)
+					JOIN public.tbl_studiengang sg USING(studiengang_kz)
+				WHERE
+					pss.status_kurzbz = '. $AUFGENOMMENER_STATUS .'
+					AND ps.person_id = p.person_id
+					AND sg.typ IN ('.$STUDIENGANG_TYP.')
+					AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
+					AND NOT EXISTS (
+						SELECT 1
+						FROM tbl_prestudentstatus spss
+						WHERE spss.prestudent_id = pss.prestudent_id
+							AND spss.status_kurzbz = '. $REJECTED_STATUS .'
+							AND spss.studiensemester_kurzbz IN (
+							SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >
+							(SELECT start FROM public.tbl_studiensemester sss WHERE studiensemester_kurzbz = '. $STUDIENSEMESTER .'))
+					)
+				 LIMIT 1
+			) AS "Studiengang"
+		FROM
+			public.tbl_person p
+		WHERE
+			EXISTS (
+				SELECT 1
+				  FROM public.tbl_prestudent sps
+				  JOIN public.tbl_studiengang ssg USING(studiengang_kz)
+				WHERE sps.person_id = p.person_id
+				  AND ssg.typ IN (' . $STUDIENGANG_TYP . ')
+				  AND ' . $AUFGENOMMENER_STATUS . ' = (
+						SELECT spss.status_kurzbz
+						FROM public.tbl_prestudentstatus spss
+						WHERE spss.prestudent_id = sps.prestudent_id
+						ORDER BY spss.datum DESC, spss.insertamum DESC, spss.ext_id DESC
+						LIMIT 1
+					)
+				AND EXISTS (
+						SELECT 1
+						FROM tbl_prestudentstatus spss
+						WHERE spss.prestudent_id = sps.prestudent_id
+						AND spss.status_kurzbz = ' . $AUFGENOMMENER_STATUS . '
+						AND spss.studiensemester_kurzbz = ' . $STUDIENSEMESTER . '
+				)
+			)
+			
+		';
+
+	$filterWidgetArray = array(
+		'query' => $query,
+		'app' => InfoCenter::APP,
+		'datasetName' => 'aufgenommen',
+		'filter_id' => $this->input->get('filter_id'),
+		'requiredPermissions' => 'infocenter',
+		'datasetRepresentation' => 'tablesorter',
+		'checkboxes' => 'PersonId',
+		'additionalColumns' => array('Details'),
+		'columnsAliases' => array(
+			'PersonId',
+			ucfirst($this->p->t('person', 'vorname')) ,
+			ucfirst($this->p->t('person', 'nachname')),
+			ucfirst($this->p->t('lehre', 'studiengang'))
+		),
+
+		'formatRow' => function($datasetRaw)
+		{
+			$datasetRaw->{'Details'} = sprintf(
+				'<a href="%s?person_id=%s&origin_page=%s&fhc_controller_id=%s&prev_filter_id=%s">Details</a>',
+				site_url('system/infocenter/InfoCenter/showDetails'),
+				$datasetRaw->{'PersonId'},
+				'aufgenommen',
+				(isset($_GET['fhc_controller_id']) ? $_GET['fhc_controller_id'] : ''),
+				(isset($_GET['filter_id']) ? $_GET['filter_id'] : '')
+			);
+			return $datasetRaw;
+		}
+	);
+
+	echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
+?>
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 241e44f2f..9f2b2c8e4 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -527,6 +527,27 @@ $filters = array(
 		',
 		'oe_kurzbz' => null,
 	),
+	array(
+		'app' => 'infocenter',
+		'dataset_name' => 'aufgenommen',
+		'filter_kurzbz' => 'InfoCenterAufgenommenAlle',
+		'description' => '{Alle}',
+		'sort' => 1,
+		'default_filter' => true,
+		'filter' => '
+			{
+				"name": "Aufgenommen - Alle",
+				"columns": [
+					{"name": "PersonId"},
+					{"name": "Vorname"},
+					{"name": "Nachname"},
+					{"name": "Studiengang"}
+				],
+				"filters": []
+			}
+		',
+		'oe_kurzbz' => null,
+	),
 	array(
 		'app' => 'budget',
 		'dataset_name' => 'budgetoverview',

From 1e082ed22524780673b41dee60bc02c1673c6052 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Thu, 27 Jul 2023 17:13:31 +0200
Subject: [PATCH 083/175] UHSTAT1 form: removed geburtsnation as it is saved in
 person table anyways, started to display existing uhstat data on form load

---
 application/controllers/codex/UHSTAT1.php    | 73 ++++++++++++++------
 application/models/codex/Abschluss_model.php |  8 ++-
 application/views/codex/uhstat1.php          | 58 +++++-----------
 system/phrasesupdate.php                     | 40 -----------
 4 files changed, 73 insertions(+), 106 deletions(-)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index 7deeb9eea..d0663c570 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -8,6 +8,17 @@ class UHSTAT1 extends FHC_Controller
 	const LOWER_BOUNDARY_YEARS = 160;
 	const UPPER_BOUNDARY_YEARS = 20;
 
+	private $_uhstat1Fields = array(
+		'mutter_geburtsstaat' => array('name' => 'Geburtsstaat Mutter', 'rules' => array('required')),
+		'mutter_geburtsjahr' => array('name' => 'Geburtsjahr Mutter', 'rules' => array('required')),
+		'mutter_bildungsstaat' => array('name' => 'Bildungsstaat Mutter', 'rules' => array('required')),
+		'mutter_bildungmax' => array('name' => 'Geburtsjahr Mutter', 'rules' => array('required')),
+		'vater_geburtsstaat' => array('name' => 'Geburtsstaat Vater', 'rules' => array('required')),
+		'vater_geburtsjahr',
+		'vater_bildungsstaat',
+		'vater_bildungmax'
+	);
+
 	public function __construct()
 	{
 		parent::__construct(
@@ -40,13 +51,17 @@ class UHSTAT1 extends FHC_Controller
 
 	public function index()
 	{
-		$formData = $this->_getFormData();
+		$formMetaData = $this->_getFormMetaData();
 
-		if (isError($formData)) show_error(getError($formData));
+		if (isError($formMetaData)) show_error(getError($formMetaData));
 
-		if (!hasData($formData)) show_error("No form data could be loaded");
+		if (!hasData($formMetaData)) show_error("No form meta data could be loaded");
 
-		$this->load->view("codex/uhstat1.php", array('formData' => getData($formData)));
+		$uhstatData = $this->_getUHSTAT1Data();
+
+		if (isError($uhstatData)) show_error(getError($uhstatData));
+
+		$this->load->view("codex/uhstat1.php", array('formMetaData' => getData($formMetaData), 'uhstatData' => getData($uhstatData)));
 	}
 
 	/**
@@ -61,7 +76,6 @@ class UHSTAT1 extends FHC_Controller
 		$this->form_validation->set_error_delimiters('<span class="text-danger">', '</span>');
 
 		// check required fields
-		$this->form_validation->set_rules('geburtsstaat', 'Geburtsstaat', 'required', array('required' => $this->p->t('uhstat', 'angabeFehlt')));
 		$this->form_validation->set_rules(
 			'mutter_geburtsstaat',
 			'Geburtsstaat Mutter',
@@ -171,11 +185,11 @@ class UHSTAT1 extends FHC_Controller
 			}
 		}
 
-		$formData = $this->_getFormData();
+		$formMetaData = $this->_getFormMetaData();
 
-		if (isError($formData)) show_error(getError($formData));
+		if (isError($formMetaData)) show_error(getError($formMetaData));
 
-		if (!hasData($formData)) show_error("No form data could be loaded");
+		if (!hasData($formMetaData)) show_error("No form data could be loaded");
 
 		// pass success/error messages to view
 		$successMessage = isset($uhstat1datenRes) && isSuccess($uhstat1datenRes) ? $this->p->t('uhstat', 'erfolgreichGespeichert') : '';
@@ -183,7 +197,7 @@ class UHSTAT1 extends FHC_Controller
 
 		// load view with form data
 		$this->load->view("codex/uhstat1.php", array(
-			'formData' => getData($formData),
+			'formMetaData' => getData($formMetaData),
 			'successMessage' => $successMessage,
 			'errorMessage' => $errorMessage
 		));
@@ -227,22 +241,23 @@ class UHSTAT1 extends FHC_Controller
 	/**
 	 * Gets initial data needed to display UHSTAT1 form.
 	 */
-	private function _getFormData()
+	private function _getFormMetaData()
 	{
 		$person_id = $this->input->get('person_id');
 
 		if (!isset($person_id) || !is_numeric($person_id)) return error("Person Id missing");
 
-		$formData = array(
+		$languageIdx = $this->_getLanguageIndex();
+
+		$formMetaData = array(
 			'nation' => array(),
 			'abschluss_oesterreich' => array(),
 			'abschluss_nicht_oesterreich' => array(),
 			'jahre' => array(),
-			'languageIdx' => $this->_getLanguageIndex(),
 			'person_id' => $person_id
 		);
 
-		$nationTextFieldName = $formData['languageIdx'] == 1 ? 'langtext' : 'engltext';
+		$nationTextFieldName = $languageIdx == 1 ? 'langtext' : 'engltext';
 
 		// get nation list
 		$this->load->model('codex/Nation_model', 'NationModel');
@@ -253,10 +268,10 @@ class UHSTAT1 extends FHC_Controller
 
 		if (isError($nationRes)) return $nationRes;
 
-		if (hasData($nationRes)) $formData['nation'] = getData($nationRes);
+		if (hasData($nationRes)) $formMetaData['nation'] = getData($nationRes);
 
 		// get abschluss list
-		$abschlussRes = $this->AbschlussModel->getActiveAbschluesse();
+		$abschlussRes = $this->AbschlussModel->getActiveAbschluesse($languageIdx);
 
 		if (isError($abschlussRes)) return $abschlussRes;
 
@@ -267,22 +282,38 @@ class UHSTAT1 extends FHC_Controller
 			foreach (getData($abschlussRes) as $abschluss)
 			{
 				if ($abschluss->in_oesterreich === true)
-					$formData['abschluss_oesterreich'][] = $abschluss;
+					$formMetaData['abschluss_oesterreich'][] = $abschluss;
 				elseif ($abschluss->in_oesterreich === false)
-					$formData['abschluss_nicht_oesterreich'][] = $abschluss;
+					$formMetaData['abschluss_nicht_oesterreich'][] = $abschluss;
 				else
 				{
-					$formData['abschluss_oesterreich'][] = $abschluss;
-					$formData['abschluss_nicht_oesterreich'][] = $abschluss;
+					$formMetaData['abschluss_oesterreich'][] = $abschluss;
+					$formMetaData['abschluss_nicht_oesterreich'][] = $abschluss;
 				}
 			}
 		}
 
 		// get realistic birth years, dated back from current year
 		$currYear = date("Y");
-		$formData['jahre'] = range($currYear - self::UPPER_BOUNDARY_YEARS, $currYear - self::LOWER_BOUNDARY_YEARS);
+		$formMetaData['jahre'] = range($currYear - self::UPPER_BOUNDARY_YEARS, $currYear - self::LOWER_BOUNDARY_YEARS);
 
-		return success($formData);
+		return success($formMetaData);
+	}
+
+	/**
+	 * Gets initial data needed to display UHSTAT1 form.
+	 */
+	private function _getUHSTAT1Data()
+	{
+		$person_id = $this->input->get('person_id');
+
+		if (!isset($person_id) || !is_numeric($person_id)) return error("Person Id missing");
+
+		$this->Uhstat1datenModel->addSelect("
+			mutter_geburtsstaat, mutter_geburtsjahr, mutter_bildungsstaat, mutter_bildungmax,
+			vater_geburtsstaat, vater_geburtsjahr, vater_bildungsstaat, vater_bildungmax"
+		);
+		return $this->Uhstat1datenModel->loadWhere(array('person_id' => $person_id));
 	}
 
 	/**
diff --git a/application/models/codex/Abschluss_model.php b/application/models/codex/Abschluss_model.php
index 93b940ed2..2907deff1 100644
--- a/application/models/codex/Abschluss_model.php
+++ b/application/models/codex/Abschluss_model.php
@@ -12,17 +12,19 @@ class Abschluss_model extends DB_Model
 		$this->pk = 'ausbildung_code';
 	}
 
-	public function getActiveAbschluesse()
+	public function getActiveAbschluesse($languageIndex)
 	{
 		return $this->execQuery(
 			'
 				SELECT
-					ausbildung_code, bezeichnung, in_oesterreich
+					ausbildung_code, bezeichnung[?], in_oesterreich
 				FROM
 					bis.tbl_abschluss
 				WHERE
 					aktiv
-				ORDER BY CASE WHEN in_oesterreich THEN 0 ELSE 1 END, ausbildung_code'
+				ORDER BY
+					CASE WHEN in_oesterreich THEN 0 ELSE 1 END, ausbildung_code',
+			array($languageIndex)
 		);
 	}
 }
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index 918364cf6..c670373d0 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -23,34 +23,7 @@ $this->load->view(
 			<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungEinleitungstext') ?>
 		</p>
 		<br>
-		<form class="form-horizontal" method="POST" action="<?php echo site_url('codex/UHSTAT1/saveUHSTAT1Data').'?person_id='.$formData['person_id'] ?>">
-			<fieldset>
-				<legend><?php echo $this->p->t('uhstat', 'persoenlicheAngaben') ?></legend>
-				<p>
-					<?php echo $this->p->t('uhstat', 'persoenlicheAngabenEinleitungstext') ?>
-				</p>
-				<div class="form-group">
-					<label for="geburtsstaat" class="col-sm-3 control-label">
-						<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
-						<br>
-						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
-					</label>
-					<div class="col-sm-9">
-						<select type="text" name="geburtsstaat" id="geburtsstaat" class="form-control">
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo set_value('geburtsstaat') == $nation->nation_code ? " selected" : "" ?>>
-									<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
-						<?php echo form_error('geburtsstaat'); ?>
-					</div>
-				</div>
-			</fieldset>
-			<br>
+		<form class="form-horizontal" method="POST" action="<?php echo site_url('codex/UHSTAT1/saveUHSTAT1Data').'?person_id='.$formMetaData['person_id'] ?>">
 			<fieldset>
 				<legend><?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigte') ?></legend>
 				<p>
@@ -63,7 +36,7 @@ $this->load->view(
 					<div class="col-sm-9">
 						<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formData['jahre'] as $jahr): ?>
+							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
 								<option
 									value="<?php echo $jahr ?>"
 									<?php echo set_value('mutter_geburtsjahr') == $jahr ? " selected" : "" ?>>
@@ -83,7 +56,7 @@ $this->load->view(
 					<div class="col-sm-9">
 						<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formData['nation'] as $nation): ?>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
 									value="<?php echo $nation->nation_code ?>"
 									<?php echo set_value('mutter_geburtsstaat') == $nation->nation_code ? " selected" : "" ?>>
@@ -103,7 +76,7 @@ $this->load->view(
 					<div class="col-sm-9">
 						<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formData['nation'] as $nation): ?>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
 									value="<?php echo $nation->nation_code ?>"
 									<?php echo set_value('mutter_bildungsstaat') == $nation->nation_code ? " selected" : "" ?>>
@@ -122,21 +95,21 @@ $this->load->view(
 							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
 								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
 							</optgroup>
-							<?php foreach ($formData['abschluss_oesterreich'] as $abschluss): ?>
+							<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
 								<option
 									value="<?php echo $abschluss->ausbildung_code ?>"
 									<?php echo set_value('mutter_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
-									<?php echo $abschluss->bezeichnung[$formData['languageIdx']] ?>
+									<?php echo $abschluss->bezeichnung ?>
 								</option>
 							<?php endforeach; ?>
 							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
 								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
 							</optgroup>
-							<?php foreach ($formData['abschluss_nicht_oesterreich'] as $abschluss): ?>
+							<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
 								<option
 									value="<?php echo $abschluss->ausbildung_code ?>"
 									<?php echo set_value('mutter_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
-									<?php echo $abschluss->bezeichnung[$formData['languageIdx']] ?>
+									<?php echo $abschluss->bezeichnung ?>
 								</option>
 							<?php endforeach; ?>
 						</select>
@@ -150,7 +123,7 @@ $this->load->view(
 					<div class="col-sm-9">
 						<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formData['jahre'] as $jahr): ?>
+							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
 								<option
 									value="<?php echo $jahr ?>"
 									<?php echo set_value('vater_geburtsjahr') == $jahr ? " selected" : "" ?>>
@@ -170,7 +143,7 @@ $this->load->view(
 					<div class="col-sm-9">
 						<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formData['nation'] as $nation): ?>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
 									value="<?php echo $nation->nation_code ?>"
 									<?php echo set_value('vater_geburtsstaat') == $nation->nation_code ? " selected" : "" ?>>
@@ -190,7 +163,7 @@ $this->load->view(
 					<div class="col-sm-9">
 						<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control">
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formData['nation'] as $nation): ?>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
 									value="<?php echo $nation->nation_code ?>"
 									<?php echo set_value('vater_bildungsstaat') == $nation->nation_code ? " selected" : "" ?>>
@@ -211,21 +184,21 @@ $this->load->view(
 							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
 								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
 							</optgroup>
-							<?php foreach ($formData['abschluss_oesterreich'] as $abschluss): ?>
+							<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
 								<option
 									value="<?php echo $abschluss->ausbildung_code ?>"
 									<?php echo set_value('vater_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
-									<?php echo $abschluss->bezeichnung[$formData['languageIdx']] ?>
+									<?php echo $abschluss->bezeichnung ?>
 								</option>
 							<?php endforeach; ?>
 							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
 								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
 							</optgroup>
-							<?php foreach ($formData['abschluss_nicht_oesterreich'] as $abschluss): ?>
+							<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
 								<option
 									value="<?php echo $abschluss->ausbildung_code ?>"
 									<?php echo set_value('vater_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
-									<?php echo $abschluss->bezeichnung[$formData['languageIdx']] ?>
+									<?php echo $abschluss->bezeichnung ?>
 								</option>
 							<?php endforeach; ?>
 						</select>
@@ -243,6 +216,7 @@ $this->load->view(
 						<?php if (isset($errorMessage)): ?>
 							<span class='text-danger'><?php echo $errorMessage ?></span>
 						<?php endif; ?>
+						&nbsp;
 						<button class="btn btn-success btn-md" type="submit">
 							<?php echo $this->p->t('uhstat', 'pruefenUndSpeichern') ?>
 						</button>
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 09f2633b8..f0043ad18 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18243,46 +18243,6 @@ array(
 			)
 		)
 	),
-	array(
-		'app' => 'core',
-		'category' => 'uhstat',
-		'phrase' => 'persoenlicheAngaben',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Persönliche Angaben',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'Personal data',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
-	array(
-		'app' => 'core',
-		'category' => 'uhstat',
-		'phrase' => 'persoenlicheAngabenEinleitungstext',
-		'insertvon' => 'system',
-		'phrases' => array(
-			array(
-				'sprache' => 'German',
-				'text' => 'Wenn Sie keine österreichische Sozialversicherungsnummer haben, dann fragen Sie bitte die Hochschule, an der Sie studieren möchten, nach Ihrem Ersatzkennzeichen.',
-				'description' => '',
-				'insertvon' => 'system'
-			),
-			array(
-				'sprache' => 'English',
-				'text' => 'If you do not have an Austrian \'Sozialversicherungsnummer\' (social security number), please ask the university or university college at which you would like to study for your substitute code (\'Ersatzkennzeichen\').',
-				'description' => '',
-				'insertvon' => 'system'
-			)
-		)
-	),
 	array(
 		'app' => 'core',
 		'category' => 'uhstat',

From 349e9b9442ef91af02e224342f36ff878b5c9f88 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Fri, 28 Jul 2023 22:15:26 +0200
Subject: [PATCH 084/175] UHSTAT1 form: removed geburtsstaat from database
 table, data is shown if uhstat entry already exists

---
 application/controllers/codex/UHSTAT1.php     | 182 ++++++++----------
 application/views/codex/uhstat1.php           |  33 ++--
 ...uhstat1_daten_ueber_das_bewerbungstool.php |   6 -
 3 files changed, 98 insertions(+), 123 deletions(-)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index d0663c570..3ba4760a5 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -8,16 +8,7 @@ class UHSTAT1 extends FHC_Controller
 	const LOWER_BOUNDARY_YEARS = 160;
 	const UPPER_BOUNDARY_YEARS = 20;
 
-	private $_uhstat1Fields = array(
-		'mutter_geburtsstaat' => array('name' => 'Geburtsstaat Mutter', 'rules' => array('required')),
-		'mutter_geburtsjahr' => array('name' => 'Geburtsjahr Mutter', 'rules' => array('required')),
-		'mutter_bildungsstaat' => array('name' => 'Bildungsstaat Mutter', 'rules' => array('required')),
-		'mutter_bildungmax' => array('name' => 'Geburtsjahr Mutter', 'rules' => array('required')),
-		'vater_geburtsstaat' => array('name' => 'Geburtsstaat Vater', 'rules' => array('required')),
-		'vater_geburtsjahr',
-		'vater_bildungsstaat',
-		'vater_bildungmax'
-	);
+	private $_uhstat1Fields = array();
 
 	public function __construct()
 	{
@@ -47,6 +38,33 @@ class UHSTAT1 extends FHC_Controller
 				'uhstat'
 			)
 		);
+
+		// set form field information
+		$this->_uhstat1Fields = array(
+			'mutter_geburtsstaat' => array('name' => 'Geburtsstaat Mutter'),
+			'mutter_geburtsjahr' => array('name' => 'Geburtsjahr Mutter'),
+			'mutter_bildungsstaat' => array('name' => 'Bildungsstaat Mutter'),
+			'mutter_bildungmax' => array(
+				'name' => 'Geburtsjahr Mutter',
+				'rules' => array(
+					'callback_bildungsstaat_bildungmax_check[m]' => array(
+						'bildungsstaat_bildungmax_check' => $this->p->t('uhstat', 'ausbildungBildungsstaatUebereinstimmung')
+					)
+				)
+			),
+			'vater_geburtsstaat' => array('name' => 'Geburtsstaat Vater'),
+			'vater_geburtsjahr' => array('name' => 'Geburtsjahr Vater'),
+			'vater_bildungsstaat' => array('name' => 'Bildungsstaat Vater'),
+			'vater_bildungmax' => array('name' => 'Geburtsjahr Vater'),
+			'vater_bildungmax' => array(
+				'name' => 'Geburtsjahr Vater',
+				'rules' => array(
+					'callback_bildungsstaat_bildungmax_check[v]' => array(
+						'bildungsstaat_bildungmax_check' => $this->p->t('uhstat', 'ausbildungBildungsstaatUebereinstimmung')
+					)
+				)
+			)
+		);
 	}
 
 	public function index()
@@ -61,7 +79,13 @@ class UHSTAT1 extends FHC_Controller
 
 		if (isError($uhstatData)) show_error(getError($uhstatData));
 
-		$this->load->view("codex/uhstat1.php", array('formMetaData' => getData($formMetaData), 'uhstatData' => getData($uhstatData)));
+		$readonly = hasData($uhstatData);
+
+		$this->load->view("codex/uhstat1.php", array(
+			'formMetaData' => getData($formMetaData),
+			'uhstatData' => getData($uhstatData),
+			'readonly' => $readonly)
+		);
 	}
 
 	/**
@@ -75,77 +99,39 @@ class UHSTAT1 extends FHC_Controller
 
 		$this->form_validation->set_error_delimiters('<span class="text-danger">', '</span>');
 
-		// check required fields
-		$this->form_validation->set_rules(
-			'mutter_geburtsstaat',
-			'Geburtsstaat Mutter',
-			'required',
-			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
-		);
-		$this->form_validation->set_rules(
-			'mutter_bildungsstaat',
-			'Bildungsstaat Mutter',
-			'required',
-			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
-		);
-		$this->form_validation->set_rules(
-			'mutter_geburtsjahr',
-			'Geburtsjahr Mutter',
-			'required',
-			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
-		);
-		$this->form_validation->set_rules(
-			'mutter_bildungmax',
-			'Höchste Ausbildung Mutter',
-			'required|callback_bildungsstaat_bildungmax_check[m]',
-			array(
-				'required' => $this->p->t('uhstat', 'angabeFehlt'),
-				'bildungsstaat_bildungmax_check' => $this->p->t('uhstat', 'ausbildungBildungsstaatUebereinstimmung')
-				//'Land der höchsten Ausbildung muss mit Bildungsstaat übereinstimmen'
-				// Bildungsstaat should correspond to state of bildung max
-			)
-		);
-		$this->form_validation->set_rules(
-			'vater_geburtsstaat',
-			'Geburtsstaat Vater',
-			'required',
-			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
-		);
-		$this->form_validation->set_rules(
-			'vater_bildungsstaat',
-			'Bildungsstaat Vater',
-			'required',
-			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
-		);
-		$this->form_validation->set_rules(
-			'vater_geburtsjahr',
-			'Geburtsjahr Vater',
-			'required',
-			array('required' => $this->p->t('uhstat', 'angabeFehlt'))
-		);
-		$this->form_validation->set_rules(
-			'vater_bildungmax',
-			'Höchste Ausbildung Vater',
-			'required|callback_bildungsstaat_bildungmax_check[v]',
-			array(
-				'required' => $this->p->t('uhstat', 'angabeFehlt'),
-				'bildungsstaat_bildungmax_check' => $this->p->t('uhstat', 'ausbildungBildungsstaatUebereinstimmung')
-			)
-		);
+		foreach ($this->_uhstat1Fields as $field => $params)
+		{
+			// all fields are required
+			$ruleNames = 'required';
+			$ruleMessages = array('required' => $this->p->t('uhstat', 'angabeFehlt'));
+
+			// add additional rules
+			if (isset($params['rules']))
+			{
+				foreach ($params['rules'] as $ruleName => $ruleMessage)
+				{
+					$ruleNames .= '|'.$ruleName;
+					$ruleMessages = array_merge($ruleMessages, $ruleMessage);
+				}
+			}
+
+			$this->form_validation->set_rules(
+				$field,
+				$params['name'],
+				$ruleNames,
+				$ruleMessages
+			);
+		}
 
 		$uhstat1datenRes = null;
 		if ($this->form_validation->run()) // if valid
 		{
 			// get post fields
-			$geburtsstaat = $this->input->post('geburtsstaat');
-			$mutter_geburtsstaat = $this->input->post('mutter_geburtsstaat');
-			$mutter_geburtsjahr = $this->input->post('mutter_geburtsjahr');
-			$mutter_bildungsstaat = $this->input->post('mutter_bildungsstaat');
-			$mutter_bildungmax = $this->input->post('mutter_bildungmax');
-			$vater_geburtsstaat = $this->input->post('vater_geburtsstaat');
-			$vater_geburtsjahr = $this->input->post('vater_geburtsjahr');
-			$vater_bildungsstaat = $this->input->post('vater_bildungsstaat');
-			$vater_bildungmax = $this->input->post('vater_bildungmax');
+			$uhstatData = array();
+			foreach ($this->_uhstat1Fields as $field => $params)
+			{
+				$uhstatData[$field] = $this->input->post($field);
+			}
 
 			$uhstat1datenloadRes = $this->Uhstat1datenModel->loadWhere(array('person_id' => $person_id));
 
@@ -153,34 +139,13 @@ class UHSTAT1 extends FHC_Controller
 			{
 				$uhstat1datenRes = $this->Uhstat1datenModel->update(
 					array('person_id' => $person_id),
-					array(
-						'geburtsstaat' => $geburtsstaat,
-						'mutter_geburtsstaat' => $mutter_geburtsstaat,
-						'mutter_geburtsjahr' => $mutter_geburtsjahr,
-						'mutter_bildungsstaat' => $mutter_bildungsstaat,
-						'mutter_bildungmax' => $mutter_bildungmax,
-						'vater_geburtsstaat' => $vater_geburtsstaat,
-						'vater_geburtsjahr' => $vater_geburtsjahr,
-						'vater_bildungsstaat' => $vater_bildungsstaat,
-						'vater_bildungmax' => $vater_bildungmax
-					)
+					$uhstatData
 				);
 			}
 			else
 			{
 				$uhstat1datenRes = $this->Uhstat1datenModel->insert(
-					array(
-						'geburtsstaat' => $geburtsstaat,
-						'mutter_geburtsstaat' => $mutter_geburtsstaat,
-						'mutter_geburtsjahr' => $mutter_geburtsjahr,
-						'mutter_bildungsstaat' => $mutter_bildungsstaat,
-						'mutter_bildungmax' => $mutter_bildungmax,
-						'vater_geburtsstaat' => $vater_geburtsstaat,
-						'vater_geburtsjahr' => $vater_geburtsjahr,
-						'vater_bildungsstaat' => $vater_bildungsstaat,
-						'vater_bildungmax' => $vater_bildungmax,
-						'person_id' =>$person_id
-					)
+					array_merge($uhstatData, array('person_id' => $person_id))
 				);
 			}
 		}
@@ -194,12 +159,14 @@ class UHSTAT1 extends FHC_Controller
 		// pass success/error messages to view
 		$successMessage = isset($uhstat1datenRes) && isSuccess($uhstat1datenRes) ? $this->p->t('uhstat', 'erfolgreichGespeichert') : '';
 		$errorMessage = isset($uhstat1datenRes) && isError($uhstat1datenRes) ? $this->p->t('uhstat', 'fehlerBeimSpeichern') : '';
+		$readOnly = isSuccess($uhstat1datenRes);
 
 		// load view with form data
 		$this->load->view("codex/uhstat1.php", array(
 			'formMetaData' => getData($formMetaData),
 			'successMessage' => $successMessage,
-			'errorMessage' => $errorMessage
+			'errorMessage' => $errorMessage,
+			'readonly' => $readOnly
 		));
 	}
 
@@ -212,7 +179,7 @@ class UHSTAT1 extends FHC_Controller
 	public function bildungsstaat_bildungmax_check($bildungmax, $bildungsstaat_typ)
 	{
 		// valid if no type passed
-		if (!isset($bildungsstaat_typ)) return true;
+		if (!isset($bildungsstaat_typ) || !isset($bildungmax)) return true;
 
 		// get correct input
 		if ($bildungsstaat_typ == 'm') // mutter
@@ -309,11 +276,14 @@ class UHSTAT1 extends FHC_Controller
 
 		if (!isset($person_id) || !is_numeric($person_id)) return error("Person Id missing");
 
-		$this->Uhstat1datenModel->addSelect("
-			mutter_geburtsstaat, mutter_geburtsjahr, mutter_bildungsstaat, mutter_bildungmax,
-			vater_geburtsstaat, vater_geburtsjahr, vater_bildungsstaat, vater_bildungmax"
+		$this->Uhstat1datenModel->addSelect(
+			implode(', ', array_keys($this->_uhstat1Fields))
 		);
-		return $this->Uhstat1datenModel->loadWhere(array('person_id' => $person_id));
+		$uhstatRes = $this->Uhstat1datenModel->loadWhere(array('person_id' => $person_id));
+
+		if (isError($uhstatRes)) return $uhstatRes;
+
+		return success(hasData($uhstatRes) ? getData($uhstatRes)[0] : null);
 	}
 
 	/**
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index c670373d0..470aeea84 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -13,7 +13,18 @@ $this->load->view(
 	)
 );
 ?>
-
+<?php
+// init data
+$mutter_geburtsjahr = isset($uhstatData->mutter_geburtsjahr) ? $uhstatData->mutter_geburtsjahr : set_value('mutter_geburtsjahr');
+$mutter_geburtsstaat = isset($uhstatData->mutter_geburtsstaat) ? $uhstatData->mutter_geburtsstaat : set_value('mutter_geburtsstaat');
+$mutter_bildungsstaat = isset($uhstatData->mutter_bildungsstaat) ? $uhstatData->mutter_bildungsstaat : set_value('mutter_bildungsstaat');
+$mutter_bildungmax = isset($uhstatData->mutter_bildungmax) ? $uhstatData->mutter_bildungmax : set_value('mutter_bildungmax');
+$vater_geburtsjahr = isset($uhstatData->vater_geburtsjahr) ? $uhstatData->vater_geburtsjahr : set_value('vater_geburtsjahr');
+$vater_geburtsstaat = isset($uhstatData->vater_geburtsstaat) ? $uhstatData->vater_geburtsstaat : set_value('vater_geburtsstaat');
+$vater_bildungsstaat = isset($uhstatData->vater_bildungsstaat) ? $uhstatData->vater_bildungsstaat : set_value('vater_bildungsstaat');
+$vater_bildungmax = isset($uhstatData->vater_bildungmax) ? $uhstatData->vater_bildungmax : set_value('vater_bildungmax');
+$disabled = $readonly === true ? ' disabled' : '';
+?>
 <div class="container">
 	<div class="tab-content">
 		<h3>
@@ -39,7 +50,7 @@ $this->load->view(
 							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
 								<option
 									value="<?php echo $jahr ?>"
-									<?php echo set_value('mutter_geburtsjahr') == $jahr ? " selected" : "" ?>>
+									<?php echo $jahr == $mutter_geburtsjahr ? " selected" : "" ?>>
 									<?php echo $jahr ?>
 								</option>
 							<?php endforeach; ?>
@@ -59,7 +70,7 @@ $this->load->view(
 							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
 									value="<?php echo $nation->nation_code ?>"
-									<?php echo set_value('mutter_geburtsstaat') == $nation->nation_code ? " selected" : "" ?>>
+									<?php echo $mutter_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
 									<?php echo $nation->nation_text ?>
 								</option>
 							<?php endforeach; ?>
@@ -79,7 +90,7 @@ $this->load->view(
 							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
 									value="<?php echo $nation->nation_code ?>"
-									<?php echo set_value('mutter_bildungsstaat') == $nation->nation_code ? " selected" : "" ?>>
+									<?php echo $mutter_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
 									<?php echo $nation->nation_text ?>
 								</option>
 							<?php endforeach; ?>
@@ -98,7 +109,7 @@ $this->load->view(
 							<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
 								<option
 									value="<?php echo $abschluss->ausbildung_code ?>"
-									<?php echo set_value('mutter_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $mutter_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
 									<?php echo $abschluss->bezeichnung ?>
 								</option>
 							<?php endforeach; ?>
@@ -108,7 +119,7 @@ $this->load->view(
 							<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
 								<option
 									value="<?php echo $abschluss->ausbildung_code ?>"
-									<?php echo set_value('mutter_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $mutter_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
 									<?php echo $abschluss->bezeichnung ?>
 								</option>
 							<?php endforeach; ?>
@@ -126,7 +137,7 @@ $this->load->view(
 							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
 								<option
 									value="<?php echo $jahr ?>"
-									<?php echo set_value('vater_geburtsjahr') == $jahr ? " selected" : "" ?>>
+									<?php echo $vater_geburtsjahr == $jahr ? " selected" : "" ?>>
 										<?php echo $jahr ?>
 									</option>
 							<?php endforeach; ?>
@@ -146,7 +157,7 @@ $this->load->view(
 							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
 									value="<?php echo $nation->nation_code ?>"
-									<?php echo set_value('vater_geburtsstaat') == $nation->nation_code ? " selected" : "" ?>>
+									<?php echo $vater_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
 										<?php echo $nation->nation_text ?>
 								</option>
 							<?php endforeach; ?>
@@ -166,7 +177,7 @@ $this->load->view(
 							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
 									value="<?php echo $nation->nation_code ?>"
-									<?php echo set_value('vater_bildungsstaat') == $nation->nation_code ? " selected" : "" ?>>
+									<?php echo $vater_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
 										<?php echo $nation->nation_text ?>
 								</option>
 							<?php endforeach; ?>
@@ -187,7 +198,7 @@ $this->load->view(
 							<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
 								<option
 									value="<?php echo $abschluss->ausbildung_code ?>"
-									<?php echo set_value('vater_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $vater_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
 									<?php echo $abschluss->bezeichnung ?>
 								</option>
 							<?php endforeach; ?>
@@ -197,7 +208,7 @@ $this->load->view(
 							<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
 								<option
 									value="<?php echo $abschluss->ausbildung_code ?>"
-									<?php echo set_value('vater_bildungmax') == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $vater_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
 									<?php echo $abschluss->bezeichnung ?>
 								</option>
 							<?php endforeach; ?>
diff --git a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
index bbd168073..3afc4083e 100644
--- a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
+++ b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
@@ -58,7 +58,6 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_uhstat1daten LIMIT 1'))
 			CREATE TABLE bis.tbl_uhstat1daten
 			(
 				uhstat1daten_id integer DEFAULT nextval('bis.tbl_uhstat1daten_uhstat1daten_id_seq'::regclass),
-				geburtsstaat varchar(3),
 				mutter_geburtsstaat varchar(3),
 				mutter_bildungsstaat varchar(3),
 				mutter_geburtsjahr smallint,
@@ -70,10 +69,6 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_uhstat1daten LIMIT 1'))
 				person_id integer NOT NULL
 			);
 
-			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_geburtsstaat FOREIGN KEY (geburtsstaat)
-			REFERENCES bis.tbl_nation (nation_code) MATCH SIMPLE
-			ON DELETE RESTRICT ON UPDATE CASCADE;
-
 			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_mutter_geburtsstaat FOREIGN KEY (mutter_geburtsstaat)
 			REFERENCES bis.tbl_nation (nation_code) MATCH SIMPLE
 			ON DELETE RESTRICT ON UPDATE CASCADE;
@@ -105,7 +100,6 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_uhstat1daten LIMIT 1'))
 			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT uk_uhstat1daten_person_id UNIQUE(person_id);
 
 			COMMENT ON TABLE bis.tbl_uhstat1daten IS 'UHSTAT1 data for a person (statistical data)';
-			COMMENT ON COLUMN bis.tbl_uhstat1daten.geburtsstaat IS 'Birthplace of person';
 			COMMENT ON COLUMN bis.tbl_uhstat1daten.mutter_geburtsstaat IS 'Birth country of mother of person';
 			COMMENT ON COLUMN bis.tbl_uhstat1daten.mutter_bildungsstaat IS 'Education country of mother of person';
 			COMMENT ON COLUMN bis.tbl_uhstat1daten.mutter_geburtsjahr IS 'Birth year of mother of person';

From cfb034bc69e3b8a0ad1052cdaad19f96d11fe768 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Fri, 28 Jul 2023 22:39:50 +0200
Subject: [PATCH 085/175] uhstat form: disabled input fields if uhstat entry
 already saved

---
 application/views/codex/uhstat1.php | 34 +++++++++++++++--------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index 470aeea84..b60f518a4 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -45,7 +45,7 @@ $disabled = $readonly === true ? ' disabled' : '';
 				<div class="form-group">
 					<label for="mutter_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
 					<div class="col-sm-9">
-						<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control">
+						<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control" <?php echo $disabled ?>>
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
 							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
 								<option
@@ -65,7 +65,7 @@ $disabled = $readonly === true ? ' disabled' : '';
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control">
+						<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control" <?php echo $disabled ?>>
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
 							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
@@ -85,7 +85,7 @@ $disabled = $readonly === true ? ' disabled' : '';
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control">
+						<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control" <?php echo $disabled ?>>
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
 							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
@@ -101,7 +101,7 @@ $disabled = $readonly === true ? ' disabled' : '';
 				<div class="form-group">
 					<label for="mutter_bildungmax" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?></label>
 					<div class="col-sm-9">
-						<select type="text" name="mutter_bildungmax" id="mutter_bildungmax" class="form-control">
+						<select type="text" name="mutter_bildungmax" id="mutter_bildungmax" class="form-control" <?php echo $disabled ?>>
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
 							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
 								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
@@ -132,7 +132,7 @@ $disabled = $readonly === true ? ' disabled' : '';
 				<div class="form-group">
 					<label for="vater_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
 					<div class="col-sm-9">
-						<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control">
+						<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control" <?php echo $disabled ?>>
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
 							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
 								<option
@@ -152,7 +152,7 @@ $disabled = $readonly === true ? ' disabled' : '';
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control">
+						<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control" <?php echo $disabled ?>>
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
 							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
@@ -172,7 +172,7 @@ $disabled = $readonly === true ? ' disabled' : '';
 						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control">
+						<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control" <?php echo $disabled ?>>
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
 							<?php foreach ($formMetaData['nation'] as $nation): ?>
 								<option
@@ -190,7 +190,7 @@ $disabled = $readonly === true ? ' disabled' : '';
 						<?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?>
 					</label>
 					<div class="col-sm-9">
-						<select type="text" name="vater_bildungmax" id="vater_bildungmax" class="form-control">
+						<select type="text" name="vater_bildungmax" id="vater_bildungmax" class="form-control" <?php echo $disabled ?>>
 							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
 							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
 								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
@@ -221,16 +221,18 @@ $disabled = $readonly === true ? ' disabled' : '';
 			<fieldset>
 				<div class="form-group">
 					<div class="col-sm-12 text-right">
-						<?php if (isset($successMessage)): ?>
-							<span class='text-success'><?php echo $successMessage ?></span>
+						<?php if (isset($successMessage) && !isEmptyString($successMessage)): ?>
+							<div class='alert alert-success text-center' role='alert'><?php echo $successMessage ?></div>
 						<?php endif; ?>
-						<?php if (isset($errorMessage)): ?>
-							<span class='text-danger'><?php echo $errorMessage ?></span>
+						<?php if (isset($errorMessage) && !isEmptyString($errorMessage)): ?>
+							<div class='alert alert-danger text-center'><?php echo $errorMessage ?></div>
+						<?php endif; ?>
+						<?php if (!$readonly): ?>
+							&nbsp;
+							<button class="btn btn-success btn-md" type="submit">
+								<?php echo $this->p->t('uhstat', 'pruefenUndSpeichern') ?>
+							</button>
 						<?php endif; ?>
-						&nbsp;
-						<button class="btn btn-success btn-md" type="submit">
-							<?php echo $this->p->t('uhstat', 'pruefenUndSpeichern') ?>
-						</button>
 					</div>
 				</div>
 			</fieldset>

From af24ef15178d23ac169d47e69b85c48885069027 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 31 Jul 2023 09:08:33 +0200
Subject: [PATCH 086/175] Bug: neue Unterbrechung

---
 .../js/components/Studierendenantrag/Form/Unterbrechung.js   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index e1322067f..3f2836a42 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -55,9 +55,8 @@ export default {
 		datumWsFormatted() {
 			let datumUnformatted = '';
 
-			if (this.studierendenantragId) {
-				if (this.data.datum_wiedereinstieg)
-					datumUnformatted = this.data.datum_wiedereinstieg;
+			if (this.data.datum_wiedereinstieg) {
+				datumUnformatted = this.data.datum_wiedereinstieg;
 			} else {
 				if (this.stsem !== null && this.data.studiensemester[this.stsem].wiedereinstieg)
 					datumUnformatted = this.data.studiensemester[this.stsem].wiedereinstieg;

From 096b436d546301f2af4d1c45c983eabfe2ec57e0 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 24 Jul 2023 10:24:21 +0200
Subject: [PATCH 087/175] Added phrases for Begruendung ECTS and Begruendung
 LVinhalt

---
 system/phrasesupdate.php | 100 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 100 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 28735e07f..74803092d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -10909,6 +10909,86 @@ Any unusual occurrences
             )
         )
     ),
+    array(
+        'app' => 'core',
+        'category' => 'anrechnung',
+        'phrase' => 'begruendungEcts',
+        'insertvon' => 'system',
+        'phrases' => array(
+            array(
+                'sprache' => 'German',
+                'text' => 'Begründen Sie die Gleichwertigkeit der ECTS',
+                'description' => '',
+                'insertvon' => 'system'
+            ),
+            array(
+                'sprache' => 'English',
+                'text' => 'Give reasons for the equivalence of ECTS',
+                'description' => '',
+                'insertvon' => 'system'
+            )
+        )
+    ),
+    array(
+        'app' => 'core',
+        'category' => 'anrechnung',
+        'phrase' => 'begruendungLvinhalt',
+        'insertvon' => 'system',
+        'phrases' => array(
+            array(
+                'sprache' => 'German',
+                'text' => 'Begründen Sie die Gleichwertigkeit der Lehrveranstaltungsinhalte',
+                'description' => '',
+                'insertvon' => 'system'
+            ),
+            array(
+                'sprache' => 'English',
+                'text' => 'Give reasons for the equivalence of the course contents',
+                'description' => '',
+                'insertvon' => 'system'
+            )
+        )
+    ),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'anrechnungBegruendungEctsTooltipText',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hinsichtlich des Umfangs der LV, die Sie anrechnen lassen wollen: Bitte erläutern Sie, warum Ihr Zeugnis bzw. Ihre berufliche Praxis mit dem Umfang der LV gleichwertig ist.<br><br>Referenzbeispiele für die ECTS-Berechnung finden Sie rechts in der Infobox.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Regarding the scope of the course you want to have credited: Please explain why your certificate or your professional practice is equivalent to the scope of the course.<br><br>Reference examples for the ECTS calculation can be found in the info box on the right.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'anrechnungBegruendungLvinhaltTooltipText',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Hinsichtlich der Lernergebnisse der LV (vgl. CIS), die Sie anrechnen lassen wollen: Bitte erläutern Sie, warum die von Ihnen erworbenen Kompetenzen mit diesen Lernergebnissen gleichwertig sind.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'With regard to the learning outcomes of the course (cf. CIS) for which you want to receive credit: Please explain why the competences you have acquired are equivalent to these learning outcomes.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'anrechnung',
@@ -13745,6 +13825,26 @@ array(
 			)
 		)
 	),
+    array(
+        'app' => 'core',
+        'category' => 'ui',
+        'phrase' => 'fehlendeMinZeichen',
+        'insertvon' => 'system',
+        'phrases' => array(
+            array(
+                'sprache' => 'German',
+                'text' => "Fehlende min. Zeichen",
+                'description' => '',
+                'insertvon' => 'system'
+            ),
+            array(
+                'sprache' => 'English',
+                'text' => "Missing min. Characters",
+                'description' => '',
+                'insertvon' => 'system'
+            )
+        )
+    ),
 	array(
 		'app' => 'core',
 		'category' => 'anrechnung',

From dd392caef73537804990afafcbd7bb95ca44bc67 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 31 Jul 2023 11:44:19 +0200
Subject: [PATCH 088/175] Adapted max/min length for Begruendung ECTS and
 Begruendung LVinhalt

---
 .../views/lehre/anrechnung/requestAnrechnung.php    | 13 +++++++------
 public/js/lehre/anrechnung/requestAnrechnung.js     |  7 ++++---
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index 839e659a8..9e430a676 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -1,7 +1,8 @@
 <?php
 const CHAR_LENGTH125 = 125;
+const CHAR_LENGTH150 = 150;
 const CHAR_LENGTH500 = 500;
-const CHAR_LENGTH1500 = 1500;
+const CHAR_LENGTH1000 = 1000;
 
 $this->load->view(
 	'templates/FHC-Header',
@@ -212,9 +213,9 @@ $this->load->view(
                                             <a href="https://www.technikum-wien.at" target="_blank" class="pull-right">ECTS Berechnung Referenzbeispiele</a>
                                         </div>
                                         <div class="panel-body">
-                                            <textarea class="form-control" name="begruendung_ects" rows="3" id="requestAnrechnung-begruendungEcts"
-                                                      maxlength="<?php echo CHAR_LENGTH125 ?>" required><?php echo $anrechnungData->begruendung_ects; ?></textarea>
-                                            <small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungEcts-charCounter"><?php echo CHAR_LENGTH125 ?></span></span></small>
+                                            <textarea class="form-control" name="begruendung_ects" rows="1" id="requestAnrechnung-begruendungEcts"
+                                                      maxlength="<?php echo CHAR_LENGTH150 ?>" required><?php echo $anrechnungData->begruendung_ects; ?></textarea>
+                                            <small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungEcts-charCounter"><?php echo CHAR_LENGTH150 ?></span></span></small>
                                         </div>
                                     </div>
                                 </div>
@@ -233,8 +234,8 @@ $this->load->view(
                                         <div class="panel-body">
                                             <textarea class="form-control" name="begruendung_lvinhalt" rows="7" id="requestAnrechnung-begruendungLvinhalt"
                                                       minlength="<?php echo CHAR_LENGTH500 ?>"
-                                                      maxlength="<?php echo CHAR_LENGTH1500 ?>" required><?php echo $anrechnungData->begruendung_lvinhalt; ?></textarea>
-                                            <small><span class="text-muted pull-right">&nbsp;/&nbsp;<?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungLvinhalt-charCounterMax"><?php echo CHAR_LENGTH1500 ?></span></span></small>
+                                                      maxlength="<?php echo CHAR_LENGTH1000 ?>" required><?php echo $anrechnungData->begruendung_lvinhalt; ?></textarea>
+                                            <small><span class="text-muted pull-right">&nbsp;/&nbsp;<?php echo $this->p->t('ui', 'maxZeichen'); ?> :<span id="requestAnrechnung-begruendungLvinhalt-charCounterMax"><?php echo CHAR_LENGTH1000 ?></span></span></small>
                                             <small><span class="text-muted pull-right"><?php echo $this->p->t('ui', 'fehlendeMinZeichen'); ?> :<span id="requestAnrechnung-begruendungLvinhalt-charCounterMin"><?php echo CHAR_LENGTH500 ?></span></span></small>
                                         </div>
                                     </div>
diff --git a/public/js/lehre/anrechnung/requestAnrechnung.js b/public/js/lehre/anrechnung/requestAnrechnung.js
index 01453f52d..2947aebe9 100644
--- a/public/js/lehre/anrechnung/requestAnrechnung.js
+++ b/public/js/lehre/anrechnung/requestAnrechnung.js
@@ -1,8 +1,9 @@
 const ANRECHNUNGSTATUS_APPROVED = 'approved';
 const ANRECHNUNGSTATUS_REJECTED = 'rejected';
 const CHAR_LENGTH125 = 125;
+const CHAR_LENGTH150 = 150;
 const CHAR_LENGTH500 = 500;
-const CHAR_LENGTH1500 = 1500;
+const CHAR_LENGTH1000 = 1000;
 
 const COLOR_DANGER = '#f2dede';
 
@@ -216,12 +217,12 @@ var requestAnrechnung = {
         });
 
         $('#requestAnrechnung-begruendungEcts').keyup(function() {
-            let length = CHAR_LENGTH125 - $(this).val().length;
+            let length = CHAR_LENGTH150 - $(this).val().length;
             $('#requestAnrechnung-begruendungEcts-charCounter').text(length);
         });
 
         $('#requestAnrechnung-begruendungLvinhalt').keyup(function() {
-            let maxlength = CHAR_LENGTH1500 - $(this).val().length;
+            let maxlength = CHAR_LENGTH1000 - $(this).val().length;
             $('#requestAnrechnung-begruendungLvinhalt-charCounterMax').text(maxlength);
 
             let minlength = CHAR_LENGTH500 - $(this).val().length;

From 83bf874156bdf409a95bedd983412cfb62d8cf8c Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 31 Jul 2023 12:48:56 +0200
Subject: [PATCH 089/175] Removed link 'ECTS Berechnung Referenzbeispiele'

---
 application/views/lehre/anrechnung/requestAnrechnung.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/application/views/lehre/anrechnung/requestAnrechnung.php b/application/views/lehre/anrechnung/requestAnrechnung.php
index 9e430a676..18fd66a67 100644
--- a/application/views/lehre/anrechnung/requestAnrechnung.php
+++ b/application/views/lehre/anrechnung/requestAnrechnung.php
@@ -210,7 +210,6 @@ $this->load->view(
                                                   title="<?php echo $this->p->t('anrechnung', 'anrechnungBegruendungEctsTooltipText'); ?>">
                                                 <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
                                             </span>
-                                            <a href="https://www.technikum-wien.at" target="_blank" class="pull-right">ECTS Berechnung Referenzbeispiele</a>
                                         </div>
                                         <div class="panel-body">
                                             <textarea class="form-control" name="begruendung_ects" rows="1" id="requestAnrechnung-begruendungEcts"

From 4c75f908b9a7b0920e77c33f4e37d1a13382df36 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 31 Jul 2023 12:50:06 +0200
Subject: [PATCH 090/175] Added card 'ECTS Berechnung Referenzbeispiele' to
 Infobox

---
 .../anrechnung/requestAnrechnungImportant.php | 17 ++++++
 .../lehre/anrechnung/reviewAnrechnungInfo.php | 16 ++++++
 system/phrasesupdate.php                      | 52 +++++++++++++++++++
 3 files changed, 85 insertions(+)

diff --git a/application/views/lehre/anrechnung/requestAnrechnungImportant.php b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
index d157b22c2..8cacb9c26 100644
--- a/application/views/lehre/anrechnung/requestAnrechnungImportant.php
+++ b/application/views/lehre/anrechnung/requestAnrechnungImportant.php
@@ -16,6 +16,23 @@
             </div>
         </div>
     </div>
+    <!--    Referenzbeispiele ECTS Berechnung panel -->
+    <div class="panel panel-info">
+        <div class="panel-heading" role="tab" id="headingBegruendung">
+            <h4 class="panel-title">
+                <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseBegruendung"
+                   aria-expanded="false" aria-controls="collapseBegruendung">
+                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
+					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungTitle'); ?>
+                </a>
+            </h4>
+        </div>
+        <div id="collapseBegruendung" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingBegruendung">
+            <div class="panel-body">
+				<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungBody'); ?>
+            </div>
+        </div>
+    </div>
     <!--    Nachweisdokumente: Voraussetzung panel -->
     <div class="panel panel-info">
         <div class="panel-heading" role="tab" id="headingTwo">
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungInfo.php b/application/views/lehre/anrechnung/reviewAnrechnungInfo.php
index 4b899d4dc..7e658ffcb 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungInfo.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungInfo.php
@@ -15,6 +15,22 @@
             </div>
         </div>
     </div>
+    <div class="panel panel-info">
+        <div class="panel-heading" role="tab" id="headingBegruendung">
+            <h4 class="panel-title">
+                <a class="collapsed" role="button" data-toggle="collapse" data-parent="#accordion" href="#collapseBegruendung"
+                   aria-expanded="false" aria-controls="collapseBegruendung">
+                    <i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
+					<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungTitle'); ?>
+                </a>
+            </h4>
+        </div>
+        <div id="collapseBegruendung" class="panel-collapse collapse" role="tabpanel" aria-labelledby="headingBegruendung">
+            <div class="panel-body">
+				<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoEctsBerechnungBody'); ?>
+            </div>
+        </div>
+    </div>
     <div class="panel panel-info">
         <div class="panel-heading" role="tab" id="headingZero">
             <h4 class="panel-title">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 74803092d..9c1df507d 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -10989,6 +10989,58 @@ Any unusual occurrences
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'requestAnrechnungInfoEctsBerechnungTitle',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Referenzbeispiele ECTS-Berechnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reference examples of ECTS calculation',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'requestAnrechnungInfoEctsBerechnungBody',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => "<b>1 ECTS an der FH Technikum Wien entspricht einem Arbeitsaufwand von 25 Stunden.</b>
+					<br><br><u>Schulisches Zeugnis:</u>
+					<br>Bitte die Unterrichtsstunden nachvollziehbar in ECTS umrechnen (ein Schuljahr besteht aus ca. 40 Wochen; d.h., eine Unterrichtsstunde pro Woche sind insgesamt ca. 40 Stunden Jahresaufwand.)
+					<br><br><u>Hochschulzeugnis:</u>
+					<br>Bitte die ECTS angeben.
+					<br><br><u>Berufliche Praxis:</u>
+					<br>Bitte die Dauer der einschlägigen beruflichen Praxis nachvollziehbar in ECTS umrechnen (1,5 ECTS sind ungefähr eine Arbeitswoche im Umfang von 37,5 Stunden).",
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => "<br>1 ECTS at the FH Technikum Wien corresponds to a workload of 25 hours.</b>
+					<br><br><u>School certificate:</u>
+					<br>Please convert the teaching hours into ECTS in a comprehensible way (a school year consists of approx. 40 weeks; i.e. one teaching hour per week is a total of approx. 40 hours of annual work).
+					<br><br><u>University certificate:</u>
+					<br>Please indicate the ECTS.
+					<br><br><u>Professional practice:</u>
+					<br>Please convert the duration of the relevant professional practice into ECTS in a comprehensible way (1.5 ECTS are approximately one working week of 37.5 hours).",
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'anrechnung',

From b5a81b540f1ff7f76233ddf51744a108947d6bd3 Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Mon, 31 Jul 2023 13:53:24 +0200
Subject: [PATCH 091/175] Added Begruendung ECTS and Begruendung LV Inhalt to
 STGL- and Lectors Detail-Views

---
 .../anrechnung/approveAnrechnungDetail.php    | 82 ++++++++++---------
 .../anrechnung/reviewAnrechnungDetail.php     | 51 +++++++-----
 system/phrasesupdate.php                      | 40 +++++++++
 3 files changed, 115 insertions(+), 58 deletions(-)

diff --git a/application/views/lehre/anrechnung/approveAnrechnungDetail.php b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
index 87b9d53cc..0970b6edd 100644
--- a/application/views/lehre/anrechnung/approveAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/approveAnrechnungDetail.php
@@ -92,85 +92,93 @@ $this->load->view(
 							</div>
 							<div class="panel-body">
 								<div class="row">
-									<div class="col-lg-6">
+									<div class="col-lg-4">
 										<table class="table table-bordered table-condensed table-fixed">
 											<tbody>
 											<tr>
-												<th class="col-xs-4"><?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
+												<th class="col-xs-5"><?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
 												<td><?php echo $antragData->vorname . ' ' . $antragData->nachname; ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('person', 'personenkennzeichen'); ?></th>
+												<th class="col-xs-5"><?php echo $this->p->t('person', 'personenkennzeichen'); ?></th>
 												<td><?php echo $antragData->matrikelnr ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?></th>
+												<th class="col-xs-5"><?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?></th>
 												<td><?php echo $antragData->studiensemester_kurzbz ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?></th>
+												<th class="col-xs-5"><?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?></th>
 												<td><?php echo $antragData->stg_bezeichnung ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?></th>
+												<th class="col-xs-5"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?></th>
 												<td><?php echo $antragData->lv_bezeichnung ?></td>
 											</tr>
-											
-											</tbody>
-										</table>
-									</div>
-									<div class="col-lg-6">
-										<table class="table table-bordered table-condensed table-fixed">
-											<tbody>
-											
-											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('lehre', 'ects'); ?></th>
-                                                <td colspan="3"><span id="ects"><?php echo $antragData->ects ?></span></td>
-											</tr>
                                             <tr>
-                                                <th class="col-xs-4">
-                                                    <?php echo $this->p->t('anrechnung', 'bisherAngerechneteEcts'); ?>
+                                                <th class="col-xs-5"><?php echo $this->p->t('lehre', 'lektorInnen'); ?></th>
+                                                <td>
+													<?php $len = count($antragData->lektoren) - 1 ?>
+													<?php foreach ($antragData->lektoren as $key => $lektor): ?>
+														<?php echo $lektor->vorname . ' ' . $lektor->nachname;
+														echo $key === $len ? '' : ', ' ?>
+													<?php endforeach; ?>
+                                                </td>
+                                            </tr>
+                                            <tr>
+                                                <th class="col-xs-5"><?php echo $this->p->t('lehre', 'ects'); ?></th>
+                                                <td><span id="ects"><?php echo $antragData->ects ?></span></td>
+                                            </tr>
+                                            <tr>
+                                                <th class="col-xs-5">
+													<?php echo $this->p->t('anrechnung', 'bisherAngerechneteEcts'); ?>
                                                     <span class="approveAnrechnungDetail-anrechnungEctsTooltip"
                                                           data-toggle="tooltip" data-placement="right"
                                                           title="<?php echo $this->p->t('anrechnung', 'anrechnungEctsTooltipText'); ?>">
 													<i class="fa fa-lg fa-info-circle" aria-hidden="true"></i>
 												</span>
                                                 </th>
-                                                <td colspan="3">
+                                                <td>
                                                     Total: <span id="sumEctsTotal"><?php echo number_format($antragData->sumEctsSchulisch + $antragData->sumEctsBeruflich, 1) ?></span>
                                                     [Schulisch: <span id="sumEctsSchulisch" value="<?php echo $antragData->sumEctsSchulisch ?>"><?php echo $antragData->sumEctsSchulisch ?></span> /
                                                     Beruflich: <span id="sumEctsBeruflich" value="<?php echo $antragData->sumEctsBeruflich ?>"><?php echo $antragData->sumEctsBeruflich ?></span> ]
-                                                     <span id="sumEctsMsg"></span>
+                                                    <span id="sumEctsMsg"></span>
                                                 </td>
                                             </tr>
+											
+											</tbody>
+										</table>
+									</div>
+									<div class="col-lg-8">
+										<table class="table table-bordered table-condensed table-fixed">
+											<tbody>
+
 											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('lehre', 'lektorInnen'); ?></th>
-												<td colspan="3">
-													<?php $len = count($antragData->lektoren) - 1 ?>
-													<?php foreach ($antragData->lektoren as $key => $lektor): ?>
-														<?php echo $lektor->vorname . ' ' . $lektor->nachname;
-														echo $key === $len ? '' : ', ' ?>
-													<?php endforeach; ?>
-												</td>
-											</tr>
-											<tr>
-												<th class="col-xs-4"><?php echo ucfirst($this->p->t('global', 'zgv')); ?></th>
-												<td colspan="3"><?php echo $antragData->zgv ?></td>
+												<th class="col-xs-3"><?php echo ucfirst($this->p->t('global', 'zgv')); ?></th>
+												<td><?php echo $antragData->zgv ?></td>
 											</tr>
 											<tr>
 												<th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'herkunftDerKenntnisse'); ?></th>
-												<td colspan="3"><?php echo $anrechnungData->anmerkung ?></td>
+												<td><?php echo $anrechnungData->anmerkung ?></td>
 											</tr>
 											<tr>
 												<th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'nachweisdokumente'); ?></th>
-												<td colspan="3">
+												<td>
 													<a href="<?php echo current_url() . '/download?dms_id=' . $anrechnungData->dms_id; ?>"
 													   target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?></a>
 												</td>
 											</tr>
                                             <tr>
                                                 <th class="col-xs-4"><?php echo $this->p->t('global', 'begruendung'); ?></th>
-                                                <td colspan="3"><span id="begruendung_id" data-begruendung_id="<?php echo $anrechnungData->begruendung_id ?>" ><?php echo $anrechnungData->begruendung ?></span></td>
+                                                <td><span id="begruendung_id" data-begruendung_id="<?php echo $anrechnungData->begruendung_id ?>" ><?php echo $anrechnungData->begruendung ?></span></td>
+                                            </tr>
+                                            <tr>
+                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
+                                                <td><span><?php echo $anrechnungData->begruendung_ects ?></span></td>
+                                            </tr>
+                                            <tr>
+                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
+                                                <td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span></td>
                                             </tr>
 											</tbody>
 										</table>
diff --git a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
index 4c67c939a..08d23d8c4 100644
--- a/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
+++ b/application/views/lehre/anrechnung/reviewAnrechnungDetail.php
@@ -84,49 +84,50 @@ $this->load->view(
 							</div>
 							<div class="panel-body">
 								<div class="row">
-									<div class="col-lg-6">
+									<div class="col-lg-4">
 										<table class="table table-bordered table-condensed table-fixed">
 											<tbody>
 											<tr>
-												<th class="col-xs-4"><?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
+												<th class="col-xs-5"><?php echo ucfirst($this->p->t('person', 'studentIn')); ?></th>
 												<td><?php echo $antragData->vorname . ' ' . $antragData->nachname; ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('person', 'personenkennzeichen'); ?></th>
+												<th class="col-xs-5"><?php echo $this->p->t('person', 'personenkennzeichen'); ?></th>
 												<td><?php echo $antragData->matrikelnr ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?></th>
+												<th class="col-xs-5"><?php echo ucfirst($this->p->t('lehre', 'studiensemester')); ?></th>
 												<td><?php echo $antragData->studiensemester_kurzbz ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?></th>
+												<th class="col-xs-5"><?php echo ucfirst($this->p->t('lehre', 'studiengang')); ?></th>
 												<td><?php echo $antragData->stg_bezeichnung ?></td>
 											</tr>
 											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?></th>
+												<th class="col-xs-5"><?php echo $this->p->t('lehre', 'lehrveranstaltung'); ?></th>
 												<td><?php echo $antragData->lv_bezeichnung ?></td>
 											</tr>
-											</tbody>
-										</table>
-									</div>
-									<div class="col-lg-6">
-										<table class="table table-bordered table-condensed table-fixed">
-											<tbody>
-											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('lehre', 'ects'); ?></th>
-												<td><?php echo $antragData->ects ?></td>
-											</tr>
-											<tr>
-												<th class="col-xs-4"><?php echo $this->p->t('lehre', 'lektorInnen'); ?></th>
-												<td>
+                                            <tr>
+                                                <th class="col-xs-5"><?php echo $this->p->t('lehre', 'ects'); ?></th>
+                                                <td><?php echo $antragData->ects ?></td>
+                                            </tr>
+                                            <tr>
+                                                <th class="col-xs-5"><?php echo $this->p->t('lehre', 'lektorInnen'); ?></th>
+                                                <td>
 													<?php $len = count($antragData->lektoren) - 1 ?>
 													<?php foreach ($antragData->lektoren as $key => $lektor): ?>
 														<?php echo $lektor->vorname . ' ' . $lektor->nachname;
 														echo $key === $len ? '' : ', ' ?>
 													<?php endforeach; ?>
-												</td>
-											</tr>
+                                                </td>
+                                            </tr>
+											</tbody>
+										</table>
+									</div>
+									<div class="col-lg-8">
+										<table class="table table-bordered table-condensed table-fixed">
+											<tbody>
+
 											<tr>
 												<th class="col-xs-4"><?php echo ucfirst($this->p->t('global', 'zgv')); ?></th>
 												<td><?php echo $antragData->zgv ?></td>
@@ -142,6 +143,14 @@ $this->load->view(
 													   target="_blank"><?php echo htmlentities($anrechnungData->dokumentname) ?></a>
 												</td>
 											</tr>
+                                            <tr>
+                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungEctsLabel'); ?></th>
+                                                <td><span><?php echo $anrechnungData->begruendung_ects ?></span></td>
+                                            </tr>
+                                            <tr>
+                                                <th class="col-xs-4"><?php echo $this->p->t('anrechnung', 'begruendungLvinhaltLabel'); ?></th>
+                                                <td><span><?php echo $anrechnungData->begruendung_lvinhalt ?></span></td>
+                                            </tr>
 											</tbody>
 										</table>
 
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 9c1df507d..9114c36a9 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -11041,6 +11041,46 @@ Any unusual occurrences
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'begruendungEctsLabel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Begründung Gleichwertigkeit ECTS',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason Equivalency of ECTS',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'anrechnung',
+		'phrase' => 'begruendungLvinhaltLabel',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Begründung Gleichwertigkeit LV-Inhalt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason Equivalency of Course content',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'anrechnung',

From f5703a2438e9e6f2163ab7a9aaf07690716984c5 Mon Sep 17 00:00:00 2001
From: Manfred <kindlm@technikum-wien.at>
Date: Tue, 1 Aug 2023 18:23:24 +0200
Subject: [PATCH 092/175] Kleine Anpassungen Testtool-Auswertung

- %-Spalte in Auswertung Detail
- Vorschlag-Nummer in Auswertung_detail_frage
---
 cis/testtool/admin/auswertung_detail.php       | 10 +++++++++-
 cis/testtool/admin/auswertung_detail_frage.php |  3 +++
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/cis/testtool/admin/auswertung_detail.php b/cis/testtool/admin/auswertung_detail.php
index 775234670..2e6b9f0e9 100644
--- a/cis/testtool/admin/auswertung_detail.php
+++ b/cis/testtool/admin/auswertung_detail.php
@@ -147,7 +147,7 @@ if(isset($_GET['show']))
 							<th>Level</th>
 							<th>Frage</th>
 							<th colspan="3" title="Anzahl der Personen die diese Frage gestellt bekommen haben">Gesamt (m/w)</th>
-							<th colspan="30">Nummer | Punkte | Gesamt | Männlich | Weiblich</th>
+							<th colspan="30">Nummer | Punkte | Gesamt | % | Männlich | Weiblich</th>
 						</tr>';
 			}
 		}		
@@ -244,12 +244,20 @@ if(isset($_GET['show']))
 					
 					$anz_m = $row_geschlecht->anz_m;
 					$anz_w = $row_vorschlag->anzahl_vorschlag-$row_geschlecht->anz_m;
+					if ($row_vorschlag->anzahl_gesamt == 0)
+						$anzahl_gesamt = 1;
+					else
+						$anzahl_gesamt = $row_vorschlag->anzahl_gesamt;
+
+					$vorschlag_prozent = round(100 * $row_vorschlag->anzahl_vorschlag / $anzahl_gesamt, 1);
+					$vorschlag_prozent = number_format($vorschlag_prozent,1,',','');
 					
 					$hlp2.= '
 						<td style="border-left: 1px solid black; padding-left:2px;"><b>'.$row_vorschlag->nummer.'</b></td>
 						<!--<td style="padding-left:2px;">'.$row_vorschlag->text.'</td>-->
 						<td>'.number_format($row_vorschlag->punkte,2).'</td>
 						<td><b>'.$row_vorschlag->anzahl_vorschlag.'</b></td>
+						<td><b>'.$vorschlag_prozent.'%</b></td>
 						<td style="color:blue;"><b>'.$anz_m.'</b></td>
 						<td style="color:magenta;"><b>'.$anz_w.'</b></td>';
 					
diff --git a/cis/testtool/admin/auswertung_detail_frage.php b/cis/testtool/admin/auswertung_detail_frage.php
index 0256d00eb..8471eabf4 100644
--- a/cis/testtool/admin/auswertung_detail_frage.php
+++ b/cis/testtool/admin/auswertung_detail_frage.php
@@ -58,6 +58,7 @@ if($frage_id!='' && is_numeric($frage_id))
 				tbl_frage_sprache.text as frage_text,
 				tbl_frage_sprache.audio as frage_audio,
 				tbl_frage_sprache.bild as frage_bild,
+				tbl_vorschlag.nummer as vorschlag_nummer,
 				tbl_vorschlag_sprache.text as vorschlag_text,
 				tbl_vorschlag_sprache.audio as vorschlag_audio,
 				tbl_vorschlag_sprache.bild as vorschlag_bild,
@@ -108,9 +109,11 @@ if($frage_id!='' && is_numeric($frage_id))
 			}
 			
 			//Vorschlaege
+			echo '<center>Nummer: '.$row->vorschlag_nummer.'</center><br>';
 			echo '<center><div style="width: 90%; padding: 5px; background-color: #eee;border: 1px solid black">';
 			//echo "<b>Vorschlag $i: </b>";
 			$first=false;
+
 			echo $row->vorschlag_text;
 			if($row->vorschlag_audio!='')
 			{

From d50ba773fe4ae033603fb0e6fe56d51b2a525de8 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Tue, 1 Aug 2023 19:26:36 +0200
Subject: [PATCH 093/175] UHSTAT 1 form: correct authentification (from
 bewerbungstool or with permission), beautified success and error messages,
 added Rechtsbelehrung, simplified parameter checking

---
 application/controllers/codex/UHSTAT1.php     |  52 ++-
 application/views/codex/uhstat1.php           | 419 +++++++++---------
 public/css/codex/uhstat1.css                  |   5 +
 public/js/codex/uhstat1.js                    |  11 +
 ...uhstat1_daten_ueber_das_bewerbungstool.php |  14 +
 system/phrasesupdate.php                      |  20 +
 6 files changed, 299 insertions(+), 222 deletions(-)
 create mode 100644 public/css/codex/uhstat1.css
 create mode 100644 public/js/codex/uhstat1.js

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index 3ba4760a5..0e019672a 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -4,6 +4,8 @@ if (! defined("BASEPATH")) exit("No direct script access allowed");
 
 class UHSTAT1 extends FHC_Controller
 {
+	const BERECHTIGUNG_UHSTAT_VERWALTEN = 'student/uhstat1daten_verwalten';
+	const PERSON_ID_SESSION_INDEX = 'bewerbung/personId';
 	const CODEX_OESTERREICH = 'A';
 	const LOWER_BOUNDARY_YEARS = 160;
 	const UPPER_BOUNDARY_YEARS = 20;
@@ -12,12 +14,7 @@ class UHSTAT1 extends FHC_Controller
 
 	public function __construct()
 	{
-		parent::__construct(
-			array(
-				'index' => 'admin:r',
-				'saveUHSTAT1Data' => 'admin:rw'
-			)
-		);
+		parent::__construct();
 
 		// load ci libs
 		$this->load->library('form_validation');
@@ -25,6 +22,10 @@ class UHSTAT1 extends FHC_Controller
 		// load ci helpers
 		$this->load->helper(array('form', 'url'));
 
+		// load libraries
+		$this->load->library('AuthLib');
+		$this->load->library('PermissionLib');
+
 		// load models
 		$this->load->model('codex/Oehbeitrag_model', 'OehbeitragModel');
 		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
@@ -93,9 +94,7 @@ class UHSTAT1 extends FHC_Controller
 	 */
 	public function saveUHSTAT1Data()
 	{
-		$person_id = $this->input->get('person_id');
-
-		if (!isset($person_id) || !is_numeric($person_id)) show_error("Person Id missing");
+		$person_id = $this->_getValidPersonId();
 
 		$this->form_validation->set_error_delimiters('<span class="text-danger">', '</span>');
 
@@ -133,8 +132,10 @@ class UHSTAT1 extends FHC_Controller
 				$uhstatData[$field] = $this->input->post($field);
 			}
 
+			// check if entry already exists
 			$uhstat1datenloadRes = $this->Uhstat1datenModel->loadWhere(array('person_id' => $person_id));
 
+			// if yes, update
 			if (hasData($uhstat1datenloadRes))
 			{
 				$uhstat1datenRes = $this->Uhstat1datenModel->update(
@@ -142,7 +143,7 @@ class UHSTAT1 extends FHC_Controller
 					$uhstatData
 				);
 			}
-			else
+			else // otherwise insert
 			{
 				$uhstat1datenRes = $this->Uhstat1datenModel->insert(
 					array_merge($uhstatData, array('person_id' => $person_id))
@@ -210,9 +211,7 @@ class UHSTAT1 extends FHC_Controller
 	 */
 	private function _getFormMetaData()
 	{
-		$person_id = $this->input->get('person_id');
-
-		if (!isset($person_id) || !is_numeric($person_id)) return error("Person Id missing");
+		$person_id = $this->_getValidPersonId();
 
 		$languageIdx = $this->_getLanguageIndex();
 
@@ -272,9 +271,7 @@ class UHSTAT1 extends FHC_Controller
 	 */
 	private function _getUHSTAT1Data()
 	{
-		$person_id = $this->input->get('person_id');
-
-		if (!isset($person_id) || !is_numeric($person_id)) return error("Person Id missing");
+		$person_id = $this->_getValidPersonId();
 
 		$this->Uhstat1datenModel->addSelect(
 			implode(', ', array_keys($this->_uhstat1Fields))
@@ -303,4 +300,27 @@ class UHSTAT1 extends FHC_Controller
 
 		return $idx;
 	}
+
+	/**
+	 * Gets Id of person having permissions to manage UHSTAT1 data.
+	 * Can be passed as parameter or be in session.
+	 * @return int person_id
+	 */
+	private function _getValidPersonId()
+	{
+		// if coming from bewerbungstool - person id is in session (person must be logged in bewerbungstool)
+		if (isset($_SESSION[self::PERSON_ID_SESSION_INDEX]) && is_numeric($_SESSION[self::PERSON_ID_SESSION_INDEX]))
+			return $_SESSION[self::PERSON_ID_SESSION_INDEX];
+
+		// if person id passed directly...
+		$person_id = $this->input->post('person_id');
+		if (!isset($person_id)) $person_id = $this->input->get('person_id');
+
+		if (!isset($person_id) || !is_numeric($person_id)) show_error("invalid person id");
+
+		// ...check if there is a permission for editing UHSTAT1 data
+		if ($this->permissionlib->isBerechtigt(self::BERECHTIGUNG_UHSTAT_VERWALTEN, 'suid')) return $person_id;
+
+		show_error("No permission for managing UHSTAT");
+	}
 }
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index b60f518a4..b81b0b316 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -6,15 +6,17 @@ $this->load->view(
 		'jquery3' => true,
 		'bootstrap3' => true,
 		'fontawesome4' => true,
-		'dialoglib' => true,
 		'phrases' => array(
 			'ui' => array('speichern')
-		)
+		),
+		'customCSSs' => array('public/css/codex/uhstat1.css'),
+		'customJSs' => array('public/js/codex/uhstat1.js')
+
 	)
 );
 ?>
 <?php
-// init data
+// initialise form fields
 $mutter_geburtsjahr = isset($uhstatData->mutter_geburtsjahr) ? $uhstatData->mutter_geburtsjahr : set_value('mutter_geburtsjahr');
 $mutter_geburtsstaat = isset($uhstatData->mutter_geburtsstaat) ? $uhstatData->mutter_geburtsstaat : set_value('mutter_geburtsstaat');
 $mutter_bildungsstaat = isset($uhstatData->mutter_bildungsstaat) ? $uhstatData->mutter_bildungsstaat : set_value('mutter_bildungsstaat');
@@ -25,219 +27,224 @@ $vater_bildungsstaat = isset($uhstatData->vater_bildungsstaat) ? $uhstatData->va
 $vater_bildungmax = isset($uhstatData->vater_bildungmax) ? $uhstatData->vater_bildungmax : set_value('vater_bildungmax');
 $disabled = $readonly === true ? ' disabled' : '';
 ?>
-<div class="container">
-	<div class="tab-content">
-		<h3>
-			<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungUeberschrift') ?>
-		</h3>
-		<p>
-			<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungEinleitungstext') ?>
-		</p>
-		<br>
-		<form class="form-horizontal" method="POST" action="<?php echo site_url('codex/UHSTAT1/saveUHSTAT1Data').'?person_id='.$formMetaData['person_id'] ?>">
-			<fieldset>
-				<legend><?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigte') ?></legend>
-				<p>
-					<?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigteEinleitungstext') ?>
-				</p>
-				<br>
-				<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonEins') ?></h4>
-				<div class="form-group">
-					<label for="mutter_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
-					<div class="col-sm-9">
-						<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
-								<option
-									value="<?php echo $jahr ?>"
-									<?php echo $jahr == $mutter_geburtsjahr ? " selected" : "" ?>>
+
+<input type='hidden' id='uhstat1Saved' value='<?php echo isset($readonly) && $readonly == true ? 1 : 0 ?>' />
+<div class='container' id='uhstat1Container'>
+	<h2><?php echo $this->p->t('uhstat', 'uhstat1AnmeldungUeberschrift') ?></h2>
+	<p>
+		<?php echo $this->p->t('uhstat', 'rechtsbelehrung') ?>
+	</p>
+	<p>
+		<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungEinleitungstext') ?>
+	</p>
+	<br>
+	<form class="form-horizontal" method="POST" action="<?php echo site_url('codex/UHSTAT1/saveUHSTAT1Data') ?>" id="uhstat1Form">
+		<input type='hidden' id='person_id' name='person_id' value='<?php echo $formMetaData['person_id'] ?>' />
+		<fieldset>
+			<legend><?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigte') ?></legend>
+			<p>
+				<?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigteEinleitungstext') ?>
+			</p>
+			<br>
+			<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonEins') ?></h4>
+			<div class="form-group">
+				<label for="mutter_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
+				<div class="col-sm-9">
+					<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control" <?php echo $disabled ?>>
+						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+						<?php foreach ($formMetaData['jahre'] as $jahr): ?>
+							<option
+								value="<?php echo $jahr ?>"
+								<?php echo $jahr == $mutter_geburtsjahr ? " selected" : "" ?>>
+								<?php echo $jahr ?>
+							</option>
+						<?php endforeach; ?>
+					</select>
+					<?php echo form_error('mutter_geburtsjahr'); ?>
+				</div>
+			</div>
+			<div class="form-group">
+				<label for="mutter_geburtsstaat" class="col-sm-3 control-label">
+					<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
+					<br>
+					<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+				</label>
+				<div class="col-sm-9">
+					<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control" <?php echo $disabled ?>>
+						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+						<?php foreach ($formMetaData['nation'] as $nation): ?>
+							<option
+								value="<?php echo $nation->nation_code ?>"
+								<?php echo $mutter_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
+								<?php echo $nation->nation_text ?>
+							</option>
+						<?php endforeach; ?>
+					</select>
+					<?php echo form_error('mutter_geburtsstaat'); ?>
+				</div>
+			</div>
+			<div class="form-group">
+				<label for="mutter_bildungsstaat" class="col-sm-3 control-label">
+					<?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschlussStaat')) ?>
+					<br>
+					<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+				</label>
+				<div class="col-sm-9">
+					<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control" <?php echo $disabled ?>>
+						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+						<?php foreach ($formMetaData['nation'] as $nation): ?>
+							<option
+								value="<?php echo $nation->nation_code ?>"
+								<?php echo $mutter_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
+								<?php echo $nation->nation_text ?>
+							</option>
+						<?php endforeach; ?>
+					</select>
+					<?php echo form_error('mutter_bildungsstaat'); ?>
+				</div>
+			</div>
+			<div class="form-group">
+				<label for="mutter_bildungmax" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?></label>
+				<div class="col-sm-9">
+					<select type="text" name="mutter_bildungmax" id="mutter_bildungmax" class="form-control" <?php echo $disabled ?>>
+						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+						<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
+							<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+						<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
+							<option
+								value="<?php echo $abschluss->ausbildung_code ?>"
+								<?php echo $mutter_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
+								<?php echo $abschluss->bezeichnung ?>
+							</option>
+						<?php endforeach; ?>
+						</optgroup>
+						<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
+							<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+						<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
+							<option
+								value="<?php echo $abschluss->ausbildung_code ?>"
+								<?php echo $mutter_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
+								<?php echo $abschluss->bezeichnung ?>
+							</option>
+						<?php endforeach; ?>
+						</optgroup>
+					</select>
+					<?php echo form_error('mutter_bildungmax'); ?>
+				</div>
+			</div>
+			<br>
+			<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonZwei') ?></h4>
+			<div class="form-group">
+				<label for="vater_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
+				<div class="col-sm-9">
+					<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control" <?php echo $disabled ?>>
+						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+						<?php foreach ($formMetaData['jahre'] as $jahr): ?>
+							<option
+								value="<?php echo $jahr ?>"
+								<?php echo $vater_geburtsjahr == $jahr ? " selected" : "" ?>>
 									<?php echo $jahr ?>
 								</option>
-							<?php endforeach; ?>
-						</select>
-						<?php echo form_error('mutter_geburtsjahr'); ?>
-					</div>
+						<?php endforeach; ?>
+					</select>
+					<?php echo form_error('vater_geburtsjahr'); ?>
 				</div>
-				<div class="form-group">
-					<label for="mutter_geburtsstaat" class="col-sm-3 control-label">
-						<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
-						<br>
-						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
-					</label>
-					<div class="col-sm-9">
-						<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $mutter_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
+			</div>
+			<div class="form-group">
+				<label for="vater_geburtsstaat" class="col-sm-3 control-label">
+					<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
+					<br>
+					<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+				</label>
+				<div class="col-sm-9">
+					<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control" <?php echo $disabled ?>>
+						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+						<?php foreach ($formMetaData['nation'] as $nation): ?>
+							<option
+								value="<?php echo $nation->nation_code ?>"
+								<?php echo $vater_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
 									<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
-						<?php echo form_error('mutter_geburtsstaat'); ?>
-					</div>
+							</option>
+						<?php endforeach; ?>
+					</select>
+					<?php echo form_error('vater_geburtsstaat'); ?>
 				</div>
-				<div class="form-group">
-					<label for="mutter_bildungsstaat" class="col-sm-3 control-label">
-						<?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschlussStaat')) ?>
-						<br>
-						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
-					</label>
-					<div class="col-sm-9">
-						<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $mutter_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
+			</div>
+			<div class="form-group">
+				<label for="vater_bildungsstaat" class="col-sm-3 control-label">
+					<?php echo $this->p->t('uhstat', 'hoechsterAbschlussStaat') ?>
+					<br>
+					<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+				</label>
+				<div class="col-sm-9">
+					<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control" <?php echo $disabled ?>>
+						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+						<?php foreach ($formMetaData['nation'] as $nation): ?>
+							<option
+								value="<?php echo $nation->nation_code ?>"
+								<?php echo $vater_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
 									<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
-						<?php echo form_error('mutter_bildungsstaat'); ?>
-					</div>
+							</option>
+						<?php endforeach; ?>
+					</select>
+					<?php echo form_error('vater_bildungsstaat'); ?>
 				</div>
-				<div class="form-group">
-					<label for="mutter_bildungmax" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?></label>
-					<div class="col-sm-9">
-						<select type="text" name="mutter_bildungmax" id="mutter_bildungmax" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
-								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
-							</optgroup>
-							<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
-								<option
-									value="<?php echo $abschluss->ausbildung_code ?>"
-									<?php echo $mutter_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
-									<?php echo $abschluss->bezeichnung ?>
-								</option>
-							<?php endforeach; ?>
-							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
-								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
-							</optgroup>
-							<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
-								<option
-									value="<?php echo $abschluss->ausbildung_code ?>"
-									<?php echo $mutter_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
-									<?php echo $abschluss->bezeichnung ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
-						<?php echo form_error('mutter_bildungmax'); ?>
-					</div>
+			</div>
+			<div class="form-group">
+				<label for="vater_bildungmax" class="col-sm-3 control-label">
+					<?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?>
+				</label>
+				<div class="col-sm-9">
+					<select type="text" name="vater_bildungmax" id="vater_bildungmax" class="form-control" <?php echo $disabled ?>>
+						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+						<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
+							<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+						<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
+							<option
+								value="<?php echo $abschluss->ausbildung_code ?>"
+								<?php echo $vater_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
+								<?php echo $abschluss->bezeichnung ?>
+							</option>
+						<?php endforeach; ?>
+						</optgroup>
+						<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
+							<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+						<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
+							<option
+								value="<?php echo $abschluss->ausbildung_code ?>"
+								<?php echo $vater_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
+								<?php echo $abschluss->bezeichnung ?>
+							</option>
+						<?php endforeach; ?>
+						</optgroup>
+					</select>
+					<?php echo form_error('vater_bildungmax'); ?>
 				</div>
-				<br>
-				<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonZwei') ?></h4>
-				<div class="form-group">
-					<label for="vater_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
-					<div class="col-sm-9">
-						<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
-								<option
-									value="<?php echo $jahr ?>"
-									<?php echo $vater_geburtsjahr == $jahr ? " selected" : "" ?>>
-										<?php echo $jahr ?>
-									</option>
-							<?php endforeach; ?>
-						</select>
-						<?php echo form_error('vater_geburtsjahr'); ?>
-					</div>
+			</div>
+		</fieldset>
+		<br>
+		<fieldset>
+			<?php if (isset($successMessage) && !isEmptyString($successMessage)): ?>
+				<div class="alert alert-success" id="success-alert_uhstat1">
+					<button type="button" class="close" data-dismiss="alert">x</button>
+					<strong><?php echo $successMessage ?></strong>
 				</div>
-				<div class="form-group">
-					<label for="vater_geburtsstaat" class="col-sm-3 control-label">
-						<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
-						<br>
-						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
-					</label>
-					<div class="col-sm-9">
-						<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $vater_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
-										<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
-						<?php echo form_error('vater_geburtsstaat'); ?>
-					</div>
+			<?php endif; ?>
+			<?php if (isset($errorMessage) && !isEmptyString($errorMessage)): ?>
+				<div class='alert alert-danger text-center'><?php echo $errorMessage ?></div>
+			<?php endif; ?>
+			<div class="form-group">
+				<div class="col-sm-12 text-right">
+					<?php if (!$readonly): ?>
+						&nbsp;
+						<button class="btn btn-success btn-md" type="submit" id="uhstat1Submit">
+							<?php echo $this->p->t('uhstat', 'pruefenUndSpeichern') ?>
+						</button>
+					<?php endif; ?>
 				</div>
-				<div class="form-group">
-					<label for="vater_bildungsstaat" class="col-sm-3 control-label">
-						<?php echo $this->p->t('uhstat', 'hoechsterAbschlussStaat') ?>
-						<br>
-						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
-					</label>
-					<div class="col-sm-9">
-						<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<?php foreach ($formMetaData['nation'] as $nation): ?>
-								<option
-									value="<?php echo $nation->nation_code ?>"
-									<?php echo $vater_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
-										<?php echo $nation->nation_text ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
-						<?php echo form_error('vater_bildungsstaat'); ?>
-					</div>
-				</div>
-				<div class="form-group">
-					<label for="vater_bildungmax" class="col-sm-3 control-label">
-						<?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?>
-					</label>
-					<div class="col-sm-9">
-						<select type="text" name="vater_bildungmax" id="vater_bildungmax" class="form-control" <?php echo $disabled ?>>
-							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
-								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
-							</optgroup>
-							<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
-								<option
-									value="<?php echo $abschluss->ausbildung_code ?>"
-									<?php echo $vater_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
-									<?php echo $abschluss->bezeichnung ?>
-								</option>
-							<?php endforeach; ?>
-							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
-								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
-							</optgroup>
-							<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
-								<option
-									value="<?php echo $abschluss->ausbildung_code ?>"
-									<?php echo $vater_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
-									<?php echo $abschluss->bezeichnung ?>
-								</option>
-							<?php endforeach; ?>
-						</select>
-						<?php echo form_error('vater_bildungmax'); ?>
-					</div>
-				</div>
-			</fieldset>
-			<br>
-			<fieldset>
-				<div class="form-group">
-					<div class="col-sm-12 text-right">
-						<?php if (isset($successMessage) && !isEmptyString($successMessage)): ?>
-							<div class='alert alert-success text-center' role='alert'><?php echo $successMessage ?></div>
-						<?php endif; ?>
-						<?php if (isset($errorMessage) && !isEmptyString($errorMessage)): ?>
-							<div class='alert alert-danger text-center'><?php echo $errorMessage ?></div>
-						<?php endif; ?>
-						<?php if (!$readonly): ?>
-							&nbsp;
-							<button class="btn btn-success btn-md" type="submit">
-								<?php echo $this->p->t('uhstat', 'pruefenUndSpeichern') ?>
-							</button>
-						<?php endif; ?>
-					</div>
-				</div>
-			</fieldset>
-		</form>
-	</div>
+			</div>
+		</fieldset>
+	</form>
 </div>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/public/css/codex/uhstat1.css b/public/css/codex/uhstat1.css
new file mode 100644
index 000000000..621ef8547
--- /dev/null
+++ b/public/css/codex/uhstat1.css
@@ -0,0 +1,5 @@
+/* for removing horizontal scrollbar when form is embedded as i frame */
+#uhstat1Container {
+	overflow-x:hidden;
+	height: 100%;
+}
diff --git a/public/js/codex/uhstat1.js b/public/js/codex/uhstat1.js
new file mode 100644
index 000000000..e5e51b09d
--- /dev/null
+++ b/public/js/codex/uhstat1.js
@@ -0,0 +1,11 @@
+/**
+ * javascript file for UHSTAT1 GUI
+ */
+$(document).ready(function ()
+{
+	window.setTimeout(function() {
+		$("#success-alert_uhstat1").fadeTo(500, 0).slideUp(500, function(){
+			$(this).remove();
+		});
+	}, 1000);
+});
diff --git a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
index 3afc4083e..ea2ad9e98 100644
--- a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
+++ b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
@@ -120,3 +120,17 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_uhstat1daten LIMIT 1'))
 	else
 		echo ' bis.tbl_uhstat1daten: Tabelle hinzugefuegt<br>';
 }
+
+// Add permission for managing UHSTAT1 data
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'student/uhstat1daten_verwalten';"))
+{
+	if($db->db_num_rows($result) == 0)
+	{
+		$qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('student/uhstat1daten_verwalten', 'UHSTAT1 Daten verwalten');";
+
+		if(!$db->db_query($qry))
+			echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+		else
+			echo ' system.tbl_berechtigung: Added permission for student/uhstat1daten_verwalten<br>';
+	}
+}
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index f0043ad18..75cfb0179 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18223,6 +18223,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'rechtsbelehrung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'gemäß § 18 Absätzen 6 und 7 Bildungsdokumentationsgesetz 2020, BGBl. I  Nr. 20/2021, in der gültigen Fassung, sowie § 141 Absatz 3 Universitätsgesetz 2002, BGBl. I  Nr. 120/2002, in der gültigen Fassung.',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'according to section 18 subsections 6 and 7 of the Bildungsdokumentationsgesetz 2020, Federal Law Gazette I  No. 20/2021, in the current version, and section 141 subsection 3 of the Universitätsgesetz 2002, Federal Law Gazette I  No. 120/2002, in the current version.',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'uhstat',

From d689e8fb2fccb39180f7f39cb15e5a2c2d1cace2 Mon Sep 17 00:00:00 2001
From: Manfred <kindlm@technikum-wien.at>
Date: Wed, 2 Aug 2023 18:24:11 +0200
Subject: [PATCH 094/175] Tablesorter, Datepicker und Spalte mit Lehrform  in
 ueberbuchung.php

---
 vilesci/lehre/check/ueberbuchung.php | 59 ++++++++++++++++++++--------
 1 file changed, 42 insertions(+), 17 deletions(-)

diff --git a/vilesci/lehre/check/ueberbuchung.php b/vilesci/lehre/check/ueberbuchung.php
index 3cb6b62e5..1e133384a 100644
--- a/vilesci/lehre/check/ueberbuchung.php
+++ b/vilesci/lehre/check/ueberbuchung.php
@@ -50,31 +50,47 @@ echo '<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 	<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 	<link rel="stylesheet" href="../../../skin/vilesci.css" type="text/css" />
 	<link rel="stylesheet" href="../../../skin/jquery.css" type="text/css"/>
-	<link rel="stylesheet" type="text/css" href="../../../skin/jquery-ui-1.9.2.custom.min.css">
-<script type="text/javascript" src="../../../vendor/jquery/jquery1/jquery-1.12.4.min.js"></script>
-<script type="text/javascript" src="../../../vendor/christianbach/tablesorter/jquery.tablesorter.min.js"></script>
+	<link href="../../../skin/jquery-ui-1.9.2.custom.min.css" rel="stylesheet" type="text/css">';
+
+	include('../../../include/meta/jquery.php');
+	include('../../../include/meta/jquery-tablesorter.php');
+
+echo '
 <script type="text/javascript" src="../../../vendor/components/jqueryui/jquery-ui.min.js"></script>
 <script type="text/javascript" src="../../../include/js/jquery.ui.datepicker.translation.js"></script>
 <script type="text/javascript" src="../../../vendor/jquery/sizzle/sizzle.js"></script>	
-	<link rel="stylesheet" href="../../../skin/tablesort.css" type="text/css"/>
-	<script src="../../../include/js/tablesort/table.js" type="text/javascript"></script>
+	
 	
 	<script type="text/javascript">	
 		$(document).ready(function() 
 			{ 
-			    $("#t1").tablesorter(
+				$("#t1").tablesorter(
 				{
-					 headers:
-				       {  
-				         0 : { sorter: "isoDate"  },
-				       }, 
+					headers:
+					{  
+						0 : { sorter: "isoDate"  },
+					}, 
 					sortList: [[0,0],[1,0]],
-					widgets: [\'zebra\']
+					widgets: ["zebra","filter"]
 				}); 
+				
+				$( ".datepicker_datum" ).datepicker(
+				{
+					changeMonth: true,
+					changeYear: true,
+					dateFormat: "yy-mm-dd",
+					showOn: "focus"
+				});
 			} 
 		);
 		</script>
 </head>
+<style>
+table.tablesorter tbody td 
+{
+	padding: 2px;
+}
+</style>
 <body>
 <h2>LV-Plan Überbuchungen - '.$db_stpl_table.'</h2>
 ';
@@ -93,8 +109,8 @@ if($beginn=='' || $ende=='')
 	$dontloadcontent=true;
 }
 
-echo " Beginn <INPUT type='text' size='10' id='beginn' name='beginn' value='$beginn'>";
-echo " Ende <INPUT type='text' size='10' id='ende' name='ende' value='$ende'>";
+echo " Beginn <INPUT class='datepicker_datum' type='text' size='10' id='beginn' name='beginn' value='$beginn'>";
+echo " Ende <INPUT class='datepicker_datum' type='text' size='10' id='ende' name='ende' value='$ende'>";
 
 $stg = new studiengang();
 $stg->getAll('typ, kurzbzlang', true);
@@ -128,7 +144,7 @@ foreach ($ort_obj->result as $row)
 	$ort[$row->ort_kurzbz] = new stdClass(); // Prevents the warning "Creating default object from empty value"
 	$ort[$row->ort_kurzbz]->max_person = $row->max_person;
 }
-$qry = "SELECT DISTINCT vw_".$db_stpl_table.".unr,datum, stunde, ort_kurzbz, studiensemester_kurzbz, vw_".$db_stpl_table.".studiengang_kz, vw_".$db_stpl_table.".semester, verband, gruppe, gruppe_kurzbz, UPPER(stg_typ || stg_kurzbz) as stg_kurzbz, lehrfach, lehrfach_bez 
+$qry = "SELECT DISTINCT vw_".$db_stpl_table.".unr,datum, stunde, ort_kurzbz, studiensemester_kurzbz, vw_".$db_stpl_table.".studiengang_kz, vw_".$db_stpl_table.".semester, verband, gruppe, gruppe_kurzbz, UPPER(stg_typ || stg_kurzbz) as stg_kurzbz, lehrfach, lehrfach_bez, lehrform 
 		FROM lehre.vw_".$db_stpl_table." JOIN lehre.tbl_lehreinheit USING(lehreinheit_id) JOIN lehre.tbl_lehrveranstaltung ON(tbl_lehreinheit.lehrveranstaltung_id=tbl_lehrveranstaltung.lehrveranstaltung_id)
 		WHERE datum>='".addslashes($beginn)."' AND datum<='".addslashes($ende)."'";
 if($stg_kz!='')
@@ -144,7 +160,8 @@ echo '<table class="tablesorter" id="t1">
 			<th>Ort</th>
 			<th>Studierende aktuell (Plätze maximal)</th>
 			<th>Gruppen (Studierende aktuell)</th>
-			<th>Lehrfach</th>
+			<th>Lehrveranstaltung</th>
+			<th>Lehrform</th>
 		</tr>
 		</thead>
 		<tbody>';
@@ -156,6 +173,7 @@ $lastort=0;
 $anzahl_studenten=0;
 $lehrfach='';
 $lehrfach_bez='';
+$lehrform='';
 $arr=array();
 
 function getAnzahl($studiengang_kz, $semester, $verband, $gruppe, $gruppe_kurzbz, $studiensemester_kurzbz)
@@ -192,7 +210,7 @@ if($result = $db->db_query($qry))
 {
 	while($row = $db->db_fetch_object($result))
 	{
-		if($lastdatum==$row->datum && $laststunde==$row->stunde && $lastort==$row->ort_kurzbz && $lehrfach==$row->lehrfach && $lehrfach_bez==$row->lehrfach_bez)
+		if($lastdatum==$row->datum && $laststunde==$row->stunde && $lastort==$row->ort_kurzbz && $lehrfach==$row->lehrfach && $lehrfach_bez==$row->lehrfach_bez && $lehrform==$row->lehrform)
 		{
 			//Solange alles gleich ist zusammenzaehlen
 			$anzahl = getAnzahl($row->studiengang_kz, $row->semester, $row->verband, $row->gruppe, $row->gruppe_kurzbz, $row->studiensemester_kurzbz);		
@@ -222,7 +240,13 @@ if($result = $db->db_query($qry))
 						$style='style="background-color: a00404; color: d3d3d3"';
 
 					//echo "<tr><td>$lastdatum</td><td>$laststunde</td><td>$lastort</td><td $style>$anzahl_studenten (".$ort[$lastort]->max_person.")</td><td>$gruppen</td><td>$lehrfach - $lehrfach_bez</td></tr>";
-					$arr[]="<tr><td>$lastdatum</td><td>$lastort</td><td $style>$anzahl_studenten (".$ort[$lastort]->max_person.")</td><td>$gruppen</td><td>$lehrfach - $lehrfach_bez</td></tr>";
+					$arr[]="<tr>
+								<td>$lastdatum</td>
+								<td>$lastort</td>
+								<td $style>$anzahl_studenten (".$ort[$lastort]->max_person.")</td>
+								<td>$gruppen</td>
+								<td>$lehrfach - $lehrfach_bez</td>
+								<td>$lehrform</td></tr>";
 					
 				}
 				$anzahl_studenten=0;
@@ -238,6 +262,7 @@ if($result = $db->db_query($qry))
 		$lastort = $row->ort_kurzbz;
 		$lehrfach = $row->lehrfach;
 		$lehrfach_bez = $row->lehrfach_bez;
+		$lehrform = $row->lehrform;
 	}
 }
 else 

From d0d42a6a15484c4896e66994c7b96f0c80e910bb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 4 Aug 2023 14:11:03 +0200
Subject: [PATCH 095/175] Unterbrecher - Wiedereintrittssemester Dropdown

---
 application/libraries/AntragLib.php           | 22 ++++++++++++++-----
 .../Studierendenantrag/Form/Unterbrechung.js  | 12 +++++++---
 system/phrasesupdate.php                      |  4 ++--
 3 files changed, 28 insertions(+), 10 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 0b5ec1957..97617231d 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1341,9 +1341,9 @@ class AntragLib
 			return $semester;
 		$nextSem = current(getData($result));
 
-		$semester[] = [
+		$semester[0] = [
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'wiedereinstieg' => $nextSem->start
+			'wiedereinstieg' => [$nextSem]
 		];
 
 		$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $nextSem->studiensemester_kurzbz, $ausbildungssemester+1);
@@ -1354,13 +1354,25 @@ class AntragLib
 		if (!hasData($result))
 			return $semester;
 
-		$semAfterNext = current(getData($result));
+		$currSemester = current(getData($result));
+		$followingSemester = [$currSemester];
 
-		$semester[] = [
+		for ($i = 0; $i < 3; $i++) {
+			$result = $this->_ci->StudiensemesterModel->getNextFrom($currSemester->studiensemester_kurzbz);
+			if (!hasData($result))
+				break;
+			$currSemester = current(getData($result));
+			$followingSemester[] = $currSemester;
+		}
+
+		$semester[1] = [
 			'studiensemester_kurzbz' => $nextSem->studiensemester_kurzbz,
-			'wiedereinstieg' => $semAfterNext->start
+			'wiedereinstieg' => $followingSemester
 		];
 
+		foreach ($followingSemester as $sem)
+			$semester[0]['wiedereinstieg'][] = $sem;
+
 		return $semester;
 	}
 
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index 3f2836a42..e0b64e7cb 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -31,6 +31,7 @@ export default {
 				default: []
 			},
 			stsem: null,
+			currentWiedereinstieg: '',
 			siteUrl: FHC_JS_DATA_STORAGE_OBJECT.app_root +
 				FHC_JS_DATA_STORAGE_OBJECT.ci_router
 		}
@@ -101,7 +102,7 @@ export default {
 			formData.append("studiensemester", this.stsem !== null && this.data.studiensemester[this.stsem].studiensemester_kurzbz);
 			formData.append("prestudent_id", this.data.prestudent_id);
 			formData.append("grund", this.$refs.grund.value);
-			formData.append("datum_wiedereinstieg", this.stsem !== null && this.data.studiensemester[this.stsem].wiedereinstieg);
+			formData.append("datum_wiedereinstieg", this.stsem !== null && this.currentWiedereinstieg);
 
 			axios.post(
 				FHC_JS_DATA_STORAGE_OBJECT.app_root +
@@ -257,6 +258,7 @@ export default {
 							v-model="stsem"
 							required
 							:id="'studierendenantrag-form-abmeldung-' + uuid + '-stsem'"
+							@input="currentWiedereinstieg = ''"
 							>
 							<option v-for="(stsem, index) in data.studiensemester" :key="index" :value="index">
 								{{stsem.studiensemester_kurzbz}}
@@ -278,8 +280,12 @@ export default {
 					<div v-else-if="stsem === null" class="form-control">
 						{{p.t('ui/select_studiensemester')}}
 					</div>
-					<div v-else class="form-control">
-						{{datumWsFormatted}}
+					<div v-else>
+						<select v-model="currentWiedereinstieg" class="form-control">
+							<option v-for="sem in data.studiensemester[stsem].wiedereinstieg" :key="sem.studiensemester_kurzbz" :value="sem.start">
+								{{sem.studiensemester_kurzbz}}
+							</option>
+						</select>
 					</div>
 
 					<div v-if="errors.datum_wiedereinstieg.length" class="invalid-feedback d-block">
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index c616c8365..babfbac70 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18773,13 +18773,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Datum Wiedereinstieg',
+				'text' => 'Wiedereinstieg',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Date of return',
+				'text' => 'Re-Entry',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From da0dc0e053f1889c0a14a94a0809e56421ce6717 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 7 Aug 2023 13:05:13 +0200
Subject: [PATCH 096/175] Missing Phrase Category in Controller

---
 application/controllers/components/Antrag/Unterbrechung.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/controllers/components/Antrag/Unterbrechung.php b/application/controllers/components/Antrag/Unterbrechung.php
index f0c269617..4d89a5cb6 100644
--- a/application/controllers/components/Antrag/Unterbrechung.php
+++ b/application/controllers/components/Antrag/Unterbrechung.php
@@ -27,7 +27,8 @@ class Unterbrechung extends FHC_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
-			'studierendenantrag'
+			'studierendenantrag',
+			'ui'
 		]);
 	}
 

From 61c6245e1ade6bbc52d40dd3096ff68cab3adf26 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 8 Aug 2023 14:39:05 +0200
Subject: [PATCH 097/175] Phrasen: Antrag => Bekanntgabe

---
 system/phrasesupdate.php | 66 ++++++++++++++++++++--------------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index babfbac70..0a618645a 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18531,13 +18531,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Antrag zurückziehen',
+				'text' => 'Bekanntgabe zurückziehen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Cancel Application',
+				'text' => 'Cancel announcement',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -19514,13 +19514,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Statusverlauf für Antrag #{id} ',
+				'text' => 'Statusverlauf für #{id} ',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'History for Application #{id}',
+				'text' => 'History for #{id}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -19594,13 +19594,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Grund für Ablehnung von Antrag #{id}',
+				'text' => 'Grund für Ablehnung von #{id}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for rejection of Application #{id}',
+				'text' => 'Reason for rejection of #{id}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -19774,13 +19774,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Für diesen Studiengang sind keine Anträge möglich',
+				'text' => 'Für diesen Studiengang sind keine Bekanntgaben möglich',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No applications are accepted for this course',
+				'text' => 'No announcements are accepted for this course',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -19794,13 +19794,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Es gibt bereits einen bestehenden Antrag',
+				'text' => 'Es gibt bereits eine bestehende Bekanntgabe',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'There is already an existing application',
+				'text' => 'There is already an existing announcement',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -19814,13 +19814,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Es gibt bereits einen bestehenden Antrag vom Typ {typ}',
+				'text' => 'Es gibt bereits eine bestehende Bekanntgabe vom Typ {typ}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'There is already an existing application of type {typ}',
+				'text' => 'There is already an existing announcement of type {typ}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -19834,13 +19834,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Kein Antrag mit AntragsId {id} gefunden',
+				'text' => 'Keine Bekanntgabe mit Id {id} gefunden',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No application found with ApplicationId {id}',
+				'text' => 'No announcement found with Id {id}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -19854,13 +19854,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Kein {typ} Antrag gefunden für Prestudent {prestudent_id}',
+				'text' => 'Keine {typ} Bekanntgabe gefunden für Prestudent {prestudent_id}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No {typ} application found for prestudent {prestudent_id}',
+				'text' => 'No {typ} announcement found for prestudent {prestudent_id}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -19874,13 +19874,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Kein Studiengang und Ausbildungssemester gefunden für Antrag mit AntragsId {id}',
+				'text' => 'Kein Studiengang und Ausbildungssemester gefunden für Bekanntgabe mit Id {id}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No studiengang and ausbildungssemester found for antrag with id: {id}',
+				'text' => 'No studiengang and ausbildungssemester found for announcement with id: {id}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -19914,13 +19914,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Kein Studiengang gefunden für Antrag #{id}',
+				'text' => 'Kein Studiengang gefunden für Bakanntgabe #{id}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No studiengang found for Application #{id}',
+				'text' => 'No studiengang found for announcement #{id}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -19934,13 +19934,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine Studiengang-Email gefunden für Antrag #{id}',
+				'text' => 'Keine Studiengang-Email gefunden für Bekanntgabe #{id}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No studiengang-email found for Application #{id}',
+				'text' => 'No studiengang-email found for announcement #{id}',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20014,7 +20014,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Dieser Antrag ist gesperrt',
+				'text' => 'Diese Bekanntgabe ist gesperrt',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -20054,13 +20054,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine Lehrveranstaltung im Antrag gefunden',
+				'text' => 'Keine Lehrveranstaltung in Bekanntgabe gefunden',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No course found in application',
+				'text' => 'No course found in announcement',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20074,13 +20074,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine Berechtigung, den Antrag zu bearbeiten',
+				'text' => 'Keine Berechtigung, die Bekanntgabe zu bearbeiten',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No authorization to edit the application',
+				'text' => 'No authorization to edit the announcement',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20094,13 +20094,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Keine Berechtigung, den Antrag zu beeinspruchen',
+				'text' => 'Keine Berechtigung, die Bekanntgabe zu beeinspruchen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'No authorization to object the application',
+				'text' => 'No authorization to object the announcement',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20114,13 +20114,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Antrag ist nicht beeinsprucht',
+				'text' => 'Bekanntgabe ist nicht beeinsprucht',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Application is not objected',
+				'text' => 'Announcement is not objected',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20134,13 +20134,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Antrag ist nicht bestätigt worden',
+				'text' => 'Bakanntgabe ist nicht bestätigt worden',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Application is not approved',
+				'text' => 'Announcement is not approved',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 5c018e204e36436caedeaa6daf18385cfd9431e2 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 8 Aug 2023 15:12:23 +0200
Subject: [PATCH 098/175] Lv Popup optische Verbesserungen

---
 application/views/lehre/Antrag/Student/List.php            | 4 +---
 public/js/components/Studierendenantrag/Leitung/LvPopup.js | 2 +-
 public/js/components/Studierendenantrag/Leitung/Table.js   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 52242d7d6..08fd513ac 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -105,9 +105,7 @@ $this->load->view(
 										<a class="ms-2" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' . str_replace('AbmeldungStgl', 'Abmeldung', $antrag->typ) . '.xml.php&xsl=Antrag' . str_replace('AbmeldungStgl', 'Abmeldung', $antrag->typ) . '&id=' . $antrag->studierendenantrag_id . '&uid=' . getAuthUID()); ?>"><i class="fa-solid fa-download" title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"></i></a>
 									<?php } ?>
 									<?php if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG && $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED) { ?>
-										<a class="btn btn-outline-secondary" href="#modalgrund<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal">
-											<?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?>
-										</a>
+										<a class="ms-2" href="#modalgrund<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal"><?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?></a>
 										<lv-popup id="modalgrund<?= $antrag->studierendenantrag_id; ?>" antrag-id = "<?= $antrag->studierendenantrag_id; ?>">
 											<?= $this->p->t('studierendenantrag', 'my_lvs'); ?>
 										</lv-popup>
diff --git a/public/js/components/Studierendenantrag/Leitung/LvPopup.js b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
index 8efee8ae4..db13a1bb7 100644
--- a/public/js/components/Studierendenantrag/Leitung/LvPopup.js
+++ b/public/js/components/Studierendenantrag/Leitung/LvPopup.js
@@ -67,7 +67,7 @@ export default {
 			options = { default: options };
 		return BsAlert.popup.bind(this)(msg, options);
 	},
-	template: `<bs-modal ref="modalContainer" class="bootstrap-prompt" v-bind="$props">
+	template: `<bs-modal ref="modalContainer" class="bootstrap-prompt" v-bind="$props" dialog-class="modal-lg">
 		<template v-slot:title>
 			<slot></slot>
 		</template>
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index ba665c6f9..be685bd80 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -370,7 +370,7 @@ export default {
 				</table>
 			</core-fetch-cmpt>
 		</bs-modal>
-		<lv-popup ref="lvList" class="fade" :antrag-id="lvsData ? lvsData.studierendenantrag_id : null" dialog-class="modal-lg">
+		<lv-popup ref="lvList" class="fade" :antrag-id="lvsData ? lvsData.studierendenantrag_id : null">
 			{{p.t('studierendenantrag', 'title_show_lvs', lvsData ? lvsData : {name: ''}) }}
 		</lv-popup>
 	</div>

From 9dc36af7fc92a9ca25ea6b59b01547c5623dc184 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 8 Aug 2023 15:37:20 +0200
Subject: [PATCH 099/175] =?UTF-8?q?Umlaute=20&=20Genehmigt=20=3D>=20Best?=
 =?UTF-8?q?=C3=A4tigt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../models/education/Studierendenantragstatus_model.php       | 2 +-
 public/js/components/Studierendenantrag/Form/Unterbrechung.js | 2 +-
 system/dbupdate_3.4/27351_digitalisierung_formulare.php       | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/models/education/Studierendenantragstatus_model.php b/application/models/education/Studierendenantragstatus_model.php
index 5355ecdba..b4bf3938b 100644
--- a/application/models/education/Studierendenantragstatus_model.php
+++ b/application/models/education/Studierendenantragstatus_model.php
@@ -7,7 +7,7 @@ class Studierendenantragstatus_model extends DB_Model
 	const STATUS_REJECTED = 'Abgelehnt';
 	const STATUS_PASS = 'Verzichtet';
 	const STATUS_REOPENED = 'Offen';
-	const STATUS_CANCELLED = 'Zurückgezogen';
+	const STATUS_CANCELLED = 'Zurueckgezogen';
 	const STATUS_LVSASSIGNED = 'Lvszugewiesen';
 	const STATUS_REMINDERSENT = 'EmailVersandt';
 	const STATUS_REQUESTSENT_1 = 'ErsteAufforderungVersandt';
diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index e0b64e7cb..14e57f797 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -42,7 +42,7 @@ export default {
 			{
 				case 'Erstellt': return 'info';
 				case 'Genehmigt': return 'success';
-				case 'Zurückgezogen': return 'danger';
+				case 'Zurueckgezogen': return 'danger';
 				default: return 'info';
 			}
 		},
diff --git a/system/dbupdate_3.4/27351_digitalisierung_formulare.php b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
index 341b34b67..1f8dd4b4b 100644
--- a/system/dbupdate_3.4/27351_digitalisierung_formulare.php
+++ b/system/dbupdate_3.4/27351_digitalisierung_formulare.php
@@ -27,11 +27,11 @@ if($result = @$db->db_query("SELECT 1 FROM campus.tbl_studierendenantrag_statust
 			(studierendenantrag_statustyp_kurzbz, bezeichnung)
 			VALUES
 			('Erstellt', '{\"Erstellt\",\"Created\"}'),
-			('Genehmigt', '{\"Genehmigt\",\"Approved\"}'),
+			('Genehmigt', '{\"Bestätigt\",\"Approved\"}'),
 			('Abgelehnt', '{\"Abgelehnt\",\"Rejected\"}'),
 			('Verzichtet', '{\"Verzichtet\",\"Pass\"}'),
 			('Offen', '{\"Offen\",\"Reopened\"}'),
-			('Zurückgezogen', '{\"Zurückgezogen\",\"Cancelled\"}'),
+			('Zurueckgezogen', '{\"Zurückgezogen\",\"Cancelled\"}'),
 			('Lvszugewiesen', '{\"Lvszugewiesen\",\"Lvsassigned\"}'),
 			('EmailVersandt', '{\"Email Versandt\",\"Reminder Sent\"}'),
 			('ErsteAufforderungVersandt', '{\"1.Aufforderung Versandt\",\"1st Request Sent\"}'),

From 44141ce8d856352d08ed2be59f63cedad78985cb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 8 Aug 2023 16:08:15 +0200
Subject: [PATCH 100/175] PDF Download "Abmeldung durch Stgl"

---
 .../views/lehre/Antrag/Student/List.php       |   8 ++-
 .../Studierendenantrag/Leitung/Table.js       |   2 +-
 rdf/AntragAbmeldungStgl.xml.php               |  67 ++++++++++++++++++
 system/vorlage_zip/AntragAbmeldungStgl.odt    | Bin 0 -> 37277 bytes
 4 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 rdf/AntragAbmeldungStgl.xml.php
 create mode 100644 system/vorlage_zip/AntragAbmeldungStgl.odt

diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 08fd513ac..724468024 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -101,8 +101,12 @@ $this->load->view(
 								</td>
 								<td>
 									<a href="<?= site_url('lehre/Studierendenantrag/' . strtolower($antrag->typ) . '/' . $antrag->prestudent_id . '/' . $antrag->studierendenantrag_id); ?>"><i class="fa-solid fa-pen" title="<?= $this->p->t('studierendenantrag', 'btn_edit'); ?>"></i></a>
-									<?php if ($antrag->typ != Studierendenantrag_model::TYP_WIEDERHOLUNG && $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED) { ?>
-										<a class="ms-2" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' . str_replace('AbmeldungStgl', 'Abmeldung', $antrag->typ) . '.xml.php&xsl=Antrag' . str_replace('AbmeldungStgl', 'Abmeldung', $antrag->typ) . '&id=' . $antrag->studierendenantrag_id . '&uid=' . getAuthUID()); ?>"><i class="fa-solid fa-download" title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"></i></a>
+									<?php if ($antrag->typ != Studierendenantrag_model::TYP_WIEDERHOLUNG && in_array($antrag->status, [
+										Studierendenantragstatus_model::STATUS_APPROVED,
+										Studierendenantragstatus_model::STATUS_OBJECTED,
+										Studierendenantragstatus_model::STATUS_OBJECTION_DENIED
+									])) { ?>
+										<a class="ms-2" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' . $antrag->typ . '.xml.php&xsl=Antrag' . $antrag->typ . '&id=' . $antrag->studierendenantrag_id . '&uid=' . getAuthUID()); ?>"><i class="fa-solid fa-download" title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"></i></a>
 									<?php } ?>
 									<?php if ($antrag->typ == Studierendenantrag_model::TYP_WIEDERHOLUNG && $antrag->status == Studierendenantragstatus_model::STATUS_APPROVED) { ?>
 										<a class="ms-2" href="#modalgrund<?= $antrag->studierendenantrag_id; ?>" data-bs-toggle="modal"><?= $this->p->t('studierendenantrag', 'btn_show_lvs'); ?></a>
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index be685bd80..f8af2818c 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -207,7 +207,7 @@ export default {
 
 					container.className = "d-flex gap-2";
 
-					if ((data.typ == 'Abmeldung' || data.typ == 'Unterbrechung') && (data.status == 'Genehmigt')) {
+					if ((data.typ == 'Abmeldung' || data.typ == 'AbmeldungStgl' || data.typ == 'Unterbrechung') && (data.status == 'Genehmigt' || data.status == 'Beeinsprucht' || data.status == 'EinspruchAbgelehnt')) {
 						// NOTE(chris): Download PDF
 						let button = document.createElement('a');
 						button.innerHTML = '<i class="fa-solid fa-download" title="' + this.p.t('studierendenantrag', 'btn_download_antrag') + '"></i>';
diff --git a/rdf/AntragAbmeldungStgl.xml.php b/rdf/AntragAbmeldungStgl.xml.php
new file mode 100644
index 000000000..b3d746fcb
--- /dev/null
+++ b/rdf/AntragAbmeldungStgl.xml.php
@@ -0,0 +1,67 @@
+<?php
+
+header("Content-type: application/xhtml+xml");
+require_once('../config/vilesci.config.inc.php');
+require_once('../include/functions.inc.php');
+require_once('../include/basis_db.class.php');
+
+$db = new basis_db();
+
+if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
+{
+
+	if(isset($_GET['id'])) {
+		$id = $_GET['id'];
+
+		$where = " WHERE studierendenantrag_id = " . $db->db_add_param($id) . "
+					AND campus.tbl_studierendenantrag.typ = 'AbmeldungStgl' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt');";
+		$not_found_error = 'Studierendenantrag not found'. $id;
+	} elseif(isset($_GET['uid']) && isset($_GET['prestudent_id'])) {
+		$uid = $_GET['uid'];
+		$uid = explode(';', $uid);
+		$uid  = (array_filter($uid, 'strlen'));
+
+		$prestudent_id = $_GET['prestudent_id'];
+		$prestudent_id = explode(';', $prestudent_id);
+		$prestudent_id  = (array_filter($prestudent_id, 'strlen'));
+
+		$where = " WHERE  campus.tbl_studierendenantrag.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
+					AND campus.tbl_studierendenantrag.typ = 'AbmeldungStgl' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'Beeinsprucht', 'EinspruchAbgelehnt');";
+		$not_found_error = 'Studierendenantrag not found for: ' . implode(',', $uid);
+	} else
+		die('<error>wrong parameters</error>');
+}
+else
+	die('<error>Format not supported</error>');
+
+
+$query = "
+	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
+	FROM
+	campus.tbl_studierendenantrag
+	JOIN public.tbl_student USING (prestudent_id)
+	JOIN public.tbl_benutzer ON tbl_student.student_uid=uid
+	JOIN public.tbl_person USING (person_id)
+	JOIN public.tbl_studiengang USING (studiengang_kz)
+	JOIN public.tbl_studiensemester USING (studiensemester_kurzbz)
+	JOIN bis.tbl_orgform ON (tbl_orgform.orgform_kurzbz = tbl_studiengang.orgform_kurzbz)" . $where;
+
+
+if (!$db->db_query($query) || !$db->db_num_rows())
+	die('<error>' . $not_found_error . '</error>');
+
+?>
+<?xml version='1.0' encoding='UTF-8' standalone='yes'?>
+<antraege>
+	<?php while($row = $db->db_fetch_object()) { ?>
+	<antrag>
+		<studiengang><?=$row->bezeichnung;?></studiengang>
+		<organisationsform><?=$row->bezeichnung_mehrsprachig;?> </organisationsform>
+		<name><?= trim($row->vorname. " " . $row->nachname);?></name>
+		<personenkz><?=$row->matrikelnr;?></personenkz>
+		<studienjahr><?php echo $row->studienjahr_kurzbz;?></studienjahr>
+		<semester><?=$row->semester;?></semester>
+		<grund><?=$row->grund;?></grund>
+	</antrag>
+	<?php } ?>
+</antraege>
diff --git a/system/vorlage_zip/AntragAbmeldungStgl.odt b/system/vorlage_zip/AntragAbmeldungStgl.odt
new file mode 100644
index 0000000000000000000000000000000000000000..2e11ca60ae49eb67a843672bf6e2c87e5d31517c
GIT binary patch
literal 37277
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

literal 0
HcmV?d00001


From c9e947831e86cc35b3b086755e9824b80fc97a8c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 8 Aug 2023 16:16:09 +0200
Subject: [PATCH 101/175] PDF Unterbrechung: Auch in status EmailVersandt
 abrufbar

---
 application/views/lehre/Antrag/Student/List.php          | 3 ++-
 public/js/components/Studierendenantrag/Leitung/Table.js | 2 +-
 rdf/AntragUnterbrechung.xml.php                          | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index 724468024..e0ea15045 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -104,7 +104,8 @@ $this->load->view(
 									<?php if ($antrag->typ != Studierendenantrag_model::TYP_WIEDERHOLUNG && in_array($antrag->status, [
 										Studierendenantragstatus_model::STATUS_APPROVED,
 										Studierendenantragstatus_model::STATUS_OBJECTED,
-										Studierendenantragstatus_model::STATUS_OBJECTION_DENIED
+										Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
+										Studierendenantragstatus_model::STATUS_REMINDERSENT
 									])) { ?>
 										<a class="ms-2" target="_blank" href="<?= base_url('cis/private/pdfExport.php?xml=Antrag' . $antrag->typ . '.xml.php&xsl=Antrag' . $antrag->typ . '&id=' . $antrag->studierendenantrag_id . '&uid=' . getAuthUID()); ?>"><i class="fa-solid fa-download" title="<?= $this->p->t('studierendenantrag', 'btn_download_antrag'); ?>"></i></a>
 									<?php } ?>
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index f8af2818c..daadc5b3e 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -207,7 +207,7 @@ export default {
 
 					container.className = "d-flex gap-2";
 
-					if ((data.typ == 'Abmeldung' || data.typ == 'AbmeldungStgl' || data.typ == 'Unterbrechung') && (data.status == 'Genehmigt' || data.status == 'Beeinsprucht' || data.status == 'EinspruchAbgelehnt')) {
+					if ((data.typ == 'Abmeldung' || data.typ == 'AbmeldungStgl' || data.typ == 'Unterbrechung') && (data.status == 'Genehmigt' || data.status == 'Beeinsprucht' || data.status == 'EinspruchAbgelehnt' || data.status == 'EmailVersandt')) {
 						// NOTE(chris): Download PDF
 						let button = document.createElement('a');
 						button.innerHTML = '<i class="fa-solid fa-download" title="' + this.p.t('studierendenantrag', 'btn_download_antrag') + '"></i>';
diff --git a/rdf/AntragUnterbrechung.xml.php b/rdf/AntragUnterbrechung.xml.php
index bb47018d6..cbf7eaeb8 100644
--- a/rdf/AntragUnterbrechung.xml.php
+++ b/rdf/AntragUnterbrechung.xml.php
@@ -15,7 +15,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$id = $_GET['id'];
 
 		$where = " WHERE studierendenantrag_id = " . $db->db_add_param($id) . "
-					AND campus.tbl_studierendenantrag.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) = 'Genehmigt';";
+					AND campus.tbl_studierendenantrag.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'EmailVersandt');";
 		$not_found_error = 'Studierendenantrag not found'. $id;
 	} elseif(isset($_GET['uid']) && isset($_GET['prestudent_id'])) {
 		$uid = $_GET['uid'];
@@ -27,7 +27,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$prestudent_id  = (array_filter($prestudent_id, 'strlen'));
 
 		$where = " WHERE  campus.tbl_studierendenantrag.prestudent_id in (" . $db->db_implode4SQL($prestudent_id) . ")
-					AND campus.tbl_studierendenantrag.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) = 'Genehmigt';";
+					AND campus.tbl_studierendenantrag.typ = 'Unterbrechung' AND campus.get_status_studierendenantrag(campus.tbl_studierendenantrag.studierendenantrag_id) IN ('Genehmigt', 'EmailVersandt');";
 		$not_found_error = 'Studierendenantrag not found for: ' . implode(',', $uid);
 	} else
 		die('<error>wrong parameters</error>');

From b77e715bdb716217a86438aa913215f1be65b026 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 8 Aug 2023 16:26:15 +0200
Subject: [PATCH 102/175] Font Awesome + Buttons in Studierendenansicht
 korrigiert

---
 application/views/lehre/Antrag/Student/List.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/lehre/Antrag/Student/List.php b/application/views/lehre/Antrag/Student/List.php
index e0ea15045..add2e8c7d 100644
--- a/application/views/lehre/Antrag/Student/List.php
+++ b/application/views/lehre/Antrag/Student/List.php
@@ -39,7 +39,7 @@ $this->load->view(
 							<p><?= $this->p->t('studierendenantrag', 'calltoaction_' . $type); ?></p>
 							<hr>
 							<a href="<?= site_url('lehre/Studierendenantrag/' . strtolower($type) . '/' . $prestudent_id); ?>" class="btn btn-outline-secondary">
-								<i class="fa-regular fa-plus fa-xl"></i> <?= $this->p->t('studierendenantrag', 'antrag_typ_' . $type); ?>
+								<i class="fa fa-plus"></i> <?= $this->p->t('studierendenantrag', 'antrag_typ_' . $type); ?>
 							</a>
 						</div>
 					<?php } ?>

From f9be090bbf4887b03a48fd9bea758da6ca15d8ac Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 8 Aug 2023 16:59:42 +0200
Subject: [PATCH 103/175] Studierendenansicht: nur STGs anzeigen bei denen ein
 Status "Student" vorhanden ist.

---
 application/models/education/Studierendenantrag_model.php | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 67adca855..13a60faac 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -197,6 +197,9 @@ class Studierendenantrag_model extends DB_Model
 			'campus.get_status_studierendenantrag(studierendenantrag_id)=st.studierendenantrag_statustyp_kurzbz',
 			'LEFT'
 		);
+		
+		$this->db->where("(SELECT status_kurzbz FROM public.tbl_prestudentstatus WHERE prestudent_id=p.prestudent_id AND status_kurzbz='Student' LIMIT 1) IS NOT NULL", null, false);
+
 
 		return $this->loadWhere([
 			'p.person_id' => $person_id

From 353e2deaf7e1a38212cfbc9cced24a49dae3fd9a Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 10 Aug 2023 11:02:45 +0200
Subject: [PATCH 104/175] AbortController

---
 .../Studierendenantrag/Leitung/Actions/New.js      | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
index 9fb5e7a64..7fca9a029 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/New.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
@@ -16,7 +16,8 @@ export default {
 	data() {
 		return {
 			data: [],
-			student: ''
+			student: '',
+			abortController: null
 		}
 	},
 	computed: {
@@ -38,11 +39,18 @@ export default {
 			});
 		},
 		loadData(evt) {
+			if (this.abortController)
+				this.abortController.abort();
+			this.abortController = new AbortController();
+
 			axios.post(
 				FHC_JS_DATA_STORAGE_OBJECT.app_root +
 				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
 				'/components/Antrag/Abmeldung/getStudiengaengeAssistenz/',
-				evt
+				evt,
+				{
+					signal: this.abortController.signal
+				}
 			).then(
 				result => {
 					if (result.data.error) {
@@ -52,7 +60,7 @@ export default {
 					}
 					return result;
 				}
-			);
+			).catch(() => {});
 		}
 	},
 	template: `

From 913f45fcda3e18365a54668f9c82e99d8def8db9 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Mon, 14 Aug 2023 11:53:36 +0200
Subject: [PATCH 105/175] - auswertung_fhtw um studiengang typ erweitert

---
 vilesci/stammdaten/auswertung_fhtw.php | 27 ++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/vilesci/stammdaten/auswertung_fhtw.php b/vilesci/stammdaten/auswertung_fhtw.php
index e5975b651..c5e4ecc02 100644
--- a/vilesci/stammdaten/auswertung_fhtw.php
+++ b/vilesci/stammdaten/auswertung_fhtw.php
@@ -1248,6 +1248,7 @@ $semester = isset($_REQUEST['semester']) ? $_REQUEST['semester'] : '';
 $prestudent_id = isset($_REQUEST['prestudent_id']) ? $_REQUEST['prestudent_id'] : '';
 $orgform_kurzbz = isset($_REQUEST['orgform_kurzbz']) ? $_REQUEST['orgform_kurzbz'] : '';
 $format = (isset($_REQUEST['format']) ? $_REQUEST['format'] : '');
+$stgtyp = (isset($_REQUEST['stgtyp']) ? $_REQUEST['stgtyp'] : '');
 $rtStudiensemester = '';
 
 if ($reihungstest != '' && (is_array($reihungstest) || is_numeric($reihungstest)))
@@ -1419,6 +1420,12 @@ if (isset($_REQUEST['reihungstest']) || isset($_POST['rtauswsubmit']))
 							OR tbl_ablauf.studienplan_id IS NULL)";
 	}
 	//$query .= " AND nachname='Al-Mafrachi'";
+
+	if ($stgtyp !== '')
+	{
+		$query .= " AND tbl_studiengang.typ = " .$db->db_add_param($stgtyp);
+	}
+
 	$query .= " ORDER BY tbl_ablauf.studiengang_kz, tbl_ablauf.semester, reihung";
 
 	if (!($result = $db->db_query($query)))
@@ -1638,6 +1645,12 @@ if (isset($_REQUEST['reihungstest']) || isset($_POST['rtauswsubmit']))
 		//$query .= " AND tbl_ablauf.studienplan_id = 5";
 		$query .= " AND tbl_studienplan.orgform_kurzbz=" . $db->db_add_param($orgform_kurzbz);
 	}
+	
+	if ($stgtyp !== '')
+	{
+		$query .= " AND tbl_studiengang.typ = " . $db->db_add_param($stgtyp);
+	}
+	
 	//$query .= " AND nachname='Al-Mafrachi'";
 	$query .= " ORDER BY nachname,
 				vorname,
@@ -3019,6 +3032,20 @@ else
 
 	echo '&nbsp;<label>von Datum: <INPUT class="datepicker_datum" type="text" name="datum_von" maxlength="10" size="10" value="' . $datum_obj->formatDatum($datum_von, 'd.m.Y') . '" /></label>&nbsp;';
 	echo '<label>bis Datum: <INPUT class="datepicker_datum" type="text" name="datum_bis" maxlength="10" size="10" value="' . $datum_obj->formatDatum($datum_bis, 'd.m.Y') . '" /></label>';
+	
+	$studiengangtyp = ['b' => 'Bachelor', 'm' => 'Master'];
+	echo '&nbsp;<label>Studiengang Typ:
+				<SELECT name="stgtyp">
+					<OPTION value="">Alle</OPTION>';
+		foreach ($studiengangtyp as $stgtyp => $typ)
+		{
+			$selected = "";
+			if (isset($_REQUEST['stgtyp']) && $_REQUEST['stgtyp'] !== '' && $_REQUEST['stgtyp'] === $stgtyp)
+				$selected = 'selected';
+			
+			echo '<option value='. $stgtyp .' '. $selected .'>'. $typ . '</option>';
+		}
+	echo '</SELECT></label>';
 	echo '</td></tr>';
 	echo '<tr><td>';
 	echo 'PrestudentIn: <INPUT id="prestudent" type="text" name="prestudent_id" size="50" value="' . $prestudent_id . '" placeholder="Name, UID oder Prestudent_id eingeben"/><input type="hidden" id="prestudent_id" name="prestudent_id" value="' . $prestudent_id . '" />';

From d200fc196142a7d63a0c2c4a6314bcd54862fe03 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Tue, 15 Aug 2023 17:19:12 +0200
Subject: [PATCH 106/175] bis tbl_uhstat1daten: added insertamum, insertvon,
 updateamum, updatevon and abgeschicktamum

---
 ...fassung_der_uhstat1_daten_ueber_das_bewerbungstool.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
index ea2ad9e98..2446651c2 100644
--- a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
+++ b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
@@ -66,7 +66,12 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_uhstat1daten LIMIT 1'))
 				vater_bildungsstaat varchar(3),
 				vater_geburtsjahr smallint,
 				vater_bildungmax integer,
-				person_id integer NOT NULL
+				person_id integer NOT NULL,
+				abgeschicktamum timestamp without time zone,
+				insertamum timestamp without time zone DEFAULT now(),
+				insertvon character varying(32),
+				updateamum timestamp without time zone,
+				updatevon character varying(32)
 			);
 
 			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_mutter_geburtsstaat FOREIGN KEY (mutter_geburtsstaat)
@@ -108,6 +113,7 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_uhstat1daten LIMIT 1'))
 			COMMENT ON COLUMN bis.tbl_uhstat1daten.vater_bildungsstaat IS 'Education country of father of person';
 			COMMENT ON COLUMN bis.tbl_uhstat1daten.vater_geburtsjahr IS 'Birth year of father of person';
 			COMMENT ON COLUMN bis.tbl_uhstat1daten.vater_bildungmax IS 'Highest completed level of education of father (code)';
+			COMMENT ON COLUMN bis.tbl_uhstat1daten.abgeschicktamum IS 'Date and time UHSTAT1 data was sent';
 
 			GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_uhstat1daten TO web;
 			GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_uhstat1daten TO vilesci;

From c62198b4b5aeba93393914e03ffa659be7f3669f Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Tue, 15 Aug 2023 18:27:30 +0200
Subject: [PATCH 107/175] UHSTAT form: added delete button for employees with
 permission, edit and delete buttons are only shown if user has permission

---
 application/controllers/codex/UHSTAT1.php | 132 +++++--
 application/views/codex/uhstat1.php       | 434 +++++++++++-----------
 public/js/codex/uhstat1.js                |   2 +-
 system/phrasesupdate.php                  |  60 +++
 4 files changed, 397 insertions(+), 231 deletions(-)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index 0e019672a..4586345eb 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -68,6 +68,9 @@ class UHSTAT1 extends FHC_Controller
 		);
 	}
 
+	// -----------------------------------------------------------------------------------------------------------------
+	// Public methods
+
 	public function index()
 	{
 		$formMetaData = $this->_getFormMetaData();
@@ -80,12 +83,10 @@ class UHSTAT1 extends FHC_Controller
 
 		if (isError($uhstatData)) show_error(getError($uhstatData));
 
-		$readonly = hasData($uhstatData);
-
 		$this->load->view("codex/uhstat1.php", array(
-			'formMetaData' => getData($formMetaData),
-			'uhstatData' => getData($uhstatData),
-			'readonly' => $readonly)
+				'formMetaData' => getData($formMetaData),
+				'uhstatData' => getData($uhstatData)
+			)
 		);
 	}
 
@@ -94,7 +95,9 @@ class UHSTAT1 extends FHC_Controller
 	 */
 	public function saveUHSTAT1Data()
 	{
-		$person_id = $this->_getValidPersonId();
+		$saved = false;
+
+		$person_id = $this->_getValidPersonId('sui');
 
 		$this->form_validation->set_error_delimiters('<span class="text-danger">', '</span>');
 
@@ -155,20 +158,30 @@ class UHSTAT1 extends FHC_Controller
 
 		if (isError($formMetaData)) show_error(getError($formMetaData));
 
-		if (!hasData($formMetaData)) show_error("No form data could be loaded");
+		if (!hasData($formMetaData)) show_error("No form meta data could be loaded");
 
+		$successMessage = '';
+		$errorMessage = '';
 		// pass success/error messages to view
-		$successMessage = isset($uhstat1datenRes) && isSuccess($uhstat1datenRes) ? $this->p->t('uhstat', 'erfolgreichGespeichert') : '';
-		$errorMessage = isset($uhstat1datenRes) && isError($uhstat1datenRes) ? $this->p->t('uhstat', 'fehlerBeimSpeichern') : '';
-		$readOnly = isSuccess($uhstat1datenRes);
+		if (isset($uhstat1datenRes))
+		{
+			if (isSuccess($uhstat1datenRes))
+			{
+				$successMessage = $this->p->t('uhstat', 'erfolgreichGespeichert');
+				$saved = true;
+			}
+			else
+				$errorMessage = $this->p->t('uhstat', 'fehlerBeimSpeichern');
+		}
 
 		// load view with form data
 		$this->load->view("codex/uhstat1.php", array(
-			'formMetaData' => getData($formMetaData),
-			'successMessage' => $successMessage,
-			'errorMessage' => $errorMessage,
-			'readonly' => $readOnly
-		));
+				'formMetaData' => getData($formMetaData),
+				'saved' => $saved,
+				'successMessage' => $successMessage,
+				'errorMessage' => $errorMessage
+			)
+		);
 	}
 
 	/**
@@ -206,12 +219,63 @@ class UHSTAT1 extends FHC_Controller
 		return false;
 	}
 
+	/**
+	 * Deletes UHSTAT1 entry.
+	 */
+	public function deleteUHSTAT1Data()
+	{
+		$saved = false;
+
+		// uhstat data can only be deleted with permission
+		if (!$this->_checkPermission('suid')) show_error('no permission');
+
+		$person_id = $this->_getValidPersonId('suid');
+
+		$uhstat1datenRes = $this->Uhstat1datenModel->delete(
+			array('person_id' => $person_id)
+		);
+
+		$formMetaData = $this->_getFormMetaData();
+
+		if (isError($formMetaData)) show_error(getError($formMetaData));
+
+		if (!hasData($formMetaData)) show_error("No form meta data could be loaded");
+
+		$successMessage = '';
+		$errorMessage = '';
+		// pass success/error messages to view
+		if (isset($uhstat1datenRes))
+		{
+			if (isSuccess($uhstat1datenRes))
+			{
+				$successMessage = $this->p->t('uhstat', 'erfolgreichGeloescht');
+			}
+			else
+				$errorMessage = $this->p->t('uhstat', 'fehlerBeimLoeschen');
+		}
+
+		// load view with form data
+		$this->load->view("codex/uhstat1.php", array(
+				'formMetaData' => getData($formMetaData),
+				'successMessage' => $successMessage,
+				'errorMessage' => $errorMessage
+			)
+		);
+	}
+
+	// -----------------------------------------------------------------------------------------------------------------
+	// Private methods
+
 	/**
 	 * Gets initial data needed to display UHSTAT1 form.
 	 */
 	private function _getFormMetaData()
 	{
-		$person_id = $this->_getValidPersonId();
+		$person_id = $this->_getValidPersonId('s');
+		$readOnly = $this->input->get('readOnly');
+
+		$editPermission = $this->_checkPermission('sui');
+		$deletePermission = $this->_checkPermission('suid');
 
 		$languageIdx = $this->_getLanguageIndex();
 
@@ -220,7 +284,10 @@ class UHSTAT1 extends FHC_Controller
 			'abschluss_oesterreich' => array(),
 			'abschluss_nicht_oesterreich' => array(),
 			'jahre' => array(),
-			'person_id' => $person_id
+			'person_id' => $person_id,
+			'editPermission' => $editPermission,
+			'deletePermission' => $deletePermission,
+			'readOnly' => $readOnly
 		);
 
 		$nationTextFieldName = $languageIdx == 1 ? 'langtext' : 'engltext';
@@ -234,7 +301,18 @@ class UHSTAT1 extends FHC_Controller
 
 		if (isError($nationRes)) return $nationRes;
 
-		if (hasData($nationRes)) $formMetaData['nation'] = getData($nationRes);
+		if (hasData($nationRes))
+		{
+			$nations = getData($nationRes);
+
+			// put austria in beginning of selection
+			foreach ($nations as $nation)
+			{
+				if ($nation->nation_code == self::CODEX_OESTERREICH) array_unshift($nations, $nation);
+			}
+
+			$formMetaData['nation'] = $nations;
+		}
 
 		// get abschluss list
 		$abschlussRes = $this->AbschlussModel->getActiveAbschluesse($languageIdx);
@@ -271,7 +349,7 @@ class UHSTAT1 extends FHC_Controller
 	 */
 	private function _getUHSTAT1Data()
 	{
-		$person_id = $this->_getValidPersonId();
+		$person_id = $this->_getValidPersonId('s');
 
 		$this->Uhstat1datenModel->addSelect(
 			implode(', ', array_keys($this->_uhstat1Fields))
@@ -306,7 +384,7 @@ class UHSTAT1 extends FHC_Controller
 	 * Can be passed as parameter or be in session.
 	 * @return int person_id
 	 */
-	private function _getValidPersonId()
+	private function _getValidPersonId($berechtigungsArt)
 	{
 		// if coming from bewerbungstool - person id is in session (person must be logged in bewerbungstool)
 		if (isset($_SESSION[self::PERSON_ID_SESSION_INDEX]) && is_numeric($_SESSION[self::PERSON_ID_SESSION_INDEX]))
@@ -319,8 +397,18 @@ class UHSTAT1 extends FHC_Controller
 		if (!isset($person_id) || !is_numeric($person_id)) show_error("invalid person id");
 
 		// ...check if there is a permission for editing UHSTAT1 data
-		if ($this->permissionlib->isBerechtigt(self::BERECHTIGUNG_UHSTAT_VERWALTEN, 'suid')) return $person_id;
+		if ($this->_checkPermission($berechtigungsArt)) return $person_id;
 
-		show_error("No permission for managing UHSTAT");
+		show_error("No permission");
+	}
+
+	/**
+	 * Checks if logged user has the UHSTAT management permission.
+	 * @param $art - type of permission, e.g. suid for full permissions
+	 * @return bool
+	 */
+	private function _checkPermission($art)
+	{
+		return $this->permissionlib->isBerechtigt(self::BERECHTIGUNG_UHSTAT_VERWALTEN, $art);
 	}
 }
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index b81b0b316..2d9bc5ebf 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -11,7 +11,6 @@ $this->load->view(
 		),
 		'customCSSs' => array('public/css/codex/uhstat1.css'),
 		'customJSs' => array('public/js/codex/uhstat1.js')
-
 	)
 );
 ?>
@@ -25,207 +24,27 @@ $vater_geburtsjahr = isset($uhstatData->vater_geburtsjahr) ? $uhstatData->vater_
 $vater_geburtsstaat = isset($uhstatData->vater_geburtsstaat) ? $uhstatData->vater_geburtsstaat : set_value('vater_geburtsstaat');
 $vater_bildungsstaat = isset($uhstatData->vater_bildungsstaat) ? $uhstatData->vater_bildungsstaat : set_value('vater_bildungsstaat');
 $vater_bildungmax = isset($uhstatData->vater_bildungmax) ? $uhstatData->vater_bildungmax : set_value('vater_bildungmax');
-$disabled = $readonly === true ? ' disabled' : '';
+$readOnly = isset($formMetaData['readOnly']);
+$disabled = $readOnly ? ' disabled' : '';
+$editPermission = isset($formMetaData['editPermission']) && $formMetaData['editPermission'] === true;
+$deletePermission = isset($formMetaData['deletePermission']) && $formMetaData['deletePermission'] === true;
+$saved = isset($saved) && $saved === true;
 ?>
 
-<input type='hidden' id='uhstat1Saved' value='<?php echo isset($readonly) && $readonly == true ? 1 : 0 ?>' />
 <div class='container' id='uhstat1Container'>
-	<h2><?php echo $this->p->t('uhstat', 'uhstat1AnmeldungUeberschrift') ?></h2>
-	<p>
-		<?php echo $this->p->t('uhstat', 'rechtsbelehrung') ?>
-	</p>
-	<p>
-		<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungEinleitungstext') ?>
-	</p>
-	<br>
-	<form class="form-horizontal" method="POST" action="<?php echo site_url('codex/UHSTAT1/saveUHSTAT1Data') ?>" id="uhstat1Form">
-		<input type='hidden' id='person_id' name='person_id' value='<?php echo $formMetaData['person_id'] ?>' />
-		<fieldset>
-			<legend><?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigte') ?></legend>
-			<p>
-				<?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigteEinleitungstext') ?>
-			</p>
-			<br>
-			<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonEins') ?></h4>
-			<div class="form-group">
-				<label for="mutter_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
-				<div class="col-sm-9">
-					<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control" <?php echo $disabled ?>>
-						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-						<?php foreach ($formMetaData['jahre'] as $jahr): ?>
-							<option
-								value="<?php echo $jahr ?>"
-								<?php echo $jahr == $mutter_geburtsjahr ? " selected" : "" ?>>
-								<?php echo $jahr ?>
-							</option>
-						<?php endforeach; ?>
-					</select>
-					<?php echo form_error('mutter_geburtsjahr'); ?>
-				</div>
-			</div>
-			<div class="form-group">
-				<label for="mutter_geburtsstaat" class="col-sm-3 control-label">
-					<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
-					<br>
-					<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
-				</label>
-				<div class="col-sm-9">
-					<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control" <?php echo $disabled ?>>
-						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-						<?php foreach ($formMetaData['nation'] as $nation): ?>
-							<option
-								value="<?php echo $nation->nation_code ?>"
-								<?php echo $mutter_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
-								<?php echo $nation->nation_text ?>
-							</option>
-						<?php endforeach; ?>
-					</select>
-					<?php echo form_error('mutter_geburtsstaat'); ?>
-				</div>
-			</div>
-			<div class="form-group">
-				<label for="mutter_bildungsstaat" class="col-sm-3 control-label">
-					<?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschlussStaat')) ?>
-					<br>
-					<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
-				</label>
-				<div class="col-sm-9">
-					<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control" <?php echo $disabled ?>>
-						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-						<?php foreach ($formMetaData['nation'] as $nation): ?>
-							<option
-								value="<?php echo $nation->nation_code ?>"
-								<?php echo $mutter_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
-								<?php echo $nation->nation_text ?>
-							</option>
-						<?php endforeach; ?>
-					</select>
-					<?php echo form_error('mutter_bildungsstaat'); ?>
-				</div>
-			</div>
-			<div class="form-group">
-				<label for="mutter_bildungmax" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?></label>
-				<div class="col-sm-9">
-					<select type="text" name="mutter_bildungmax" id="mutter_bildungmax" class="form-control" <?php echo $disabled ?>>
-						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-						<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
-							<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
-						<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
-							<option
-								value="<?php echo $abschluss->ausbildung_code ?>"
-								<?php echo $mutter_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
-								<?php echo $abschluss->bezeichnung ?>
-							</option>
-						<?php endforeach; ?>
-						</optgroup>
-						<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
-							<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
-						<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
-							<option
-								value="<?php echo $abschluss->ausbildung_code ?>"
-								<?php echo $mutter_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
-								<?php echo $abschluss->bezeichnung ?>
-							</option>
-						<?php endforeach; ?>
-						</optgroup>
-					</select>
-					<?php echo form_error('mutter_bildungmax'); ?>
-				</div>
-			</div>
-			<br>
-			<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonZwei') ?></h4>
-			<div class="form-group">
-				<label for="vater_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
-				<div class="col-sm-9">
-					<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control" <?php echo $disabled ?>>
-						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-						<?php foreach ($formMetaData['jahre'] as $jahr): ?>
-							<option
-								value="<?php echo $jahr ?>"
-								<?php echo $vater_geburtsjahr == $jahr ? " selected" : "" ?>>
-									<?php echo $jahr ?>
-								</option>
-						<?php endforeach; ?>
-					</select>
-					<?php echo form_error('vater_geburtsjahr'); ?>
-				</div>
-			</div>
-			<div class="form-group">
-				<label for="vater_geburtsstaat" class="col-sm-3 control-label">
-					<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
-					<br>
-					<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
-				</label>
-				<div class="col-sm-9">
-					<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control" <?php echo $disabled ?>>
-						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-						<?php foreach ($formMetaData['nation'] as $nation): ?>
-							<option
-								value="<?php echo $nation->nation_code ?>"
-								<?php echo $vater_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
-									<?php echo $nation->nation_text ?>
-							</option>
-						<?php endforeach; ?>
-					</select>
-					<?php echo form_error('vater_geburtsstaat'); ?>
-				</div>
-			</div>
-			<div class="form-group">
-				<label for="vater_bildungsstaat" class="col-sm-3 control-label">
-					<?php echo $this->p->t('uhstat', 'hoechsterAbschlussStaat') ?>
-					<br>
-					<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
-				</label>
-				<div class="col-sm-9">
-					<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control" <?php echo $disabled ?>>
-						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-						<?php foreach ($formMetaData['nation'] as $nation): ?>
-							<option
-								value="<?php echo $nation->nation_code ?>"
-								<?php echo $vater_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
-									<?php echo $nation->nation_text ?>
-							</option>
-						<?php endforeach; ?>
-					</select>
-					<?php echo form_error('vater_bildungsstaat'); ?>
-				</div>
-			</div>
-			<div class="form-group">
-				<label for="vater_bildungmax" class="col-sm-3 control-label">
-					<?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?>
-				</label>
-				<div class="col-sm-9">
-					<select type="text" name="vater_bildungmax" id="vater_bildungmax" class="form-control" <?php echo $disabled ?>>
-						<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
-						<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
-							<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
-						<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
-							<option
-								value="<?php echo $abschluss->ausbildung_code ?>"
-								<?php echo $vater_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
-								<?php echo $abschluss->bezeichnung ?>
-							</option>
-						<?php endforeach; ?>
-						</optgroup>
-						<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
-							<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
-						<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
-							<option
-								value="<?php echo $abschluss->ausbildung_code ?>"
-								<?php echo $vater_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
-								<?php echo $abschluss->bezeichnung ?>
-							</option>
-						<?php endforeach; ?>
-						</optgroup>
-					</select>
-					<?php echo form_error('vater_bildungmax'); ?>
-				</div>
-			</div>
-		</fieldset>
+	<div id="uhstat1Subcontainer">
+		<input type='hidden' id='uhstat1Saved' value='<?php echo $saved ? 1 : 0 ?>' />
+		<h2><?php echo $this->p->t('uhstat', 'uhstat1AnmeldungUeberschrift') ?></h2>
+		<p>
+			<?php echo $this->p->t('uhstat', 'rechtsbelehrung') ?>
+		</p>
+		<p>
+			<?php echo $this->p->t('uhstat', 'uhstat1AnmeldungEinleitungstext') ?>
+		</p>
 		<br>
-		<fieldset>
+		<?php if ($editPermission): ?>
 			<?php if (isset($successMessage) && !isEmptyString($successMessage)): ?>
-				<div class="alert alert-success" id="success-alert_uhstat1">
+				<div class="alert alert-success" id="uhstat_success_alert">
 					<button type="button" class="close" data-dismiss="alert">x</button>
 					<strong><?php echo $successMessage ?></strong>
 				</div>
@@ -233,18 +52,217 @@ $disabled = $readonly === true ? ' disabled' : '';
 			<?php if (isset($errorMessage) && !isEmptyString($errorMessage)): ?>
 				<div class='alert alert-danger text-center'><?php echo $errorMessage ?></div>
 			<?php endif; ?>
-			<div class="form-group">
-				<div class="col-sm-12 text-right">
-					<?php if (!$readonly): ?>
-						&nbsp;
-						<button class="btn btn-success btn-md" type="submit" id="uhstat1Submit">
-							<?php echo $this->p->t('uhstat', 'pruefenUndSpeichern') ?>
-						</button>
-					<?php endif; ?>
+		<?php endif; ?>
+		<form class="form-horizontal" method="POST" action="<?php echo site_url('codex/UHSTAT1/saveUHSTAT1Data') ?>" id="uhstat1Form">
+			<input type='hidden' id='person_id' name='person_id' value='<?php echo $formMetaData['person_id'] ?>' />
+			<fieldset>
+				<legend><?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigte') ?></legend>
+				<p>
+					<?php echo $this->p->t('uhstat', 'angabenErziehungsberechtigteEinleitungstext') ?>
+				</p>
+				<br>
+				<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonEins') ?></h4>
+				<div class="form-group">
+					<label for="mutter_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="mutter_geburtsjahr" id="mutter_geburtsjahr" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
+								<option
+									value="<?php echo $jahr ?>"
+									<?php echo $jahr == $mutter_geburtsjahr ? " selected" : "" ?>>
+									<?php echo $jahr ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('mutter_geburtsjahr'); ?>
+					</div>
 				</div>
-			</div>
-		</fieldset>
-	</form>
+				<div class="form-group">
+					<label for="mutter_geburtsstaat" class="col-sm-3 control-label">
+						<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
+						<br>
+						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+					</label>
+					<div class="col-sm-9">
+						<select type="text" name="mutter_geburtsstaat" id="mutter_geburtsstaat" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo $mutter_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
+									<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('mutter_geburtsstaat'); ?>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="mutter_bildungsstaat" class="col-sm-3 control-label">
+						<?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschlussStaat')) ?>
+						<br>
+						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+					</label>
+					<div class="col-sm-9">
+						<select type="text" name="mutter_bildungsstaat" id="mutter_bildungsstaat" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo $mutter_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
+									<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('mutter_bildungsstaat'); ?>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="mutter_bildungmax" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="mutter_bildungmax" id="mutter_bildungmax" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
+								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+							<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
+								<option
+									value="<?php echo $abschluss->ausbildung_code ?>"
+									<?php echo $mutter_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $abschluss->bezeichnung ?>
+								</option>
+							<?php endforeach; ?>
+							</optgroup>
+							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
+								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+							<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
+								<option
+									value="<?php echo $abschluss->ausbildung_code ?>"
+									<?php echo $mutter_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $abschluss->bezeichnung ?>
+								</option>
+							<?php endforeach; ?>
+							</optgroup>
+						</select>
+						<?php echo form_error('mutter_bildungmax'); ?>
+					</div>
+				</div>
+				<br>
+				<h4><?php echo $this->p->t('uhstat', 'erziehungsberechtigtePersonZwei') ?></h4>
+				<div class="form-group">
+					<label for="vater_geburtsjahr" class="col-sm-3 control-label"><?php echo ucfirst($this->p->t('uhstat', 'geburtsjahr')) ?></label>
+					<div class="col-sm-9">
+						<select type="text" name="vater_geburtsjahr" id="vater_geburtsjahr" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['jahre'] as $jahr): ?>
+								<option
+									value="<?php echo $jahr ?>"
+									<?php echo $vater_geburtsjahr == $jahr ? " selected" : "" ?>>
+										<?php echo $jahr ?>
+									</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('vater_geburtsjahr'); ?>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="vater_geburtsstaat" class="col-sm-3 control-label">
+						<?php echo ucfirst($this->p->t('uhstat', 'geburtsstaat')) ?>
+						<br>
+						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+					</label>
+					<div class="col-sm-9">
+						<select type="text" name="vater_geburtsstaat" id="vater_geburtsstaat" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo $vater_geburtsstaat == $nation->nation_code ? " selected" : "" ?>>
+										<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('vater_geburtsstaat'); ?>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="vater_bildungsstaat" class="col-sm-3 control-label">
+						<?php echo $this->p->t('uhstat', 'hoechsterAbschlussStaat') ?>
+						<br>
+						<?php echo '('.ucfirst($this->p->t('uhstat', 'inDenHeutigenGrenzen')).')' ?>
+					</label>
+					<div class="col-sm-9">
+						<select type="text" name="vater_bildungsstaat" id="vater_bildungsstaat" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<?php foreach ($formMetaData['nation'] as $nation): ?>
+								<option
+									value="<?php echo $nation->nation_code ?>"
+									<?php echo $vater_bildungsstaat == $nation->nation_code ? " selected" : "" ?>>
+										<?php echo $nation->nation_text ?>
+								</option>
+							<?php endforeach; ?>
+						</select>
+						<?php echo form_error('vater_bildungsstaat'); ?>
+					</div>
+				</div>
+				<div class="form-group">
+					<label for="vater_bildungmax" class="col-sm-3 control-label">
+						<?php echo ucfirst($this->p->t('uhstat', 'hoechsterAbschluss')) ?>
+					</label>
+					<div class="col-sm-9">
+						<select type="text" name="vater_bildungmax" id="vater_bildungmax" class="form-control" <?php echo $disabled ?>>
+							<option disabled selected value=""><?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?></option>
+							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussInOesterreich') ?>">
+								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+							<?php foreach ($formMetaData['abschluss_oesterreich'] as $abschluss): ?>
+								<option
+									value="<?php echo $abschluss->ausbildung_code ?>"
+									<?php echo $vater_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $abschluss->bezeichnung ?>
+								</option>
+							<?php endforeach; ?>
+							</optgroup>
+							<optgroup label="<?php echo $this->p->t('uhstat', 'wennAbschlussNichtInOesterreich') ?>">
+								<?php echo $this->p->t('uhstat', 'bitteAuswaehlen') ?>
+							<?php foreach ($formMetaData['abschluss_nicht_oesterreich'] as $abschluss): ?>
+								<option
+									value="<?php echo $abschluss->ausbildung_code ?>"
+									<?php echo $vater_bildungmax == $abschluss->ausbildung_code ? " selected" : "" ?>>
+									<?php echo $abschluss->bezeichnung ?>
+								</option>
+							<?php endforeach; ?>
+							</optgroup>
+						</select>
+						<?php echo form_error('vater_bildungmax'); ?>
+					</div>
+				</div>
+			</fieldset>
+			<?php if ($editPermission && !$readOnly): ?>
+				<br>
+				<fieldset>
+					<div class="form-group">
+						<div class="col-sm-12 text-right">
+							<button class="btn btn-success btn-md" type="submit" id="uhstat1Submit">
+								<?php echo $this->p->t('uhstat', 'pruefenUndSpeichern') ?>
+							</button>
+						</div>
+					</div>
+				</fieldset>
+			<?php endif; ?>
+		</form>
+		<?php if ($deletePermission && !$readOnly): ?>
+			<form class="form-horizontal" method="POST" action="<?php echo site_url('codex/UHSTAT1/deleteUHSTAT1Data') ?>" id="uhstat1DeleteForm">
+				<input type='hidden' id='person_id' name='person_id' value='<?php echo $formMetaData['person_id'] ?>' />
+				<div class="form-group">
+					<div class="col-sm-12">
+						<button class="btn btn-danger btn-md" type="submit" id="uhstat1Delete">
+							<?php echo $this->p->t('uhstat', 'datenLoeschen') ?>
+						</button>
+					</div>
+				</div>
+			</form>
+		<?php endif; ?>
+	</div>
 </div>
 
 <?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/public/js/codex/uhstat1.js b/public/js/codex/uhstat1.js
index e5e51b09d..78eeddefd 100644
--- a/public/js/codex/uhstat1.js
+++ b/public/js/codex/uhstat1.js
@@ -4,7 +4,7 @@
 $(document).ready(function ()
 {
 	window.setTimeout(function() {
-		$("#success-alert_uhstat1").fadeTo(500, 0).slideUp(500, function(){
+		$("#uhstat_success_alert").fadeTo(500, 0).slideUp(500, function(){
 			$(this).remove();
 		});
 	}, 1000);
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 75cfb0179..8acdffca7 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18522,6 +18522,66 @@ array(
 				'insertvon' => 'system'
 			)
 		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'datenLoeschen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Daten löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete data',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'erfolgreichGeloescht',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Erfolgreich gelöscht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Deleted successfully',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'uhstat',
+		'phrase' => 'datenLoeschen',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Daten löschen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Delete data',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
 	)
 );
 

From e78440094327667abddd26ad2d6f3ebed875c879 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Wed, 16 Aug 2023 01:21:05 +0200
Subject: [PATCH 108/175] uhstat1 data save: added uid

---
 application/controllers/codex/UHSTAT1.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index 4586345eb..8525564b2 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -10,6 +10,7 @@ class UHSTAT1 extends FHC_Controller
 	const LOWER_BOUNDARY_YEARS = 160;
 	const UPPER_BOUNDARY_YEARS = 20;
 
+	private $_uid;
 	private $_uhstat1Fields = array();
 
 	public function __construct()
@@ -40,6 +41,8 @@ class UHSTAT1 extends FHC_Controller
 			)
 		);
 
+		$this->_uid = getAuthUID();
+
 		// set form field information
 		$this->_uhstat1Fields = array(
 			'mutter_geburtsstaat' => array('name' => 'Geburtsstaat Mutter'),
@@ -141,6 +144,8 @@ class UHSTAT1 extends FHC_Controller
 			// if yes, update
 			if (hasData($uhstat1datenloadRes))
 			{
+				$uhstatData['updateamum'] = 'NOW()';
+				$uhstatData['updatevon'] = $this->_uid;
 				$uhstat1datenRes = $this->Uhstat1datenModel->update(
 					array('person_id' => $person_id),
 					$uhstatData

From b8aadab50958146716ed2f589fb5d8984c7101f0 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Wed, 16 Aug 2023 11:12:09 +0200
Subject: [PATCH 109/175] UHSTAT1 form: add insertamum and insertvon when
 inserting data

---
 application/controllers/codex/UHSTAT1.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index 8525564b2..0795959c7 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -153,6 +153,8 @@ class UHSTAT1 extends FHC_Controller
 			}
 			else // otherwise insert
 			{
+				$uhstatData['insertamum'] = 'NOW()';
+				$uhstatData['insertvon'] = $this->_uid;
 				$uhstat1datenRes = $this->Uhstat1datenModel->insert(
 					array_merge($uhstatData, array('person_id' => $person_id))
 				);

From fab1022c491cc54ea14761cc0112e115f72c3fb6 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Wed, 16 Aug 2023 17:40:00 +0200
Subject: [PATCH 110/175] tbl_uhstat1daten: added primary key, removed
 abgeschicktamum (instead: own sync table)

---
 ..._erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
index 2446651c2..2fbff6713 100644
--- a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
+++ b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
@@ -67,11 +67,11 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_uhstat1daten LIMIT 1'))
 				vater_geburtsjahr smallint,
 				vater_bildungmax integer,
 				person_id integer NOT NULL,
-				abgeschicktamum timestamp without time zone,
 				insertamum timestamp without time zone DEFAULT now(),
 				insertvon character varying(32),
 				updateamum timestamp without time zone,
-				updatevon character varying(32)
+				updatevon character varying(32),
+				CONSTRAINT pk_tbl_uhstat1daten PRIMARY KEY (uhstat1daten_id)
 			);
 
 			ALTER TABLE bis.tbl_uhstat1daten ADD CONSTRAINT fk_tbl_uhstat1daten_mutter_geburtsstaat FOREIGN KEY (mutter_geburtsstaat)
@@ -113,7 +113,6 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_uhstat1daten LIMIT 1'))
 			COMMENT ON COLUMN bis.tbl_uhstat1daten.vater_bildungsstaat IS 'Education country of father of person';
 			COMMENT ON COLUMN bis.tbl_uhstat1daten.vater_geburtsjahr IS 'Birth year of father of person';
 			COMMENT ON COLUMN bis.tbl_uhstat1daten.vater_bildungmax IS 'Highest completed level of education of father (code)';
-			COMMENT ON COLUMN bis.tbl_uhstat1daten.abgeschicktamum IS 'Date and time UHSTAT1 data was sent';
 
 			GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_uhstat1daten TO web;
 			GRANT SELECT, UPDATE, INSERT, DELETE ON bis.tbl_uhstat1daten TO vilesci;

From fcd3733f3c31afdf7472eda0a0b0dd78e5dcb365 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 17 Aug 2023 09:12:30 +0200
Subject: [PATCH 111/175] AbmeldungStgl GrundDropdown

---
 .../controllers/lehre/Studierendenantrag.php  |   2 +-
 .../Studierendenantrag/Form/AbmeldungStgl.js  | 175 +++++++++++-
 .../Studierendenantrag/Leitung/Actions/New.js |   2 +-
 system/phrasesupdate.php                      | 259 ++++++++++++++++++
 4 files changed, 431 insertions(+), 7 deletions(-)

diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
index c0ac284b3..482216518 100644
--- a/application/controllers/lehre/Studierendenantrag.php
+++ b/application/controllers/lehre/Studierendenantrag.php
@@ -129,7 +129,7 @@ class Studierendenantrag extends FHC_Controller
 		]);
 	}
 
-	public function abmeldungstgl($prestudent_id, $studierendenantrag_id)
+	public function abmeldungstgl($prestudent_id, $studierendenantrag_id = null)
 	{
 		$this->load->view('lehre/Antrag/Create', [
 			'prestudent_id' => $prestudent_id,
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 7665c7353..8dd527a9e 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -13,11 +13,17 @@ export default {
 		'setStatus'
 	],
 	props: {
+		prestudentId: Number,
 		studierendenantragId: Number
 	},
 	data() {
 		return {
-			data: null
+			data: null,
+			saving: false,
+			errors: {
+				grund: [],
+				default: []
+			}
 		}
 	},
 	computed: {
@@ -28,6 +34,13 @@ export default {
 				case 'Genehmigt': return 'success';
 				default: return 'info';
 			}
+		},
+		loadUrl() {
+			if (this.studierendenantragId)
+				return '/components/Antrag/Abmeldung/getDetailsForAntrag/'+
+					this.studierendenantragId;
+			return '/components/Antrag/Abmeldung/getDetailsForNewAntrag/' +
+				this.prestudentId;
 		}
 	},
 	methods: {
@@ -35,8 +48,7 @@ export default {
 			return axios.get(
 				FHC_JS_DATA_STORAGE_OBJECT.app_root +
 				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
-				'/components/Antrag/Abmeldung/getDetailsForAntrag/' +
-				this.studierendenantragId
+				this.loadUrl
 			).then(
 				result => {
 					this.data = result.data.retval;
@@ -49,7 +61,75 @@ export default {
 					return result;
 				}
 			);
-		}
+		},
+		createAntrag() {
+			bootstrap.Modal.getOrCreateInstance(this.$refs.modal).hide();
+			this.$emit('setStatus', {
+				msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_saving')}),
+				severity: 'warning'
+			});
+			this.saving = true;
+			for(var k in this.errors)
+				this.errors[k] = [];
+			axios.post(
+				FHC_JS_DATA_STORAGE_OBJECT.app_root +
+				FHC_JS_DATA_STORAGE_OBJECT.ci_router +
+				'/components/Antrag/Abmeldung/createAntrag/', {
+					studiensemester: this.data.studiensemester_kurzbz,
+					prestudent_id: this.data.prestudent_id,
+					grund: this.$refs.grund.value
+				}
+			).then(
+				result => {
+					if (result.data.error)
+					{
+						for (var k in result.data.retval)
+						{
+							if (this.errors[k] !== undefined)
+								this.errors[k].push(result.data.retval[k]);
+							else
+								this.errors.default.push(result.data.retval[k]);
+						}
+						this.$emit('setStatus', {
+							msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_error')}),
+							severity: 'danger'
+						});
+					}
+					else
+					{
+						if (result.data.retval === true)
+							document.location += "";
+						this.data = result.data.retval;
+						if (this.data.status) {
+							this.$emit("setStatus", {
+								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.data.statustyp}),
+								severity: this.statusSeverity
+							});
+						}
+						else
+							this.$emit('setStatus', {
+								msg: this.p.t_ref('studierendenantrag', 'status_x', {status: this.p.t('studierendenantrag', 'status_open')}),
+								severity:'success'
+							});
+					}
+					this.saving = false;
+				}
+			);
+		},
+		appendDropDownText(event){
+			let templateText = this.$refs.grund;
+
+			if(event.target.value)
+			{
+				let templateT= this.p.t('studierendenantrag', event.target.value);
+				templateText.value = templateT;
+			}
+			else
+				templateText.value = '';
+		},
+	},
+	created() {
+		this.uuid = _uuid++;
 	},
 	template: `
 	<div class="studierendenantrag-form-abmeldung">
@@ -83,11 +163,96 @@ export default {
 						</tr>
 					</table>
 				</div>
-				<div class="mb-3">
+
+				<div v-if="data.grund" class="mb-3">
 					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
+									
+					<div class="mb-3">
+					<h5>if data grund:</h5>
 					<pre>{{data.grund}}</pre>
 				</div>
+				
+					<pre>{{data.grund}}</pre>
+				</div>      
+				<div v-else class="col-sm-6 mb-3">
+					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-grund'" class="form-label">Grund:</label>
+					<div class="mb-2">
+						<select name="grundAv" @change="appendDropDownText
+							($event)">
+							<option value="" > --- bitte auswählen, sofern zutreffend ---- </option>
+							<option value="textLong_NichtantrittStudium">{{p.t('studierendenantrag', 'dropdown_NichtantrittStudium')}}
+							</option>
+							<option value="textLong_ungenuegendeLeistung">{{p.t('studierendenantrag', 'dropdown_ungenuegendeLeistung')}}
+							</option>
+							<option value="textLong_studentNichtAnwesend">{{p.t('studierendenantrag', 'dropdown_nichtAnwesend')}}
+							</option>
+							<option value="textLong_PruefunstermineNichtEingehalten">{{p.t('studierendenantrag', 'dropdown_PruefunstermineNichtEingehalten')}}
+							</option>
+							<option value="textLong_studentNichtGezahlt">{{p.t('studierendenantrag', 'dropdown_nichtGezahlt')}}
+							</option>
+							<option value="textLong_plageat">{{p.t('studierendenantrag', 'dropdown_plageat')}}
+							</option>					
+						</select>	
+					</div>			
+					<textarea
+						class="form-control"
+						:class="{'is-invalid': errors.grund.length}"
+						:id="'studierendenantrag-form-abmeldung-' + uuid + '-grund'"
+						rows="5"
+						:disabled="saving"
+						ref="grund"
+						required
+						></textarea>
+					<div v-if="errors.grund.length" class="invalid-feedback">
+						{{errors.grund.join(".")}}
+					</div>
+				</div>
+				
+				<div class="col-12 text-end">
+					<button
+						v-else-if="!data.studierendenantrag_id"
+						type="button"
+						class="btn btn-primary"
+						data-bs-toggle="modal"
+						:data-bs-target="'#studierendenantrag-form-abmeldung-' + uuid + '-modal'"
+						:disabled="saving"
+						>
+						{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+					</button>
+					<div
+						ref="modal"
+						class="modal fade text-start"
+						:id="'studierendenantrag-form-abmeldung-' + uuid + '-modal'"
+						tabindex="-1"
+						:aria-labelledby="'studierendenantrag-form-abmeldung-' + uuid + '-modal-label'"
+						aria-hidden="true">
+						<div class="modal-dialog">
+							<div class="modal-content">
+								<div class="modal-header">
+									<h5
+										class="modal-title"
+										:id="'studierendenantrag-form-abmeldung-' + uuid + '-modal-label'"
+										>
+										{{p.t('studierendenantrag', 'title_Abmeldung')}}
+									</h5>
+									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui', 'schliessen')"></button>
+								</div>
+								<div class="modal-body" v-html="p.t('studierendenantrag', 'warning_Abmeldung')">
+								</div>
+								<div class="modal-footer">
+									<button
+										type="button"
+										class="btn btn-primary"
+										@click="createAntrag">
+										{{p.t('studierendenantrag', 'btn_create_Abmeldung')}}
+									</button>
+								</div>
+							</div>
+						</div>
+					</div>
+				</div>
 			</div>
+			
 			<template v-slot:error="{errorMessage}">
 				<div class="alert alert-danger m-0" role="alert">
 					{{ errorMessage }}
diff --git a/public/js/components/Studierendenantrag/Leitung/Actions/New.js b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
index 7fca9a029..ad3009bdb 100644
--- a/public/js/components/Studierendenantrag/Leitung/Actions/New.js
+++ b/public/js/components/Studierendenantrag/Leitung/Actions/New.js
@@ -22,7 +22,7 @@ export default {
 	},
 	computed: {
 		newUrl() {
-			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/lehre/Studierendenantrag/abmeldung/' + this.student.prestudent_id;
+			return FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router + '/lehre/Studierendenantrag/abmeldungStgl/' + this.student.prestudent_id;
 		}
 	},
 	methods: {
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 0a618645a..c5594d178 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20766,6 +20766,265 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_studentNichtGezahlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Nichterfüllung finanzieller Verpflichtungen trotz Mahnung (Studienbeitrag)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): Failure to meet financial obligations despite a reminder (tuition fees)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_studentNichtAnwesend',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): mehrmalig unentschuldigtes Verletzen der Anwesenheitspflicht',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): multiple unexcused breaches of attendance requirements',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_PruefunstermineNichtEingehalten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): wiederholtes Nichteinhalten von Prüfungsterminen bzw Abgabeterminen für Seminararbeiten bzw. Projektarbeiten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): repeated non-compliance with examination dates or deadlines for seminar papers or project work',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_plageat',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Plagiieren im Rahmen wissenschaftlicher Arbeiten bzw. unerlaubte Verwendung KI generierter Hilfsmittel bzw. Quellen',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): Plagiarism in the context of scientific work or unauthorized use of AI-generated tools or sources',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_ungenuegendeLeistung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): nicht genügende Leistung im Sinne der Prüfungsordnung',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): insufficient performance in terms of the examination regulations',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'textLong_NichtantrittStudium',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Nichtantritt des Studiums zu Beginn des Studienjahres (=Unbegründetes Nichterscheinen zur ersten Studienveranstaltung)',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): Failure to start the course at the beginning of the academic year (= unjustified non-attendance to the first course event)',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_nichtGezahlt',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student*in hat nicht bezahlt',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student has not paid',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_nichtAnwesend',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student*in war mehrmals unentschuldigt abwesend',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student was absent without excuse several times',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_PruefunstermineNichtEingehalten',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student*in hat Prüfunstermine nicht eingehalten',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student failed to meet exam dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_plageat',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Student*in hat plagiiert',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Student failed to meet exam dates',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_ungenuegendeLeistung',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Leistung ungenügend',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'performance insufficient',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_NichtantrittStudium',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Nichtantritt des Studiums',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'non-commencement of the course',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'dropdown_bitteWaehlen',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'bitte auswählen, sofern zutreffend',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'please select if applicable',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 );
 
 

From 9aa5f701f75da5b3790567a0093d8f98616af80a Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 17 Aug 2023 09:24:15 +0200
Subject: [PATCH 112/175] phrasenupdate

---
 system/phrasesupdate.php | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index c5594d178..facf0d2d5 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20774,13 +20774,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Nichterfüllung finanzieller Verpflichtungen trotz Mahnung (Studienbeitrag)',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nNichterfüllung finanzieller Verpflichtungen trotz Mahnung (Studienbeitrag)',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): Failure to meet financial obligations despite a reminder (tuition fees)',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nFailure to meet financial obligations despite a reminder (tuition fees)',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20794,13 +20794,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): mehrmalig unentschuldigtes Verletzen der Anwesenheitspflicht',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nmehrmalig unentschuldigtes Verletzen der Anwesenheitspflicht',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): multiple unexcused breaches of attendance requirements',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nmultiple unexcused breaches of attendance requirements',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20814,13 +20814,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): wiederholtes Nichteinhalten von Prüfungsterminen bzw Abgabeterminen für Seminararbeiten bzw. Projektarbeiten',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nwiederholtes Nichteinhalten von Prüfungsterminen bzw Abgabeterminen für Seminararbeiten bzw. Projektarbeiten',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): repeated non-compliance with examination dates or deadlines for seminar papers or project work',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nrepeated non-compliance with examination dates or deadlines for seminar papers or project work',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20834,13 +20834,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Plagiieren im Rahmen wissenschaftlicher Arbeiten bzw. unerlaubte Verwendung KI generierter Hilfsmittel bzw. Quellen',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nPlagiieren im Rahmen wissenschaftlicher Arbeiten bzw. unerlaubte Verwendung KI generierter Hilfsmittel bzw. Quellen',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): Plagiarism in the context of scientific work or unauthorized use of AI-generated tools or sources',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nPlagiarism in the context of scientific work or unauthorized use of AI-generated tools or sources',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20854,13 +20854,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): nicht genügende Leistung im Sinne der Prüfungsordnung',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nnicht genügende Leistung im Sinne der Prüfungsordnung',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): insufficient performance in terms of the examination regulations',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): \ninsufficient performance in terms of the examination regulations',
 				'description' => '',
 				'insertvon' => 'system'
 			)
@@ -20874,13 +20874,13 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): Nichtantritt des Studiums zu Beginn des Studienjahres (=Unbegründetes Nichterscheinen zur ersten Studienveranstaltung)',
+				'text' => 'Ausschlußgrund gemäß Ausbildungsvertrag (Punkt 7.4): \nNichtantritt des Studiums zu Beginn des Studienjahres (=Unbegründetes Nichterscheinen zur ersten Studienveranstaltung)',
 				'description' => '',
 				'insertvon' => 'system'
 			),
 			array(
 				'sprache' => 'English',
-				'text' => 'Reason for exclusion according to the training contract (point 7.4): Failure to start the course at the beginning of the academic year (= unjustified non-attendance to the first course event)',
+				'text' => 'Reason for exclusion according to the training contract (point 7.4): \nFailure to start the course at the beginning of the academic year (= unjustified non-attendance to the first course event)',
 				'description' => '',
 				'insertvon' => 'system'
 			)

From 95e885989604b877c8d8e454facc434b978373eb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 17 Aug 2023 09:50:01 +0200
Subject: [PATCH 113/175] Bug Hotfix

---
 application/libraries/AntragLib.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 97617231d..f9e54b757 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1255,13 +1255,14 @@ class AntragLib
 		$where = [
 			'prestudent_id' => $prestudent_id
 		];
+		$types = null;
 		if ($typ) {
 			if (is_array($typ))
-				$this->_ci->StudierendenantragModel->db->where_in('typ', $typ);
+				$types = $typ;
 			else
 				$where['typ'] = $typ;
 		}
-		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere($where);
+		$result = $this->_ci->StudierendenantragModel->loadWithStatusWhere($where, $types);
 		if (isError($result))
 			return $result;
 

From 672ee59ba527df76b853b01db05d24746fb88feb Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 17 Aug 2023 10:34:28 +0200
Subject: [PATCH 114/175] =?UTF-8?q?neuer=20Hinweistext=20mit=20Einspruchsf?=
 =?UTF-8?q?rist=20f=C3=BCr=20Abmeldung=20Stgl?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 public/css/Fhc.css                            |  4 ++++
 .../Studierendenantrag/Form/AbmeldungStgl.js  | 13 +++++-------
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 3 files changed, 29 insertions(+), 8 deletions(-)

diff --git a/public/css/Fhc.css b/public/css/Fhc.css
index 2c3491767..23c2379ea 100644
--- a/public/css/Fhc.css
+++ b/public/css/Fhc.css
@@ -1,3 +1,7 @@
+.text-prewrap {
+  white-space: pre-line;
+}
+
 .accordion-button-primary {
   background-color: #e7f1ff;
   color: #0c63e4;
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 8dd527a9e..48ee4f772 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -1,6 +1,8 @@
 import {CoreFetchCmpt} from '../../Fetch.js';
 import Phrasen from '../../../mixins/Phrasen.js';
 
+var _uuid = 0;
+
 export default {
 	components: {
 		CoreFetchCmpt
@@ -166,13 +168,8 @@ export default {
 
 				<div v-if="data.grund" class="mb-3">
 					<h5>{{p.t('studierendenantrag', 'antrag_grund')}}:</h5>
-									
-					<div class="mb-3">
-					<h5>if data grund:</h5>
-					<pre>{{data.grund}}</pre>
-				</div>
 				
-					<pre>{{data.grund}}</pre>
+					<pre class="text-prewrap">{{data.grund}}</pre>
 				</div>      
 				<div v-else class="col-sm-6 mb-3">
 					<label :for="'studierendenantrag-form-abmeldung-' + uuid + '-grund'" class="form-label">Grund:</label>
@@ -210,7 +207,7 @@ export default {
 				
 				<div class="col-12 text-end">
 					<button
-						v-else-if="!data.studierendenantrag_id"
+						v-if="!data.studierendenantrag_id"
 						type="button"
 						class="btn btn-primary"
 						data-bs-toggle="modal"
@@ -237,7 +234,7 @@ export default {
 									</h5>
 									<button type="button" class="btn-close" data-bs-dismiss="modal" :aria-label="p.t('ui', 'schliessen')"></button>
 								</div>
-								<div class="modal-body" v-html="p.t('studierendenantrag', 'warning_Abmeldung')">
+								<div class="modal-body" v-html="p.t('studierendenantrag', 'warning_AbmeldungStgl')">
 								</div>
 								<div class="modal-footer">
 									<button
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index facf0d2d5..65345aed1 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18565,6 +18565,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'warning_AbmeldungStgl',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Bitte beachten Sie die Einspruchsfrist von 2 Wochen nach Bestätigung durch die Studiengangsleitung!',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'Please note the objection period of 2 weeks after confirmation by the head of the degree program!',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From c7d2608cce2b50c45d3f83076ebf9eead151d23f Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 17 Aug 2023 11:10:09 +0200
Subject: [PATCH 115/175] =?UTF-8?q?Adaptierung=20Buttons:=20Zur=C3=BCckzie?=
 =?UTF-8?q?hen=20Stgl=20und=20Ausblenden=20Antr=C3=A4ge=20STGL=20nicht=20g?=
 =?UTF-8?q?enehmigt=20Studentview?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/lehre/Studierendenantrag.php      | 3 +++
 application/models/education/Studierendenantrag_model.php | 1 +
 public/js/components/Studierendenantrag/Leitung/Table.js  | 2 +-
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
index 482216518..a7c818920 100644
--- a/application/controllers/lehre/Studierendenantrag.php
+++ b/application/controllers/lehre/Studierendenantrag.php
@@ -67,6 +67,9 @@ class Studierendenantrag extends FHC_Controller
 			}
 			if ($antrag->studierendenantrag_id == null)
 				continue;
+			if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG_STGL && (!$antrag->isapproved))
+				continue;
+
 			$prestudentenArr[$antrag->prestudent_id]['antraege'][] = $antrag;
 		}
 
diff --git a/application/models/education/Studierendenantrag_model.php b/application/models/education/Studierendenantrag_model.php
index 13a60faac..e1b386f2e 100644
--- a/application/models/education/Studierendenantrag_model.php
+++ b/application/models/education/Studierendenantrag_model.php
@@ -188,6 +188,7 @@ class Studierendenantrag_model extends DB_Model
 		$this->addSelect($this->dbTable . '.datum_wiedereinstieg');
 		$this->addSelect($this->dbTable . '.grund');
 		$this->addSelect($this->dbTable . '.dms_id');
+		$this->addSelect("(SELECT count(1) FROM campus.tbl_studierendenantrag_status WHERE studierendenantrag_id = " . $this->dbTable . ".studierendenantrag_id AND studierendenantrag_statustyp_kurzbz = 'Genehmigt') AS isapproved", false);
 
 		$this->addJoin('public.tbl_prestudent p', 'prestudent_id', 'RIGHT');
 		$this->addJoin('public.tbl_studiengang stg', 'p.studiengang_kz=stg.studiengang_kz');
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index daadc5b3e..01ca0c1ed 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -274,7 +274,7 @@ export default {
 							container.append(button);
 						}
 						// NOTE(chris): Cancel
-						if (data.typ == 'AbmeldungStgl' && data.status == 'Erstellt') {
+						if (data.typ == 'AbmeldungStgl' && (data.status == 'Erstellt' || data.status == 'Genehmigt' )) {
 							let button = document.createElement('button');
 							button.innerHTML = this.p.t('studierendenantrag', 'btn_cancel');
 							button.className = "btn btn-outline-secondary";

From 743ba8314839999bc44118d0d4b490713ef5807b Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 17 Aug 2023 11:18:51 +0200
Subject: [PATCH 116/175] Anzeige Studiensemester Abmeldung

---
 public/js/components/Studierendenantrag/Form/Abmeldung.js     | 4 ++++
 public/js/components/Studierendenantrag/Form/AbmeldungStgl.js | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/public/js/components/Studierendenantrag/Form/Abmeldung.js b/public/js/components/Studierendenantrag/Form/Abmeldung.js
index 7018237fb..ba6a054ad 100644
--- a/public/js/components/Studierendenantrag/Form/Abmeldung.js
+++ b/public/js/components/Studierendenantrag/Form/Abmeldung.js
@@ -201,6 +201,10 @@ export default {
 						<tr>
 							<th>{{p.t('lehre', 'studienjahr')}}</th>
 							<td align="right">{{data.studienjahr_kurzbz}}</td>
+						</tr>						
+						<tr>
+							<th>{{p.t('lehre', 'studiensemester')}}</th>
+							<td align="right">{{data.studiensemester_kurzbz}}</td>
 						</tr>
 						<tr>
 							<th>{{p.t('lehre', 'semester')}}</th>
diff --git a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
index 48ee4f772..3524bcd1f 100644
--- a/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
+++ b/public/js/components/Studierendenantrag/Form/AbmeldungStgl.js
@@ -159,6 +159,10 @@ export default {
 							<th>{{p.t('lehre', 'studienjahr')}}</th>
 							<td align="right">{{data.studienjahr_kurzbz}}</td>
 						</tr>
+						<tr>
+							<th>{{p.t('lehre', 'studiensemester')}}</th>
+							<td align="right">{{data.studiensemester_kurzbz}}</td>
+						</tr>
 						<tr>
 							<th>{{p.t('lehre', 'semester')}}</th>
 							<td align="right">{{data.semester}}</td>

From 70aa0a9c9c418b6c81cd22bbb7f5842f86abd784 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 17 Aug 2023 13:18:06 +0200
Subject: [PATCH 117/175] neue Mail an Assistenz: AbbrecherStgl

---
 application/config/studierendenantrag.php  |  2 +-
 application/controllers/jobs/AntragJob.php | 34 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
index 786256a82..159ead759 100644
--- a/application/config/studierendenantrag.php
+++ b/application/config/studierendenantrag.php
@@ -104,7 +104,7 @@ $config['digitalization_start'] = '2022-07-01';
  * @var string           A string formated as PHP DateTime modifier
  * @see https://www.php.net/manual/de/datetime.modify.php
  */
-$config['abmeldung_job_deadline_date_modifier'] = '+3 weeks';
+$config['abmeldung_job_deadline_date_modifier'] = '+2 weeks';
 
 
 
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index f932a420c..23e1e61e6 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -323,6 +323,8 @@ class AntragJob extends JOB_Controller
 		$this->StudierendenantragModel->addSelect('studiensemester_kurzbz');
 		$this->StudierendenantragModel->addSelect('s.insertamum');
 
+		$this->StudierendenantragModel->db->where_in('public.get_rolle_prestudent(prestudent_id, studiensemester_kurzbz)', $this->config->item('antrag_prestudentstatus_whitelist'));
+
 		$result = $this->StudierendenantragModel->getWithLastStatusWhere([
             'typ' => Studierendenantrag_model::TYP_ABMELDUNG_STGL,
             'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
@@ -350,7 +352,39 @@ class AntragJob extends JOB_Controller
 				if (isError($result))
 					$this->logError(getError($result));
 				else
+				{
 					$count++;
+					$result = $this->PrestudentModel->load($antrag->prestudent_id);
+					if(!hasData($result)) {
+						$this->logWarning('No Prestudent found');
+						continue;
+					}
+					$prestudent = current(getData($result));
+					$result = $this->StudiengangModel->load($prestudent->studiengang_kz);
+					if(!hasData($result)) {
+						$this->logWarning('No Studiengang found');
+						continue;
+					}
+					$studiengang = current(getData($result));
+					$result = $this->PersonModel->loadPrestudent($antrag->prestudent_id);
+					if(!hasData($result))
+					{
+						$this->logWarning('No Person found');
+						continue;
+					}
+					$person = current(getData($result));
+					$email = $studiengang->email;
+					$dataMail = array(
+						'prestudent' => $antrag->prestudent_id,
+						'studiensemester' => $antrag->studiensemester_kurzbz,
+						'name' => trim($person->vorname . ' '. $person->nachname),
+					);
+
+					if(!sendSanchoMail('Sancho_Mail_Antrag_A_Assist', $dataMail, $email, 'Einspruchsfrist abgelaufen'))
+					{
+						$this->logWarning("Failed to send Notification to " . $email);
+					}
+				}
 			}
 			$this->logInfo($count . " Students set to Abbrecher");
 		}

From 1d938ea33d78f42c04f030f3e0af1dea793f8781 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 17 Aug 2023 13:46:58 +0200
Subject: [PATCH 118/175] Anzeige following Studiensemester Wiedereinstieg

---
 application/libraries/AntragLib.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index f9e54b757..a026ce19f 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1358,7 +1358,11 @@ class AntragLib
 		$currSemester = current(getData($result));
 		$followingSemester = [$currSemester];
 
-		for ($i = 0; $i < 3; $i++) {
+		$max = $this->_ci->config->item('unterbrecher_semester_max_length');
+		if(!$max || $max < 1)
+			$max = 2;
+
+		for ($i = 1; $i < $max; $i++) {
 			$result = $this->_ci->StudiensemesterModel->getNextFrom($currSemester->studiensemester_kurzbz);
 			if (!hasData($result))
 				break;
@@ -1371,6 +1375,9 @@ class AntragLib
 			'wiedereinstieg' => $followingSemester
 		];
 
+		//remove last Semester of the array
+		array_pop($followingSemester);
+
 		foreach ($followingSemester as $sem)
 			$semester[0]['wiedereinstieg'][] = $sem;
 

From 4a505631de0ed3015ef223fd676ff48676c94cb0 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 17 Aug 2023 13:54:34 +0200
Subject: [PATCH 119/175] Kein Verzicht bei Wiederholung

---
 public/js/components/Studierendenantrag/Form/Wiederholung.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Form/Wiederholung.js b/public/js/components/Studierendenantrag/Form/Wiederholung.js
index ff37540bb..336441dda 100644
--- a/public/js/components/Studierendenantrag/Form/Wiederholung.js
+++ b/public/js/components/Studierendenantrag/Form/Wiederholung.js
@@ -192,7 +192,7 @@ export default {
 					>
 						{{p.t('studierendenantrag/antrag_Wiederholung_button_yes')}}
 					</button>
-					<button
+<!--					<button
 						v-if="!data.studierendenantrag_id || data.status == 'Offen'"
 						type="button"
 						class="btn btn-danger"
@@ -200,7 +200,7 @@ export default {
 						:disabled="saving"
 					>
 						{{p.t('studierendenantrag/antrag_Wiederholung_button_no')}}
-					</button>
+					</button>-->
 				</div>
 			</div>
 			<template v-slot:error="{errorMessage}">

From 376ce0e44053cd737a8a14b9126cba6390cf531d Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 17 Aug 2023 14:13:30 +0200
Subject: [PATCH 120/175] WH: nur positive Noten bei intern angerechnet
 zulassen

---
 .../education/Studierendenantraglehrveranstaltung_model.php    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/application/models/education/Studierendenantraglehrveranstaltung_model.php b/application/models/education/Studierendenantraglehrveranstaltung_model.php
index 9445b8cf8..47a07ecfe 100644
--- a/application/models/education/Studierendenantraglehrveranstaltung_model.php
+++ b/application/models/education/Studierendenantraglehrveranstaltung_model.php
@@ -70,6 +70,7 @@ class Studierendenantraglehrveranstaltung_model extends DB_Model
 			'z.lehrveranstaltung_id=lv.lehrveranstaltung_id AND z.student_uid=s.student_uid AND z.studiensemester_kurzbz=a.studiensemester_kurzbz',
 			'LEFT'
 		);
+		$this->addJoin('lehre.tbl_note zn', 'z.note = zn.note', 'LEFT');
 
 		return $this->loadWhere([
 			'ps.prestudent_id' => $prestudent_id,
@@ -77,7 +78,7 @@ class Studierendenantraglehrveranstaltung_model extends DB_Model
 			'stat.studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_APPROVED,
 			'n.note <> ' => 0,
 			$this->dbTable . '.studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'(n.note<>19 OR z.note IS NOT NULL)' => null
+			'(n.note<>19 OR (z.note IS NOT NULL AND zn.positiv))' => null
 		]);
 	}
 }

From b468f01d0e16c25ca335908485af59a8b1c0ad29 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Fri, 18 Aug 2023 11:34:38 +0200
Subject: [PATCH 121/175] =?UTF-8?q?Lv-zuweisung=20Breite=20vergr=C3=B6sser?=
 =?UTF-8?q?t,=20Prestudent=20Status=20Unterbrechungssemester=20vor=20Vorr?=
 =?UTF-8?q?=C3=BCckung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/libraries/PrestudentLib.php       | 39 +++++++++++++++----
 .../Studierendenantrag/Lvzuweisung.js         |  4 +-
 system/phrasesupdate.php                      | 22 ++++++++++-
 3 files changed, 55 insertions(+), 10 deletions(-)

diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 59cba0df1..5ce2cf8f0 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -32,6 +32,7 @@ class PrestudentLib
 		$this->_ci->load->model('organisation/Lehrverband_model', 'LehrverbandModel');
 		$this->_ci->load->model('education/Studentlehrverband_model', 'StudentlehrverbandModel');
 		$this->_ci->load->model('person/Benutzer_model', 'BenutzerModel');
+		$this->_ci->load->model('organisation/Studiengang_model', 'StudiengangModel');
 	}
 
 	public function setAbbrecher($prestudent_id, $studiensemester_kurzbz, $insertvon = null, $statusgrund_kurzbz = null, $datum = null, $bestaetigtam = null)
@@ -205,6 +206,7 @@ class PrestudentLib
 
 	public function setUnterbrecher($prestudent_id, $studiensemester_kurzbz, $studierendenantrag_id, $insertvon = null)
 	{
+		$ausbildungssemester_plus = 0;
 		if (!$insertvon)
 			$insertvon = getAuthUID();
 
@@ -213,14 +215,38 @@ class PrestudentLib
 			return $result;
 		$result = getData($result);
 		if (!$result) {
-			return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
-				'prestudent_id' => $prestudent_id,
-				'studiensemester_kurzbz' => $studiensemester_kurzbz
-			]));
+			//NOTE(manu): only valid if nextSemester focus max
+
+			$result = $this->_ci->PrestudentstatusModel->getLastStatus($prestudent_id);
+			if (isError($result))
+				return $result;
+			$result = getData($result);
+
+			//check if ausbildungssemester is last
+			$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent p', 'studiengang_kz');
+			$res = $this->_ci->StudiengangModel->loadWhere(['p.prestudent_id' => $prestudent_id]);
+			if(isError($res))
+				return $res;
+			if(!hasData($res))
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_stg_for_prestudent', [
+					'prestudent_id' => $prestudent_id
+				]));
+
+			$studiengang = current(getData($res));
+			$prestudent_status = current($result);
+			if($prestudent_status->ausbildungssemester + 1 < $studiengang->max_semester)
+				$ausbildungssemester_plus = 1;
+
+			if(!$result)
+			{
+				return error($this->_ci->p->t('studierendenantrag', 'error_no_prestudent_in_sem', [
+					'prestudent_id' => $prestudent_id,
+					'studiensemester_kurzbz' => $studiensemester_kurzbz
+				]));
+			}
 		}
 
 		$prestudent_status = current($result);
-
 		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id' => $prestudent_id]);
 
 		if (isError($result))
@@ -245,7 +271,7 @@ class PrestudentLib
 			'prestudent_id' => $prestudent_id,
 			'status_kurzbz' => Prestudentstatus_model::STATUS_UNTERBRECHER,
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
-			'ausbildungssemester' => $prestudent_status->ausbildungssemester,
+			'ausbildungssemester' => $prestudent_status->ausbildungssemester + $ausbildungssemester_plus,
 			'datum' => date('c'),
 			'insertvon' => $insertvon,
 			'insertamum' => date('c'),
@@ -256,7 +282,6 @@ class PrestudentLib
 			'anmerkung'=> 'Wiedereinstieg ' . $antrag->datum_wiedereinstieg
 		]);
 
-		//error try manu
 		if (isError($result))
 			return $result;
 
diff --git a/public/js/components/Studierendenantrag/Lvzuweisung.js b/public/js/components/Studierendenantrag/Lvzuweisung.js
index f70812209..376e266d3 100644
--- a/public/js/components/Studierendenantrag/Lvzuweisung.js
+++ b/public/js/components/Studierendenantrag/Lvzuweisung.js
@@ -225,7 +225,7 @@ export default {
 		);
 	},
 	template: `
-	<div class="col-sm-8">
+	<div class="col-sm-10">
 		<div ref="alertbox"></div>
 
 		<span class="d-flex justify-content-between h4">
@@ -244,7 +244,7 @@ export default {
 
 		<button type="button" @click="save" :disabled="isloading || disabled"  class="btn btn-primary my-3">{{p.t('studierendenantrag', 'btn_save_lvs')}}</button>
 	</div>
-	<div class="col-sm-4">
+	<div class="col-sm-2">
 		<studierendenantrag-status :msg="statusMsg" :severity="statusSeverity"></studierendenantrag-status>
 	</div>
 	`
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 65345aed1..c86d51d81 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -19934,7 +19934,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Kein Studiengang gefunden für Bakanntgabe #{id}',
+				'text' => 'Kein Studiengang gefunden für Bekanntgabe #{id}',
 				'description' => '',
 				'insertvon' => 'system'
 			),
@@ -20286,6 +20286,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'error_no_stg_for_prestudent',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Kein Studiengang für Prestudent #{prestudent_id} gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No course found for prestudent #{prestudent_id}',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From f9f0e238c64481857730c2c64fe7a53e4ab70f6f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 22 Aug 2023 10:58:23 +0200
Subject: [PATCH 122/175] - bug fix

---
 application/libraries/MailLib.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/libraries/MailLib.php b/application/libraries/MailLib.php
index dbbc22f08..60dd52342 100644
--- a/application/libraries/MailLib.php
+++ b/application/libraries/MailLib.php
@@ -182,6 +182,7 @@ class MailLib
 	{
 		if ($this->sended == $this->email_number_per_time_range)
 		{
+			$this->sended = 0;
 			sleep($this->email_time_range); // Wait!!!
 		}
 	}

From 8da161120fe7d2cf52103cec7b396a39ce62f5cb Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 22 Aug 2023 11:11:38 +0200
Subject: [PATCH 123/175] Abmeldung (Stg): Suche auch nach student_uid

---
 application/models/organisation/Studiengang_model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 8b7d93035..7ec99b5bf 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -599,6 +599,7 @@ class Studiengang_model extends DB_Model
 				$this->db->group_start();
 					$this->db->where('pers.vorname ILIKE', "%" . $q . "%");
 					$this->db->or_where('pers.nachname ILIKE', "%" . $q . "%");
+					$this->db->or_where('stud.student_uid ILIKE', "%" . $q . "%");
 					$this->db->or_where($this->dbTable . '.bezeichnung ILIKE', "%" . $q . "%");
 					if (is_numeric($q))
 						$this->db->or_where('p.prestudent_id', $q);

From b9bf2487c20f5666d1d9d2e1b7dd1899a8c9370d Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 22 Aug 2023 11:13:05 +0200
Subject: [PATCH 124/175] Stg-Ansicht: Status styled as link

Stg-Ansicht: Status styled as link
---
 .../models/organisation/Studiengang_model.php |  1 +
 .../Studierendenantrag/Leitung/Table.js       | 20 ++++++++++++-------
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 7ec99b5bf..ea8e59ebd 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -573,6 +573,7 @@ class Studiengang_model extends DB_Model
 		);
 		$this->addJoin('bis.tbl_orgform o', $this->dbTable . '.orgform_kurzbz=o.orgform_kurzbz');
 		$this->addJoin('public.tbl_person pers', 'person_id');
+		$this->addJoin('public.tbl_student stud', 'p.prestudent_id=stud.prestudent_id', 'LEFT');
 
 		$this->db->where_in($this->dbTable . '.studiengang_kz', $studiengang_kzs);
 		$this->db->where_in('ps.status_kurzbz', $this->config->item('antrag_prestudentstatus_whitelist'));
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 01ca0c1ed..8cbfdd9d7 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -147,6 +147,19 @@ export default {
 					valuesLookup: true,
 					clearable: true,
 					autocomplete: true,
+				},
+				formatter: (cell, formatterParams, onRendered) => {
+					let link = document.createElement('a');
+					link.href = "#";
+					link.innerHTML = cell.getValue();
+					link.addEventListener('click', e => {
+						e.preventDefault();
+						this.lastHistoryClickedId = cell.getData().studierendenantrag_id;
+						this.$refs.historyLoader.fetchData();
+						this.$refs.history.show();
+					});
+
+					return link;
 				}
 			}, {
 				field: 'matrikelnr',
@@ -338,13 +351,6 @@ export default {
 		this.table.on("rowSelectionChanged", data => {
 			this.$emit('update:selectedData', data);
 		});
-		this.table.on("cellClick", (e, cell) => {
-			if (cell.getColumn().getField() == 'statustyp') {
-				this.lastHistoryClickedId = cell.getData().studierendenantrag_id;
-				this.$refs.historyLoader.fetchData();
-				this.$refs.history.show();
-			}
-		});
 	},
 	template: `
 	<div class="studierendenantrag-leitung-table">

From 294bfeb2e4807bdf820fe992a3ab8c14aa7b1774 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 22 Aug 2023 11:18:05 +0200
Subject: [PATCH 125/175] Sancho Mail Antrag_W_Student Aufnahme der
 angerechneten bzw. neu zu absolvierenden LVs

---
 application/libraries/AntragLib.php | 32 ++++++++++++++++++++++++++++-
 system/phrasesupdate.php            | 20 ++++++++++++++++++
 2 files changed, 51 insertions(+), 1 deletion(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index a026ce19f..5d3560cbc 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1511,6 +1511,32 @@ class AntragLib
 		if (hasData($result)) {
 			$kontakt = current(getData($result));
 			$email = $kontakt->kontakt;
+
+			$sem_not_allowed = $sem_to_repeat = '';
+			$list_not_allowed = $list_to_repeat = $this->_ci->p->t('studierendenantrag', 'mail_part_error_no_lvs');
+
+			$result = $this->getLvsForAntrag($antrag_id);
+			if (hasData($result)) {
+				$lvs = getData($result);
+				foreach ($lvs as $semester => $lv_list) {
+					$lvs_filtered = array_filter($lv_list, function ($el) {
+						return $el->antrag_zugelassen;
+					});
+					if (substr($semester, 0, 1) == '1') {
+						$sem_not_allowed = substr($semester, 1);
+						$list_not_allowed = array_map(function ($el) {
+							return $el->bezeichnung . '(' . $el->lehrform_kurzbz . ')';
+						}, $lvs_filtered);
+						$list_not_allowed = '<ul><li>' . implode('</li><li>', $list_not_allowed) . '</li></ul>';
+					} else {
+						$sem_to_repeat = substr($semester, 1);
+						$list_to_repeat = array_map(function ($el) {
+							return $el->bezeichnung . '(' . $el->lehrform_kurzbz . ')';
+						}, $lvs_filtered);
+						$list_to_repeat = '<ul><li>' . implode('</li><li>', $list_to_repeat) . '</li></ul>';
+					}
+				}
+			}
 			
 			// NOTE(chris): Sancho mail
 			sendSanchoMail(
@@ -1520,7 +1546,11 @@ class AntragLib
 					'stg' => $stg->bezeichnung,
 					'sem' => $semester,
 					'mitarbeiter' => $mitarbeiter,
-					'name' => $student
+					'student' => $student,
+					'sem_not_allowed' => $sem_not_allowed,
+					'list_not_allowed' => $list_not_allowed,
+					'sem_to_repeat' => $sem_to_repeat,
+					'list_to_repeat' => $list_to_repeat
 				],
 				$email,
 				$this->_ci->p->t('studierendenantrag', 'mail_subject_W_Student')
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index c86d51d81..b395c3e74 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20746,6 +20746,26 @@ array(
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'studierendenantrag',
+		'phrase' => 'mail_part_error_no_lvs',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Keine Lehrveranstaltungen gefunden',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'No courses found',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From bf6fc52fcf095fd51af58e25ff5c5c58917d17f0 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 22 Aug 2023 11:18:35 +0200
Subject: [PATCH 126/175] Studierendenseite: Reihenfolge WH, Unterbrechung,
 Abmeldung; wording von du du auf indirekt

---
 application/controllers/lehre/Studierendenantrag.php | 9 +++++----
 system/phrasesupdate.php                             | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/controllers/lehre/Studierendenantrag.php b/application/controllers/lehre/Studierendenantrag.php
index a7c818920..fb0d17abb 100644
--- a/application/controllers/lehre/Studierendenantrag.php
+++ b/application/controllers/lehre/Studierendenantrag.php
@@ -53,17 +53,18 @@ class Studierendenantrag extends FHC_Controller
 					'bezeichnungStg' => $antrag->bezeichnung,
 					'bezeichnungOrgform' => $antrag->orgform
 				);
-				$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
+				
+				$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
 				if (getData($result) == 1)
-					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
 
 				$result = $this->antraglib->getPrestudentUnterbrechungsBerechtigt($antrag->prestudent_id);
 				if (getData($result) == 1)
 					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Unterbrechung';
 
-				$result = $this->antraglib->getPrestudentWiederholungsBerechtigt($antrag->prestudent_id);
+				$result = $this->antraglib->getPrestudentAbmeldeBerechtigt($antrag->prestudent_id);
 				if (getData($result) == 1)
-					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Wiederholung';
+					$prestudentenArr[$antrag->prestudent_id]['allowedNewTypes'][] = 'Abmeldung';
 			}
 			if ($antrag->studierendenantrag_id == null)
 				continue;
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b395c3e74..f66bdd177 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -20774,7 +20774,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Die Abmeldung vom Studium kannst du hier durchführen.',
+				'text' => 'Die Abmeldung vom Studium kann hier durchführt werden.',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From 754ed076210f6e8549d029eafeaa14f789ade4c8 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 22 Aug 2023 11:18:47 +0200
Subject: [PATCH 127/175] anzeige Lehrverband nach setUnterrbrecher im Fas

---
 application/libraries/PrestudentLib.php | 33 +++++++++++++++++++------
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/application/libraries/PrestudentLib.php b/application/libraries/PrestudentLib.php
index 5ce2cf8f0..279b6ed2a 100644
--- a/application/libraries/PrestudentLib.php
+++ b/application/libraries/PrestudentLib.php
@@ -376,17 +376,34 @@ class PrestudentLib
 		]);
 
 		//Studentlehrverband setzen
-		$this->_ci->StudentlehrverbandModel->update([
+		$result = $this->_ci->StudentlehrverbandModel->loadWhere([
 			'studiensemester_kurzbz' => $studiensemester_kurzbz,
 			'student_uid' => $student->student_uid
-		], [
-			'studiengang_kz' => $student->studiengang_kz,
-			'semester' => 0,
-			'verband' => 'B',
-			'gruppe' => '',
-			'updateamum' => date('c'),
-			'updatevon' => $insertvon
 		]);
+		if (hasData($result)) {
+			$this->_ci->StudentlehrverbandModel->update([
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'student_uid' => $student->student_uid
+			], [
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'updateamum' => date('c'),
+				'updatevon' => $insertvon
+			]);
+		} else {
+			$this->_ci->StudentlehrverbandModel->insert([
+				'student_uid' => $student->student_uid,
+				'studiensemester_kurzbz' => $studiensemester_kurzbz,
+				'studiengang_kz' => $student->studiengang_kz,
+				'semester' => 0,
+				'verband' => 'B',
+				'gruppe' => '',
+				'insertamum' => date('c'),
+				'insertvon' => $insertvon
+			]);
+		}
 
 		return success();
 	}

From e6be6e19d1be80e5051b91565fa7de26d676af79 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 22 Aug 2023 11:30:54 +0200
Subject: [PATCH 128/175] Abmeldung PDF-Vorlage: Studiensemester added

---
 rdf/AntragAbmeldung.xml.php        |   3 +-
 rdf/AntragAbmeldungStgl.xml.php    |   3 +-
 system/xsl/AntragAbmeldung.xsl     |  10 +
 system/xsl/AntragAbmeldungStgl.xsl | 378 +++++++++++++++++++++++++++++
 4 files changed, 392 insertions(+), 2 deletions(-)
 create mode 100644 system/xsl/AntragAbmeldungStgl.xsl

diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
index 13e99dff2..177c37a96 100644
--- a/rdf/AntragAbmeldung.xml.php
+++ b/rdf/AntragAbmeldung.xml.php
@@ -36,7 +36,7 @@ else
 
 
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
+	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
 	FROM
 	campus.tbl_studierendenantrag
 	JOIN public.tbl_student USING (prestudent_id)
@@ -60,6 +60,7 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 		<name><?= trim($row->vorname. " " . $row->nachname);?></name>
 		<personenkz><?=$row->matrikelnr;?></personenkz>
 		<studienjahr><?php echo $row->studienjahr_kurzbz;?></studienjahr>
+		<studiensemester><?php echo $row->studiensemester_kurzbz;?></studiensemester>
 		<semester><?=$row->semester;?></semester>
 		<grund><?=$row->grund;?></grund>
 	</antrag>
diff --git a/rdf/AntragAbmeldungStgl.xml.php b/rdf/AntragAbmeldungStgl.xml.php
index b3d746fcb..32b65c887 100644
--- a/rdf/AntragAbmeldungStgl.xml.php
+++ b/rdf/AntragAbmeldungStgl.xml.php
@@ -36,7 +36,7 @@ else
 
 
 $query = "
-	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
+	SELECT tbl_studiengang.bezeichnung, bezeichnung_mehrsprachig[(SELECT index FROM public.tbl_sprache WHERE sprache=" . $db->db_add_param(getSprache(), FHC_STRING) . ")], studierendenantrag_id, matrikelnr, studienjahr_kurzbz, studiensemester_kurzbz, vorname, nachname, studiengang_kz, public.get_absem_prestudent(prestudent_id, NULL) AS semester, tbl_studierendenantrag.grund
 	FROM
 	campus.tbl_studierendenantrag
 	JOIN public.tbl_student USING (prestudent_id)
@@ -60,6 +60,7 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 		<name><?= trim($row->vorname. " " . $row->nachname);?></name>
 		<personenkz><?=$row->matrikelnr;?></personenkz>
 		<studienjahr><?php echo $row->studienjahr_kurzbz;?></studienjahr>
+		<studiensemester><?php echo $row->studiensemester_kurzbz;?></studiensemester>
 		<semester><?=$row->semester;?></semester>
 		<grund><?=$row->grund;?></grund>
 	</antrag>
diff --git a/system/xsl/AntragAbmeldung.xsl b/system/xsl/AntragAbmeldung.xsl
index 7996e3745..ef67d6f15 100644
--- a/system/xsl/AntragAbmeldung.xsl
+++ b/system/xsl/AntragAbmeldung.xsl
@@ -325,6 +325,16 @@
 							</text:p>
 						</table:table-cell>
 					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">Studiensemester</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">
+								<text:span text:style-name="T4"><xsl:value-of select="studiensemester"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
 					<table:table-row table:style-name="Tabelle2.1">
 						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
 							<text:p text:style-name="P5">Semester</text:p>
diff --git a/system/xsl/AntragAbmeldungStgl.xsl b/system/xsl/AntragAbmeldungStgl.xsl
new file mode 100644
index 000000000..aa6a28073
--- /dev/null
+++ b/system/xsl/AntragAbmeldungStgl.xsl
@@ -0,0 +1,378 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<xsl:stylesheet
+	xmlns:fo="http://www.w3.org/1999/XSL/Format"
+	xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+	version="1.0"
+	xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+	xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+	xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+	xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+	xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+	xmlns:xlink="http://www.w3.org/1999/xlink"
+	xmlns:dc="http://purl.org/dc/elements/1.1/"
+	xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+	xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+	xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+	xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+	xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0">
+
+	<xsl:output method="xml" version="1.0" indent="yes"/>
+
+	<xsl:template match="antraege">
+		<office:document-content
+			xmlns:officeooo="http://openoffice.org/2009/office"
+			xmlns:css3t="http://www.w3.org/TR/css3-text/"
+			xmlns:grddl="http://www.w3.org/2003/g/data-view#"
+			xmlns:xhtml="http://www.w3.org/1999/xhtml"
+			xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0"
+			xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+			xmlns:rpt="http://openoffice.org/2005/report"
+			xmlns:dc="http://purl.org/dc/elements/1.1/"
+			xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0"
+			xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0"
+			xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0"
+			xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0"
+			xmlns:oooc="http://openoffice.org/2004/calc"
+			xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0"
+			xmlns:ooow="http://openoffice.org/2004/writer"
+			xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0"
+			xmlns:xlink="http://www.w3.org/1999/xlink"
+			xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0"
+			xmlns:ooo="http://openoffice.org/2004/office"
+			xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0"
+			xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0"
+			xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0"
+			xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0"
+			xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2"
+			xmlns:calcext="urn:org:documentfoundation:names:experimental:calc:xmlns:calcext:1.0"
+			xmlns:tableooo="http://openoffice.org/2009/table"
+			xmlns:drawooo="http://openoffice.org/2010/draw"
+			xmlns:loext="urn:org:documentfoundation:names:experimental:office:xmlns:loext:1.0"
+			xmlns:dom="http://www.w3.org/2001/xml-events"
+			xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0"
+			xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+			xmlns:math="http://www.w3.org/1998/Math/MathML"
+			xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0"
+			xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0"
+			xmlns:xforms="http://www.w3.org/2002/xforms" office:version="1.3">
+
+			<office:scripts/>
+			<office:font-face-decls>
+				<style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/>
+				<style:font-face style:name="Liberation Sans" svg:font-family="&apos;Liberation Sans&apos;" style:font-family-generic="swiss" style:font-pitch="variable"/>
+				<style:font-face style:name="Liberation Serif" svg:font-family="&apos;Liberation Serif&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+				<style:font-face style:name="Lohit Devanagari" svg:font-family="&apos;Lohit Devanagari&apos;"/>
+				<style:font-face style:name="Lohit Devanagari1" svg:font-family="&apos;Lohit Devanagari&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+				<style:font-face style:name="Noto Sans CJK SC" svg:font-family="&apos;Noto Sans CJK SC&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+				<style:font-face style:name="Noto Serif CJK SC" svg:font-family="&apos;Noto Serif CJK SC&apos;" style:font-family-generic="system" style:font-pitch="variable"/>
+				<style:font-face style:name="Tahoma" svg:font-family="Tahoma" style:font-family-generic="swiss" style:font-pitch="variable"/>
+				<style:font-face style:name="Times New Roman" svg:font-family="&apos;Times New Roman&apos;" style:font-family-generic="roman" style:font-pitch="variable"/>
+			</office:font-face-decls>
+			<office:automatic-styles>
+				<style:style style:name="Tabelle1" style:family="table">
+					<style:table-properties style:width="16.245cm" fo:margin-left="-0.191cm" table:align="left" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle1.A" style:family="table-column">
+					<style:table-column-properties style:column-width="16.245cm"/>
+				</style:style>
+				<style:style style:name="Tabelle1.1" style:family="table-row">
+					<style:table-row-properties fo:keep-together="auto"/>
+				</style:style>
+				<style:style style:name="Tabelle1.A1" style:family="table-cell">
+					<style:table-cell-properties style:vertical-align="top" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="none" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle2" style:family="table">
+					<style:table-properties style:width="16.245cm" fo:margin-left="-0.191cm" table:align="left" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle2.A" style:family="table-column">
+					<style:table-column-properties style:column-width="4.41cm"/>
+				</style:style>
+				<style:style style:name="Tabelle2.B" style:family="table-column">
+					<style:table-column-properties style:column-width="11.836cm"/>
+				</style:style>
+				<style:style style:name="Tabelle2.1" style:family="table-row">
+					<style:table-row-properties fo:keep-together="auto"/>
+				</style:style>
+				<style:style style:name="Tabelle2.A1" style:family="table-cell">
+					<style:table-cell-properties style:vertical-align="top" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="0.5pt solid #000000" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle2.5" style:family="table-row">
+					<style:table-row-properties style:min-row-height="8.301cm" fo:keep-together="auto"/>
+				</style:style>
+				<style:style style:name="Tabelle3" style:family="table">
+					<style:table-properties style:width="16.245cm" fo:margin-left="-0.191cm" table:align="left" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle3.A" style:family="table-column">
+					<style:table-column-properties style:column-width="7.528cm"/>
+				</style:style>
+				<style:style style:name="Tabelle3.B" style:family="table-column">
+					<style:table-column-properties style:column-width="0.416cm"/>
+				</style:style>
+				<style:style style:name="Tabelle3.C" style:family="table-column">
+					<style:table-column-properties style:column-width="8.301cm"/>
+				</style:style>
+				<style:style style:name="Tabelle3.1" style:family="table-row">
+					<style:table-row-properties fo:keep-together="auto"/>
+				</style:style>
+				<style:style style:name="Tabelle3.A1" style:family="table-cell">
+					<style:table-cell-properties style:vertical-align="top" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="none" fo:border-bottom="0.5pt solid #000000" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle3.B1" style:family="table-cell">
+					<style:table-cell-properties style:vertical-align="top" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border="none" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="Tabelle3.A2" style:family="table-cell">
+					<style:table-cell-properties style:vertical-align="top" fo:padding-left="0.191cm" fo:padding-right="0.191cm" fo:padding-top="0cm" fo:padding-bottom="0cm" fo:border-left="none" fo:border-right="none" fo:border-top="0.5pt solid #000000" fo:border-bottom="none" style:writing-mode="lr-tb"/>
+				</style:style>
+				<style:style style:name="P1" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:line-height="150%">
+						<style:tab-stops>
+							<style:tab-stop style:position="3.501cm"/>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="14.753cm"/>
+							<style:tab-stop style:position="15.503cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+				</style:style>
+				<style:style style:name="P2" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:line-height="150%">
+						<style:tab-stops>
+							<style:tab-stop style:position="3.501cm"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+				</style:style>
+				<style:style style:name="P3" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false">
+						<style:tab-stops>
+							<style:tab-stop style:position="7.502cm"/>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="14.753cm"/>
+							<style:tab-stop style:position="15.503cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+				</style:style>
+				<style:style style:name="P4" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:margin-top="0.494cm" fo:margin-bottom="0.882cm" style:contextual-spacing="false" fo:line-height="0.776cm">
+						<style:tab-stops>
+							<style:tab-stop style:position="7.502cm"/>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="14.753cm"/>
+							<style:tab-stop style:position="15.503cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+					<style:text-properties fo:font-size="14pt" style:font-size-asian="14pt" style:font-size-complex="14pt"/>
+				</style:style>
+				<style:style style:name="P5" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false">
+						<style:tab-stops>
+							<style:tab-stop style:position="7.502cm"/>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="14.753cm"/>
+							<style:tab-stop style:position="15.503cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+					<style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="P6" style:family="paragraph" style:parent-style-name="Header">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false">
+						<style:tab-stops>
+							<style:tab-stop style:position="7.502cm"/>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="14.753cm"/>
+							<style:tab-stop style:position="15.503cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+					<style:text-properties fo:font-size="9pt" fo:language="none" fo:country="none" style:font-size-asian="9pt" style:language-asian="none" style:country-asian="none" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="P7" style:family="paragraph" style:parent-style-name="Header">
+					<style:text-properties fo:language="none" fo:country="none" style:language-asian="none" style:country-asian="none"/>
+				</style:style>
+				<style:style style:name="P8" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false" fo:line-height="0.776cm">
+						<style:tab-stops>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+					<style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="P9" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false"/>
+					<style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="P10" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false">
+						<style:tab-stops>
+							<style:tab-stop style:position="9.502cm"/>
+							<style:tab-stop style:position="16.002cm" style:type="right"/>
+						</style:tab-stops>
+					</style:paragraph-properties>
+					<style:text-properties fo:font-size="9pt" fo:language="none" fo:country="none" style:font-size-asian="9pt" style:language-asian="none" style:country-asian="none" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="P11" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false"/>
+				</style:style>
+				<style:style style:name="P12" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:margin-top="0.141cm" fo:margin-bottom="0.141cm" style:contextual-spacing="false" style:snap-to-layout-grid="false"/>
+				</style:style>
+				<style:style style:name="P13" style:family="paragraph" style:parent-style-name="Standard">
+					<style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+				</style:style>
+				<style:style style:name="P14" style:family="paragraph" style:parent-style-name="Standard">
+					<style:paragraph-properties fo:break-after="page"/>
+					<style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+				</style:style>
+				<style:style style:name="T1" style:family="text">
+					<style:text-properties fo:font-size="10pt" style:font-size-asian="10pt"/>
+				</style:style>
+				<style:style style:name="T2" style:family="text">
+					<style:text-properties fo:font-size="10pt" style:font-size-asian="10pt" style:font-size-complex="10pt"/>
+				</style:style>
+				<style:style style:name="T3" style:family="text">
+					<style:text-properties fo:font-size="9pt" style:font-size-asian="9pt" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="T4" style:family="text">
+					<style:text-properties fo:font-size="9pt" fo:language="none" fo:country="none" style:font-size-asian="9pt" style:language-asian="none" style:country-asian="none" style:font-size-complex="9pt"/>
+				</style:style>
+				<style:style style:name="T5" style:family="text">
+					<style:text-properties fo:font-size="8pt" style:font-size-asian="8pt" style:font-size-complex="8pt"/>
+				</style:style>
+				<style:style style:name="fr1" style:family="graphic" style:parent-style-name="Graphics">
+					<style:graphic-properties fo:margin-left="0.319cm" fo:margin-right="0.319cm" fo:margin-top="0cm" fo:margin-bottom="0cm" style:run-through="background" style:wrap="parallel" style:number-wrapped-paragraphs="no-limit" style:wrap-contour="true" style:wrap-contour-mode="outside" style:vertical-pos="from-top" style:vertical-rel="paragraph" style:horizontal-pos="from-left" style:horizontal-rel="paragraph" fo:background-color="transparent" draw:fill="none" draw:fill-color="#ffffff" fo:padding="0.002cm" fo:border="none" style:mirror="none" fo:clip="rect(0cm, 0cm, 0cm, 0cm)" draw:luminance="0%" draw:contrast="0%" draw:red="0%" draw:green="0%" draw:blue="0%" draw:gamma="100%" draw:color-inversion="false" draw:image-opacity="100%" draw:color-mode="standard"/>
+				</style:style>
+				<style:style style:name="Sect1" style:family="section">
+					<style:section-properties text:dont-balance-text-columns="true" style:writing-mode="lr-tb" style:editable="false">
+						<style:columns fo:column-count="1" fo:column-gap="0cm"/>
+					</style:section-properties>
+				</style:style>
+			</office:automatic-styles>
+			<office:body>
+				<xsl:apply-templates match="antrag"/>
+			</office:body>
+
+		</office:document-content>
+	</xsl:template>
+	
+	<xsl:template match="antrag">
+		<office:text>
+			<office:forms form:automatic-focus="false" form:apply-design-mode="false"/>
+			<text:tracked-changes text:track-changes="true"/>
+			<text:sequence-decls>
+				<text:sequence-decl text:display-outline-level="0" text:name="Illustration"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Table"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Text"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Drawing"/>
+				<text:sequence-decl text:display-outline-level="0" text:name="Figure"/>
+			</text:sequence-decls>
+			<text:section text:style-name="Sect1" text:name="Bereich1" text:protected="true">
+				<table:table table:name="Tabelle1" table:style-name="Tabelle1">
+					<table:table-column table:style-name="Tabelle1.A"/>
+					<table:table-row table:style-name="Tabelle1.1">
+						<table:table-cell table:style-name="Tabelle1.A1" office:value-type="string">
+							<text:p text:style-name="P1">
+
+								<text:span text:style-name="T2">Studiengang: 
+									<text:s text:c="13"/>
+								</text:span>
+								<text:span text:style-name="T4"><xsl:value-of select="studiengang"/></text:span>
+							</text:p>
+							<text:p text:style-name="P2">
+								<text:span text:style-name="T2">Organisationsform:
+									<text:tab/>
+								</text:span>
+								<text:span text:style-name="T4"><xsl:value-of select="organisationsform"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+				</table:table>
+				<text:p text:style-name="P4">Abmeldung vom Studium durch Studiengang</text:p>
+				<table:table table:name="Tabelle2" table:style-name="Tabelle2">
+					<table:table-column table:style-name="Tabelle2.A"/>
+					<table:table-column table:style-name="Tabelle2.B"/>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P3">
+								<text:span text:style-name="T3">Name der*des Studierenden</text:span>
+							</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P6">
+								<text:span text:style-name="T4"><xsl:value-of select="name"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">Personenkennzeichen</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">
+								<text:span text:style-name="T4"><xsl:value-of select="personenkz"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">Studienjahr</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">
+								<text:span text:style-name="T4"><xsl:value-of select="studienjahr"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">Studiensemester</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">
+								<text:span text:style-name="T4"><xsl:value-of select="studiensemester"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.1">
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">Semester</text:p>
+						</table:table-cell>
+						<table:table-cell table:style-name="Tabelle2.A1" office:value-type="string">
+							<text:p text:style-name="P5">
+								<text:span text:style-name="T4"><xsl:value-of select="semester"/></text:span>
+							</text:p>
+						</table:table-cell>
+					</table:table-row>
+					<table:table-row table:style-name="Tabelle2.5">
+						<table:table-cell table:style-name="Tabelle2.A1" table:number-columns-spanned="2" office:value-type="string">
+							<text:p text:style-name="P8">Grund der Abmeldung:</text:p>
+							<text:p text:style-name="P10">
+								<text:span text:style-name="T4"><xsl:value-of select="grund"/></text:span>
+							</text:p>
+						</table:table-cell>
+						<table:covered-table-cell/>
+					</table:table-row>
+				</table:table>
+				<text:p text:style-name="Standard"/>
+
+				<text:p text:style-name="Standard"/>
+				<text:p text:style-name="Standard"/>
+				<text:p text:style-name="Standard"/>
+				<text:p text:style-name="P13"/>
+				<text:p text:style-name="Standard">
+					<text:span text:style-name="T2">Wir weisen Sie darauf hin, dass Ihr FHTW Account noch 21 Tage aktiv ist. Wir bitten Sie, alle benötigte Dateien (Zeugnisse, Studienerfolgsbestätigungen, Studienbestätigungen, etc.) innerhalb dieses Zeitraums herunterzuladen. Für die Ausstellung von Duplikaten fallen nach Inaktivsetzung des CIS-Accounts Kosten an.
+						<text:line-break/>
+					</text:span>
+					<text:span text:style-name="T1">Sie sind gem. Ausbildungsvertrag verpflichtet, unverzüglich alle zur Verfügung gestellten Gerätschaften, Bücher, Schlüssel und sonstige Materialien zurückzugeben.</text:span>
+					<text:span text:style-name="T2">
+						<text:line-break/>Bei Abmeldung vor dem 01.09. bzw. 15.02. und bereits eingezahltem Studienbeitrag für das kommende Semester: Wir informieren Sie darüber, dass der Studienbeitrag für das kommende Semester von Ihnen zurückgefordert werden kann. Bitte geben Sie uns dafür innerhalb von 14 Tagen Ihre Bankdaten an folgende E-Mail-Adresse bekannt: billing@technikum-wien.at.
+					</text:span>
+				</text:p>
+				<text:p text:style-name="P14"/>
+			</text:section>
+		</office:text>
+	</xsl:template>
+
+</xsl:stylesheet>
\ No newline at end of file

From 0b51239f8c6ef8b50a7f202855609b5b6c655289 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 22 Aug 2023 15:24:12 +0200
Subject: [PATCH 129/175] Fixed SQL Error when sending Anrechnungen
 Recommendation Reminder

---
 application/controllers/jobs/AnrechnungJob.php | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/application/controllers/jobs/AnrechnungJob.php b/application/controllers/jobs/AnrechnungJob.php
index b442c7e56..5784830b6 100644
--- a/application/controllers/jobs/AnrechnungJob.php
+++ b/application/controllers/jobs/AnrechnungJob.php
@@ -216,7 +216,7 @@ class AnrechnungJob extends JOB_Controller
 					'datentabelle'  => $anrechnungen_table,
 					'link'          => anchor($url, 'Anrechnungsanträge Übersicht')
 				);
-	
+
 				// Send mail
 				sendSanchoMail(
 					'AnrechnungAntragStellen',
@@ -242,7 +242,7 @@ class AnrechnungJob extends JOB_Controller
 
         $result = $this->AnrechnungModel->loadWhere('
             studiensemester_kurzbz = (SELECT studiensemester_kurzbz FROM tbl_studiensemester WHERE now()::date BETWEEN start AND ende)
-            AND genehmigt_von IS NULL                             
+            AND genehmigt_von IS NULL
             AND empfehlung_anrechnung IS NULL
             AND status_kurzbz = '. $this->db->escape(self::ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR) .' -- in Bearbeitung durch Lektor
             AND NOW()::date = (astat.datum + interval \'1 day\')                    -- nur gestrige Empfehlungsanfrage
@@ -387,7 +387,7 @@ class AnrechnungJob extends JOB_Controller
 
 		$db = new DB_Model();
 		$result = $db->execReadOnlyQuery($qry);
-		
+
 		// Exit if there are no rejected Anrechnungen
 		if (!hasData($result))
 		{
@@ -440,9 +440,9 @@ html;
 
         $result = $this->AnrechnungModel->loadWhere('
             studiensemester_kurzbz = (
-                SELECT studiensemester_kurzbz FROM tbl_studiensemester WHERE now()::date BETWEEN start AND ende)
+                SELECT studiensemester_kurzbz FROM tbl_studiensemester WHERE now()::date BETWEEN start AND ende
             )
-            AND genehmigt_von IS NULL                             
+            AND genehmigt_von IS NULL
             AND empfehlung_anrechnung IS NULL
             AND status_kurzbz = '. $this->db->escape(self::ANRECHNUNGSTATUS_PROGRESSED_BY_LEKTOR) .' -- in Bearbeitung durch Lektor
             AND NOW()::date = (astat.datum + interval \'1 week\')                   -- eine Woche nach Empfehlungsanfrage
@@ -455,7 +455,7 @@ html;
             $this->logInfo('End AnrechnungJob sendMailRemindRecommendation, because no recommendations to be done.');
             exit;
         }
-        
+
         $anrechnung_id_arr = array_column(getData($result), 'anrechnung_id');
 
         $arr_lvLector_arr = array();
@@ -514,7 +514,7 @@ html;
 					'vorname' => $stgl->vorname
 				);
 			}
-			
+
 			return $stglMailAdress_arr;
 		}
 		// If not available, get assistance mail address

From ac945ab5409ba81eb45c8c17d364f16d219bef30 Mon Sep 17 00:00:00 2001
From: Manfred <kindlm@technikum-wien.at>
Date: Tue, 22 Aug 2023 15:51:17 +0200
Subject: [PATCH 130/175] =?UTF-8?q?studiensemester=5Fkurzbz=20in=20GET-Par?=
 =?UTF-8?q?ameter=20eingef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/pdfExport.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/content/pdfExport.php b/content/pdfExport.php
index a2a5a1a33..2f9180418 100644
--- a/content/pdfExport.php
+++ b/content/pdfExport.php
@@ -253,7 +253,7 @@ else
 				array('uid', 'stg_kz', 'person_id', 'id', 'prestudent_id', 'buchungsnummern', 'ss', 'abschlusspruefung_id',
 					'typ', 'all', 'preoutgoing_id', 'lvid', 'projekt_kurzbz', 'von', 'bis', 'stundevon', 'stundebis',
 					'sem', 'lehreinheit', 'mitarbeiter_uid', 'studienordnung_id', 'fixangestellt', 'standort',
-					'abrechnungsmonat', 'form', 'projektarbeit_id', 'betreuerart_kurzbz')
+					'abrechnungsmonat', 'form', 'projektarbeit_id', 'betreuerart_kurzbz', 'studiensemester_kurzbz')
 			)
 		)
 		{

From c44071114568b64a0299bef748c2a121caeb6967 Mon Sep 17 00:00:00 2001
From: Manfred <kindlm@technikum-wien.at>
Date: Tue, 22 Aug 2023 15:53:19 +0200
Subject: [PATCH 131/175] =?UTF-8?q?Teilgebiete-=C3=9Cbersicht=20mit=20Spal?=
 =?UTF-8?q?ten=20mehrsprachig=20und=20Offset?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../reihungstest_administration.php           | 29 ++++++++++++++-----
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/vilesci/stammdaten/reihungstest_administration.php b/vilesci/stammdaten/reihungstest_administration.php
index 3f3ec6e83..3b59e1961 100644
--- a/vilesci/stammdaten/reihungstest_administration.php
+++ b/vilesci/stammdaten/reihungstest_administration.php
@@ -783,7 +783,9 @@ $qry="SELECT
 		studiengang_kz,
 		reihung,
 		gebiet_id,
-		tbl_gebiet.bezeichnung,
+		gb.bezeichnung,
+		gb.bezeichnung_mehrsprachig[1] as bezeichnung_de,
+		gb.bezeichnung_mehrsprachig[2] as bezeichnung_en,
 		zeit,
 		multipleresponse,
 		maxfragen,
@@ -794,17 +796,19 @@ $qry="SELECT
 		level_sprung_ab,
 		levelgleichverteilung,
 		maxpunkte,
+		offsetpunkte,
 		antwortenprozeile,
 		(SELECT SUM (zeit) AS sum FROM testtool.tbl_gebiet JOIN testtool.tbl_ablauf USING (gebiet_id) WHERE studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
 		if ($semester!='')
 			$qry.=" AND semester=".$db->db_add_param($semester, FHC_INTEGER);
 		$qry.="	) AS gesamtzeit,
+		(SELECT count(*) FROM testtool.tbl_frage WHERE gebiet_id=gb.gebiet_id AND demo=false) AS anz_fragen,
 		(SELECT SUM (zeit) AS sum FROM testtool.tbl_gebiet JOIN testtool.tbl_ablauf USING (gebiet_id) WHERE studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
 		if ($semester!='')
 			$qry.=" AND semester=".$db->db_add_param($semester, FHC_INTEGER);
 		$qry.="	)-'00:40:00'::time without time zone AS gesamtzeit_persoenlichkeit
 		FROM testtool.tbl_ablauf
-		JOIN testtool.tbl_gebiet USING (gebiet_id)
+		JOIN testtool.tbl_gebiet gb USING (gebiet_id)
 		JOIN public.tbl_studiengang USING (studiengang_kz)
 		WHERE studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
 		if ($semester!='')
@@ -827,9 +831,11 @@ if ($studiengang_kz!=1 && $num_rows!=0)
 				<th>KZ</th>
 				<th>NR</th>
 				<th>Gebiet_id</th>
-				<th>Bezeichnung</th>
+				<th>Bezeichnung DE</th>
+				<th>Bezeichnung EN</th>
 				<th>Zeit</th>
 				<th><div title='Multiple Response' style='cursor:help'>MR</div></th>
+				<th>Summe Fragen</th>
 				<th>Maxfragen</th>
 				<th><div title='Zufallsfrage' style='cursor:help'>ZFF</div></th>
 				<th><div title='Zufallsvorschlag' style='cursor:help'>ZFV</div></th>
@@ -838,6 +844,7 @@ if ($studiengang_kz!=1 && $num_rows!=0)
 				<th>Level ab</th>
 				<th><div title='Levelgleichverteilung' style='cursor:help'>LGV</div></th>
 				<th>Maxpunkte</th>
+				<th>Offset</th>
 				<th><div title='Antwortenprozeile' style='cursor:help'>AWPZ</div></th>\n";
 		echo "</tr></thead>";
 		echo "<tbody>";
@@ -850,7 +857,8 @@ if ($studiengang_kz!=1 && $num_rows!=0)
 			<td>$row->studiengang_kz</td>
 			<td>$row->reihung</td>
 			<td>$row->gebiet_id</td>
-			<td>$row->bezeichnung</td>";
+			<td>$row->bezeichnung_de</td>
+			<td>$row->bezeichnung_en</td>";
 			if ($row->gebiet_id==7)
 			{
 					echo "<td>00:20:00*</td>";
@@ -861,15 +869,17 @@ if ($studiengang_kz!=1 && $num_rows!=0)
 			{
 					echo "<td>$row->zeit</td>";
 			}
-			echo "<td align='center'><img src='../../skin/images/".($row->multipleresponse=='t'?'true.png':'false.png')."' height='20'></td>
+			echo "<td align='center'>".($row->multipleresponse=='t'?'Ja':'Nein')."</td>
+			<td align='center'>$row->anz_fragen</td>
 			<td align='center'>$row->maxfragen</td>
-			<td align='center'><img src='../../skin/images/".($row->zufallfrage=='t'?'true.png':'false.png')."' height='20'></td>
-			<td align='center'><img src='../../skin/images/".($row->zufallvorschlag=='t'?'true.png':'false.png')."' height='20'></td>
+			<td align='center'>".($row->zufallfrage=='t'?'Ja':'Nein')."</td>
+			<td align='center'>".($row->zufallvorschlag=='t'?'Ja':'Nein')."</td>
 			<td align='center'>$row->level_start</td>
 			<td align='center'>$row->level_sprung_auf</td>
 			<td align='center'>$row->level_sprung_ab</td>
-			<td align='center'><img src='../../skin/images/".($row->levelgleichverteilung=='t'?'true.png':'false.png')."' height='20'></td>
+			<td align='center'>".($row->levelgleichverteilung=='t'?'Ja':'Nein')."</td>
 			<td align='center'>$row->maxpunkte</td>
+			<td align='center'>".number_format((intval(($row->offsetpunkte*100))/100),2,',','.')."</td>
 			<td align='center'>$row->antwortenprozeile</td>";
 			echo "</tr>\n";
 		}
@@ -881,6 +891,7 @@ if ($studiengang_kz!=1 && $num_rows!=0)
 		echo "<td></td>";
 		echo "<td></td>";
 		echo "<td></td>";
+		echo "<td></td>";
 		echo "<td align='right'>Gesamt&nbsp;</td>";
 		echo "<td>".$gesamtzeit."</td>";
 		echo "<td></td>";
@@ -893,6 +904,8 @@ if ($studiengang_kz!=1 && $num_rows!=0)
 		echo "<td></td>";
 		echo "<td></td>";
 		echo "<td></td>";
+		echo "<td></td>";
+		echo "<td></td>";
 		echo "</tr>\n";
 		echo "</tfooter></table>";
 	}

From db96dd1388b2660470b194f3f08a96c010f09389 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 24 Aug 2023 07:56:49 +0200
Subject: [PATCH 132/175] - bug fix

---
 vilesci/stammdaten/auswertung_fhtw.php | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/vilesci/stammdaten/auswertung_fhtw.php b/vilesci/stammdaten/auswertung_fhtw.php
index c5e4ecc02..616369d8f 100644
--- a/vilesci/stammdaten/auswertung_fhtw.php
+++ b/vilesci/stammdaten/auswertung_fhtw.php
@@ -1419,7 +1419,6 @@ if (isset($_REQUEST['reihungstest']) || isset($_POST['rtauswsubmit']))
 							ORDER BY studienplan_id DESC LIMIT 1)
 							OR tbl_ablauf.studienplan_id IS NULL)";
 	}
-	//$query .= " AND nachname='Al-Mafrachi'";
 
 	if ($stgtyp !== '')
 	{
@@ -1654,9 +1653,7 @@ if (isset($_REQUEST['reihungstest']) || isset($_POST['rtauswsubmit']))
 	//$query .= " AND nachname='Al-Mafrachi'";
 	$query .= " ORDER BY nachname,
 				vorname,
-				person_id	
-	";/*print_r($query);*/
-	//echo '<pre>', var_dump($query), '</pre>';
+				person_id";
 	if (!($result = $db->db_query($query)))
 	{
 		die($db->db_last_error());
@@ -3037,13 +3034,13 @@ else
 	echo '&nbsp;<label>Studiengang Typ:
 				<SELECT name="stgtyp">
 					<OPTION value="">Alle</OPTION>';
-		foreach ($studiengangtyp as $stgtyp => $typ)
+		foreach ($studiengangtyp as $key => $typ)
 		{
 			$selected = "";
-			if (isset($_REQUEST['stgtyp']) && $_REQUEST['stgtyp'] !== '' && $_REQUEST['stgtyp'] === $stgtyp)
+			if (isset($_REQUEST['stgtyp']) && $_REQUEST['stgtyp'] !== '' && $_REQUEST['stgtyp'] === $key)
 				$selected = 'selected';
 			
-			echo '<option value='. $stgtyp .' '. $selected .'>'. $typ . '</option>';
+			echo '<option value='. $key .' '. $selected .'>'. $typ . '</option>';
 		}
 	echo '</SELECT></label>';
 	echo '</td></tr>';
@@ -3059,6 +3056,7 @@ else
 										&prestudent_id=' . $prestudent_id . '
 										&' . http_build_query(array('reihungstest' => $reihungstest)) . '
 										&orgform_kurzbz=' . $orgform_kurzbz . '
+										&stgtyp=' . $stgtyp . '
 										&format=xls"
 									class="btn btn-primary"
 									role="button">

From 7c365cea81cd542ee7d43077d3330cbd01dbfe24 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 24 Aug 2023 08:01:36 +0200
Subject: [PATCH 133/175] - title aenderung

---
 system/filtersupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 9f2b2c8e4..dcf01b577 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -536,7 +536,7 @@ $filters = array(
 		'default_filter' => true,
 		'filter' => '
 			{
-				"name": "Aufgenommen - Alle",
+				"name": "Aufgenommen - Lehrgänge",
 				"columns": [
 					{"name": "PersonId"},
 					{"name": "Vorname"},

From 26e63160ba52071333cacdaaf22c75b116f1c59b Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 24 Aug 2023 10:38:46 +0200
Subject: [PATCH 134/175] - bug fix, bescheibung

---
 .../models/organisation/Studiensemester_model.php      | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/application/models/organisation/Studiensemester_model.php b/application/models/organisation/Studiensemester_model.php
index bb9b94c92..45a4eac7c 100644
--- a/application/models/organisation/Studiensemester_model.php
+++ b/application/models/organisation/Studiensemester_model.php
@@ -204,4 +204,14 @@ class Studiensemester_model extends DB_Model
 
 		return $this->execQuery($query, array($studiensemester_kurzbz));
 	}
+
+	public function getAktAndFutureSemester()
+	{
+		$query = 'SELECT studiensemester_kurzbz
+					FROM public.tbl_studiensemester
+					WHERE start >= NOW() OR (start <= NOW() AND ende >= NOW())
+					ORDER BY start';
+					
+		return $this->execQuery($query);
+	}
 }

From 6e2c5acc6f208afeb68481cb5b324009a3218c85 Mon Sep 17 00:00:00 2001
From: Manfred <kindlm@technikum-wien.at>
Date: Thu, 24 Aug 2023 14:28:46 +0200
Subject: [PATCH 135/175] =?UTF-8?q?Eintrag=20Archiv=20f=C3=BCr=20Abschluss?=
 =?UTF-8?q?dokumentLehrgaenge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/student/studentoverlay.js.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/content/student/studentoverlay.js.php b/content/student/studentoverlay.js.php
index d9686d5e3..334080fb2 100644
--- a/content/student/studentoverlay.js.php
+++ b/content/student/studentoverlay.js.php
@@ -3452,6 +3452,10 @@ function StudentZeugnisDokumentArchivieren()
 			xml = 'ausbildungsvertrag.xml.php';
 			break;
 
+		case 'AbschlussdokumentLehrgaenge':
+			xml = 'abschlussdokument_lehrgaenge.xml.php';
+			break;
+
 		default:
 			alert('Das Archivieren fuer diesen Dokumenttyp wird derzeit nicht unterstuetzt');
 			return

From f3453670b37f363106952ded645fa6e4a6ffa318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 25 Aug 2023 09:50:37 +0200
Subject: [PATCH 136/175] =?UTF-8?q?Problem=20behoben=20wodurch=20der=20Pla?=
 =?UTF-8?q?usicheck=20abgebrochen=20hat=20wenn=20Studieng=C3=A4nge=20f?=
 =?UTF-8?q?=C3=BCr=20den=20GebDatum=20Check=20exkludiert=20wurden.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../issues/plausichecks/GbDatumWeitZurueck.php       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/libraries/issues/plausichecks/GbDatumWeitZurueck.php b/application/libraries/issues/plausichecks/GbDatumWeitZurueck.php
index a9e9f817a..04e1cf97b 100644
--- a/application/libraries/issues/plausichecks/GbDatumWeitZurueck.php
+++ b/application/libraries/issues/plausichecks/GbDatumWeitZurueck.php
@@ -85,6 +85,12 @@ class GbDatumWeitZurueck extends PlausiChecker
 			$params[] = $studiengang_kz;
 		}
 
+		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
+		{
+			$qry .= " AND stg.studiengang_kz NOT IN ?";
+			$params[] = $exkludierte_studiengang_kz;
+		}
+
 		$qry .= ")";
 
 		if (isset($person_id))
@@ -93,12 +99,6 @@ class GbDatumWeitZurueck extends PlausiChecker
 			$params[] = $person_id;
 		}
 
-		if (isset($exkludierte_studiengang_kz) && !isEmptyArray($exkludierte_studiengang_kz))
-		{
-			$qry .= " AND stg.studiengang_kz NOT IN ?";
-			$params[] = $exkludierte_studiengang_kz;
-		}
-
 		return $this->_db->execReadOnlyQuery($qry, $params);
 	}
 }

From 86aac2388dcf46acf761dab0e8f9dab64e97dbbc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 25 Aug 2023 11:04:06 +0200
Subject: [PATCH 137/175] Als Admin wird nun die Buchungsnummer im Konto
 Karteireiter im FAS angezeigt damit diese einfach kopiert werden kann

---
 content/student/studentkontooverlay.xul.php | 24 +++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/content/student/studentkontooverlay.xul.php b/content/student/studentkontooverlay.xul.php
index a15275fac..7dec7f9a2 100644
--- a/content/student/studentkontooverlay.xul.php
+++ b/content/student/studentkontooverlay.xul.php
@@ -27,8 +27,14 @@ header("Pragma: no-cache");
 header("Content-type: application/vnd.mozilla.xul+xml");
 require_once('../../config/vilesci.config.inc.php');
 require_once('../../config/global.config.inc.php');
+require_once('../../include/functions.inc.php');
+require_once('../../include/benutzerberechtigung.class.php');
 echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 
+$user = get_uid();
+$rechte = new benutzerberechtigung();
+$rechte->getBerechtigungen($user);
+
 ?>
 
 <overlay id="StudentKonto"
@@ -206,10 +212,6 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 							<spacer flex="1"/>
 							<button id="student-konto-button-zahlungsbestaetigung" label="Zahlungsbestaetigung drucken" oncommand="StudentKontoZahlungsbestaetigung();" disabled="true" hidden="<?php echo $is_hidden?>"/>
 						</hbox>
-						<vbox hidden="true">
-							<label value="Buchungsnr" control="student-konto-textbox-buchungsnr"/>
-							<textbox id="student-konto-textbox-buchungsnr" disabled="true"/>
-						</vbox>
 						<groupbox id="student-konto-groupbox">
 						<caption label="Details"/>
 							<grid id="student-konto-grid-detail" style="overflow:auto;margin:4px;" flex="1">
@@ -218,6 +220,20 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 									<column flex="5"/>
 								</columns>
 								<rows>
+									<?php
+									$hidden = 'hidden="true"';
+									$rechte = new benutzerberechtigung();
+									$rechte->getBerechtigungen($user);
+									if($rechte->isBerechtigt('admin'))
+										$hidden = '';
+									?>
+									<row <?php echo $hidden ?>>
+										<label value="Buchungsnr" control="student-konto-textbox-buchungsnr"/>
+										<hbox>
+											<textbox id="student-konto-textbox-buchungsnr" readonly="true" size="9"/>
+											<spacer flex="1" />
+										</hbox>
+									</row>
 									<row>
 										<label value="Betrag" control="student-konto-textbox-betrag"/>
 										<hbox>

From 20aaefffb14ef8c4b84163afc42feee36bd484d3 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 29 Aug 2023 16:50:02 +0200
Subject: [PATCH 138/175] Finalisierung Emailvariablen

---
 application/config/studierendenantrag.php  |   2 +-
 application/controllers/jobs/AntragJob.php |  54 +++++++-
 application/libraries/AntragLib.php        | 136 ++++++++++++++++-----
 3 files changed, 159 insertions(+), 33 deletions(-)

diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
index 159ead759..fc62fcdb0 100644
--- a/application/config/studierendenantrag.php
+++ b/application/config/studierendenantrag.php
@@ -77,7 +77,7 @@ $config['wiederholung_job_request_1_date_modifier'] = '+0 days';
  * @var string           A string formated as PHP DateTime modifier
  * @see https://www.php.net/manual/de/datetime.modify.php
  */
-$config['wiederholung_job_request_2_date_modifier'] = '+3 weeks';
+$config['wiederholung_job_request_2_date_modifier'] = '+3 months';
 
 /**
  * Final deadline - after this the student will be abgemeldet if he hasn't chosen yet
diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 23e1e61e6..1211a6abe 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -25,6 +25,8 @@ class AntragJob extends JOB_Controller
 		$this->load->model('education/Pruefung_model', 'PruefungModel');
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
 	}
 
 	/**
@@ -134,7 +136,9 @@ class AntragJob extends JOB_Controller
 		foreach ($stgLeitungen as $leitung)
 		{
 			$data = [
-				'name' => trim($leitung['Details']->vorname . ' ' . $leitung['Details']->nachname)
+				'name' => trim($leitung['Details']->vorname . ' ' . $leitung['Details']->nachname),
+				'vorname' => $leitung['Details']->vorname,
+				'nachname' => $leitung['Details']->nachname
 			];
 
 			foreach ($languages as $lang) {
@@ -205,12 +209,31 @@ class AntragJob extends JOB_Controller
 		$count = 0;
 		foreach ($antraege as $antrag)
 		{
+			$this->StudiengangModel->addJoin('public.tbl_prestudent ps','studiengang_kz');
+			$res = $this->StudiengangModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
+			$stg = '';
+			$orgform = '';
+			if (hasData($res)) {
+				$studiengang = current(getData($res));
+				$stg = $studiengang->bezeichnung;
+				$orgform = $studiengang->orgform_kurzbz;
+			}
+
 			$datum = new DateTime($antrag->datum_wiedereinstieg);
 			$data = array(
 				'prestudent' => $antrag->prestudent_id,
 				'name' => trim($antrag->vorname . ' '. $antrag->nachname),
-				'datum_wiedereinstieg' => $datum->format('d.m.Y')
+				'datum_wiedereinstieg' => $datum->format('d.m.Y'),
+				'vorname' => $antrag->vorname,
+				'nachname' => $antrag->nachname,
+				'Orgform' => $orgform,
+				'stg' => $stg
 			);
+			$result = $this->StudentModel->loadWhere(['prestudent_id'=> $antrag->prestudent_id]);
+			if (hasData($result)) {
+				$student = current(getData($result));
+				$data['UID'] = $student->student_uid;
+			}
 
 			// NOTE(chris): Sancho mail
 			if(sendSanchoMail('Sancho_Mail_Antrag_U_Reminder', $data, $antrag->email, 'Reminder: Unterbrechung Wiedereinstieg'))
@@ -488,18 +511,41 @@ class AntragJob extends JOB_Controller
 				$fristende = new DateTime($prestudent->datum);
 				$fristende->add(DateInterval::createFromDateString($modifier_deadline));
 
+				$result = $this->StudiensemesterModel->getNextFrom($prestudent->studiensemester_kurzbz);
+				$next_sem = "";
+				$sem_after_next_sem = "";
+				if (hasData($result)) {
+					$next_sem = current(getData($result))->studiensemester_kurzbz;
+					$result = $this->StudiensemesterModel->getNextFrom($next_sem);
+					if (hasData($result)) {
+						$sem_after_next_sem = current(getData($result))->studiensemester_kurzbz;
+					}
+				}
+
+//prestudentstatus
+				$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
+				$result = $this->PrestudentstatusModel->loadLastWithStgDetails($prestudent->prestudent_id, $prestudent->studiensemester_kurzbz);
+				if (hasData($result)) {
+					$ausbildungssemester = current(getData($result))->semester;
+				}
+
 				$dataMail = array(
 					'name'=> trim($prestudent->vorname . ' '. $prestudent->nachname),
+					'vorname' => $prestudent->vorname,
+					'nachname' => $prestudent->nachname,
 					'pers_kz'=> $prestudent->matrikelnr,
 					'studiengang' => $prestudent->bezeichnung,
 					'lvbezeichnung' => $prestudent->lvbezeichnung,
 					'datum_kp' => $prestudent->datum,
 					'studiensemester'=> $prestudent->studiensemester_kurzbz,
-					'orgform'=> $prestudent->orgform,
+					'Orgform'=> $prestudent->orgform,
 					'prestudent_id' => $prestudent->prestudent_id,
 					'url' => $url,
 					'urlCIS' => $urlCIS,
-					'fristablauf' => $fristende->format('d.m.Y')
+					'fristablauf' => $fristende->format('d.m.Y'),
+					'pre_wiederholer_sem' => $next_sem,
+					'wiederholer_sem' => $sem_after_next_sem,
+					'sem' => $ausbildungssemester
 				);
 
 				// NOTE(chris): Sancho mail
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 5d3560cbc..f1fcce95f 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -149,6 +149,15 @@ class AntragLib
 			if (isError($result))
 				$errors[] = getError($result);
 			else {
+				$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent ps','studiengang_kz');
+				$result = $this->_ci->StudiengangModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
+				$stg = '';
+				$orgform = '';
+				if (hasData($result)) {
+					$studiengang = current(getData($result));
+					$stg = $studiengang->bezeichnung;
+					$orgform = $studiengang->orgform_kurzbz;
+				}
 				if ($antrag->typ == Studierendenantrag_model::TYP_ABMELDUNG)
 				{
 					$resultPrestudentStatus = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail($antrag->prestudent_id);
@@ -177,12 +186,25 @@ class AntragLib
 
 						$result = $this->_ci->PersonModel->loadPrestudent($antrag->prestudent_id);
 						$data = [
-							'nameStudent' => $this->_ci->p->t('person', 'studentIn')
+							'student' => $this->_ci->p->t('person', 'studentIn'),
+							'sem' => $antrag->studiensemester_kurzbz,
+							'linkPdf' => base_url('content/pdfExport.php?xml=Antrag' . $antrag->typ . '.xml.php&xsl=Antrag' . $antrag->typ . '&id=' . $antrag->studierendenantrag_id . '&output=pdf')
 						];
 						if (hasData($result)) {
 							$person = current(getData($result));
-							$data['nameStudent'] = trim($person->vorname . ' ' . $person->nachname);
+							$data['student'] = trim($person->vorname . ' ' . $person->nachname);
+							$data['vorname'] = $person->vorname;
+							$data['nachname'] = $person->nachname;
 						}
+						$result = $this->_ci->StudentModel->loadWhere(['prestudent_id'=> $antrag->prestudent_id]);
+						if (hasData($result)) {
+							$student = current(getData($result));
+							$data['UID'] = $student->student_uid;
+						}
+
+						$data['Orgform'] = $orgform;
+						$data['stg'] = $stg;
+
 						// NOTE(chris): Sancho mail
 						sendSanchoMail($vorlage, $data, $prestudent_status->email, $subject);
 					}
@@ -221,8 +243,12 @@ class AntragLib
 					if (hasData($res)) {
 						$person = current(getData($res));
 						$name = trim($person->vorname . ' ' . $person->nachname);
+						$vorname = $person->vorname;
+						$nachname = $person->nachname;
 					} else {
 						$name = $this->_ci->p->t('person', 'studentIn');
+						$vorname = '';
+						$nachname = $name;
 					}
 					$res = $this->_ci->KontaktModel->getZustellKontakt($prestudent->person_id, ['email']);
 					if (hasData($res)) {
@@ -235,7 +261,11 @@ class AntragLib
 							'Sancho_Mail_Antrag_A_' . $vorlage,
 							[
 								'name' => $name,
-								'grund' => $antrag->grund
+								'grund' => $antrag->grund,
+								'vorname' => $vorname,
+								'nachname' => $nachname,
+								'Orgform' => $orgform,
+								'stg' => $stg
 							],
 							$email,
 							$this->_ci->p->t('studierendenantrag', 'mail_subject_A_' . $vorlage)
@@ -281,9 +311,6 @@ class AntragLib
 
 		$status = current(getData($result));
 
-		if ($grund)
-			$grund = $this->_ci->p->t('studierendenantrag', 'mail_part_grund', ['grund' => $grund]);
-
 		$result = $this->_ci->StudierendenantragstatusModel->insert([
 			'studierendenantrag_id' => $studierendenantrag_id,
 			'studierendenantrag_statustyp_kurzbz' => Studierendenantragstatus_model::STATUS_OBJECTION_DENIED,
@@ -312,6 +339,8 @@ class AntragLib
 				if (hasData($res)) {
 					$person = current(getData($res));
 					$name = trim($person->vorname . ' ' . $person->nachname);
+					$vorname = $person->vorname;
+					$nachname = $person->nachname;
 				} else {
 					$name = $this->_ci->p->t('person', 'studentIn');
 				}
@@ -319,11 +348,26 @@ class AntragLib
 				if (hasData($res)) {
 					$kontakt = current(getData($res));
 					$email = $kontakt->kontakt;
+
+					$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent ps','studiengang_kz');
+					$res = $this->_ci->StudiengangModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
+					$stg = '';
+					$orgform = '';
+					if (hasData($res)) {
+						$studiengang = current(getData($res));
+						$stg = $studiengang->bezeichnung;
+						$orgform = $studiengang->orgform_kurzbz;
+					}
+
 					sendSanchoMail(
 						'Sancho_Mail_Antrag_A_ObjDenied',
 						[
 							'name' => $name,
-							'grund' => $grund
+							'vorname' => $vorname,
+							'nachname' => $nachname,
+							'grund' => $grund,
+							'Orgform' => $orgform,
+							'stg' => $stg
 						],
 						$email,
 						$this->_ci->p->t('studierendenantrag', 'mail_subject_A_ObjectionDenied')
@@ -405,6 +449,7 @@ class AntragLib
 				'<br>Details:<br>' .
 				$error_msg;
 			} else {
+
 				$data = getData($data);
 
 				$result = $this->_ci->StudierendenantragstatusModel->insert([
@@ -432,17 +477,17 @@ class AntragLib
 
 						// Prestudentstatus und Unterbrechungsfolgeaktionen setzen
 					$result = $this->_ci->prestudentlib->setUnterbrecher(
-                        $resultAntrag->prestudent_id,
-                        $resultAntrag->studiensemester_kurzbz,
-                        $studierendenantrag_id
-                    );
+						$resultAntrag->prestudent_id,
+						$resultAntrag->studiensemester_kurzbz,
+						$studierendenantrag_id
+					);
 
 					if (isError($result)) {
 						$this->_ci->StudierendenantragstatusModel->delete($studierendenantrag_status_id);
 						return $result;
 					}
 
-							//Mail
+					//Mail
 					$subject = $this->_ci->p->t('studierendenantrag', 'mail_subject_U_Approve');
 					$mail = [];
 
@@ -456,15 +501,15 @@ class AntragLib
 					{
 						if (isset($data['errors']['person']))
 						{
-									//send assistenz mit id
+							//send assistenz mit id
 							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_mail_and_name', [
-                                'message' => $data['errors']['email'] . '<br>' . $data['errors']['person']
-                            ]);
+								'message' => $data['errors']['email'] . '<br>' . $data['errors']['person']
+							]);
 							$mail['ass'] = $this->_ci->p->t('studierendenantrag', 'StudentIn', ['prestudent_id' => $data['antrag']->prestudent_id]);
 						}
 						else
 						{
-									//send assistenz mit name
+							//send assistenz mit name
 							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_mail', ['message' => $data['errors']['email']]);
 							$mail['ass'] = trim($data['person']->vorname . ' ' . $data['person']->nachname);
 						}
@@ -473,14 +518,14 @@ class AntragLib
 					{
 						if (isset($data['errors']['person']))
 						{
-									//send assistenz mit id & student mit "Student/in"
+							//send assistenz mit id & student mit "Student/in"
 							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_name', ['message' => $data['errors']['person']]);
 							$mail['ass'] = $this->_ci->p->t('studierendenantrag', 'StudentIn', ['prestudent_id' => $data['antrag']->prestudent_id]);
 							$mail['stu'] = $this->_ci->p->t('person', 'StudentIn');
 						}
 						else
 						{
-									//send normal
+							//send normal
 							$mail['ass'] = $mail['stu'] = trim($data['person']->vorname . ' ' . $data['person']->nachname);
 						}
 					}
@@ -492,7 +537,11 @@ class AntragLib
 						if (!sendSanchoMail(
 							$mailVorlage,
 							[
-								'name' => $mail['ass']
+								'name' => $mail['ass'],
+								'stg' => $data['studiengang']->bezeichnung,
+								'Orgform' => $data['studiengang']->orgform_kurzbz,
+								'vorname' => $data['person']->vorname,
+								'nachname' => $data['person']->nachname
 							],
 							$data['prestudent_status']->email,
 							$subject
@@ -505,7 +554,11 @@ class AntragLib
 						if (!sendSanchoMail(
 							$mailVorlage,
 							[
-								'name' => $mail['stu']
+								'name' => $mail['stu'],
+								'stg' => $data['studiengang']->bezeichnung,
+								'Orgform' => $data['studiengang']->orgform_kurzbz,
+								'vorname' => $data['person']->vorname,
+								'nachname' => $data['person']->nachname
 							],
 							$data['email'],
 							$subject
@@ -577,10 +630,14 @@ class AntragLib
 						if (isset($data['errors']['person'])) {
 							//send student mit "Student/in"
 							$errors[] = $this->_ci->p->t('studierendenantrag', 'error_name', ['message' => $data['errors']['person']]);
-							$name = 'Student/in';
+							$name = $this->_ci->p->t('person', 'studentIn');
+							$vorname = "";
+							$nachname = $name;
 						} else {
 							//send normal
 							$name = trim($data['person']->vorname . ' ' . $data['person']->nachname);
+							$vorname = $data['person']->vorname;
+							$nachname = $data['person']->nachname;
 						}
 					}
 					if ($name)
@@ -589,7 +646,11 @@ class AntragLib
 							'Sancho_Mail_Antrag_U_Reject',
 							[
 								'name' => $name,
+								'vorname' => $vorname,
+								'nachname' => $nachname,
 								'grund' => $grund,
+								'stg' => $data['studiengang']->bezeichnung,
+								'Orgform' => $data['studiengang']->orgform_kurzbz,
 								'prestudent_id' => $data['prestudent_status']->prestudent_id,
 								'abmeldungLink' => site_url('lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id),
 								'abmeldungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Studierendenantrag/abmeldung/' . $data['prestudent_status']->prestudent_id
@@ -627,7 +688,16 @@ class AntragLib
 			return error($this->_ci->p->t('studierendenantrag', 'error_no_antrag_found', ['id' => $studierendenantrag_id]));
 
 		$result['antrag'] = $antrag = current($res);
-
+		$this->_ci->StudiengangModel->addJoin('public.tbl_prestudent ps','studiengang_kz');
+		$res = $this->_ci->StudiengangModel->loadWhere(['prestudent_id' => $antrag->prestudent_id]);
+		if (hasData($res)) {
+			$result['studiengang'] = current(getData($res));
+		}
+		else{
+			$result['studiengang'] = new stdClass();
+			$result['studiengang']->bezeichnung = "";
+			$result['studiengang']->orgform_kurzbz = "";
+		}
 
 		$res = $this->_ci->PrestudentstatusModel->getLastStatusWithStgEmail($antrag->prestudent_id);
 		if (isError($res))
@@ -1491,6 +1561,13 @@ class AntragLib
 			$mitarbeiter = getData($result);
 		}
 
+		$result = $this->_ci->StudentModel->loadWhere(['prestudent_id'=> $antrag->prestudent_id]);
+		if (hasData($result)) {
+			$student = current(getData($result));
+			$student_uid = $student->student_uid;
+		}
+		else
+			$student_uid = '';
 
 		// NOTE(chris): Sancho mail
 		if (!sendSanchoMail(
@@ -1500,7 +1577,9 @@ class AntragLib
 				'stg' => $stg->bezeichnung,
 				'sem' => $semester,
 				'student' => $student,
-				'mitarbeiter' => $mitarbeiter
+				'mitarbeiter' => $mitarbeiter,
+				'Orgform' => $stg->orgform_kurzbz,
+				'UID' => $student_uid
 			],
 			$email,
 			$this->_ci->p->t('studierendenantrag', 'mail_subject_W_Approve')
@@ -1518,18 +1597,18 @@ class AntragLib
 			$result = $this->getLvsForAntrag($antrag_id);
 			if (hasData($result)) {
 				$lvs = getData($result);
-				foreach ($lvs as $semester => $lv_list) {
+				foreach ($lvs as $sem => $lv_list) {
 					$lvs_filtered = array_filter($lv_list, function ($el) {
 						return $el->antrag_zugelassen;
 					});
-					if (substr($semester, 0, 1) == '1') {
-						$sem_not_allowed = substr($semester, 1);
+					if (substr($sem, 0, 1) == '1') {
+						$sem_not_allowed = substr($sem, 1);
 						$list_not_allowed = array_map(function ($el) {
 							return $el->bezeichnung . '(' . $el->lehrform_kurzbz . ')';
 						}, $lvs_filtered);
 						$list_not_allowed = '<ul><li>' . implode('</li><li>', $list_not_allowed) . '</li></ul>';
 					} else {
-						$sem_to_repeat = substr($semester, 1);
+						$sem_to_repeat = substr($sem, 1);
 						$list_to_repeat = array_map(function ($el) {
 							return $el->bezeichnung . '(' . $el->lehrform_kurzbz . ')';
 						}, $lvs_filtered);
@@ -1550,7 +1629,8 @@ class AntragLib
 					'sem_not_allowed' => $sem_not_allowed,
 					'list_not_allowed' => $list_not_allowed,
 					'sem_to_repeat' => $sem_to_repeat,
-					'list_to_repeat' => $list_to_repeat
+					'list_to_repeat' => $list_to_repeat,
+					'Orgform' => $stg->orgform_kurzbz
 				],
 				$email,
 				$this->_ci->p->t('studierendenantrag', 'mail_subject_W_Student')

From 2fe9bda46b9463ac2a0c6ffbca1a36f5a7a871e3 Mon Sep 17 00:00:00 2001
From: Nikolaus Krondraf <krondraf@technikum-wien.at>
Date: Wed, 30 Aug 2023 14:40:52 +0200
Subject: [PATCH 139/175] =?UTF-8?q?l=C3=A4ngeres=20G=C3=BCltigkeitsdatum?=
 =?UTF-8?q?=20hinzugef=C3=BCgt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 content/zutrittskarte.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/content/zutrittskarte.php b/content/zutrittskarte.php
index c936400da..21f6e53d0 100644
--- a/content/zutrittskarte.php
+++ b/content/zutrittskarte.php
@@ -270,7 +270,8 @@ foreach ($uid_arr as $uid)
 					'matrikelnummer' => rtrim($student->matrikelnr),
 					'matr_nr' => $person->matr_nr,
 					'ausstellungsdatum' => date('M.Y'),
-					'gueltigbis' => $datum_obj->formatDatum($gueltigbis, 'd.m.Y')
+					'gueltigbis' => $datum_obj->formatDatum($gueltigbis, 'd.m.Y'),
+                    'gueltigbis_3jahre' => date('d.m.Y', strtotime('+3 years'))
 				);
 			}
 		}

From 1b1f45e6903f3eaf0351a6460223980c1a5c1de4 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Thu, 31 Aug 2023 08:33:17 +0200
Subject: [PATCH 140/175] bugfix Studiengang

---
 application/controllers/jobs/AntragJob.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 1211a6abe..6bd4e29d6 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -26,7 +26,7 @@ class AntragJob extends JOB_Controller
 		$this->load->model('person/Kontakt_model', 'KontaktModel');
 		$this->load->model('crm/Student_model', 'StudentModel');
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
-
+		$this->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 	}
 
 	/**
@@ -511,6 +511,8 @@ class AntragJob extends JOB_Controller
 				$fristende = new DateTime($prestudent->datum);
 				$fristende->add(DateInterval::createFromDateString($modifier_deadline));
 
+				$datum_kp = new DateTime($prestudent->datum);
+
 				$result = $this->StudiensemesterModel->getNextFrom($prestudent->studiensemester_kurzbz);
 				$next_sem = "";
 				$sem_after_next_sem = "";
@@ -522,7 +524,6 @@ class AntragJob extends JOB_Controller
 					}
 				}
 
-//prestudentstatus
 				$this->load->model('crm/Prestudentstatus_model', 'PrestudentstatusModel');
 				$result = $this->PrestudentstatusModel->loadLastWithStgDetails($prestudent->prestudent_id, $prestudent->studiensemester_kurzbz);
 				if (hasData($result)) {
@@ -534,9 +535,9 @@ class AntragJob extends JOB_Controller
 					'vorname' => $prestudent->vorname,
 					'nachname' => $prestudent->nachname,
 					'pers_kz'=> $prestudent->matrikelnr,
-					'studiengang' => $prestudent->bezeichnung,
+					'stg' => $prestudent->bezeichnung,
 					'lvbezeichnung' => $prestudent->lvbezeichnung,
-					'datum_kp' => $prestudent->datum,
+					'datum_kp' => $datum_kp->format('d.m.Y'),
 					'studiensemester'=> $prestudent->studiensemester_kurzbz,
 					'Orgform'=> $prestudent->orgform,
 					'prestudent_id' => $prestudent->prestudent_id,

From f81c9939f7582958e7210c413f14bbdf2d13599b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 31 Aug 2023 08:39:21 +0200
Subject: [PATCH 141/175] config default wert korrigiert

---
 application/config/studierendenantrag.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
index fc62fcdb0..159ead759 100644
--- a/application/config/studierendenantrag.php
+++ b/application/config/studierendenantrag.php
@@ -77,7 +77,7 @@ $config['wiederholung_job_request_1_date_modifier'] = '+0 days';
  * @var string           A string formated as PHP DateTime modifier
  * @see https://www.php.net/manual/de/datetime.modify.php
  */
-$config['wiederholung_job_request_2_date_modifier'] = '+3 months';
+$config['wiederholung_job_request_2_date_modifier'] = '+3 weeks';
 
 /**
  * Final deadline - after this the student will be abgemeldet if he hasn't chosen yet

From 60246100e6a620ed8c61616ec15bf3c857f82943 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 31 Aug 2023 09:24:43 +0200
Subject: [PATCH 142/175] Bugfix: missing phrases

---
 application/controllers/components/Antrag/Wiederholung.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/controllers/components/Antrag/Wiederholung.php b/application/controllers/components/Antrag/Wiederholung.php
index e7fde6031..515771224 100644
--- a/application/controllers/components/Antrag/Wiederholung.php
+++ b/application/controllers/components/Antrag/Wiederholung.php
@@ -41,6 +41,7 @@ class Wiederholung extends FHC_Controller
 
 		// Load language phrases
 		$this->loadPhrases([
+			'global',
 			'studierendenantrag'
 		]);
 	}

From 7f0d716bd83ad1dda6b7d7d6469081074f0b525c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Thu, 31 Aug 2023 09:25:17 +0200
Subject: [PATCH 143/175] Finale Finalisierung Emailvariablen

---
 application/libraries/AntragLib.php               | 2 ++
 application/models/crm/Prestudentstatus_model.php | 1 +
 2 files changed, 3 insertions(+)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index f1fcce95f..360d0e16c 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -836,6 +836,8 @@ class AntragLib
 				'Sancho_Mail_Antrag_W_New',
 				[
 					'antrag_id' => $antrag_id,
+					'stg' => $prestudent_status->stg_bezeichnung,
+					'Orgform' => $prestudent_status->orgform,
 					'lvzuweisungLink' => site_url('lehre/Antrag/Wiederholung/assistenz/' . $antrag_id),
 					'lvzuweisungLinkCIS' => CIS_ROOT . 'index.ci.php/lehre/Antrag/Wiederholung/assistenz/' . $antrag_id
 				],
diff --git a/application/models/crm/Prestudentstatus_model.php b/application/models/crm/Prestudentstatus_model.php
index 16f82fea5..d12ebd68d 100644
--- a/application/models/crm/Prestudentstatus_model.php
+++ b/application/models/crm/Prestudentstatus_model.php
@@ -243,6 +243,7 @@ class Prestudentstatus_model extends DB_Model
 						tbl_orgform.bezeichnung_mehrsprachig AS bezeichnung_orgform,
 						tbl_status.bezeichnung_mehrsprachig,
 						tbl_status_grund.bezeichnung_mehrsprachig AS bezeichnung_statusgrund,
+						tbl_studiengang.bezeichnung AS stg_bezeichnung,
 						tbl_studiengang.email');
 		$this->addJoin('lehre.tbl_studienplan', 'studienplan_id', 'LEFT');
 		$this->addJoin('lehre.tbl_studienordnung', 'studienordnung_id', 'LEFT');

From 4175ecc209e231f28da159bccf276d55ed492bb3 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpenko@technikum-wien.at>
Date: Tue, 5 Sep 2023 16:49:19 +0200
Subject: [PATCH 144/175] UHSTAT1 form: added firstname and lastname of student

---
 application/controllers/codex/UHSTAT1.php | 17 +++++++++++++++++
 application/views/codex/uhstat1.php       |  6 ++++++
 2 files changed, 23 insertions(+)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index 0795959c7..6bbd4d4f8 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -279,8 +279,11 @@ class UHSTAT1 extends FHC_Controller
 	private function _getFormMetaData()
 	{
 		$person_id = $this->_getValidPersonId('s');
+
+		// read only display param
 		$readOnly = $this->input->get('readOnly');
 
+		// depending on permissions, editing or deleting is possible
 		$editPermission = $this->_checkPermission('sui');
 		$deletePermission = $this->_checkPermission('suid');
 
@@ -297,6 +300,20 @@ class UHSTAT1 extends FHC_Controller
 			'readOnly' => $readOnly
 		);
 
+		// get person data
+		$this->load->model('person/Person_model', 'PersonModel');
+		$this->PersonModel->addSelect("vorname, nachname");
+		$personRes = $this->PersonModel->load($person_id);
+
+		if (isError($personRes)) return $personRes;
+
+		if (hasData($personRes))
+		{
+			$person = getData($personRes)[0];
+			$formMetaData['vorname'] = $person->vorname;
+			$formMetaData['nachname'] = $person->nachname;
+		}
+
 		$nationTextFieldName = $languageIdx == 1 ? 'langtext' : 'engltext';
 
 		// get nation list
diff --git a/application/views/codex/uhstat1.php b/application/views/codex/uhstat1.php
index 2d9bc5ebf..a09f9c70a 100644
--- a/application/views/codex/uhstat1.php
+++ b/application/views/codex/uhstat1.php
@@ -32,6 +32,12 @@ $saved = isset($saved) && $saved === true;
 ?>
 
 <div class='container' id='uhstat1Container'>
+	<h1 class="text-center">
+		<?php echo isset($formMetaData['nachname'])
+			? 'UHSTAT1 Daten für '.(isset($formMetaData['vorname']) ? $formMetaData['vorname'].' ' : '').$formMetaData['nachname']
+			: ''
+		?>
+	</h1>
 	<div id="uhstat1Subcontainer">
 		<input type='hidden' id='uhstat1Saved' value='<?php echo $saved ? 1 : 0 ?>' />
 		<h2><?php echo $this->p->t('uhstat', 'uhstat1AnmeldungUeberschrift') ?></h2>

From 38da37980debbdefd298297586b4db3574409012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 7 Sep 2023 15:34:55 +0200
Subject: [PATCH 145/175] Fehlerhaftes Escaping korrigiert damit inserts mit
 standard_conforming_strings funktioniert

---
 ...1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
index 2fbff6713..aaa412d88 100644
--- a/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
+++ b/system/dbupdate_3.4/29835_uhstat1_erfassung_der_uhstat1_daten_ueber_das_bewerbungstool.php
@@ -26,10 +26,10 @@ if (!$result = @$db->db_query('SELECT 1 FROM bis.tbl_abschluss LIMIT 1'))
 			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(110, 'Pflichtschule', '{\"Pflichtschule (mit/ohne Abschluss)\", \"Compulsory school (Completed/not completed)\"}', true);
 			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(121, 'Lehre', '{\"Lehre\", \"Apprenticeship\"}', true);
 			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(122, 'Mittlere Schule ohne Matura', '{\"Mittlere Schule ohne Matura (z.B. Handelsschule, Fachschule)\", \"School for intermediate vocational education (without university entrance qualification)\"}', true);
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(123, 'Meisterprüfung', '{\"Meisterprüfung\", \"Master craftsman\'s diploma\"}', true);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(123, 'Meisterprüfung', '{\"Meisterprüfung\", \"Master craftsman''s diploma\"}', true);
 			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(131, 'AHS', '{\"AHS (allgemein bildende höhere Schule)\", \"Academic secondary school\"}', true);
 			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(132, 'BHS', '{\"BHS (berufsbildende höhere Schule, z.B. HAK, HTL)\", \"College for higher vocational education\"}', true);
-			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(133, 'Sonstige Hochschulzugangsberechtigung', '{\"Sonstige Hochschulzugangsberechtigung (z.B. Berufsreifeprüfung)\", \"Other university entrance qualification (e.g. \'Berufsreifeprüfung\')\"}', true);
+			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(133, 'Sonstige Hochschulzugangsberechtigung', '{\"Sonstige Hochschulzugangsberechtigung (z.B. Berufsreifeprüfung)\", \"Other university entrance qualification (e.g. ''Berufsreifeprüfung'')\"}', true);
 			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(141, 'Akademie', '{\"Akademie (z.B. PÄDAK, SOZAK)\", \"Academy (for example PÄDAK, SOZAK)\"}', true);
 			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(142, 'Universität/Hochschule', '{\"Universität/Hochschule\", \"University/university of applied sciences/university college of teacher education\"}', true);
 			INSERT INTO bis.tbl_abschluss(ausbildung_code, abschluss_bez, bezeichnung, in_oesterreich) VALUES(210, 'Pflichtschule', '{\"Pflichtschule (mit/ohne Abschluss)\", \"Compulsory school (Completed/not completed)\"}', false);

From 2a77fb361a06199190a3d6727134d55500c01452 Mon Sep 17 00:00:00 2001
From: nkrondraf <krondraf@technikum-wien.at>
Date: Thu, 14 Sep 2023 10:32:09 +0200
Subject: [PATCH 146/175] raise version number of API to 0.6

---
 include/dvb.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/include/dvb.class.php b/include/dvb.class.php
index c264ca4a7..b9a738da2 100644
--- a/include/dvb.class.php
+++ b/include/dvb.class.php
@@ -39,8 +39,8 @@ class dvb extends basis_db
 	const DVB_URL_WEBSERVICE_NACHNAME = DVB_PORTAL.'/rws/0.2/simpleStudentByNachname.xml';
 	const DVB_URL_WEBSERVICE_NAME = DVB_PORTAL.'/rws/0.2/simpleStudentByName.xml';
 	const DVB_URL_WEBSERVICE_MATRIKELNUMMER = DVB_PORTAL.'/rws/0.2/simpleStudentByMatrikelnummer.xml';
-	const DVB_URL_WEBSERVICE_RESERVIERUNG = DVB_PORTAL.'/rws/0.5/matrikelreservierung.xml';
-	const DVB_URL_WEBSERVICE_MELDUNG = DVB_PORTAL.'/rws/0.5/matrikelmeldung.xml';
+	const DVB_URL_WEBSERVICE_RESERVIERUNG = DVB_PORTAL.'/rws/0.6/matrikelreservierung.xml';
+	const DVB_URL_WEBSERVICE_MELDUNG = DVB_PORTAL.'/rws/0.6/matrikelmeldung.xml';
 	const DVB_URL_WEBSERVICE_BPK = DVB_PORTAL.'/rws/0.5/pruefebpk.xml';
 
 	public $authentication;

From e8c7ecf1ee231f8d46c783360a074c522de986be Mon Sep 17 00:00:00 2001
From: nkrondraf <krondraf@technikum-wien.at>
Date: Thu, 14 Sep 2023 10:50:04 +0200
Subject: [PATCH 147/175] =?UTF-8?q?Besuch=20der=20LV=20kann=20nun=203=20Se?=
 =?UTF-8?q?mester=20in=20Vergangenheit=20liegen=20f=C3=BCr=20Pr=C3=BCfungs?=
 =?UTF-8?q?anmeldung?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/lehre/pruefung/pruefungsanmeldung.json.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
index e201fbe30..6757cf391 100644
--- a/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
+++ b/cis/private/lehre/pruefung/pruefungsanmeldung.json.php
@@ -419,7 +419,7 @@ function saveAnmeldung($aktStudiensemester = null, $uid = null)
 				$semCounter = $fakultaeten[1]["sem"];
 				break;
 			default:
-				$semCounter = 2;
+				$semCounter = 3;
 				break;
 			}
 		}

From 47c956bf1ef1473642166bb858a7da93c53a6a1d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 18 Sep 2023 12:22:21 +0200
Subject: [PATCH 148/175] Geburtsdatum Format korrigiert

---
 include/dvb.class.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/include/dvb.class.php b/include/dvb.class.php
index b9a738da2..92b5dd9d5 100644
--- a/include/dvb.class.php
+++ b/include/dvb.class.php
@@ -829,7 +829,8 @@ class dvb extends basis_db
 			if (ErrorHandler::isError($result))
 				return ErrorHandler::error();
 		}
-		$gebdat = str_replace("-", "", $person->geburtsdatum);
+		//$gebdat = str_replace("-", "", $person->geburtsdatum);
+		$gebdat = $person->geburtsdatum;
 
 		$data = '<?xml version="1.0" encoding="UTF-8"?>
 		<matrikelnummernmeldung xmlns="http://www.brz.gv.at/datenverbund-unis">
@@ -1038,7 +1039,7 @@ class dvb extends basis_db
 			<ausstellland>'.$reisepass->ausstellland.'</ausstellland>
 			<dokumentnr>'.$reisepass->dokumentnr.'</dokumentnr>
 			<dokumenttyp>'.$reisepass->dokumenttyp.'</dokumenttyp>
-			</ernpmeldung>		
+			</ernpmeldung>
 		';
 		$data .= '</matrikelnummernmeldung>';
 

From 4242f75fde65dce7b6cf8effa359d7fe156f1466 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 18 Sep 2023 12:35:45 +0200
Subject: [PATCH 149/175] Hiweistext bei Geburtsdatumsformat korrigiert bei
 Testclient

---
 soap/datenverbund_client.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/soap/datenverbund_client.php b/soap/datenverbund_client.php
index 0f2a2ba19..3f6052e75 100644
--- a/soap/datenverbund_client.php
+++ b/soap/datenverbund_client.php
@@ -230,7 +230,7 @@ if ($getPersonData)
 		printrow('matrikelnummer', 'Matrikelnummer', $matrikelnr);
 		printrow('nachname', 'Nachname', $nachname, '', 255);
 		printrow('vorname', 'Vorname', $vorname, '', 30);
-		printrow('geburtsdatum', 'Geburtsdatum', $geburtsdatum, 'Format: YYYYMMDD', 10);
+		printrow('geburtsdatum', 'Geburtsdatum', $geburtsdatum, 'Format: YYYY-MM-DD', 10);
 		printrow('geschlecht', 'Geschlecht', $geschlecht, 'Format: M | W', 1);
 		printrow('postleitzahl', 'Postleitzahl', $postleitzahl, '', 10);
     }

From e886b4742b314a5374e1d44ed3abe49b22e2c9aa Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 19 Sep 2023 14:56:30 +0200
Subject: [PATCH 150/175] Neue Mailvorlagen Sancho_Mail_Antrag_U_Student(SB)

---
 application/libraries/AntragLib.php | 31 +++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 360d0e16c..4d136fb2c 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -487,6 +487,7 @@ class AntragLib
 						return $result;
 					}
 
+
 					//Mail
 					$subject = $this->_ci->p->t('studierendenantrag', 'mail_subject_U_Approve');
 					$mail = [];
@@ -529,11 +530,26 @@ class AntragLib
 							$mail['ass'] = $mail['stu'] = trim($data['person']->vorname . ' ' . $data['person']->nachname);
 						}
 					}
-					$mailVorlage = 'Sancho_Mail_Antrag_U_Approve';
-					if ($data['studienbeitrag'])
-						$mailVorlage .= '_SB';
+
 					if (isset($mail['ass'])) {
 						// NOTE(chris): Sancho mail
+						$mailVorlage = 'Sancho_Mail_Antrag_U_Approve';
+
+						$result = $this->_ci->StudentModel->loadWhere(['prestudent_id'=> $data['antrag']->prestudent_id]);
+						if (hasData($result)) {
+							$student = current(getData($result));
+							$data['UID'] = $student->student_uid;
+						}
+
+						$result = $this->_ci->PersonModel->getFullName($insertvon);
+						if (isError($result))
+							return $result;
+						$approvedBy = $insertvon;
+						if (hasData($result))
+						{
+							$approvedBy = getData($result);
+						}
+
 						if (!sendSanchoMail(
 							$mailVorlage,
 							[
@@ -541,7 +557,11 @@ class AntragLib
 								'stg' => $data['studiengang']->bezeichnung,
 								'Orgform' => $data['studiengang']->orgform_kurzbz,
 								'vorname' => $data['person']->vorname,
-								'nachname' => $data['person']->nachname
+								'nachname' => $data['person']->nachname,
+								'UID' => $data['UID'],
+								'sem' => $resultAntrag->studiensemester_kurzbz,
+								'linkPdf' => base_url('content/pdfExport.php?xml=AntragUnterbrechung.xml.php&xsl=AntragUnterbrechung&id=' . $studierendenantrag_id . '&output=pdf'),
+								'insertvon' => $approvedBy
 							],
 							$data['prestudent_status']->email,
 							$subject
@@ -551,6 +571,9 @@ class AntragLib
 					}
 					if (isset($mail['stu'])) {
 						// NOTE(chris): Sancho mail
+						$mailVorlage = 'Sancho_Mail_Antrag_U_Student';
+						if ($data['studienbeitrag'])
+							$mailVorlage .= '_SB';
 						if (!sendSanchoMail(
 							$mailVorlage,
 							[

From 972e9b7025d446a9ae17478903e7253115ed6da1 Mon Sep 17 00:00:00 2001
From: KarpAlex <karpen_ko@hotmail.com>
Date: Mon, 25 Sep 2023 16:45:39 +0200
Subject: [PATCH 151/175] UHSTAT1 form: nations with sperre = true are not
 loaded

---
 application/controllers/codex/UHSTAT1.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/controllers/codex/UHSTAT1.php b/application/controllers/codex/UHSTAT1.php
index 6bbd4d4f8..4486f9d74 100644
--- a/application/controllers/codex/UHSTAT1.php
+++ b/application/controllers/codex/UHSTAT1.php
@@ -321,7 +321,7 @@ class UHSTAT1 extends FHC_Controller
 
 		$this->NationModel->addSelect("nation_code, $nationTextFieldName AS nation_text");
 		$this->NationModel->addOrder("nation_text");
-		$nationRes = $this->NationModel->load();
+		$nationRes = $this->NationModel->loadWhere('sperre IS NULL OR sperre = FALSE');
 
 		if (isError($nationRes)) return $nationRes;
 

From 4fcf4a57d10e520fa1c1ebe197120ed44f818600 Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Wed, 27 Sep 2023 09:57:39 +0200
Subject: [PATCH 152/175] Adaptierung rdfs mit CDATA

---
 rdf/AntragAbmeldung.xml.php     | 17 +++++++++--------
 rdf/AntragAbmeldungStgl.xml.php | 18 +++++++++---------
 rdf/AntragUnterbrechung.xml.php | 21 ++++++++++++---------
 3 files changed, 30 insertions(+), 26 deletions(-)

diff --git a/rdf/AntragAbmeldung.xml.php b/rdf/AntragAbmeldung.xml.php
index 177c37a96..dc59b57a0 100644
--- a/rdf/AntragAbmeldung.xml.php
+++ b/rdf/AntragAbmeldung.xml.php
@@ -55,14 +55,15 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
 	<antrag>
-		<studiengang><?=$row->bezeichnung;?></studiengang>
-		<organisationsform><?=$row->bezeichnung_mehrsprachig;?> </organisationsform>
-		<name><?= trim($row->vorname. " " . $row->nachname);?></name>
-		<personenkz><?=$row->matrikelnr;?></personenkz>
-		<studienjahr><?php echo $row->studienjahr_kurzbz;?></studienjahr>
-		<studiensemester><?php echo $row->studiensemester_kurzbz;?></studiensemester>
-		<semester><?=$row->semester;?></semester>
-		<grund><?=$row->grund;?></grund>
+        <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+        <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
+        <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
+        <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
+        <studienjahr><![CDATA[<?= $row->studienjahr_kurzbz; ?>]]></studienjahr>
+        <studiensemester><![CDATA[<?= $row->studiensemester_kurzbz; ?>]]></studiensemester>
+        <semester><![CDATA[<?= $row->semester; ?>]]></semester>
+        <grund><![CDATA[<?= $row->grund; ?>]]></grund>
 	</antrag>
 	<?php } ?>
 </antraege>
+
diff --git a/rdf/AntragAbmeldungStgl.xml.php b/rdf/AntragAbmeldungStgl.xml.php
index 32b65c887..55d940457 100644
--- a/rdf/AntragAbmeldungStgl.xml.php
+++ b/rdf/AntragAbmeldungStgl.xml.php
@@ -54,15 +54,15 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <?xml version='1.0' encoding='UTF-8' standalone='yes'?>
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
-	<antrag>
-		<studiengang><?=$row->bezeichnung;?></studiengang>
-		<organisationsform><?=$row->bezeichnung_mehrsprachig;?> </organisationsform>
-		<name><?= trim($row->vorname. " " . $row->nachname);?></name>
-		<personenkz><?=$row->matrikelnr;?></personenkz>
-		<studienjahr><?php echo $row->studienjahr_kurzbz;?></studienjahr>
-		<studiensemester><?php echo $row->studiensemester_kurzbz;?></studiensemester>
-		<semester><?=$row->semester;?></semester>
-		<grund><?=$row->grund;?></grund>
+        <antrag>
+            <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+            <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
+            <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
+            <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
+            <studienjahr><![CDATA[<?= $row->studienjahr_kurzbz; ?>]]></studienjahr>
+            <studiensemester><![CDATA[<?= $row->studiensemester_kurzbz; ?>]]></studiensemester>
+            <semester><![CDATA[<?= $row->semester; ?>]]></semester>
+            <grund><![CDATA[<?= $row->grund; ?>]]></grund>
 	</antrag>
 	<?php } ?>
 </antraege>
diff --git a/rdf/AntragUnterbrechung.xml.php b/rdf/AntragUnterbrechung.xml.php
index cbf7eaeb8..6945f66ef 100644
--- a/rdf/AntragUnterbrechung.xml.php
+++ b/rdf/AntragUnterbrechung.xml.php
@@ -56,15 +56,18 @@ if (!$db->db_query($query) || !$db->db_num_rows())
 <antraege>
 	<?php while($row = $db->db_fetch_object()) { ?>
 	<antrag>
-		<studiengang><?=$row->bezeichnung;?></studiengang>
-		<organisationsform><?=$row->bezeichnung_mehrsprachig;?> </organisationsform>
-		<name><?= trim($row->vorname. " " . $row->nachname);?></name>
-		<personenkz><?=$row->matrikelnr;?></personenkz>
-		<studienjahr><?php echo $row->studienjahr_kurzbz;?></studienjahr>
-		<semester><?=$row->semester;?></semester>
-		<grund><?=$row->grund;?></grund>
-		<returndate><?=(new DateTime($row->datum_wiedereinstieg))->format('d.m.Y');?></returndate>
-		<createdate><?= (new DateTime($row->datum))->format('d.m.Y');?></createdate>
+        <name><![CDATA[<?= trim($row->vorname . $row->nachname); ?>]]></name>
+        <studiengang><![CDATA[<?= $row->bezeichnung; ?>]]></studiengang>
+        <organisationsform><![CDATA[<?= $row->bezeichnung_mehrsprachig; ?>]]></organisationsform>
+        <personenkz><![CDATA[<?= $row->matrikelnr; ?>]]></personenkz>
+        <studienjahr><![CDATA[<?= $row->studienjahr_kurzbz; ?>]]></studienjahr>
+        <studiensemester><![CDATA[<?= $row->studiensemester_kurzbz; ?>]]></studiensemester>
+        <semester><![CDATA[<?= $row->semester; ?>]]></semester>
+        <grund><![CDATA[<?= $row->grund; ?>]]></grund>
+		<returndate><![CDATA[<?=(new DateTime($row->datum_wiedereinstieg))->format('d.m.Y');?>]]></returndate>
+		<createdate><![CDATA[<?= (new DateTime($row->datum))->format('d.m.Y');?>]]></createdate>
 	</antrag>
 	<?php } ?>
 </antraege>
+
+

From 137c5f28ec00543e4e4e2230f5bc8a29f408237f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 28 Sep 2023 14:27:35 +0200
Subject: [PATCH 153/175] modify Phrasen.js so that it can be used by
 composition api and does not use legacy categories at all

---
 public/js/mixins/Phrasen.js | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
index fd954579a..edaf4d101 100644
--- a/public/js/mixins/Phrasen.js
+++ b/public/js/mixins/Phrasen.js
@@ -44,6 +44,7 @@ function getValueForLoadedPhrase(category, phrase, params) {
 	return result;
 }
 
+
 const phrasen = {
 	t_ref(category, phrase, params) {
 		if (params === undefined && (
@@ -58,8 +59,9 @@ const phrasen = {
 			return '';
 		}
 		if (!categories[category]) {
-			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined)
-				categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+
+			//if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined)
+			//	categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
 			
 			if (!categories[category] || Object.keys(categories[category]).length === 0) {
 				categories[category] = undefined;
@@ -83,3 +85,16 @@ export default {
 		}
 	}
 }
+
+// Composable (wrapper for mixin)
+export function usePhrasen() {
+
+	function t(category, phrase, params) {
+		return phrasen.t(category, phrase, params);
+	}
+
+	return {		
+		t,
+	}
+
+}

From af3588aa610f320864c820ae5eda5c1a235629a9 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 28 Sep 2023 15:45:03 +0200
Subject: [PATCH 154/175] revert commented lines for the moment until there is
 a better solution

---
 public/js/mixins/Phrasen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
index edaf4d101..bf11f8435 100644
--- a/public/js/mixins/Phrasen.js
+++ b/public/js/mixins/Phrasen.js
@@ -60,8 +60,8 @@ const phrasen = {
 		}
 		if (!categories[category]) {
 
-			//if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined)
-			//	categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined)
+				categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
 			
 			if (!categories[category] || Object.keys(categories[category]).length === 0) {
 				categories[category] = undefined;

From a237cb1808f71fbd416d90eba594e474f32aeb93 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 28 Sep 2023 15:58:35 +0200
Subject: [PATCH 155/175] check if there are any entries

---
 application/controllers/components/Antrag/Leitung.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/application/controllers/components/Antrag/Leitung.php b/application/controllers/components/Antrag/Leitung.php
index a429625ae..f6b184351 100644
--- a/application/controllers/components/Antrag/Leitung.php
+++ b/application/controllers/components/Antrag/Leitung.php
@@ -101,7 +101,10 @@ class Leitung extends FHC_Controller
 				$this->output->set_status_header(500);
 				return $this->outputJson('Internal Server Error');
 			}
-			$antraege = getData($result);
+			if(hasData($result))
+			{
+			    $antraege = getData($result);
+			}
 		}
 
 		$this->outputJson($antraege);

From c828fe2ee4a94ac5c7d68d83fde6e6fc54170560 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 29 Sep 2023 12:58:30 +0200
Subject: [PATCH 156/175] =?UTF-8?q?Version=20f=C3=BCr=20Legacy=20BPK=20Sch?=
 =?UTF-8?q?nittstelle=20angepasst?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 include/dvb.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/include/dvb.class.php b/include/dvb.class.php
index 92b5dd9d5..fbeb79afc 100644
--- a/include/dvb.class.php
+++ b/include/dvb.class.php
@@ -41,7 +41,7 @@ class dvb extends basis_db
 	const DVB_URL_WEBSERVICE_MATRIKELNUMMER = DVB_PORTAL.'/rws/0.2/simpleStudentByMatrikelnummer.xml';
 	const DVB_URL_WEBSERVICE_RESERVIERUNG = DVB_PORTAL.'/rws/0.6/matrikelreservierung.xml';
 	const DVB_URL_WEBSERVICE_MELDUNG = DVB_PORTAL.'/rws/0.6/matrikelmeldung.xml';
-	const DVB_URL_WEBSERVICE_BPK = DVB_PORTAL.'/rws/0.5/pruefebpk.xml';
+	const DVB_URL_WEBSERVICE_BPK = DVB_PORTAL.'/rws/0.6/pruefebpk.xml';
 
 	public $authentication;
 	private $username;

From 54bcf837812cf9e2d5a1a689ae989ba9e2fc8219 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 2 Oct 2023 11:06:34 +0200
Subject: [PATCH 157/175] s&d

---
 .../controllers/components/Antrag/Unterbrechung.php   |  2 +-
 application/libraries/AntragLib.php                   | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/application/controllers/components/Antrag/Unterbrechung.php b/application/controllers/components/Antrag/Unterbrechung.php
index 4d89a5cb6..33bd0035d 100644
--- a/application/controllers/components/Antrag/Unterbrechung.php
+++ b/application/controllers/components/Antrag/Unterbrechung.php
@@ -86,7 +86,7 @@ class Unterbrechung extends FHC_Controller
 
 		$data = getData($result);
 
-		$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($data->studiengang_kz, $data->studiensemester_kurzbz, $data->semester);
+		$data->studiensemester = $this->antraglib->getSemesterForUnterbrechung($data->studiensemester_kurzbz);
 
 		$this->outputJsonSuccess($data);
 	}
diff --git a/application/libraries/AntragLib.php b/application/libraries/AntragLib.php
index 4d136fb2c..6cad6c2bf 100644
--- a/application/libraries/AntragLib.php
+++ b/application/libraries/AntragLib.php
@@ -1421,17 +1421,12 @@ class AntragLib
 		return success($resultDetails);
 	}
 
-	public function getSemesterForUnterbrechung($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester)
+	public function getSemesterForUnterbrechung($studiensemester_kurzbz)
 	{
-		$this->_ci->load->model('organisation/Studienplan_model', 'StudienplanModel');
 		$this->_ci->load->model('organisation/Studiensemester_model', 'StudiensemesterModel');
 
 		$semester = [];
 
-		$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $studiensemester_kurzbz, $ausbildungssemester);
-		if (!hasData($result))
-			return $semester;
-
 		$result = $this->_ci->StudiensemesterModel->getNextFrom($studiensemester_kurzbz);
 		if (!hasData($result))
 			return $semester;
@@ -1442,10 +1437,6 @@ class AntragLib
 			'wiedereinstieg' => [$nextSem]
 		];
 
-		$result = $this->_ci->StudienplanModel->getStudienplaeneBySemester($studiengang_kz, $nextSem->studiensemester_kurzbz, $ausbildungssemester+1);
-		if (!hasData($result))
-			return $semester;
-
 		$result = $this->_ci->StudiensemesterModel->getNextFrom($nextSem->studiensemester_kurzbz);
 		if (!hasData($result))
 			return $semester;

From ad191f3f9050754ecb28008b19236eecdd628e86 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 2 Oct 2023 11:06:53 +0200
Subject: [PATCH 158/175] Optische Verbesserungen select field

---
 .../components/Studierendenantrag/Form/Unterbrechung.js   | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Form/Unterbrechung.js b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
index 14e57f797..2459dec17 100644
--- a/public/js/components/Studierendenantrag/Form/Unterbrechung.js
+++ b/public/js/components/Studierendenantrag/Form/Unterbrechung.js
@@ -277,11 +277,13 @@ export default {
 					<div v-if="data.studierendenantrag_id">
 						{{datumWsFormatted}}
 					</div>
-					<div v-else-if="stsem === null" class="form-control">
-						{{p.t('ui/select_studiensemester')}}
+					<div v-else-if="stsem === null">
+						<select class="form-select" disabled>
+							<option selected>{{p.t('ui/select_studiensemester')}}</option>
+						</select>
 					</div>
 					<div v-else>
-						<select v-model="currentWiedereinstieg" class="form-control">
+						<select v-model="currentWiedereinstieg" class="form-select">
 							<option v-for="sem in data.studiensemester[stsem].wiedereinstieg" :key="sem.studiensemester_kurzbz" :value="sem.start">
 								{{sem.studiensemester_kurzbz}}
 							</option>

From cda93ce85be022f9caecb8fd7fb73a14abf9f1ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 5 Oct 2023 08:14:32 +0200
Subject: [PATCH 159/175] Fixed PHP81 Warning on Loading Adresses

---
 rdf/adresse.rdf.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rdf/adresse.rdf.php b/rdf/adresse.rdf.php
index ac557fb98..fd6a76d19 100644
--- a/rdf/adresse.rdf.php
+++ b/rdf/adresse.rdf.php
@@ -100,7 +100,7 @@ function draw_rdf($row)
             <ADRESSE:gemeinde><![CDATA['.$row->gemeinde.']]></ADRESSE:gemeinde>
             <ADRESSE:nation><![CDATA['.$row->nation.']]></ADRESSE:nation>
             <ADRESSE:typ><![CDATA['.$row->typ.']]></ADRESSE:typ>
-            <ADRESSE:typ_name><![CDATA['.$row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE].']]></ADRESSE:typ_name>
+            <ADRESSE:typ_name><![CDATA['.(isset($row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE])?$row->bezeichnung_mehrsprachig[DEFAULT_LANGUAGE]:'').']]></ADRESSE:typ_name>
             <ADRESSE:heimatadresse><![CDATA['.($row->heimatadresse?'Ja':'Nein').']]></ADRESSE:heimatadresse>
             <ADRESSE:zustelladresse><![CDATA['.($row->zustelladresse?'Ja':'Nein').']]></ADRESSE:zustelladresse>
             <ADRESSE:co_name><![CDATA['. $row->co_name.']]></ADRESSE:co_name>

From 3ab8fd22f48ed35731d478921fb03e6fbca54b7e Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 6 Oct 2023 20:22:05 +0200
Subject: [PATCH 160/175] minor layout changes

---
 application/views/lehre/Antrag/Leitung/List.php        |  1 +
 public/css/cis_bs5.css                                 | 10 ++++++++++
 .../js/components/Studierendenantrag/Leitung/Table.js  | 10 ++++++++--
 3 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/application/views/lehre/Antrag/Leitung/List.php b/application/views/lehre/Antrag/Leitung/List.php
index 3dffacf3f..9c0749dae 100644
--- a/application/views/lehre/Antrag/Leitung/List.php
+++ b/application/views/lehre/Antrag/Leitung/List.php
@@ -13,6 +13,7 @@ $sitesettings = array(
 	'primevue3' => true,
 	'phrases' => array(
 		'global',
+		'ui',
 		'studierendenantrag',
 		'lehre',
 		'person',
diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
index 9ee7cd848..d4fc7960c 100644
--- a/public/css/cis_bs5.css
+++ b/public/css/cis_bs5.css
@@ -59,8 +59,18 @@ h6, .h6 {
 
 .fhc-container {
 	padding: 0 15px;
+	max-width: 100%;
 }
 
 .tabulator {
 	font-size: var(--bs-body-font-size);
 }
+
+.fhc-container .tabulator .tabulator-frozen {
+	background-color: #fff !important;
+}
+
+.fhc-container .tabulator .tabulator-header .tabulator-col,
+.fhc-container .tabulator-row .tabulator-cell {
+	border-right: 1px solid #dee2e6;
+}
diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 8cbfdd9d7..2af674a0f 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -86,8 +86,8 @@ export default {
 		this.table = new Tabulator(this.$refs.table, {
 			placeholder:"Keine zu bearbeitenden Datensätze",
 			movableColumns: true,
-			height: '50vh',
-			layout: "fitDataStretch", // TODO(chris): wont work when changed
+			maxHeight: '50vh',
+			layout: "fitDataFill", // TODO(chris): wont work when changed
 			ajaxURL: this.ajaxUrl,
 			persistence: { // NOTE(chris): do not store column titles
 				sort: true, //persist column sorting
@@ -214,6 +214,10 @@ export default {
 				}
 			}, {
 				field: 'actions',
+				frozen: true,
+				title: this.p.t('ui', 'aktion'),
+				headerFilter: false,
+				headerSort: false,				
 				formatter: (cell, formatterParams, onRendered) => {
 					let container = document.createElement('div'),
 						data = cell.getData();
@@ -325,9 +329,11 @@ export default {
 					}
 
 					// TODO(chris): not yet perfect
+					/*
 					onRendered(() => {
 						cell.getColumn().setWidth(true);
 					});
+					*/
 
 					return container;
 				}

From c1a53a1be352c20a89ab123797e0180a4dfb155f Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Mon, 9 Oct 2023 11:47:02 +0200
Subject: [PATCH 161/175] do not use phrases from FHC_JS_PHRASES_STORAGE_OBJECT
 at all

---
 public/js/mixins/Phrasen.js | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
index bf11f8435..b94bc5702 100644
--- a/public/js/mixins/Phrasen.js
+++ b/public/js/mixins/Phrasen.js
@@ -59,13 +59,18 @@ const phrasen = {
 			return '';
 		}
 		if (!categories[category]) {
-
-			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined)
-				categories[category] = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+			
+			var initialval = '';
+  			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) {
+  				var category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+				if(category[phrase] !== undefined ) {
+					initialval = category[phrase];
+				}
+			}
 			
 			if (!categories[category] || Object.keys(categories[category]).length === 0) {
 				categories[category] = undefined;
-				let val = Vue.ref('');
+				let val = Vue.ref(initialval);
 				loadLazy(category, val, phrase, params);
 				return val;
 			}

From 17d5cff1784663d617c5f6b206cf3b84001df77b Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Mon, 9 Oct 2023 15:13:00 +0200
Subject: [PATCH 162/175] slightly better css

---
 public/css/cis_bs5.css | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
index d4fc7960c..4bc5a24f4 100644
--- a/public/css/cis_bs5.css
+++ b/public/css/cis_bs5.css
@@ -66,11 +66,30 @@ h6, .h6 {
 	font-size: var(--bs-body-font-size);
 }
 
-.fhc-container .tabulator .tabulator-frozen {
-	background-color: #fff !important;
+.fhc-container .tabulator {
+	border-left: 1px solid #dee2e6;
+}
+.fhc-container .tabulator .tabulator-row {
+	border-bottom: none;
+}
+.fhc-container .tabulator .tabulator-row .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row .tabulator-cell {
+	border-bottom: 1px solid #dee2e6;
+}
+.fhc-container .tabulator .tabulator-row.tabulator-row-even {
+	background-color: transparent;
+}
+.fhc-container .tabulator .tabulator-headers .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-row-odd .tabulator-cell {
+	background-color: #fff;
+}
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-cell {
+	background-color: #f2f2f2;
 }
 
-.fhc-container .tabulator .tabulator-header .tabulator-col,
-.fhc-container .tabulator-row .tabulator-cell {
+.fhc-container .tabulator .tabulator-col,
+.fhc-container .tabulator .tabulator-cell {
 	border-right: 1px solid #dee2e6;
 }

From c5b246dc8e132937e08937adae4d98109c22c5ce Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 13:08:43 +0200
Subject: [PATCH 163/175] CSS table row hovering

---
 public/css/cis_bs5.css | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/public/css/cis_bs5.css b/public/css/cis_bs5.css
index 4bc5a24f4..48a5bfb1b 100644
--- a/public/css/cis_bs5.css
+++ b/public/css/cis_bs5.css
@@ -88,6 +88,10 @@ h6, .h6 {
 .fhc-container .tabulator .tabulator-row.tabulator-row-even .tabulator-cell {
 	background-color: #f2f2f2;
 }
+.fhc-container .tabulator .tabulator-row.tabulator-selectable:hover .tabulator-frozen,
+.fhc-container .tabulator .tabulator-row.tabulator-selectable:hover .tabulator-cell {
+	background-color: #ececec;
+}
 
 .fhc-container .tabulator .tabulator-col,
 .fhc-container .tabulator .tabulator-cell {

From 0a25982fa20ff95782d0137c464be909f6274a71 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 13:09:28 +0200
Subject: [PATCH 164/175] Do not allow frozen columns to be invisible

---
 public/js/components/Studierendenantrag/Leitung/Table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 2af674a0f..d28b2e4ab 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -344,7 +344,7 @@ export default {
 			let columnData = [];
 			for (let col of columns) {
 				let def = col.getDefinition();
-				if (def.title) {
+				if (def.title && !def.frozen) {
 					columnData.push({
 						title: def.title,
 						visible: col.isVisible(),

From 5010a1653a382cc6f6a5855c63002b4c63c65b66 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 13:09:43 +0200
Subject: [PATCH 165/175] cleaner config

---
 application/config/studierendenantrag.php | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/application/config/studierendenantrag.php b/application/config/studierendenantrag.php
index 159ead759..c5ebc0d80 100644
--- a/application/config/studierendenantrag.php
+++ b/application/config/studierendenantrag.php
@@ -110,11 +110,10 @@ $config['abmeldung_job_deadline_date_modifier'] = '+2 weeks';
 
 /**
  * System User - uid of a user that is allowed to set prestudentstatus
- * TODO(chris): DEBUG! CHANGE THIS!
  *
  * @var string
  */
-$config['antrag_job_systemuser'] = 'ma0168';
+$config['antrag_job_systemuser'] = '';
 
 
 /**

From b5ce0ba7ed255b025a19ae30d96802dfafa15311 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 13:12:51 +0200
Subject: [PATCH 166/175] Remove unnecessary comment

---
 public/js/components/Studierendenantrag/Leitung/Table.js | 7 -------
 1 file changed, 7 deletions(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index d28b2e4ab..18c72f762 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -328,13 +328,6 @@ export default {
 						container.append(button);
 					}
 
-					// TODO(chris): not yet perfect
-					/*
-					onRendered(() => {
-						cell.getColumn().setWidth(true);
-					});
-					*/
-
 					return container;
 				}
 			}]

From 6137cf3347a90755b158c84c62660f1e5921600e Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 14:11:21 +0200
Subject: [PATCH 167/175] Remove unnecessary comment

---
 public/js/components/Studierendenantrag/Leitung/Table.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/components/Studierendenantrag/Leitung/Table.js b/public/js/components/Studierendenantrag/Leitung/Table.js
index 18c72f762..ea8dae107 100644
--- a/public/js/components/Studierendenantrag/Leitung/Table.js
+++ b/public/js/components/Studierendenantrag/Leitung/Table.js
@@ -87,7 +87,7 @@ export default {
 			placeholder:"Keine zu bearbeitenden Datensätze",
 			movableColumns: true,
 			maxHeight: '50vh',
-			layout: "fitDataFill", // TODO(chris): wont work when changed
+			layout: "fitDataFill",
 			ajaxURL: this.ajaxUrl,
 			persistence: { // NOTE(chris): do not store column titles
 				sort: true, //persist column sorting

From ebdd6a2040d03b9ece17ed0cf0b20b71ba9de506 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Tue, 10 Oct 2023 14:16:32 +0200
Subject: [PATCH 168/175] =?UTF-8?q?Bug:=20Wiederholer=20Reminder=20werden?=
 =?UTF-8?q?=20nicht=20versandt=20-=20Fehlerquelle=20Datumsbereich=20wenn?=
 =?UTF-8?q?=20Pr=C3=BCfungen=20mehr=20als=20ein=20Monat=20verteilt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/controllers/jobs/AntragJob.php    | 75 +++++++++------
 .../models/education/Pruefung_model.php       | 96 +++++++++++++++----
 2 files changed, 122 insertions(+), 49 deletions(-)

diff --git a/application/controllers/jobs/AntragJob.php b/application/controllers/jobs/AntragJob.php
index 6bd4e29d6..6f5747232 100644
--- a/application/controllers/jobs/AntragJob.php
+++ b/application/controllers/jobs/AntragJob.php
@@ -426,40 +426,56 @@ class AntragJob extends JOB_Controller
 		$modifier_request_2 = $this->config->item('wiederholung_job_request_2_date_modifier');
 		$modifier_deadline = $this->config->item('wiederholung_job_deadline_date_modifier');
 
-		if ($modifier_deadline)
-		{
+		$digi_start = $this->config->item('digitalization_start');
+		if ($digi_start) {
+			try {
+				$digi_start = new DateTime($digi_start);
+			} catch(Exception $e) {
+			}
+		}
+
+		if ($modifier_deadline) {
 			$dateDeadline = new DateTime();
 			$dateDeadline->sub(DateInterval::createFromDateString($modifier_deadline));
+			
+			if ($digi_start)
+				$dateDeadline = max($digi_start, $dateDeadline);
+		} else {
+			$dateDeadline = $digi_start ?: null;
 		}
-		else
-			$dateDeadline = null;
 
 		//first request
-		if ($modifier_request_1)
-			$this->sendReminder(
-				'Request1',
-				null,
-				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
-				$dateDeadline,
-				$modifier_request_1,
-				$modifier_deadline,
-				'Aufforderung: Bekanntgabe Wiederholung'
-			);
-		else
+		if ($modifier_request_1) {
+			$dateStichtag = new DateTime();
+			$dateStichtag->sub(DateInterval::createFromDateString($modifier_request_1));
+			if (!$dateDeadline || $dateStichtag > $dateDeadline)
+				$this->sendReminder(
+					'Request1',
+					null,
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+					$dateDeadline,
+					$dateStichtag,
+					$modifier_deadline,
+					'Aufforderung: Bekanntgabe Wiederholung'
+				);
+		} else
 			$this->logError('Config "wiederholung_job_request_1_date_modifier" nicht gesetzt');
 
 		//second request
-		if ($modifier_request_2)
-			$this->sendReminder(
-				'Request2',
-				Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
-				Studierendenantragstatus_model::STATUS_REQUESTSENT_2,
-				$dateDeadline,
-				$modifier_request_2,
-				$modifier_deadline,
-				'Reminder Aufforderung: Bekanntgabe Wiederholung'
-			);
-		else
+		if ($modifier_request_2) {
+			$dateStichtag = new DateTime();
+			$dateStichtag->sub(DateInterval::createFromDateString($modifier_request_2));
+			if (!$dateDeadline || $dateStichtag > $dateDeadline)
+				$this->sendReminder(
+					'Request2',
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_1,
+					Studierendenantragstatus_model::STATUS_REQUESTSENT_2,
+					$dateDeadline,
+					$dateStichtag,
+					$modifier_deadline,
+					'Reminder Aufforderung: Bekanntgabe Wiederholung'
+				);
+		} else
 			$this->logError('Config "wiederholung_job_request_2_date_modifier" nicht gesetzt');
 
 		$this->logInfo('Ende Job sendAufforderungWiederholer');
@@ -479,14 +495,11 @@ class AntragJob extends JOB_Controller
 		return $result;
 	}
 
-	protected function sendReminder($name, $status_from, $status_to, $deadline, $date_modifier, $modifier_deadline, $subject)
+	protected function sendReminder($name, $status_from, $status_to, $deadline, $date_stichtag, $modifier_deadline, $subject)
 	{
 		$this->logInfo('Start Job sendAufforderungWiederholer ' . $name);
 
-		$dateStichtag = new DateTime();
-		$dateStichtag->sub(DateInterval::createFromDateString($date_modifier));
-
-		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed($status_from, $dateStichtag, $deadline);
+		$result = $this->PruefungModel->getAllPrestudentsWhereCommitteeExamFailed($status_from, $date_stichtag, $deadline);
 
 		if(isError($result))
 		{
diff --git a/application/models/education/Pruefung_model.php b/application/models/education/Pruefung_model.php
index 813a74179..83bf9b7f8 100644
--- a/application/models/education/Pruefung_model.php
+++ b/application/models/education/Pruefung_model.php
@@ -117,8 +117,74 @@ class Pruefung_model extends DB_Model
         return $this->db->get_compiled_select($this->dbTable);
     }
 
+	/**
+	 * @return stdClass
+	 */
+	public function loadWhereCommitteeExamsFailed()
+	{
+		$this->dbTable = 'lehre.tbl_pruefung p';
+
+		$this->addSelect('p.datum');
+
+		$this->addJoin('lehre.tbl_note n', 'note');
+
+		$this->db->where("n.positiv", false);
+		$this->db->where_in("p.pruefungstyp_kurzbz", ['kommPruef','zusKommPruef']);
+
+		return $this->load();
+	}
 
 
+	/**
+	 * @return void
+	 */
+	protected function withDetailsForStudierendenAntrag()
+	{
+		$this->load->config('studierendenantrag');
+
+		$sprache_index = "SELECT index FROM public.tbl_sprache WHERE sprache='" . getUserLanguage() . "' LIMIT 1";
+
+		$this->addSelect('pers.vorname');
+		$this->addSelect('pers.nachname');
+		$this->addSelect('pers.person_id');
+		$this->addSelect('s.matrikelnr');
+		$this->addSelect('g.bezeichnung');
+		$this->addSelect('g.studiengang_kz');
+		$this->addSelect('o.bezeichnung_mehrsprachig[(' . $sprache_index . ')] AS orgform', false);
+		$this->addSelect('ps.prestudent_id');
+		$this->addSelect('lv.bezeichnung as lvbezeichnung');
+		$this->addSelect('le.studiensemester_kurzbz');
+		$this->addSelect('a.typ');
+		$this->addSelect('campus.get_status_studierendenantrag(a.studierendenantrag_id) status');
+
+		$this->addJoin('lehre.tbl_lehreinheit le', 'lehreinheit_id');
+		$this->addJoin('lehre.tbl_lehrveranstaltung lv', 'lehrveranstaltung_id');
+		$this->addJoin('public.tbl_student s', 'student_uid');
+		$this->addJoin('public.tbl_prestudent ps', 'prestudent_id');
+		$this->addJoin('public.tbl_person pers', 'person_id');
+		$this->addJoin('public.tbl_benutzer b', 's.student_uid=b.uid');
+		$this->addJoin('public.tbl_studiengang g', 'ps.studiengang_kz=g.studiengang_kz');
+		$this->addJoin('bis.tbl_orgform o', 'g.orgform_kurzbz=o.orgform_kurzbz');
+		$this->addJoin('campus.tbl_studierendenantrag a', 'ps.prestudent_id=a.prestudent_id and a.typ=' . $this->escape(Studierendenantrag_model::TYP_WIEDERHOLUNG), 'LEFT');
+
+		$this->db->where_in("get_rolle_prestudent(ps.prestudent_id, null)", $this->config->item('antrag_prestudentstatus_whitelist'));
+
+		$this->db->where("g.aktiv", true);
+
+		$statusgruende = $this->config->item('status_gruende_wiederholer');
+		if (is_array($statusgruende) && !isEmptyArray($statusgruende)) {
+			foreach ($statusgruende as $k => $v) {
+				$statusgruende[$k] = $this->db->escape($v);
+			}
+			$this->db->where('lv.studiengang_kz NOT IN(
+				SELECT ps1.studiengang_kz
+				FROM
+				public.tbl_prestudent ps1
+				JOIN public.tbl_prestudentstatus pss USING (prestudent_id)
+				WHERE pss.statusgrund_id in (' . implode(',', $statusgruende) . ')
+				AND ps.prestudent_id = ps1.prestudent_id)', null, false);
+		}
+	}
 
 	/**
 	 * @param integer		$prestudent_id student_uid
@@ -127,23 +193,23 @@ class Pruefung_model extends DB_Model
 	 */
 	public function loadWhereCommitteeExamFailedForPrestudent($prestudent_id)
 	{
+		$this->withDetailsForStudierendenAntrag();
 
-		$sql = $this->loadWhereThreeExamsFailed();
+		$this->db->where('ps.prestudent_id', $prestudent_id);
 
-        $statusgruende = $this->config->item('status_gruende_wiederholer');
-        if (!is_array($statusgruende))
-            $statusgruende = [];
-
-        return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3 AND prestudent_id = ?', [
-			Studierendenantrag_model::TYP_WIEDERHOLUNG,
-			$statusgruende,
-			$prestudent_id
-		]);
+		return $this->loadWhereCommitteeExamsFailed();
 	}
 
+	/**
+	 * @param string		$status
+	 * @param \DateTime		$maxDate
+	 * @param \DateTime		$minDate
+	 *
+	 * @return stdClass
+	 */
 	public function getAllPrestudentsWhereCommitteeExamFailed($status, $maxDate, $minDate)
 	{
-		$this->load->model('education/Studierendenantrag_model', 'StudierendenantragModel');
+		$this->withDetailsForStudierendenAntrag();
 
 		if ($maxDate)
 			$this->db->where("p.datum < ", $maxDate->format('c'));
@@ -170,12 +236,6 @@ class Pruefung_model extends DB_Model
 			$this->db->where('campus.get_status_studierendenantrag(a.studierendenantrag_id)', $status);
 		}
 
-		$sql = $this->loadWhereThreeExamsFailed();
-
-		$statusgruende = $this->config->item('status_gruende_wiederholer');
-		if (!is_array($statusgruende))
-			$statusgruende = [];
-
-		return $this->execQuery('select * from ( ' . $sql . ') temp where count >= 3', [Studierendenantrag_model::TYP_WIEDERHOLUNG, $statusgruende]);
+		return $this->loadWhereCommitteeExamsFailed();
 	}
 }

From af89ec394220845b606a1bfda54610a02c784083 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 11 Oct 2023 14:43:43 +0200
Subject: [PATCH 169/175] Bugfix: Phrasen: local variable has overwritten
 function parameter

---
 public/js/mixins/Phrasen.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
index b94bc5702..3af8a6c92 100644
--- a/public/js/mixins/Phrasen.js
+++ b/public/js/mixins/Phrasen.js
@@ -62,9 +62,9 @@ const phrasen = {
 			
 			var initialval = '';
   			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) {
-  				var category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
+  				var tmp_category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
 				if(category[phrase] !== undefined ) {
-					initialval = category[phrase];
+					initialval = tmp_category[phrase];
 				}
 			}
 			

From 95d3b6ac5bdd74cdc90de547f14423b5d663d99f Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 11 Oct 2023 14:57:44 +0200
Subject: [PATCH 170/175] Bugfix: Phrasen: local variable has overwritten
 function parameter

---
 public/js/mixins/Phrasen.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/public/js/mixins/Phrasen.js b/public/js/mixins/Phrasen.js
index 3af8a6c92..6c27f87bb 100644
--- a/public/js/mixins/Phrasen.js
+++ b/public/js/mixins/Phrasen.js
@@ -63,7 +63,7 @@ const phrasen = {
 			var initialval = '';
   			if (window.FHC_JS_PHRASES_STORAGE_OBJECT !== undefined) {
   				var tmp_category = extractCategory(FHC_JS_PHRASES_STORAGE_OBJECT, category);
-				if(category[phrase] !== undefined ) {
+				if(tmp_category[phrase] !== undefined ) {
 					initialval = tmp_category[phrase];
 				}
 			}

From 9d31cdffe6f67d45de4d3edf57014ffa6082efa9 Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Wed, 11 Oct 2023 14:59:54 +0200
Subject: [PATCH 171/175] Bugfix: handle reload event of Table.js

---
 public/js/components/Studierendenantrag/Leitung.js | 1 +
 1 file changed, 1 insertion(+)

diff --git a/public/js/components/Studierendenantrag/Leitung.js b/public/js/components/Studierendenantrag/Leitung.js
index 747ad7123..da883acbc 100644
--- a/public/js/components/Studierendenantrag/Leitung.js
+++ b/public/js/components/Studierendenantrag/Leitung.js
@@ -347,6 +347,7 @@ export default {
 			@action:objectionDeny="actionoObjectionDeny"
 			@action:objectionApprove="actionObjectionApprove"
 			@action:cancel="actionCancel"
+			@reload="reload"
 			>
 		</leitung-table>
 

From b5c0c14e2aeca527d737c8753d4c347508f0c9d6 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Wed, 11 Oct 2023 19:20:40 +0200
Subject: [PATCH 172/175] fix typo

---
 system/phrasesupdate.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index d405692ba..4567365c2 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -21427,7 +21427,7 @@ array(
 		'phrases' => array(
 			array(
 				'sprache' => 'German',
-				'text' => 'Die Abmeldung vom Studium kann hier durchführt werden.',
+				'text' => 'Die Abmeldung vom Studium kann hier durchgeführt werden.',
 				'description' => '',
 				'insertvon' => 'system'
 			),

From d06819f25fc6db54edd72a613364c8daf3ee6409 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Thu, 12 Oct 2023 16:07:20 +0200
Subject: [PATCH 173/175] comment out info_ studierendenantrag phrase

---
 system/phrasesupdate.php | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index 4567365c2..0a8407ad7 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -18936,6 +18936,9 @@ array(
 			)
 		)
 	),
+/*
+	// es kann fuer jede Kombination Typ und Status eine Phrase der Form info_<Typ>_<Status 
+	// erstellt werden, die dann in der Studierendenansicht in einer infobox angezeigt werden
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',
@@ -18956,6 +18959,7 @@ array(
 			)
 		)
 	),
+*/
 	array(
 		'app' => 'core',
 		'category' => 'studierendenantrag',

From 60ee3ec8f0367ac22b28e6ebff246a3968ce893f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 16 Oct 2023 10:26:23 +0200
Subject: [PATCH 174/175] =?UTF-8?q?UID=20Generierung=20bei=20Incoming=20um?=
 =?UTF-8?q?=20Nachname,=20Vorname=20erg=C3=A4nzt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 vilesci/personen/import/interessentenimport.php | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/vilesci/personen/import/interessentenimport.php b/vilesci/personen/import/interessentenimport.php
index 3cdfefb06..d1830eaeb 100644
--- a/vilesci/personen/import/interessentenimport.php
+++ b/vilesci/personen/import/interessentenimport.php
@@ -806,7 +806,12 @@ if (isset($_POST['save']))
 		$stg_obj = new studiengang();
 		$stg_obj->load(ltrim($stg,'0'));
 
-		$uid = generateUID($stg_obj->kurzbz,$jahr, $stg_obj->typ, $matrikelnr);
+		$nachname_clean = mb_strtolower(convertProblemChars($person->nachname));
+		$vorname_clean = mb_strtolower(convertProblemChars($person->vorname));
+		$nachname_clean = str_replace(' ','_', $nachname_clean);
+		$vorname_clean = str_replace(' ','_', $vorname_clean);
+
+		$uid = generateUID($stg_obj->kurzbz,$jahr, $stg_obj->typ, $matrikelnr, $vorname_clean, $nachname_clean);
 
 		//Benutzerdatensatz anlegen
 		$benutzer = new benutzer();
@@ -815,10 +820,6 @@ if (isset($_POST['save']))
 		$benutzer->aktiv = true;
 		$benutzer->aktivierungscode = generateActivationKey();
 
-		$nachname_clean = mb_strtolower(convertProblemChars($person->nachname));
-		$vorname_clean = mb_strtolower(convertProblemChars($person->vorname));
-		$nachname_clean = str_replace(' ','_', $nachname_clean);
-		$vorname_clean = str_replace(' ','_', $vorname_clean);
 
 		if (!defined('GENERATE_ALIAS_STUDENT') || GENERATE_ALIAS_STUDENT === true)
 		{

From 22d3b08a06367a8b92b87eee3d745a4fb8a20865 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 16 Oct 2023 11:08:34 +0200
Subject: [PATCH 175/175] Escaping von LVs mit Sonderzeichen

---
 rdf/lehrveranstaltungszeugnis_ktu.rdf.php | 132 +++++++++++-----------
 1 file changed, 66 insertions(+), 66 deletions(-)

diff --git a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
index e065925e7..9696978b3 100644
--- a/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
+++ b/rdf/lehrveranstaltungszeugnis_ktu.rdf.php
@@ -52,7 +52,7 @@ function breaktext($text, $zeichen)
 	$arr = explode(' ',$text);
 	$ret = '';
 	$teilstring='';
-	
+
 	foreach($arr as $elem)
 	{
 		if(strlen($teilstring.$elem)>$zeichen)
@@ -60,7 +60,7 @@ function breaktext($text, $zeichen)
 			$ret.=' '.$teilstring.'\n';
 			$teilstring=$elem;
 		}
-		else 
+		else
 			$teilstring .=' '.$elem;
 	}
 	$ret.=$teilstring;
@@ -72,9 +72,9 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 
 	if(isset($_GET['uid']))
 		$uid = $_GET['uid'];
-	else 
+	else
 		$uid = null;
-	
+
 	$uid_arr = explode(";",$uid);
 
 	if ($uid_arr[0] == "")
@@ -82,61 +82,61 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		unset($uid_arr[0]);
 		$uid_arr = array_values($uid_arr);
 	}
-	
+
 	$note_arr = array();
 	$note = new note();
 	$note->getAll($offiziell = true);
 	foreach ($note->result as $n){
 		$note_arr[$n->note] = $n->anmerkung;
-		$note_bezeichnung_arr[$n->note] = $n->bezeichnung;	
-	
+		$note_bezeichnung_arr[$n->note] = $n->bezeichnung;
+
 	}
 	if(isset($_GET['ss']))
 		$studiensemester_kurzbz = $_GET['ss'];
-	else 
+	else
 		die('Studiensemester muss uebergeben werden');
 
 	if(isset($_GET['lvid']))
 		$lehrveranstaltung_id = $_GET['lvid'];
-	else 
+	else
 		$lehrveranstaltung_id = 0;
-	
+
 	//Daten holen
 
-	$lqry = "SELECT 
-				tbl_person.titelpre, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpost 
-			FROM 
-				public.tbl_benutzer JOIN public.tbl_person using (person_id) 
-			WHERE 
-				tbl_benutzer.uid = (SELECT 
-										tbl_lehreinheitmitarbeiter.mitarbeiter_uid 
-									FROM 
-										lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehrfunktion USING(lehrfunktion_kurzbz), 
-										lehre.tbl_lehreinheit JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id) 
-									WHERE 
+	$lqry = "SELECT
+				tbl_person.titelpre, tbl_person.vorname, tbl_person.nachname, tbl_person.titelpost
+			FROM
+				public.tbl_benutzer JOIN public.tbl_person using (person_id)
+			WHERE
+				tbl_benutzer.uid = (SELECT
+										tbl_lehreinheitmitarbeiter.mitarbeiter_uid
+									FROM
+										lehre.tbl_lehreinheitmitarbeiter JOIN lehre.tbl_lehrfunktion USING(lehrfunktion_kurzbz),
+										lehre.tbl_lehreinheit JOIN lehre.tbl_lehrveranstaltung USING(lehrveranstaltung_id)
+									WHERE
 										tbl_lehreinheitmitarbeiter.lehreinheit_id = tbl_lehreinheit.lehreinheit_id AND
 										tbl_lehrveranstaltung.lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id)." AND
 										tbl_lehreinheit.studiensemester_kurzbz=".$db->db_add_param($studiensemester_kurzbz)."
 									ORDER BY tbl_lehrfunktion.standardfaktor desc limit 1)";
-	
+
 	$leiter_titel = '';
 	$leiter_vorname = '';
 	$leiter_nachname = '';
 	$leiter_titelpost = '';
-	
+
 	if($db->db_query($lqry))
 	{
 		if ($lrow = $db->db_fetch_object())
 		{
-			$leiter_titel = $lrow->titelpre;			
+			$leiter_titel = $lrow->titelpre;
 			$leiter_vorname = $lrow->vorname;
-			$leiter_nachname = $lrow->nachname;	
-			$leiter_titelpost = $lrow->titelpost;	
-		}		
+			$leiter_nachname = $lrow->nachname;
+			$leiter_titelpost = $lrow->titelpost;
+		}
 	}
-		
-	$qry = "SELECT wochen FROM public.tbl_semesterwochen 
-						WHERE (studiengang_kz, semester) in (SELECT studiengang_kz, semester 
+
+	$qry = "SELECT wochen FROM public.tbl_semesterwochen
+						WHERE (studiengang_kz, semester) in (SELECT studiengang_kz, semester
 						FROM lehre.tbl_lehrveranstaltung WHERE lehrveranstaltung_id=".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER).")";
 	$wochen = 15;
 	if($result_wochen = $db->db_query($qry))
@@ -146,7 +146,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$wochen = $row_wochen->wochen;
 		}
 	}
-	
+
 	$lehrveranstaltung=new lehrveranstaltung();
 	$lehrveranstaltung->load($lehrveranstaltung_id);
 	$sws=$lehrveranstaltung->semesterstunden/$wochen;
@@ -157,7 +157,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 	$lehrform = new lehrform($lehrform_kurzbz);
 	$lehrform_bezeichnung = $lehrform->bezeichnung;
 	$organisationseinheit = new organisationseinheit($lehrveranstaltung->oe_kurzbz);
-	
+
 	$lehreinheit=new lehreinheit();
 	$lehreinheit->load_lehreinheiten($lehrveranstaltung_id, $studiensemester_kurzbz);
 	if(count($lehreinheit->lehreinheiten)>=1)
@@ -169,11 +169,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$lehrfach_id='';
 		die('keine Lehreinheiten gefunden!');
 	}
-	
+
 	$lv_lehrfach=new lehrveranstaltung();
 	$lv_lehrfach->load($lehrfach_id);
 	$lehrfach_bezeichnung=$lv_lehrfach->bezeichnung;
-	
+
 /*	$lvqry = "SELECT * from lehre.tbl_lehrveranstaltung where lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
 	if($db->db_query($lvqry))
 	{
@@ -182,43 +182,43 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$sws = $lvrow->semesterstunden/$wochen;
 			$ects = $lvrow->ects;
 			$lvbezeichnung = $lvrow->bezeichnung;
-			$lvstg = $lvrow->studiengang_kz;			
-		}		
+			$lvstg = $lvrow->studiengang_kz;
+		}
 	} */
-	
+
 	$lehrinhalte = '';
 	$infoqry = "SELECT * FROM campus.tbl_lvinfo WHERE sprache='German' AND lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
 	if($db->db_query($infoqry))
 	{
 		if ($inforow = $db->db_fetch_object())
 		{
-			$lehrinhalte_arr = explode("<br>",$inforow->lehrinhalte);			
+			$lehrinhalte_arr = explode("<br>",$inforow->lehrinhalte);
 			for ($i = 0; $i < sizeof($lehrinhalte_arr); $i++)
 			{
-				$lehrinhalte .= $lehrinhalte_arr[$i].'\n';			
+				$lehrinhalte .= $lehrinhalte_arr[$i].'\n';
 			}
-		}		
-	}	
-	
+		}
+	}
+
 	$xml = "<?xml version='1.0' encoding='UTF-8' standalone='yes'?>";
 	$xml .= "<zertifikate>";
-	
+
 	$studiensemester = new studiensemester();
 	$studiensemester->load($studiensemester_kurzbz);
-			
+
 	for ($i = 0; $i < sizeof($uid_arr); $i++)
 	{
 		$anzahl_fussnoten=0;
 		$studiengang_typ='';
 		$xml_fussnote='';
-		
+
 		$query = "SELECT mitarbeiter_uid FROM lehre.tbl_lehreinheit as le
 			JOIN lehre.tbl_pruefung as p USING(lehreinheit_id)
 			JOIN lehre.tbl_lehrveranstaltung as lv USING(lehrveranstaltung_id)
 			WHERE p.student_uid = ".$db->db_add_param($uid_arr[$i])."
 			AND le.studiensemester_kurzbz = ".$db->db_add_param($studiensemester_kurzbz)."
 			AND lv.lehrveranstaltung_id = ".$db->db_add_param($lehrveranstaltung_id, FHC_INTEGER);
-		
+
 		$pruefer_uid='';
 		$pruefer_name='';
 		if($db->db_query($query))
@@ -231,7 +231,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		if($pruefer_uid!='')
 		{
 			$pruefer = new mitarbeiter($pruefer_uid);
-			$pruefer_name = trim($pruefer->titelpre.' '.$pruefer->vorname.' '.$pruefer->nachname.' '.$pruefer->titelpost);			
+			$pruefer_name = trim($pruefer->titelpre.' '.$pruefer->vorname.' '.$pruefer->nachname.' '.$pruefer->titelpost);
 		}
 
 		$query = "SELECT tbl_student.matrikelnr, tbl_student.studiengang_kz, tbl_studiengang.typ, tbl_studiengang.bezeichnung, tbl_person.vorname, tbl_person.nachname,tbl_person.gebdatum,tbl_person.titelpre, tbl_person.titelpost, tbl_person.geschlecht, tbl_person.matr_nr FROM tbl_person, tbl_student, tbl_studiengang, tbl_benutzer WHERE tbl_student.studiengang_kz = tbl_studiengang.studiengang_kz and tbl_student.student_uid = tbl_benutzer.uid and tbl_benutzer.person_id = tbl_person.person_id and tbl_student.student_uid = '".$uid_arr[$i]."'";
@@ -251,7 +251,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$stgl_ma = new mitarbeiter($stgleiter_uid);
 			$stgl .= trim($stgl_ma->titelpre.' '.$stgl_ma->vorname.' '.$stgl_ma->nachname.' '.$stgl_ma->titelpost);
 		}
-		
+
 		$student=new student();
 		$student->load($uid_arr[$i]);
 		$prestudent=new prestudent();
@@ -261,11 +261,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		{
 			if($status->studienplan_bezeichnung != '')
 			    $studienplan_bezeichnung=$status->studienplan_bezeichnung;
-			
+
 			if($status->studienplan_id != NULL)
 			    $studienplan_id = $status->studienplan_id;
 		}
-		
+
 		$xml .= "\n	<zertifikat>";
 		$xml .= "\n		<studiensemester>".$studiensemester_kurzbz."</studiensemester>";
 		$xml .= "\n		<vorname>".$row->vorname."</vorname>";
@@ -279,8 +279,8 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$xml .= "\n		<studiengangsleiter>".$stgl."</studiengangsleiter>";
 		$datum_aktuell = date('d.m.Y');
 		$xml .= "\n		<ort_datum>Wien, am ".$datum_aktuell."</ort_datum>";
-		
-		
+
+
 		$obj = new zeugnisnote();
 		$obj->load($lehrveranstaltung_id, $uid_arr[$i], $studiensemester_kurzbz);
 
@@ -298,10 +298,10 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			$uebernahmedatum = "";
 			$benotungsdatum = "";
 		}
-		
+
 		$stg = new studiengang();
 		$stg->load($lvstg);
-                
+
                 $xml .= "				<stg_studiengang_bezeichnung>".$stg_oe_obj->bezeichnung."</stg_studiengang_bezeichnung>";
 		$xml .= "				<lv_studiengang_bezeichnung>".$stg->bezeichnung."</lv_studiengang_bezeichnung>";
 		$xml .= "				<lv_studiengang_typ>".$stg->typ."</lv_studiengang_typ>";
@@ -318,20 +318,20 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		$xml .= "				<lehrform_kurzbz>".$lehrform_kurzbz."</lehrform_kurzbz>";
 		$xml .= "				<lehrform_bezeichnung>".$lehrform_bezeichnung."</lehrform_bezeichnung>";
 		$xml .= "				<sws>".($sws==0?'':number_format(sprintf('%.1F',$sws),1))."</sws>";
-		
+
 		$xml .= "				<lvleiter>".$leiter_titel." ".$leiter_vorname." ".$leiter_nachname.($leiter_titelpost!=''?', '.$leiter_titelpost:'')."</lvleiter>";
 		$xml .= "				<lehrinhalte><![CDATA[".clearHtmlTags($lehrinhalte)."]]></lehrinhalte>";
 		$xml .= "				<kompatible_lvs>";
-		
+
 		$lehrveranstaltung->getLVkompatibel($lehrveranstaltung_id);
 		foreach($lehrveranstaltung->lehrveranstaltungen as $lv_kompatibel)
 		{
-		    $xml .= "<lv>".$lv_kompatibel->bezeichnung."</lv>";
+		    $xml .= "<lv><![CDATA[".$lv_kompatibel->bezeichnung."]]></lv>";
 		}
 
 		$xml .= "	</kompatible_lvs>";
-                
-		
+
+
 		$anrechnung = new anrechnung();
 		$anrechnung->getAnrechnungPrestudent($student->prestudent_id, null, $lehrveranstaltung_id);
 
@@ -343,7 +343,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		    $xml .= $anrechnung->result[0]->lehrveranstaltung_bez;
 		}
 		$xml .= "</studienverpflichtung>";
-                
+
                 if($lehrveranstaltung_id_kompatibel != "")
                 {
                     $lv = new lehrveranstaltung($lehrveranstaltung_id_kompatibel);
@@ -352,11 +352,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
                         $ects = $lv->ects;
                     }
                 }
-                
+
                 $xml .= "				<ects>".number_format($ects,1)."</ects>";
 
 		$lehrveranstaltung->loadLehrveranstaltungStudienplan($studienplan_id);
-		
+
 		$studienplan_lehrveranstaltung_id = "";
 		foreach($lehrveranstaltung->lehrveranstaltungen as $lv)
 		{
@@ -366,7 +366,7 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 			break;
 		    }
 		}
-		
+
 		$studienplan = new studienplan();
 		if($studienplan_lehrveranstaltung_id != "")
 		{
@@ -384,11 +384,11 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 		{
 		    $lehrveranstaltung->lehrveranstaltungen = array();
 		}
-		
+
 //		$return = $lehrveranstaltung->getLVFromStudienplanByLehrtyp($studienplan_id, "modul");
 
 		$xml .= "	<module>";
-		
+
 		//Variable wird zur korrekten Darstellung im Dokument benötigt
 		$count=0;
 		foreach($lehrveranstaltung->lehrveranstaltungen as $modul)
@@ -411,4 +411,4 @@ if (isset($_REQUEST["xmlformat"]) && $_REQUEST["xmlformat"] == "xml")
 	$xml .= "</zertifikate>";
 	echo $xml;
 }
-?>
\ No newline at end of file
+?>