From 26600dac056ca05cf656c0d2aa0d6a7167db92ed Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Fri, 11 May 2018 14:14:16 +0200
Subject: [PATCH] added kurzbz to zgv info, optimized responsiveness of panel
 headers, whole notizenrow clickable

---
 .../controllers/system/infocenter/InfoCenter.php   |  3 ++-
 application/views/system/infocenter/notizen.php    |  4 ++--
 .../views/system/infocenter/studiengangZgvInfo.php |  2 +-
 .../views/system/infocenter/zgvpruefungen.php      | 14 ++++++++++----
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 4bafe591b..1973b84c5 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -221,9 +221,10 @@ class InfoCenter extends VileSci_Controller
 		$studienordnung = $this->PrestudentstatusModel->getStudienordnungWithZgvText($prestudent_id);
 
 		$prestudentdata = $this->_getPersonAndStudiengangFromPrestudent($prestudent_id);
+		$studiengangkurzbz = $prestudentdata['studiengang_kurzbz'];
 		$studiengangbezeichnung = $prestudentdata['studiengang_bezeichnung'];
 
-		$data = array('studiengang_bezeichnung' => $studiengangbezeichnung, 'data' => null);
+		$data = array('studiengang_bezeichnung' => $studiengangbezeichnung, 'studiengang_kurzbz' => $studiengangkurzbz, 'data' => null);
 
 		if (hasData($studienordnung))
 		{
diff --git a/application/views/system/infocenter/notizen.php b/application/views/system/infocenter/notizen.php
index 683a9b3d9..646645ae3 100644
--- a/application/views/system/infocenter/notizen.php
+++ b/application/views/system/infocenter/notizen.php
@@ -9,9 +9,9 @@
 	<tbody>
 	<?php foreach ($notizen as $notiz): ?>	
 		<tr data-toggle="tooltip"
-			title="<?php echo isset($notiz->text) ? strip_tags($notiz->text) : '' ?>">		
+			title="<?php echo isset($notiz->text) ? strip_tags($notiz->text) : '' ?>" style="cursor: pointer">
 			<td><?php echo date_format(date_create($notiz->insertamum), 'd.m.Y H:i:s') ?></td>
-			<td style="cursor: pointer"><?php echo html_escape($notiz->titel) ?></td>
+			<td><?php echo html_escape($notiz->titel) ?></td>
 			<td><?php echo $notiz->verfasser_uid ?></td>
 			<td style="display: none"><?php echo $notiz->notiz_id ?></td>
 		</tr>
diff --git a/application/views/system/infocenter/studiengangZgvInfo.php b/application/views/system/infocenter/studiengangZgvInfo.php
index 92f9d08e1..6242d0db6 100644
--- a/application/views/system/infocenter/studiengangZgvInfo.php
+++ b/application/views/system/infocenter/studiengangZgvInfo.php
@@ -17,7 +17,7 @@ $this->load->view(
 			<div class="container-fluid">
 				<div class="row">
 					<div class="col-lg-12">
-						<h3 class="page-header">Zugangsvoraussetzungen <?php echo $studiengang_bezeichnung; ?></h3>
+						<h3 class="page-header">Zugangsvoraussetzungen <?php echo $studiengang_kurzbz; ?> - <?php echo $studiengang_bezeichnung; ?></h3>
 					</div>
 				</div>
 				<div id="data">
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index c8091a5dc..1a31fc643 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -2,14 +2,20 @@
 	<?php
 	foreach ($zgvpruefungen as $zgvpruefung):
 		$infoonly = $zgvpruefung->infoonly;
-		//set bootstrap columns
+		//set bootstrap columns for zgv form
 		$columns = array(4, 3, 2, 3);
+		$headercolumns = array(7, 5);
+		if (!$infoonly && isset($zgvpruefung->prestudentstatus->bewerbungsnachfrist) && isset($zgvpruefung->prestudentstatus->bewerbungstermin))
+		{
+			$headercolumns[0] = 5;
+			$headercolumns[1] = 7;
+		}
 		?>
 		<br/>
 		<div class="panel panel-default">
 			<div class="panel-heading">
 				<div class="row">
-					<div class="col-xs-7">
+					<div class="col-xs-<?php echo $headercolumns[0]; ?>">
 						<h4 class="panel-title">
 							<a data-toggle="collapse"
 							   href="#collapse<?php echo $zgvpruefung->prestudent_id ?>"><?php echo $zgvpruefung->studiengang.' - '.$zgvpruefung->studiengangbezeichnung.' | '.(isset($zgvpruefung->prestudentstatus->status_kurzbz) ? $zgvpruefung->prestudentstatus->status_kurzbz : '');
@@ -19,13 +25,13 @@
 					<?php if (isset($zgvpruefung->prestudentstatus->status_kurzbz) && $zgvpruefung->prestudentstatus->status_kurzbz === 'Interessent'/* && !$infoonly*/): ?>
 						<?php if ($infoonly): ?>
 							<?php if (isset($zgvpruefung->prestudentstatus->bestaetigtam)): ?>
-							<div class="col-xs-5 text-right">
+							<div class="col-xs-<?php echo $headercolumns[1]; ?> text-right">
 								<i class="fa fa-check" style="color: green"></i>
 								An Studiengang freigegeben
 							</div>
 							<?php endif; ?>
 						<?php else: ?>
-						<div class="col-xs-5 text-right">
+						<div class="col-xs-<?php echo $headercolumns[1]; ?> text-right">
 							<?php echo 'Bewerbung abgeschickt: '.(isset($zgvpruefung->prestudentstatus->bewerbung_abgeschicktamum) ? '<i class="fa fa-check" style="color:green"></i>' : '<i class="fa fa-times" style="color:red"></i>'); ?>
 							<?php echo (isset($zgvpruefung->prestudentstatus->bewerbungsnachfrist) ? ' | Nachfrist: '. date_format(date_create($zgvpruefung->prestudentstatus->bewerbungsnachfrist), 'd.m.Y') : ''); ?>
 							<?php echo (isset($zgvpruefung->prestudentstatus->bewerbungstermin) ? ' | Bewerbungsfrist: '. date_format(date_create($zgvpruefung->prestudentstatus->bewerbungstermin), 'd.m.Y') : ''); ?>