From a2864eb47a08888461c44507c062bd1528d56aa2 Mon Sep 17 00:00:00 2001
From: alex <karpen_ko@hotmail.com>
Date: Thu, 1 Mar 2018 16:05:23 +0100
Subject: [PATCH] added notizen (Anmerkungen) zur Bewerbung

---
 .../system/infocenter/InfoCenter.php          |   8 +
 .../infocenter/anmerkungenZurBewerbung.php    |  26 +++
 .../system/infocenter/infocenterDetails.php   |  36 ++--
 .../views/system/infocenter/stammdaten.php    | 201 +++++++++---------
 4 files changed, 153 insertions(+), 118 deletions(-)
 create mode 100644 application/views/system/infocenter/anmerkungenZurBewerbung.php

diff --git a/application/controllers/system/infocenter/InfoCenter.php b/application/controllers/system/infocenter/InfoCenter.php
index 4cd6a0e07..216aa0619 100644
--- a/application/controllers/system/infocenter/InfoCenter.php
+++ b/application/controllers/system/infocenter/InfoCenter.php
@@ -641,6 +641,13 @@ class InfoCenter extends VileSci_Controller
 			show_error($notizen->retval);
 		}
 
+		$notizen_bewerbung = $this->NotizModel->getNotizByTitel($person_id, 'Anmerkung zur Bewerbung');
+
+		if (isError($notizen_bewerbung))
+		{
+			show_error($notizen_bewerbung->retval);
+		}
+
 		$user_person = $this->PersonModel->getByUid($this->uid);
 
 		if (isError($user_person))
@@ -659,6 +666,7 @@ class InfoCenter extends VileSci_Controller
 			'messages' => $messages->retval,
 			'logs' => $logs,
 			'notizen' => $notizen->retval,
+			'notizenbewerbung' => $notizen_bewerbung->retval,
 			'messagelink' => $messagelink
 		);
 
diff --git a/application/views/system/infocenter/anmerkungenZurBewerbung.php b/application/views/system/infocenter/anmerkungenZurBewerbung.php
new file mode 100644
index 000000000..565db79db
--- /dev/null
+++ b/application/views/system/infocenter/anmerkungenZurBewerbung.php
@@ -0,0 +1,26 @@
+<?php if (count($notizenbewerbung) > 0): ?>
+	<br>
+	<div class="row">
+		<div class="col-lg-12">
+			<table class="table-bordered" align="center" width="100%">
+				<thead>
+				<tr>
+					<th colspan="2" class="text-center">Anmerkungen zur Bewerbung</th>
+				</tr>
+				</thead>
+				<tbody>
+				<?php foreach ($notizenbewerbung as $notiz): ?>
+					<tr>
+						<td class="text-center">
+							<?php echo date_format(date_create($notiz->insertamum), 'd.m.Y H:i:s') ?>
+						</td>
+						<td>
+							<?php echo nl2br($notiz->text) ?>
+						</td>
+					</tr>
+				<?php endforeach; ?>
+				</tbody>
+			</table>
+		</div>
+	</div>
+<?php endif; ?>
\ No newline at end of file
diff --git a/application/views/system/infocenter/infocenterDetails.php b/application/views/system/infocenter/infocenterDetails.php
index 299138e5c..07075773f 100644
--- a/application/views/system/infocenter/infocenterDetails.php
+++ b/application/views/system/infocenter/infocenterDetails.php
@@ -37,35 +37,35 @@
 	<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="row<?php if ($lockedbyother) echo ' alert-danger' ?>">
 				<div class="col-lg-8">
-							<h3 class="page-header">
-							Infocenter Details: <?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?>
-							</h3>
+					<h3 class="page-header">
+						Infocenter Details: <?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?>
+					</h3>
 				</div>
 				<div class="col-lg-4">
 					<div class="headerright text-right">
 						wird bearbeitet von:
 						<?php
-							if(isset($lockedby)):
-								echo $lockedby;
-						?>
-						&nbsp;&nbsp;
-						<a href="../unlockPerson/<?php echo $stammdaten->person_id; ?>"><i class="fa fa-sign-out"></i>&nbsp;Freigeben</a>
+						if (isset($lockedby)):
+							echo $lockedby;
+							?>
+							&nbsp;&nbsp;
+							<a href="../unlockPerson/<?php echo $stammdaten->person_id; ?>"><i
+										class="fa fa-sign-out"></i>&nbsp;Freigeben</a>
 						<?php endif; ?>
 					</div>
 				</div>
 			</div>
-			<br />
+			<br/>
 			<section>
 				<div class="row">
 					<div class="col-lg-12">
 						<div class="panel panel-primary">
 							<div class="panel-heading text-center"><h4>Stammdaten</h4></div>
 							<div class="panel-body">
-								<div class="row">
-									<?php $this->load->view('system/infocenter/stammdaten.php'); ?>
-								</div> <!-- ./row -->
+								<?php $this->load->view('system/infocenter/stammdaten.php'); ?>
+								<?php $this->load->view('system/infocenter/anmerkungenZurBewerbung.php'); ?>
 							</div> <!-- ./panel-body -->
 						</div> <!-- ./panel -->
 					</div> <!-- ./main column -->
@@ -109,9 +109,9 @@
 							</div>
 							<div class="panel-body">
 								<div class="row">
-										<?php
-										$this->load->view('system/messageList.php', $messages);
-										?>
+									<?php
+									$this->load->view('system/messageList.php', $messages);
+									?>
 								</div>
 							</div>
 						</div>
@@ -130,10 +130,10 @@
 								<div class="row">
 									<div class="col-lg-6">
 										<div id="addnotiz">
-										<?php $this->load->view('system/infocenter/addNotiz.php'); ?>
+											<?php $this->load->view('system/infocenter/addNotiz.php'); ?>
 										</div>
 										<div id="notizen">
-										<?php $this->load->view('system/infocenter/notizen.php'); ?>
+											<?php $this->load->view('system/infocenter/notizen.php'); ?>
 										</div>
 									</div>
 									<div class="col-lg-6" id="logs">
diff --git a/application/views/system/infocenter/stammdaten.php b/application/views/system/infocenter/stammdaten.php
index 6aae1c9f6..eaf27de0b 100644
--- a/application/views/system/infocenter/stammdaten.php
+++ b/application/views/system/infocenter/stammdaten.php
@@ -1,108 +1,109 @@
-<div class="col-lg-6 table-responsive">
-	<table class="table">
-		<tr>
-			<td><strong>Vorname</strong></td>
-			<td><?php echo $stammdaten->vorname ?></td>
-		</tr>
-		<tr>
-			<td><strong>Nachname</strong></td>
-			<td>
-				<?php echo $stammdaten->nachname ?></td>
-		</tr>
-		<tr>
-			<td><strong>Geburtsdatum</strong></td>
-			<td>
-				<?php echo date_format(date_create($stammdaten->gebdatum), 'd.m.Y') ?></td>
-		</tr>
-		<tr>
-			<td><strong>Sozialversicherungsnr</strong></td>
-			<td>
-				<?php echo $stammdaten->svnr ?></td>
-		</tr>
-		<tr>
-			<td><strong>Staatsb&uuml;rgerschaft</strong></td>
-			<td>
-				<?php echo $stammdaten->staatsbuergerschaft ?></td>
-		</tr>
-		<tr>
-			<td><strong>Geschlecht</strong></td>
-			<td>
-				<?php echo $stammdaten->geschlecht ?></td>
-		</tr>
-		<tr>
-			<td><strong>Geburtsnation</strong></td>
-			<td>
-				<?php echo $stammdaten->geburtsnation ?></td>
-		</tr>
-		<tr>
-			<td><strong>Geburtsort</strong></td>
-			<td><?php echo $stammdaten->gebort ?></td>
-		</tr>
-	</table>
-</div>
-<div class="col-lg-6 table-responsive">
-	<table class="table table-bordered">
-		<thead>
-		<tr>
-			<th colspan="4" class="text-center">Kontakte</th>
-		</tr>
-		<tr>
-			<th class="text-center">Typ</th>
-			<th class="text-center">Kontakt</th>
-			<th class="text-center">Anmerkung</th>
-		</tr>
-		</thead>
-		<tbody>
-		<?php foreach ($stammdaten->kontakte as $kontakt): ?>
-
+<div class="row">
+	<div class="col-lg-6 table-responsive">
+		<table class="table">
 			<tr>
-				<td><?php echo ucfirst($kontakt->kontakttyp); ?></td>
-				<td>
-					<?php if ($kontakt->kontakttyp === 'email'): ?>
-					<a href="mailto:<?php echo $kontakt->kontakt; ?>" target="_top">
-						<?php
-						endif;
-						echo $kontakt->kontakt;
-						if ($kontakt->kontakttyp === 'email'):
-						?>
-					</a>
-				<?php endif; ?>
-				</td>
-				<td><?php echo $kontakt->anmerkung; ?></td>
+				<td><strong>Vorname</strong></td>
+				<td><?php echo $stammdaten->vorname ?></td>
 			</tr>
-		<?php endforeach; ?>
-		<?php foreach ($stammdaten->adressen as $adresse): ?>
 			<tr>
+				<td><strong>Nachname</strong></td>
 				<td>
-					Adresse
-				</td>
-				<td>
-					<?php echo isset($adresse) ? $adresse->strasse.', '.$adresse->plz.' '.$adresse->ort : '' ?>
-				</td>
-				<td>
-					<?php echo ($adresse->heimatadresse === true ? 'Heimatadresse' : '').
-						($adresse->heimatadresse === true && $adresse->rechnungsadresse === true ? ', ' : '').
-						($adresse->rechnungsadresse === true ? 'Rechnungsadresse' : ''); ?>
-				</td>
+					<?php echo $stammdaten->nachname ?></td>
 			</tr>
-		<?php endforeach; ?>
-		</tbody>
-	</table>
-	<div class="row">
-		<div class="col-lg-6">
-			<form id="sendmsgform" method="post" action="<?php echo $messagelink ?>"
-				  target="_blank">
-				<input type="hidden" name="person_id"
-					   value="<?php echo $stammdaten->person_id ?>">
-				<a id="sendmsglink" href="javascript:void(0);"><i
-						class="fa fa-envelope"></i>&nbsp;Nachricht senden</a>
-			</form>
-		</div>
-		<?php if (isset($stammdaten->zugangscode)): ?>
-			<div class="col-lg-6 text-right">
-				<a href="<?php echo base_url('addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode)) ?>"
-					target='_blank'><i class="glyphicon glyphicon-new-window"></i>&nbsp;Zugang Bewerbung</a>
+			<tr>
+				<td><strong>Geburtsdatum</strong></td>
+				<td>
+					<?php echo date_format(date_create($stammdaten->gebdatum), 'd.m.Y') ?></td>
+			</tr>
+			<tr>
+				<td><strong>Sozialversicherungsnr</strong></td>
+				<td>
+					<?php echo $stammdaten->svnr ?></td>
+			</tr>
+			<tr>
+				<td><strong>Staatsb&uuml;rgerschaft</strong></td>
+				<td>
+					<?php echo $stammdaten->staatsbuergerschaft ?></td>
+			</tr>
+			<tr>
+				<td><strong>Geschlecht</strong></td>
+				<td>
+					<?php echo $stammdaten->geschlecht ?></td>
+			</tr>
+			<tr>
+				<td><strong>Geburtsnation</strong></td>
+				<td>
+					<?php echo $stammdaten->geburtsnation ?></td>
+			</tr>
+			<tr>
+				<td><strong>Geburtsort</strong></td>
+				<td><?php echo $stammdaten->gebort ?></td>
+			</tr>
+		</table>
+	</div>
+	<div class="col-lg-6 table-responsive">
+		<table class="table table-bordered">
+			<thead>
+			<tr>
+				<th colspan="4" class="text-center">Kontakte</th>
+			</tr>
+			<tr>
+				<th class="text-center">Typ</th>
+				<th class="text-center">Kontakt</th>
+				<th class="text-center">Anmerkung</th>
+			</tr>
+			</thead>
+			<tbody>
+			<?php foreach ($stammdaten->kontakte as $kontakt): ?>
+				<tr>
+					<td><?php echo ucfirst($kontakt->kontakttyp); ?></td>
+					<td>
+						<?php if ($kontakt->kontakttyp === 'email'): ?>
+						<a href="mailto:<?php echo $kontakt->kontakt; ?>" target="_top">
+							<?php
+							endif;
+							echo $kontakt->kontakt;
+							if ($kontakt->kontakttyp === 'email'):
+							?>
+						</a>
+					<?php endif; ?>
+					</td>
+					<td><?php echo $kontakt->anmerkung; ?></td>
+				</tr>
+			<?php endforeach; ?>
+			<?php foreach ($stammdaten->adressen as $adresse): ?>
+				<tr>
+					<td>
+						Adresse
+					</td>
+					<td>
+						<?php echo isset($adresse) ? $adresse->strasse.', '.$adresse->plz.' '.$adresse->ort : '' ?>
+					</td>
+					<td>
+						<?php echo ($adresse->heimatadresse === true ? 'Heimatadresse' : '').
+							($adresse->heimatadresse === true && $adresse->rechnungsadresse === true ? ', ' : '').
+							($adresse->rechnungsadresse === true ? 'Rechnungsadresse' : ''); ?>
+					</td>
+				</tr>
+			<?php endforeach; ?>
+			</tbody>
+		</table>
+		<div class="row">
+			<div class="col-lg-6">
+				<form id="sendmsgform" method="post" action="<?php echo $messagelink ?>"
+					  target="_blank">
+					<input type="hidden" name="person_id"
+						   value="<?php echo $stammdaten->person_id ?>">
+					<a id="sendmsglink" href="javascript:void(0);"><i
+								class="fa fa-envelope"></i>&nbsp;Nachricht senden</a>
+				</form>
 			</div>
-		<?php endif; ?>
+			<?php if (isset($stammdaten->zugangscode)): ?>
+				<div class="col-lg-6 text-right">
+					<a href="<?php echo base_url('addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode)) ?>"
+					   target='_blank'><i class="glyphicon glyphicon-new-window"></i>&nbsp;Zugang Bewerbung</a>
+				</div>
+			<?php endif; ?>
+		</div>
 	</div>
 </div>
\ No newline at end of file