From 4e0dfbf28a7f5f685115c7ade427ba18bece6737 Mon Sep 17 00:00:00 2001
From: OliiverHacker <hacker@technikum-wien.at>
Date: Tue, 23 Mar 2021 13:24:15 +0100
Subject: [PATCH 01/29] change studienblatt if AbbrecherIn

---
 rdf/studienblatt.xml.php | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/rdf/studienblatt.xml.php b/rdf/studienblatt.xml.php
index 7756901f5..e9e82cbbf 100644
--- a/rdf/studienblatt.xml.php
+++ b/rdf/studienblatt.xml.php
@@ -156,12 +156,26 @@ foreach($uid_arr as $uid)
 			echo "\t\t<ects_pro_semester><![CDATA[".($studienplan->regelstudiendauer!=0?$studienordnung->ects/$studienplan->regelstudiendauer:0)."]]></ects_pro_semester>";
 
 			echo "\t\t<aktuellesJahr><![CDATA[".date('Y')."]]></aktuellesJahr>";
+			$status_aktuell = ($prestudent->getLastStatus($student->prestudent_id,null,null))?$prestudent->status_kurzbz:'';
+			$abbrecher = 'false';
+			if ($status_aktuell == 'Abbrecher')
+			{
+				$ausbildungssemester_titel = "Abgemeldet im Ausbildungssemester";
+				$studiensemester_titel = "Abgemeldet im Studiensemester";
+			}
+			else
+			{
+				$ausbildungssemester_titel = "Aktuelles Ausbildungssemester";
+				$studiensemester_titel = "Abgemeldet im Studiensemester";
+			}
 
+			echo "\t\t<ausbildungssemester_titel><![CDATA[".$ausbildungssemester_titel."]]></ausbildungssemester_titel>";
 			echo "\t\t<ausbildungssemester_aktuell><![CDATA[".$prestudent->ausbildungssemester."]]></ausbildungssemester_aktuell>";
 
 			$studiensemester_aktuell = new studiensemester();
 			$studiensemester_aktuell->load($studiensemester);
 
+			echo "\t\t<studiensemester_titel><![CDATA[".$studiensemester_titel."]]></studiensemester_titel>";
 			echo "\t\t<studiensemester_aktuell><![CDATA[".$studiensemester_aktuell->bezeichnung."]]></studiensemester_aktuell>";
 
 			// check ob Oeh-Beitrag bezahlt wurde
@@ -184,15 +198,14 @@ foreach($uid_arr as $uid)
 			$abschluss = $studiensemester_abschluss->jump($prestudent->studiensemester_kurzbz, $studienplan->regelstudiendauer-$prestudent->ausbildungssemester);
 			$studiensemester_abschluss->load($abschluss);
 			echo "\t\t<voraussichtlichLetztesStudiensemester><![CDATA[".$studiensemester_abschluss->bezeichnung."]]></voraussichtlichLetztesStudiensemester>";
-			echo "\t\t<voraussichtlichLetztesStudiensemester_datum><![CDATA[".date('d.m.Y',strtotime($studiensemester_abschluss->ende))."]]></voraussichtlichLetztesStudiensemester_datum>";
 
 			$studiensemester_endedatum = new studiensemester();
 			$studiensemester_endedatum->load($studiensemester_endedatum->getaktorNext(1));
 
-			echo "\t\t<studiensemester_endedatum><![CDATA[".date('d.m.Y',strtotime($studiensemester_endedatum->ende))."]]></studiensemester_endedatum>";
-
 			$status_aktuell = ($prestudent->getLastStatus($student->prestudent_id,null,null))?$prestudent->status_kurzbz:'';
 
+			$enddatum = date('d.m.Y',strtotime($studiensemester_abschluss->ende));
+			$letztesStudiensemester_datum_titel = 'Voraussichtliches Abschlussdatum';
 			switch($status_aktuell)
 			{
 				case 'Student':
@@ -209,12 +222,22 @@ foreach($uid_arr as $uid)
 					break;
 				case 'Abbrecher':
 					$studierendenstatus_aktuell = 'AbbrecherIn';
+					$letztesStudiensemester_datum_titel = 'Abgemeldet am:';
+					$enddatum = date('d.m.Y',strtotime($prestudent->bestaetigtam));
+					$abbrecher = "true";
 					break;
 				default:
 					$studierendenstatus_aktuell ='';
 			}
+		echo "\t\t<abbrecher><![CDATA[".$abbrecher."]]></abbrecher>";
 
-			echo "\t\t<studierendenstatus_aktuell><![CDATA[".$studierendenstatus_aktuell."]]></studierendenstatus_aktuell>\n";
+		echo "\t\t<studiensemester_endedatum><![CDATA[".date('d.m.Y',strtotime($studiensemester_endedatum->ende))."]]></studiensemester_endedatum>";
+
+			echo "\t\t<voraussichtlichLetztesStudiensemester_datum><![CDATA[".$enddatum."]]></voraussichtlichLetztesStudiensemester_datum>";
+
+		echo "\t\t<letztesStudiensemester_datum_titel><![CDATA[".$letztesStudiensemester_datum_titel."]]></letztesStudiensemester_datum_titel>";
+
+		echo "\t\t<studierendenstatus_aktuell><![CDATA[".$studierendenstatus_aktuell."]]></studierendenstatus_aktuell>\n";
 		echo "\t\t<datum_reifepruefung><![CDATA[".$prestudent->zgvdatum."]]></datum_reifepruefung>\n";
 		$zgv = new zgv($prestudent->zgv_code);
 		echo "\t\t<schulform_zgv><![CDATA[".$zgv->zgv_kurzbz."]]></schulform_zgv>\n";

From 3644cc690ca1bc16b1d80cf0c270d5c725fb8a89 Mon Sep 17 00:00:00 2001
From: OliiverHacker <hacker@technikum-wien.at>
Date: Thu, 1 Apr 2021 21:28:27 +0200
Subject: [PATCH 02/29] Put Checks from xml to xsl for Abbrecher

---
 rdf/studienblatt.xml.php      | 87 +++++++++++++++--------------------
 system/xsl/Studienblatt_0.xsl | 39 ++++++++++++++--
 2 files changed, 72 insertions(+), 54 deletions(-)

diff --git a/rdf/studienblatt.xml.php b/rdf/studienblatt.xml.php
index e9e82cbbf..e6cd0f1f0 100644
--- a/rdf/studienblatt.xml.php
+++ b/rdf/studienblatt.xml.php
@@ -158,54 +158,7 @@ foreach($uid_arr as $uid)
 			echo "\t\t<aktuellesJahr><![CDATA[".date('Y')."]]></aktuellesJahr>";
 			$status_aktuell = ($prestudent->getLastStatus($student->prestudent_id,null,null))?$prestudent->status_kurzbz:'';
 			$abbrecher = 'false';
-			if ($status_aktuell == 'Abbrecher')
-			{
-				$ausbildungssemester_titel = "Abgemeldet im Ausbildungssemester";
-				$studiensemester_titel = "Abgemeldet im Studiensemester";
-			}
-			else
-			{
-				$ausbildungssemester_titel = "Aktuelles Ausbildungssemester";
-				$studiensemester_titel = "Abgemeldet im Studiensemester";
-			}
 
-			echo "\t\t<ausbildungssemester_titel><![CDATA[".$ausbildungssemester_titel."]]></ausbildungssemester_titel>";
-			echo "\t\t<ausbildungssemester_aktuell><![CDATA[".$prestudent->ausbildungssemester."]]></ausbildungssemester_aktuell>";
-
-			$studiensemester_aktuell = new studiensemester();
-			$studiensemester_aktuell->load($studiensemester);
-
-			echo "\t\t<studiensemester_titel><![CDATA[".$studiensemester_titel."]]></studiensemester_titel>";
-			echo "\t\t<studiensemester_aktuell><![CDATA[".$studiensemester_aktuell->bezeichnung."]]></studiensemester_aktuell>";
-
-			// check ob Oeh-Beitrag bezahlt wurde
-			$oehbeitrag = $konto->getOehBeitragGesamt($uid, $studiensemester_aktuell->studiensemester_kurzbz);
-			echo "\t\t<oehbeitrag><![CDATA[".str_replace('.', ',', $oehbeitrag)."]]></oehbeitrag>";
-
-			// check ob Quereinsteiger
-			$ausbildungssemester = ($prestudent->getFirstStatus($student->prestudent_id, 'Student'))?$prestudent->ausbildungssemester:'';
-			echo "\t\t<semesterStudent><![CDATA[".$ausbildungssemester."]]></semesterStudent>";
-
-			$studiensemester_beginn = new studiensemester();
-			$studienbeginn = ($prestudent->getFirstStatus($student->prestudent_id, 'Student'))?$prestudent->studiensemester_kurzbz:'';
-			$studiensemester_beginn->load($studienbeginn);
-
-			echo "\t\t<studiensemester_beginn><![CDATA[".$studiensemester_beginn->bezeichnung."]]></studiensemester_beginn>";
-			echo "\t\t<studiensemester_beginndatum><![CDATA[".date('d.m.Y',strtotime($studiensemester_beginn->start))."]]></studiensemester_beginndatum>";
-
-			$prestudent->getLastStatus($student->prestudent_id,$studiensemester);
-			$studiensemester_abschluss = new studiensemester();
-			$abschluss = $studiensemester_abschluss->jump($prestudent->studiensemester_kurzbz, $studienplan->regelstudiendauer-$prestudent->ausbildungssemester);
-			$studiensemester_abschluss->load($abschluss);
-			echo "\t\t<voraussichtlichLetztesStudiensemester><![CDATA[".$studiensemester_abschluss->bezeichnung."]]></voraussichtlichLetztesStudiensemester>";
-
-			$studiensemester_endedatum = new studiensemester();
-			$studiensemester_endedatum->load($studiensemester_endedatum->getaktorNext(1));
-
-			$status_aktuell = ($prestudent->getLastStatus($student->prestudent_id,null,null))?$prestudent->status_kurzbz:'';
-
-			$enddatum = date('d.m.Y',strtotime($studiensemester_abschluss->ende));
-			$letztesStudiensemester_datum_titel = 'Voraussichtliches Abschlussdatum';
 			switch($status_aktuell)
 			{
 				case 'Student':
@@ -222,7 +175,6 @@ foreach($uid_arr as $uid)
 					break;
 				case 'Abbrecher':
 					$studierendenstatus_aktuell = 'AbbrecherIn';
-					$letztesStudiensemester_datum_titel = 'Abgemeldet am:';
 					$enddatum = date('d.m.Y',strtotime($prestudent->bestaetigtam));
 					$abbrecher = "true";
 					break;
@@ -231,11 +183,44 @@ foreach($uid_arr as $uid)
 			}
 		echo "\t\t<abbrecher><![CDATA[".$abbrecher."]]></abbrecher>";
 
+		echo "\t\t<ausbildungssemester_aktuell><![CDATA[".$prestudent->ausbildungssemester."]]></ausbildungssemester_aktuell>";
+
+		$studiensemester_aktuell = new studiensemester();
+		$studiensemester_aktuell->load($studiensemester);
+
+		echo "\t\t<studiensemester_aktuell><![CDATA[".$studiensemester_aktuell->bezeichnung."]]></studiensemester_aktuell>";
+
+		// check ob Oeh-Beitrag bezahlt wurde
+		$oehbeitrag = $konto->getOehBeitragGesamt($uid, $studiensemester_aktuell->studiensemester_kurzbz);
+		echo "\t\t<oehbeitrag><![CDATA[".str_replace('.', ',', $oehbeitrag)."]]></oehbeitrag>";
+
+		// check ob Quereinsteiger
+		$ausbildungssemester = ($prestudent->getFirstStatus($student->prestudent_id, 'Student'))?$prestudent->ausbildungssemester:'';
+		echo "\t\t<semesterStudent><![CDATA[".$ausbildungssemester."]]></semesterStudent>";
+
+		$studiensemester_beginn = new studiensemester();
+		$studienbeginn = ($prestudent->getFirstStatus($student->prestudent_id, 'Student'))?$prestudent->studiensemester_kurzbz:'';
+		$studiensemester_beginn->load($studienbeginn);
+
+		echo "\t\t<studiensemester_beginn><![CDATA[".$studiensemester_beginn->bezeichnung."]]></studiensemester_beginn>";
+		echo "\t\t<studiensemester_beginndatum><![CDATA[".date('d.m.Y',strtotime($studiensemester_beginn->start))."]]></studiensemester_beginndatum>";
+
+		$prestudent->getLastStatus($student->prestudent_id,$studiensemester);
+		$studiensemester_abschluss = new studiensemester();
+		$abschluss = $studiensemester_abschluss->jump($prestudent->studiensemester_kurzbz, $studienplan->regelstudiendauer-$prestudent->ausbildungssemester);
+		$studiensemester_abschluss->load($abschluss);
+		echo "\t\t<voraussichtlichLetztesStudiensemester><![CDATA[".$studiensemester_abschluss->bezeichnung."]]></voraussichtlichLetztesStudiensemester>";
+
+		$studiensemester_endedatum = new studiensemester();
+		$studiensemester_endedatum->load($studiensemester_endedatum->getaktorNext(1));
+
+		$status_aktuell = ($prestudent->getLastStatus($student->prestudent_id,null,null))?$prestudent->status_kurzbz:'';
+
+		$enddatum = date('d.m.Y',strtotime($studiensemester_abschluss->ende));
+
 		echo "\t\t<studiensemester_endedatum><![CDATA[".date('d.m.Y',strtotime($studiensemester_endedatum->ende))."]]></studiensemester_endedatum>";
 
-			echo "\t\t<voraussichtlichLetztesStudiensemester_datum><![CDATA[".$enddatum."]]></voraussichtlichLetztesStudiensemester_datum>";
-
-		echo "\t\t<letztesStudiensemester_datum_titel><![CDATA[".$letztesStudiensemester_datum_titel."]]></letztesStudiensemester_datum_titel>";
+		echo "\t\t<voraussichtlichLetztesStudiensemester_datum><![CDATA[".$enddatum."]]></voraussichtlichLetztesStudiensemester_datum>";
 
 		echo "\t\t<studierendenstatus_aktuell><![CDATA[".$studierendenstatus_aktuell."]]></studierendenstatus_aktuell>\n";
 		echo "\t\t<datum_reifepruefung><![CDATA[".$prestudent->zgvdatum."]]></datum_reifepruefung>\n";
diff --git a/system/xsl/Studienblatt_0.xsl b/system/xsl/Studienblatt_0.xsl
index 5d51c6752..dbb692cb4 100644
--- a/system/xsl/Studienblatt_0.xsl
+++ b/system/xsl/Studienblatt_0.xsl
@@ -426,7 +426,16 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                 </table:table-row>
                 <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="P4">Aktuelles Studiensemester</text:p>
+                        <xsl:choose>
+                            <xsl:when test = "abbrecher='true'">
+                                <text:p text:style-name="P4">Abgemeldet im Studiensemester</text:p>
+                            </xsl:when>
+
+                            <xsl:otherwise>
+                                <text:p text:style-name="P4">Aktuelles Studiensemester</text:p>
+                            </xsl:otherwise>
+
+                        </xsl:choose>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
                         <text:p text:style-name="P2">
@@ -435,7 +444,17 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                 </table:table-row>
                 <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="P4">Aktuelles Ausbildungssemester</text:p>
+                        <xsl:choose>
+                            <xsl:when test = "abbrecher='true'">
+                                <text:p text:style-name="P4">Abgemeldet im Ausbildungssemester</text:p>
+                            </xsl:when>
+
+                            <xsl:otherwise>
+                                <text:p text:style-name="P4">Aktuelles Ausbildungssemester</text:p>
+                            </xsl:otherwise>
+
+                        </xsl:choose>
+
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
                         <text:p text:style-name="P2">
@@ -451,6 +470,9 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                             <text:span text:style-name="T4"><xsl:value-of select="studierendenstatus_aktuell"/></text:span></text:p>
                     </table:table-cell>
                 </table:table-row>
+
+            <xsl:if test="abbrecher='false'">
+
                 <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="P4">Voraussichtlich letztes Studiensemester</text:p>
@@ -460,9 +482,20 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                             <text:span text:style-name="T4"><xsl:value-of select="voraussichtlichLetztesStudiensemester"/></text:span></text:p>
                     </table:table-cell>
                 </table:table-row>
+            </xsl:if>
+
                 <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="P4">Voraussichtliches Abschlussdatum</text:p>
+                        <xsl:choose>
+                            <xsl:when test="abbrecher='true'">
+                                <text:p text:style-name="P4">Abgemeldet am</text:p>
+                            </xsl:when>
+
+                            <xsl:otherwise>
+                                <text:p text:style-name="P4">Voraussichtliches Abschlussdatum</text:p>
+                            </xsl:otherwise>
+
+                        </xsl:choose>
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
                         <text:p text:style-name="P15"><xsl:value-of select="voraussichtlichLetztesStudiensemester_datum"/></text:p>

From 48105425fc8093a466813ab68f91914b7e9fe401 Mon Sep 17 00:00:00 2001
From: OliiverHacker <hacker@technikum-wien.at>
Date: Fri, 2 Apr 2021 15:35:36 +0200
Subject: [PATCH 03/29] =?UTF-8?q?Edit=20Studienblatt=20in=20Englisch=20f?=
 =?UTF-8?q?=C3=BCr=20AbbrecherInnen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 system/xsl/StudienblattEng_0.xsl | 38 +++++++++++++++++++++++++++++---
 1 file changed, 35 insertions(+), 3 deletions(-)

diff --git a/system/xsl/StudienblattEng_0.xsl b/system/xsl/StudienblattEng_0.xsl
index bfed01a19..f7da3a5fe 100644
--- a/system/xsl/StudienblattEng_0.xsl
+++ b/system/xsl/StudienblattEng_0.xsl
@@ -463,7 +463,17 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                 </table:table-row>
                 <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="P4">Current Semester of Study</text:p>
+                        <xsl:choose>
+                            <xsl:when test = "abbrecher='true'">
+                                <text:p text:style-name="P4">Semester resigned from Study</text:p>
+                            </xsl:when>
+
+                            <xsl:otherwise>
+                                <text:p text:style-name="P4">Current Semester of Study</text:p>
+                            </xsl:otherwise>
+
+                        </xsl:choose>
+
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
                         <text:p text:style-name="P2">
@@ -482,7 +492,17 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                 </table:table-row>
                 <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="P4">Current Semester in Degree Program</text:p>
+                        <xsl:choose>
+                            <xsl:when test = "abbrecher='true'">
+                                <text:p text:style-name="P4">Resignation Semester in Degree Program</text:p>
+                            </xsl:when>
+
+                            <xsl:otherwise>
+                                <text:p text:style-name="P4">Current Semester in Degree Program</text:p>
+                            </xsl:otherwise>
+
+                        </xsl:choose>
+
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
                         <text:p text:style-name="P2">
@@ -516,6 +536,7 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                            </text:span></text:p>
                     </table:table-cell>
                 </table:table-row>
+                <xsl:if test="abbrecher='false'">
                 <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="P4">Expected Final Semester of Study</text:p>
@@ -535,9 +556,20 @@ xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn
                             </text:span></text:p>
                     </table:table-cell>
                 </table:table-row>
+                </xsl:if>
                 <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="P4">Expected Date of Graduation</text:p>
+                        <xsl:choose>
+                            <xsl:when test="abbrecher='true'">
+                                <text:p text:style-name="P4">Resignation Date</text:p>
+                            </xsl:when>
+
+                            <xsl:otherwise>
+                                <text:p text:style-name="P4">Expected Date of Graduation</text:p>
+                            </xsl:otherwise>
+
+                        </xsl:choose>
+
                     </table:table-cell>
                     <table:table-cell table:style-name="Tabelle3.A1" office:value-type="string">
                         <text:p text:style-name="P15"><xsl:value-of select="voraussichtlichLetztesStudiensemester_datum"/></text:p>

From 2c6d8937f64eb322af4feaac831412b7f7f398d8 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 12 May 2021 12:48:29 +0200
Subject: [PATCH 04/29] funktion hinzugefuegt um mehrere bewerber abzuweisen
 und status wird nur angezeigt wenn aktiv

---
 .../system/infocenter/InfoCenter.php          |  56 ++++++++-
 application/models/crm/Prestudent_model.php   |  13 +++
 application/models/crm/Statusgrund_model.php  |  13 +++
 .../models/organisation/Studiengang_model.php |  13 +++
 .../views/system/infocenter/infocenter.php    |   1 +
 .../js/infocenter/infocenterPersonDataset.js  | 107 ++++++++++++++++++
 6 files changed, 197 insertions(+), 6 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 43de8bb60..fd3f98320 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -108,7 +108,9 @@ class InfoCenter extends Auth_Controller
 				'setOnHold' => 'infocenter:rw',
 				'removeOnHold' => 'infocenter:rw',
 				'getStudienjahrEnd' => 'infocenter:r',
-				'setNavigationMenuArrayJson' => 'infocenter:r'
+				'setNavigationMenuArrayJson' => 'infocenter:r',
+				'getAbsageData' => 'infocenter:r',
+				'saveAbsageForAll' => 'infocenter:rw'
 			)
 		);
 
@@ -433,11 +435,14 @@ class InfoCenter extends Auth_Controller
 	 * Saves Absage for Prestudent including the reason for the Absage (statusgrund).
 	 * inserts Studiensemester and Ausbildungssemester for the new Absage of (chronologically) last status.
 	 */
-	public function saveAbsage()
+	public function saveAbsage($prestudent_id = null, $statusgrund = null)
 	{
 		$json = null;
-		$prestudent_id = $this->input->post('prestudent_id');
-		$statusgrund = $this->input->post('statusgrund');
+		if (is_null($prestudent_id))
+			$prestudent_id = $this->input->post('prestudent_id');
+
+		if (is_null($statusgrund))
+			$statusgrund = $this->input->post('statusgrund');
 
 		$lastStatus = $this->PrestudentstatusModel->getLastStatus($prestudent_id);
 
@@ -1427,8 +1432,8 @@ class InfoCenter extends Auth_Controller
 
 		$this->_sortPrestudents($zgvpruefungen);
 
-		$abwstatusgruende = $this->StatusgrundModel->loadWhere(array('status_kurzbz' => self::ABGEWIESENERSTATUS))->retval;
-		$intstatusgruende = $this->StatusgrundModel->loadWhere(array('status_kurzbz' => self::INTERESSENTSTATUS))->retval;
+		$abwstatusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
+		$intstatusgruende = $this->StatusgrundModel->getStatus(self::INTERESSENTSTATUS)->retval;
 
 		$data = array (
 			'zgvpruefungen' => $zgvpruefungen,
@@ -1687,4 +1692,43 @@ class InfoCenter extends Auth_Controller
 			$this->loglib->logError('Studiengang has no mail for sending Freigabe mail');
 		}
 	}
+
+	public function getAbsageData()
+	{
+		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
+
+		$statusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
+		$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(['b', 'm']);
+
+		$data = array (
+			'statusgruende' => $statusgruende,
+			'studiengaenge' => $studiengaenge->retval
+		);
+
+		$this->outputJsonSuccess($data);
+	}
+
+	public function saveAbsageForAll()
+	{
+		$statusgrund = $this->input->post('statusgrund');
+		$studiengang = $this->input->post('studiengang');
+		$personen = $this->input->post('personen');
+
+		if ($statusgrund === 'null' || $studiengang === 'null' || empty($personen))
+			$this->terminateWithJsonError("Bitte Statusgrund, Studiengang und Personen auswählen.");
+
+		foreach($personen as $person)
+		{
+			$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person);
+
+			if(!hasData($prestudent))
+				continue;
+
+			$prestudentData = getData($prestudent);
+
+			$this->saveAbsage($prestudentData[0]->prestudent_id, $statusgrund);
+		}
+
+		$this->outputJsonSuccess("Success");
+	}
 }
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 2e014800c..41639d0ac 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -581,4 +581,17 @@ class Prestudent_model extends DB_Model
 
 		return $this->execQuery($query, array($person_id));
 	}
+
+	public function getPrestudentByStudiengangAndPerson($studiengang, $person)
+	{
+		$query = "SELECT ps.prestudent_id
+					FROM public.tbl_prestudentstatus pss
+					JOIN public.tbl_prestudent ps USING(prestudent_id)
+					JOIN public.tbl_studiengang sg USING(studiengang_kz)
+					JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+					WHERE ps.person_id = ?
+					AND UPPER((sg.typ || sg.kurzbz) || ':' || sp.orgform_kurzbz) = ?";
+
+		return $this->execQuery($query, array($person, $studiengang));
+	}
 }
diff --git a/application/models/crm/Statusgrund_model.php b/application/models/crm/Statusgrund_model.php
index 4717a7571..f9b156b76 100644
--- a/application/models/crm/Statusgrund_model.php
+++ b/application/models/crm/Statusgrund_model.php
@@ -11,4 +11,17 @@ class Statusgrund_model extends DB_Model
 		$this->dbTable = "public.tbl_status_grund";
 		$this->pk = "statusgrund_id";
 	}
+
+	public function getStatus($status_kurzbz = null, $aktiv = null)
+	{
+		$where = array();
+		if (!is_null($status_kurzbz))
+			$where['status_kurzbz'] = $status_kurzbz;
+		if (!is_null($aktiv))
+			$where['aktiv'] = $aktiv;
+
+		$status = $this->loadWhere($where);
+
+		return success($status->retval);
+	}
 }
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 8b8be0366..999fcbbd0 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -481,4 +481,17 @@ class Studiengang_model extends DB_Model
 		
 		return $this->loadWhere($condition);
 	}
+
+	public function getStudiengaengeWithOrgForm($typ)
+	{
+		$query = "SELECT DISTINCT (UPPER(sg.typ || sg.kurzbz || ':' || sp.orgform_kurzbz)) AS Studiengang
+					FROM public.tbl_prestudentstatus pss
+					JOIN public.tbl_prestudent ps USING(prestudent_id)
+					JOIN public.tbl_studiengang sg USING(studiengang_kz)
+					JOIN lehre.tbl_studienplan sp USING(studienplan_id)
+					WHERE sg.typ IN ?
+					ORDER BY Studiengang;";
+
+		return $this->execQuery($query, array($typ));
+	}
 }
diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php
index 4005518a1..43e326bb5 100644
--- a/application/views/system/infocenter/infocenter.php
+++ b/application/views/system/infocenter/infocenter.php
@@ -13,6 +13,7 @@
 			'ajaxlib' => true,
 			'filterwidget' => true,
 			'navigationwidget' => true,
+			'dialoglib' => true,
 			'phrases' => array(
 				'person' => array('vorname', 'nachname'),
 				'global' => array('mailAnXversandt'),
diff --git a/public/js/infocenter/infocenterPersonDataset.js b/public/js/infocenter/infocenterPersonDataset.js
index 87a40c0f1..7ea048b71 100644
--- a/public/js/infocenter/infocenterPersonDataset.js
+++ b/public/js/infocenter/infocenterPersonDataset.js
@@ -31,6 +31,20 @@ var InfocenterPersonDataset = {
 		var formHtml = '<form id="sendMsgsForm" method="post" action="'+ url +'" target="_blank"></form>';
 		$("#datasetActionsTop").before(formHtml);
 
+		var auswahlAbsageToggle =
+			'<a class="absageToggle">Erweiterte Einstellungen</a>';
+
+		var auswahlAbsage =
+			'<select class="form-control absgstatusgrund" style="width:auto; float:left;">' +
+			'<option value="null" selected="selected"> Absagegrund </option>' +
+			'</select>' +
+			'<select class="form-control auswahlAbsageStg" style="width:auto; float:left;">' +
+			'<option value="null" selected="selected"> Studiengang </option>' +
+			'</select>' +
+			'<button class="btn btn-default auswahlAbsageBtn" style="float:left"> Absage </button>';
+
+		InfocenterPersonDataset.getAbsageData();
+
 		var studienSemesterHtml = '<button class="btn btn-default btn-xs decStudiensemester">' +
 			'<i class="fa fa-chevron-left"></i>' +
 			'</button>&nbsp;' +
@@ -60,6 +74,14 @@ var InfocenterPersonDataset = {
 			"<div class='col-xs-12 text-center'>"+studienSemesterHtml+"</div>"+
 			"</div><div class='h-divider'></div><hr class='studiensemesterline'>");
 
+		$("#datasetActionsBottom").append(
+			"<div class='row'>"+
+				"<div class='col-xs-12'>"+auswahlAbsageToggle+"</div>"+
+				"<div class='col-xs-12' id='absagePunkte' style='display:none'>"+auswahlAbsage+"</div>"+
+			"</div>" +
+			"<div class='h-divider'></div>" +
+			"<hr class='studiensemesterline'>"
+		)
 		$("button.incStudiensemester").click(function() {
 			InfocenterPersonDataset.changeStudiensemesterUservar(1);
 		});
@@ -68,6 +90,16 @@ var InfocenterPersonDataset = {
 			InfocenterPersonDataset.changeStudiensemesterUservar(-1);
 		});
 
+		$('button.auswahlAbsageBtn').click(function()
+		{
+			InfocenterPersonDataset.saveAbsageForAll();
+		});
+
+		$('a.absageToggle').click(function()
+		{
+			$('#absagePunkte').toggle();
+		})
+
 		var personcount = 0;
 
 		FHC_AjaxClient.ajaxCallGet(
@@ -203,6 +235,81 @@ var InfocenterPersonDataset = {
 		);
 	},
 
+	saveAbsageForAll: function()
+	{
+		var idsel = $("#filterTableDataset input:checked[name=PersonId\\[\\]]");
+
+		if(idsel.length <= 0)
+			return FHC_DialogLib.alertInfo("Bitte wählen Sie die Personen aus.");
+
+		var statusgrund = $('.absgstatusgrund').val();
+		var studiengang = $('.auswahlAbsageStg').val();
+
+		if(statusgrund === 'null' || studiengang === 'null')
+			return FHC_DialogLib.alertInfo("Bitte den Absagegrund und Studiengang auswählen.");
+
+		var personen = [];
+
+		for (var i = 0; i < idsel.length; i++)
+		{
+			personen.push($(idsel[i]).val());
+		}
+
+		FHC_AjaxClient.ajaxCallPost(
+			'system/infocenter/InfoCenter/saveAbsageForAll',
+			{
+				'statusgrund': statusgrund,
+				'studiengang': studiengang,
+				'personen' : personen
+			},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.isError(data))
+						FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
+
+					if (FHC_AjaxClient.hasData(data))
+						FHC_FilterWidget.reloadDataset();
+
+				},
+				errorCallback: function(jqXHR, textStatus, errorThrown) {
+					FHC_DialogLib.alertError(textStatus);
+				}
+			}
+		);
+	},
+
+	getAbsageData: function()
+	{
+		FHC_AjaxClient.ajaxCallGet(
+			'system/infocenter/InfoCenter/getAbsageData',
+			{},
+			{
+				successCallback: function(data, textStatus, jqXHR) {
+					if (FHC_AjaxClient.hasData(data))
+					{
+						data = FHC_AjaxClient.getData(data);
+						$.each(data.statusgruende, function(key, value){
+							$('.absgstatusgrund').append($("<option/>", {
+									value: value.statusgrund_id,
+									text: value.bezeichnung_mehrsprachig[0]
+							}))
+						})
+						$.each(data.studiengaenge, function(key, value){
+							$('.auswahlAbsageStg').append($("<option/>", {
+									value: value.studiengang,
+									text: value.studiengang
+							}))
+						})
+
+					}
+				},
+				errorCallback: function(jqXHR, textStatus, errorThrown) {
+					console.log(FHC_AjaxClient.getError(jqXHR));
+					FHC_DialogLib.alertError(textStatus);
+				}
+			}
+		);
+	},
 	/**
 	 * initializes call to get the Studiensemester user variable
 	 */

From 0d4bf432e2d8138f57bf19cf73c5f376fb0acdc8 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 12 May 2021 14:00:45 +0200
Subject: [PATCH 05/29] deleted console.log

---
 public/js/infocenter/infocenterPersonDataset.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/public/js/infocenter/infocenterPersonDataset.js b/public/js/infocenter/infocenterPersonDataset.js
index 7ea048b71..e5f91a7ee 100644
--- a/public/js/infocenter/infocenterPersonDataset.js
+++ b/public/js/infocenter/infocenterPersonDataset.js
@@ -304,7 +304,6 @@ var InfocenterPersonDataset = {
 					}
 				},
 				errorCallback: function(jqXHR, textStatus, errorThrown) {
-					console.log(FHC_AjaxClient.getError(jqXHR));
 					FHC_DialogLib.alertError(textStatus);
 				}
 			}

From f05493d3f3a7d05c1eb0ab116408a077d744d55e Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 20 May 2021 09:33:08 +0200
Subject: [PATCH 06/29] modal und check hinzugefuegt

---
 .../views/system/infocenter/absageModal.php   | 35 +++++++++++++++++++
 .../views/system/infocenter/infocenter.php    |  1 +
 .../js/infocenter/infocenterPersonDataset.js  | 22 ++++++++----
 3 files changed, 51 insertions(+), 7 deletions(-)
 create mode 100644 application/views/system/infocenter/absageModal.php

diff --git a/application/views/system/infocenter/absageModal.php b/application/views/system/infocenter/absageModal.php
new file mode 100644
index 000000000..00298945e
--- /dev/null
+++ b/application/views/system/infocenter/absageModal.php
@@ -0,0 +1,35 @@
+<div class="modal fade absageModalForAll"
+	 tabindex="-1"
+	 role="dialog"
+	 aria-labelledby="absageModalLabel"
+	 aria-hidden="true">
+	<div class="modal-dialog">
+		<div class="modal-content">
+			<div class="modal-header">
+				<button type="button"
+						class="close"
+						data-dismiss="modal"
+						aria-hidden="true">
+					&times;
+				</button>
+				<h4 class="modal-title"
+					id="absageModalLabel"><?php echo  $this->p->t('infocenter', 'absageBestaetigen') ?></h4>
+			</div>
+			<div class="modal-body">
+				<?php echo  $this->p->t('infocenter', 'absageBestaetigenTxt') ?>
+			</div>
+			<div class="modal-footer">
+				<button type="button"
+						class="btn btn-default"
+						data-dismiss="modal">
+					<?php echo  $this->p->t('ui', 'abbrechen') ?>
+				</button>
+				<button class="btn btn-primary saveAbsage" id="saveAbsageForAll">
+					<?php echo  $this->p->t('infocenter', 'interessentAbweisen') ?>
+				</button>
+			</div>
+		</div>
+		<!-- /.modal-content -->
+	</div>
+	<!-- /.modal-dialog -->
+</div>
\ No newline at end of file
diff --git a/application/views/system/infocenter/infocenter.php b/application/views/system/infocenter/infocenter.php
index 43e326bb5..38e644846 100644
--- a/application/views/system/infocenter/infocenter.php
+++ b/application/views/system/infocenter/infocenter.php
@@ -41,6 +41,7 @@
 				</div>
 				<div>
 					<?php $this->load->view('system/infocenter/infocenterData.php'); ?>
+					<?php $this->load->view('system/infocenter/absageModal.php'); ?>
 				</div>
 			</div>
 		</div>
diff --git a/public/js/infocenter/infocenterPersonDataset.js b/public/js/infocenter/infocenterPersonDataset.js
index e5f91a7ee..efdd7dc99 100644
--- a/public/js/infocenter/infocenterPersonDataset.js
+++ b/public/js/infocenter/infocenterPersonDataset.js
@@ -91,6 +91,19 @@ var InfocenterPersonDataset = {
 		});
 
 		$('button.auswahlAbsageBtn').click(function()
+		{
+			var idsel = $("#filterTableDataset input:checked[name=PersonId\\[\\]]");
+
+			if(idsel.length <= 0)
+				return FHC_DialogLib.alertInfo("Bitte wählen Sie die Personen aus.");
+
+			if($('.absgstatusgrund').val()  === 'null' || $('.auswahlAbsageStg').val() === 'null')
+				return FHC_DialogLib.alertInfo("Bitte den Absagegrund und Studiengang auswählen.");
+
+			$(".absageModalForAll").modal("show");
+		});
+
+		$('#saveAbsageForAll').click(function()
 		{
 			InfocenterPersonDataset.saveAbsageForAll();
 		});
@@ -239,15 +252,9 @@ var InfocenterPersonDataset = {
 	{
 		var idsel = $("#filterTableDataset input:checked[name=PersonId\\[\\]]");
 
-		if(idsel.length <= 0)
-			return FHC_DialogLib.alertInfo("Bitte wählen Sie die Personen aus.");
-
 		var statusgrund = $('.absgstatusgrund').val();
 		var studiengang = $('.auswahlAbsageStg').val();
 
-		if(statusgrund === 'null' || studiengang === 'null')
-			return FHC_DialogLib.alertInfo("Bitte den Absagegrund und Studiengang auswählen.");
-
 		var personen = [];
 
 		for (var i = 0; i < idsel.length; i++)
@@ -268,8 +275,9 @@ var InfocenterPersonDataset = {
 						FHC_DialogLib.alertError(FHC_AjaxClient.getError(data));
 
 					if (FHC_AjaxClient.hasData(data))
-						FHC_FilterWidget.reloadDataset();
+						FHC_DialogLib.alertSuccess("Erfolgreich gespeichert.")
 
+					$(".absageModalForAll").modal("hide");
 				},
 				errorCallback: function(jqXHR, textStatus, errorThrown) {
 					FHC_DialogLib.alertError(textStatus);

From 5330e2b250715f3551cdd48d145d08054743f09f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 1 Jun 2021 11:13:23 +0200
Subject: [PATCH 07/29] beim abweisen das studiensemester hinzugefuegt

---
 application/controllers/system/infocenter/InfoCenter.php | 3 ++-
 application/models/crm/Prestudent_model.php              | 8 +++++---
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index fd3f98320..40ff3ceff 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -1713,13 +1713,14 @@ class InfoCenter extends Auth_Controller
 		$statusgrund = $this->input->post('statusgrund');
 		$studiengang = $this->input->post('studiengang');
 		$personen = $this->input->post('personen');
+		$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
 
 		if ($statusgrund === 'null' || $studiengang === 'null' || empty($personen))
 			$this->terminateWithJsonError("Bitte Statusgrund, Studiengang und Personen auswählen.");
 
 		foreach($personen as $person)
 		{
-			$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person);
+			$prestudent = $this->PrestudentModel->getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester);
 
 			if(!hasData($prestudent))
 				continue;
diff --git a/application/models/crm/Prestudent_model.php b/application/models/crm/Prestudent_model.php
index 41639d0ac..52ba4d9f3 100644
--- a/application/models/crm/Prestudent_model.php
+++ b/application/models/crm/Prestudent_model.php
@@ -582,7 +582,7 @@ class Prestudent_model extends DB_Model
 		return $this->execQuery($query, array($person_id));
 	}
 
-	public function getPrestudentByStudiengangAndPerson($studiengang, $person)
+	public function getPrestudentByStudiengangAndPerson($studiengang, $person, $studienSemester)
 	{
 		$query = "SELECT ps.prestudent_id
 					FROM public.tbl_prestudentstatus pss
@@ -590,8 +590,10 @@ class Prestudent_model extends DB_Model
 					JOIN public.tbl_studiengang sg USING(studiengang_kz)
 					JOIN lehre.tbl_studienplan sp USING(studienplan_id)
 					WHERE ps.person_id = ?
-					AND UPPER((sg.typ || sg.kurzbz) || ':' || sp.orgform_kurzbz) = ?";
+					AND UPPER((sg.typ || sg.kurzbz) || ':' || sp.orgform_kurzbz) = ?
+					AND pss.studiensemester_kurzbz = ?
+					";
 
-		return $this->execQuery($query, array($person, $studiengang));
+		return $this->execQuery($query, array($person, $studiengang, $studienSemester));
 	}
 }

From ccffdf9b7ff7663a009998638d6b20e3b20829ce Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 10 Jun 2021 12:00:09 +0200
Subject: [PATCH 08/29] statusgruende sortiert

---
 application/models/crm/Statusgrund_model.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/application/models/crm/Statusgrund_model.php b/application/models/crm/Statusgrund_model.php
index f9b156b76..7ab17a45b 100644
--- a/application/models/crm/Statusgrund_model.php
+++ b/application/models/crm/Statusgrund_model.php
@@ -14,6 +14,7 @@ class Statusgrund_model extends DB_Model
 
 	public function getStatus($status_kurzbz = null, $aktiv = null)
 	{
+		$this->addOrder('bezeichnung_mehrsprachig');
 		$where = array();
 		if (!is_null($status_kurzbz))
 			$where['status_kurzbz'] = $status_kurzbz;

From 6595df95ad55923e25d07b5de3062d95dd0e6f29 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 14 Jun 2021 15:36:17 +0200
Subject: [PATCH 09/29] Studienblatt - Endedatum bei Abbrechern korrigiert

---
 rdf/studienblatt.xml.php | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/rdf/studienblatt.xml.php b/rdf/studienblatt.xml.php
index e6cd0f1f0..0aa752637 100644
--- a/rdf/studienblatt.xml.php
+++ b/rdf/studienblatt.xml.php
@@ -157,7 +157,7 @@ foreach($uid_arr as $uid)
 
 			echo "\t\t<aktuellesJahr><![CDATA[".date('Y')."]]></aktuellesJahr>";
 			$status_aktuell = ($prestudent->getLastStatus($student->prestudent_id,null,null))?$prestudent->status_kurzbz:'';
-			$abbrecher = 'false';
+			$abbrecher = false;
 
 			switch($status_aktuell)
 			{
@@ -176,12 +176,12 @@ foreach($uid_arr as $uid)
 				case 'Abbrecher':
 					$studierendenstatus_aktuell = 'AbbrecherIn';
 					$enddatum = date('d.m.Y',strtotime($prestudent->bestaetigtam));
-					$abbrecher = "true";
+					$abbrecher = true;
 					break;
 				default:
 					$studierendenstatus_aktuell ='';
 			}
-		echo "\t\t<abbrecher><![CDATA[".$abbrecher."]]></abbrecher>";
+		echo "\t\t<abbrecher><![CDATA[".($abbrecher?'true':'false')."]]></abbrecher>";
 
 		echo "\t\t<ausbildungssemester_aktuell><![CDATA[".$prestudent->ausbildungssemester."]]></ausbildungssemester_aktuell>";
 
@@ -207,7 +207,10 @@ foreach($uid_arr as $uid)
 
 		$prestudent->getLastStatus($student->prestudent_id,$studiensemester);
 		$studiensemester_abschluss = new studiensemester();
-		$abschluss = $studiensemester_abschluss->jump($prestudent->studiensemester_kurzbz, $studienplan->regelstudiendauer-$prestudent->ausbildungssemester);
+		if($abbrecher)
+			$abschluss = $prestudent->studiensemester_kurzbz;
+		else
+			$abschluss = $studiensemester_abschluss->jump($prestudent->studiensemester_kurzbz, $studienplan->regelstudiendauer-$prestudent->ausbildungssemester);
 		$studiensemester_abschluss->load($abschluss);
 		echo "\t\t<voraussichtlichLetztesStudiensemester><![CDATA[".$studiensemester_abschluss->bezeichnung."]]></voraussichtlichLetztesStudiensemester>";
 
@@ -220,7 +223,10 @@ foreach($uid_arr as $uid)
 
 		echo "\t\t<studiensemester_endedatum><![CDATA[".date('d.m.Y',strtotime($studiensemester_endedatum->ende))."]]></studiensemester_endedatum>";
 
-		echo "\t\t<voraussichtlichLetztesStudiensemester_datum><![CDATA[".$enddatum."]]></voraussichtlichLetztesStudiensemester_datum>";
+		if($abbrecher)
+			echo "\t\t<voraussichtlichLetztesStudiensemester_datum><![CDATA[".date('d.m.Y',strtotime($prestudent->datum))."]]></voraussichtlichLetztesStudiensemester_datum>";
+		else
+			echo "\t\t<voraussichtlichLetztesStudiensemester_datum><![CDATA[".$enddatum."]]></voraussichtlichLetztesStudiensemester_datum>";
 
 		echo "\t\t<studierendenstatus_aktuell><![CDATA[".$studierendenstatus_aktuell."]]></studierendenstatus_aktuell>\n";
 		echo "\t\t<datum_reifepruefung><![CDATA[".$prestudent->zgvdatum."]]></datum_reifepruefung>\n";

From 2d440585f4d00fbad1bb692976c361cd1e73c7e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 14 Jun 2021 16:40:27 +0200
Subject: [PATCH 10/29] Planner enhancements - Removed Loading of Mantis Tasks
 - Dont Load Ressource Overview on Startup - Set Projects Tab as Default on
 Startup

---
 content/planner.overlay.xul.php             |   6 +-
 content/projekt/projekttask.overlay.js.php  | 102 ++++++++++----------
 content/projekt/projekttask.overlay.xul.php |   6 +-
 content/projekt/ressource.overlay.xul.php   |   4 +-
 content/projekt/ressourcenauslastung.php    |  17 +++-
 5 files changed, 71 insertions(+), 64 deletions(-)

diff --git a/content/planner.overlay.xul.php b/content/planner.overlay.xul.php
index 5f6b4e800..1175827a3 100644
--- a/content/planner.overlay.xul.php
+++ b/content/planner.overlay.xul.php
@@ -107,9 +107,9 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/ressource.overlay.xul.php"
 <vbox id="vbox-main">
 	<tabbox id="tabbox-main" flex="3" orient="vertical">
 		<tabs id="tabs-planner-main" orient="horizontal">
-			<tab id="tab-projekte" label="Projekte" />
+			<tab id="tab-projekte" label="Projekte" selected="true" />
 			<tab id="tab-projektphase" label="Phasen" />
-			<tab id="tab-projekttask" label="Tasks" selected="true" />
+			<tab id="tab-projekttask" label="Tasks"/>
 			<tab id="tab-dokumente" label="Dokumente" />
 			<tab id="tab-ressourceauslastung" label="Ressourcen" />
 			<tab id="tab-bestellung" label="Bestellungen" />
@@ -176,7 +176,7 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/ressource.overlay.xul.php"
 	      <treechildren>
 	       <treeitem uri="rdf:*">
 	         <treerow>
-	           <treecell label="rdf:http://www.technikum-wien.at/ressource/rdf#bezeichnung"/>	         
+	           <treecell label="rdf:http://www.technikum-wien.at/ressource/rdf#bezeichnung"/>
 	           <treecell label="rdf:http://www.technikum-wien.at/ressource/rdf#rdf_description"/>
 	           <treecell label="rdf:http://www.technikum-wien.at/ressource/rdf#typ"/>
 	           <treecell label="rdf:http://www.technikum-wien.at/ressource/rdf#ressource_id"/>
diff --git a/content/projekt/projekttask.overlay.js.php b/content/projekt/projekttask.overlay.js.php
index 464463ea1..2aa29b98d 100644
--- a/content/projekt/projekttask.overlay.js.php
+++ b/content/projekt/projekttask.overlay.js.php
@@ -25,7 +25,7 @@ require_once('../../config/vilesci.config.inc.php');
 
 var TaskSelectID=null; //ID des Task Eintrages der nach dem Refresh markiert werden soll
 var filterErledigt; //Tasks filtern
-var currentProjektPhaseID; 
+var currentProjektPhaseID;
 // ********** Observer und Listener ************* //
 
 // ****
@@ -81,13 +81,13 @@ function LoadTasks(projekt_phase_id, filter)
 		{
 			// wenn phase übergeben wurde -> setzte globale variable
 			if(projekt_phase_id != null && projekt_phase_id != '' && typeof optional && "undefined")
-				currentProjektPhaseID = projekt_phase_id; 
-			
+				currentProjektPhaseID = projekt_phase_id;
+
 			// wenn filter übergeben wurde -> setze globale variable
 			if(filter != null && filter != '' && typeof filter != "undefined")
 				filterErledigt = filter;
-				
-			url = "<?php echo APP_ROOT; ?>rdf/projekttask.rdf.php?projektphase_id="+currentProjektPhaseID+"&"+gettimestamp();	
+
+			url = "<?php echo APP_ROOT; ?>rdf/projekttask.rdf.php?projektphase_id="+currentProjektPhaseID+"&"+gettimestamp();
 
 			// überprüfe ob filter gesetzt ist
 			if(filterErledigt != null)
@@ -100,7 +100,7 @@ function LoadTasks(projekt_phase_id, filter)
 			{
 			    treeTask.database.RemoveDataSource(oldDatasources.getNext());
 			}
-	
+
 			try
 			{
 			    datasourceTreeTask.removeXMLSinkObserver(TaskTreeSinkObserver);
@@ -108,7 +108,7 @@ function LoadTasks(projekt_phase_id, filter)
 			}
 			catch(e)
 			{}
-			
+
 			var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
 			datasourceTreeTask = rdfService.GetDataSource(url);
 			datasourceTreeTask.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
@@ -116,7 +116,7 @@ function LoadTasks(projekt_phase_id, filter)
 			treeTask.database.AddDataSource(datasourceTreeTask);
 			datasourceTreeTask.addXMLSinkObserver(TaskTreeSinkObserver);
 			treeTask.builder.addListener(TaskTreeListener);
-			
+
 		}
 		catch(e)
 		{
@@ -153,7 +153,7 @@ function RessourceTaskLoad(menulist, id)
 	datasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
 	menulist.database.AddDataSource(datasource);
 	menulist.builder.rebuild();
-	
+
 }
 
 
@@ -167,7 +167,7 @@ function TaskTreeRefresh()
 	//markierte Lehreinheit global speichern damit diese LE nach dem
 	//refresh wieder markiert werden kann.
 	var tree = document.getElementById('projekttask-tree');
-		
+
 	try
 	{
 		TaskSelectID = getTreeCellText(tree, "projekttask-treecol-projekttask_id", tree.currentIndex);
@@ -187,7 +187,7 @@ function TaskNeu()
 	var tasktree=document.getElementById('projekttask-tree');
 	tasktree.view.selection.clearSelection();
 	tree = document.getElementById('tree-projektmenue');
-	
+
 	//Projektphase_id holen
 	var projektphase_id = getTreeCellText(tree, "treecol-projektmenue-projekt_phase_id", tree.currentIndex);
 
@@ -199,12 +199,12 @@ function TaskNeu()
 	//Details zuruecksetzen
 	TaskDetailReset();
 	TaskDisableFields(false);
-			
+
 	document.getElementById('textbox-projekttaskdetail-projektphase_id').value=projektphase_id;
 	document.getElementById('caption-projekttask-detail').label='Neuer Task';
-	
+
 	//Detail Tab auswaehlen
-	document.getElementById('projekttask-tabs').selectedItem=document.getElementById('projekttask-tab-detail');	
+	document.getElementById('projekttask-tabs').selectedItem=document.getElementById('projekttask-tab-detail');
 }
 // ****
 // * Selectiert die Lektorzuordnung nachdem der Tree
@@ -222,7 +222,7 @@ function TaskTreeSelectTask()
 	   	{
 	   		//id der row holen
 	   		id = getTreeCellText(tree, "projekttask-treecol-projekttask_id", i);
-			
+
 			//wenn dies die zu selektierende Zeile
 			if(TaskSelectID==id)
 			{
@@ -264,7 +264,7 @@ function TaskDelete()
 		var soapBody = new SOAPObject("deleteProjekttask");
 		soapBody.appendChild(new SOAPObject("projekttask_id")).val(id);
 		var sr = new SOAPRequest("deleteProjekttask",soapBody);
-	
+
 		SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
 		SOAPClient.SendRequest(sr, clb_deleteProjekttask);
 	}
@@ -285,7 +285,7 @@ function clb_deleteProjekttask(respObj)
 		return;
 	}
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
-			
+
 	TaskSelectID='';
 	datasourceTreeTask.Refresh(false); //non blocking
 	SetStatusBarText('Eintrag wurde entfernt');
@@ -332,7 +332,7 @@ function showProjekttaskParsedown()
 
 	//Werte holen
 	projekttask_id = document.getElementById('textbox-projekttaskdetail-projekttask_id').value;
-	
+
 	if(!isNaN(projekttask_id) && projekttask_id != '')
 	{
 		window.open("projekt/parsedown.php?projekttask_id="+projekttask_id,"Projekttask"+projekttask_id);
@@ -355,15 +355,15 @@ function saveProjekttaskDetail()
 	aufwand = document.getElementById('textbox-projekttask-detail-aufwand').value;
 	mantis_id = document.getElementById('textbox-projekttask-detail-mantis_id').value;
 	scrumsprint_id = document.getElementById('textbox-projekttask-detail-scrumsprint_id').value;
-	ressource_id = MenulistGetSelectedValue('textbox-projekttask-detail-ressource'); 	
+	ressource_id = MenulistGetSelectedValue('textbox-projekttask-detail-ressource');
 	ende = document.getElementById('textbox-projekttask-detail-ende').iso;
-	
+
 	if(!isNaN(projektphase_id) && projektphase_id != '')
 	{
 		var soapBody = new SOAPObject("saveProjekttask");
 		//soapBody.appendChild(new SOAPObject("username")).val('joe');
 		//soapBody.appendChild(new SOAPObject("passwort")).val('waschl');
-					
+
 		var task = new SOAPObject("task");
 		task.appendChild(new SOAPObject("projekttask_id")).val(projekttask_id);
 		task.appendChild(new SOAPObject("projektphase_id")).val(projektphase_id);
@@ -376,9 +376,9 @@ function saveProjekttaskDetail()
 		task.appendChild(new SOAPObject("ressource_id")).val(ressource_id);
 		task.appendChild(new SOAPObject("ende")).val(ende);
 		soapBody.appendChild(task);
-								
+
 		var sr = new SOAPRequest("saveProjekttask",soapBody);
-	
+
 		SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
 		SOAPClient.SendRequest(sr, clb_saveProjekttask);
 	}else
@@ -402,7 +402,7 @@ function clb_saveProjekttask(respObj)
 	}
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 		document.getElementById('textbox-projekttaskdetail-projekttask_id').value=id;
-		
+
 	TaskSelectID=id;
 	datasourceTreeTask.Refresh(false); //non blocking
 	SetStatusBarText('Daten wurden gespeichert');
@@ -415,7 +415,7 @@ function clb_saveProjekttask(respObj)
 // ****
 function onselectProjekttask()
 {
-	
+
 	// Trick 17	(sonst gibt's ein Permission denied)
 	netscape.security.PrivilegeManager.enablePrivilege("UniversalXPConnect");
 	var tree = document.getElementById('projekttask-tree');
@@ -445,12 +445,12 @@ function onselectProjekttask()
 		alert(e);
 		return false;
 	}
-	
+
 	var req = new phpRequest('../rdf/projekttask.rdf.php','','');
 	req.add('projekttask_id',id);
 
 	var response = req.execute();
-	
+
 	// Datasource holen
 	var dsource=parseRDFString(response, 'http://www.technikum-wien.at/projekttask/alle-projekttasks');
 
@@ -472,7 +472,7 @@ function onselectProjekttask()
 	var scrumsprint_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#scrumsprint_id" ));
 	var ressource_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ressource_id" ));
 	var ende=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#ende" ));
-	
+
 	//Daten den Feldern zuweisen
 	var menulist = document.getElementById('textbox-projekttask-detail-ressource');
 	RessourceTaskLoad(menulist, projektphase_id);
@@ -486,17 +486,17 @@ function onselectProjekttask()
 	document.getElementById('textbox-projekttask-detail-scrumsprint_id').value=scrumsprint_id;
 	MenulistSelectItemOnValue('textbox-projekttask-detail-ressource', ressource_id);
 	//document.getElementById('textbox-projekttask-detail-ressource').value=ressource_id;
-	
+
 	 //Notizen zu eines Tasks Laden
 	notiz = document.getElementById('box-projekttask-notizen');
 	notiz.LoadNotizTree('','',projekttask_id,'','','','', '','');
-	
+
 	//Mantis Tab reset
 	document.getElementById('textbox-projekttask-mantis-issue_summary').value=bezeichnung;
 	document.getElementById('textbox-projekttask-mantis-issue_description').value=beschreibung;
 	//document.getElementById('textbox-projekttask-mantis-issue_project_id').value='1';
     //document.getElementById('textbox-projekttask-mantis-issue_category').value='General';
-	
+
 	document.getElementById('textbox-projekttask-mantis-mantis_id').value='';
 	document.getElementById('textbox-projekttask-mantis-issue_view_state_id').value='';
 	document.getElementById('textbox-projekttask-mantis-issue_view_state_name').value='';
@@ -525,9 +525,9 @@ function onselectProjekttask()
     document.getElementById('textbox-projekttask-mantis-issue_due_date').value='';
 	document.getElementById('textbox-projekttask-mantis-issue_steps_to_reproduce').value='';
 	document.getElementById('textbox-projekttask-mantis-issue_additional_information').value='';
-        
+
     //Mantis
-	if (mantis_id!='')
+	if (false && mantis_id!='')
     {
     	var req = new phpRequest('../rdf/mantis.rdf.php','','');
         req.add('issue_id',mantis_id);
@@ -539,7 +539,7 @@ function onselectProjekttask()
 		           getService(Components.interfaces.nsIRDFService);
         subject = rdfService.GetResource("http://www.technikum-wien.at/mantis/" + mantis_id);
         predicateNS = "http://www.technikum-wien.at/mantis/rdf";
-    
+
         //Daten holen
         var issue_id = getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_id" ));
         var issue_summary=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_summary" ));
@@ -571,12 +571,12 @@ function onselectProjekttask()
 		var issue_tags_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_tags_name" ));
 		var issue_resolution_id=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_resolution_id" ));
 		var issue_resolution_name=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_resolution_name" ));
-		var issue_due_date=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_due_date" ));			 		 
+		var issue_due_date=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_due_date" ));
 		var issue_steps_to_reproduce=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_steps_to_reproduce" ));
 		var issue_additional_information=getTargetHelper(dsource,subject,rdfService.GetResource( predicateNS + "#issue_additional_information" ));
 
 		ProjekttaskLoadCategories(issue_project_id);
-		
+
 		//Daten den Feldern zuweisen
 		document.getElementById('textbox-projekttask-mantis-mantis_id').value=mantis_id;
 		document.getElementById('textbox-projekttask-mantis-issue_summary').value=issue_summary;
@@ -610,18 +610,18 @@ function onselectProjekttask()
 		document.getElementById('textbox-projekttask-mantis-issue_due_date').value=issue_due_date;
 		document.getElementById('textbox-projekttask-mantis-issue_steps_to_reproduce').value=issue_steps_to_reproduce;
 		document.getElementById('textbox-projekttask-mantis-issue_additional_information').value=issue_additional_information;
-		document.getElementById('textbox-projekttask-mantis-issue_tags').value=issue_tags_name; 
+		document.getElementById('textbox-projekttask-mantis-issue_tags').value=issue_tags_name;
 	}
 }
 
 // ****
-// * Beim Aendern des Mantis Projekts werden die zugehoerigen 
+// * Beim Aendern des Mantis Projekts werden die zugehoerigen
 // * Kategorien geladen
 // ****
 function ProjekttaskMantisProjektChange()
 {
 	project_id=document.getElementById('menulist-projekttask-mantis-issue_project_id').value;
-	
+
 	if(project_id!='')
 		ProjekttaskLoadCategories(project_id);
 }
@@ -645,10 +645,10 @@ function ProjekttaskLoadCategories(project_id)
 		}
 		//Refresh damit die entfernten DS auch wirklich entfernt werden
 		menulist.builder.rebuild();
-	
-		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);	
+
+		var rdfService = Components.classes["@mozilla.org/rdf/rdf-service;1"].getService(Components.interfaces.nsIRDFService);
 		var datasource = rdfService.GetDataSourceBlocking(url);
-	
+
 		datasource.QueryInterface(Components.interfaces.nsIRDFRemoteDataSource);
 		datasource.QueryInterface(Components.interfaces.nsIRDFXMLSink);
 		menulist.database.AddDataSource(datasource);
@@ -696,7 +696,7 @@ function saveProjekttaskMantis()
 	var issue_steps_to_reproduce=document.getElementById('textbox-projekttask-mantis-issue_steps_to_reproduce').value;
 	var issue_additional_information=document.getElementById('textbox-projekttask-mantis-issue_additional_information').value;
 	var issue_tags = document.getElementById('textbox-projekttask-mantis-issue_tags').value;
-	
+
 	var soapBody = new SOAPObject("saveMantis");
 	soapBody.appendChild(new SOAPObject("projekttask_id")).val(projekttask_id);
 	soapBody.appendChild(new SOAPObject("mantis_id")).val(mantis_id);
@@ -731,25 +731,25 @@ function saveProjekttaskMantis()
 	soapBody.appendChild(new SOAPObject("issue_due_date")).val(issue_due_date);
 	soapBody.appendChild(new SOAPObject("issue_steps_to_reproduce")).val(issue_steps_to_reproduce);
 	soapBody.appendChild(new SOAPObject("issue_additional_information")).val(issue_additional_information);
-		
+
 	var sr = new SOAPRequest("saveMantis",soapBody);
 
 	SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
 	SOAPClient.SendRequest(sr, clb_saveProjekttaskMantis);
-	
+
 	// Tags speichern
 	if(mantis_id != '')
 	{
 		var soapBody = new SOAPObject("saveTagsForIssue");
 		soapBody.appendChild(new SOAPObject("mantis_id")).val(mantis_id);
-		soapBody.appendChild(new SOAPObject("issue_tags")).val(issue_tags);	
+		soapBody.appendChild(new SOAPObject("issue_tags")).val(issue_tags);
 
 		var sr = new SOAPRequest("saveTagsForIssue",soapBody);
 
 		SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
 		SOAPClient.SendRequest(sr, clb_saveProjekttaskMantis);
 	}
-	
+
 }
 
 // ****
@@ -779,7 +779,7 @@ function ProjekttaskUpdateErledigt(event)
     var col = new Object();
     var childElt = new Object();
     //Tree holen
-    var tree = event.currentTarget; 
+    var tree = event.currentTarget;
     //Treecol ermitteln in die geklickt wurde
     tree.treeBoxObject.getCellAt(event.clientX, event.clientY, row, col, childElt);
     //abbrechen wenn auf Header oder Scrollbar geklickt wurde
@@ -798,7 +798,7 @@ function ProjekttaskUpdateErledigt(event)
 			newval='false';
 		else
 			newval='true';
-		
+
 		var soapBody = new SOAPObject("setErledigt");
 		//soapBody.appendChild(new SOAPObject("username")).val('joe');
 		//soapBody.appendChild(new SOAPObject("passwort")).val('waschl');
@@ -807,8 +807,8 @@ function ProjekttaskUpdateErledigt(event)
 
 	    var sr = new SOAPRequest("setErledigt",soapBody);
 	    SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/projekttask.soap.php?"+gettimestamp();
-    				    
-    	SOAPClient.SendRequest(sr,function (respObj) 
+
+    	SOAPClient.SendRequest(sr,function (respObj)
     	{
 	    	try
 			{
diff --git a/content/projekt/projekttask.overlay.xul.php b/content/projekt/projekttask.overlay.xul.php
index cbce0e857..52c19828b 100644
--- a/content/projekt/projekttask.overlay.xul.php
+++ b/content/projekt/projekttask.overlay.xul.php
@@ -29,7 +29,7 @@ require_once('../../config/vilesci.config.inc.php');
 echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 
 echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/projekttaskdetail.overlay.xul.php"?>';
-echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/mantisdetail.overlay.xul.php"?>';
+
 ?>
 <overlay id="ProjekttaskOverlay"
 	xmlns:html="http://www.w3.org/1999/xhtml"
@@ -154,12 +154,12 @@ echo '<?xul-overlay href="'.APP_ROOT.'content/projekt/mantisdetail.overlay.xul.p
 			<tabbox id="projekttask-tabbox" flex="3" orient="vertical">
 				<tabs orient="horizontal" id="projekttask-tabs">
 					<tab id="projekttask-tab-detail" label="Details" />
-					<tab id="projekttask-tab-mantis" label="Mantis" />
+
 					<tab id="projekttask-tab-notizen" label="Notizen" />
 				</tabs>
 				<tabpanels id="projekttask-tabpanels-main" flex="1">
 					<vbox id="box-projekttask-detail" />
-					<vbox id="box-projekttask-mantis" />
+
 					<box class="Notiz" id="box-projekttask-notizen"/>
 				</tabpanels>
 			</tabbox>
diff --git a/content/projekt/ressource.overlay.xul.php b/content/projekt/ressource.overlay.xul.php
index cd509cbfd..f291009b2 100644
--- a/content/projekt/ressource.overlay.xul.php
+++ b/content/projekt/ressource.overlay.xul.php
@@ -64,7 +64,7 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 							<toolbarbutton id="toolbarbutton-ressource-projekt-drucken" label="Drucken" oncommand="foo = window.open('<?php echo APP_ROOT; ?>content/projekt/ressourcenauslastung.php?typ=projekt');foo.print();" image="../skin/images/drucken.png" tooltiptext="Drucken"/>
 						</toolbar>
 					</toolbox>
-					<iframe id="iframe-ressource-projekt" flex="5" src="<?php echo APP_ROOT; ?>content/projekt/ressourcenauslastung.php?typ=projekt" />
+					<iframe id="iframe-ressource-projekt" flex="5" src="<?php echo APP_ROOT; ?>content/projekt/ressourcenauslastung.php?empty" />
 				</vbox>
 				<vbox>
 					<toolbox>
@@ -89,4 +89,4 @@ echo '<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>';
 			</tabpanels>
 		</tabbox>
 	</vbox>
-</overlay>
\ No newline at end of file
+</overlay>
diff --git a/content/projekt/ressourcenauslastung.php b/content/projekt/ressourcenauslastung.php
index 8bbdba923..1c069e0f6 100644
--- a/content/projekt/ressourcenauslastung.php
+++ b/content/projekt/ressourcenauslastung.php
@@ -34,7 +34,12 @@ $datum = date('Y-m-d',$timestamp);
 $endetimestamp = jump_week($timestamp,$showweeks);
 $endedatum = date('Y-m-d',$endetimestamp);
 
-if(isset($_GET['projekt_kurzbz']) && $_GET['projekt_kurzbz']!='')
+if(isset($_GET['empty']))
+{
+	echo '<br><br><br>';
+	exit;
+}
+elseif(isset($_GET['projekt_kurzbz']) && $_GET['projekt_kurzbz']!='')
 {
 	$projekt_kurzbz=$_GET['projekt_kurzbz'];
 }
@@ -60,9 +65,10 @@ else
 	$anzahl_warnung = 6;
 }
 
-
 foreach($ressource->result as $row)
+{
 	$ressource_arr[]=$row->bezeichnung;
+}
 
 $ressource_arr = array_unique($ressource_arr);
 
@@ -117,7 +123,7 @@ foreach($ressource_arr as $bezeichnung)
 			$beistrich=false;
 			$start = $datum_obj->mktime_fromdate($row->start);
 			$ende = $datum_obj->mktime_fromdate($row->ende);
-			if($row->bezeichnung == $bezeichnung 
+			if($row->bezeichnung == $bezeichnung
 				&& ($row->start=='' || $start<=$timestamp_kw)
 				&& ($row->ende=='' || $ende>=$timestamp_kw)
 				)
@@ -156,10 +162,10 @@ foreach($ressource_arr as $bezeichnung)
 				if($beistrich)
 					$title.=', ';
 			}
-			
+
 		}
 		$title = mb_substr($title,0,-1);
-		
+
 		$htmlrow.='<td title="'.$title.'" align="center">';
 		if($anzahl>=$anzahl_warnung)
 			$htmlrow.='<span class="warning">'.$anzahl.($typ!='projekt'?'/'.$aufwandssumme:'').'</span>';
@@ -173,6 +179,7 @@ foreach($ressource_arr as $bezeichnung)
 	ob_flush();
 }
 
+echo ' </table>';
 echo '
 	</body>
 </html>';

From ed9bfcdf2d55751aea040f64e9c054504acc7ad4 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Tue, 15 Jun 2021 11:18:55 +0200
Subject: [PATCH 11/29] change infoscreen preview url

---
 vilesci/stammdaten/infoscreen_preview.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/vilesci/stammdaten/infoscreen_preview.php b/vilesci/stammdaten/infoscreen_preview.php
index 884edb1c6..06d36ddaa 100644
--- a/vilesci/stammdaten/infoscreen_preview.php
+++ b/vilesci/stammdaten/infoscreen_preview.php
@@ -56,10 +56,10 @@ $datum_obj = new datum();
 		echo '
 		<div style="float: left">
 			<h2><center>',$row->bezeichnung,'</center></h2>
-			<iframe style="width:500px; height:400px" src="../../cis/infoterminal/infoscreen.php?ipadresse=',$row->ipadresse,'"></iframe>
+			<iframe style="width:500px; height:400px" src="../../cis/infoterminal/informationsbildschirm.php?ipadresse=',$row->ipadresse,'"></iframe>
 		</div>';
 	}
 ?>
  
 </body>
-</html>
\ No newline at end of file
+</html>

From 212261a38ef6e908425cfe83740835da0cae179f Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 16 Jun 2021 09:18:53 +0200
Subject: [PATCH 12/29] autofill vom username im falschen feld verhindern

---
 application/views/lehre/lehrauftrag/acceptLehrauftrag.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
index e87f0945c..521883452 100644
--- a/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
+++ b/application/views/lehre/lehrauftrag/acceptLehrauftrag.php
@@ -189,7 +189,7 @@ $this->load->view(
 
 			<div class="col-xs-4 col-md-offset-0 col-md-4">
 				<div class="input-group">
-					<input id="username" type="hidden" autocomplete="username" value=""><!-- this is to prevent Chrome autofilling a random input field with the username-->
+					<input id="username" autocomplete="username" style="position: absolute; opacity: 0;"><!-- this is to prevent Chrome autofilling a random input field with the username-->
 					<input id="password" type="password" autocomplete="new-password" class="form-control" placeholder="CIS-<?php echo ucfirst($this->p->t('password', 'password')); ?>">
 						<span class="input-group-btn">
 							<button id="accept-lehrauftraege" class="btn btn-primary pull-right"><?php echo ucfirst($this->p->t('global', 'lehrauftraegeAnnehmen')); ?></button>

From 6376853734a233f6d3da89c31ca3a53e5bf42a0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Wed, 16 Jun 2021 15:10:43 +0200
Subject: [PATCH 13/29] =?UTF-8?q?Planner:=20Timming=20Problem=20beim=20Spe?=
 =?UTF-8?q?ichern=20von=20Ressourcen=20behoben=20das=20dazu=20f=C3=BChrte?=
 =?UTF-8?q?=20dass=20die=20Daten=20nicht=20immer=20gespeichert=20wurden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../projekt/projekt_ressource.window.js.php   | 137 +++++++++---------
 1 file changed, 69 insertions(+), 68 deletions(-)

diff --git a/content/projekt/projekt_ressource.window.js.php b/content/projekt/projekt_ressource.window.js.php
index bf0aed5de..480fb3551 100644
--- a/content/projekt/projekt_ressource.window.js.php
+++ b/content/projekt/projekt_ressource.window.js.php
@@ -6,76 +6,77 @@ require_once('../../include/functions.inc.php');
 
 function updateProjektRessource()
 {
-				if(projekt_ressource_id!='')
+	if(projekt_ressource_id!='')
+	{
+		aufwand = document.getElementById("textbox-ressource-aufwand").value;
+		if (document.getElementById("leitung").selected)
+			funktion_kurzbz = 'Leitung';
+		else
+			funktion_kurzbz = 'Mitarbeiter';
+
+		try
+		{
+			var soapBody = new SOAPObject("saveProjektRessource");
+			var projektRessource = new SOAPObject("projektRessource");
+
+			projektRessource.appendChild(new SOAPObject("projekt_ressource_id")).val(projekt_ressource_id);
+
+			if(projekt_kurzbz != '')
+			{
+				projektRessource.appendChild(new SOAPObject("projektphase_id")).val('');
+				projektRessource.appendChild(new SOAPObject("projekt_kurzbz")).val(projekt_kurzbz);
+				var res_binding = window.opener.document.getElementById('box-projekt-ressourcen');
+			}
+			else if(projektphase_id != '')
+			{
+				projektRessource.appendChild(new SOAPObject("projektphase_id")).val(projektphase_id);
+				projektRessource.appendChild(new SOAPObject("projekt_kurzbz")).val('');
+				var res_binding = window.opener.document.getElementById('box-projekt-ressource-phase');
+			}
+
+			projektRessource.appendChild(new SOAPObject("ressource_id")).val(ressource_id);
+			projektRessource.appendChild(new SOAPObject("funktion_kurzbz")).val(funktion_kurzbz);
+			projektRessource.appendChild(new SOAPObject("beschreibung")).val(beschreibung);
+			projektRessource.appendChild(new SOAPObject("aufwand")).val(aufwand);
+
+			soapBody.appendChild(projektRessource);
+
+			var sr = new SOAPRequest("saveProjektRessource",soapBody);
+			SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/ressource_projekt.soap.php?"+gettimestamp();
+
+			function mycallb(obj, projekt_kurzbz, projektphase_id)
+			{
+				var ressourcebinding=obj;
+				var projekt = projekt_kurzbz;
+				var phase = projektphase_id;
+
+				this.invoke=function (respObj)
 				{
+					try
+					{
+						var id = respObj.Body[0].saveProjektRessourceResponse[0].message[0].Text;
+					}
+					catch(e)
+					{
+						var fehler = respObj.Body[0].Fault[0].faultstring[0].Text;
+						alert('Fehler: '+fehler);
+						return;
+					}
+					// Ressourcen Tree aktualisieren
+					ressourcebinding.LoadRessourceTree(projekt, phase);
 
-						aufwand = document.getElementById("textbox-ressource-aufwand").value;
-						if (document.getElementById("leitung").selected)
-							funktion_kurzbz = 'Leitung';
-						else
-							funktion_kurzbz = 'Mitarbeiter';
-
-
-
-						try
-						{
-							var soapBody = new SOAPObject("saveProjektRessource");
-							var projektRessource = new SOAPObject("projektRessource");
-
-						    projektRessource.appendChild(new SOAPObject("projekt_ressource_id")).val(projekt_ressource_id);
-
-						    if(projekt_kurzbz != '')
-						    {
-							    projektRessource.appendChild(new SOAPObject("projektphase_id")).val('');
-							    projektRessource.appendChild(new SOAPObject("projekt_kurzbz")).val(projekt_kurzbz);
-						    }
-						    else if(projektphase_id != '')
-						    {
-							    projektRessource.appendChild(new SOAPObject("projektphase_id")).val(projektphase_id);
-							    projektRessource.appendChild(new SOAPObject("projekt_kurzbz")).val('');
-						    }
-
-						    projektRessource.appendChild(new SOAPObject("ressource_id")).val(ressource_id);
-						    projektRessource.appendChild(new SOAPObject("funktion_kurzbz")).val(funktion_kurzbz);
-						    projektRessource.appendChild(new SOAPObject("beschreibung")).val(beschreibung);
-						    projektRessource.appendChild(new SOAPObject("aufwand")).val(aufwand);
-
-							soapBody.appendChild(projektRessource);
-
-						    var sr = new SOAPRequest("saveProjektRessource",soapBody);
-						    SOAPClient.Proxy="<?php echo APP_ROOT;?>soap/ressource_projekt.soap.php?"+gettimestamp();
-
-						    function mycallb(obj)
-						    {
-								  var me=obj;
-								  this.invoke=function (respObj)
-								  {
-									    try
-										{
-											var id = respObj.Body[0].saveProjektRessourceResponse[0].message[0].Text;
-										}
-										catch(e)
-										{
-											var fehler = respObj.Body[0].Fault[0].faultstring[0].Text;
-											alert('Fehler: '+fehler);
-											return;
-										}
-										me.RefreshRessource();
-								  }
-							}
-
-							var cb=new mycallb(this);
-
-						   //SOAPClient.SendRequest(sr,cb.invoke);
-							SOAPClient.SendRequest(sr);
-						}
-						catch(e)
-						{
-							debug("Ressource load failed with exception: "+e);
-						}
-
+					// Popup schließen
+					window.close();
 				}
-				//window.opener.location.reload(false);
-				window.close();
+			}
 
+			// Callback fuer aktualisierung des Trees nach dem Speichern
+			var cb=new mycallb(res_binding, projekt_kurzbz, projektphase_id);
+			SOAPClient.SendRequest(sr,cb.invoke);
+		}
+		catch(e)
+		{
+			debug("Ressource load failed with exception: "+e);
+		}
+	}
 }

From ab799cb54fc7d58ac621859cbb1bb7b5451dda5e Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Thu, 17 Jun 2021 13:47:21 +0200
Subject: [PATCH 14/29] abweisen auch wenn bereits freigegeben

---
 .../system/infocenter/InfoCenter.php          |  6 +-
 .../system/infocenter/infocenterData.php      |  2 +-
 .../infocenter/infocenterFreigegeben.php      |  2 +
 .../infocenter/infocenterFreigegebenData.php  |  2 +-
 .../infocenterReihungstestAbsolviert.php      |  2 +
 .../views/system/infocenter/zgvpruefungen.php | 57 +++++++++++++++++++
 6 files changed, 67 insertions(+), 4 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 40ff3ceff..cc8d25cec 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -451,8 +451,8 @@ class InfoCenter extends Auth_Controller
 
 		if (hasData($lastStatus) && hasData($statusgrresult))
 		{
-			//check if still Interessent and not freigegeben yet
-			if ($lastStatus->retval[0]->status_kurzbz === self::INTERESSENTSTATUS && !isset($lastStatus->retval[0]->bestaetigtam))
+			//check if still Interessent
+			if ($lastStatus->retval[0]->status_kurzbz === self::INTERESSENTSTATUS)
 			{
 				$result = $this->PrestudentstatusModel->insert(
 					array(
@@ -1363,6 +1363,8 @@ class InfoCenter extends Auth_Controller
 				|| isset($zgvpruefung->prestudentstatus->bestaetigtam)
 				|| $zgvpruefung->prestudentstatus->status_kurzbz != self::INTERESSENTSTATUS;
 
+			$zgvpruefung->abgewiesener = $zgvpruefung->prestudentstatus->status_kurzbz === self::ABGEWIESENERSTATUS;
+
 			//wether prestudent was freigegeben for RT/Stg
 			$zgvpruefung->isRtFreigegeben = false;
 			$zgvpruefung->isStgFreigegeben = false;
diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 0c7030059..5c0d7f105 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -3,7 +3,7 @@
 	$APP = '\'infocenter\'';
 	$REJECTED_STATUS = '\'Abgewiesener\'';
 	$INTERESSENT_STATUS = '\'Interessent\'';
-	$STUDIENGANG_TYP = '\'b\'';
+	$STUDIENGANG_TYP = '\'m\'';
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
 	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\', \'Interessent rejected\'';
 	$LOGDATA_NAME_PARKED = '\'Parked\'';
diff --git a/application/views/system/infocenter/infocenterFreigegeben.php b/application/views/system/infocenter/infocenterFreigegeben.php
index 15e73f1b6..4855e5cd6 100644
--- a/application/views/system/infocenter/infocenterFreigegeben.php
+++ b/application/views/system/infocenter/infocenterFreigegeben.php
@@ -13,6 +13,7 @@
 			'ajaxlib' => true,
 			'filterwidget' => true,
 			'navigationwidget' => true,
+			'dialoglib' => true,
 			'phrases' => array(
 				'person' => array('vorname', 'nachname'),
 				'global' => array('mailAnXversandt'),
@@ -40,6 +41,7 @@
 				</div>
 				<div>
 					<?php $this->load->view('system/infocenter/infocenterFreigegebenData.php'); ?>
+					<?php $this->load->view('system/infocenter/absageModal.php'); ?>
 				</div>
 			</div>
 		</div>
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
index aab69b651..047afe5f2 100644
--- a/application/views/system/infocenter/infocenterFreigegebenData.php
+++ b/application/views/system/infocenter/infocenterFreigegebenData.php
@@ -2,7 +2,7 @@
 
 	$APP = '\'infocenter\'';
 	$INTERESSENT_STATUS = '\'Interessent\'';
-	$STUDIENGANG_TYP = '\'b\'';
+	$STUDIENGANG_TYP = '\'m\'';
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
 	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\'';
 	$REJECTED_STATUS = '\'Abgewiesener\'';
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviert.php b/application/views/system/infocenter/infocenterReihungstestAbsolviert.php
index 79f75885b..f2d838fac 100644
--- a/application/views/system/infocenter/infocenterReihungstestAbsolviert.php
+++ b/application/views/system/infocenter/infocenterReihungstestAbsolviert.php
@@ -13,6 +13,7 @@
 			'ajaxlib' => true,
 			'filterwidget' => true,
 			'navigationwidget' => true,
+			'dialoglib' => true,
 			'phrases' => array(
 				'person' => array('vorname', 'nachname'),
 				'global' => array('mailAnXversandt'),
@@ -40,6 +41,7 @@
 				</div>
 				<div>
 					<?php $this->load->view('system/infocenter/infocenterReihungstestAbsolviertData.php'); ?>
+					<?php $this->load->view('system/infocenter/absageModal.php'); ?>
 				</div>
 			</div>
 		</div>
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index 41b549616..5bf700483 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -508,6 +508,63 @@
 								</label>
 							</div>
 						</div><!-- /.row -->
+						<div class="row">
+							<div class="col-lg-4 text-left">
+								<div class="input-group" id="absgstatusgrselect_<?php echo $zgvpruefung->prestudent_id ?>">
+									<select name="absgstatusgrund"
+											class="d-inline float-right"
+											required>
+										<option value="null"
+												selected="selected"><?php echo ucfirst($this->p->t('infocenter', 'absagegrund')) . '...' ?>
+										</option>
+										<?php foreach ($abwstatusgruende as $statusgrund): ?>
+											<option value="<?php echo $statusgrund->statusgrund_id ?>"><?php echo $statusgrund->bezeichnung_mehrsprachig[0] ?></option>
+										<?php endforeach ?>
+									</select>
+									<span class="input-group-btn">
+											<button type="button"
+													class="btn btn-default absageBtn" id="absagebtn_<?php echo $zgvpruefung->prestudent_id ?>">
+												<?php echo  $this->p->t('ui', 'absagen') ?>
+											</button>
+										</span>
+								</div>
+								<div class="modal fade absageModal" id="absageModal_<?php echo $zgvpruefung->prestudent_id ?>"
+									 tabindex="-1"
+									 role="dialog"
+									 aria-labelledby="absageModalLabel"
+									 aria-hidden="true">
+									<div class="modal-dialog">
+										<div class="modal-content">
+											<div class="modal-header">
+												<button type="button"
+														class="close"
+														data-dismiss="modal"
+														aria-hidden="true">
+													&times;
+												</button>
+												<h4 class="modal-title"
+													id="absageModalLabel"><?php echo  $this->p->t('infocenter', 'absageBestaetigen') ?></h4>
+											</div>
+											<div class="modal-body">
+												<?php echo  $this->p->t('infocenter', 'absageBestaetigenTxt') ?>
+											</div>
+											<div class="modal-footer">
+												<button type="button"
+														class="btn btn-default"
+														data-dismiss="modal">
+													<?php echo  $this->p->t('ui', 'abbrechen') ?>
+												</button>
+												<button class="btn btn-primary saveAbsage" id="saveAbsage_<?php echo $zgvpruefung->prestudent_id ?>">
+													<?php echo  $this->p->t('infocenter', 'interessentAbweisen') ?>
+												</button>
+											</div>
+										</div>
+										<!-- /.modal-content -->
+									</div>
+									<!-- /.modal-dialog -->
+								</div>
+							</div>
+						</div>
 					</div><!-- /.panel-footer -->
 				<?php endif; //end if infoonly
 				?>

From e5a6af7eb3e50ea9124fe38261450ad3c65da76a Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 18 Jun 2021 09:16:02 +0200
Subject: [PATCH 15/29] first guess adding filter for upcoming exams

---
 .../lehre/pruefungsprotokollUebersicht.php    |  2 ++
 .../pruefungsprotokollUebersichtData.php      |  1 +
 system/phrasesupdate.php                      | 20 +++++++++++++++++++
 3 files changed, 23 insertions(+)

diff --git a/application/views/lehre/pruefungsprotokollUebersicht.php b/application/views/lehre/pruefungsprotokollUebersicht.php
index 35bea7963..2416b30bd 100644
--- a/application/views/lehre/pruefungsprotokollUebersicht.php
+++ b/application/views/lehre/pruefungsprotokollUebersicht.php
@@ -48,6 +48,8 @@
                                 name="period" value="today"><?php echo $this->p->t('ui','heute'); ?></button>
                         <button type="submit" class="btn btn-default <?php echo $period == 'lastWeek' ? 'active' : ''?>"
                                 name="period" value="lastWeek"><?php echo $this->p->t('ui','letzteWoche'); ?></button>
+                        <button type="submit" class="btn btn-default <?php echo $period == 'in_the_future' ? 'active' : ''?>"
+                                name="period" value="upcoming"><?php echo $this->p->t('ui','zukuenftige'); ?></button>
                         <button type="submit" class="btn btn-default <?php echo $period == 'all' ? 'active' : ''?>"
                                 name="period" value="all"><?php echo $this->p->t('ui','alle'); ?></button>
                     </div>
diff --git a/application/views/lehre/pruefungsprotokollUebersichtData.php b/application/views/lehre/pruefungsprotokollUebersichtData.php
index dd247c2eb..caee939a5 100644
--- a/application/views/lehre/pruefungsprotokollUebersichtData.php
+++ b/application/views/lehre/pruefungsprotokollUebersichtData.php
@@ -21,6 +21,7 @@ WHERE
 	AND (
 		'". $PERIOD. "' = 'today' AND datum = NOW()::date OR
 		'". $PERIOD. "' = 'lastWeek' AND datum = (NOW() - interval '1 week')::date OR
+                '". $PERIOD. "' = 'upcoming' AND datum > NOW()::date OR    
 		'". $PERIOD. "' = 'all' AND datum >= '2020-05-27'
 	)
 ORDER BY datum, nachname, vorname
diff --git a/system/phrasesupdate.php b/system/phrasesupdate.php
index b49aa6044..18098af91 100644
--- a/system/phrasesupdate.php
+++ b/system/phrasesupdate.php
@@ -7949,6 +7949,26 @@ Any unusual occurrences
 			)
 		)
 	),
+	array(
+		'app' => 'core',
+		'category' => 'ui',
+		'phrase' => 'zukuenftige',
+		'insertvon' => 'system',
+		'phrases' => array(
+			array(
+				'sprache' => 'German',
+				'text' => 'Zukünftige',
+				'description' => '',
+				'insertvon' => 'system'
+			),
+			array(
+				'sprache' => 'English',
+				'text' => 'upcoming',
+				'description' => '',
+				'insertvon' => 'system'
+			)
+		)
+	),    
 	array(
 		'app' => 'core',
 		'category' => 'ui',

From a0b86b6207cdf25cd1a897554dd7728c36180842 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 18 Jun 2021 09:21:39 +0200
Subject: [PATCH 16/29] rename in_the_future to upcoming consistently

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

diff --git a/application/views/lehre/pruefungsprotokollUebersicht.php b/application/views/lehre/pruefungsprotokollUebersicht.php
index 2416b30bd..c7de8fcd0 100644
--- a/application/views/lehre/pruefungsprotokollUebersicht.php
+++ b/application/views/lehre/pruefungsprotokollUebersicht.php
@@ -48,7 +48,7 @@
                                 name="period" value="today"><?php echo $this->p->t('ui','heute'); ?></button>
                         <button type="submit" class="btn btn-default <?php echo $period == 'lastWeek' ? 'active' : ''?>"
                                 name="period" value="lastWeek"><?php echo $this->p->t('ui','letzteWoche'); ?></button>
-                        <button type="submit" class="btn btn-default <?php echo $period == 'in_the_future' ? 'active' : ''?>"
+                        <button type="submit" class="btn btn-default <?php echo $period == 'upcoming' ? 'active' : ''?>"
                                 name="period" value="upcoming"><?php echo $this->p->t('ui','zukuenftige'); ?></button>
                         <button type="submit" class="btn btn-default <?php echo $period == 'all' ? 'active' : ''?>"
                                 name="period" value="all"><?php echo $this->p->t('ui','alle'); ?></button>

From cea673fa824c4db5e6c3c6e6a4cdf8ceb04ed156 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 18 Jun 2021 12:45:44 +0200
Subject: [PATCH 17/29] adjust indentation, changed filter lastWeek to cover
 last 7 days and not only a week ago today

---
 application/views/lehre/pruefungsprotokollUebersichtData.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/lehre/pruefungsprotokollUebersichtData.php b/application/views/lehre/pruefungsprotokollUebersichtData.php
index caee939a5..1450c7f93 100644
--- a/application/views/lehre/pruefungsprotokollUebersichtData.php
+++ b/application/views/lehre/pruefungsprotokollUebersichtData.php
@@ -20,8 +20,8 @@ WHERE
 	vorsitz='".$UID."'
 	AND (
 		'". $PERIOD. "' = 'today' AND datum = NOW()::date OR
-		'". $PERIOD. "' = 'lastWeek' AND datum = (NOW() - interval '1 week')::date OR
-                '". $PERIOD. "' = 'upcoming' AND datum > NOW()::date OR    
+		'". $PERIOD. "' = 'lastWeek' AND datum >= (NOW() - interval '1 week')::date AND datum < NOW()::date OR
+		'". $PERIOD. "' = 'upcoming' AND datum > NOW()::date OR
 		'". $PERIOD. "' = 'all' AND datum >= '2020-05-27'
 	)
 ORDER BY datum, nachname, vorname

From e76dead57076bc23d1b7f9ba4958d3274f16bc21 Mon Sep 17 00:00:00 2001
From: Harald Bamberger <harald.bamberger@technikum-wien.at>
Date: Fri, 18 Jun 2021 14:45:05 +0200
Subject: [PATCH 18/29] add parantheses although not explicitly needed for
 correct function

---
 .../views/lehre/pruefungsprotokollUebersichtData.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/application/views/lehre/pruefungsprotokollUebersichtData.php b/application/views/lehre/pruefungsprotokollUebersichtData.php
index 1450c7f93..ff2caa774 100644
--- a/application/views/lehre/pruefungsprotokollUebersichtData.php
+++ b/application/views/lehre/pruefungsprotokollUebersichtData.php
@@ -19,10 +19,10 @@ FROM
 WHERE
 	vorsitz='".$UID."'
 	AND (
-		'". $PERIOD. "' = 'today' AND datum = NOW()::date OR
-		'". $PERIOD. "' = 'lastWeek' AND datum >= (NOW() - interval '1 week')::date AND datum < NOW()::date OR
-		'". $PERIOD. "' = 'upcoming' AND datum > NOW()::date OR
-		'". $PERIOD. "' = 'all' AND datum >= '2020-05-27'
+		('". $PERIOD. "' = 'today' AND datum = NOW()::date) OR
+		('". $PERIOD. "' = 'lastWeek' AND datum >= (NOW() - interval '1 week')::date AND datum < NOW()::date) OR
+		('". $PERIOD. "' = 'upcoming' AND datum > NOW()::date) OR
+		('". $PERIOD. "' = 'all' AND datum >= '2020-05-27')
 	)
 ORDER BY datum, nachname, vorname
 ";

From 7314352e794981ec5f67f5c0b0d48de5aaa01bf7 Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 22 Jun 2021 16:54:45 +0200
Subject: [PATCH 19/29] =?UTF-8?q?absagen=20nun=20m=C3=B6glich=20auch=20bei?=
 =?UTF-8?q?=20studenten=20die=20den=20reihungstest=20absolviert=20haben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/infocenter/InfoCenter.php          |   8 +-
 .../models/organisation/Studiengang_model.php |  17 +-
 .../infocenter/infocenterFreigegebenData.php  |   6 +
 .../infocenterReihungstestAbsolviertData.php  |   3 +-
 .../views/system/infocenter/zgvpruefungen.php | 278 ++++++++----------
 5 files changed, 147 insertions(+), 165 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index cc8d25cec..7d36690e7 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -70,6 +70,7 @@ class InfoCenter extends Auth_Controller
 	const INTERESSENTSTATUS = 'Interessent';
 	const ABGEWIESENERSTATUS = 'Abgewiesener';
 	const BEWERBERSTATUS = 'Bewerber';
+	const WARTENDER = 'Wartender';
 
 	// Statusgruende for which no Studiengangsfreigabemessage should be sent
 	private $_statusgruendeNoStgFreigabeMessage = array('FIT Programm', 'FIT program', 'FIT programme');
@@ -452,7 +453,9 @@ class InfoCenter extends Auth_Controller
 		if (hasData($lastStatus) && hasData($statusgrresult))
 		{
 			//check if still Interessent
-			if ($lastStatus->retval[0]->status_kurzbz === self::INTERESSENTSTATUS)
+			if ($lastStatus->retval[0]->status_kurzbz === self::INTERESSENTSTATUS
+				|| $lastStatus->retval[0]->status_kurzbz === self::BEWERBERSTATUS
+				|| $lastStatus->retval[0]->status_kurzbz === self::WARTENDER)
 			{
 				$result = $this->PrestudentstatusModel->insert(
 					array(
@@ -1700,7 +1703,8 @@ class InfoCenter extends Auth_Controller
 		$this->load->model('organisation/Studiengang_model', 'StudiengangModel');
 
 		$statusgruende = $this->StatusgrundModel->getStatus(self::ABGEWIESENERSTATUS, true)->retval;
-		$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(['b', 'm']);
+		$studienSemester = $this->variablelib->getVar('infocenter_studiensemester');
+		$studiengaenge = $this->StudiengangModel->getStudiengaengeWithOrgForm(['b', 'm'], $studienSemester);
 
 		$data = array (
 			'statusgruende' => $statusgruende,
diff --git a/application/models/organisation/Studiengang_model.php b/application/models/organisation/Studiengang_model.php
index 999fcbbd0..41bdabd11 100644
--- a/application/models/organisation/Studiengang_model.php
+++ b/application/models/organisation/Studiengang_model.php
@@ -482,16 +482,17 @@ class Studiengang_model extends DB_Model
 		return $this->loadWhere($condition);
 	}
 
-	public function getStudiengaengeWithOrgForm($typ)
+	public function getStudiengaengeWithOrgForm($typ, $semester)
 	{
 		$query = "SELECT DISTINCT (UPPER(sg.typ || sg.kurzbz || ':' || sp.orgform_kurzbz)) AS Studiengang
-					FROM public.tbl_prestudentstatus pss
-					JOIN public.tbl_prestudent ps USING(prestudent_id)
-					JOIN public.tbl_studiengang sg USING(studiengang_kz)
-					JOIN lehre.tbl_studienplan sp USING(studienplan_id)
-					WHERE sg.typ IN ?
-					ORDER BY Studiengang;";
+					FROM public.tbl_studiengang sg
+					JOIN lehre.tbl_studienordnung USING (studiengang_kz)
+					JOIN lehre.tbl_studienplan sp USING (studienordnung_id)
+					JOIN lehre.tbl_studienplan_semester spsem USING (studienplan_id)
+					WHERE sp.aktiv = TRUE AND sg.aktiv = TRUE AND sg.typ IN ?
+					AND spsem.studiensemester_kurzbz = ?
+					ORDER BY Studiengang";
 
-		return $this->execQuery($query, array($typ));
+		return $this->execQuery($query, array($typ, $semester));
 	}
 }
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
index 047afe5f2..83e8c8916 100644
--- a/application/views/system/infocenter/infocenterFreigegebenData.php
+++ b/application/views/system/infocenter/infocenterFreigegebenData.php
@@ -114,6 +114,12 @@
 					    sg.studiengang_kz in('.$ADDITIONAL_STG.')
 					   )
 				   AND pss.studiensemester_kurzbz = '.$STUDIENSEMESTER.'
+				   AND NOT EXISTS (
+					   SELECT 1
+						 FROM tbl_prestudentstatus spss
+						WHERE spss.prestudent_id = ps.prestudent_id
+						  AND spss.status_kurzbz = '.$REJECTED_STATUS.'
+					)
 				 LIMIT 1
 			) AS "StgAbgeschickt",
 			(
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
index 22b122bb0..beb4887ae 100644
--- a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
+++ b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
@@ -83,10 +83,11 @@
 				 LIMIT 1
 			) AS "AnzahlAbgeschickt",
 			(
-				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz || \':\' || sg.orgform_kurzbz)), \', \')
+				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.typ || sg.kurzbz || \':\' || sp.orgform_kurzbz)), \', \')
 				  FROM public.tbl_prestudentstatus pss
 				  JOIN public.tbl_prestudent ps USING(prestudent_id)
 				  JOIN public.tbl_studiengang sg USING(studiengang_kz)
+				  JOIN lehre.tbl_studienplan sp USING(studienplan_id)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND pss.bewerbung_abgeschicktamum IS NOT NULL
 				   AND ps.person_id = p.person_id
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index 5bf700483..2d00a789d 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -344,7 +344,7 @@
 
 				<?php
 				//Prestudenten cannot be abgewiesen or freigegeben if already done
-				if (!$infoonly) :
+				if (!$infoonly || (isset($zgvpruefung->prestudentstatus->status_kurzbz) && in_array($zgvpruefung->prestudentstatus->status_kurzbz, ['Bewerber', 'Wartender']))) :
 					?>
 					<div class="panel-footer solidtop">
 						<div class="row">
@@ -368,130 +368,97 @@
 											</button>
 										</span>
 									</div>
-									<div class="modal fade absageModal" id="absageModal_<?php echo $zgvpruefung->prestudent_id ?>"
-										 tabindex="-1"
-										 role="dialog"
-										 aria-labelledby="absageModalLabel"
-										 aria-hidden="true">
-										<div class="modal-dialog">
-											<div class="modal-content">
-												<div class="modal-header">
-													<button type="button"
-															class="close"
-															data-dismiss="modal"
-															aria-hidden="true">
-														&times;
-													</button>
-													<h4 class="modal-title"
-														id="absageModalLabel"><?php echo  $this->p->t('infocenter', 'absageBestaetigen') ?></h4>
-												</div>
-												<div class="modal-body">
-													<?php echo  $this->p->t('infocenter', 'absageBestaetigenTxt') ?>
-												</div>
-												<div class="modal-footer">
-													<button type="button"
-															class="btn btn-default"
-															data-dismiss="modal">
-														<?php echo  $this->p->t('ui', 'abbrechen') ?>
-													</button>
-													<button class="btn btn-primary saveAbsage" id="saveAbsage_<?php echo $zgvpruefung->prestudent_id ?>">
-														<?php echo  $this->p->t('infocenter', 'interessentAbweisen') ?>
-													</button>
-												</div>
-											</div>
-											<!-- /.modal-content -->
-										</div>
-										<!-- /.modal-dialog -->
-									</div>
 								</div>
 							</div><!-- /.column-absage -->
-								<?php
-								$disabled = $disabledStg = $disabledTxt = $disabledStgTxt = '';
-								if (isEmptyString($zgvpruefung->prestudentstatus->bewerbung_abgeschicktamum))
-								{
-									$disabled = $disabledStg = 'disabled';
-									$disabledTxt = $disabledStgTxt = $this->p->t('infocenter', 'bewerbungMussAbgeschickt');
-								}
+							<?php
+							$disabled = $disabledStg = $disabledTxt = $disabledStgTxt = '';
+							if (isEmptyString($zgvpruefung->prestudentstatus->bewerbung_abgeschicktamum))
+							{
+								$disabled = $disabledStg = 'disabled';
+								$disabledTxt = $disabledStgTxt = $this->p->t('infocenter', 'bewerbungMussAbgeschickt');
+							}
 
-								if ($studiengangtyp !== 'b')
-								{
-									$disabled = 'disabled';
-									$disabledTxt = $this->p->t('infocenter', 'nurBachelorFreigeben');
+							if ($studiengangtyp !== 'b')
+							{
+								$disabled = 'disabled';
+								$disabledTxt = $this->p->t('infocenter', 'nurBachelorFreigeben');
 
-									// FIT-Lehrgänge: exceptions, can be freigegeben in Infocenter
-									if (!in_array($studiengang_kz, $fit_programme_studiengaenge))
-									{
-										$disabledStg = 'disabled';
-										$disabledStgTxt = $this->p->t('infocenter', 'nurBachelorFreigeben');
-									}
+								// FIT-Lehrgänge: exceptions, can be freigegeben in Infocenter
+								if (!in_array($studiengang_kz, $fit_programme_studiengaenge))
+								{
+									$disabledStg = 'disabled';
+									$disabledStgTxt = $this->p->t('infocenter', 'nurBachelorFreigeben');
 								}
-								?>
-							<div class="col-lg-8 text-right">
-								<div class="form-inline">
-									<div class="input-group frgstatusgrselect" id="frgstatusgrselect_<?php echo $zgvpruefung->prestudent_id ?>">
-										<select name="frgstatusgrund"
-												class="d-inline float-right"
-												<?php echo $disabledStg ?>
-												required>
-											<option value="null"
-													selected="selected"><?php echo ucfirst($this->p->t('ui', 'freigabeart')) . '...' ?>
-											</option>
-											<?php foreach ($intstatusgruende as $statusgrund): ?>
-												<option value="<?php echo $statusgrund->statusgrund_id ?>"><?php echo $statusgrund->bezeichnung_mehrsprachig[0] ?></option>
-											<?php endforeach ?>
-										</select>
-										<span class="input-group-btn">
-											<button class="btn btn-default freigabebtnstg" <?php echo $disabledStg ?> id="freigabebtnstg_<?php echo $zgvpruefung->prestudent_id ?>"
-													data-toggle="tooltip" title="<?php echo $disabledStgTxt ?>">
-												<?php echo  $this->p->t('ui', 'freigabeAnStudiengang') ?>
+							}
+							if (!$infoonly) :
+							?>
+								<div class="col-lg-8 text-right">
+									<div class="form-inline">
+										<div class="input-group frgstatusgrselect" id="frgstatusgrselect_<?php echo $zgvpruefung->prestudent_id ?>">
+											<select name="frgstatusgrund"
+													class="d-inline float-right"
+													<?php echo $disabledStg ?>
+													required>
+												<option value="null"
+														selected="selected"><?php echo ucfirst($this->p->t('ui', 'freigabeart')) . '...' ?>
+												</option>
+												<?php foreach ($intstatusgruende as $statusgrund): ?>
+													<option value="<?php echo $statusgrund->statusgrund_id ?>"><?php echo $statusgrund->bezeichnung_mehrsprachig[0] ?></option>
+												<?php endforeach ?>
+											</select>
+											<span class="input-group-btn">
+												<button class="btn btn-default freigabebtnstg" <?php echo $disabledStg ?> id="freigabebtnstg_<?php echo $zgvpruefung->prestudent_id ?>"
+														data-toggle="tooltip" title="<?php echo $disabledStgTxt ?>">
+													<?php echo  $this->p->t('ui', 'freigabeAnStudiengang') ?>
+												</button>
+											</span>
+										</div>
+										<div class="input-group" id="igrfrgbtn">
+											<button type="button" id="freigabebtn_<?php echo $zgvpruefung->prestudent_id ?>" class="btn btn-default freigabebtn" <?php echo $disabled ?>
+													data-toggle="tooltip" title="<?php echo $disabledTxt ?>">
+												<?php echo  $this->p->t('ui', 'freigabeZumReihungstest') ?>
 											</button>
-										</span>
-									</div>
-									<div class="input-group" id="igrfrgbtn">
-										<button type="button" id="freigabebtn_<?php echo $zgvpruefung->prestudent_id ?>" class="btn btn-default freigabebtn" <?php echo $disabled ?>
-												data-toggle="tooltip" title="<?php echo $disabledTxt ?>">
-											<?php echo  $this->p->t('ui', 'freigabeZumReihungstest') ?>
-										</button>
+										</div>
 									</div>
 								</div>
-							</div>
-							<div class="modal fade freigabeModal" id="freigabeModal_<?php echo $zgvpruefung->prestudent_id ?>" tabindex="-1"
-								 role="dialog"
-								 aria-labelledby="freigabeModalLabel"
-								 aria-hidden="true">
-								<div class="modal-dialog">
-									<div class="modal-content">
-										<div class="modal-header">
-											<button type="button" class="close"
-													data-dismiss="modal"
-													aria-hidden="true">&times;
-											</button>
-											<h4 class="modal-title"
-												id="freigabeModalLabel">
-												<?php echo $this->p->t('infocenter', 'freigabeBestaetigen') ?>
-												<span id="freigabeModalStgr_<?php echo $zgvpruefung->prestudent_id ?>"></span>
-											</h4>
-										</div>
-										<div class="modal-body">
-											<?php echo $this->p->t('infocenter', 'interessentFreigebenTxt') ?>
-										</div>
-										<div class="modal-footer">
-											<button type="button"
-													class="btn btn-default"
-													data-dismiss="modal"><?php echo  $this->p->t('ui', 'abbrechen') ?>
-											</button>
-											<button type="button"
-													class="btn btn-primary saveFreigabe" id="saveFreigabe_<?php echo $zgvpruefung->prestudent_id ?>">
-												<?php echo $this->p->t('infocenter', 'interessentFreigeben') ?>
-											</button>
-											<button type="button"
-													class="btn btn-primary saveStgFreigabe" id="saveStgFreigabe_<?php echo $zgvpruefung->prestudent_id ?>">
-												<?php echo $this->p->t('infocenter', 'interessentFreigeben') ?>
-											</button>
-										</div>
-									</div><!-- /.modal-content -->
-								</div><!-- /.modal-dialog -->
-							</div><!-- /.modal-fade -->
+								<div class="modal fade freigabeModal" id="freigabeModal_<?php echo $zgvpruefung->prestudent_id ?>" tabindex="-1"
+									 role="dialog"
+									 aria-labelledby="freigabeModalLabel"
+									 aria-hidden="true">
+									<div class="modal-dialog">
+										<div class="modal-content">
+											<div class="modal-header">
+												<button type="button" class="close"
+														data-dismiss="modal"
+														aria-hidden="true">&times;
+												</button>
+												<h4 class="modal-title"
+													id="freigabeModalLabel">
+													<?php echo $this->p->t('infocenter', 'freigabeBestaetigen') ?>
+													<span id="freigabeModalStgr_<?php echo $zgvpruefung->prestudent_id ?>"></span>
+												</h4>
+											</div>
+											<div class="modal-body">
+												<?php echo $this->p->t('infocenter', 'interessentFreigebenTxt') ?>
+											</div>
+											<div class="modal-footer">
+												<button type="button"
+														class="btn btn-default"
+														data-dismiss="modal"><?php echo  $this->p->t('ui', 'abbrechen') ?>
+												</button>
+												<button type="button"
+														class="btn btn-primary saveFreigabe" id="saveFreigabe_<?php echo $zgvpruefung->prestudent_id ?>">
+													<?php echo $this->p->t('infocenter', 'interessentFreigeben') ?>
+												</button>
+												<button type="button"
+														class="btn btn-primary saveStgFreigabe" id="saveStgFreigabe_<?php echo $zgvpruefung->prestudent_id ?>">
+													<?php echo $this->p->t('infocenter', 'interessentFreigeben') ?>
+												</button>
+											</div>
+										</div><!-- /.modal-content -->
+									</div><!-- /.modal-dialog -->
+								</div><!-- /.modal-fade -->
+							<?php endif; ?>
 						</div><!-- /.row -->
 					</div><!-- /.panel-footer -->
 				<?php elseif (isset($zgvpruefung->prestudentstatus->status_kurzbz) && $zgvpruefung->prestudentstatus->status_kurzbz === 'Interessent'): ?>
@@ -528,46 +495,49 @@
 											</button>
 										</span>
 								</div>
-								<div class="modal fade absageModal" id="absageModal_<?php echo $zgvpruefung->prestudent_id ?>"
-									 tabindex="-1"
-									 role="dialog"
-									 aria-labelledby="absageModalLabel"
-									 aria-hidden="true">
-									<div class="modal-dialog">
-										<div class="modal-content">
-											<div class="modal-header">
-												<button type="button"
-														class="close"
-														data-dismiss="modal"
-														aria-hidden="true">
-													&times;
-												</button>
-												<h4 class="modal-title"
-													id="absageModalLabel"><?php echo  $this->p->t('infocenter', 'absageBestaetigen') ?></h4>
-											</div>
-											<div class="modal-body">
-												<?php echo  $this->p->t('infocenter', 'absageBestaetigenTxt') ?>
-											</div>
-											<div class="modal-footer">
-												<button type="button"
-														class="btn btn-default"
-														data-dismiss="modal">
-													<?php echo  $this->p->t('ui', 'abbrechen') ?>
-												</button>
-												<button class="btn btn-primary saveAbsage" id="saveAbsage_<?php echo $zgvpruefung->prestudent_id ?>">
-													<?php echo  $this->p->t('infocenter', 'interessentAbweisen') ?>
-												</button>
-											</div>
-										</div>
-										<!-- /.modal-content -->
-									</div>
-									<!-- /.modal-dialog -->
-								</div>
 							</div>
 						</div>
 					</div><!-- /.panel-footer -->
-				<?php endif; //end if infoonly
-				?>
+
+					<?php
+					endif;
+					?>
+
+				<div class="modal fade absageModal" id="absageModal_<?php echo $zgvpruefung->prestudent_id ?>"
+					 tabindex="-1"
+					 role="dialog"
+					 aria-labelledby="absageModalLabel"
+					 aria-hidden="true">
+					<div class="modal-dialog">
+						<div class="modal-content">
+							<div class="modal-header">
+								<button type="button"
+										class="close"
+										data-dismiss="modal"
+										aria-hidden="true">
+									&times;
+								</button>
+								<h4 class="modal-title"
+									id="absageModalLabel"><?php echo  $this->p->t('infocenter', 'absageBestaetigen') ?></h4>
+							</div>
+							<div class="modal-body">
+								<?php echo  $this->p->t('infocenter', 'absageBestaetigenTxt') ?>
+							</div>
+							<div class="modal-footer">
+								<button type="button"
+										class="btn btn-default"
+										data-dismiss="modal">
+									<?php echo  $this->p->t('ui', 'abbrechen') ?>
+								</button>
+								<button class="btn btn-primary saveAbsage" id="saveAbsage_<?php echo $zgvpruefung->prestudent_id ?>">
+									<?php echo  $this->p->t('infocenter', 'interessentAbweisen') ?>
+								</button>
+							</div>
+						</div>
+						<!-- /.modal-content -->
+					</div>
+					<!-- /.modal-dialog -->
+				</div>
 			</div><!-- /.div collapse -->
 		</div><!-- /.panel -->
 	<?php

From f4ddbd3084b65a3ed79e0b9ba07baac1102fb6f2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 25 Jun 2021 11:15:12 +0200
Subject: [PATCH 20/29] Added DB-Index for lehre.tbl_pruefung to speed up
 queries

---
 system/dbupdate_3.3.php | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index e658d7a97..407a4aa24 100644
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -4767,6 +4767,20 @@ if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berecht
 	}
 }
 
+// Add index to system.tbl_log
+if ($result = $db->db_query("SELECT * FROM pg_class WHERE relname='idx_tbl_pruefung_student_uid'"))
+{
+	if ($db->db_num_rows($result) == 0)
+	{
+		$qry = "CREATE INDEX idx_tbl_pruefung_student_uid ON lehre.tbl_pruefung USING btree (student_uid)";
+
+		if (! $db->db_query($qry))
+			echo '<strong>Indizes: ' . $db->db_last_error() . '</strong><br>';
+		else
+			echo 'Index fuer lehre.pruefung.student_uid hinzugefuegt<br>';
+	}
+}
+
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
 echo '<H2>Pruefe Tabellen und Attribute!</H2>';
 

From b1ce67ebd587a99d073a5d956ff4e49f7e12e079 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 1 Jul 2021 14:59:11 +0200
Subject: [PATCH 21/29] Infocenter fixed STG Typ

---
 application/views/system/infocenter/infocenterData.php          | 2 +-
 .../views/system/infocenter/infocenterFreigegebenData.php       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 5c0d7f105..0c7030059 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -3,7 +3,7 @@
 	$APP = '\'infocenter\'';
 	$REJECTED_STATUS = '\'Abgewiesener\'';
 	$INTERESSENT_STATUS = '\'Interessent\'';
-	$STUDIENGANG_TYP = '\'m\'';
+	$STUDIENGANG_TYP = '\'b\'';
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
 	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\', \'Interessent rejected\'';
 	$LOGDATA_NAME_PARKED = '\'Parked\'';
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
index 83e8c8916..3e14e7323 100644
--- a/application/views/system/infocenter/infocenterFreigegebenData.php
+++ b/application/views/system/infocenter/infocenterFreigegebenData.php
@@ -2,7 +2,7 @@
 
 	$APP = '\'infocenter\'';
 	$INTERESSENT_STATUS = '\'Interessent\'';
-	$STUDIENGANG_TYP = '\'m\'';
+	$STUDIENGANG_TYP = '\'b\'';
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
 	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\'';
 	$REJECTED_STATUS = '\'Abgewiesener\'';

From 25124e035404d6d4580daca2dec54c20254dac38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 5 Jul 2021 18:13:37 +0200
Subject: [PATCH 22/29] Reduced amount of LDAP Requests when Loading CIS Menu

---
 cms/menu.inc.php | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/cms/menu.inc.php b/cms/menu.inc.php
index 136187f70..7375ee849 100644
--- a/cms/menu.inc.php
+++ b/cms/menu.inc.php
@@ -19,7 +19,7 @@
  */
 /**
  * Dieses File enthaelt Hilfsklassen zur Anzeige des CMS-Menues
- * 
+ *
  * mit drawSubmenu($id) wird das enstprechende Menue gezeichnet.
  */
 require_once(dirname(__FILE__).'/../include/functions.inc.php');
@@ -30,13 +30,14 @@ $params = array();
 foreach($_REQUEST as $key=>$value)
 	$params[$key]=$value;
 
+$user = null;
 //Parameter fuer Include Addons
 $includeparams = array();
 $contentobjects=array();
 $chldsobject = array();
 /**
  * Zeichnet einen Menueeintrag aus dem CMS System
- * 
+ *
  * @param $content_id
  */
 function drawSubmenu($content_id)
@@ -47,16 +48,16 @@ function drawSubmenu($content_id)
 	global $contentobjects;
 	$content = new content();
 	$sprache = getSprache();
-	
+
 	// Daten Laden
-	
+
 	// Alle Kindelemente des Contents holen
 	$ids = $content->getAllChilds($content_id);
 
-	// Alle vorkommenden Contenteintraege laden 
+	// Alle vorkommenden Contenteintraege laden
 	$content->loadArray($ids, $sprache, true);
 	$contentobjects = $content->result;
-	
+
 	// Baumstruktur laden
 	$childsobject = $content->getChildArray($content_id);
 
@@ -91,7 +92,7 @@ function drawSubmenu1($content_id)
 				drawEntry($contentobj);
 			}
 		}
-		
+
 
 	}
 }
@@ -101,12 +102,13 @@ function drawSubmenu1($content_id)
  */
 function drawEntry($item)
 {
-	global $childsobject;
+	global $childsobject, $user;
 
 	//pruefen ob der Content eine Berechtigung erfordert
 	if($item->locked)
 	{
-		$user = get_uid();
+		if(is_null($user))
+			$user = get_uid();
 		$content = new content();
 		//wenn der User nicht berechtigt ist, dann wird der Eintrag nicht angezeigt
 		if(!$content->berechtigt($item->content_id, $user))
@@ -139,7 +141,7 @@ function drawEntry($item)
 			Redirect($item);
 		else
 			DrawLink(APP_ROOT.'cms/content.php?content_id='.$item->content_id,'content',$item->titel);
-			
+
 		echo "</li>";
 	}
 }
@@ -155,7 +157,7 @@ function DrawLink($link, $target, $name, $content_id=null, $open=null)
 {
 	if($target=='')
 		$target='content';
-	
+
 	if($open)
 		$class='class="selected"';
 	else
@@ -167,7 +169,7 @@ function DrawLink($link, $target, $name, $content_id=null, $open=null)
  * Redirects sind Links Seiten ausserhalb des CMS
  * die URL kann Variablen enthalten. Diese werden hier ersetzt.
  * Danach wird der Link angezeigt.
- * 
+ *
  * @param $content_id ContentID des Redirects
  * @param $name Anzeigename des Links
  * @param $content_id_Submenu ID des Submenues das geoeffnet werden soll (optional)
@@ -175,42 +177,42 @@ function DrawLink($link, $target, $name, $content_id=null, $open=null)
 function Redirect($content, $content_id_Submenu=null)
 {
 	global $sprache, $params;
-		
+
 	$xml = new DOMDocument();
 	if($content->content!='')
 	{
 		$xml->loadXML($content->content);
 	}
-	
+
 	if($xml->getElementsByTagName('url')->item(0))
 		$url = $xml->getElementsByTagName('url')->item(0)->nodeValue;
 	else
 		$url='';
-		
+
 	//Variablen Ersetzen
 	foreach($params as $key=>$value)
 	{
 		$url = str_replace('$'.$key,addslashes($value),$url);
 	}
-	
+
 	if($xml->getElementsByTagName('target')->item(0))
 		$target = $xml->getElementsByTagName('target')->item(0)->nodeValue;
 	else
 		$target='';
-		
+
 	DrawLink($url, $target, $content->titel, $content_id_Submenu, $content->menu_open);
 }
 
 /**
- * Bei Content mit Include Templates wird 
+ * Bei Content mit Include Templates wird
  * das entsprechende Menu-Addon geladen und inkludiert
- * 
+ *
  * @param $content_id
  */
 function IncludeMenuAddon($content)
 {
 	global $sprache, $includeparams;
-	
+
 	$xml = new DOMDocument();
 	if($content->content!='')
 	{
@@ -223,6 +225,6 @@ function IncludeMenuAddon($content)
 	if($url!='')
 	{
 		$includeparams['content']=$content;
-		include(dirname(__FILE__).'/menu/'.$url);		
+		include(dirname(__FILE__).'/menu/'.$url);
 	}
 }

From 0ee6485ece2841bf0065cfdfcda7db955f9f52c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Mon, 5 Jul 2021 18:18:20 +0200
Subject: [PATCH 23/29] Dependecy Update

---
 FHC-vendor/jquery-tablesorter/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FHC-vendor/jquery-tablesorter/package.json b/FHC-vendor/jquery-tablesorter/package.json
index b16fcb45e..110042959 100644
--- a/FHC-vendor/jquery-tablesorter/package.json
+++ b/FHC-vendor/jquery-tablesorter/package.json
@@ -56,7 +56,7 @@
     ]
   },
   "devDependencies": {
-    "grunt": "^0.4.5",
+    "grunt": "^1.3.0",
     "grunt-cli": "~0.1.13",
     "grunt-contrib-clean": "^0.7.0",
     "grunt-contrib-concat": "^0.5.1",

From 1c0de3ec451b49b8857396e835b1cc2256dde2cc Mon Sep 17 00:00:00 2001
From: cris-technikum <hainberg@technikum-wien.at>
Date: Thu, 8 Jul 2021 15:05:19 +0200
Subject: [PATCH 24/29] Fixed: Doppelte Tabellenanzeige in SanchoMail
 korrigiert

Signed-off-by: cris-technikum <hainberg@technikum-wien.at>
---
 application/controllers/jobs/LehrauftragJob.php | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/application/controllers/jobs/LehrauftragJob.php b/application/controllers/jobs/LehrauftragJob.php
index 4ba327a2f..7f5754595 100644
--- a/application/controllers/jobs/LehrauftragJob.php
+++ b/application/controllers/jobs/LehrauftragJob.php
@@ -383,8 +383,8 @@ class LehrauftragJob extends JOB_Controller
 						} // Else if UID exists
 						else
 						{
-							// Search if studiensemester exists
-							$ss_index = array_search($data['studiensemester_kurzbz'], array_column($mail_data_arr, 'studiensemester_kurzbz'));
+							// Search if studiensemester exists inside the existing UID array
+							$ss_index = array_search($data['studiensemester_kurzbz'], array_column($mail_data_arr[$uid_index], 'studiensemester_kurzbz'));
 
 							// If studiensemester is new, add studiensemester to existing UID
 							if ($ss_index === false)
@@ -394,13 +394,6 @@ class LehrauftragJob extends JOB_Controller
 									$data[$i]
 								);
 							}
-							// Else if studiensemester exists
-							else
-							{
-								// Add corresponding data to existing studiensemester of UID
-								$mail_data_arr[$uid_index]['studiensemester_kurbz'][] = $data[$i];
-							}
-
 						}
 					}
 				}

From 54593512af9345f38ce66af682b70dfdbdb92041 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 8 Jul 2021 18:09:04 +0200
Subject: [PATCH 25/29] Added Sort for Loading of Notizen in Bewerbungstool

---
 include/notiz.class.php | 1237 ++++++++++++++++++++-------------------
 1 file changed, 619 insertions(+), 618 deletions(-)

diff --git a/include/notiz.class.php b/include/notiz.class.php
index 459bdc6a6..5d237e2b8 100644
--- a/include/notiz.class.php
+++ b/include/notiz.class.php
@@ -1,618 +1,619 @@
-<?php
-/* Copyright (C) 2011 FH Technikum-Wien
- *
- * 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: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
- */
-require_once(dirname(__FILE__).'/basis_db.class.php');
-require_once(dirname(__FILE__).'/dms.class.php');
-
-class notiz extends basis_db
-{
-	public $new;
-	public $result=array();
-	public $dokumente=array();
-
-	//Tabellenspalten
-	public $notiz_id;
-	public $titel;
-	public $text;
-	public $verfasser_uid;
-	public $bearbeiter_uid;
-	public $start;
-	public $ende;
-	public $erledigt;
-	public $insertamum;
-	public $insertvon;
-	public $updateamum;
-	public $updatevon;
-
-	public $projekt_kurzbz;
-	public $projektphase_id;
-	public $projekttask_id;
-	public $uid;
-	public $person_id;
-	public $prestudent_id;
-	public $bestellung_id;
-	public $lehreinheit_id;
-	public $anrechnung_id;
-
-	/**
-	 * Konstruktor
-	 * @param $notiz_id
-	 */
-	public function __construct($notiz_id = null)
-	{
-		parent::__construct();
-
-		if($notiz_id != null)
-			$this->load($notiz_id);
-	}
-
-	/**
-	 * Laedt eine Notiz
-	 * @param  $notiz_id
-	 * @return true wenn ok, false im Fehlerfall
-	 */
-	public function load($notiz_id)
-	{
-		if(!is_numeric($notiz_id))
-		{
-			$this->errormsg = 'NotizID ist ungueltig';
-			return false;
-		}
-
-		$qry = "SELECT * FROM public.tbl_notiz WHERE notiz_id=".$this->db_add_param($notiz_id, FHC_INTEGER);
-
-		if($this->db_query($qry))
-		{
-			if($row = $this->db_fetch_object())
-			{
-				$this->notiz_id=$row->notiz_id;
-				$this->titel=$row->titel;
-				$this->text=$row->text;
-				$this->verfasser_uid=$row->verfasser_uid;
-				$this->bearbeiter_uid=$row->bearbeiter_uid;
-				$this->start=$row->start;
-				$this->ende=$row->ende;
-				$this->erledigt=$this->db_parse_bool($row->erledigt);
-				$this->insertamum=$row->insertamum;
-				$this->insertvon=$row->insertvon;
-				$this->updateamum=$row->updateamum;
-				$this->updatevon=$row->updatevon;
-				$this->getDokumente($row->notiz_id);
-
-				return true;
-			}
-			else
-			{
-				$this->errormsg = 'Datensatz wurde nicht gefunden';
-				return false;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-
-	/**
-	 * Löscht eine Notiz
-	 * @param  $notiz_id
-	 * @return true wenn ok, false im Fehlerfall
-	 */
-	public function delete($notiz_id)
-	{
-		if(!is_numeric($notiz_id))
-		{
-			$this->errormsg = 'NotizID ist ungueltig';
-			return false;
-		}
-
-		// Dokumente der Notiz löschen
-		$this->getDokumente($notiz_id);
-		if(!empty($this->dokumente))
-		{
-			$dms = new dms();
-
-			foreach($this->dokumente as $dms_id)
-			{
-				$dms->deleteDms($dms_id);
-			}
-		}
-
-		$qry = "Delete FROM public.tbl_notiz WHERE notiz_id=".$this->db_add_param($notiz_id, FHC_INTEGER);
-
-		if(!$this->db_query($qry))
-		{
-			$this->errormsg = 'Fehler beim Loeschen der Daten';
-			return false;
-		}
-		return true;
-	}
-
-	/**
-	 * Prueft die Daten vor dem Speichern
-	 * auf Gueltigkeit
-	 */
-	public function validate()
-	{
-		return true;
-	}
-
-	/**
-	 * Speichert den aktuellen Datensatz in die Datenbank
-	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
-	 * andernfalls wird der Datensatz mit der ID in $notiz_id aktualisiert
-	 * @return true wenn ok, false im Fehlerfall
-	 */
-	public function save($new=null)
-	{
-		if($new==null)
-			$new=$this->new;
-
-		if(!$this->validate())
-			return false;
-
-		if($new)
-		{
-			//Neuen Datensatz einfuegen
-			$qry='BEGIN;INSERT INTO public.tbl_notiz (titel, text, verfasser_uid,
-					bearbeiter_uid, start, ende, erledigt, insertamum, insertvon,
-					updateamum, updatevon) VALUES('.
-				$this->db_add_param($this->titel).', '.
-				$this->db_add_param($this->text).', '.
-				$this->db_add_param($this->verfasser_uid).','.
-				$this->db_add_param($this->bearbeiter_uid).','.
-				$this->db_add_param($this->start).','.
-				$this->db_add_param($this->ende).','.
-				$this->db_add_param($this->erledigt,FHC_BOOLEAN).','.
-				$this->db_add_param($this->insertamum).','.
-				$this->db_add_param($this->insertvon).','.
-				$this->db_add_param($this->updateamum).','.
-				$this->db_add_param($this->updatevon).');';
-		}
-		else
-		{
-			$qry='UPDATE public.tbl_notiz SET '.
-				'titel='.$this->db_add_param($this->titel).', '.
-				'text='.$this->db_add_param($this->text).', '.
-				'verfasser_uid='.$this->db_add_param($this->verfasser_uid).', '.
-				'bearbeiter_uid='.$this->db_add_param($this->bearbeiter_uid).', '.
-				'start='.$this->db_add_param($this->start).', '.
-				'ende='.$this->db_add_param($this->ende).', '.
-				'erledigt='.$this->db_add_param($this->erledigt,FHC_BOOLEAN).', '.
-				'updateamum='.$this->db_add_param($this->updateamum).', '.
-				'updatevon='.$this->db_add_param($this->updatevon).' '.
-				'WHERE notiz_id='.$this->db_add_param($this->notiz_id,FHC_INTEGER).';';
-		}
-
-		if($this->db_query($qry))
-		{
-			if($new)
-			{
-				$qry="SELECT currval('seq_notiz_notiz_id') as id;";
-				if($result = $this->db_query($qry))
-				{
-					if($row = $this->db_fetch_object($result))
-					{
-						$this->notiz_id = $row->id;
-						$this->db_query('COMMIT;');
-						return true;
-					}
-					else
-					{
-						$this->errormsg = 'Fehler beim Lesen der Sequence';
-						$this->db_query('ROLLBACK');
-						return false;
-					}
-				}
-				else
-				{
-						$this->errormsg = 'Fehler beim Lesen der Sequence';
-						$this->db_query('ROLLBACK');
-						return false;
-				}
-			}
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Speichern des Datensatzes';
-			return false;
-		}
-	}
-
-	/**
-	 * Speichert die Zuordnung einer Notiz
-	 *
-	 */
-	public function saveZuordnung()
-	{
-		$qry = "INSERT INTO public.tbl_notizzuordnung(notiz_id, projekt_kurzbz, projektphase_id, projekttask_id,
-						uid, person_id, prestudent_id, bestellung_id, lehreinheit_id, anrechnung_id) VALUES(".
-				$this->db_add_param($this->notiz_id, FHC_INTEGER).','.
-				$this->db_add_param($this->projekt_kurzbz).','.
-				$this->db_add_param($this->projektphase_id, FHC_INTEGER).','.
-				$this->db_add_param($this->projekttask_id, FHC_INTEGER).','.
-				$this->db_add_param($this->uid).','.
-				$this->db_add_param($this->person_id, FHC_INTEGER).','.
-				$this->db_add_param($this->prestudent_id, FHC_INTEGER).','.
-				$this->db_add_param($this->bestellung_id, FHC_INTEGER).','.
-				$this->db_add_param($this->lehreinheit_id, FHC_INTEGER).','.
-				$this->db_add_param($this->anrechnung_id, FHC_INTEGER).');';
-
-		if($this->db_query($qry))
-		{
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Speichern der Daten';
-			return false;
-		}
-	}
-
-	/**
-	 * Speichert ein Dokument zur Notiz
-	 * @param int $dms_id
-	 * @return boolean
-	 */
-	public function saveDokument($dms_id)
-	{
-		$qry = "INSERT INTO public.tbl_notiz_dokument(notiz_id, dms_id) VALUES(".
-				$this->db_add_param($this->notiz_id, FHC_INTEGER).','.
-				$this->db_add_param($dms_id, FHC_INTEGER).');';
-
-		if($this->db_query($qry))
-		{
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Speichern der Daten';
-			return false;
-		}
-	}
-
-	/**
-	 *
-	 * Laedt die Notizen
-	 * @param $erledigt
-	 * @param $projekt_kurzbz
-	 * @param $projektphase_id
-	 * @param $projekttask_id
-	 * @param $uid
-	 * @param $person_id
-	 * @param $prestudent_id
-	 * @param $bestellung_id
-	 * @param $user
-	 * @param $lehreinheit_id
-	 * @param $anrechnung_id
-	 * @return boolean
-	 */
-	public function getNotiz(
-			$erledigt=null,
-			$projekt_kurzbz=null,
-			$projektphase_id=null,
-			$projekttask_id=null,
-			$uid=null,
-			$person_id=null,
-			$prestudent_id=null,
-			$bestellung_id=null,
-			$user=null,
-			$lehreinheit_id=null,
-			$stundenplandev_id=null,
-			$anrechnung_id=null,
-			$titel=null)
-	{
-		$qry = "SELECT
-					*
-				FROM
-					public.tbl_notiz
-					LEFT JOIN public.tbl_notizzuordnung USING(notiz_id)
-				WHERE 1=1";
-
-		if(!is_null($erledigt))
-		{
-			if($erledigt)
-				$qry.=" AND erledigt=true";
-			else
-				$qry.=" AND erledigt=false";
-		}
-		if($projekt_kurzbz!='')
-			$qry.=" AND projekt_kurzbz=".$this->db_add_param($projekt_kurzbz);
-		if($projektphase_id!='')
-			$qry.=" AND projektphase_id=".$this->db_add_param($projektphase_id, FHC_INTEGER);
-		if($projekttask_id!='')
-			$qry.=" AND projekttask_id=".$this->db_add_param($projekttask_id, FHC_INTEGER);
-		if($uid!='')
-			$qry.=" AND uid=".$this->db_add_param($uid);
-		if($person_id!='')
-			$qry.=" AND person_id=".$this->db_add_param($person_id, FHC_INTEGER);
-		if($prestudent_id!='')
-			$qry.=" AND prestudent_id=".$this->db_add_param($prestudent_id, FHC_INTEGER);
-		if($bestellung_id!='')
-			$qry.=" AND bestellung_id=".$this->db_add_param($bestellung_id, FHC_INTEGER);
-		if($user!='')
-			$qry.=" AND (verfasser_uid=".$this->db_add_param($user)." OR bearbeiter_uid=".$this->db_add_param($user).")";
-		if($lehreinheit_id!='')
-			$qry.=" AND lehreinheit_id=".$this->db_add_param($lehreinheit_id, FHC_INTEGER);
-		if($anrechnung_id!='')
-			$qry.=" AND anrechnung_id=".$this->db_add_param($anrechnung_id, FHC_INTEGER);
-		if($titel!='')
-			$qry.=" AND titel=".$this->db_add_param($titel);
-
-		$qry.=' ORDER BY start, ende, titel';
-
-		if($result = $this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object($result))
-			{
-				$obj = new notiz();
-
-				$obj->notiz_id=$row->notiz_id;
-				$obj->titel=$row->titel;
-				$obj->text=$row->text;
-				$obj->verfasser_uid=$row->verfasser_uid;
-				$obj->bearbeiter_uid=$row->bearbeiter_uid;
-				$obj->start=$row->start;
-				$obj->ende=$row->ende;
-				$obj->erledigt=$this->db_parse_bool($row->erledigt);
-				$obj->insertamum=$row->insertamum;
-				$obj->insertvon=$row->insertvon;
-				$obj->updateamum=$row->updateamum;
-				$obj->updatevon=$row->updatevon;
-				$obj->getDokumente($row->notiz_id);
-
-				$this->result[] = $obj;
-			}
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-
-	/**
-	 *
-	 * Laedt die Notizen vom Bewerbungstool
-	 * @param integer $person_id
-	 * @param integer $prestudent_id
-	 * @return boolean
-	 */
-	public function getBewerbungstoolNotizen($person_id, $prestudent_id = null)
-	{
-		$qry = "SELECT
-					*
-				FROM
-					public.tbl_notiz
-					LEFT JOIN public.tbl_notizzuordnung USING(notiz_id)
-				WHERE (insertvon = 'online' OR insertvon = 'online_notiz')
-				AND person_id = ".$this->db_add_param($person_id, FHC_INTEGER);
-		if ($prestudent_id != '')
-		{
-			$qry .= " AND prestudent_id = ".$this->db_add_param($prestudent_id, FHC_INTEGER);
-		}
-
-		$qry .= " ORDER BY notiz_id";
-
-		if($result = $this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object($result))
-			{
-				$obj = new notiz();
-
-				$obj->notiz_id=$row->notiz_id;
-				$obj->titel=$row->titel;
-				$obj->text=$row->text;
-				$obj->verfasser_uid=$row->verfasser_uid;
-				$obj->bearbeiter_uid=$row->bearbeiter_uid;
-				$obj->start=$row->start;
-				$obj->ende=$row->ende;
-				$obj->erledigt=$this->db_parse_bool($row->erledigt);
-				$obj->insertamum=$row->insertamum;
-				$obj->insertvon=$row->insertvon;
-				$obj->updateamum=$row->updateamum;
-				$obj->updatevon=$row->updatevon;
-
-				$this->result[] = $obj;
-			}
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-
-
-	/**
-	 * TEMPORARY: kurzfristig wird für das Onlinebewerbungstool die Ausbildung
-	 * (Name und Adresse der besuchten Schule) in eine Notiz mit
-	 * insertvon = online_ausbildung gespeichert.
-	 * Wird auf UDF umgebaut!
-	 *
-	 * Laedt die Notizen zur Ausbilund vom Bewerbungstool
-	 * @param $person_id int
-	 * @return boolean
-	 */
-	public function getBewerbungstoolNotizenAusbildung($person_id)
-	{
-		$qry = 'SELECT
-					*
-				FROM
-					public.tbl_notiz
-					LEFT JOIN public.tbl_notizzuordnung USING(notiz_id)
-				WHERE person_id = ' . $this->db_add_param($person_id, FHC_INTEGER) .
-				' AND insertvon = ' . $this->db_add_param('online_ausbildung') .
-				' ORDER BY notiz_id';
-
-		if($result = $this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object($result))
-			{
-				$obj = new notiz();
-
-				$obj->notiz_id=$row->notiz_id;
-				$obj->titel=$row->titel;
-				$obj->text=$row->text;
-				$obj->verfasser_uid=$row->verfasser_uid;
-				$obj->bearbeiter_uid=$row->bearbeiter_uid;
-				$obj->start=$row->start;
-				$obj->ende=$row->ende;
-				$obj->erledigt=$this->db_parse_bool($row->erledigt);
-				$obj->insertamum=$row->insertamum;
-				$obj->insertvon=$row->insertvon;
-				$obj->updateamum=$row->updateamum;
-				$obj->updatevon=$row->updatevon;
-
-				$this->result[] = $obj;
-			}
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-
-
-
-	/**
-
-	 *
-
-	 * Laedt die Notizen
-	 * @param $erledigt
-	 * @param $projekt_kurzbz
-	 * @param $projektphase_id
-	 * @param $projekttask_id
-	 * @param $uid
-	 * @param $person_id
-	 * @param $prestudent_id
-	 * @param $bestellung_id
-	 * @param $user
-	 * @param $lehreinheit_id
-	 * @param $anrechnung_id
-	 * @return boolean
-	 */
-	public function getAnzahlNotizen($erledigt=null, $projekt_kurzbz=null, $projektphase_id=null, $projekttask_id=null, $uid=null, $person_id=null, $prestudent_id=null, $bestellung_id=null, $user=null, $lehreinheit_id=null, $anrechnung_id=null)
-	{
-		$qry = "SELECT
-					count(*) as anzahl
-				FROM
-					public.tbl_notiz
-					LEFT JOIN public.tbl_notizzuordnung USING(notiz_id)
-				WHERE 1=1";
-
-		if(!is_null($erledigt))
-		{
-			if($erledigt)
-				$qry.=" AND erledigt=true";
-			else
-				$qry.=" AND erledigt=false";
-		}
-		if($projekt_kurzbz!='')
-			$qry.=" AND projekt_kurzbz=".$this->db_add_param($projekt_kurzbz);
-		if($projektphase_id!='')
-			$qry.=" AND projektphase_id=".$this->db_add_param($projektphase_id, FHC_INTEGER);
-		if($projekttask_id!='')
-			$qry.=" AND projekttask_id=".$this->db_add_param($projekttask_id, FHC_INTEGER);
-		if($uid!='')
-			$qry.=" AND uid=".$this->db_add_param($uid);
-		if($person_id!='')
-			$qry.=" AND person_id=".$this->db_add_param($person_id, FHC_INTEGER);
-		if($prestudent_id!='')
-			$qry.=" AND prestudent_id=".$this->db_add_param($prestudent_id, FHC_INTEGER);
-		if($bestellung_id!='')
-			$qry.=" AND bestellung_id=".$this->db_add_param($bestellung_id, FHC_INTEGER);
-		if($user!='')
-			$qry.=" AND (verfasser_uid=".$this->db_add_param($user)." OR bearbeiter_uid=".$this->db_add_param($user).")";
-		if($lehreinheit_id!='')
-			$qry.=" AND lehreinheit_id=".$this->db_add_param($lehreinheit_id, FHC_INTEGER);
-		if($anrechnung_id!='')
-			$qry.=" AND anrechnung_id=".$this->db_add_param($anrechnung_id, FHC_INTEGER);
-
-		if($result = $this->db_query($qry))
-		{
-			if($row = $this->db_fetch_object($result))
-				return $row->anzahl;
-			else
-			{
-				$this->errormsg='Fehler beim Laden der Daten';
-				return false;
-			}
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-
-	/**
-	 * Laedt die Dokumente der Notiz
-	 * @return boolean
-	 */
-	public function getDokumente($notiz_id)
-	{
-		$qry = "SELECT dms_id FROM public.tbl_notiz_dokument WHERE notiz_id=".$this->db_add_param($notiz_id, FHC_INTEGER);
-
-		if($this->db_query($qry))
-		{
-			while($row = $this->db_fetch_object())
-			{
-				$this->dokumente[] = $row->dms_id;
-			}
-
-			return true;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-
-	/**
-	 * Prueft ob das Dokument an einer Notiz haengt
-	 * @param $dms_id DMS id des Dokuments.
-	 * @return boolean true wenn das Dokument an einer Notiz hängt, sonst false.
-	 */
-	public function isNotizDokument($dms_id)
-	{
-		$qry = "SELECT * FROM public.tbl_notiz_dokument WHERE dms_id=".$this->db_add_param($dms_id, FHC_INTEGER);
-
-		if($result = $this->db_query($qry))
-		{
-			if($this->db_num_rows($result)>0)
-				return true;
-			else
-				return false;
-		}
-		else
-		{
-			$this->errormsg = 'Fehler beim Laden der Daten';
-			return false;
-		}
-	}
-}
+<?php
+/* Copyright (C) 2011 FH Technikum-Wien
+ *
+ * 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: Andreas Oesterreicher <andreas.oesterreicher@technikum-wien.at> and
+ */
+require_once(dirname(__FILE__).'/basis_db.class.php');
+require_once(dirname(__FILE__).'/dms.class.php');
+
+class notiz extends basis_db
+{
+	public $new;
+	public $result=array();
+	public $dokumente=array();
+
+	//Tabellenspalten
+	public $notiz_id;
+	public $titel;
+	public $text;
+	public $verfasser_uid;
+	public $bearbeiter_uid;
+	public $start;
+	public $ende;
+	public $erledigt;
+	public $insertamum;
+	public $insertvon;
+	public $updateamum;
+	public $updatevon;
+
+	public $projekt_kurzbz;
+	public $projektphase_id;
+	public $projekttask_id;
+	public $uid;
+	public $person_id;
+	public $prestudent_id;
+	public $bestellung_id;
+	public $lehreinheit_id;
+	public $anrechnung_id;
+
+	/**
+	 * Konstruktor
+	 * @param $notiz_id
+	 */
+	public function __construct($notiz_id = null)
+	{
+		parent::__construct();
+
+		if($notiz_id != null)
+			$this->load($notiz_id);
+	}
+
+	/**
+	 * Laedt eine Notiz
+	 * @param  $notiz_id
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function load($notiz_id)
+	{
+		if(!is_numeric($notiz_id))
+		{
+			$this->errormsg = 'NotizID ist ungueltig';
+			return false;
+		}
+
+		$qry = "SELECT * FROM public.tbl_notiz WHERE notiz_id=".$this->db_add_param($notiz_id, FHC_INTEGER);
+
+		if($this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object())
+			{
+				$this->notiz_id=$row->notiz_id;
+				$this->titel=$row->titel;
+				$this->text=$row->text;
+				$this->verfasser_uid=$row->verfasser_uid;
+				$this->bearbeiter_uid=$row->bearbeiter_uid;
+				$this->start=$row->start;
+				$this->ende=$row->ende;
+				$this->erledigt=$this->db_parse_bool($row->erledigt);
+				$this->insertamum=$row->insertamum;
+				$this->insertvon=$row->insertvon;
+				$this->updateamum=$row->updateamum;
+				$this->updatevon=$row->updatevon;
+				$this->getDokumente($row->notiz_id);
+
+				return true;
+			}
+			else
+			{
+				$this->errormsg = 'Datensatz wurde nicht gefunden';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Löscht eine Notiz
+	 * @param  $notiz_id
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function delete($notiz_id)
+	{
+		if(!is_numeric($notiz_id))
+		{
+			$this->errormsg = 'NotizID ist ungueltig';
+			return false;
+		}
+
+		// Dokumente der Notiz löschen
+		$this->getDokumente($notiz_id);
+		if(!empty($this->dokumente))
+		{
+			$dms = new dms();
+
+			foreach($this->dokumente as $dms_id)
+			{
+				$dms->deleteDms($dms_id);
+			}
+		}
+
+		$qry = "Delete FROM public.tbl_notiz WHERE notiz_id=".$this->db_add_param($notiz_id, FHC_INTEGER);
+
+		if(!$this->db_query($qry))
+		{
+			$this->errormsg = 'Fehler beim Loeschen der Daten';
+			return false;
+		}
+		return true;
+	}
+
+	/**
+	 * Prueft die Daten vor dem Speichern
+	 * auf Gueltigkeit
+	 */
+	public function validate()
+	{
+		return true;
+	}
+
+	/**
+	 * Speichert den aktuellen Datensatz in die Datenbank
+	 * Wenn $neu auf true gesetzt ist wird ein neuer Datensatz angelegt
+	 * andernfalls wird der Datensatz mit der ID in $notiz_id aktualisiert
+	 * @return true wenn ok, false im Fehlerfall
+	 */
+	public function save($new=null)
+	{
+		if($new==null)
+			$new=$this->new;
+
+		if(!$this->validate())
+			return false;
+
+		if($new)
+		{
+			//Neuen Datensatz einfuegen
+			$qry='BEGIN;INSERT INTO public.tbl_notiz (titel, text, verfasser_uid,
+					bearbeiter_uid, start, ende, erledigt, insertamum, insertvon,
+					updateamum, updatevon) VALUES('.
+				$this->db_add_param($this->titel).', '.
+				$this->db_add_param($this->text).', '.
+				$this->db_add_param($this->verfasser_uid).','.
+				$this->db_add_param($this->bearbeiter_uid).','.
+				$this->db_add_param($this->start).','.
+				$this->db_add_param($this->ende).','.
+				$this->db_add_param($this->erledigt,FHC_BOOLEAN).','.
+				$this->db_add_param($this->insertamum).','.
+				$this->db_add_param($this->insertvon).','.
+				$this->db_add_param($this->updateamum).','.
+				$this->db_add_param($this->updatevon).');';
+		}
+		else
+		{
+			$qry='UPDATE public.tbl_notiz SET '.
+				'titel='.$this->db_add_param($this->titel).', '.
+				'text='.$this->db_add_param($this->text).', '.
+				'verfasser_uid='.$this->db_add_param($this->verfasser_uid).', '.
+				'bearbeiter_uid='.$this->db_add_param($this->bearbeiter_uid).', '.
+				'start='.$this->db_add_param($this->start).', '.
+				'ende='.$this->db_add_param($this->ende).', '.
+				'erledigt='.$this->db_add_param($this->erledigt,FHC_BOOLEAN).', '.
+				'updateamum='.$this->db_add_param($this->updateamum).', '.
+				'updatevon='.$this->db_add_param($this->updatevon).' '.
+				'WHERE notiz_id='.$this->db_add_param($this->notiz_id,FHC_INTEGER).';';
+		}
+
+		if($this->db_query($qry))
+		{
+			if($new)
+			{
+				$qry="SELECT currval('seq_notiz_notiz_id') as id;";
+				if($result = $this->db_query($qry))
+				{
+					if($row = $this->db_fetch_object($result))
+					{
+						$this->notiz_id = $row->id;
+						$this->db_query('COMMIT;');
+						return true;
+					}
+					else
+					{
+						$this->errormsg = 'Fehler beim Lesen der Sequence';
+						$this->db_query('ROLLBACK');
+						return false;
+					}
+				}
+				else
+				{
+						$this->errormsg = 'Fehler beim Lesen der Sequence';
+						$this->db_query('ROLLBACK');
+						return false;
+				}
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern des Datensatzes';
+			return false;
+		}
+	}
+
+	/**
+	 * Speichert die Zuordnung einer Notiz
+	 *
+	 */
+	public function saveZuordnung()
+	{
+		$qry = "INSERT INTO public.tbl_notizzuordnung(notiz_id, projekt_kurzbz, projektphase_id, projekttask_id,
+						uid, person_id, prestudent_id, bestellung_id, lehreinheit_id, anrechnung_id) VALUES(".
+				$this->db_add_param($this->notiz_id, FHC_INTEGER).','.
+				$this->db_add_param($this->projekt_kurzbz).','.
+				$this->db_add_param($this->projektphase_id, FHC_INTEGER).','.
+				$this->db_add_param($this->projekttask_id, FHC_INTEGER).','.
+				$this->db_add_param($this->uid).','.
+				$this->db_add_param($this->person_id, FHC_INTEGER).','.
+				$this->db_add_param($this->prestudent_id, FHC_INTEGER).','.
+				$this->db_add_param($this->bestellung_id, FHC_INTEGER).','.
+				$this->db_add_param($this->lehreinheit_id, FHC_INTEGER).','.
+				$this->db_add_param($this->anrechnung_id, FHC_INTEGER).');';
+
+		if($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Speichert ein Dokument zur Notiz
+	 * @param int $dms_id
+	 * @return boolean
+	 */
+	public function saveDokument($dms_id)
+	{
+		$qry = "INSERT INTO public.tbl_notiz_dokument(notiz_id, dms_id) VALUES(".
+				$this->db_add_param($this->notiz_id, FHC_INTEGER).','.
+				$this->db_add_param($dms_id, FHC_INTEGER).');';
+
+		if($this->db_query($qry))
+		{
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Speichern der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 *
+	 * Laedt die Notizen
+	 * @param $erledigt
+	 * @param $projekt_kurzbz
+	 * @param $projektphase_id
+	 * @param $projekttask_id
+	 * @param $uid
+	 * @param $person_id
+	 * @param $prestudent_id
+	 * @param $bestellung_id
+	 * @param $user
+	 * @param $lehreinheit_id
+	 * @param $anrechnung_id
+	 * @return boolean
+	 */
+	public function getNotiz(
+			$erledigt=null,
+			$projekt_kurzbz=null,
+			$projektphase_id=null,
+			$projekttask_id=null,
+			$uid=null,
+			$person_id=null,
+			$prestudent_id=null,
+			$bestellung_id=null,
+			$user=null,
+			$lehreinheit_id=null,
+			$stundenplandev_id=null,
+			$anrechnung_id=null,
+			$titel=null)
+	{
+		$qry = "SELECT
+					*
+				FROM
+					public.tbl_notiz
+					LEFT JOIN public.tbl_notizzuordnung USING(notiz_id)
+				WHERE 1=1";
+
+		if(!is_null($erledigt))
+		{
+			if($erledigt)
+				$qry.=" AND erledigt=true";
+			else
+				$qry.=" AND erledigt=false";
+		}
+		if($projekt_kurzbz!='')
+			$qry.=" AND projekt_kurzbz=".$this->db_add_param($projekt_kurzbz);
+		if($projektphase_id!='')
+			$qry.=" AND projektphase_id=".$this->db_add_param($projektphase_id, FHC_INTEGER);
+		if($projekttask_id!='')
+			$qry.=" AND projekttask_id=".$this->db_add_param($projekttask_id, FHC_INTEGER);
+		if($uid!='')
+			$qry.=" AND uid=".$this->db_add_param($uid);
+		if($person_id!='')
+			$qry.=" AND person_id=".$this->db_add_param($person_id, FHC_INTEGER);
+		if($prestudent_id!='')
+			$qry.=" AND prestudent_id=".$this->db_add_param($prestudent_id, FHC_INTEGER);
+		if($bestellung_id!='')
+			$qry.=" AND bestellung_id=".$this->db_add_param($bestellung_id, FHC_INTEGER);
+		if($user!='')
+			$qry.=" AND (verfasser_uid=".$this->db_add_param($user)." OR bearbeiter_uid=".$this->db_add_param($user).")";
+		if($lehreinheit_id!='')
+			$qry.=" AND lehreinheit_id=".$this->db_add_param($lehreinheit_id, FHC_INTEGER);
+		if($anrechnung_id!='')
+			$qry.=" AND anrechnung_id=".$this->db_add_param($anrechnung_id, FHC_INTEGER);
+		if($titel!='')
+			$qry.=" AND titel=".$this->db_add_param($titel);
+
+		$qry.=' ORDER BY start, ende, titel';
+
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$obj = new notiz();
+
+				$obj->notiz_id=$row->notiz_id;
+				$obj->titel=$row->titel;
+				$obj->text=$row->text;
+				$obj->verfasser_uid=$row->verfasser_uid;
+				$obj->bearbeiter_uid=$row->bearbeiter_uid;
+				$obj->start=$row->start;
+				$obj->ende=$row->ende;
+				$obj->erledigt=$this->db_parse_bool($row->erledigt);
+				$obj->insertamum=$row->insertamum;
+				$obj->insertvon=$row->insertvon;
+				$obj->updateamum=$row->updateamum;
+				$obj->updatevon=$row->updatevon;
+				$obj->getDokumente($row->notiz_id);
+
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 *
+	 * Laedt die Notizen vom Bewerbungstool
+	 * @param integer $person_id
+	 * @param integer $prestudent_id
+	 * @param string $order Sorting order. Default: "notiz_id"
+	 * @return boolean
+	 */
+	public function getBewerbungstoolNotizen($person_id, $prestudent_id = null, $order = 'notiz_id')
+	{
+		$qry = "SELECT
+					*
+				FROM
+					public.tbl_notiz
+					LEFT JOIN public.tbl_notizzuordnung USING(notiz_id)
+				WHERE (insertvon = 'online' OR insertvon = 'online_notiz')
+				AND person_id = ".$this->db_add_param($person_id, FHC_INTEGER);
+		if ($prestudent_id != '')
+		{
+			$qry .= " AND prestudent_id = ".$this->db_add_param($prestudent_id, FHC_INTEGER);
+		}
+
+		$qry .= " ORDER BY ".$order;
+
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$obj = new notiz();
+
+				$obj->notiz_id=$row->notiz_id;
+				$obj->titel=$row->titel;
+				$obj->text=$row->text;
+				$obj->verfasser_uid=$row->verfasser_uid;
+				$obj->bearbeiter_uid=$row->bearbeiter_uid;
+				$obj->start=$row->start;
+				$obj->ende=$row->ende;
+				$obj->erledigt=$this->db_parse_bool($row->erledigt);
+				$obj->insertamum=$row->insertamum;
+				$obj->insertvon=$row->insertvon;
+				$obj->updateamum=$row->updateamum;
+				$obj->updatevon=$row->updatevon;
+
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
+
+	/**
+	 * TEMPORARY: kurzfristig wird für das Onlinebewerbungstool die Ausbildung
+	 * (Name und Adresse der besuchten Schule) in eine Notiz mit
+	 * insertvon = online_ausbildung gespeichert.
+	 * Wird auf UDF umgebaut!
+	 *
+	 * Laedt die Notizen zur Ausbilund vom Bewerbungstool
+	 * @param $person_id int
+	 * @return boolean
+	 */
+	public function getBewerbungstoolNotizenAusbildung($person_id)
+	{
+		$qry = 'SELECT
+					*
+				FROM
+					public.tbl_notiz
+					LEFT JOIN public.tbl_notizzuordnung USING(notiz_id)
+				WHERE person_id = ' . $this->db_add_param($person_id, FHC_INTEGER) .
+				' AND insertvon = ' . $this->db_add_param('online_ausbildung') .
+				' ORDER BY notiz_id';
+
+		if($result = $this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object($result))
+			{
+				$obj = new notiz();
+
+				$obj->notiz_id=$row->notiz_id;
+				$obj->titel=$row->titel;
+				$obj->text=$row->text;
+				$obj->verfasser_uid=$row->verfasser_uid;
+				$obj->bearbeiter_uid=$row->bearbeiter_uid;
+				$obj->start=$row->start;
+				$obj->ende=$row->ende;
+				$obj->erledigt=$this->db_parse_bool($row->erledigt);
+				$obj->insertamum=$row->insertamum;
+				$obj->insertvon=$row->insertvon;
+				$obj->updateamum=$row->updateamum;
+				$obj->updatevon=$row->updatevon;
+
+				$this->result[] = $obj;
+			}
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
+
+
+	/**
+
+	 *
+
+	 * Laedt die Notizen
+	 * @param $erledigt
+	 * @param $projekt_kurzbz
+	 * @param $projektphase_id
+	 * @param $projekttask_id
+	 * @param $uid
+	 * @param $person_id
+	 * @param $prestudent_id
+	 * @param $bestellung_id
+	 * @param $user
+	 * @param $lehreinheit_id
+	 * @param $anrechnung_id
+	 * @return boolean
+	 */
+	public function getAnzahlNotizen($erledigt=null, $projekt_kurzbz=null, $projektphase_id=null, $projekttask_id=null, $uid=null, $person_id=null, $prestudent_id=null, $bestellung_id=null, $user=null, $lehreinheit_id=null, $anrechnung_id=null)
+	{
+		$qry = "SELECT
+					count(*) as anzahl
+				FROM
+					public.tbl_notiz
+					LEFT JOIN public.tbl_notizzuordnung USING(notiz_id)
+				WHERE 1=1";
+
+		if(!is_null($erledigt))
+		{
+			if($erledigt)
+				$qry.=" AND erledigt=true";
+			else
+				$qry.=" AND erledigt=false";
+		}
+		if($projekt_kurzbz!='')
+			$qry.=" AND projekt_kurzbz=".$this->db_add_param($projekt_kurzbz);
+		if($projektphase_id!='')
+			$qry.=" AND projektphase_id=".$this->db_add_param($projektphase_id, FHC_INTEGER);
+		if($projekttask_id!='')
+			$qry.=" AND projekttask_id=".$this->db_add_param($projekttask_id, FHC_INTEGER);
+		if($uid!='')
+			$qry.=" AND uid=".$this->db_add_param($uid);
+		if($person_id!='')
+			$qry.=" AND person_id=".$this->db_add_param($person_id, FHC_INTEGER);
+		if($prestudent_id!='')
+			$qry.=" AND prestudent_id=".$this->db_add_param($prestudent_id, FHC_INTEGER);
+		if($bestellung_id!='')
+			$qry.=" AND bestellung_id=".$this->db_add_param($bestellung_id, FHC_INTEGER);
+		if($user!='')
+			$qry.=" AND (verfasser_uid=".$this->db_add_param($user)." OR bearbeiter_uid=".$this->db_add_param($user).")";
+		if($lehreinheit_id!='')
+			$qry.=" AND lehreinheit_id=".$this->db_add_param($lehreinheit_id, FHC_INTEGER);
+		if($anrechnung_id!='')
+			$qry.=" AND anrechnung_id=".$this->db_add_param($anrechnung_id, FHC_INTEGER);
+
+		if($result = $this->db_query($qry))
+		{
+			if($row = $this->db_fetch_object($result))
+				return $row->anzahl;
+			else
+			{
+				$this->errormsg='Fehler beim Laden der Daten';
+				return false;
+			}
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Laedt die Dokumente der Notiz
+	 * @return boolean
+	 */
+	public function getDokumente($notiz_id)
+	{
+		$qry = "SELECT dms_id FROM public.tbl_notiz_dokument WHERE notiz_id=".$this->db_add_param($notiz_id, FHC_INTEGER);
+
+		if($this->db_query($qry))
+		{
+			while($row = $this->db_fetch_object())
+			{
+				$this->dokumente[] = $row->dms_id;
+			}
+
+			return true;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+
+	/**
+	 * Prueft ob das Dokument an einer Notiz haengt
+	 * @param $dms_id DMS id des Dokuments.
+	 * @return boolean true wenn das Dokument an einer Notiz hängt, sonst false.
+	 */
+	public function isNotizDokument($dms_id)
+	{
+		$qry = "SELECT * FROM public.tbl_notiz_dokument WHERE dms_id=".$this->db_add_param($dms_id, FHC_INTEGER);
+
+		if($result = $this->db_query($qry))
+		{
+			if($this->db_num_rows($result)>0)
+				return true;
+			else
+				return false;
+		}
+		else
+		{
+			$this->errormsg = 'Fehler beim Laden der Daten';
+			return false;
+		}
+	}
+}

From e4aa42ad586049f6ab882c4dfbcdb08c0e4b32b7 Mon Sep 17 00:00:00 2001
From: Paolo <bison@technikum-wien.at>
Date: Wed, 21 Jul 2021 10:39:52 +0200
Subject: [PATCH 26/29] models/CL/Messages_model->getVorlage now filters out
 the _not_ active templates

---
 application/models/CL/Messages_model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/application/models/CL/Messages_model.php b/application/models/CL/Messages_model.php
index 9ffd12cf6..4975af382 100644
--- a/application/models/CL/Messages_model.php
+++ b/application/models/CL/Messages_model.php
@@ -612,9 +612,9 @@ class Messages_model extends CI_Model
 		if (!isEmptyString($vorlage_kurzbz))
 		{
 			$this->load->model('system/Vorlagestudiengang_model', 'VorlagestudiengangModel');
-			$this->VorlagestudiengangModel->addOrder('version','DESC');
+			$this->VorlagestudiengangModel->addOrder('version', 'DESC');
 
-			$getVorlage = $this->VorlagestudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz));
+			$getVorlage = $this->VorlagestudiengangModel->loadWhere(array('vorlage_kurzbz' => $vorlage_kurzbz, 'aktiv' => true));
 		}
 
 		return $getVorlage;

From c2527e1b137669464b3f4cd7fc293fbf403722b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Thu, 22 Jul 2021 15:03:27 +0200
Subject: [PATCH 27/29] Updated FHComplete Domain

---
 cis/index.html            | 2 +-
 cis/index_login.php       | 2 +-
 content/fasoverlay.js.php | 2 +-
 content/tempus.js.php     | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cis/index.html b/cis/index.html
index 792be7e10..2a3809f6f 100644
--- a/cis/index.html
+++ b/cis/index.html
@@ -25,7 +25,7 @@
 			</tr>
 			<tr style="height:10%;" >
 				<td align="center" valign="bottom">
-					<div style="color:grey">Powered by <a href="http://www.fhcomplete.org" target="blank">FH Complete</a></div>
+					<div style="color:grey">Powered by <a href="http://www.fhcomplete.info" target="blank">FH Complete</a></div>
 					<br><br>
 				</td>
 			</tr>
diff --git a/cis/index_login.php b/cis/index_login.php
index 4c4d75f93..74c87f649 100644
--- a/cis/index_login.php
+++ b/cis/index_login.php
@@ -69,7 +69,7 @@ if(isset($_GET['login']))
 				</tr>
 				<tr style="height:10%;" >
 					<td align="center" valign="bottom">
-						<div style="color:grey">Powered by <a href="http://www.fhcomplete.org" target="blank">FH Complete</a></div>
+						<div style="color:grey">Powered by <a href="http://www.fhcomplete.info" target="blank">FH Complete</a></div>
 						<br><br>
 					</td>
 				</tr>
diff --git a/content/fasoverlay.js.php b/content/fasoverlay.js.php
index f7a30158f..9504285ce 100644
--- a/content/fasoverlay.js.php
+++ b/content/fasoverlay.js.php
@@ -1539,7 +1539,7 @@ function OpenAboutDialog()
 // ****
 function OpenManual()
 {
-	window.open('https://wiki.fhcomplete.org/doku.php?','_blank');
+	window.open('https://wiki.fhcomplete.info/','_blank');
 }
 
 // ****
diff --git a/content/tempus.js.php b/content/tempus.js.php
index e4dad5e43..5a734ebf3 100644
--- a/content/tempus.js.php
+++ b/content/tempus.js.php
@@ -473,7 +473,7 @@ function SyncLVPlan()
 // ****
 function OpenManualTempus()
 {
-	window.open('https://wiki.fhcomplete.org/doku.php?id=tempus:allgemeines','Manual');
+	window.open('https://wiki.fhcomplete.info/doku.php?id=tempus:allgemeines','Manual');
 }
 
 // ****

From 6267a1bc37f8ed2c7db4dd507d9b125ad283a5eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 23 Jul 2021 13:06:15 +0200
Subject: [PATCH 28/29] =?UTF-8?q?-=20Hautpberuf=20wird=20im=20CIS=20Profil?=
 =?UTF-8?q?=20angezeigt=20f=C3=BCr=20den=20Mitarbeiter=20-=20Fehler=20beho?=
 =?UTF-8?q?ben=20wodurch=20die=20letzte=20Verwendung=20nicht=20korrekt=20e?=
 =?UTF-8?q?rmittelt=20wurde=20wenn=20das=20Ende=20Datum=20leer=20ist?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 cis/private/profile/index.php   | 17 +++++++++++++++++
 include/bisverwendung.class.php |  8 +++++---
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/cis/private/profile/index.php b/cis/private/profile/index.php
index dd39cf301..80062a932 100644
--- a/cis/private/profile/index.php
+++ b/cis/private/profile/index.php
@@ -44,6 +44,7 @@ require_once('../../../include/addon.class.php');
 require_once('../../../include/gruppe.class.php');
 require_once('../../../include/adresse.class.php');
 require_once('../../../include/benutzerberechtigung.class.php');
+require_once('../../../include/bisverwendung.class.php');
 
 $sprache = getSprache();
 $p = new phrasen($sprache);
@@ -271,6 +272,22 @@ if (!$ansicht)
 
 }
 
+if (!$ansicht)
+{
+	if ($is_employee)
+	{
+		$verwendung = new bisverwendung();
+		if($verwendung->getLastVerwendung($uid))
+		{
+			if (!$verwendung->hauptberuflich)
+			{
+				echo 'Hauptberuf: '. $verwendung->hauptberuf;
+			}
+		}
+		echo "<br><br>";
+	}
+}
+
 if (!$ansicht)
 {
 	$adresse = new adresse();
diff --git a/include/bisverwendung.class.php b/include/bisverwendung.class.php
index 799cfc93e..07f2a74de 100644
--- a/include/bisverwendung.class.php
+++ b/include/bisverwendung.class.php
@@ -524,12 +524,13 @@ class bisverwendung extends basis_db
 	{
 		//laden des Datensatzes
 		$qry = "SELECT
-					*
+					*, tbl_hauptberuf.bezeichnung as hauptberuf
 				FROM
 					bis.tbl_bisverwendung
+					LEFT JOIN bis.tbl_hauptberuf USING(hauptberufcode)
 				WHERE
 					mitarbeiter_uid=".$this->db_add_param($uid)."
-				ORDER BY ende DESC NULLS LAST,beginn DESC NULLS LAST LIMIT 1;";
+				ORDER BY ende DESC NULLS FIRST,beginn DESC NULLS LAST LIMIT 1;";
 
 		if($this->db_query($qry))
 		{
@@ -543,6 +544,7 @@ class bisverwendung extends basis_db
 				$this->mitarbeiter_uid = $row->mitarbeiter_uid;
 				$this->hauptberufcode = $row->hauptberufcode;
 				$this->hauptberuflich = $this->db_parse_bool($row->hauptberuflich);
+				$this->hauptberuf = $row->hauptberuf;
 				$this->habilitation = $this->db_parse_bool($row->habilitation);
 				$this->beginn = $row->beginn;
 				$this->ende = $row->ende;
@@ -582,7 +584,7 @@ class bisverwendung extends basis_db
 					(beginn<=now() OR beginn IS NULL)
 				AND
 					(ende>=now() OR ende IS NULL)
-				ORDER BY ende DESC NULLS LAST,beginn DESC NULLS LAST LIMIT 1;";
+				ORDER BY ende DESC NULLS FIRST,beginn DESC NULLS LAST LIMIT 1;";
 
 		if($this->db_query($qry))
 		{

From 023994b12cb8dfc4f9e4d894b29c5b300e774ecb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 23 Jul 2021 13:07:23 +0200
Subject: [PATCH 29/29] =?UTF-8?q?PHP=20Error=20behoben=20wenn=20Lehrauftr?=
 =?UTF-8?q?=C3=A4ge=20f=C3=BCr=20einzelne=20Studieng=C3=A4nge=20erstellt?=
 =?UTF-8?q?=20werden?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 rdf/lehrauftrag_annehmen.xml.php | 90 ++++++++++++++++----------------
 1 file changed, 44 insertions(+), 46 deletions(-)

diff --git a/rdf/lehrauftrag_annehmen.xml.php b/rdf/lehrauftrag_annehmen.xml.php
index c0f691fe3..990701901 100644
--- a/rdf/lehrauftrag_annehmen.xml.php
+++ b/rdf/lehrauftrag_annehmen.xml.php
@@ -275,29 +275,29 @@ function drawLehrauftrag($uid)
 		FROM
 			campus.vw_lehreinheit
 			JOIN lehre.tbl_lehreinheitmitarbeiter lema USING (lehreinheit_id, mitarbeiter_uid)
-            JOIN lehre.tbl_vertrag_vertragsstatus vvst USING (vertrag_id)
+			JOIN lehre.tbl_vertrag_vertragsstatus vvst USING (vertrag_id)
 		WHERE
 			mitarbeiter_uid=".$db->db_add_param($uid)."
 			AND studiensemester_kurzbz=".$db->db_add_param($ss). "
-            AND lema.vertrag_id IS NOT NULL
-            AND vertragsstatus_kurzbz = 'akzeptiert'";
+			AND lema.vertrag_id IS NOT NULL
+			AND vertragsstatus_kurzbz = 'akzeptiert'";
 
 	if ($studiengang_kz != '') //$studiengang_kz!='0' &&
-    {
-        $qry .= " AND lv_studiengang_kz=".$db->db_add_param($studiengang_kz);
-    }
+	{
+		$qry .= " AND lv_studiengang_kz=".$db->db_add_param($studiengang_kz);
+	}
 	elseif (!empty($xsl_oe_kurzbz))
-    {
-        if ($xsl_oe_kurzbz == 'etw')
-        {
-            $qry .= " AND lv_studiengang_kz > 0";
-        }
+	{
+		if ($xsl_oe_kurzbz == 'etw')
+		{
+			$qry .= " AND lv_studiengang_kz > 0";
+		}
 
-        if ($xsl_oe_kurzbz == 'lehrgang')
-        {
-            $qry .= " AND lv_studiengang_kz <= 0";
-        }
-    }
+		if ($xsl_oe_kurzbz == 'lehrgang')
+		{
+			$qry .= " AND lv_studiengang_kz <= 0";
+		}
+	}
 
 	$qry .= " ORDER BY lv_orgform_kurzbz, lv_bezeichnung, lehreinheit_id";
 	$lv = array();
@@ -390,8 +390,8 @@ function drawLehrauftrag($uid)
 				$gesamtstunden = $gesamtstunden + $stunden;
 		}
 	}
-	$qry = 'SELECT 
-	            pa.projektarbeit_id,
+	$qry = 'SELECT
+				pa.projektarbeit_id,
 				pb.faktor,
 				pb.stunden,
 				pb.stundensatz,
@@ -401,37 +401,37 @@ function drawLehrauftrag($uid)
 				student.studiengang_kz,
 				projekttyp_kurzbz,
 				lv.oe_kurzbz,
-                vertragsstatus_kurzbz
+				vertragsstatus_kurzbz
 			FROM lehre.tbl_projektbetreuer pb
-                JOIN lehre.tbl_projektarbeit pa USING (projektarbeit_id)
-		        JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
-		        JOIN lehre.tbl_lehrveranstaltung           lv USING (lehrveranstaltung_id)
-                JOIN PUBLIC.tbl_organisationseinheit       oe USING (oe_kurzbz)
-                JOIN public.tbl_benutzer benutzer ON pb.person_id = benutzer.person_id			
-                JOIN campus.vw_student student ON pa.student_uid = student.uid
-                LEFT JOIN lehre.tbl_vertrag                vertrag USING (vertrag_id)
-                LEFT JOIN lehre.tbl_vertrag_vertragsstatus vvst USING (vertrag_id)
+				JOIN lehre.tbl_projektarbeit pa USING (projektarbeit_id)
+				JOIN lehre.tbl_lehreinheit le USING (lehreinheit_id)
+				JOIN lehre.tbl_lehrveranstaltung           lv USING (lehrveranstaltung_id)
+				JOIN PUBLIC.tbl_organisationseinheit       oe USING (oe_kurzbz)
+				JOIN public.tbl_benutzer benutzer ON pb.person_id = benutzer.person_id
+				JOIN campus.vw_student student ON pa.student_uid = student.uid
+				LEFT JOIN lehre.tbl_vertrag                vertrag USING (vertrag_id)
+				LEFT JOIN lehre.tbl_vertrag_vertragsstatus vvst USING (vertrag_id)
 			WHERE pb.vertrag_id IS NOT NULL
-                AND vvst.vertragsstatus_kurzbz = \'akzeptiert\'
-                AND benutzer.uid = '.$db->db_add_param($uid).'
-                AND le.studiensemester_kurzbz = '.$db->db_add_param($ss);
+				AND vvst.vertragsstatus_kurzbz = \'akzeptiert\'
+				AND benutzer.uid = '.$db->db_add_param($uid).'
+				AND le.studiensemester_kurzbz = '.$db->db_add_param($ss);
 
 	if ($studiengang_kz != '')
-    {
-        $qry .= " AND tbl_lehrveranstaltung.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
-    }
-    elseif (!empty($xsl_oe_kurzbz))
-    {
-        if ($xsl_oe_kurzbz == 'etw')
-        {
-            $qry .= " AND lv.studiengang_kz > 0";
-        }
+	{
+		$qry .= " AND lv.studiengang_kz=".$db->db_add_param($studiengang_kz, FHC_INTEGER);
+	}
+	elseif (!empty($xsl_oe_kurzbz))
+	{
+		if ($xsl_oe_kurzbz == 'etw')
+		{
+			$qry .= " AND lv.studiengang_kz > 0";
+		}
 
-        if ($xsl_oe_kurzbz == 'lehrgang')
-        {
-            $qry .= " AND lv.studiengang_kz <= 0";
-        }
-    }
+		if ($xsl_oe_kurzbz == 'lehrgang')
+		{
+			$qry .= " AND lv.studiengang_kz <= 0";
+		}
+	}
 
 	if ($result = $db->db_query($qry))
 	{
@@ -471,8 +471,6 @@ function drawLehrauftrag($uid)
 		}
 	}
 
-
-
 	foreach ($lv as $lv_row)
 	{
 		$xml .= '