From 96e2648b064c336dde4240beadf70a6d6c2bf436 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 2 Mar 2018 08:03:24 +0100
Subject: [PATCH] =?UTF-8?q?Infocenter=20=C3=9Cbersicht=20-=20Lock=20User?=
 =?UTF-8?q?=20hinzugef=C3=BCgt=20-=20Bereits=20best=C3=A4tigte=20Personen?=
 =?UTF-8?q?=20werden=20nicht=20angezeigt=20-=20Es=20werden=20nur=20Persone?=
 =?UTF-8?q?n=20angezeigt=20die=20nach=20dem=201.3.2018=2018:00=20abgeschic?=
 =?UTF-8?q?kt=20haben?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/infocenter/infocenterData.php      | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 9b2643a94..c68ccf83f 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -1,7 +1,7 @@
 <?php
 
 	$APP = 'infocenter';
-
+	$NOTBEFORE = '2018-03-01 18:00:00';
 	$filterWidgetArray = array(
 		'query' => '
 		SELECT
@@ -36,6 +36,11 @@
 					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()
+					)
 					ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 					LIMIT 1
 				) AS "Studiensemester",
@@ -46,9 +51,15 @@
 						INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
 						JOIN public.tbl_studiengang USING(studiengang_kz)
 					WHERE pss.status_kurzbz = \'Interessent\'
-						AND pss.bewerbung_abgeschicktamum IS NOT NULL
+						AND (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
+						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()
+						)
 					ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 					LIMIT 1
 				) AS "SendDate",
@@ -59,28 +70,41 @@
 						INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
 						JOIN public.tbl_studiengang USING(studiengang_kz)
 					WHERE pss.status_kurzbz = \'Interessent\'
-						AND pss.bewerbung_abgeschicktamum IS NOT NULL
+						AND (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
+						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()
+						)
 					LIMIT 1
 				) AS "AnzahlAbgeschickt",
 				array_to_string(
 					(
-					SELECT array_agg(tbl_studiengang.kurzbzlang)
+					SELECT array_agg(distinct tbl_studiengang.kurzbzlang)
 					FROM
 						public.tbl_prestudentstatus pss
 						INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
 						JOIN public.tbl_studiengang USING(studiengang_kz)
 					WHERE pss.status_kurzbz = \'Interessent\'
-						AND pss.bewerbung_abgeschicktamum IS NOT NULL
+						AND (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
+						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()
+						)
 					LIMIT 1
 					),\',\'
 				) AS "StgAbgeschickt",
-				pl.zeitpunkt AS "LockDate"
+				pl.zeitpunkt AS "LockDate",
+				pl.lockuser as "LockUser"
 			FROM public.tbl_person p
-		LEFT JOIN (SELECT person_id, zeitpunkt FROM system.tbl_person_lock WHERE app = \''.$APP.'\') pl USING(person_id)
+		LEFT JOIN (SELECT person_id, zeitpunkt, uid as lockuser FROM system.tbl_person_lock WHERE app = \''.$APP.'\') pl USING(person_id)
 			WHERE
 				EXISTS(
 					SELECT 1
@@ -103,7 +127,7 @@
 							WHERE
 								prestudent_id = tbl_prestudent.prestudent_id
 								AND status_kurzbz = \'Interessent\'
-								AND bestaetigtam IS NULL
+								AND (bestaetigtam IS NULL AND (bewerbung_abgeschicktamum is null OR bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\'))
 								AND studiensemester_kurzbz IN (
 									SELECT studiensemester_kurzbz
 									FROM public.tbl_studiensemester
@@ -145,6 +169,11 @@
 				$datasetRaw->{'LockDate'} = 'Not locked';
 			}
 
+			if ($datasetRaw->{'LockUser'} == null)
+			{
+				$datasetRaw->{'LockUser'} = 'Not locked';
+			}
+
 			if ($datasetRaw->{'StgAbgeschickt'} == null)
 			{
 				$datasetRaw->{'StgAbgeschickt'} = 'N/A';