admin/dog_training
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Feat(SQL, UI): Logic for Get-Many SQL Stored Procedures refactored to use Calc Stored Procedures and Dog Command Links page styling improved.

Browse Source
This commit is contained in:
Teddy Middleton-Smith
2025-07-01 21:21:51 +01:00
parent caeb13429a
commit 0d1e644e6c
102 changed files with 6971 additions and 1797 deletions
Download Patch File Download Diff File Expand all files Collapse all files

110
static/MySQL/70516_p_dog_get_many_user.sql
View File

@@ -18,7 +18,7 @@ CREATE PROCEDURE p_dog_get_many_user (
BEGIN
DECLARE v_id_access_level_admin INT;
DECLARE v_id_access_level_view INT;
DECLARE v_id_permission_store_admin INT;
DECLARE v_id_permission_dog_admin INT;
DECLARE v_id_permission_user INT;
DECLARE v_id_permission_user_admin INT;
DECLARE v_ids_permission_required VARCHAR(4000);
@@ -34,14 +34,14 @@ BEGIN
SET v_time_start := CURRENT_TIMESTAMP(6);
SET v_guid := UUID();
SET v_id_access_level_admin := (SELECT id_access_level FROM demo.Shop_Access_Level WHERE code = 'ADMIN' LIMIT 1);
SET v_id_access_level_view := (SELECT id_access_level FROM demo.Shop_Access_Level WHERE code = 'VIEW' LIMIT 1);
SET v_id_permission_store_admin := (SELECT id_permission FROM demo.Shop_Permission WHERE code = 'STORE_ADMIN' LIMIT 1);
SET v_id_permission_user := (SELECT id_permission FROM demo.Shop_Permission WHERE code = 'STORE_USER' LIMIT 1);
SET v_id_permission_user_admin := (SELECT id_permission FROM demo.Shop_Permission WHERE code = 'STORE_USER_ADMIN' LIMIT 1);
SET v_code_error_bad_data := (SELECT code FROM demo.Shop_Msg_Error_Type WHERE code = 'BAD_DATA' LIMIT 1);
SET v_id_type_error_bad_data := (SELECT id_type FROM demo.Shop_Msg_Error_Type WHERE code = v_code_error_bad_data LIMIT 1);
SET v_ids_permission_required := CONCAT(v_id_permission_user, ',', v_id_permission_user_admin, ',', v_id_permission_store_admin);
SET v_id_access_level_admin := (SELECT id_access_level FROM parts.Shop_Access_Level WHERE code = 'ADMIN' LIMIT 1);
SET v_id_access_level_view := (SELECT id_access_level FROM parts.Shop_Access_Level WHERE code = 'VIEW' LIMIT 1);
SET v_id_permission_dog_admin := (SELECT id_permission FROM parts.Shop_Permission WHERE code = 'DOG_ADMIN' LIMIT 1);
SET v_id_permission_user := (SELECT id_permission FROM parts.Shop_Permission WHERE code = 'USER_VIEW' LIMIT 1);
SET v_id_permission_user_admin := (SELECT id_permission FROM parts.Shop_Permission WHERE code = 'USER_ADMIN' LIMIT 1);
SET v_code_error_bad_data := (SELECT code FROM parts.Shop_Msg_Error_Type WHERE code = 'BAD_DATA' LIMIT 1);
SET v_id_type_error_bad_data := (SELECT id_type FROM parts.Shop_Msg_Error_Type WHERE code = v_code_error_bad_data LIMIT 1);
SET v_ids_permission_required := CONCAT(v_id_permission_user, ',', v_id_permission_user_admin, ',', v_id_permission_dog_admin);
SET v_is_new := FALSE;
SET a_get_all_user := IFNULL(a_get_all_user, 1);
@@ -70,7 +70,7 @@ BEGIN
CREATE TEMPORARY TABLE tmp_User (
id_user INT NULL
, rank_user INT NULL
, can_admin_store BIT NULL
, can_admin_dog BIT NULL
, can_admin_user BIT NULL
);
@@ -88,12 +88,12 @@ BEGIN
);
IF ISNULL(a_id_user) AND NOT ISNULL(a_id_user_auth0) THEN
SET a_id_user := (SELECT U.id_user FROM demo.Shop_User U WHERE U.id_user_auth0 = a_id_user_auth0 LIMIT 1); -- LIKE CONCAT('%', a_id_user_auth0, '%') LIMIT 1);
SET a_id_user := (SELECT U.id_user FROM parts.Shop_User U WHERE U.id_user_auth0 = a_id_user_auth0 LIMIT 1); -- LIKE CONCAT('%', a_id_user_auth0, '%') LIMIT 1);
END IF;
IF ISNULL(a_id_user) THEN
IF NOT ISNULL(a_id_user_auth0) THEN
INSERT INTO demo.Shop_User (
INSERT INTO parts.Shop_User (
id_user_auth0
, is_super_user
, active
@@ -104,7 +104,7 @@ BEGIN
, 1 -- active
)
;
SET a_id_user := (SELECT U.id_user FROM demo.Shop_User U WHERE U.id_user_auth0 = a_id_user_auth0 LIMIT 1);
SET a_id_user := (SELECT U.id_user FROM parts.Shop_User U WHERE U.id_user_auth0 = a_id_user_auth0 LIMIT 1);
SET v_is_new := TRUE;
ELSE
INSERT INTO tmp_Msg_Error (
@@ -133,7 +133,7 @@ BEGIN
-- User IDs
IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user = 1) THEN
CALL demo.p_split(v_guid, a_ids_user, ',', FALSE);
CALL parts.p_core_split(v_guid, a_ids_user, ',', FALSE);
DELETE FROM tmp_Split;
@@ -144,21 +144,21 @@ BEGIN
SELECT
substring
, CONVERT(substring, DECIMAL(10,0)) AS as_int
FROM demo.Split_Temp
FROM parts.Split_Temp
WHERE 1=1
AND GUID = v_guid
AND NOT ISNULL(substring)
AND substring != ''
;
CALL demo.p_clear_split_temp( v_guid );
CALL parts.p_core_clear_split( v_guid );
END IF;
IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user = 1) THEN
IF EXISTS (
SELECT *
FROM tmp_Split t_S
LEFT JOIN demo.Shop_User U ON t_S.as_int = U.id_user
LEFT JOIN parts.Shop_User U ON t_S.as_int = U.id_user
WHERE
ISNULL(t_S.as_int)
OR ISNULL(U.id_user)
@@ -175,7 +175,7 @@ BEGIN
v_code_error_bad_data,
CONCAT('Invalid or inactive User IDs: ', IFNULL(GROUP_CONCAT(t_S.substring SEPARATOR ', '), 'NULL'))
FROM tmp_Split t_S
LEFT JOIN demo.Shop_User U ON t_S.as_int = U.id_user
LEFT JOIN parts.Shop_User U ON t_S.as_int = U.id_user
WHERE
ISNULL(t_S.as_int)
OR ISNULL(U.id_user)
@@ -189,7 +189,7 @@ BEGIN
U.id_user
, RANK() OVER (ORDER BY U.id_user DESC) AS rank_user
FROM tmp_Split t_S
RIGHT JOIN demo.Shop_User U ON t_S.as_int = U.id_user
RIGHT JOIN parts.Shop_User U ON t_S.as_int = U.id_user
WHERE
(
a_get_all_user = 1
@@ -208,7 +208,7 @@ BEGIN
-- Auth0 User IDs
IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user_auth0 = 1) THEN
CALL demo.p_split(v_guid, a_ids_user_auth0, ',', FALSE);
CALL parts.p_core_split(v_guid, a_ids_user_auth0, ',', FALSE);
DELETE FROM tmp_Split;
@@ -217,21 +217,21 @@ BEGIN
)
SELECT
substring
FROM demo.Split_Temp
FROM parts.Split_Temp
WHERE 1=1
AND GUID = v_guid
AND NOT ISNULL(substring)
AND substring != ''
;
CALL demo.p_clear_split_temp( v_guid );
CALL parts.p_core_clear_split( v_guid );
END IF;
IF (NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) AND v_has_filter_user_auth0 = 1) THEN
IF EXISTS (
SELECT *
FROM tmp_Split t_S
LEFT JOIN demo.Shop_User U ON t_S.substring = U.id_user_auth0
LEFT JOIN parts.Shop_User U ON t_S.substring = U.id_user_auth0
WHERE
ISNULL(t_S.substring)
OR ISNULL(U.id_user_auth0)
@@ -248,7 +248,7 @@ BEGIN
v_code_error_bad_data,
CONCAT('Invalid or inactive Auth0 User IDs: ', IFNULL(GROUP_CONCAT(t_S.substring SEPARATOR ', '), 'NULL'))
FROM tmp_Split t_S
LEFT JOIN demo.Shop_User U ON t_S.substring = U.id_user_auth0
LEFT JOIN parts.Shop_User U ON t_S.substring = U.id_user_auth0
WHERE
ISNULL(t_S.substring)
OR ISNULL(U.id_user_auth0)
@@ -264,7 +264,7 @@ BEGIN
U.id_user
, v_rank_max + (RANK() OVER (ORDER BY U.id_user DESC)) AS rank_user
FROM tmp_Split t_S
RIGHT JOIN demo.Shop_User U ON t_S.substring = U.id_user_auth0
RIGHT JOIN parts.Shop_User U ON t_S.substring = U.id_user_auth0
WHERE
(
a_get_all_user = 1
@@ -300,43 +300,43 @@ BEGIN
SELECT * FROM tmp_User;
END IF;
-- Can admin store
-- Can admin dog
IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN
IF a_debug = 1 THEN
SELECT
v_guid -- guid
, a_id_user -- ids_user
, FALSE -- get_inactive_user
, v_id_permission_store_admin -- ids_permission
, v_id_permission_dog_admin -- ids_permission
, v_id_access_level_admin -- ids_access_level
, '' -- ids_product
, 0 -- a_debug
;
SELECT * FROM demo.Shop_Calc_User_Temp;
SELECT * FROM parts.Shop_Calc_User_Temp;
END IF;
CALL demo.p_shop_calc_user(
CALL parts.p_dog_calc_user(
v_guid -- guid
, a_id_user -- ids_user
, FALSE -- get_inactive_user
, v_id_permission_store_admin -- ids_permission
, v_id_permission_dog_admin -- ids_permission
, v_id_access_level_admin -- ids_access_level
, '' -- ids_product
, 0 -- a_debug
);
IF a_debug = 1 THEN
SELECT * FROM demo.Shop_Calc_User_Temp WHERE GUID = v_guid;
SELECT * FROM parts.Shop_Calc_User_Temp WHERE GUID = v_guid;
END IF;
UPDATE tmp_User t_U
INNER JOIN demo.Shop_Calc_User_Temp CUT
INNER JOIN parts.Shop_Calc_User_Temp CUT
ON CUT.GUID = v_guid
AND t_U.id_user = CUT.id_user
SET t_U.can_admin_store = CUT.can_admin
SET t_U.can_admin_dog = CUT.can_admin
;
CALL demo.p_shop_clear_calc_user( v_guid, FALSE );
CALL parts.p_dog_clear_calc_user( v_guid, FALSE );
END IF;
-- Can admin user
@@ -351,10 +351,10 @@ BEGIN
, '' -- ids_product
, 0 -- a_debug
;
SELECT * FROM demo.Shop_Calc_User_Temp;
SELECT * FROM parts.Shop_Calc_User_Temp;
END IF;
CALL demo.p_shop_calc_user(
CALL parts.p_dog_calc_user(
v_guid -- guid
, a_id_user -- ids_user
, FALSE -- get_inactive_user
@@ -365,17 +365,17 @@ BEGIN
);
IF a_debug = 1 THEN
SELECT * FROM demo.Shop_Calc_User_Temp WHERE GUID = v_guid;
SELECT * FROM parts.Shop_Calc_User_Temp WHERE GUID = v_guid;
END IF;
UPDATE tmp_User t_U
INNER JOIN demo.Shop_Calc_User_Temp CUT
INNER JOIN parts.Shop_Calc_User_Temp CUT
ON CUT.GUID = v_guid
AND t_U.id_user = CUT.id_user
SET t_U.can_admin_user = CUT.can_admin
;
CALL demo.p_shop_clear_calc_user( v_guid, FALSE );
CALL parts.p_dog_clear_calc_user( v_guid, FALSE );
END IF;
-- Permissions
@@ -390,10 +390,10 @@ BEGIN
, '' -- ids_product
, 0 -- a_debug
;
SELECT * FROM demo.Shop_Calc_User_Temp;
SELECT * FROM parts.Shop_Calc_User_Temp;
END IF;
CALL demo.p_shop_calc_user(
CALL parts.p_dog_calc_user(
v_guid -- guid
, a_id_user -- ids_user
, FALSE -- get_inactive_user
@@ -404,12 +404,12 @@ BEGIN
);
IF a_debug = 1 THEN
SELECT * FROM demo.Shop_Calc_User_Temp WHERE GUID = v_guid;
SELECT * FROM parts.Shop_Calc_User_Temp WHERE GUID = v_guid;
END IF;
IF NOT EXISTS (
SELECT can_view
FROM demo.Shop_Calc_User_Temp CUT
FROM parts.Shop_Calc_User_Temp CUT
WHERE 1=1
AND CUT.GUID = v_guid
AND can_view = 1
@@ -423,9 +423,9 @@ BEGIN
VALUES (
v_id_type_error_bad_data,
v_code_error_bad_data,
-- CONCAT('You do not have view permissions for ', (SELECT name FROM demo.Shop_Permission WHERE id_permission = v_id_permission_user LIMIT 1))
-- CONCAT('You do not have view permissions for ', (SELECT GROUP_CONCAT(name SEPARATOR ', ') FROM demo.Shop_Permission WHERE FIND_IN_SET(v_id_permission_user, id_permission) > 0))
CONCAT('You do not have view permissions for ', (SELECT name FROM demo.Shop_Permission P INNER JOIN demo.Shop_Calc_User_Temp CUT ON P.id_permission = CUT.id_permission_required WHERE GUID = v_guid AND IFNULL(can_view, 0) = 0 LIMIT 1)) -- WHERE IFNULL(CUT.can_view, 0) = 0
-- CONCAT('You do not have view permissions for ', (SELECT name FROM parts.Shop_Permission WHERE id_permission = v_id_permission_user LIMIT 1))
-- CONCAT('You do not have view permissions for ', (SELECT GROUP_CONCAT(name SEPARATOR ', ') FROM parts.Shop_Permission WHERE FIND_IN_SET(v_id_permission_user, id_permission) > 0))
CONCAT('You do not have view permissions for ', (SELECT name FROM parts.Shop_Permission P INNER JOIN parts.Shop_Calc_User_Temp CUT ON P.id_permission = CUT.id_permission_required WHERE GUID = v_guid AND IFNULL(can_view, 0) = 0 LIMIT 1)) -- WHERE IFNULL(CUT.can_view, 0) = 0
)
;
ELSE
@@ -433,7 +433,7 @@ BEGIN
SET a_debug := a_debug;
END IF;
CALL demo.p_shop_clear_calc_user( v_guid, FALSE );
CALL parts.p_dog_clear_calc_user( v_guid, FALSE );
END IF;
@@ -457,11 +457,11 @@ BEGIN
, U.id_region_default
, U.is_included_VAT_default
, U.is_super_user
, t_U.can_admin_store
, t_U.can_admin_dog
, t_U.can_admin_user
, v_is_new AS is_new
FROM tmp_User t_U
INNER JOIN demo.Shop_User U ON t_U.id_user = U.id_user
INNER JOIN parts.Shop_User U ON t_U.id_user = U.id_user
;
# Errors
@@ -472,7 +472,7 @@ BEGIN
MET.name,
MET.description
FROM tmp_Msg_Error t_ME
INNER JOIN demo.Shop_Msg_Error_Type MET
INNER JOIN parts.Shop_Msg_Error_Type MET
ON t_ME.id_type = MET.id_type
;
@@ -486,12 +486,12 @@ BEGIN
DROP TEMPORARY TABLE IF EXISTS tmp_Msg_Error;
/*
DELETE FROM demo.Shop_Calc_User_Temp
DELETE FROM parts.Shop_Calc_User_Temp
WHERE GUID = v_guid;
*/
IF a_debug = 1 THEN
CALL demo.p_debug_timing_reporting ( v_time_start );
CALL parts.p_debug_timing_reporting ( v_time_start );
END IF;
END //
DELIMITER ;
@@ -520,11 +520,11 @@ CALL p_dog_get_many_user (
);*/
/*
select * FROM demo.Shop_Calc_User_Temp;
delete FROM demo.Shop_Calc_User_Temp;
select * FROM parts.Shop_Calc_User_Temp;
delete FROM parts.Shop_Calc_User_Temp;
SELECT *
FROM demo.Shop_USER;
FROM parts.Shop_USER;
CALL p_dog_get_many_user(
NULL -- :a_id_user,