From d5b1c9c643c74b76a2a09a750c6d101d3168413f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andreas=20=C3=96sterreicher?= <oesi@technikum-wien.at>
Date: Tue, 4 Dec 2018 15:45:51 +0100
Subject: [PATCH] Infocenter: Added Column ZGVNation to FilterPages

---
 .../system/infocenter/InfoCenter.php            |  6 +++---
 .../views/system/infocenter/infocenterData.php  | 17 +++++++++++++++--
 .../infocenter/infocenterFreigegebenData.php    | 16 ++++++++++++++--
 .../infocenterReihungstestAbsolviertData.php    | 16 ++++++++++++++--
 4 files changed, 46 insertions(+), 9 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index b79d8d4d8..de02a3a11 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -859,7 +859,7 @@ class InfoCenter extends Auth_Controller
 		$this->navigationlib->setSessionMenu(
 			array(
 				'freigegeben' => $this->navigationlib->oneLevel(
-					'Freigegeben',		// description
+					'zum RT Freigegeben',		// description
 					$freigegebenLink,	// link
 					null,				// children
 					'thumbs-up',		// icon
@@ -871,10 +871,10 @@ class InfoCenter extends Auth_Controller
 					1   				// sort
 				),
 				'reihungstestAbsolviert' => $this->navigationlib->oneLevel(
-					'Reihungstest Absolviert',		// description
+					'Reihungstest absolviert',		// description
 					$reihungstestAbsolviertLink,				// link
 					null,				// children
-					'',					// icon
+					'check',					// icon
 					null,				// subscriptDescription
 					false,				// expand
 					null,				// subscriptLinkClass
diff --git a/application/views/system/infocenter/infocenterData.php b/application/views/system/infocenter/infocenterData.php
index 026556615..6715705ad 100755
--- a/application/views/system/infocenter/infocenterData.php
+++ b/application/views/system/infocenter/infocenterData.php
@@ -162,7 +162,14 @@
 						  AND spss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende > NOW())
 					)
 				 LIMIT 1
-			) AS "StgAktiv"
+			) AS "StgAktiv",
+			(
+				SELECT ps.zgvnation
+				FROM public.tbl_prestudent ps
+				 WHERE ps.person_id = p.person_id
+			  ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
+				 LIMIT 1
+			) AS "ZGVNation"
 		  FROM public.tbl_person p
 	 LEFT JOIN (
 				SELECT tpl.person_id,
@@ -232,7 +239,8 @@
 			ucfirst($this->p->t('global', 'abgeschickt')).' ('.$this->p->t('global', 'anzahl').')',
 			ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'gesendet').')',
 			ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'nichtGesendet').')',
-			ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'aktiv').')'
+			ucfirst($this->p->t('lehre', 'studiengang')).' ('.$this->p->t('global', 'aktiv').')',
+			'ZGV Nation'
 		),
 		'formatRow' => function($datasetRaw) {
 
@@ -304,6 +312,11 @@
 				$datasetRaw->{'Nation'} = '-';
 			}
 
+			if ($datasetRaw->{'ZGVNation'} == null)
+			{
+				$datasetRaw->{'ZGVNation'} = '-';
+			}
+
 			return $datasetRaw;
 		},
 		'markRow' => function($datasetRaw) {
diff --git a/application/views/system/infocenter/infocenterFreigegebenData.php b/application/views/system/infocenter/infocenterFreigegebenData.php
index f3ac6e757..616afa6cf 100644
--- a/application/views/system/infocenter/infocenterFreigegebenData.php
+++ b/application/views/system/infocenter/infocenterFreigegebenData.php
@@ -127,7 +127,14 @@
 				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
-			) AS "ReihungstestApplied"
+			) AS "ReihungstestApplied",
+			(
+				SELECT ps.zgvnation
+				FROM public.tbl_prestudent ps
+				 WHERE ps.person_id = p.person_id
+			  ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
+				 LIMIT 1
+			) AS "ZGVNation"
 		  FROM public.tbl_person p
 	 LEFT JOIN (
 			SELECT tpl.person_id,
@@ -181,7 +188,8 @@
 			'Studiengänge',
 			'Statusgrund',
 			'Reihungstest angetreten',
-			'Reihungstest angemeldet'
+			'Reihungstest angemeldet',
+			'ZGV Nation'
 		),
 		'formatRow' => function($datasetRaw) {
 
@@ -256,6 +264,10 @@
 				$datasetRaw->{'ReihungstestApplied'} = 'Nein';
 			}
 
+			if ($datasetRaw->{'ZGVNation'} == null)
+			{
+				$datasetRaw->{'ZGVNation'} = '-';
+			}
 			return $datasetRaw;
 		},
 		'markRow' => function($datasetRaw) {
diff --git a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
index 09ee2a0ee..d238cea64 100644
--- a/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
+++ b/application/views/system/infocenter/infocenterReihungstestAbsolviertData.php
@@ -145,7 +145,14 @@
 				   AND pss.studiensemester_kurzbz IN (SELECT ss.studiensemester_kurzbz FROM public.tbl_studiensemester ss WHERE ss.ende >= NOW())
 			  ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 				 LIMIT 1
-			) AS "ReihungstestDatum"
+			) AS "ReihungstestDatum",
+			(
+				SELECT ps.zgvnation
+				FROM public.tbl_prestudent ps
+				 WHERE ps.person_id = p.person_id
+			  ORDER BY ps.zgvnation DESC NULLS LAST, ps.prestudent_id DESC
+				 LIMIT 1
+			) AS "ZGVNation"
 		  FROM public.tbl_person p
 	 LEFT JOIN (
 			SELECT tpl.person_id,
@@ -200,7 +207,8 @@
 			'Statusgrund',
 			'Reihungstest angetreten',
 			'Reihungstest angemeldet',
-			'Reihungstest Datum'
+			'Reihungstest Datum',
+			'ZGV Nation'
 		),
 		'formatRow' => function($datasetRaw) {
 
@@ -284,6 +292,10 @@
 				$datasetRaw->{'ReihungstestDatum'} = date_format(date_create($datasetRaw->{'ReihungstestDatum'}),'d.m.Y');
 			}
 
+			if ($datasetRaw->{'ZGVNation'} == null)
+			{
+				$datasetRaw->{'ZGVNation'} = '-';
+			}
 			return $datasetRaw;
 		},
 		'markRow' => function($datasetRaw) {