From cb9eaa769488dc412e17a430f454006a3c46e071 Mon Sep 17 00:00:00 2001
From: Manfred <kindlm@technikum-wien.at>
Date: Mon, 12 Dec 2022 09:40:02 +0100
Subject: [PATCH 1/2] =?UTF-8?q?Last=20Status=20Abgewiesener=20erg=C3=A4nzt?=
 =?UTF-8?q?,=20Felder=20BPK=20und=20Matrikelnummer=20erg=C3=A4nzt?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../views/system/issues/issuesData.php        | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/application/views/system/issues/issuesData.php b/application/views/system/issues/issuesData.php
index ce05ecf8a..418f0ead1 100644
--- a/application/views/system/issues/issuesData.php
+++ b/application/views/system/issues/issuesData.php
@@ -56,7 +56,7 @@ $query .= "SELECT issue_id, fehlercode AS \"Fehlercode\", iss.fehlercode_extern
 				    WHERE person_id = pers.person_id
 				    ORDER BY prestudent_id DESC
 				) prestudents
-				WHERE last_status IN ('Aufgenommener', 'Student', 'Incoming', 'Diplomand', 'Abbrecher', 'Unterbrecher', 'Absolvent')
+				WHERE last_status IN ('Abgewiesener','Aufgenommener', 'Student', 'Incoming', 'Diplomand', 'Abbrecher', 'Unterbrecher', 'Absolvent')
 				GROUP BY person_id
 				LIMIT 1;
 			) AS \"Zugehörigkeit\",
@@ -89,7 +89,9 @@ $query .= "SELECT issue_id, fehlercode AS \"Fehlercode\", iss.fehlercode_extern
 				LEFT JOIN public.tbl_funktion fu USING (funktion_kurzbz)
 				WHERE fehlercode = fr.fehlercode
 				GROUP BY fehlercode
-			) AS \"Organisationseinheit Zuständigkeiten\"
+			) AS \"Organisationseinheit Zuständigkeiten\",
+			pers.bpk AS \"BPK\",
+			pers.matr_nr AS \"Matrikelnummer\"
 			FROM system.tbl_issue iss
 			JOIN system.tbl_fehler fr USING (fehlercode)
 			JOIN system.tbl_fehlertyp ftyp USING (fehlertyp_kurzbz)
@@ -172,7 +174,9 @@ $filterWidgetArray = array(
 		ucfirst($this->p->t('fehlermonitoring', 'zugehoerigkeit')),
 		ucfirst($this->p->t('fehlermonitoring', 'hauptzustaendig')),
 		ucfirst($this->p->t('fehlermonitoring', 'zustaendigePersonen')),
-		ucfirst($this->p->t('fehlermonitoring', 'zustaendigeOrganisationseinheiten'))
+		ucfirst($this->p->t('fehlermonitoring', 'zustaendigeOrganisationseinheiten')),
+	    'BPK',
+	    'Matrikelnummer'
     ),
 	'formatRow' => function($datasetRaw) {
 
@@ -221,6 +225,16 @@ $filterWidgetArray = array(
 			$datasetRaw->{'Organisationseinheit Zuständigkeiten'} = '-';
 		}
 
+		if ($datasetRaw->{'BPK'} == null)
+		{
+			$datasetRaw->{'BPK'} = '-';
+		}
+
+		if ($datasetRaw->{'Matrikelnummer'} == null)
+		{
+			$datasetRaw->{'Matrikelnummer'} = '-';
+		}
+
 		return $datasetRaw;
 	},
 	'markRow' => function($datasetRaw) {

From 2ca9f29c0d02b0a2f28634a11f86b2aba8f825ff Mon Sep 17 00:00:00 2001
From: Manfred <kindlm@technikum-wien.at>
Date: Mon, 9 Jan 2023 15:52:12 +0100
Subject: [PATCH 2/2] Englischen Bachelor-Leitfaden entfernt

---
 locale/de-AT/testtool.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/locale/de-AT/testtool.php b/locale/de-AT/testtool.php
index dbafe21e9..3e69306b3 100644
--- a/locale/de-AT/testtool.php
+++ b/locale/de-AT/testtool.php
@@ -71,7 +71,6 @@ $this->phrasen['testtool/einfuehrungsText']='
 					<h1 style="white-space: normal">Welcome to the placement test</h1>
 					<a href="'.APP_ROOT.'cms/dms.php?id=145596" target="_blank"><img src="'.APP_ROOT.'cms/dms.php?id=142977" alt="Einfuehrungsvideo" style="border: 1px solid lightgray; border-radius: 10px; width:350px;"></a>
 					<br><br>
-					<a href="'.APP_ROOT.'cms/dms.php?id=207696" target="_blank"><img src="'.APP_ROOT.'cms/dms.php?id=46&version=1">&nbsp;<b>Bachelor</b>-Guideline for placement test</a><br>
 					<a href="'.APP_ROOT.'cms/dms.php?id=143930" target="_blank"><img src="'.APP_ROOT.'cms/dms.php?id=46&version=1">&nbsp;<b>Master</b>-Guideline for placement test</a>
 					<br><br>
 					Under the following link you can test the correct display of the placement test:<br><br>