diff --git a/application/controllers/Cis/MyLv.php b/application/controllers/Cis/MyLv.php
index 49a938553..819d56b05 100644
--- a/application/controllers/Cis/MyLv.php
+++ b/application/controllers/Cis/MyLv.php
@@ -33,9 +33,4 @@ class MyLv extends Auth_Controller
$this->load->view('CisRouterView/CisRouterView.php', ['viewData' => $viewData, 'route' => 'MyLv']);
}
-
- public function Info($studien_semester,$lvid)
- {
- $this->load->view('Cis/LvInfo',['lvid'=> $lvid, 'studien_semester' => $studien_semester]);
- }
}
diff --git a/application/helpers/hlp_header_helper.php b/application/helpers/hlp_header_helper.php
index 41d40ca0d..27dfba5a1 100644
--- a/application/helpers/hlp_header_helper.php
+++ b/application/helpers/hlp_header_helper.php
@@ -269,3 +269,199 @@ function absoluteJsImportUrl($relurl)
}
return $url;
}
+
+/*
+ * Manipulate CI views includes Array to load
+ * - public/js/FhcApps.js via customJSs and
+ * - app customisation js and/or css from extensions via customJSModules
+ * if customJSModules contains at least one vuejs app and customisation files
+ * exist in extensions
+ */
+class ExtendableAppsHelper
+{
+ private static $instance = null;
+
+ protected $extensions;
+
+ protected $customCSSs;
+ protected $customJSs;
+ protected $customJSModules;
+
+ protected $initialised;
+ protected $appscount;
+
+ protected $extCustomCSSs;
+ protected $extCustomJSs;
+ protected $extCustomJSModules;
+
+ private function __construct()
+ {
+ $this->extensions = array();
+ $this->customCSSs = null;
+ $this->customJSs = null;
+ $this->customJSModules = null;
+
+ $this->initialised = false;
+ $this->appscount = 0;
+
+ $this->extCustomCSSs = null;
+ $this->extCustomJSs = null;
+ $this->extCustomJSModules = null;
+ }
+
+ public static function getInstance()
+ {
+ if(self::$instance === null)
+ {
+ self::$instance = new ExtendableAppsHelper();
+ }
+ return self::$instance;
+ }
+
+ public function init($customCSSs, $customJSs, $customJSModules)
+ {
+ if($this->initialised)
+ {
+ return;
+ }
+
+ $this->customCSSs = $customCSSs;
+ $this->customJSs = $customJSs;
+ $this->customJSModules = $customJSModules;
+ $this->initialised = true;
+
+ if(!isset($this->customJSModules))
+ {
+ return;
+ }
+
+ if(!is_array($this->customJSModules))
+ {
+ $this->customJSModules = array($this->customJSModules);
+ }
+
+ if(count($this->customJSModules) < 1)
+ {
+ return;
+ }
+
+ $this->buildExtensionsList();
+ $this->prepareExtendedArrays();
+ }
+
+ public function getCustomCSSs()
+ {
+ if(is_null($this->extCustomCSSs))
+ {
+ return $this->customCSSs;
+ }
+ return $this->extCustomCSSs;
+ }
+
+ public function getCustomJSs()
+ {
+ if(is_null($this->extCustomJSs))
+ {
+ return $this->customJSs;
+ }
+ return $this->extCustomJSs;
+ }
+
+ public function getCustomJSModules()
+ {
+ if(is_null($this->extCustomJSModules))
+ {
+ return $this->customJSModules;
+ }
+ return $this->extCustomJSModules;
+ }
+
+ protected function buildExtensionsList()
+ {
+ $this->extensions = array();
+ $fsiterator = new FilesystemIterator(FHCPATH . 'application/extensions');
+ foreach ($fsiterator as $fsitem)
+ {
+ if(preg_match('/^FHC-Core-/', $fsitem->getBasename()))
+ {
+ $this->extensions[] = $fsitem->getBasename();
+ }
+ }
+ }
+
+ protected function prepareExtendedArrays()
+ {
+ $this->appscount = 0;
+ $this->initExtCustomCSSs();
+ $this->extCustomJSModules = array();
+ foreach($this->customJSModules as $item)
+ {
+ $matches = array();
+ if(preg_match('#^public/(extensions/FHC-Core-.+)?js/apps/(.*)\.js$#', $item, $matches))
+ {
+ $this->appscount++;
+
+ $fhcextension = $matches[1];
+ $app = $matches[2];
+
+ $extend_js_suffix = 'js/extend_app/' . $fhcextension . $app . '.js';
+ $extend_css_suffix = 'css/extend_app/' . $fhcextension . $app . '.css';
+
+ foreach($this->extensions as $extension)
+ {
+ $extend_js = 'public/extensions/' . $extension . '/' . $extend_js_suffix;
+ $extend_css = 'public/extensions/' . $extension . '/' . $extend_css_suffix;
+
+ if(is_readable(FHCPATH . $extend_js))
+ {
+ array_push($this->extCustomJSModules, $extend_js);
+ }
+
+ if(is_readable(FHCPATH . $extend_css))
+ {
+ array_push($this->extCustomCSSs, $extend_css);
+ }
+ }
+ }
+ array_push($this->extCustomJSModules, $item);
+ }
+
+ if($this->appscount > 0)
+ {
+ $this->addFhcAppsJs();
+ }
+ }
+
+ protected function initExtCustomCSSs()
+ {
+ if(!isset($this->customCSSs))
+ {
+ $this->extCustomCSSs = array();
+ }
+ elseif(!is_array($this->customCSSs))
+ {
+ $this->extCustomCSSs = array($this->customCSSs);
+ }
+ else
+ {
+ $this->extCustomCSSs = $this->customCSSs;
+ }
+ }
+
+ protected function addFhcAppsJs()
+ {
+ if(!isset($this->customJSs))
+ {
+ $this->extCustomJSs = array();
+ }
+ elseif(!is_array($this->customJSs))
+ {
+ $this->extCustomJSs = array($this->customJSs);
+ }
+ else
+ {
+ $this->extCustomJSs = $this->customJSs;
+ }
+ array_push($this->extCustomJSs, 'public/js/FhcApps.js');
+ }
+}
diff --git a/application/views/Cis/LvInfo.php b/application/views/Cis/LvInfo.php
deleted file mode 100644
index 49a7b7a85..000000000
--- a/application/views/Cis/LvInfo.php
+++ /dev/null
@@ -1,15 +0,0 @@
- 'LvInfo',
- 'customJSModules' => ['public/js/apps/Cis/LvInfo.js']
-);
-
-$this->load->view('templates/CISVUE-Header', $includesArray);
-?>
-
-
-
-
-
-
-load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/Cis/Profil.php b/application/views/Cis/Profil.php
deleted file mode 100644
index f66ebf8a9..000000000
--- a/application/views/Cis/Profil.php
+++ /dev/null
@@ -1,18 +0,0 @@
- 'Profil',
- 'customJSModules' => ['public/js/apps/Cis/Profil.js'],
- 'tabulator5' => true,
- 'primevue3' => true,
- 'customCSSs' => ['public/css/components/calendar.css', 'public/css/components/FilterComponent.css','public/css/components/Profil.css','public/css/components/FormUnderline.css'],
-
-);
-
-$this->load->view('templates/CISVUE-Header', $includesArray);
-?>
-
-
-
-
-
-load->view('templates/CISVUE-Footer', $includesArray); ?>
diff --git a/application/views/templates/FHC-Footer.php b/application/views/templates/FHC-Footer.php
index c816ebf2e..d2eb229f1 100644
--- a/application/views/templates/FHC-Footer.php
+++ b/application/views/templates/FHC-Footer.php
@@ -17,6 +17,7 @@
$use_vuejs_dev_version = $this->config->item('use_vuejs_dev_version');
// By default set the parameters to null
+ $customCSSs = isset($customCSSs) ? $customCSSs : null;
$customJSs = isset($customJSs) ? $customJSs : null;
$customJSModules = isset($customJSModules) ? $customJSModules : null;
@@ -191,12 +192,13 @@
// NOTE: keep it as the last but one
if ($addons === true) generateAddonsJSsInclude($calledPath.'/'.$calledMethod);
-
-
+ $extapphelper = ExtendableAppsHelper::getInstance();
+ $extapphelper->init($customCSSs, $customJSs, $customJSModules);
+
// Eventually required JS
// NOTE: keep it as the latest
- generateJSsInclude($customJSs);
- generateJSModulesInclude($customJSModules);
+ generateJSsInclude($extapphelper->getCustomJSs());
+ generateJSModulesInclude($extapphelper->getCustomJSModules());
?>