From ce61b30ec4df0d6c9c4f93db64f44746b81b3fe5 Mon Sep 17 00:00:00 2001
From: raab <raab@technikum-wien.at>
Date: Fri, 24 May 2019 13:03:44 +0200
Subject: [PATCH] spalte anzahlaktepflicht, bugfixes

---
 .../system/infocenter/infocenterData.php      | 12 ++++++-
 .../infocenter/infocenterFreigegebenData.php  | 34 +++++++++++++++++--
 2 files changed, 43 insertions(+), 3 deletions(-)

diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 7841b7b12..d888f6cd7 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -10,6 +10,7 @@
 	$LOGTYPE_KURZBZ = '\'Processstate\'';
 	$STATUS_KURZBZ = '\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\'';
 	$ADDITIONAL_STG = '10021,10027';
+	$AKTE_TYP = '\'identity\', \'zgv_bakk\'';
 
 	$query = '
 		WITH currentOrNextStudiensemester AS (
@@ -48,6 +49,14 @@
 			  ORDER BY l.zeitpunkt DESC
 				 LIMIT 1
 			) AS "LastActionType",
+			(
+				SELECT count(akte_id)
+				  FROM public.tbl_akte a
+				 WHERE
+				   a.person_id = p.person_id
+				 AND
+				  a.dokument_kurzbz in ('.$AKTE_TYP.')
+			) AS "AnzahlAkte",
 			(
 				SELECT l.insertvon
 				  FROM system.tbl_log l
@@ -134,7 +143,7 @@
 				  JOIN lehre.tbl_studienplan sp USING(studienplan_id)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND pss.bewerbung_abgeschicktamum IS NOT NULL
-				   AND pss.bestaetigtam IS NULL
+				 -- AND pss.bestaetigtam IS NULL
 				   AND ps.person_id = p.person_id
 				   AND (sg.typ IN ('.$STUDIENGANG_TYP.')
 					   OR
@@ -272,6 +281,7 @@
 			ucfirst($this->p->t('global', 'parkdatum')),
 			ucfirst($this->p->t('global', 'letzteAktion')),
 			'Aktionstyp',
+			'AnzahlAktePflicht',
 			ucfirst($this->p->t('global', 'letzterBearbeiter')),
 			ucfirst($this->p->t('lehre', 'studiensemester')),
 			ucfirst($this->p->t('global', 'gesendetAm')),
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
index 554d00fef..059e30a80 100644
--- a/application/views/system/infocenter/infocenterFreigegebenData.php
+++ b/application/views/system/infocenter/infocenterFreigegebenData.php
@@ -6,7 +6,8 @@
 	$TAETIGKEIT_KURZBZ = '\'bewerbung\', \'kommunikation\'';
 	$LOGDATA_NAME = '\'Login with code\', \'Login with user\', \'New application\'';
 	$REJECTED_STATUS = '\'Abgewiesener\'';
-	$ADDITIONAL_STG = '10021,10027';
+	$ADDITIONAL_STG = '10021,10027,10002';
+	$STATUS_KURZBZ = '\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\'';
 
 	$query = '
 		SELECT
@@ -114,6 +115,29 @@
 				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
 				 LIMIT 1
 			) AS "StgAbgeschickt",
+			(
+				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 IN ('.$STATUS_KURZBZ.')
+
+				   AND ps.person_id = p.person_id
+				   AND (sg.typ IN ('.$STUDIENGANG_TYP.')
+					OR
+					sg.studiengang_kz in('.$ADDITIONAL_STG.')
+					)
+				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND NOT EXISTS (
+					   SELECT 1
+						 FROM tbl_prestudentstatus spss
+						WHERE spss.prestudent_id = pss.prestudent_id
+						  AND spss.status_kurzbz = '.$REJECTED_STATUS.'
+						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > NOW())
+					)
+				 LIMIT 1
+			) AS "StgAktiv",
 			(
 				SELECT ARRAY_TO_STRING(ARRAY_AGG(DISTINCT UPPER(sg.bezeichnung_mehrsprachig[1])), \', \')
 				  FROM public.tbl_prestudentstatus pss
@@ -155,7 +179,7 @@
 				) rtp ON(rtp.person_id = ps.person_id AND rtp.studiensemester_kurzbz = pss.studiensemester_kurzbz)
 				 WHERE pss.status_kurzbz = '.$INTERESSENT_STATUS.'
 				   AND ps.person_id = p.person_id
-				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
+				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.studiensemester_kurzbz = \'WS2019\')
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
 			) AS "ReihungstestApplied",
@@ -227,6 +251,7 @@
 			'GesendetAm',
 			'NumAbgeschickt',
 			'Studiengänge',
+			'Stg aktiv',
 			'Statusgrund',
 			'Reihungstest angetreten',
 			'Reihungstest angemeldet',
@@ -287,6 +312,11 @@
 				$datasetRaw->{'Nation'} = '-';
 			}
 
+			if ($datasetRaw->{'StgAktiv'} == null)
+			{
+				$datasetRaw->{'StgAktiv'} = '-';
+			}
+
 			if ($datasetRaw->{'ReihungstestAngetreten'} == 'true')
 			{
 				$datasetRaw->{'ReihungstestAngetreten'} = 'Ja';