From 090345d6c08ed9ed982696a832c5c030ae1a26ca Mon Sep 17 00:00:00 2001
From: ma0068 <ma0068@technikum-wien.at>
Date: Tue, 13 Dec 2022 10:58:52 +0100
Subject: [PATCH] =?UTF-8?q?OE-Unit=20in=20Abh=C3=A4ngigkeit=20von=20der=20?=
 =?UTF-8?q?Sender-OE=20anzeigen?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/config/constants.php                    |  3 +++
 application/controllers/jobs/ReihungstestJob.php    |  5 +----
 application/views/system/infocenter/messageList.php | 13 +++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/application/config/constants.php b/application/config/constants.php
index cbbf55d8b..bffeecc52 100644
--- a/application/config/constants.php
+++ b/application/config/constants.php
@@ -148,3 +148,6 @@ define('MSG_ERR_INVALID_SENDER',		45);
 define('MSG_ERR_INVALID_RECIPIENTS',	46);
 define('MSG_ERR_INVALID_OU',			47);
 define('MSG_ERR_INVALID_TOKEN',			48);
+
+// Message sender OE unit for reminder application Test
+define('OU_SENDER_TEST_REMINDER', 'infocenter');
diff --git a/application/controllers/jobs/ReihungstestJob.php b/application/controllers/jobs/ReihungstestJob.php
index 37ba22dac..3f4002836 100644
--- a/application/controllers/jobs/ReihungstestJob.php
+++ b/application/controllers/jobs/ReihungstestJob.php
@@ -24,8 +24,6 @@ use \DB_Model as DB_Model;
 
 class ReihungstestJob extends JOB_Controller
 {
-	const OU_SENDER_TEST_REMINDER = 'infocenter';
-
 	/**
 	 * Constructor
 	 */
@@ -473,7 +471,7 @@ class ReihungstestJob extends JOB_Controller
 								$this->CLMessagesModel->sendExplicitTemplateSenderId(
 									$sender_id,
 									$applicant->prestudent_id,
-									self::OU_SENDER_TEST_REMINDER,
+									OU_SENDER_TEST_REMINDER,
 									'Sancho_RemindApplicantsOfTest',
 									$mailcontent_data_arr
 								);
@@ -1164,4 +1162,3 @@ class ReihungstestJob extends JOB_Controller
 		}
 	}
 }
-
diff --git a/application/views/system/infocenter/messageList.php b/application/views/system/infocenter/messageList.php
index 57e375a28..6093f4166 100644
--- a/application/views/system/infocenter/messageList.php
+++ b/application/views/system/infocenter/messageList.php
@@ -6,18 +6,19 @@ $widthColumn = $msgExists === true ? 8 : 12;
 	<table id="msgtable" class="table table-bordered table-condensed tablesort-hover tablesort-active">
 		<thead>
 		<tr>
-			<th><?php echo  ucfirst($this->p->t('global','gesendetAm')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global','sender')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global','empfaenger')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global','betreff')) ?></th>
-			<th><?php echo  ucfirst($this->p->t('global','gelesenAm')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global', 'gesendetAm')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global', 'sender')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global', 'empfaenger')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global', 'betreff')) ?></th>
+			<th><?php echo  ucfirst($this->p->t('global', 'gelesenAm')) ?></th>
 		</tr>
 		</thead>
 		<tbody>
 		<?php foreach ($messages as $message): ?>
 			<tr id="<?php echo $message->message_id.'_'.$message->repersonid ?>" style="cursor: pointer">
 				<td><?php echo isset($message->insertamum) ? date_format(date_create($message->insertamum), 'd.m.Y H:i:s') : '' ?></td>
-				<td><?php echo isset($message->oebezeichnung) ? $message->oebezeichnung : $message->sevorname.' '.$message->senachname ?></td>
+				<td><?php echo isset($message->oebezeichnung) && ($message->oe_kurzbz == OU_SENDER_TEST_REMINDER) ?
+					$message->oebezeichnung : $message->sevorname.' '.$message->senachname ?></td>
 				<td><?php echo $message->revorname.' '.$message->renachname ?></td>
 				<td><?php echo $message->subject ?></td>
 				<td><?php echo isset($message->statusamum) ? date_format(date_create($message->statusamum), 'd.m.Y H:i:s') : '' ?></td>