From 841247aa067529ceeac529f03b26df9798cbc19c Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Tue, 22 Feb 2022 12:23:12 +0100
Subject: [PATCH 1/2] download von identitaetsnachweis hinzugefuegt onholddate
 als default spalte hinzugefuegt

---
 .../system/infocenter/infocenterData.php      |  4 +++
 .../infocenter/infocenterFreigegebenData.php  | 27 +++++++++++++++++--
 system/filtersupdate.php                      |  6 +++--
 3 files changed, 33 insertions(+), 4 deletions(-)

diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index d867c8613..f3849d622 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -414,6 +414,10 @@
 			{
 				$datasetRaw->{'OnholdDate'} = '-';
 			}
+			else
+			{
+				$datasetRaw->{'OnholdDate'} = date_format(date_create($datasetRaw->{'OnholdDate'}), 'Y-m-d H:i');
+			}
 
 			if ($datasetRaw->{'StgAbgeschickt'} == null)
 			{
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
index 39b1e3cca..92f062b62 100644
--- a/application/views/system/infocenter/infocenterFreigegebenData.php
+++ b/application/views/system/infocenter/infocenterFreigegebenData.php
@@ -11,6 +11,7 @@
 	$STATUS_KURZBZ = '\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\'';
 	$STUDIENSEMESTER = '\''.$this->variablelib->getVar('infocenter_studiensemester').'\'';
 	$ORG_NAME = '\'InfoCenter\'';
+	$IDENTITY = '\'identity\'';
 
 $query = '
 		SELECT
@@ -245,7 +246,15 @@ $query = '
 					LIMIT 1
 				)
 				LIMIT 1 
-			) AS "InfoCenterMitarbeiter"
+			) AS "InfoCenterMitarbeiter",
+			(
+				SELECT akte.akte_id
+				FROM public.tbl_akte akte
+				JOIN public.tbl_dokument USING (dokument_kurzbz)
+				WHERE akte.person_id = p.person_id
+				AND dokument_kurzbz = '. $IDENTITY .'
+				LIMIT 1
+			) AS "AktenId"
 		  FROM public.tbl_person p
 	 LEFT JOIN (
 			SELECT tpl.person_id,
@@ -317,7 +326,8 @@ $query = '
 			'Reihungstest date',
 			'ZGV Nation BA',
 			'ZGV Nation MA',
-			'InfoCenter Mitarbeiter'
+			'InfoCenter Mitarbeiter',
+			'Identitätsnachweis'
 		),
 		'formatRow' => function($datasetRaw) {
 
@@ -425,6 +435,19 @@ $query = '
 				$datasetRaw->{'InfoCenterMitarbeiter'} = 'Ja';
 			}
 
+			if ($datasetRaw->{'AktenId'} !== null)
+			{
+				$datasetRaw->{'AktenId'} = sprintf(
+					'<a href="outputAkteContent/%s">Identitätsnachweis</a>',
+					$datasetRaw->{'AktenId'}
+				);
+			}
+			else
+			{
+				$datasetRaw->{'AktenId'} = '-';
+			}
+
+
 			return $datasetRaw;
 		},
 		'markRow' => function($datasetRaw) {
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 1a1717339..812dd9493 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -40,7 +40,8 @@ $filters = array(
 					{"name": "LastActionType"},
 					{"name": "User/Operator"},
 					{"name": "InfoCenterMitarbeiter"},
-					{"name": "LockUser"}
+					{"name": "LockUser"},
+					{"name": "OnholdDate"}
 				],
 				"filters": [
 					{
@@ -320,7 +321,8 @@ $filters = array(
 					{"name": "Statusgrund"},
 					{"name": "Studiensemester"},
 					{"name": "ReihungstestApplied"},
-					{"name": "ReihungstestDate"}
+					{"name": "ReihungstestDate"},
+					{"name": "AktenId"}
 				],
 				"filters": [
 					{

From a4c80b7969aaedc32aa05bf0a4ae4f372ef5c90d Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 23 Feb 2022 15:00:14 +0100
Subject: [PATCH 2/2] reihenfolge der spalten angepasst

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

diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 812dd9493..92053cb56 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -35,7 +35,6 @@ $filters = array(
 					{"name": "ZGVNation"},
 					{"name": "ZGVMNation"},
 					{"name": "StgAbgeschickt"},
-					{"name": "Studiensemester"},
 					{"name": "LastAction"},
 					{"name": "LastActionType"},
 					{"name": "User/Operator"},
@@ -312,6 +311,7 @@ $filters = array(
 				"columns": [
 					{"name": "Vorname"},
 					{"name": "Nachname"},
+					{"name": "AktenId"},
 					{"name": "StgAbgeschickt"},
 					{"name": "LastAction"},
 					{"name": "LastActionType"},
@@ -321,8 +321,7 @@ $filters = array(
 					{"name": "Statusgrund"},
 					{"name": "Studiensemester"},
 					{"name": "ReihungstestApplied"},
-					{"name": "ReihungstestDate"},
-					{"name": "AktenId"}
+					{"name": "ReihungstestDate"}
 				],
 				"filters": [
 					{