blackicedbear/FHC-Core
1
0
Fork 0
mirror of https://github.com/FH-Complete/FHC-Core.git synced 2026-07-25 08:34:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into feature-36185/requestAnrechnung_bootstrap3_zu_bootstrap5

Browse Source
This commit is contained in:
Harald Bamberger
2024-10-30 16:45:07 +01:00
parent 25deb0a440 ae80c3415d
commit d4f3fbfc79
263 changed files with 32461 additions and 3354 deletions
Download Patch File Download Diff File Expand all files Collapse all files
application/views/system/infocenter/infocenterDetails.php
+13 -19
View File
@@ -27,7 +27,8 @@
'public/js/infocenter/rueckstellung.js',
'public/js/infocenter/zgvUeberpruefung.js',
'public/js/infocenter/docUeberpruefung.js',
'public/js/infocenter/stammdaten.js'
'public/js/infocenter/stammdaten.js',
'public/js/infocenter/personcheck.js'
),
'phrases' => array(
'infocenter',
@@ -38,6 +39,14 @@
$this->load->view('templates/FHC-Header', $includesArray);
?>
<script>
// Embed PHP data into JS as JSON to access from script files
const viewData = {
checkPerson: <?php echo json_encode(array('unruly' => $unruly, 'duplicate' => $duplicate)); ?>,
};
</script>
<div id="wrapper">
<?php echo $this->widgetlib->widget('NavigationWidget'); ?>
@@ -74,22 +83,8 @@
</div>
</div>
</div>
<?php if (!is_null($duplicated)): ?>
<div class="row alert-warning">
<h3 class="header col-lg-12">
<?php echo $this->p->t('global', 'bewerberVorhanden') . ':'; ?>
</h3>
<div class="text-left col-lg-12">
<?php
foreach ($duplicated as $duplicate)
{
echo 'Person ID: ' . $duplicate->person_id . '<br />';
}
?>
</div>
</div>
<?php endif; ?>
<br/>
<?php $this->load->view('system/infocenter/personCheck.php', array('unruly' => $unruly, 'duplicate' => $duplicate)); ?>
<br/>
<section>
<div class="row">
@@ -201,5 +196,4 @@
</div> <!-- ./wrapper -->
<button id="scrollToTop" title="Go to top"><i class="fa fa-chevron-up"></i></button>
<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
<?php $this->load->view('templates/FHC-Footer', $includesArray); ?>
application/views/system/infocenter/personCheck.php
+34
View File
@@ -0,0 +1,34 @@
<div class="row alert-info" id="unruly" style="display: none;">
<h3 class="header col-lg-12">
<?php echo $this->p->t('infocenter', 'unrulyPersonFound') . ':'; ?>
</h3>
<div class="text-left col-lg-12" id="unrulylist">
<?php
if($unruly) {
foreach ($unruly as $unruled)
{
echo '<p>Person ID: ' . $unruled->person_id . '<p/>';
}
}
?>
</div>
</div>
<div class="row alert-warning" id="duplicate" style="display: none;">
<h3 class="header col-lg-12">
<?php echo $this->p->t('global', 'bewerberVorhanden') . ':'; ?>
</h3>
<div class="text-left col-lg-12" id="duplicatelist">
<?php
if($duplicate) {
foreach ($duplicate as $dupe)
{
echo '<p>Person ID: ' . $dupe->person_id . '<p/>';
}
}
?>
</div>
</div>
application/views/system/logs/testSearch.php
+8 -9
View File
@@ -1,13 +1,12 @@
<?php
$includesArray = array(
'title' => 'Test Search',
'jquery3' => true,
'bootstrap5' => true,
'fontawesome6' => true,
'tablesorter2' => true,
'tabulator5' => true,
'primevue3' => true,
'axios027' => true,
'vue3' => true,
'ajaxlib' => true,
'jqueryui1' => true,
'filtercomponent' => true,
'navigationcomponent' => true,
'phrases' => array(
@@ -17,8 +16,8 @@
'customCSSs' => array(
'public/css/components/verticalsplit.css',
'public/css/components/searchbar.css',
'public/css/components/primevue.css',
),
'customJSs' => array('vendor/axios/axios/axios.min.js'),
'customJSModules' => array('public/js/apps/TestSearch.js')
);
@@ -40,17 +39,17 @@
</div>
<div>
<searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction"></searchbar>
<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunction"></core-searchbar>
<verticalsplit>
<core-verticalsplit>
<template #top>
<searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunctiondummy"></searchbar>
<core-searchbar :searchoptions="searchbaroptions" :searchfunction="searchfunctiondummy"></core-searchbar>
</template>
<template #bottom>
<!-- Filter component -->
<core-filter-cmpt filter-type="LogsViewer" @nw-new-entry="newSideMenuEntryHandler"></core-filter-cmpt>
</template>
</verticalsplit>
</core-verticalsplit>
</div>
</div>