From baf6503f2f602793a496c6f233240a4107e08352 Mon Sep 17 00:00:00 2001
From: Gerald Raab <raab@technikum-wien.at>
Date: Thu, 12 Apr 2018 12:12:25 +0200
Subject: [PATCH] Updated BaseSQL

---
 .../system/infocenter/infocenterData.php      | 65 +++++++++++++++++--
 1 file changed, 58 insertions(+), 7 deletions(-)

diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 4a30c137b..8360867b6 100755
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -82,15 +82,17 @@
 							FROM public.tbl_studiensemester
 							WHERE ende >= NOW()
 						)
+						AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
 					LIMIT 1
 				) AS "AnzahlAbgeschickt",
 				array_to_string(
 					(
-					SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz))
+					SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) || \':\' || tbl_studienplan.orgform_kurzbz)
 					FROM
 						public.tbl_prestudentstatus pss
 						INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
 						JOIN public.tbl_studiengang USING(studiengang_kz)
+						JOIN lehre.tbl_studienplan using (studienplan_id)
 					WHERE pss.status_kurzbz = \'Interessent\'
 						AND (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
 						AND pss.bestaetigtam IS NULL
@@ -101,9 +103,53 @@
 							FROM public.tbl_studiensemester
 							WHERE ende >= NOW()
 						)
+						AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
 					LIMIT 1
 					),\', \'
 				) AS "StgAbgeschickt",
+				array_to_string(
+					(
+					SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) || \':\' || tbl_studienplan.orgform_kurzbz)
+					FROM
+						public.tbl_prestudentstatus pss
+						INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
+						JOIN public.tbl_studiengang USING(studiengang_kz)
+						JOIN lehre.tbl_studienplan using (studienplan_id)
+					WHERE pss.status_kurzbz = \'Interessent\'
+						AND (pss.bewerbung_abgeschicktamum IS NULL)
+						AND pss.bestaetigtam IS NULL
+						AND ps.person_id = p.person_id
+						AND tbl_studiengang.typ in(\'b\')
+						AND studiensemester_kurzbz IN (
+							SELECT studiensemester_kurzbz
+							FROM public.tbl_studiensemester
+							WHERE ende >= NOW()
+						)
+					AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
+					LIMIT 1
+					),\', \'
+				) AS "StgNichtAbgeschickt",
+				array_to_string(
+					(
+					SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz) || \':\' || tbl_studienplan.orgform_kurzbz)
+					FROM
+						public.tbl_prestudentstatus pss
+						INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
+						JOIN public.tbl_studiengang USING(studiengang_kz)
+						JOIN lehre.tbl_studienplan using (studienplan_id)
+					WHERE pss.status_kurzbz in (\'Wartender\', \'Bewerber\', \'Aufgenommener\', \'Student\')
+						AND (pss.bewerbung_abgeschicktamum IS NULL)
+						AND ps.person_id = p.person_id
+						AND tbl_studiengang.typ in(\'b\')
+						AND studiensemester_kurzbz IN (
+							SELECT studiensemester_kurzbz
+							FROM public.tbl_studiensemester
+							WHERE start >= NOW()
+						)
+					AND not exists (select 1 from tbl_prestudentstatus psss where psss.prestudent_id = pss.prestudent_id and psss.status_kurzbz = \'Abgewiesener\')
+					LIMIT 1
+					),\', \'
+				) AS "StgAktiv",
 				pl.zeitpunkt AS "LockDate",
 				pl.lockuser as "LockUser"
 			FROM public.tbl_person p
@@ -140,12 +186,10 @@
 				)
 			ORDER BY "LastAction" ASC
 		',
-		'hideHeader' => false,
-		'hideSave' => false,
 		'checkboxes' => 'PersonId',
 		'additionalColumns' => array('Details'),
-		'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Nation','Letzte Aktion','Letzter Bearbeiter',
-			'StSem','GesendetAm','NumAbgeschickt','Studiengänge','Sperrdatum','GesperrtVon'),
+		'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Nation', 'Letzte Aktion','Letzter Bearbeiter',
+			'StSem','GesendetAm','NumAbgeschickt','StgSent','StgNotSent','StgAktiv', 'Sperrdatum','GesperrtVon'),
 		'formatRaw' => function($datasetRaw) {
 
 			$datasetRaw->{'Details'} = sprintf(
@@ -189,9 +233,16 @@
 
 			if ($datasetRaw->{'StgAbgeschickt'} == null)
 			{
-				$datasetRaw->{'StgAbgeschickt'} = 'N/A';
+				$datasetRaw->{'StgAbgeschickt'} = '-';
+			}
+			if ($datasetRaw->{'StgNichtAbgeschickt'} == null)
+			{
+				$datasetRaw->{'StgNichtAbgeschickt'} = '-';
+			}
+			if ($datasetRaw->{'StgAktiv'} == null)
+			{
+				$datasetRaw->{'StgAktiv'} = '-';
 			}
-
 			if ($datasetRaw->{'Nation'} == null)
 			{
 				$datasetRaw->{'Nation'} = '-';