From 835fe48442e9de2ee17731f8a6eb214450fa29dd Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Mon, 10 Dec 2018 11:45:12 +0100
Subject: [PATCH] - freigabemessage to bewerber only sent once each freigabe
 per semester (bachelor only) - moved RTfreigabe button to right and made
 bigger - new Vorlagen for Messages - Message also sent for
 Studiengangfreigabe

---
 .../system/infocenter/InfoCenter.php          | 34 +++----
 application/models/person/Notiz_model.php     |  1 +
 .../views/system/infocenter/zgvpruefungen.php | 28 +++---
 public/css/infocenter/infocenterDetails.css   |  8 +-
 public/js/infocenter/infocenterDetails.js     | 99 ++++++++++++-------
 5 files changed, 101 insertions(+), 69 deletions(-)

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index de02a3a11..97da8ff2e 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -1371,11 +1371,16 @@ class InfoCenter extends Auth_Controller
 		$interessentbez = $person->geschlecht == 'm' ? 'Ein Interessent' : 'Eine Interessentin';
 		$sprache = $prestudentstatus->sprachedetails->bezeichnung[0];
 		$orgform = $prestudentstatus->orgform != '' ? ' ('.$prestudentstatus->orgform.')' : '';
-		$geschlecht = $person->geschlecht == 'm' ? 'm&auml;nnlich' : 'weiblich';
-		$geburtsdatum = date('d.m.Y', strtotime($person->gebdatum));
-		$zgvort = !isEmptyString($prestudent->zgvort) ? ' in '.$prestudent->zgvort : '';
+		$statusgrund = isset($prestudentstatus->statusgrund_id) ?
+			'<tr>
+				<td><b>Statusgrund</b></td>
+				<td>'.$prestudentstatus->bezeichnung_statusgrund[0].'</td>
+			</tr>' : '';
+		//$geschlecht = $person->geschlecht == 'm' ? 'm&auml;nnlich' : 'weiblich';
+		//$geburtsdatum = date('d.m.Y', strtotime($person->gebdatum));
+		/*$zgvort = !isEmptyString($prestudent->zgvort) ? ' in '.$prestudent->zgvort : '';
 		$zgvnation = !isEmptyString($prestudent->zgvnation_bez) ? ', '.$prestudent->zgvnation_bez : '';
-		$zgvdatum = !isEmptyString($prestudent->zgvdatum) ? ', am '.date_format(date_create($prestudent->zgvdatum), 'd.m.Y') : '';
+		$zgvdatum = !isEmptyString($prestudent->zgvdatum) ? ', am '.date_format(date_create($prestudent->zgvdatum), 'd.m.Y') : '';*/
 
 		$dokumenteNachzureichenMail = $dokumenteMail = array();
 		//convert documents to array so they can be parsed, and keeping only needed fields
@@ -1406,16 +1411,6 @@ class InfoCenter extends Auth_Controller
 		}
 		$notizentext .= '</ul>';
 
-		$mailadresse = '';
-		foreach ($person->kontakte as $kontakt)
-		{
-			if ($kontakt->kontakttyp === 'email')
-			{
-				$mailadresse = $kontakt->kontakt;
-				break;
-			}
-		}
-
 		$data = array
 		(
 			'interessentbez' => $interessentbez,
@@ -1423,20 +1418,21 @@ class InfoCenter extends Auth_Controller
 			'studiengangtypbez' => $prestudent->studiengangtyp_bez,
 			'orgform' => $orgform,
 			'studiensemester' => $prestudentstatus->studiensemester_kurzbz,
+			'ausbildungssemester' => $prestudentstatus->ausbildungssemester,
 			'sprache' => $sprache,
-			'geschlecht' => $geschlecht,
 			'vorname' => $person->vorname,
 			'nachname' => $person->nachname,
-			'gebdatum' => $geburtsdatum,
-			'mailadresse' => $mailadresse,
 			'prestudentid' => $prestudent_id,
-			'zgvbez' => $prestudent->zgv_bez,
+			'statusgrund' => $statusgrund,
+			/*'zgvbez' => $prestudent->zgv_bez,
 			'zgvort' => $zgvort,
 			'zgvdatum' => $zgvdatum,
 			'zgvnation' => $zgvnation,
+			*/
 			'notizentext' => $notizentext,
 			'dokumente' => $dokumenteMail,
-			'dokumente_nachgereicht' => $dokumenteNachzureichenMail
+			'dokumente_nachgereicht' => $dokumenteNachzureichenMail,
+			'persondetailslink' => APP_ROOT.'vilesci/personen/personendetails.php?id='.$person_id
 		);
 
 		$this->load->library('LogLib');
diff --git a/application/models/person/Notiz_model.php b/application/models/person/Notiz_model.php
index ccc1e2719..8df400933 100644
--- a/application/models/person/Notiz_model.php
+++ b/application/models/person/Notiz_model.php
@@ -154,6 +154,7 @@ class Notiz_model extends DB_Model
 	{
 		// Join with the table public.tbl_notizzuordnung using notiz_id
 		$this->addJoin('public.tbl_notizzuordnung', 'notiz_id');
+		$this->addOrder('insertamum', 'DESC');
 
 		return $this->loadWhere(array('person_id' => $person_id, 'titel' => $titel));
 	}
diff --git a/application/views/system/infocenter/zgvpruefungen.php b/application/views/system/infocenter/zgvpruefungen.php
index 4c2958d62..a26c94177 100644
--- a/application/views/system/infocenter/zgvpruefungen.php
+++ b/application/views/system/infocenter/zgvpruefungen.php
@@ -97,7 +97,10 @@
 				<div class="panel-body">
 					<form method="post"
 						  action="#" class="zgvform">
-						<input type="hidden" name="prestudentid" value="<?php echo $zgvpruefung->prestudent_id  ?>">
+						<input type="hidden" name="prestudentid" value="<?php echo $zgvpruefung->prestudent_id ?>" class="prestudentidinput">
+						<input type="hidden" name="studiensemester" value="<?php echo $studiensemester ?>" id="studiensemester_<?php echo $zgvpruefung->prestudent_id  ?>">
+						<input type="hidden" name="isfreigegeben" class="isfreigegeben"
+							   value="<?php echo isset($zgvpruefung->prestudentstatus->bestaetigtam) && $zgvpruefung->prestudentstatus->status_kurzbz === 'Interessent' && $zgvpruefung->studiengangtyp === 'b' ? 1 : 0 ?>" id="isfreigegeben_<?php echo $zgvpruefung->prestudent_id  ?>">
 						<div class="row">
 							<div class="col-lg-<?php echo $columns[0] ?>">
 								<div class="form-group">
@@ -118,8 +121,7 @@
 							</div>
 							<div class="col-lg-<?php echo $columns[2] ?>">
 								<div class="form-group form-inline">
-									<label style="float: left"><span style="display: inline-block">Ausbildungs</span><span
-											style="display: inline-block">semester:&nbsp;</span></label>
+									<label><?php echo  ucfirst($this->p->t('lehre', 'ausbildungssemester')) . ':' ?></label>
 									<?php if (isset($zgvpruefung->prestudentstatus->ausbildungssemester)): ?>
 										<?php if ($infoonly): ?>
 											<input id="ausbildungssem_<?php echo $zgvpruefung->prestudent_id ?>" value="<?php echo $zgvpruefung->prestudentstatus->ausbildungssemester?>" type="hidden">
@@ -303,7 +305,7 @@
 					?>
 					<div class="panel-footer solidtop">
 						<div class="row">
-							<div class="col-lg-3 text-left">
+							<div class="col-lg-4 text-left">
 								<div class="form-inline">
 									<div class="input-group" id="absgstatusgrselect_<?php echo $zgvpruefung->prestudent_id ?>">
 										<select name="absgstatusgrund"
@@ -374,11 +376,11 @@
 									$disabledTxt = 'Nur Bachelorstudiengänge können freigegeben werden.';;
 								}
 								?>
-							<div class="col-lg-3">
+							<div class="col-lg-8 text-right">
 								<div class="form-inline">
 									<div class="input-group frgstatusgrselect" id="frgstatusgrselect_<?php echo $zgvpruefung->prestudent_id ?>">
 										<select name="frgstatusgrund"
-												class="d-inline float-right input-sm"
+												class="d-inline float-right"
 												<?php echo $disabled ?>
 												required>
 											<option value="null"
@@ -389,20 +391,20 @@
 											<?php endforeach ?>
 										</select>
 										<span class="input-group-btn">
-											<button class="btn btn-sm freigabebtnstg" <?php echo $disabled ?> id="freigabebtnstg_<?php echo $zgvpruefung->prestudent_id ?>"
+											<button class="btn btn-default freigabebtnstg" <?php echo $disabled ?> id="freigabebtnstg_<?php echo $zgvpruefung->prestudent_id ?>"
 													data-toggle="tooltip" title="<?php echo $disabledTxt ?>">
 												<?php echo  $this->p->t('ui', 'freigabeAnStudiengang') ?>
 											</button>
 										</span>
 									</div>
+									<div class="input-group" id="igrfrgbtn">
+										<button type="button" id="freigabebtn_<?php echo $zgvpruefung->prestudent_id ?>" class="btn btn-default freigabebtn" <?php echo $disabled ?>
+												data-toggle="tooltip" title="<?php echo $disabledTxt ?>">
+											<?php echo  $this->p->t('ui', 'freigabeZumReihungstest') ?>
+										</button>
+									</div>
 								</div>
 							</div>
-							<div class="col-lg-6 text-right">
-									<button type="button" id="freigabebtn_<?php echo $zgvpruefung->prestudent_id ?>" class="btn btn-default freigabebtn" <?php echo $disabled ?>
-											data-toggle="tooltip" title="<?php echo $disabledTxt ?>">
-										<?php echo  $this->p->t('ui', 'freigabeZumReihungstest') ?>
-									</button>
-							</div>
 							<div class="modal fade freigabeModal" id="freigabeModal_<?php echo $zgvpruefung->prestudent_id ?>" tabindex="-1"
 								 role="dialog"
 								 aria-labelledby="freigabeModalLabel"
diff --git a/public/css/infocenter/infocenterDetails.css b/public/css/infocenter/infocenterDetails.css
index 3e64bbcd7..b8bdc84bf 100644
--- a/public/css/infocenter/infocenterDetails.css
+++ b/public/css/infocenter/infocenterDetails.css
@@ -39,12 +39,12 @@
 
 .ausbildungssemselect{
    width: 40px !important;
-    margin-top: -5px;
-    padding: 4px;
+   margin-top: -5px;
+   padding: 4px;
 }
 
-.frgstatusgrselect{
-    margin-top: 2px;
+#igrfrgbtn{
+    margin-left: 30px;
 }
 
 #scrollToTop{
diff --git a/public/js/infocenter/infocenterDetails.js b/public/js/infocenter/infocenterDetails.js
index 1e38575ab..8de1d2c6f 100644
--- a/public/js/infocenter/infocenterDetails.js
+++ b/public/js/infocenter/infocenterDetails.js
@@ -2,8 +2,9 @@
 const BASE_URL = FHC_JS_DATA_STORAGE_OBJECT.app_root + FHC_JS_DATA_STORAGE_OBJECT.ci_router;
 const CALLED_PATH = FHC_JS_DATA_STORAGE_OBJECT.called_path;
 const CONTROLLER_URL = BASE_URL + "/"+CALLED_PATH;
-const FREIGABE_MESSAGE_VORLAGE = "InfocenterRTfreigegeben";
-const FREIGABE_MESSAGE_VORLAGE_QUER = "InfocenterRTfreigegQuer";
+const RTFREIGABE_MESSAGE_VORLAGE = "InfocenterRTfreigegeben";
+const RTFREIGABE_MESSAGE_VORLAGE_QUER = "InfocenterRTfreigegQuer";
+const STGFREIGABE_MESSAGE_VORLAGE = "InfocenterSTGfreigegeben";
 
 /**
  * javascript file for infocenterDetails page
@@ -271,8 +272,6 @@ var InfocenterDetails = {
 	},
 	saveFreigabe: function(data, rtfreigabe)
 	{
-		var callback = null;
-
 		FHC_AjaxClient.ajaxCallPost(
 			CALLED_PATH + '/saveFreigabe',
 			data,
@@ -281,28 +280,8 @@ var InfocenterDetails = {
 
 					if (FHC_AjaxClient.hasData(data))
 					{
-						if (rtfreigabe)
-						{
-							FHC_AjaxClient.showVeil();
-							callback = function ()
-							{
-								InfocenterDetails.sendFreigabeMessage(data.retval.prestudent_id);
-							};
-						}
-						else
-						{
-							callback = function ()
-							{
-								InfocenterDetails._refreshLog();
-							};
-						}
-
-
-						InfocenterDetails._refreshZgv(
-							false,
-							//send message only after refresh to have current Ausbildungssemester
-							callback
-						);
+						FHC_AjaxClient.showVeil();
+						InfocenterDetails.initFrgMessageSend(data.retval.prestudent_id, rtfreigabe);
 					}
 					else if (data.error === 2 && parseInt(data.retval.prestudent_id, 10))
 					{
@@ -447,10 +426,67 @@ var InfocenterDetails = {
 			}
 		);
 	},
-	sendFreigabeMessage: function(prestudentid)
+	initFrgMessageSend: function(prestudentid, rtfreigabe)
+	{
+		var callback = function ()
+		{
+			// check if a prestudent in same semester is already freigegeben - then not send message again
+			var freigegeben = false;
+			var prestudentids = $(".prestudentidinput");
+
+			if (prestudentids.length > 1)
+			{
+				prestudentids.each(function()
+					{
+						var id = $(this).val();
+
+						if (parseInt(id) !== parseInt(prestudentid))
+						{
+							if ($("#studiensemester_"+id).val() === $("#studiensemester_"+prestudentid).val() && $("#isfreigegeben_"+id).val() === "1")
+							{
+								freigegeben = true;
+								return false;
+							}
+						}
+					}
+				);
+			}
+
+			if (freigegeben)
+			{
+				InfocenterDetails._refreshLog();
+			}
+			else
+			{
+				var ausbildungssem = $("#ausbildungssem_" + prestudentid).val();
+				var vorlage_kurzbz = null;
+				var msgvars = {};
+
+				if (rtfreigabe)
+				{
+					vorlage_kurzbz = isNaN(ausbildungssem) || parseInt(ausbildungssem) === 1 ? RTFREIGABE_MESSAGE_VORLAGE : RTFREIGABE_MESSAGE_VORLAGE_QUER;
+					msgvars = {
+						'rtlink': FHC_JS_DATA_STORAGE_OBJECT.app_root + 'addons/bewerbung/cis/registration.php?active=aufnahme',
+						'ausbildungssemester': ausbildungssem
+					}
+				}
+				else
+				{
+					vorlage_kurzbz = STGFREIGABE_MESSAGE_VORLAGE;
+				}
+				InfocenterDetails.sendFreigabeMessage(prestudentid, vorlage_kurzbz, msgvars);
+			}
+			FHC_AjaxClient.hideVeil();
+		};
+
+		InfocenterDetails._refreshZgv(
+			false,
+			//send message only after refresh to have current Ausbildungssemester
+			callback
+		);
+	},
+	sendFreigabeMessage: function(prestudentid, vorlage_kurzbz, msgvars)
 	{
-		var ausbildungssem = $("#ausbildungssem_"+prestudentid).val();
-		var vorlage_kurzbz = isNaN(ausbildungssem) || parseInt(ausbildungssem) === 1 ? FREIGABE_MESSAGE_VORLAGE : FREIGABE_MESSAGE_VORLAGE_QUER;
 
 		FHC_AjaxClient.ajaxCallPost(
 			'system/Messages/sendJson',
@@ -458,10 +494,7 @@ var InfocenterDetails = {
 				"prestudents": prestudentid,
 				"vorlage_kurzbz": vorlage_kurzbz,
 				"oe_kurzbz": 'infocenter',
-				"msgvars": {
-					'rtlink': FHC_JS_DATA_STORAGE_OBJECT.app_root + 'addons/bewerbung/cis/registration.php?active=aufnahme',
-					'ausbildungssemester': ausbildungssem
-				}
+				"msgvars": msgvars
 			},
 			{
 				successCallback: function(data, textStatus, jqXHR) {