diff --git a/src/sql/0-run-first/1-sanitize_init.sql b/src/sql/0-run-first/1-sanitize_init.sql index 601ad1d..cfe8ec9 100644 --- a/src/sql/0-run-first/1-sanitize_init.sql +++ b/src/sql/0-run-first/1-sanitize_init.sql @@ -8,10 +8,13 @@ UPDATE users SET hash = ''; UPDATE project_lifecycle SET new_value = '+CREATED', changed_column = 'status' WHERE changed_column = 'created'; DELETE FROM project_lifecycle WHERE project_number = 'EVENT'; -UPDATE billing set accepted_date = accepted_date - INTERVAL 4 HOUR, line_created = line_created - INTERVAL 4 HOUR; -UPDATE dispatch SET date_dispatched = date_dispatched - INTERVAL 4 HOUR; -UPDATE project_comments set timestamp = timestamp - INTERVAL 4 HOUR; -UPDATE project_lifecycle SET timestamp = timestamp - INTERVAL 4 HOUR; +#TIMEZONE FIX +# we'll store the roll amount as a single variable +SET @roll = 4; +UPDATE billing set accepted_date = accepted_date - INTERVAL @roll HOUR, line_created = line_created - INTERVAL @roll HOUR; +UPDATE dispatch SET date_dispatched = date_dispatched - INTERVAL @roll HOUR; +UPDATE project_comments set timestamp = timestamp - INTERVAL @roll HOUR; +UPDATE project_lifecycle SET timestamp = timestamp - INTERVAL @roll HOUR; ALTER TABLE project_lifecycle ADD COLUMN id INT AUTO_INCREMENT KEY FIRST; CREATE OR REPLACE INDEX lifecycle_timestamp on project_lifecycle (timestamp); diff --git a/src/sql/0-run-first/contributions.sql b/src/sql/0-run-first/contributions.sql index 2c36eba..ef7c9c4 100644 --- a/src/sql/0-run-first/contributions.sql +++ b/src/sql/0-run-first/contributions.sql @@ -45,20 +45,21 @@ DROP TABLE IF EXISTS rdu_soil_contributions; CREATE TABLE rdu_soil_contributions AS -SELECT CONCAT(users.email) AS `Technician Email`, - project_lifecycle.project_number AS `Project Number`, +SELECT CONCAT(users.email) AS `Technician Email`, + project_lifecycle.project_number AS `Project Number`, project_lifecycle.timestamp, - new_value AS `Action Type`, - CONCAT(SUBSTR(project_lifecycle.project_number, 1, 3), ' - ', - IF(ap.proj_type = 'Warranty', 'Structural', ap.proj_type)) AS `Region`, - clients.name AS `Client`, - ap.description AS `Description` + new_value AS `Action Type`, + 'RDU - Soil' AS `Region`, + clients.name AS `Client`, + ap.description AS `Description` FROM users INNER JOIN project_lifecycle ON pkey = modifier INNER JOIN all_projects ap on project_lifecycle.project_number = ap.refnum INNER JOIN contacts on ap.contact_fkey = contacts.pkey INNER JOIN clients on contacts.cl_fkey = clients.pkey -WHERE project_lifecycle.new_value IN ('+READY_FOR_REVIEW'); +WHERE project_lifecycle.new_value IN ('+READY_FOR_REVIEW') + AND SUBSTR(ap.proj_type, 1, 3) = 'RDU' + AND ap.proj_type = 'Soil'; ALTER TABLE rdu_soil_contributions