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

Feat(SQL, UI): 1. Dog Command Links page completed with get + set functionality. \n 2. Commands page and Command Categories page completed with get + set functionality.

Browse Source
This commit is contained in:
Teddy Middleton-Smith
2025-07-09 17:42:43 +01:00
parent 660b15cb8f
commit 28158cb0c4
68 changed files with 3302 additions and 3926 deletions
Download Patch File Download Diff File Expand all files Collapse all files

240
static/MySQL/71003_p_dog_save_command.sql
View File

@@ -15,7 +15,7 @@ BEGIN
DECLARE v_can_create BIT;
DECLARE v_code_type_error_bad_data VARCHAR(100);
DECLARE v_id_access_level_admin INT;
DECLARE v_id_access_level_create INT;
DECLARE v_id_access_level_edit INT;
DECLARE v_id_change_set INT;
DECLARE v_id_permission_dog_admin INT;
DECLARE v_id_permission_dog_new INT;
@@ -74,7 +74,8 @@ BEGIN
SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM parts.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
SET v_id_permission_dog_admin := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_ADMIN' LIMIT 1);
SET v_id_permission_dog_new := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_CREATE' LIMIT 1);
SET v_id_access_level_admin := (SELECT PERMISSION.id_permission FROM parts.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_CREATE' LIMIT 1);
SET v_id_access_level_admin := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'ADMIN' LIMIT 1);
SET v_id_access_level_edit := (SELECT ACCESS_LEVEL.id_access_level FROM parts.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'EDIT' LIMIT 1);
CALL parts.p_core_validate_guid ( a_guid );
@@ -118,12 +119,29 @@ BEGIN
SELECT
COMMAND_T.id_command AS id_command
, COMMAND_T.id_command_category AS id_command_category
, COALESCE(COMMAND_T.name, COMMAND.name) AS name
, COALESCE(COMMAND_T.hand_signal_default_description, COMMAND.hand_signal_default_description) AS hand_signal_default_description
, COALESCE(COMMAND_T.can_have_button, COMMAND.can_have_button) AS can_have_button
, COALESCE(COMMAND_T.notes, COMMAND.notes) AS notes
, COALESCE(COMMAND_T.active, COMMAND.active, 1) AS active
, COALESCE(
COMMAND_T.name
, COMMAND.name
) AS name
, COALESCE(
COMMAND_T.hand_signal_default_description
, COMMAND.hand_signal_default_description
) AS hand_signal_default_description
, COALESCE(
COMMAND_T.can_have_button
, COMMAND.can_have_button
) AS can_have_button
, COALESCE(
COMMAND_T.notes
, COMMAND.notes
) AS notes
, COALESCE(
COMMAND_T.active
, COMMAND.active
, 1
) AS active
, CASE WHEN IFNULL(COMMAND_T.id_command, 0) < 1 THEN 1 ELSE 0 END AS is_new
-- , CASE WHEN NOT ISNULL(COMMAND_T.id_command) THEN 1 ELSE 0 END AS does_have_valid_command_id
, COMMAND_T.name_command_category AS name_command_category
FROM parts.DOG_Command_Temp COMMAND_T
@@ -131,35 +149,61 @@ BEGIN
WHERE COMMAND_T.guid = a_guid
;
IF a_debug = 1 THEN
SELECT 'Command_Temp records';
SELECT * FROM tmp_Command;
SELECT COUNT(*) FROM tmp_Command;
END IF;
-- Error names
UPDATE tmp_Command t_COMMAND
SET name_error = COALESCE(t_COMMAND.name, t_COMMAND.notes, t_COMMAND.name_command_category, '(No Command)')
LEFT JOIN parts.DOG_Command_Category COMMAND_CATEGORY ON t_COMMAND.id_command_category = COMMAND_CATEGORY.id_command_category
LEFT JOIN parts.DOG_Command COMMAND ON t_COMMAND.id_command = COMMAND.id_command
SET t_COMMAND.name_error = CONCAT(
COALESCE(COMMAND_CATEGORY.name, t_COMMAND.id_command_category, '(No Command Category)')
, ' - '
, COALESCE(COMMAND.name, t_COMMAND.id_command, '(No Command)')
)
;
IF a_debug = 1 THEN
SELECT 'After set name_error';
SELECT * FROM tmp_Command;
SELECT COUNT(*) FROM tmp_Command;
END IF;
-- Find missing id_command_category by name_command_category
UPDATE tmp_Command t_COMMAND
INNER JOIN parts.DOG_Command_Category COMMAND_CATEGORY ON t_COMMAND.name_command_category = COMMAND_CATEGORY.name
SET t_COMMAND.id_command_category = COMMAND_CATEGORY.id_command_category
WHERE t_COMMAND.id_command_category IS NULL
WHERE
t_COMMAND.id_command_category IS NULL
AND COMMAND_CATEGORY.id_command_category IS NOT NULL
;
IF EXISTS (
SELECT *
FROM tmp_Command t_COMMAND
WHERE ISNULL(t_COMMAND.id_command_category)
LIMIT 1
) THEN
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
SELECT
v_id_type_error_bad_data
, v_code_type_error_bad_data
, CONCAT('The following Command(s) do not have a Category: ', GROUP_CONCAT(t_COMMAND.name_error SEPARATOR ', ')) AS msg
FROM tmp_Command t_COMMAND
WHERE t_COMMAND.id_command_category IS NULL
;
IF a_debug = 1 THEN
SELECT 'After set missing id_command_category from name';
SELECT * FROM tmp_Command;
SELECT COUNT(*) FROM tmp_Command;
END IF;
-- Missing Command Ids
UPDATE tmp_Command t_COMMAND
LEFT JOIN parts.DOG_Command COMMAND
ON t_COMMAND.id_command_category = COMMAND.id_command_category
AND t_COMMAND.name = COMMAND.name
SET
t_COMMAND.id_command = COMMAND.id_command
, t_COMMAND.is_new = 0
WHERE
IFNULL(t_COMMAND.id_command, 0) < 1
AND NOT ISNULL(COMMAND.id_command)
;
IF a_debug = 1 THEN
SELECT 'After set missing id_command';
SELECT * FROM tmp_Command;
SELECT COUNT(*) FROM tmp_Command;
END IF;
-- Validation
@@ -211,6 +255,7 @@ BEGIN
END IF;
-- Permissions
-- Can Create
IF a_debug = 1 THEN
SELECT
a_guid
@@ -224,46 +269,13 @@ BEGIN
, 1 -- a_require_any_id_search_filters_met
, 0 -- a_require_all_non_id_search_filters_met
, 0 -- a_require_any_non_id_search_filters_met
, v_id_permission_dog_admin -- ids_permission
, v_id_access_level_admin -- ids_access_level
, v_id_permission_dog_new -- ids_permission
, v_id_access_level_edit -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
;
END IF;
-- Can Admin
CALL parts.p_dog_calc_user(
a_guid
, 0 -- get_all_user
, 0 -- get_inactive_user
, a_id_user -- ids_user
, '' -- a_auth0_ids_user
, '' -- a_names_user
, '' -- a_emails_user
, 1 -- a_require_all_id_search_filters_met
, 1 -- a_require_any_id_search_filters_met
, 0 -- a_require_all_non_id_search_filters_met
, 0 -- a_require_any_non_id_search_filters_met
, v_id_permission_dog_admin -- ids_permission
, v_id_access_level_admin -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
);
SELECT
IFNULL(CU_T.has_access, 0)
INTO
v_can_admin
FROM parts.DOG_Calc_User_Temp CU_T
WHERE CU_T.GUID = a_guid
LIMIT 1
;
CALL parts.p_dog_clear_calc_user(
a_guid
, 0 -- a_debug
);
-- Can Create
CALL parts.p_dog_calc_user(
a_guid
, 0 -- get_all_user
@@ -277,7 +289,7 @@ BEGIN
, 0 -- a_require_all_non_id_search_filters_met
, 0 -- a_require_any_non_id_search_filters_met
, v_id_permission_dog_new -- ids_permission
, v_id_access_level_create -- ids_access_level
, v_id_access_level_edit -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
);
@@ -296,7 +308,7 @@ BEGIN
, 0 -- a_debug
);
IF (v_can_create = 0 AND EXISTS(SELECT * FROM tmp_Command WHERE is_new = 1)) THEN
IF (v_can_create = 0) THEN
DELETE t_ME
FROM tmp_Msg_Error t_ME
WHERE t_ME.id_type <> v_id_type_error_no_permission
@@ -309,25 +321,7 @@ BEGIN
VALUES (
v_id_type_error_no_permission
, v_code_type_error_no_permission
, 'You do not have permission to create new Commands.'
)
;
END IF;
IF (v_can_admin = 0 AND EXISTS(SELECT * FROM tmp_Command WHERE is_new = 0)) THEN
DELETE t_ME
FROM tmp_Msg_Error t_ME
WHERE t_ME.id_type <> v_id_type_error_no_permission
;
INSERT INTO tmp_Msg_Error (
id_type
, code
, msg
)
VALUES (
v_id_type_error_no_permission
, v_code_type_error_no_permission
, 'You do not have permission to admin Commands.'
, 'You do not have permission to edit new Commands.'
)
;
END IF;
@@ -439,29 +433,60 @@ DELIMITER ;
/*
select
*
-- COUNT(*)
-- delete
from parts.DOG_Command_Temp
;
select COUNT(*)
from parts.DOG_Command_Temp
;
select
*
-- COUNT(*)
-- delete
from parts.DOG_Command_Temp
;
select COUNT(*)
from parts.DOG_Command_Temp
;
select
*
-- COUNT(*)
-- delete
from parts.DOG_Command
*/
DELETE FROM demo.DOG_Command_Temp;
SELECT *
/*
CC.name
, C.name
*/
FROM parts.DOG_Command C
INNER JOIN parts.DOG_Command_Category CC ON C.id_command_category = CC.id_command_category
ORDER BY CC.name, C.name
;
select COUNT(*)
from parts.DOG_Command
;
INSERT INTO parts.DOG_Command_Temp (
id_command
, id_command_category
, name
, hand_signal_default_description
, can_have_button
, notes
, active
, guid
)
VALUES (
-1 -- id_command
, 1 -- id_command_category
, 'Bathing' -- name
, 'Burp and juice' -- hand_signal_default_description
, 1 -- can_have_category
, 'Sweet' -- notes
, 1 -- active
, 'ripplesipplenippletippledipplekipple'
);
CALL parts.p_dog_save_command (
'nipples'
'ripplesipplenippletippledipplekipple'
, (SELECT GUID FROM parts.DOG_Command_Temp COMMAND_TEMP ORDER BY id_temp DESC LIMIT 1)
, 1
, 1
@@ -477,14 +502,15 @@ from parts.DOG_Command_Temp
select COUNT(*)
from parts.DOG_Command_Temp
;
select
*
-- COUNT(*)
-- delete
from parts.DOG_Command
SELECT *
/*
CC.name
, C.name
*/
FROM parts.DOG_Command C
INNER JOIN parts.DOG_Command_Category CC ON C.id_command_category = CC.id_command_category
ORDER BY CC.name, C.name
;
select COUNT(*)
from parts.DOG_Command
;
*/