Fix: Hamburger menu styles.

This commit is contained in:
2025-08-07 10:39:04 +01:00
parent 3d2b753b79
commit e87490c3de
62 changed files with 3113 additions and 941 deletions

View File

@@ -1,9 +1,9 @@
-- Clear previous proc
DROP PROCEDURE IF EXISTS p_dog_user_eval;
DROP PROCEDURE IF EXISTS p_dog_calc_user_access;
DROP PROCEDURE IF EXISTS p_dog_user_calc;
DROP PROCEDURE IF EXISTS p_dog_calc_user_access;
DROP PROCEDURE IF EXISTS fetchmetrics.p_dog_user_eval;
DROP PROCEDURE IF EXISTS fetchmetrics.p_dog_calc_user;
DROP PROCEDURE IF EXISTS fetchmetrics.p_dog_user_calc;
DROP PROCEDURE IF EXISTS fetchmetrics.p_dog_calc_user_access;
DELIMITER //
CREATE PROCEDURE fetchmetrics.p_dog_calc_user_access (
@@ -188,6 +188,7 @@ BEGIN
CREATE TEMPORARY TABLE tmp_Calc_User_Access_Calc_User_Access (
id_temp INT PRIMARY KEY AUTO_INCREMENT NOT NULL
, id_user INT
, id_role INT
, id_permission_required INT NOT NULL
, priority_access_level_required INT NOT NULL
, is_super_user BIT
@@ -735,28 +736,48 @@ BEGIN
END IF;
-- Calculated fields
-- Priority Access Level User
WITH User_Access_Level AS (
SELECT
USER.id_user
, MIN(IFNULL(ACCESS_LEVEL.priority, v_priority_access_level_none)) AS priority_access_level
FROM fetchmetrics.DOG_User USER -- tmp_Calc_User_Access_Calc_User_Access t_CALC_USER_ACCESS
LEFT JOIN fetchmetrics.DOG_User_Role_Link USER_ROLE_LINK
ON USER.id_user = USER_ROLE_LINK.id_user
AND USER_ROLE_LINK.active = 1
LEFT JOIN fetchmetrics.DOG_Role_Permission_Link ROLE_PERMISSION_LINK
ON USER_ROLE_LINK.id_role = ROLE_PERMISSION_LINK.id_role
AND ROLE_PERMISSION_LINK.active = 1
LEFT JOIN fetchmetrics.DOG_Access_Level ACCESS_LEVEL
ON ROLE_PERMISSION_LINK.id_access_level = ACCESS_LEVEL.id_access_level
AND ACCESS_LEVEL.active = 1
GROUP BY USER.id_user
)
-- Priority Access Level and Role
WITH
User_Access_Level AS (
SELECT
USER.id_user
, MIN(IFNULL(ACCESS_LEVEL.priority, v_priority_access_level_none)) AS priority_access_level
FROM fetchmetrics.DOG_User USER -- tmp_Calc_User_Access_Calc_User_Access t_CALC_USER_ACCESS
LEFT JOIN fetchmetrics.DOG_User_Role_Link USER_ROLE_LINK
ON USER.id_user = USER_ROLE_LINK.id_user
AND USER_ROLE_LINK.active = 1
LEFT JOIN fetchmetrics.DOG_Role_Permission_Link ROLE_PERMISSION_LINK
ON USER_ROLE_LINK.id_role = ROLE_PERMISSION_LINK.id_role
AND ROLE_PERMISSION_LINK.active = 1
LEFT JOIN fetchmetrics.DOG_Access_Level ACCESS_LEVEL
ON ROLE_PERMISSION_LINK.id_access_level = ACCESS_LEVEL.id_access_level
AND ACCESS_LEVEL.active = 1
GROUP BY USER.id_user
)
, User_Role_And_Access_Level AS (
SELECT
USER_ACCESS_LEVEL.id_user
, USER_ACCESS_LEVEL.priority_access_level
, ROLE_PERMISSION_LINK.id_role
, ROW_NUMBER() OVER (PARTITION BY USER_ACCESS_LEVEL.id_user, USER_ACCESS_LEVEL.priority_access_level) AS index_link_in_user_and_priority_access_level
FROM User_Access_Level USER_ACCESS_LEVEL
LEFT JOIN fetchmetrics.DOG_User_Role_Link USER_ROLE_LINK
ON USER_ACCESS_LEVEL.id_user = USER_ROLE_LINK.id_user
AND USER_ROLE_LINK.active = 1
LEFT JOIN fetchmetrics.DOG_Access_Level ACCESS_LEVEL
ON USER_ACCESS_LEVEL.priority_access_level = ACCESS_LEVEL.priority
AND ACCESS_LEVEL.active = 1
LEFT JOIN fetchmetrics.DOG_Role_Permission_Link ROLE_PERMISSION_LINK
ON ACCESS_LEVEL.id_access_level = ROLE_PERMISSION_LINK.id_access_level
AND USER_ROLE_LINK.id_role = ROLE_PERMISSION_LINK.id_role
AND ROLE_PERMISSION_LINK.active = 1
)
UPDATE tmp_Calc_User_Access_Calc_User_Access t_CALC_USER_ACCESS
INNER JOIN User_Access_Level USER_ACCESS_LEVEL ON t_CALC_USER_ACCESS.id_user = USER_ACCESS_LEVEL.id_user
INNER JOIN User_Role_And_Access_Level USER_ROLE_AND_ACCESS_LEVEL ON t_CALC_USER_ACCESS.id_user = USER_ROLE_AND_ACCESS_LEVEL.id_user
SET
t_CALC_USER_ACCESS.priority_access_level_user = USER_ACCESS_LEVEL.priority_access_level
, t_CALC_USER_ACCESS.has_access = CASE WHEN USER_ACCESS_LEVEL.priority_access_level <= v_priority_access_level_required THEN 1 ELSE 0 END
t_CALC_USER_ACCESS.id_role = USER_ROLE_AND_ACCESS_LEVEL.id_role
, t_CALC_USER_ACCESS.priority_access_level_user = USER_ROLE_AND_ACCESS_LEVEL.priority_access_level
, t_CALC_USER_ACCESS.has_access = CASE WHEN USER_ROLE_AND_ACCESS_LEVEL.priority_access_level <= v_priority_access_level_required THEN 1 ELSE 0 END
;
-- Has access
@@ -791,6 +812,7 @@ BEGIN
INSERT INTO fetchmetrics.DOG_Calc_User_Access_Temp (
guid
, id_user
, id_role
, id_permission_required
, priority_access_level_required
, is_super_user
@@ -806,6 +828,7 @@ BEGIN
SELECT
a_guid
, t_CALC_USER_ACCESS.id_user
, t_CALC_USER_ACCESS.id_role
, t_CALC_USER_ACCESS.id_permission_required
, t_CALC_USER_ACCESS.priority_access_level_required
, t_CALC_USER_ACCESS.is_super_user