Merge branch 'master' into feature-68737/interne_weiterbildung

application/views/Cis/Login.php

@@ -2,7 +2,8 @@
 	$includesArray = array(
 		'title' => 'FH-Complete',
 		'bootstrap5' => true,
-		'fontawesome6' => true
+		'fontawesome6' => true,
+		'customJSs' => 'public/js/helpers/ColorThemeSetting.js'
 	);
 
 	$this->load->view('templates/FHC-Header', $includesArray);

application/views/Cis/ProfilUpdate.php

@@ -2,10 +2,14 @@
 $includesArray = array(
     'title' => 'Profil Änderungen',
     'vue3' => true,
+	'primevue3' => true,
     'bootstrap5' => true,
     'fontawesome6'=> true,
     'axios027' => true,
     'tabulator5' => true,
+	'customJSs' => array(
+		'vendor/moment/luxonjs/luxon.min.js'
+	),
     'customJSModules' => array(
 	'public/js/apps/Cis/ProfilUpdateRequests.js'
     ),

application/views/CisRouterView/CisRouterView.php

@@ -5,25 +5,32 @@ $includesArray = array(
 	'axios027' => true,
 	'bootstrap5' => true,
 	'fontawesome6' => true,
-	'tabulator5' => true,
+	'tabulator5' => true, // TODO: upgrade to 6 when available
 	'vue3' => true,
 	'primevue3' => true,
+	'skipID' => '#fhccontent',
+	'vuedatepicker11' => true,
 	'customCSSs' => array(
 		'public/css/components/verticalsplit.css',
 		'public/css/components/searchbar/searchbar.css',
 		'public/css/Fhc.css',
 		'public/css/components/dashboard.css',
-		'public/css/components/calendar.css',
+		//'public/css/components/calendar.css', <= imported in dashboard.css
 		'public/css/components/Sprachen.css',
 		'public/css/components/MyLv.css',
 		'public/css/components/FilterComponent.css',
 		'public/css/components/Profil.css',
 		'public/css/components/FormUnderline.css',
 		'public/css/Cis4/Cms.css',
+		'public/css/Cis4/Studium.css',
 	),
 	'customJSs' => array(
-		'vendor/npm-asset/primevue/accordion/accordion.js',
-		'vendor/npm-asset/primevue/accordiontab/accordiontab.js'
+		'vendor/npm-asset/primevue/accordion/accordion.min.js',
+		'vendor/npm-asset/primevue/accordiontab/accordiontab.min.js',
+		'vendor/npm-asset/primevue/inputnumber/inputnumber.min.js',
+		'vendor/npm-asset/primevue/textarea/textarea.min.js',
+		'vendor/npm-asset/primevue/checkbox/checkbox.min.js',
+		'vendor/moment/luxonjs/luxon.min.js'
 	),
 	'customJSModules' => array(
 		'public/js/apps/Dashboard/Fhc.js'
@@ -33,7 +40,7 @@ $includesArray = array(
 
 $this->load->view('templates/CISVUE-Header', $includesArray);
 ?>
-<div id="fhccontent" route=<?php echo $route ?>>
+<div id="fhccontent" class="h-100" route=<?php echo $route ?>>
 	<router-view 
 			:view-data='<?php echo json_encode($viewData) ?>'
 	></router-view>

application/views/LVVerwaltung.php

@@ -0,0 +1,39 @@
+<?php
+	$includesArray = array(
+		'title' => 'LVVerwaltung',
+		'axios027' => true,
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'vue3' => true,
+		'primevue3' => true,
+		'tabulator6' => true,
+		'tinymce5' => true,
+		'tags' => true,
+
+		'customCSSs' => [
+			'public/css/components/vue-datepicker.css',
+			'public/css/components/primevue.css',
+			'public/css/Studentenverwaltung.css',
+			'public/css/Lvverwaltung.css'
+
+		],
+		'customJSModules' => [
+			'public/js/apps/LVVerwaltung.js'
+		]
+	);
+
+	$this->load->view('templates/FHC-Header', $includesArray);
+
+?>
+<div id="main">
+	<router-view
+		default-semester="<?= $variables['semester_aktuell']; ?>"
+		lv-root="<?= site_url('LVVerwaltung'); ?>"
+		:permissions="<?= htmlspecialchars(json_encode($permissions));?>"
+		:config="<?=  htmlspecialchars(json_encode($configs)); ?>"
+	>
+	</router-view>
+
+</div>
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+

application/views/Nachrichten.php

@@ -0,0 +1,52 @@
+<?php
+$includesArray = array(
+	'title' => 'Nachrichten',
+	'axios027' => true,
+	'bootstrap5' => true,
+	'fontawesome6' => true,
+	'vue3' => true,
+	'primevue3' => true,
+	#'filtercomponent' => true,
+	'tabulator5' => true,
+	'tinymce5' => true,
+	'phrases' => array(
+		'global',
+		'ui',
+	),
+	'customCSSs' => [
+		'public/css/components/vue-datepicker.css',
+		'public/css/components/primevue.css',
+	],
+	'customJSs' => [
+		#'vendor/npm-asset/primevue/tree/tree.min.js',
+		#'vendor/npm-asset/primevue/toast/toast.min.js'
+	],
+	'customJSModules' => [
+		'public/js/apps/Nachrichten.js'
+	]
+);
+
+$this->load->view('templates/FHC-Header', $includesArray);
+?>
+
+<?php
+$configArray = [
+	'domain' => !defined('DOMAIN') ? 'notDefined' : DOMAIN,
+];
+?>
+
+<div id="main">
+	<router-view
+		cis-root="<?= CIS_ROOT; ?>"
+		:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
+		:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
+<?php if($ids !== null && $typeid !== null) { ?>
+		:id ="<?= htmlspecialchars(json_encode($ids)); ?>"
+		type-id ="<?= htmlspecialchars($typeid); ?>"
+<?php } ?>
+	>
+	</router-view>
+</div>
+
+<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
+

application/views/Studentenverwaltung.php

@@ -15,11 +15,15 @@
 			'notiz',
 		),
 		'customCSSs' => [
+			#datepicker fuer component functions
 			'public/css/components/vue-datepicker.css',
 			'public/css/components/primevue.css',
-			'public/css/Studentenverwaltung.css'
+			'public/css/Studentenverwaltung.css',
+			'public/css/components/function.css'
 		],
 		'customJSs' => [
+			'vendor/vuejs/vuedatepicker_js/vue-datepicker.iife.js',
+			'vendor/moment/luxonjs/luxon.min.js'
 			#'vendor/npm-asset/primevue/tree/tree.min.js',
 			#'vendor/npm-asset/primevue/toast/toast.min.js'
 		],
@@ -37,7 +41,10 @@ $configArray = [
 	//replaced by possibility to hide each formular field via config stv.php
 	#'showZgvDoktor' => !defined('ZGV_DOKTOR_ANZEIGEN') ? false : ZGV_DOKTOR_ANZEIGEN,
 	#'showZgvErfuellt' => !defined('ZGV_ERFUELLT_ANZEIGEN') ? false : ZGV_ERFUELLT_ANZEIGEN
-	'showHintKommPrfg' => !defined('FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT') ? false : FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT
+	'showHintKommPrfg' => !defined('FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT') ? false : FAS_STUDSTATUS_SHOW_KOMM_PRFG_HINT,
+	'showAufnahmegruppen' => !defined('FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN') ? false : FAS_REIHUNGSTEST_AUFNAHMEGRUPPEN,
+	'allowUebernahmePunkte' => !defined('FAS_REIHUNGSTEST_PUNKTEUEBERNAHME') ? true : FAS_REIHUNGSTEST_PUNKTEUEBERNAHME,
+	'useReihungstestPunkte' => !defined('FAS_REIHUNGSTEST_PUNKTE') ? true : FAS_REIHUNGSTEST_PUNKTE,
 ];
 ?>
 
@@ -47,6 +54,8 @@ $configArray = [
 			active-addons="<?= defined('ACTIVE_ADDONS') ? ACTIVE_ADDONS : ''; ?>"
 			stv-root="<?= site_url('Studentenverwaltung'); ?>"
 			cis-root="<?= CIS_ROOT; ?>"
+			avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
+			logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 			:permissions="<?= htmlspecialchars(json_encode($permissions)); ?>"
 			:config="<?=  htmlspecialchars(json_encode($configArray)); ?>"
 			>

application/views/codex/uhstat1.php

@@ -26,7 +26,7 @@ $vater_bildungsstaat = isset($uhstatData->vater_bildungsstaat) ? $uhstatData->va
 $vater_bildungmax = isset($uhstatData->vater_bildungmax) ? $uhstatData->vater_bildungmax : set_value('vater_bildungmax');
 $readOnly = isset($formMetaData['readOnly']);
 $disabled = $readOnly ? ' disabled' : '';
-$editPermission = isset($formMetaData['editPermission']) && $formMetaData['editPermission'] === true;
+$savePermission = isset($formMetaData['savePermission']) && $formMetaData['savePermission'] === true;
 $deletePermission = isset($formMetaData['deletePermission']) && $formMetaData['deletePermission'] === true;
 $saved = isset($saved) && $saved === true;
 ?>
@@ -51,7 +51,7 @@ $saved = isset($saved) && $saved === true;
 			<?php echo $this->p->t('uhstat', 'uhstat1EinleitungSvnrtext') ?>
 		</p>
 		<br>
-		<?php if ($editPermission): ?>
+		<?php if ($savePermission): ?>
 			<?php if (isset($successMessage) && !isEmptyString($successMessage)): ?>
 				<div class="alert alert-success" id="uhstat_success_alert">
 					<button type="button" class="close" data-dismiss="alert">x</button>
@@ -288,7 +288,7 @@ $saved = isset($saved) && $saved === true;
 					</div>
 				</div>
 			</fieldset>
-			<?php if ($editPermission && !$readOnly): ?>
+			<?php if ($savePermission && !$readOnly): ?>
 				<br>
 				<fieldset>
 					<div class="form-group">

application/views/lehre/anrechnung/requestAnrechnungImportant.php

@@ -9,7 +9,6 @@
 
                         <i class="me-2 fa fa-lg fa-info-circle" aria-hidden="true"></i>&ensp;
 						<?php echo $this->p->t('anrechnung', 'requestAnrechnungInfoFristenTitle'); ?>
-
                     </div>
                 </div>
             </h2>
@@ -80,4 +79,4 @@
             </div>
         </div>
 	<?php endif; ?>
-</div>
+</div>

application/views/system/infocenter/anmerkungenZurBewerbung.php

@@ -18,6 +18,9 @@
 							<?php (!isset($notiz->kurzbzlang)) ?: print_r('(' . nl2br($notiz->kurzbzlang) . ') - ') ?>
 							<?php echo nl2br($notiz->text) ?>
 						</td>
+						<td>
+							<a href="mailto:<?php echo htmlspecialchars($notiz->email)?>?body=<?php echo rawurlencode($notiz->text);; ?>"><i class="fa fa-envelope"></i></a>
+						</td>
 					</tr>
 				<?php endforeach; ?>
 				</tbody>

application/views/system/infocenter/infocenterDetails.php

@@ -57,7 +57,7 @@
 				<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 ?>
+							Infocenter Details: <a target="_blank" title="Studentenverwaltung" href="<?php echo site_url('/Studentenverwaltung/' . $studiensemester . '/person/' . $stammdaten->person_id) ?>"><?php echo $stammdaten->vorname.' '.$stammdaten->nachname ?> <i class="fa fa-external-link" style="font-size:small"></i></a>
 						</h3>
 					</div>
 					<div class="col-lg-4">

application/views/system/infocenter/onboarding.php

@@ -0,0 +1,47 @@
+<?php
+	$this->load->view(
+		'templates/FHC-Header',
+		array(
+			'title' => 'Info Center',
+			'jquery3' => true,
+			'jqueryui1' => true,
+			'jquerycheckboxes1' => true,
+			'bootstrap3' => true,
+			'fontawesome4' => true,
+			'sbadmintemplate3' => true,
+			'tablesorter2' => true,
+			'ajaxlib' => true,
+			'filterwidget' => true,
+			'navigationwidget' => true,
+			'dialoglib' => true,
+			'phrases' => array(
+				'person' => array('vorname', 'nachname'),
+				'ui' => array('bitteEintragWaehlen')
+			),
+			'customCSSs' => array('public/css/sbadmin2/tablesort_bootstrap.css', 'public/css/infocenter/infocenterPersonDataset.css'),
+			'customJSs' => array('public/js/bootstrapper.js', 'public/js/infocenter/rueckstellung.js', 'public/js/infocenter/infocenterPersonDataset.js')
+		)
+	);
+?>
+
+	<div id="wrapper">
+
+		<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
+
+		<div id="page-wrapper">
+			<div class="container-fluid">
+				<div class="row">
+					<div class="col-lg-12">
+						<h3 class="page-header">
+							Electronic Onboarding
+						</h3>
+					</div>
+				</div>
+				<div>
+					<?php $this->load->view('system/infocenter/onboardingData.php'); ?>
+				</div>
+			</div>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>

application/views/system/infocenter/onboardingData.php

@@ -0,0 +1,116 @@
+<?php
+
+	$APP = '\'infocenter\'';
+	$KENNZEICHEN = '\'eobRegistrierungsId\'';
+
+$query = '
+		SELECT
+			p.person_id AS "PersonId",
+			p.vorname AS "Vorname",
+			p.nachname AS "Nachname",
+			pl.zeitpunkt AS "LockDate",
+			pl.lockuser AS "LockUser",
+			rueck.datum_bis AS "HoldDate",
+			rueck.bezeichnung AS "Rueckstellgrund"
+		FROM public.tbl_person p
+			JOIN tbl_kennzeichen ON p.person_id = tbl_kennzeichen.person_id AND kennzeichentyp_kurzbz = '. $KENNZEICHEN .'
+			LEFT JOIN (
+					SELECT tpl.person_id,
+						   tpl.zeitpunkt,
+						   sp.nachname AS lockuser
+					  FROM system.tbl_person_lock tpl
+					  JOIN public.tbl_benutzer sb USING (uid)
+					  JOIN public.tbl_person sp ON sb.person_id = sp.person_id
+					 WHERE tpl.app = '.$APP.'
+				 ) pl ON p.person_id = pl.person_id
+			LEFT JOIN (
+				SELECT
+					tbl_rueckstellung.person_id,
+					tbl_rueckstellung.datum_bis,
+					tbl_rueckstellung.status_kurzbz,
+					array_to_json(bezeichnung_mehrsprachig::varchar[])->>0 as bezeichnung
+				FROM public.tbl_rueckstellung
+					JOIN public.tbl_rueckstellung_status USING(status_kurzbz)
+					JOIN public.tbl_person sp ON tbl_rueckstellung.person_id = sp.person_id
+				WHERE tbl_rueckstellung.rueckstellung_id =
+				(
+					SELECT srueck.rueckstellung_id
+					FROM public.tbl_rueckstellung srueck
+					WHERE srueck.person_id = tbl_rueckstellung.person_id
+						AND datum_bis >= NOW()
+					ORDER BY srueck.datum_bis DESC LIMIT 1
+				)
+			) rueck ON rueck.person_id = p.person_id
+		WHERE p.person_id NOT IN (SELECT person_id FROM public.tbl_prestudent)';
+
+	$filterWidgetArray = array(
+		'query' => $query,
+		'app' => InfoCenter::APP,
+		'datasetName' => 'onboarding',
+		'filter_id' => $this->input->get('filter_id'),
+		'requiredPermissions' => 'infocenter',
+		'datasetRepresentation' => 'tablesorter',
+		'checkboxes' => 'PersonId',
+		'additionalColumns' => array('Details'),
+		'columnsAliases' => array(
+			'PersonId',
+			ucfirst($this->p->t('person', 'vorname')) ,
+			ucfirst($this->p->t('person', 'nachname')),
+			ucfirst($this->p->t('global', 'sperrdatum')),
+			ucfirst($this->p->t('global', 'gesperrtVon')),
+			ucfirst($this->p->t('infocenter', 'rueckstelldatum')),
+			ucfirst($this->p->t('infocenter', 'rueckstellgrund')),
+		),
+
+		'formatRow' => function($datasetRaw) {
+			/* NOTE: Dont use $this here for PHP Version compatibility */
+			$datasetRaw->{'Details'} = sprintf(
+				'<a href="%s?person_id=%s&origin_page=%s&fhc_controller_id=%s&prev_filter_id=%s">Details</a>',
+				site_url('system/infocenter/InfoCenter/showDetails'),
+				$datasetRaw->{'PersonId'},
+				'onboarding',
+				(isset($_GET['fhc_controller_id']) ? $_GET['fhc_controller_id'] : ''),
+				(isset($_GET['filter_id']) ? $_GET['filter_id'] : '')
+			);
+
+			if ($datasetRaw->{'LockDate'} == null)
+			{
+				$datasetRaw->{'LockDate'} = '-';
+			}
+
+			if ($datasetRaw->{'LockUser'} == null)
+			{
+				$datasetRaw->{'LockUser'} = '-';
+			}
+
+			if ($datasetRaw->{'HoldDate'} == null)
+			{
+				$datasetRaw->{'HoldDate'} = '-';
+			}
+			else
+			{
+				$datasetRaw->{'HoldDate'} = date_format(date_create($datasetRaw->{'HoldDate'}), 'Y-m-d H:i');
+			}
+
+			if ($datasetRaw->{'Rueckstellgrund'} === null)
+			{
+				$datasetRaw->{'Rueckstellgrund'} = '-';
+			}
+
+			return $datasetRaw;
+		},
+
+		'markRow' => function($datasetRaw) {
+
+			if ($datasetRaw->LockDate != null)
+			{
+				return FilterWidget::DEFAULT_MARK_ROW_CLASS;
+			}
+		}
+
+
+
+	);
+
+	echo $this->widgetlib->widget('FilterWidget', $filterWidgetArray);
+?>

application/views/system/infocenter/stammdaten.php

@@ -32,12 +32,6 @@
 					<div class='stammdaten' id="gebdatum"><?php echo date_format(date_create($stammdaten->gebdatum), 'd.m.Y') ?></div>
 				</td>
 			</tr>
-			<tr>
-				<td><strong><?php echo  ucfirst($this->p->t('person','svnr')) ?></strong></td>
-				<td>
-					<div class='stammdaten' id="svnr"><?php echo $stammdaten->svnr ?></div>
-				</td>
-			</tr>
 			<tr>
 				<td><strong><?php echo  ucfirst($this->p->t('person','staatsbuergerschaft')) ?></strong></td>
 				<td>
@@ -112,6 +106,7 @@
 			<tbody>
 			<?php
 			$lastMailAdress = '';
+			$lastUnverifiedMailAdress = '';
 			foreach ($stammdaten->kontakte as $kontakt): ?>
 				<tr>
 				<?php if ($kontakt->kontakttyp === 'email'): ?>
@@ -125,14 +120,16 @@
 						<?php echo '<span class="kontakt '.$kontakt->kontakttyp.'" data-id="'. $kontakt->kontakt_id .'" data-value="' . $kontakt->kontakt .'">';?>
 						<?php if ($kontakt->kontakttyp === 'email'): ?>
 							<a href="mailto:<?php echo $kontakt->kontakt; ?>" target="_top">
-							<?php $lastMailAdress = $kontakt->kontakt;
+							<?php $lastMailAdress = $kontakt->kontakt; ?>
+						<?php elseif ($kontakt->kontakttyp === 'email_unverifiziert'): ?>
+							<?php $lastUnverifiedMailAdress = $kontakt->kontakt;
 							endif;
 							echo $kontakt->kontakt;
-							if ($kontakt->kontakttyp === 'email'):
+						if ($kontakt->kontakttyp === 'email'):
 							?>
 							</a>
-							<?php endif; ?>
-					<?php echo '</span>'?>
+						<?php endif; ?>
+						<?php echo '</span>'?>
 					</td>
 					<td><?php echo $kontakt->anmerkung; ?></td>
 				</tr>
@@ -146,9 +143,9 @@
 						<?php if (isset($adresse)): ?>
 							<div class="row adresse col-sm-12" data-id="<?php echo $adresse->adresse_id ?>">
 								<div class="float-left" data-value="<?php echo $adresse->strasse ?>" data-type="strasse"><?php echo $adresse->strasse ?></div>
-								
+
 								<div class="float-left" data-value="<?php echo $adresse->plz ?>" data-type="plz"><?php echo $adresse->plz ?></div>
-								
+
 								<div class="float-left" data-value="<?php echo $adresse->ort ?>" data-type="ort"><?php echo $adresse->ort ?></div>
 
 							<?php if (isset($adresse->nationkurztext)): ?>
@@ -188,7 +185,8 @@
 			</div>
 			<?php if (isset($stammdaten->zugangscode)): ?>
 				<div class="col-xs-6 text-right">
-					<a href="<?php echo CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode).'&emailAdresse='.$lastMailAdress ?>"
+					<a href="<?php echo CIS_ROOT.'addons/bewerbung/cis/registration.php?code='.html_escape($stammdaten->zugangscode)
+					.'&emailAdresse='.(isEmptyString($lastMailAdress)?$lastUnverifiedMailAdress:$lastMailAdress).'&keepEmailUnverified=true' ?>"
 					   target='_blank'><i class="glyphicon glyphicon-new-window"></i>&nbsp;<?php echo  $this->p->t('infocenter','zugangBewerbung') ?></a>
 				</div>
 			<?php endif; ?>

application/views/templates/CISVUE-Header.php

@@ -1,4 +1,5 @@
 <?php
+$this->load->config('theme');
 $includesArray = array(
 	'title' => $title ?? 'FH-Complete',
 	'vue3' => true,
@@ -10,7 +11,8 @@ $includesArray = array(
 		'public/js/apps/Cis.js'
 	], $customJSModules ?? []),
 	'customCSSs' => array_merge([
-		'public/css/Cis4/Cis.css'
+		'public/css/Cis4/Cis.css',
+		$this->config->item('theme_css'),
 	], $customCSSs ?? [])
 );
 
@@ -26,7 +28,7 @@ $this->load->view('templates/FHC-Header', $includesArray);
 <header id="cis-header" class="navbar-dark">
 	<cis-menu 
 		root-url="<?= site_url(''); ?>" 
-		logo-url="<?= base_url('/public/images/logo-300x160.png'); ?>" 
+		logo-url="<?= base_url($this->config->item('theme_logo')); ?>" 
 		avatar-url="<?= site_url('Cis/Pub/bild/person/' . getAuthPersonId()); ?>" 
 		logout-url="<?= site_url('Cis/Auth/logout'); ?>"
 		:searchbaroptions="searchbaroptions" 

application/views/templates/FHC-Common.php

@@ -29,6 +29,7 @@
 	$tinymce5 = isset($tinymce5) ? $tinymce5 : false;
 	$vue3 = isset($vue3) ? $vue3 : false;
 	$primevue3 = isset($primevue3) ? $primevue3 : false;
+	$vuedatepicker11 = isset($vuedatepicker11) ? $vuedatepicker11 : false;
 
 	// Hooks
 	$addons = isset($addons) ? $addons : false;

application/views/templates/FHC-Footer.php

@@ -158,6 +158,8 @@
 		generateJSsInclude('vendor/npm-asset/primevue/tieredmenu/tieredmenu.min.js');
 	}
 
+	if($vuedatepicker11) generateJSsInclude('vendor/vuejs/vuedatepicker_js11/vue-datepicker.iife.js');
+	
 	// --------------------------------------------------------------------------------------------------------
 	// From public folder
 
@@ -187,11 +189,13 @@
 
 	// User Defined Fields
 	if ($udfs === true) generateJSsInclude('public/js/UDFWidget.js');
-
+	
 	// Load addon hooks JS
 	// NOTE: keep it as the last but one
 	if ($addons === true) generateAddonsJSsInclude($calledPath.'/'.$calledMethod);
 
+	
+	
 	// Eventually required JS
 	// NOTE: keep it as the latest
 	generateJSsInclude($customJSs);

application/views/templates/FHC-Header.php

@@ -9,12 +9,14 @@
 	$title = isset($title) ? $title : null;
 	$refresh = isset($refresh) ? $refresh : null;
 	$customCSSs = isset($customCSSs) ? $customCSSs : null;
+	$skipID = isset($skipID) ? $skipID : null;
 ?>
 <!-- Header start -->
 
 <!DOCTYPE HTML>
 <html>
 	<head>
+
 		<title><?php printPageTitle($title); ?></title>
 
 		<meta name="viewport" content="width=device-width, initial-scale=1">
@@ -95,7 +97,12 @@
 				generateCSSsInclude('vendor/npm-asset/primeicons/primeicons.css');
 			}
 
-			// --------------------------------------------------------------------------------------------------------
+			if ($vuedatepicker11 === true)
+			{
+				generateCSSsInclude('vendor/vuejs/vuedatepicker_css11/main.css');
+			}
+			
+		// --------------------------------------------------------------------------------------------------------
 			// From public folder
 
 			// AjaxLib CSS
@@ -131,5 +138,7 @@
 	</head>
 	<body>
 
+		<?php if($skipID) generateSkipLink($skipID); ?>
+
 <!-- Header end -->