Merge remote-tracking branch 'origin/master'

application/controllers/system/Filters.php

@@ -74,25 +74,33 @@ class Filters extends VileSci_Controller
 		$allSelectedFields = $_SESSION[self::SESSION_NAME]['allSelectedFields'];
 		$allColumnsAliases = $_SESSION[self::SESSION_NAME]['allColumnsAliases'];
 
+		$json->selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'];
+		$json->columnsAliases = $_SESSION[self::SESSION_NAME]['columnsAliases'];
+
 		if (isset($selectedFieldsLst) && is_array($selectedFieldsLst))
 		{
-			$json->selectedFields = $_SESSION[self::SESSION_NAME]['selectedFields'] = $selectedFieldsLst;
+			$json->selectedFields = $selectedFieldsLst;
+			$json->columnsAliases = array();
 
 			for ($i = 0; $i < count($json->selectedFields); $i++)
 			{
 				$pos = array_search($json->selectedFields[$i], $allSelectedFields);
 
+				$json->columnsAliases[$i] = $json->selectedFields[$i];
+
 				if ($pos !== false)
 				{
-					$json->columnsAliases[] = $json->selectedFields[$i];
 					if ($allColumnsAliases != null && is_array($allColumnsAliases))
 					{
-						$json->columnsAliases[] = $allColumnsAliases[$pos];
+						$json->columnsAliases[$i] = $allColumnsAliases[$pos];
 					}
 				}
 			}
 		}
 
+		$_SESSION[self::SESSION_NAME]['selectedFields'] = $json->selectedFields;
+		$_SESSION[self::SESSION_NAME]['columnsAliases'] = $json->columnsAliases;
+
 		$this->output->set_content_type('application/json')->set_output(json_encode($json));
 	}
 
@@ -125,10 +133,10 @@ class Filters extends VileSci_Controller
 
 			if ($pos !== false)
 			{
-				$json->selectedFiltersAliases[] = $json->selectedFilters[$i];
+				$json->selectedFiltersAliases[$i] = $json->selectedFilters[$i];
 				if ($json->allColumnsAliases != null && is_array($json->allColumnsAliases))
 				{
-					$json->selectedFiltersAliases[] = $json->allColumnsAliases[$pos];
+					$json->selectedFiltersAliases[$i] = $json->allColumnsAliases[$pos];
 				}
 
 				$json->selectedFiltersMetaData[] = $metaData[$pos];

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
 		);
 

application/libraries/MessageLib.php

@@ -690,7 +690,7 @@ class MessageLib
 
 					// Sending email
 					$sent = $this->ci->maillib->send(
-						$sender,
+						null,
 						$receiverContact,
 						is_null($subject) ? $result->retval[0]->subject : $subject, // if parameter subject is not null, use it!
 						$bodyMsg,

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; ?>

application/views/system/infocenter/infocenterData.php

@@ -1,7 +1,7 @@
 <?php
 
 	$APP = 'infocenter';
-
+	$NOTBEFORE = '2018-03-01 18:00:00';
 	$filterWidgetArray = array(
 		'query' => '
 		SELECT
@@ -12,7 +12,7 @@
 				(
 					SELECT zeitpunkt
 					FROM system.tbl_log
-					WHERE taetigkeit_kurzbz = \'bewerbung\'
+					WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\')
 					AND person_id = p.person_id
 					ORDER BY zeitpunkt DESC
 					LIMIT 1
@@ -20,7 +20,7 @@
 				(
 					SELECT insertvon
 					FROM system.tbl_log
-					WHERE taetigkeit_kurzbz = \'bewerbung\'
+					WHERE taetigkeit_kurzbz IN(\'bewerbung\',\'kommunikation\')
 					AND person_id = p.person_id
 					ORDER BY zeitpunkt DESC
 					LIMIT 1
@@ -36,6 +36,11 @@
 					AND pss.bestaetigtam IS NULL
 					AND ps.person_id = p.person_id
 					AND tbl_studiengang.typ in(\'b\')
+					AND studiensemester_kurzbz IN (
+						SELECT studiensemester_kurzbz
+						FROM public.tbl_studiensemester
+						WHERE ende >= NOW()
+					)
 					ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 					LIMIT 1
 				) AS "Studiensemester",
@@ -46,9 +51,15 @@
 						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 (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
+						AND pss.bestaetigtam IS NULL
 						AND ps.person_id = p.person_id
 						AND tbl_studiengang.typ in(\'b\')
+						AND studiensemester_kurzbz IN (
+							SELECT studiensemester_kurzbz
+							FROM public.tbl_studiensemester
+							WHERE ende >= NOW()
+						)
 					ORDER BY pss.datum DESC, pss.insertamum DESC, pss.ext_id DESC
 					LIMIT 1
 				) AS "SendDate",
@@ -59,28 +70,41 @@
 						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 (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
+						AND pss.bestaetigtam IS NULL
 						AND ps.person_id = p.person_id
 						AND tbl_studiengang.typ in(\'b\')
+						AND studiensemester_kurzbz IN (
+							SELECT studiensemester_kurzbz
+							FROM public.tbl_studiensemester
+							WHERE ende >= NOW()
+						)
 					LIMIT 1
 				) AS "AnzahlAbgeschickt",
 				array_to_string(
 					(
-					SELECT array_agg(tbl_studiengang.kurzbzlang)
+					SELECT array_agg(distinct UPPER(tbl_studiengang.typ || tbl_studiengang.kurzbz))
 					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 (pss.bewerbung_abgeschicktamum IS NOT NULL AND pss.bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\')
+						AND pss.bestaetigtam IS NULL
 						AND ps.person_id = p.person_id
 						AND tbl_studiengang.typ in(\'b\')
+						AND studiensemester_kurzbz IN (
+							SELECT studiensemester_kurzbz
+							FROM public.tbl_studiensemester
+							WHERE ende >= NOW()
+						)
 					LIMIT 1
-					),\',\'
+					),\', \'
 				) AS "StgAbgeschickt",
-				pl.zeitpunkt AS "LockDate"
+				pl.zeitpunkt AS "LockDate",
+				pl.lockuser as "LockUser"
 			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, uid as lockuser FROM system.tbl_person_lock WHERE app = \''.$APP.'\') pl USING(person_id)
 			WHERE
 				EXISTS(
 					SELECT 1
@@ -103,7 +127,7 @@
 							WHERE
 								prestudent_id = tbl_prestudent.prestudent_id
 								AND status_kurzbz = \'Interessent\'
-								AND bestaetigtam IS NULL
+								AND (bestaetigtam IS NULL AND (bewerbung_abgeschicktamum is null OR bewerbung_abgeschicktamum>=\''.$NOTBEFORE.'\'))
 								AND studiensemester_kurzbz IN (
 									SELECT studiensemester_kurzbz
 									FROM public.tbl_studiensemester
@@ -111,12 +135,14 @@
 							)
 					)
 				)
-			ORDER BY "LastAction" DESC
+			ORDER BY "LastAction" ASC
 		',
 		'hideHeader' => false,
 		'hideSave' => false,
 		'checkboxes' => 'PersonId',
 		'additionalColumns' => array('Details'),
+		'columnsAliases' => array('PersonID','Vorname','Nachname','GebDatum','Letzte Aktion','Letzter Bearbeiter',
+			'StSem','GesendetAm','NumAbgeschickt','Studiengänge','Sperrdatum','GesperrtVon'),
 		'formatRaw' => function($datasetRaw) {
 
 			$datasetRaw->{'Details'} = sprintf(
@@ -129,10 +155,18 @@
 			{
 				$datasetRaw->{'SendDate'} = 'Not sent';
 			}
+			else
+			{
+				$datasetRaw->{'SendDate'} = date_format(date_create($datasetRaw->{'SendDate'}),'Y-m-d H:i');
+			}
 
 			if ($datasetRaw->{'LastAction'} == null)
 			{
-				$datasetRaw->{'LastAction'} = 'Not logged';
+				$datasetRaw->{'LastAction'} = '-';
+			}
+			else
+			{
+				$datasetRaw->{'LastAction'} = date_format(date_create($datasetRaw->{'LastAction'}),'Y-m-d H:i');
 			}
 
 			if ($datasetRaw->{'User/Operator'} == '')
@@ -142,7 +176,12 @@
 
 			if ($datasetRaw->{'LockDate'} == null)
 			{
-				$datasetRaw->{'LockDate'} = 'Not locked';
+				$datasetRaw->{'LockDate'} = '-';
+			}
+
+			if ($datasetRaw->{'LockUser'} == null)
+			{
+				$datasetRaw->{'LockUser'} = '-';
 			}
 
 			if ($datasetRaw->{'StgAbgeschickt'} == null)

application/views/system/infocenter/infocenterDetails.php

@@ -10,6 +10,7 @@
 			'tablesorter' => true,
 			'tinymce' => true,
 			'sbadmintemplate' => true,
+			'addons' => true,
 			'customCSSs' =>
 				array(
 					'skin/admintemplate.css',
@@ -37,35 +38,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 +110,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 +131,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">

application/views/system/infocenter/stammdaten.php

@@ -1,108 +1,111 @@
-<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>
-			</div>
-		<?php endif; ?>
+			<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>
+	<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 echo '<span class="'.$kontakt->kontakttyp.'">';?>
+						<?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; ?>
+					<?php echo '</span>'?>
+					</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 if (isset($stammdaten->zugangscode)): ?>
+				<div class="col-lg-6 text-right">
+					<a href="<?php echo CIS_ROOT.'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>

application/views/templates/FHC-Header.php

@@ -15,6 +15,7 @@ $fontawesome = isset($fontawesome) ? $fontawesome : false;
 $tablesorter = isset($tablesorter) ? $tablesorter : false;
 $tinymce = isset($tinymce) ? $tinymce : false;
 $sbadmintemplate = isset($sbadmintemplate) ? $sbadmintemplate : false;
+$addons = isset($addons) ? $addons : false;
 
 /**
  * Print the given title of the page
@@ -76,6 +77,16 @@ function _generateJSsInclude($JSs)
 	}
 }
 
+/**
+ * Generates global JS-Object to pass parms to addon-js-functions
+ */
+function _generateAddonDataStorageObject()
+{
+	echo '<script type="text/javascript">';
+	echo 'var FHC_ADDON_DATA_STORAGE_OBJECT = {app_root:"'.APP_ROOT.'"};';
+	echo "</script>\n";
+}
+
 ?>
 <!-- Header start -->
 <!DOCTYPE HTML>
@@ -142,6 +153,28 @@ function _generateJSsInclude($JSs)
 				_generateJSsInclude('vendor/BlackrockDigital/startbootstrap-sb-admin-2/dist/js/sb-admin-2.min.js');
 			}
 
+			// load addon hooks JS
+			if ($addons === true)
+			{
+				_generateAddonDataStorageObject();
+
+				$aktive_addons = array_filter(explode(";", ACTIVE_ADDONS));
+				$called_from = $this->router->directory.$this->router->class.'/'.$this->router->method;
+				foreach ($aktive_addons as $addon)
+				{
+					$hookfile = DOC_ROOT.'addons/'.$addon.'/hooks.config.inc.php';
+					if (file_exists($hookfile))
+					{
+						include($hookfile);
+						if (key_exists($called_from, $js_hooks))
+						{
+							foreach ($js_hooks[$called_from] as $js_file)
+								_generateJSsInclude('addons/'.$addon.'/'.$js_file);
+						}
+					}
+				}
+			}
+
 			// Eventually required JS
 			_generateJSsInclude($customJSs);
 		?>

application/views/widgets/filter/filter.php

@@ -2,8 +2,8 @@
 
 	.filter-name-title {
 		font-family: inherit;
-		font-size: 20px;
-		font-weight: bold;
+		font-size: 16px;
+		/*font-weight: bold;*/
 		line-height: 1.1;
 		color: black;
 	}

application/views/widgets/filter/selectFields.php

@@ -196,13 +196,16 @@
 					var fieldName = data.allSelectedFields[i];
 					var fieldToDisplay = data.allSelectedFields[i];
 
-					if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
+					if (data.selectedFields.indexOf(fieldName) < 0)
 					{
-						fieldToDisplay = data.allColumnsAliases[i];
-					}
+						if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
+						{
+							fieldToDisplay = data.allColumnsAliases[i];
+						}
 
-					strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
-					$("#addField").append(strDropDown);
+						strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
+						$("#addField").append(strDropDown);
+					}
 				}
 			}
 

application/views/widgets/filter/selectFilters.php

@@ -216,20 +216,6 @@
 				var strDropDown = '<option value="">Select a filter to add...</option>';
 				$("#addFilter").append(strDropDown);
 
-				for (var i = 0; i < data.allSelectedFields.length; i++)
-				{
-					var fieldName = data.allSelectedFields[i];
-					var fieldToDisplay = data.allSelectedFields[i];
-
-					if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
-					{
-						fieldToDisplay = data.allColumnsAliases[i];
-					}
-
-					strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
-					$("#addFilter").append(strDropDown);
-				}
-
 				for (var i = 0; i < data.selectedFilters.length; i++)
 				{
 					var selectedFilters = '<div>';
@@ -253,6 +239,23 @@
 
 					$("#selectedFilters").append(selectedFilters);
 				}
+
+				for (var i = 0; i < data.allSelectedFields.length; i++)
+				{
+					var fieldName = data.allSelectedFields[i];
+					var fieldToDisplay = data.allSelectedFields[i];
+
+					if (data.selectedFilters.indexOf(fieldName) < 0)
+					{
+						if (data.allColumnsAliases != null && $.isArray(data.allColumnsAliases))
+						{
+							fieldToDisplay = data.allColumnsAliases[i];
+						}
+
+						strDropDown = '<option value="' + fieldName + '">' + fieldToDisplay + '</option>';
+						$("#addFilter").append(strDropDown);
+					}
+				}
 			}
 
 			addEventsSFilters();

application/widgets/Vorlage_widget.php

@@ -7,9 +7,9 @@ class Vorlage_widget extends DropdownWidget
 		// All organization units to which the user belongs
 		$oe_kurzbz = $widgetData['oe_kurzbz'];
 		$idAdmin = $widgetData['isAdmin'];
-		
+
 		$vorlage = null;
-		
+
 		// If the user is an admin
 		if ($idAdmin === true)
 		{
@@ -23,17 +23,17 @@ class Vorlage_widget extends DropdownWidget
 			// organisation unit tree
 			$vorlage = $this->_getUserVorlage($oe_kurzbz);
 		}
-		
+
 		$this->setElementsArray(
 			$vorlage,
 			true,
 			'Select a vorlage...',
 			'No vorlage found'
 		);
-		
+
 		$this->loadDropDownView($widgetData);
     }
-    
+
     /**
      * Get all the vorlage with mimetype = text/html
      */
@@ -41,12 +41,12 @@ class Vorlage_widget extends DropdownWidget
     {
 		$this->load->model('system/Vorlage_model', 'VorlageModel');
 		$this->VorlageModel->addOrder('vorlage_kurzbz');
-		
+
 		$this->addSelectToModel($this->VorlageModel, 'vorlage_kurzbz', 'bezeichnung');
-		
+
 		return $this->VorlageModel->loadWhere(array('mimetype' => 'text/html'));
     }
-    
+
     /**
      * Get all the vorlage that belongs to the organisation units of the user
      * and the parents of those organisation units until the root of the
@@ -56,9 +56,9 @@ class Vorlage_widget extends DropdownWidget
     {
 		// Loads library OrganisationseinheitLib
         $this->load->library('OrganisationseinheitLib');
-        
+
 		$vorlage = success(array()); // Default value
-		
+
 		$table = '(
 					SELECT v.vorlage_kurzbz, v.bezeichnung, vs.version, vs.oe_kurzbz, vs.aktiv, vs.subject, vs.text, v.mimetype
 					FROM tbl_vorlagestudiengang vs INNER JOIN tbl_vorlage v USING(vorlage_kurzbz)
@@ -70,7 +70,7 @@ class Vorlage_widget extends DropdownWidget
 				AND templates.text IS NOT NULL
 				AND templates.mimetype = \'text/html\'';
 		$order_by = 'description ASC';
-		
+
 		if (!is_array($oe_kurzbz))
 		{
 			$vorlage = $this->organisationseinheitlib->treeSearchEntire(
@@ -95,14 +95,20 @@ class Vorlage_widget extends DropdownWidget
 					$order_by,
 					$val
 				);
-				
+
 				// Everything is ok and data are inside
 				if (hasData($tmpVorlage))
 				{
 					// If it's the first vorlage copy it
 					if (count($vorlage->retval) == 0)
 					{
-						$vorlage->retval = $tmpVorlage->retval;
+						for ($j = 0; $j < count($tmpVorlage->retval); $j++)
+						{
+							if ($tmpVorlage->retval[$j]->id != '')
+							{
+								array_push($vorlage->retval, $tmpVorlage->retval[$j]);
+							}
+						}
 					}
 					else // checks for duplicates, if it's not already present push it into the array $vorlage->retval
 					{
@@ -110,7 +116,8 @@ class Vorlage_widget extends DropdownWidget
 						{
 							for ($j = 0; $j < count($tmpVorlage->retval); $j++)
 							{
-								if ($vorlage->retval[$i]->_pk != $tmpVorlage->retval[$j]->_pk
+								if ($tmpVorlage->retval[$j]->id != ''
+									&& $vorlage->retval[$i]->_pk != $tmpVorlage->retval[$j]->_pk
 									&& $vorlage->retval[$i]->_ppk != $tmpVorlage->retval[$j]->_ppk
 									&& $vorlage->retval[$i]->_jtpk != $tmpVorlage->retval[$j]->_jtpk)
 								{
@@ -122,7 +129,7 @@ class Vorlage_widget extends DropdownWidget
 				}
 			}
 		}
-		
+
 		return $vorlage;
-    }
+	}
 }