From c7c89138339a20e0e25066c3eac7fddd61adb35e Mon Sep 17 00:00:00 2001
From: Cris <hainberg@technikum-wien.at>
Date: Tue, 11 Oct 2022 14:18:39 +0200
Subject: [PATCH] =?UTF-8?q?Adapted=20Dashboard=20DB=20Update:=20Berechtigu?=
 =?UTF-8?q?ngen=20erg=C3=A4nzt=20/=20Typspezifikation=20entfernt.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

. Berechtigungen ergänzt:
  - dashboard/benutzer
  - dashboard/admin

. Typspezifikation entfernt in Create Sequence
  - war nicht mit PHPSQL 9.6.2 kompatibel.
---
 system/dashboard/dbupdate_dashboard.php | 41 ++++++++++++++++++++++---
 system/dbupdate_3.3.php                 |  7 ++++-
 2 files changed, 43 insertions(+), 5 deletions(-)

diff --git a/system/dashboard/dbupdate_dashboard.php b/system/dashboard/dbupdate_dashboard.php
index 3e73de3b9..a8ef842e1 100644
--- a/system/dashboard/dbupdate_dashboard.php
+++ b/system/dashboard/dbupdate_dashboard.php
@@ -72,7 +72,6 @@ ALTER TABLE dashboard.tbl_dashboard_benutzer_override OWNER TO fhcomplete;
 --
 
 CREATE SEQUENCE dashboard.tbl_dashboard_benutzer_override_override_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -94,7 +93,6 @@ ALTER SEQUENCE dashboard.tbl_dashboard_benutzer_override_override_id_seq OWNED B
 --
 
 CREATE SEQUENCE dashboard.tbl_dashboard_dashboard_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -130,7 +128,6 @@ ALTER TABLE dashboard.tbl_dashboard_preset OWNER TO fhcomplete;
 --
 
 CREATE SEQUENCE dashboard.tbl_dashboard_preset_preset_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -177,7 +174,6 @@ ALTER TABLE dashboard.tbl_widget OWNER TO fhcomplete;
 --
 
 CREATE SEQUENCE dashboard.tbl_widget_widget_id_seq
-    AS integer
     START WITH 1
     INCREMENT BY 1
     NO MINVALUE
@@ -427,3 +423,40 @@ EODASHBOARDSQL;
 		}
 	}
 }
+
+// Add permission: dashboard/admin
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'dashboard/admin';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('dashboard/admin', 'Adminberechtigung');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'system.tbl_berechtigung: Added permission for dashboard/admin<br>';
+        }
+    }
+}
+
+// Add permission: dashboard/benutzer
+if($result = @$db->db_query("SELECT 1 FROM system.tbl_berechtigung WHERE berechtigung_kurzbz = 'dashboard/benutzer';"))
+{
+    if($db->db_num_rows($result) == 0)
+    {
+        $qry = "INSERT INTO system.tbl_berechtigung(berechtigung_kurzbz, beschreibung) VALUES('dashboard/benutzer', 'Benutzerberechtigung');";
+
+        if(!$db->db_query($qry))
+        {
+            echo '<strong>system.tbl_berechtigung '.$db->db_last_error().'</strong><br>';
+        }
+        else
+        {
+            echo 'system.tbl_berechtigung: Added permission for dashboard/benutzer<br>';
+        }
+    }
+}
+
diff --git a/system/dbupdate_3.3.php b/system/dbupdate_3.3.php
index fc5e95b35..190b06a4e 100644
--- a/system/dbupdate_3.3.php
+++ b/system/dbupdate_3.3.php
@@ -6521,7 +6521,7 @@ if($result = @$db->db_query("SELECT * FROM information_schema.role_table_grants
 	}
 }
 
-// add Dashboard Schema and Tables
+// add Dashboard Schema, Tables and Permissions
 include __DIR__ . '/dashboard/dbupdate_dashboard.php';
 
 // *** Pruefung und hinzufuegen der neuen Attribute und Tabellen
@@ -6618,6 +6618,11 @@ $tabellen=array(
 	"campus.tbl_zeitsperretyp"  => array("zeitsperretyp_kurzbz","beschreibung","farbe"),
 	"campus.tbl_zeitwunsch"  => array("stunde","mitarbeiter_uid","tag","gewicht","updateamum","updatevon","insertamum","insertvon", "zeitwunsch_id", "zeitwunsch_gueltigkeit_id"),
 	"campus.tbl_zeitwunsch_gueltigkeit"  => array("zeitwunsch_gueltigkeit_id","mitarbeiter_uid","von","bis","insertamum","insertvon", "updateamum","updatevon"),
+	"dashboard.tbl_dashboard" => array("dashboard_id", "dashboard_kurzbz", "beschreibung"),
+	"dashboard.tbl_dashboard_benutzer_override" => array("override_id", "dashboard_id", "uid", "override"),
+	"dashboard.tbl_dashboard_preset" => array("preset_id", "dashboard_id", "funktion_kurzbz", "preset"),
+	"dashboard.tbl_dashboard_widget" => array("dashboard_id", "widget_id"),
+	"dashboard.tbl_widget" => array("widget_id", "widget_kurzbz", "beschreibung"),
 	"fue.tbl_aktivitaet"  => array("aktivitaet_kurzbz","beschreibung","sort"),
 	"fue.tbl_aufwandstyp" => array("aufwandstyp_kurzbz","bezeichnung"),
 	"fue.tbl_projekt"  => array("projekt_kurzbz","nummer","titel","beschreibung","beginn","ende","oe_kurzbz","budget","farbe","aufwandstyp_kurzbz","ressource_id","anzahl_ma","aufwand_pt","projekt_id","projekttyp_kurzbz","zeitaufzeichnung"),