From 311d235fda8cad5e69ac78702ef50a4106c45c4c Mon Sep 17 00:00:00 2001
From: ma0048 <ma0048@technikum-wien.at>
Date: Wed, 17 May 2023 16:35:22 +0200
Subject: [PATCH] - abgewiesene gesperrt von spalte

---
 .../infocenter/infocenterAbgewiesenData.php   | 33 +++++++++++++++++++
 system/filtersupdate.php                      |  3 +-
 2 files changed, 35 insertions(+), 1 deletion(-)

diff --git a/application/views/system/infocenter/infocenterAbgewiesenData.php b/application/views/system/infocenter/infocenterAbgewiesenData.php
index 94d3d6ee1..2307ea87e 100644
--- a/application/views/system/infocenter/infocenterAbgewiesenData.php
+++ b/application/views/system/infocenter/infocenterAbgewiesenData.php
@@ -1,6 +1,7 @@
 <?php
 
 	$this->config->load('infocenter');
+	$APP = '\'infocenter\'';
 	$ABGEWIESENEN_STATUS = '\'Abgewiesener\'';
 	$STUDIENGANG_TYP = '\''.$this->variablelib->getVar('infocenter_studiensgangtyp').'\'';
 	$ADDITIONAL_STG = $this->config->item('infocenter_studiengang_kz');
@@ -17,6 +18,8 @@ $query = '
 			p.nachname AS "Nachname",
 			so.studiengangkurzbzlang as "Studiengang",
 			pss.insertamum AS "AbgewiesenAm",
+			pl.zeitpunkt AS "LockDate",
+			pl.lockuser AS "LockUser",
 			(
 				SELECT l.zeitpunkt
 				FROM system.tbl_log l
@@ -54,6 +57,15 @@ $query = '
 			JOIN public.tbl_studiengang sg USING(studiengang_kz)
 			JOIN lehre.tbl_studienplan sp USING(studienplan_id)
 			JOIN lehre.tbl_studienordnung so USING(studienordnung_id)
+			LEFT JOIN (
+				SELECT tpl.person_id,
+					   tpl.zeitpunkt,
+					   sp.nachname AS lockuser
+				  FROM system.tbl_person_lock tpl
+				  JOIN public.tbl_benutzer sb USING (uid)
+				  JOIN public.tbl_person sp ON sb.person_id = sp.person_id
+				 WHERE tpl.app = '.$APP.'
+			 ) pl USING(person_id)
 		WHERE pss.status_kurzbz = '. $ABGEWIESENEN_STATUS .'
 		AND pss.studiensemester_kurzbz = '. $STUDIENSEMESTER .'
 		AND (sg.typ IN ('. $STUDIENGANG_TYP .') 
@@ -78,6 +90,8 @@ $query = '
 			ucfirst($this->p->t('person', 'nachname')),
 			ucfirst($this->p->t('lehre', 'studiengang')),
 			ucfirst($this->p->t('infocenter', 'abgewiesenam')),
+			ucfirst($this->p->t('global', 'sperrdatum')),
+			ucfirst($this->p->t('global', 'gesperrtVon')),
 			ucfirst($this->p->t('global', 'nachricht')),
 			ucfirst($this->p->t('infocenter', 'kaution'))
 		),
@@ -114,10 +128,29 @@ $query = '
 			{
 				$datasetRaw->{'Kaution'} = 'Offen';
 			}
+			
+			if ($datasetRaw->{'LockDate'} == null)
+			{
+				$datasetRaw->{'LockDate'} = '-';
+			}
+			
+			if ($datasetRaw->{'LockUser'} == null)
+			{
+				$datasetRaw->{'LockUser'} = '-';
+			}
 
 			$datasetRaw->{'AbgewiesenAm'} = date_format(date_create($datasetRaw->{'AbgewiesenAm'}),'Y-m-d H:i');
 			return $datasetRaw;
+		},
+		
+		'markRow' => function($datasetRaw) {
+			
+			if ($datasetRaw->LockDate != null)
+			{
+				return FilterWidget::DEFAULT_MARK_ROW_CLASS;
+			}
 		}
+		
 	);
 
 	echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
diff --git a/system/filtersupdate.php b/system/filtersupdate.php
index 2ed253422..abdea4532 100644
--- a/system/filtersupdate.php
+++ b/system/filtersupdate.php
@@ -520,7 +520,8 @@ $filters = array(
 					{"name": "Studiengang"},
 					{"name": "AbgewiesenAm"},
 					{"name": "Nachricht"},
-					{"name": "Kaution"}
+					{"name": "Kaution"},
+					{"name": "LockUser"}
 				],
 				"filters": []
 			}