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

Feat: Assessment page completed with save method combining Assessment, Distraction, Assessment Command Modality Link, and Assessment Response save for creating new complete Assessnent.

Browse Source
This commit is contained in:
Teddy Middleton-Smith
2025-07-28 22:41:38 +01:00
parent 1bbe6f0040
commit 574d60442a
122 changed files with 3261 additions and 1057 deletions
Download Patch File Download Diff File Expand all files Collapse all files

748
static/MySQL/00000_combined.sql
View File

@@ -1,26 +1,24 @@
USE demo;
DROP PROCEDURE IF EXISTS demo.p_ph_save_contact_form;
DROP PROCEDURE IF EXISTS demo.p_dog_save_assessment_distraction_and_response;
DELIMITER //
CREATE PROCEDURE demo.p_ph_save_contact_form (
CREATE PROCEDURE demo.p_dog_save_assessment_distraction_and_response (
IN a_comment VARCHAR(500),
IN a_guid BINARY(36),
IN a_id_user INT,
IN a_debug BIT
)
BEGIN
DECLARE v_code_type_error_bad_data VARCHAR(100);
DECLARE v_id_access_level_view INT;
DECLARE v_id_access_level_edit INT;
DECLARE v_id_change_set INT;
DECLARE v_id_permission_contact_form_admin INT;
DECLARE v_id_permission_contact_form_new INT;
DECLARE v_id_type_error_bad_data INT;
DECLARE v_time_start TIMESTAMP(6);
DECLARE v_can_admin BIT;
DECLARE v_can_create BIT;
DECLARE v_code_type_error_bad_data VARCHAR(100);
DECLARE v_id_access_level_edit INT;
DECLARE v_id_change_set INT;
DECLARE v_id_permission_dog_new INT;
DECLARE v_id_type_error_bad_data INT;
DECLARE v_time_start TIMESTAMP(6);
DECLARE exit handler for SQLEXCEPTION
BEGIN
@@ -32,16 +30,16 @@ BEGIN
ROLLBACK;
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT
, id_type INT NULL
, code VARCHAR(50) NOT NULL
, msg VARCHAR(4000) NOT NULL
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Combined (
id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
, id_type INT
, code VARCHAR(250)
, msg TEXT NOT NULL
);
INSERT INTO tmp_Msg_Error (
INSERT INTO tmp_Msg_Error_Combined (
id_type
, code
, code
, msg
)
SELECT
@@ -51,156 +49,191 @@ BEGIN
FROM demo.CORE_Msg_Error_Type MET
WHERE MET.code = 'MYSQL_ERROR'
;
SELECT *
FROM tmp_Msg_Error;
DROP TABLE IF EXISTS tmp_Msg_Error
SELECT
t_ERROR.id_error
, t_ERROR.id_type
, t_ERROR.code
, ERROR_TYPE.name
, ERROR_TYPE.description
, ERROR_TYPE.is_breaking_error
, ERROR_TYPE.background_colour
, ERROR_TYPE.text_colour
, t_ERROR.msg
FROM tmp_Msg_Error_Combined t_ERROR
INNER JOIN demo.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
;
DROP TABLE IF EXISTS tmp_Msg_Error_Combined;
END;
SET SESSION group_concat_max_len=15000;
SET v_time_start := CURRENT_TIMESTAMP(6);
SET v_code_type_error_bad_data := 'BAD_DATA';
SET v_id_type_error_bad_data := (SELECT id_type FROM demo.CORE_Msg_Error_Type WHERE code = v_code_type_error_bad_data LIMIT 1);
SET v_id_permission_contact_form_admin := (SELECT id_permission FROM demo.DOG_Permission P WHERE P.code = 'CONTACT_FORM_ADMIN' LIMIT 1);
SET v_id_permission_contact_form_new := (SELECT id_permission FROM demo.DOG_Permission P WHERE P.code = 'CONTACT_FORM_CREATE' LIMIT 1);
SET v_id_type_error_bad_data := (SELECT ERROR_TYPE.id_type FROM demo.CORE_Msg_Error_Type ERROR_TYPE WHERE ERROR_TYPE.code = v_code_type_error_bad_data LIMIT 1);
SET v_id_permission_dog_new := (SELECT PERMISSION.id_permission FROM demo.DOG_Permission PERMISSION WHERE PERMISSION.code = 'DOG_CREATE' LIMIT 1);
SET v_id_access_level_edit := (SELECT ACCESS_LEVEL.id_access_level FROM demo.DOG_Access_Level ACCESS_LEVEL WHERE ACCESS_LEVEL.code = 'EDIT' LIMIT 1);
CALL demo.p_core_validate_guid ( a_guid );
DROP TABLE IF EXISTS tmp_Contact_Form;
DROP TABLE IF EXISTS tmp_Assessment_Response_Save_ADR;
DROP TABLE IF EXISTS tmp_Assessment_Command_Modality_Link_Save_ADR;
DROP TABLE IF EXISTS tmp_Distraction_Save_ADR;
DROP TABLE IF EXISTS tmp_Assessment_Save_ADR;
CREATE TEMPORARY TABLE tmp_Contact_Form (
id_contact_form INT NOT NULL
, email VARCHAR(255) NOT NULL
, name_contact VARCHAR(255) NOT NULL
, name_company VARCHAR(255) NOT NULL
, message TEXT NOT NULL
, receive_marketing_communications BIT NOT NULL
, active BIT NOT NULL
, name_error VARCHAR(255)
, is_new BIT NOT NULL
CREATE TEMPORARY TABLE tmp_Assessment_Save_ADR (
id_temp INT
, id_assessment INT
, id_assessment_old INT
, active BIT
, is_new BIT
);
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error (
display_order INT NOT NULL PRIMARY KEY AUTO_INCREMENT
, id_type INT NULL
, code VARCHAR(50) NOT NULL
, msg VARCHAR(4000) NOT NULL
CREATE TEMPORARY TABLE tmp_Distraction_Save_ADR (
id_temp INT
, id_distraction INT
, id_distraction_old INT
, id_assessment INT
, active BIT
, is_new BIT
);
CREATE TEMPORARY TABLE tmp_Assessment_Command_Modality_Link_Save_ADR (
id_temp INT
, id_link INT
, id_link_old INT
, id_assessment INT
, active BIT
, is_new BIT
);
CREATE TEMPORARY TABLE tmp_Assessment_Response_Save_ADR (
id_temp INT
, id_response INT
, id_response_old INT
, id_assessment_command_modality_link INT
, active BIT
, is_new BIT
);
CREATE TEMPORARY TABLE IF NOT EXISTS tmp_Msg_Error_Combined (
id_error INT NOT NULL PRIMARY KEY AUTO_INCREMENT
, id_type INT
, code VARCHAR(250)
, msg TEXT NOT NULL
);
-- Get data from Temp table
INSERT INTO tmp_Contact_Form (
id_contact_form
, email
, name_contact
, name_company
, message
, receive_marketing_communications
INSERT INTO tmp_Assessment_Save_ADR (
id_temp
, id_assessment
, id_assessment_old
, active
, is_new
)
SELECT
CF_T.id_contact_form AS id_contact_form
, IFNULL(CF_T.email, CF.email) AS code
, IFNULL(CF_T.name_contact, CF.name_contact) AS name_contact
, IFNULL(CF_T.name_company, CF.name_company) AS name_company
, IFNULL(CF_T.message, CF.message) AS message
, COALESCE(CF_T.receive_marketing_communications, CF.receive_marketing_communications, 0) AS receive_marketing_communications
, COALESCE(CF_T.active, CF.active, 1) AS active
, CASE WHEN IFNULL(CF_T.id_contact_form, 0) < 1 THEN 1 ELSE 0 END AS is_new
FROM demo.PH_Contact_Form_Temp CF_T
LEFT JOIN demo.PH_Contact_Form CF ON CF_T.id_contact_form = CF.id_contact_form
WHERE CF_T.guid = a_guid
ASSESSMENT_T.id_temp
, ASSESSMENT_T.id_assessment
, ASSESSMENT_T.id_assessment
, COALESCE(
ASSESSMENT_T.active
, ASSESSMENT.active
, 1
) AS active
, CASE WHEN COALESCE(ASSESSMENT_T.id_assessment, 0) < 1 THEN 1 ELSE 0 END AS is_new
FROM demo.DOG_Assessment_Temp ASSESSMENT_T
LEFT JOIN demo.DOG_Assessment ASSESSMENT ON ASSESSMENT_T.id_assessment = ASSESSMENT.id_assessment
WHERE ASSESSMENT_T.guid = a_guid
;
UPDATE tmp_Contact_Form t_CF
SET name_error = COALESCE(t_CF.email, t_CF.name_company, t_CF.name_contact, t_CF.message, '(No Contact Form)')
INSERT INTO tmp_Distraction_Save_ADR (
id_temp
, id_distraction
, id_distraction_old
, id_assessment
, active
, is_new
)
SELECT
DISTRACTION_T.id_temp
, DISTRACTION_T.id_distraction
, DISTRACTION_T.id_distraction
, DISTRACTION_T.id_assessment
, COALESCE(
DISTRACTION_T.active
, DISTRACTION.active
, 1
) AS active
, CASE WHEN COALESCE(DISTRACTION_T.id_distraction, 0) < 1 THEN 1 ELSE 0 END AS is_new
FROM demo.DOG_Distraction_Temp DISTRACTION_T
LEFT JOIN demo.DOG_Distraction DISTRACTION ON DISTRACTION_T.id_distraction = DISTRACTION.id_distraction
WHERE DISTRACTION_T.guid = a_guid
;
-- Validation
-- Missing mandatory fields
-- email
IF EXISTS (SELECT * FROM tmp_Contact_Form t_CF WHERE ISNULL(t_CF.email) 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 Contact Form(s) do not have an Email: ', GROUP_CONCAT(t_CF.name_error SEPARATOR ', ')) AS msg
FROM tmp_Contact_Form t_CF
WHERE ISNULL(t_CF.email)
;
END IF;
-- name_contact
IF EXISTS (SELECT * FROM tmp_Contact_Form t_CF WHERE ISNULL(t_CF.name_contact) 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 Contact Form(s) do not have a Contact Name: ', GROUP_CONCAT(t_CF.name_error SEPARATOR ', ')) AS msg
FROM tmp_Contact_Form t_CF
WHERE ISNULL(t_CF.name_contact)
;
END IF;
-- name_company
IF EXISTS (SELECT * FROM tmp_Contact_Form t_CF WHERE ISNULL(t_CF.name_company) 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 Contact Form(s) do not have a Company Name: ', GROUP_CONCAT(t_CF.name_error SEPARATOR ', ')) AS msg
FROM tmp_Contact_Form t_CF
WHERE ISNULL(t_CF.name)
;
END IF;
-- message
IF EXISTS (SELECT * FROM tmp_Contact_Form t_CF WHERE ISNULL(t_CF.message) 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 Contact Form(s) do not have a Message: ', GROUP_CONCAT(t_CF.name_error SEPARATOR ', ')) AS msg
FROM tmp_Contact_Form t_CF
WHERE ISNULL(t_CF.message)
;
INSERT INTO tmp_Assessment_Command_Modality_Link_Save_ADR (
id_temp
, id_link
, id_link_old
, id_assessment
, active
, is_new
)
SELECT
ASSESSMENT_COMMAND_MODALITY_LINK_T.id_temp
, ASSESSMENT_COMMAND_MODALITY_LINK_T.id_link
, ASSESSMENT_COMMAND_MODALITY_LINK_T.id_link
, ASSESSMENT_COMMAND_MODALITY_LINK_T.id_assessment
, COALESCE(
ASSESSMENT_COMMAND_MODALITY_LINK_T.active
, ASSESSMENT_COMMAND_MODALITY_LINK.active
, 1
) AS active
, CASE WHEN COALESCE(ASSESSMENT_COMMAND_MODALITY_LINK_T.id_link, 0) < 1 THEN 1 ELSE 0 END AS is_new
FROM demo.DOG_Assessment_Command_Modality_Link_Temp ASSESSMENT_COMMAND_MODALITY_LINK_T
LEFT JOIN demo.DOG_Assessment_Command_Modality_Link ASSESSMENT_COMMAND_MODALITY_LINK ON ASSESSMENT_COMMAND_MODALITY_LINK_T.id_link = ASSESSMENT_COMMAND_MODALITY_LINK.id_link
WHERE ASSESSMENT_COMMAND_MODALITY_LINK_T.guid = a_guid
;
INSERT INTO tmp_Assessment_Response_Save_ADR (
id_temp
, id_response
, id_response_old
, id_assessment_command_modality_link
, active
, is_new
)
SELECT
ASSESSMENT_RESPONSE_T.id_temp
, ASSESSMENT_RESPONSE_T.id_response
, ASSESSMENT_RESPONSE_T.id_response
, ASSESSMENT_RESPONSE_T.id_assessment_command_modality_link
, COALESCE(
ASSESSMENT_RESPONSE_T.active
, ASSESSMENT_RESPONSE.active
, 1
) AS active
, CASE WHEN COALESCE(ASSESSMENT_RESPONSE_T.id_response, 0) < 1 THEN 1 ELSE 0 END AS is_new
FROM demo.DOG_Assessment_Response_Temp ASSESSMENT_RESPONSE_T
LEFT JOIN demo.DOG_Assessment_Response ASSESSMENT_RESPONSE ON ASSESSMENT_RESPONSE_T.id_response = ASSESSMENT_RESPONSE.id_response
WHERE ASSESSMENT_RESPONSE_T.guid = a_guid
;
IF a_debug = 1 THEN
SELECT 'Temp records';
SELECT * FROM tmp_Assessment_Save_ADR;
SELECT COUNT(*) FROM tmp_Assessment_Save_ADR;
SELECT * FROM tmp_Distraction_Save_ADR;
SELECT COUNT(*) FROM tmp_Distraction_Save_ADR;
SELECT * FROM tmp_Assessment_Command_Modality_Link_Save_ADR;
SELECT COUNT(*) FROM tmp_Assessment_Command_Modality_Link_Save_ADR;
SELECT * FROM tmp_Assessment_Response_Save_ADR;
SELECT COUNT(*) FROM tmp_Assessment_Response_Save_ADR;
END IF;
-- Permissions
IF a_debug = 1 THEN
SELECT
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_contact_form_admin -- ids_permission
, v_id_access_level_view -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
;
END IF;
-- Can Create
CALL demo.p_dog_calc_user(
a_guid
, 0 -- get_all_user
@@ -213,196 +246,300 @@ 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_contact_form_admin -- ids_permission
, v_id_access_level_view -- 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
);
SELECT
IFNULL(CALC_USER_T.has_access, 0)
INTO
v_can_admin
FROM demo.DOG_Calc_User_Temp CALC_USER_T
WHERE CALC_USER_T.GUID = a_guid
LIMIT 1
;
IF a_debug = 1 THEN
SELECT v_can_admin;
SELECT COUNT(*) AS Count_Errors FROM tmp_Msg_Error t_ERROR;
SELECT * FROM tmp_Msg_Error t_ERROR;
END IF;
CALL demo.p_dog_clear_calc_user(
a_guid
, 0 -- a_debug
);
IF a_debug = 1 THEN
SELECT
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_contact_form_new -- ids_permission
, v_id_access_level_view -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
;
END IF;
CALL demo.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_contact_form_new -- ids_permission
, v_id_access_level_view -- ids_access_level
, 0 -- a_show_errors
, 0 -- a_debug
);
SELECT
IFNULL(CALC_USER_T.has_access, 0)
IFNULL(CU_T.has_access, 0)
INTO
v_can_create
FROM demo.DOG_Calc_User_Temp CALC_USER_T
WHERE CALC_USER_T.GUID = a_guid
FROM demo.DOG_Calc_User_Temp CU_T
WHERE CU_T.GUID = a_guid
LIMIT 1
;
IF a_debug = 1 THEN
SELECT v_can_create;
SELECT COUNT(*) AS Count_Errors FROM tmp_Msg_Error t_ERROR;
SELECT * FROM tmp_Msg_Error t_ERROR;
END IF;
CALL demo.p_dog_clear_calc_user(
a_guid
, 0 -- a_debug
);
IF (v_can_admin = 0 AND EXISTS(SELECT * FROM tmp_Contact_Form WHERE is_new = 0)) THEN
IF v_can_create = 0 THEN
DELETE t_ME
FROM tmp_Msg_Error t_ME
FROM tmp_Msg_Error_Combined t_ME
WHERE t_ME.id_type <> v_id_type_error_no_permission
;
INSERT INTO tmp_Msg_Error (
INSERT INTO tmp_Msg_Error_Combined (
id_type
, code
, code
, msg
)
VALUES (
v_id_type_error_no_permission
, v_code_type_error_no_permission
, 'You do not have permission to admin Contact Forms.'
, v_code_type_error_no_permission
, 'You do not have permission to edit Assessment_Distraction_And_Responses.'
)
;
END IF;
IF EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN
IF a_debug = 1 THEN
SELECT * from tmp_Contact_Form;
END IF;
DELETE FROM tmp_Contact_Form;
END IF;
-- DELETE FROM tmp_Msg_Error_Combined_Save;
-- Save Assessments
-- CREATE TEMPORARY TABLE tmp_Assessment_Save_ADR_Save_Error AS
-- INSERT INTO tmp_Msg_Error_Combined_Save
CALL demo.p_dog_save_assessment (
a_comment
, a_guid
, a_id_user
, 0 -- debug
);
IF NOT EXISTS (SELECT * FROM tmp_Msg_Error LIMIT 1) THEN
START TRANSACTION;
INSERT INTO demo.PH_Contact_Form_Change_Set (
comment
, id_user_updated_last_by
, updated_last_on
)
VALUES (
a_comment
, a_id_user
, v_time_start
)
;
SET v_id_change_set := LAST_INSERT_ID();
UPDATE demo.PH_Contact_Form CF
INNER JOIN tmp_Contact_Form t_CF
ON CF.id_contact_form = t_CF.id_contact_form
AND t_CF.is_new = 0
SET
CF.email = t_CF.email
, CF.name_contact = t_CF.name_contact
, CF.name_company = t_CF.name_company
, CF.message = t_CF.message
, CF.receive_marketing_communications = t_CF.receive_marketing_communications
, CF.active = t_CF.active
, CF.id_change_set = v_id_change_set
;
INSERT INTO demo.PH_Contact_Form (
email
, name_contact
, name_company
, message
, receive_marketing_communications
, active
, id_user_created_by
, created_on
)
SELECT
t_CF.email AS email
, t_CF.name_contact AS name_contact
, t_CF.name_company AS name_company
, t_CF.message AS message
, t_CF.receive_marketing_communications AS receive_marketing_communications
, t_CF.active AS active
, a_id_user AS created_by
, v_time_start AS created_on
FROM tmp_Contact_Form t_CF
WHERE
t_CF.is_new = 1
AND t_CF.active = 1
;
COMMIT;
END IF;
START TRANSACTION;
/*
INSERT INTO tmp_Msg_Error_Combined (
id_type
, code
, msg
)
SELECT
t_ASSESSMENT_SAVE_ERROR.id_type
, t_ASSESSMENT_SAVE_ERROR.code
, t_ASSESSMENT_SAVE_ERROR.msg
FROM tmp_Assessment_Save_ADR_Save_Error t_ASSESSMENT_SAVE_ERROR
;
*/
DELETE FROM demo.PH_Contact_Form_Temp
WHERE GUID = a_guid
-- Get New Assessment Ids
IF NOT EXISTS (SELECT * FROM tmp_Msg_Error_Combined t_ERROR INNER JOIN demo.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
-- Update Temporary tables with new Ids
UPDATE tmp_Assessment_Save_ADR t_ASSESSMENT
INNER JOIN demo.DOG_Assessment ASSESSMENT ON t_ASSESSMENT.id_temp = ASSESSMENT.id_temp
INNER JOIN tmp_Distraction_Save_ADR t_DISTRACTION ON t_ASSESSMENT.id_assessment_old = t_DISTRACTION.id_assessment
INNER JOIN tmp_Assessment_Command_Modality_Link_Save_ADR t_ASSESSMENT_COMMAND_MODALITY_LINK ON t_ASSESSMENT.id_assessment_old = t_ASSESSMENT_COMMAND_MODALITY_LINK.id_assessment
SET
t_ASSESSMENT.id_assessment = ASSESSMENT.id_assessment
, t_DISTRACTION.id_assessment = ASSESSMENT.id_assessment
, t_ASSESSMENT_COMMAND_MODALITY_LINK.id_assessment = ASSESSMENT.id_assessment
WHERE
t_ASSESSMENT.active = 1
AND t_ASSESSMENT.is_new = 1
;
COMMIT;
-- Update Staging tables with new Ids
IF EXISTS (SELECT * FROM tmp_Assessment_Save_ADR t_ASSESSMENT WHERE t_ASSESSMENT.id_assessment <> t_ASSESSMENT.id_assessment_old LIMIT 1) THEN
START TRANSACTION;
UPDATE demo.DOG_Distraction_Temp DISTRACTION_T
INNER JOIN tmp_Distraction_Save_ADR t_DISTRACTION ON DISTRACTION_T.id_temp = t_DISTRACTION.id_temp
INNER JOIN tmp_Assessment_Save_ADR t_ASSESSMENT ON t_DISTRACTION.id_assessment = t_ASSESSMENT.id_assessment
SET DISTRACTION_T.id_assessment = t_DISTRACTION.id_assessment
WHERE t_ASSESSMENT.id_assessment <> t_ASSESSMENT.id_assessment_old
;
UPDATE demo.DOG_Assessment_Command_Modality_Link_Temp ASSESSMENT_COMMAND_MODALITY_LINK_T
INNER JOIN tmp_Assessment_Command_Modality_Link_Save_ADR t_ASSESSMENT_COMMAND_MODALITY_LINK ON t_ASSESSMENT_COMMAND_MODALITY_LINK.id_temp = ASSESSMENT_COMMAND_MODALITY_LINK_T.id_temp
INNER JOIN tmp_Assessment_Save_ADR t_ASSESSMENT ON t_ASSESSMENT.id_assessment = t_ASSESSMENT_COMMAND_MODALITY_LINK.id_assessment
SET ASSESSMENT_COMMAND_MODALITY_LINK_T.id_assessment = t_ASSESSMENT_COMMAND_MODALITY_LINK.id_assessment
WHERE t_ASSESSMENT.id_assessment <> t_ASSESSMENT.id_assessment_old
;
COMMIT;
END IF;
END IF;
IF a_debug = 1 THEN
SELECT 'After align assessment Ids';
SELECT * FROM tmp_Assessment_Save_ADR;
SELECT * FROM tmp_Distraction_Save_ADR;
SELECT * FROM tmp_Assessment_Command_Modality_Link_Save_ADR;
SELECT * FROM tmp_Assessment_Response_Save_ADR;
END IF;
-- DELETE FROM tmp_Msg_Error_Combined_Save;
-- Save Distractions
-- CREATE TEMPORARY TABLE tmp_Distraction_Save_ADR_Save_Error AS
-- INSERT INTO tmp_Msg_Error_Combined_Save
CALL demo.p_dog_save_distraction (
a_comment
, a_guid
, a_id_user
, 0 -- debug
);
/*
INSERT INTO tmp_Msg_Error_Combined (
id_type
, code
, msg
)
SELECT
t_DISTRACTION_SAVE_ERROR.id_type
, t_DISTRACTION_SAVE_ERROR.code
, t_DISTRACTION_SAVE_ERROR.msg
FROM tmp_Distraction_Save_ADR_Save_Error t_DISTRACTION_SAVE_ERROR
;
*/
-- DELETE FROM tmp_Msg_Error_Combined_Save;
-- Save Assessment Command Modality Links
-- CREATE TEMPORARY TABLE tmp_Assessment_Command_Modality_Link_Save_ADR_Save_Error AS
-- INSERT INTO tmp_Msg_Error_Combined_Save
CALL demo.p_dog_save_assessment_command_modality_link (
a_comment
, a_guid
, a_id_user
, 0 -- debug
);
/*
INSERT INTO tmp_Msg_Error_Combined (
id_type
, code
, msg
)
SELECT
t_ACML_SAVE_ERROR.id_type
, t_ACML_SAVE_ERROR.code
, t_ACML_SAVE_ERROR.msg
FROM tmp_Assessment_Command_Modality_Link_Save_ADR_Save_Error t_ACML_SAVE_ERROR
;
*/
-- Get New Assessment Command Modality Link Ids
IF EXISTS (SELECT * FROM tmp_Msg_Error_Combined t_ERROR INNER JOIN demo.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
START TRANSACTION;
DELETE ASSESSMENT
FROM demo.DOG_Assessment ASSESSMENT
INNER JOIN tmp_Assessment_Save_ADR t_ASSESSMENT ON ASSESSMENT.id_assessment = t_ASSESSMENT.id_assessment
WHERE t_ASSESSMENT.is_new = 1
;
COMMIT;
ELSE
-- Update Temporary tables with new Ids
UPDATE tmp_Assessment_Command_Modality_Link_Save_ADR t_ASSESSMENT_COMMAND_MODALITY_LINK
INNER JOIN demo.DOG_Assessment_Command_Modality_Link ASSESSMENT_COMMAND_MODALITY_LINK ON t_ASSESSMENT_COMMAND_MODALITY_LINK.id_temp = ASSESSMENT_COMMAND_MODALITY_LINK.id_temp
LEFT JOIN tmp_Assessment_Response_Save_ADR t_ASSESSMENT_RESPONSE ON t_ASSESSMENT_COMMAND_MODALITY_LINK.id_link = t_ASSESSMENT_RESPONSE.id_assessment_command_modality_link
SET
t_ASSESSMENT_COMMAND_MODALITY_LINK.id_link = ASSESSMENT_COMMAND_MODALITY_LINK.id_link
, t_ASSESSMENT_RESPONSE.id_assessment_command_modality_link = ASSESSMENT_COMMAND_MODALITY_LINK.id_link
WHERE
t_ASSESSMENT_COMMAND_MODALITY_LINK.active = 1
AND t_ASSESSMENT_COMMAND_MODALITY_LINK.is_new = 1
;
-- Update Staging tables with new Ids
IF EXISTS (SELECT * FROM tmp_Assessment_Command_Modality_Link_Save_ADR t_ASSESSMENT_COMMAND_MODALITY_LINK WHERE t_ASSESSMENT_COMMAND_MODALITY_LINK.id_link <> t_ASSESSMENT_COMMAND_MODALITY_LINK.id_link_old LIMIT 1) THEN
START TRANSACTION;
UPDATE demo.DOG_Assessment_Response_Temp ASSESSMENT_RESPONSE_T
INNER JOIN tmp_Assessment_Response_Save_ADR t_ASSESSMENT_RESPONSE ON ASSESSMENT_RESPONSE_T.id_temp = t_ASSESSMENT_RESPONSE.id_temp
INNER JOIN tmp_Assessment_Command_Modality_Link_Save_ADR t_ASSESSMENT_COMMAND_MODALITY_LINK ON t_ASSESSMENT_RESPONSE.id_assessment_command_modality_link = t_ASSESSMENT_COMMAND_MODALITY_LINK.id_link
SET ASSESSMENT_RESPONSE_T.id_assessment_command_modality_link = t_ASSESSMENT_RESPONSE.id_assessment_command_modality_link
WHERE t_ASSESSMENT_COMMAND_MODALITY_LINK.id_link <> t_ASSESSMENT_COMMAND_MODALITY_LINK.id_link_old
;
COMMIT;
END IF;
END IF;
IF a_debug = 1 THEN
SELECT 'After align assessment Ids';
SELECT * FROM tmp_Assessment_Save_ADR;
SELECT * FROM tmp_Distraction_Save_ADR;
SELECT * FROM tmp_Assessment_Command_Modality_Link_Save_ADR;
SELECT * FROM tmp_Assessment_Response_Save_ADR;
END IF;
-- DELETE FROM tmp_Msg_Error_Combined_Save;
-- Save Assessment Responses
-- CREATE TEMPORARY TABLE tmp_Assessment_Response_Save_ADR_Save_Error AS
-- INSERT INTO tmp_Msg_Error_Combined_Save
CALL demo.p_dog_save_assessment_response (
a_comment
, a_guid
, a_id_user
, 0 -- debug
);
/*
INSERT INTO tmp_Msg_Error_Combined (
id_type
, code
, msg
)
SELECT
t_ASSESSMENT_RESPONSE_SAVE_ERROR.id_type
, t_ASSESSMENT_RESPONSE_SAVE_ERROR.code
, t_ASSESSMENT_RESPONSE_SAVE_ERROR.msg
FROM tmp_Assessment_Response_Save_ADR_Save_Error t_ASSESSMENT_RESPONSE_SAVE_ERROR
;
*/
-- Get New Assessment Command Modality Link Ids
IF EXISTS (SELECT * FROM tmp_Msg_Error_Combined t_ERROR INNER JOIN demo.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type WHERE ERROR_TYPE.is_breaking_error = 1 LIMIT 1) THEN
START TRANSACTION;
DELETE ASSESSMENT_COMMAND_MODALITY_LINK
FROM demo.DOG_Assessment_Command_Modality_Link ASSESSMENT_COMMAND_MODALITY_LINK
INNER JOIN tmp_Assessment_Command_Modality_Link_Save_ADR t_ASSESSMENT_COMMAND_MODALITY_LINK ON ASSESSMENT_COMMAND_MODALITY_LINK.id_link = t_ASSESSMENT_COMMAND_MODALITY_LINK.id_assessment_command_modality_link
INNER JOIN tmp_Assessment_Save_ADR t_ASSESSMENT ON ASSESSMENT_COMMAND_MODALITY_LINK.id_assessment = t_ASSESSMENT.id_assessment
WHERE
t_ASSESSMENT_COMMAND_MODALITY_LINK.is_new = 1
OR t_ASSESSMENT.is_new = 1
;
DELETE ASSESSMENT
FROM demo.DOG_Assessment ASSESSMENT
INNER JOIN tmp_Assessment_Save_ADR t_ASSESSMENT ON ASSESSMENT.id_assessment = t_ASSESSMENT.id_assessment
WHERE t_ASSESSMENT.is_new = 1
;
COMMIT;
END IF;
-- Errors
SELECT *
FROM tmp_Msg_Error t_ME
INNER JOIN demo.CORE_Msg_Error_Type MET ON t_ME.id_type = MET.id_type
SELECT
t_ERROR.id_error
, t_ERROR.id_type
, t_ERROR.code
, ERROR_TYPE.name
, ERROR_TYPE.description
, ERROR_TYPE.is_breaking_error
, ERROR_TYPE.background_colour
, ERROR_TYPE.text_colour
, t_ERROR.msg
FROM tmp_Msg_Error_Combined t_ERROR
INNER JOIN demo.CORE_Msg_Error_Type ERROR_TYPE ON t_ERROR.id_type = ERROR_TYPE.id_type
;
IF a_debug = 1 THEN
SELECT * from tmp_Contact_Form;
SELECT * FROM tmp_Assessment_Save_ADR;
SELECT * FROM tmp_Distraction_Save_ADR;
SELECT * FROM tmp_Assessment_Command_Modality_Link_Save_ADR;
SELECT * FROM tmp_Assessment_Response_Save_ADR;
END IF;
DROP TEMPORARY TABLE tmp_Contact_Form;
DROP TEMPORARY TABLE tmp_Msg_Error;
CALL demo.p_dog_clear_msg_error (
a_guid
, 0 -- debug
);
DROP TABLE IF EXISTS tmp_Assessment_Response_Save_ADR_Save_Error;
DROP TABLE IF EXISTS tmp_Assessment_Command_Modality_Link_Save_ADR_Save_Error;
DROP TABLE IF EXISTS tmp_Distraction_Save_ADR_Save_Error;
DROP TABLE IF EXISTS tmp_Assessment_Save_ADR_Save_Error;
DROP TABLE IF EXISTS tmp_Assessment_Response_Save_ADR;
DROP TABLE IF EXISTS tmp_Assessment_Command_Modality_Link_Save_ADR;
DROP TABLE IF EXISTS tmp_Distraction_Save_ADR;
DROP TABLE IF EXISTS tmp_Assessment_Save_ADR;
DROP TEMPORARY TABLE tmp_Msg_Error_Combined;
IF a_debug = 1 THEN
CALL demo.p_core_debug_timing_reporting ( v_time_start );
@@ -411,26 +548,15 @@ END //
DELIMITER ;
select
*
-- COUNT(*)
-- delete
from demo.PH_Contact_Form_Temp
;
/*
CALL demo.p_ph_save_contact_form (
CALL demo.p_dog_save_assessment_distraction_and_response (
'nipples'
, (SELECT GUID FROM demo.PH_Contact_Form_Temp ORDER BY id_temp DESC LIMIT 1)
, 'ripplesipplenipplytippledipplykipple'
, 1
, 1
);
select
*
-- COUNT(*)
-- delete
from demo.PH_Contact_Form_Temp
;
*/