From 1cbba8bdaafcf65d79e3ff0d7b5762139d873212 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Fri, 19 Jan 2018 16:22:37 +0100
Subject: [PATCH] =?UTF-8?q?Lehrg=C3=A4nge=20aus=20Infocenter=20Filter=20au?=
 =?UTF-8?q?sgenommen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/infocenter/infocenterData.php      | 46 ++++++++++++-------
 1 file changed, 30 insertions(+), 16 deletions(-)

diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 88471f94c..9035a9c4a 100644
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -1,5 +1,4 @@
 <?php
-
 	$filterWidgetArray = array(
 		'query' => '
 		SELECT
@@ -29,10 +28,12 @@
 					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.bestaetigtam IS NULL
 					AND pss.bestaetigtvon IS NULL
 					AND ps.person_id = p.person_id
+					AND tbl_studiengang.typ in(\'b\',\'m\')
 					ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 					LIMIT 1
 				) AS "Studiensemester",
@@ -41,10 +42,12 @@
 					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.bestaetigtam IS NULL
 						AND pss.bestaetigtvon IS NULL
 						AND ps.person_id = p.person_id
+						AND tbl_studiengang.typ in(\'b\',\'m\')
 					ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 					LIMIT 1
 				) AS "SendDate"
@@ -52,21 +55,32 @@
 			WHERE
 				EXISTS(
 					SELECT 1
-					FROM public.tbl_prestudent
-					WHERE person_id=p.person_id
-					AND \'Interessent\' = (SELECT status_kurzbz FROM public.tbl_prestudentstatus
-					WHERE prestudent_id=tbl_prestudent.prestudent_id
-					ORDER BY datum DESC, insertamum DESC, ext_id DESC
-					LIMIT 1
-					)
-					AND EXISTS (SELECT 1 FROM public.tbl_prestudentstatus
-					WHERE prestudent_id=tbl_prestudent.prestudent_id
-					AND status_kurzbz=\'Interessent\' AND bestaetigtam IS NULL and bestaetigtvon IS NULL
-					AND studiensemester_kurzbz IN (
-						SELECT studiensemester_kurzbz
-						FROM public.tbl_studiensemester
-						WHERE ende >= NOW()
-						)
+					FROM
+						public.tbl_prestudent
+						JOIN public.tbl_studiengang USING(studiengang_kz)
+					WHERE
+						person_id=p.person_id
+						AND tbl_studiengang.typ in(\'b\',\'m\')
+						AND \'Interessent\' = (SELECT status_kurzbz FROM public.tbl_prestudentstatus
+												WHERE prestudent_id=tbl_prestudent.prestudent_id
+												ORDER BY datum DESC, insertamum DESC, ext_id DESC
+												LIMIT 1
+												)
+						AND EXISTS (
+							SELECT
+								1
+							FROM
+								public.tbl_prestudentstatus
+							WHERE
+								prestudent_id=tbl_prestudent.prestudent_id
+								AND status_kurzbz=\'Interessent\'
+								AND bestaetigtam IS NULL
+								AND bestaetigtvon IS NULL
+								AND studiensemester_kurzbz IN (
+									SELECT studiensemester_kurzbz
+									FROM public.tbl_studiensemester
+									WHERE ende >= NOW()
+							)
 					)
 				)
 			ORDER BY "LastAction" DESC