Merge branch 'master' of https://github.com/FH-Complete/FHC-Core

application/views/system/infocenter/infocenterData.php

@@ -64,9 +64,23 @@
 						AND tbl_studiengang.typ in(\'b\')
 					LIMIT 1
 				) AS "AnzahlAbgeschickt",
+				array_to_string(
+					(
+					SELECT array_agg(tbl_studiengang.kurzbzlang)
+					FROM
+						public.tbl_prestudentstatus pss
+						INNER JOIN public.tbl_prestudent ps USING(prestudent_id)
+						JOIN public.tbl_studiengang USING(studiengang_kz)
+					WHERE pss.status_kurzbz = \'Interessent\'
+						AND pss.bewerbung_abgeschicktamum IS NOT NULL
+						AND ps.person_id = p.person_id
+						AND tbl_studiengang.typ in(\'b\')
+					LIMIT 1
+					),\',\'
+				) AS "StgAbgeschickt",
 				pl.zeitpunkt AS "LockDate"
 			FROM public.tbl_person p
-	   LEFT JOIN (SELECT person_id, zeitpunkt FROM system.tbl_person_lock WHERE app = \''.$APP.'\') pl USING(person_id)
+		LEFT JOIN (SELECT person_id, zeitpunkt FROM system.tbl_person_lock WHERE app = \''.$APP.'\') pl USING(person_id)
 			WHERE
 				EXISTS(
 					SELECT 1

application/views/system/infocenter/infocenterDetails.php

@@ -36,6 +36,7 @@
 	?>
 	<div id="page-wrapper">
 		<div class="container-fluid">
+			<input type="hidden" id="hiddenpersonid" value="<?php echo $stammdaten->person_id ?>">
 			<div class="row<?php if($lockedbyother) echo ' alert-danger' ?>">
 				<div class="col-lg-8">
 							<h3 class="page-header">

application/views/system/infocenter/zgvpruefungen.php

@@ -76,7 +76,7 @@
 										echo $this->widgetlib->widget(
 											'Zgv_widget',
 											array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgv_code),
-											array('name' => 'zgv', 'id' => 'zgv')
+											array('name' => 'zgv', 'id' => 'zgv_'.$zgvpruefung->prestudent_id)
 										); ?>
 								</div>
 							</div>
@@ -89,21 +89,23 @@
 										?>
 										<input type="text" class="form-control"
 											   value="<?php echo $zgvpruefung->zgvort ?>"
-											   name="zgvort">
+											   name="zgvort" id="zgvort_<?php echo $zgvpruefung->prestudent_id ?>">
 									<?php endif; ?>
 								</div>
 							</div>
 							<div class="col-lg-<?php echo $columns[2] ?>">
 								<div class="form-group">
 									<label>ZGV Datum: </label>
-									<?php if ($infoonly):
-										echo date_format(date_create($zgvpruefung->zgvdatum), 'd.m.Y');
+									<?php
+									$zgvdatum = empty($zgvpruefung->zgvdatum) ? "" : date_format(date_create($zgvpruefung->zgvdatum), 'd.m.Y');
+									if ($infoonly):
+										echo $zgvdatum;
 									else:
 										?>
 										<input type="text"
 											   class="dateinput form-control"
-											   value="<?php echo empty($zgvpruefung->zgvdatum) ? "" : date_format(date_create($zgvpruefung->zgvdatum), 'd.m.Y') ?>"
-											   name="zgvdatum">
+											   value="<?php echo $zgvdatum ?>"
+											   name="zgvdatum" id="zgvdatum_<?php echo $zgvpruefung->prestudent_id ?>">
 									<?php endif; ?>
 								</div>
 							</div>
@@ -116,7 +118,7 @@
 										echo $this->widgetlib->widget(
 											'Nation_widget',
 											array(DropdownWidget::SELECTED_ELEMENT => $zgvpruefung->zgvnation_code),
-											array('name' => 'zgvnation', 'id' => 'zgvnation')
+											array('name' => 'zgvnation', 'id' => 'zgvnation_'.$zgvpruefung->prestudent_id)
 										); ?>
 								</div>
 							</div>
@@ -153,13 +155,15 @@
 								<div class="col-lg-<?php echo $columns[2] ?>">
 									<div class="form-group">
 										<label>ZGV Master Datum: </label>
-										<?php if ($infoonly):
-											echo date_format(date_create($zgvpruefung->zgvmadatum), 'd.m.Y');
+										<?php
+										$zgvmadatum = empty($zgvpruefung->zgvmadatum) ? "" : date_format(date_create($zgvpruefung->zgvmadatum), 'd.m.Y');
+										if ($infoonly):
+											echo $zgvmadatum;
 										else:
 											?>
 											<input type="text"
 												   class="dateinput form-control"
-												   value="<?php echo empty($zgvpruefung->zgvmadatum) ? "" : date_format(date_create($zgvpruefung->zgvmadatum), 'd.m.Y') ?>"
+												   value="<?php echo $zgvmadatum ?>"
 												   name="zgvmadatum">
 										<?php endif; ?>
 									</div>
@@ -183,7 +187,12 @@
 						<?php endif; ?>
 						<?php if (!$infoonly): ?>
 							<div class="row">
-								<div class="col-lg-12 text-right">
+								<div class="col-lg-6 text-left">
+									<button type="button" class="btn btn-default zgvUebernehmen" id="zgvUebernehmen_<?php echo $zgvpruefung->prestudent_id ?>">
+										Letzte ZGV &uuml;bernehmen
+									</button>
+								</div>
+								<div class="col-lg-6 text-right">
 									<button type="submit" class="btn btn-default">
 										Speichern
 									</button>
@@ -203,7 +212,7 @@
 								<div class="form-inline">
 									<form method="post"
 										  action="../saveAbsage/<?php echo $zgvpruefung->prestudent_id ?>">
-										<div class="input-group" id="statusgrselect">
+										<div class="input-group" id="statusgrselect_<?php echo $zgvpruefung->prestudent_id ?>">
 											<select name="statusgrund"
 													class="d-inline float-right"
 													required>
@@ -216,15 +225,15 @@
 												<?php endforeach ?>
 											</select>
 											<span class="input-group-btn">
-																				<button id="absageBtn" type="button"
-																						class="btn btn-default"
-																						data-toggle="modal"
-																						data-target="#absageModal">
-																					Absage
-																				</button>
-																			</span>
+												<button id="absageBtn" type="button"
+														class="btn btn-default"
+														data-toggle="modal"
+														data-target="#absageModal_<?php echo $zgvpruefung->prestudent_id ?>">
+													Absage
+												</button>
+											</span>
 										</div>
-										<div class="modal fade" id="absageModal"
+										<div class="modal fade absageModal" id="absageModal_<?php echo $zgvpruefung->prestudent_id ?>"
 											 tabindex="-1"
 											 role="dialog"
 											 aria-labelledby="absageModalLabel"
@@ -280,12 +289,12 @@
 								<div>
 									<button type="button" class="btn btn-default"
 											data-toggle="modal"
-											data-target="#freigabeModal">
+											data-target="#freigabeModal_<?php echo $zgvpruefung->prestudent_id ?>">
 										Freigabe an Studiengang
 									</button>
 								</div>
 							</div>
-							<div class="modal fade" id="freigabeModal" tabindex="-1"
+							<div class="modal fade" id="freigabeModal_<?php echo $zgvpruefung->prestudent_id ?>" tabindex="-1"
 								 role="dialog"
 								 aria-labelledby="freigabeModalLabel"
 								 aria-hidden="true">

application/views/templates/mailtemplates/interessentFreigabe.php

@@ -0,0 +1,54 @@
+<html>
+<head>
+	<title>Interessentenfreigabe mail</title>
+</head>
+<body>
+<div class="container">
+	{interessentbez} wurde freigegeben.
+	<br><br>
+	<table style="font-size:small">
+		<tbody>
+		<tr>
+			<td><b>Studiengang</b></td>
+			<td>{studiengangbez}&nbsp;{studiengangtypbez} {orgform} {sprache}</td>
+		</tr>
+		<tr>
+			<td><b>Studiensemester</b></td>
+			<td>{studiensemester}</td>
+		</tr>
+		<tr>
+			<td><b>Geschlecht</b></td>
+			<td>{geschlecht}</td>
+		</tr>
+		<tr>
+			<td><b>Vorname</b></td>
+			<td>{vorname}</td>
+		</tr>
+		<tr>
+			<td><b>Nachname</b></td>
+			<td>{nachname}</td>
+		</tr>
+		<tr>
+			<td><b>Geburtsdatum</b></td>
+			<td>{gebdatum}</td>
+		</tr>
+		<tr>
+			<td><b>E-Mail Adresse</b></td>
+			<td>{mailadresse}</td>
+		</tr>
+		<tr>
+			<td><b>Prestudent ID</b></td>
+			<td>{prestudentid}</td>
+		</tr>
+		<tr>
+			<td valign="top"><b>Anmerkungen zur Bewerbung</b></td>
+			<td>{notizentext}</td>
+		</tr>
+		</tbody>
+	</table>
+	<br>
+	Für mehr Details verwenden Sie die Personenansicht im FAS.
+</div>
+</body>
+</html>
+