From 2780ec5636a9612ac994f304285f1edc90d3290c Mon Sep 17 00:00:00 2001
From: cgfhtw <christopher.gerbrich@technikum-wien.at>
Date: Fri, 5 May 2023 14:27:33 +0200
Subject: [PATCH] Dashboard Admin Demo

---
 .../controllers/dashboard/DashboardDemo.php   |  8 +++++
 .../libraries/dashboard/DashboardLib.php      |  2 ++
 .../views/dashboard/dashboard_demo_admin.php  | 32 +++++++++++++++++++
 public/js/apps/Dashboard.js                   |  4 ---
 public/js/apps/{Test.js => DashboardAdmin.js} |  7 +---
 system/dbupdate_3.4/dbupdate_dashboard.php    |  2 ++
 6 files changed, 45 insertions(+), 10 deletions(-)
 create mode 100644 application/views/dashboard/dashboard_demo_admin.php
 rename public/js/apps/{Test.js => DashboardAdmin.js} (58%)

diff --git a/application/controllers/dashboard/DashboardDemo.php b/application/controllers/dashboard/DashboardDemo.php
index 9822fafc5..90eb017b8 100644
--- a/application/controllers/dashboard/DashboardDemo.php
+++ b/application/controllers/dashboard/DashboardDemo.php
@@ -17,6 +17,7 @@ class DashboardDemo extends Auth_Controller
         parent::__construct(
             array(
                 'index' => 'user:r',
+                'admin' => 'dashboard/admin:rw'
             )
         );
 
@@ -35,6 +36,13 @@ class DashboardDemo extends Auth_Controller
 		$this->load->view('dashboard/dashboard_demo.php', []);
 	}
 
+    // -----------------------------------------------------------------------------------------------------------------
+    // Public methods
+    public function admin()
+    {
+        $this->load->view('dashboard/dashboard_demo_admin.php', []);
+    }
+
     // -----------------------------------------------------------------------------------------------------------------
     // Private methods
 
diff --git a/application/libraries/dashboard/DashboardLib.php b/application/libraries/dashboard/DashboardLib.php
index 1c503c25c..edea7c310 100644
--- a/application/libraries/dashboard/DashboardLib.php
+++ b/application/libraries/dashboard/DashboardLib.php
@@ -114,6 +114,8 @@ class DashboardLib
 	
 	public function getPresetOrCreateEmptyPreset($dashboard_kurzbz, $funktion_kurzbz)
 	{
+		if ($funktion_kurzbz === self::SECTION_IF_FUNKTION_KURZBZ_IS_NULL)
+			$funktion_kurzbz = null;
 		$preset = $this->getPreset($dashboard_kurzbz, $funktion_kurzbz);
 		if (null !== $preset) {
 			return $preset;
diff --git a/application/views/dashboard/dashboard_demo_admin.php b/application/views/dashboard/dashboard_demo_admin.php
new file mode 100644
index 000000000..0d92146a8
--- /dev/null
+++ b/application/views/dashboard/dashboard_demo_admin.php
@@ -0,0 +1,32 @@
+<?php
+$this->load->view(
+	'templates/FHC-Header',
+	array(
+		'title' => 'FH-Complete',
+		'bootstrap5' => true,
+		'fontawesome6' => true,
+		'axios027' => true,
+		'restclient' => true,
+		'vue3' => true,
+		'customJSModules' => ['public/js/apps/DashboardAdmin.js'],
+		'customCSSs' => [
+			'public/css/components/dashboard.css'
+		],
+		'navigationcomponent' => true
+	)
+);
+?>
+
+	<div id="main">
+
+		<core-navigation-cmpt :add-side-menu-entries="appSideMenuEntries"></core-navigation-cmpt>
+
+		<div id="content">
+			<div class="d-flex justify-content-between flex-wrap flex-md-nowrap align-items-center pt-3 pb-2 mb-3 border-bottom">
+				<h1 class="h2">Dashboard</h1>
+			</div>
+			<dashboard-admin dashboard="CIS" apiurl="<?= site_url('dashboard'); ?>"></dashboard-admin>
+		</div>
+	</div>
+
+<?php $this->load->view('templates/FHC-Footer'); ?>
diff --git a/public/js/apps/Dashboard.js b/public/js/apps/Dashboard.js
index 54a73441c..e56425a6d 100644
--- a/public/js/apps/Dashboard.js
+++ b/public/js/apps/Dashboard.js
@@ -8,9 +8,5 @@ Vue.createApp({
   components: {
     CoreNavigationCmpt,
     CoreDashboard
-    /*,
-    "CoreFilterCmpt": CoreFilterCmpt,
-    "verticalsplit": verticalsplit,
-    "searchbar": searchbar*/
   }
 }).mount('#main');
diff --git a/public/js/apps/Test.js b/public/js/apps/DashboardAdmin.js
similarity index 58%
rename from public/js/apps/Test.js
rename to public/js/apps/DashboardAdmin.js
index cdf3e78f3..fed16f577 100644
--- a/public/js/apps/Test.js
+++ b/public/js/apps/DashboardAdmin.js
@@ -1,5 +1,4 @@
 import {CoreNavigationCmpt} from '../components/navigation/Navigation.js';
-import CoreDashboard from '../components/Dashboard/Dashboard.js';
 import DashboardAdmin from '../components/Dashboard/Admin.js';
 
 Vue.createApp({
@@ -8,11 +7,7 @@ Vue.createApp({
     }),
   components: {
     CoreNavigationCmpt,
-    DashboardAdmin,
-    CoreDashboard/*,
-    "CoreFilterCmpt": CoreFilterCmpt,
-    "verticalsplit": verticalsplit,
-    "searchbar": searchbar*/
+    DashboardAdmin
   },
   mounted() {
   }
diff --git a/system/dbupdate_3.4/dbupdate_dashboard.php b/system/dbupdate_3.4/dbupdate_dashboard.php
index 22c2ef4cf..e1e611e4e 100644
--- a/system/dbupdate_3.4/dbupdate_dashboard.php
+++ b/system/dbupdate_3.4/dbupdate_dashboard.php
@@ -399,6 +399,7 @@ GRANT ALL ON SEQUENCE dashboard.tbl_dashboard_preset_preset_id_seq TO vilesci;
 --
 
 GRANT SELECT ON TABLE dashboard.tbl_dashboard_widget TO web;
+GRANT SELECT,INSERT,DELETE,UPDATE ON TABLE dashboard.tbl_dashboard_widget TO vilesci;
 
 
 --
@@ -406,6 +407,7 @@ GRANT SELECT ON TABLE dashboard.tbl_dashboard_widget TO web;
 --
 
 GRANT SELECT ON TABLE dashboard.tbl_widget TO web;
+GRANT SELECT,INSERT,UPDATE ON TABLE dashboard.tbl_widget TO vilesci;
 
 
 --