tweaks to all projects view construction. - happy new year

src/sql/0-run-first/contributions.sql

@@ -1,3 +1,5 @@
+CREATE INDEX IF NOT EXISTS new_value_idx  ON project_lifecycle (new_value);
+
 DROP TABLE IF EXISTS engineer_contributions;
 
 #########################Engineer Contributions########################################################################
@@ -81,3 +83,42 @@ WHERE id IN (SELECT bad_rows.id
 
 ALTER TABLE rdu_soil_contributions
     DROP COLUMN IF EXISTS id;
+
+#########################FA Contributions#############################################################################
+DROP TABLE IF EXISTS fa_contributions;
+
+
+CREATE TABLE fa_contributions AS
+SELECT CONCAT(users.email)              AS `Technician`,
+       project_lifecycle.project_number AS `ProjectNumber`,
+       project_lifecycle.timestamp,
+       new_value                        AS `ActionType`,
+       'RDU'                     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 ('+DELIVERED', '+READY_TO_INVOICE');
+
+
+ALTER TABLE fa_contributions
+    ADD COLUMN IF NOT EXISTS id INT AUTO_INCREMENT KEY FIRST;
+
+
+DELETE
+FROM fa_contributions
+WHERE id IN (SELECT bad_rows.id
+             FROM fa_contributions AS bad_rows
+                      INNER JOIN (SELECT fa_contributions.`ProjectNumber`, MAX(id) as min_id
+                                  FROM fa_contributions
+                                  GROUP BY fa_contributions.`ProjectNumber`
+                                  HAVING count(*) > 1) AS good_rows
+                                 ON good_rows.`ProjectNumber` =
+                                    bad_rows.`ProjectNumber`
+                                     AND good_rows.min_id <> bad_rows.id);
+
+ALTER TABLE fa_contributions
+    DROP COLUMN IF EXISTS id;

src/sql/update-mercury-hrPaycorHoursJoin.sql

@@ -2,13 +2,13 @@ DROP TABLE IF EXISTS mercury.hr_paycor_report_joined;
 
 CREATE TABLE mercury.hr_paycor_report_joined AS
 SELECT paygroup,
-       dept,
+       HomeDept,
        fname,
        lname,
        CONCAT(lname, ', ', fname) AS fullname,
-       manager,
+       ManagerName,
        week_of,
-       hr_paycor_directory.EEId,
+       mercury.hr_timesheet_directory.EEId,
        Regular,
        Overtime,
        Sick,
@@ -18,4 +18,4 @@ SELECT paygroup,
        Bereavement,
        Total
 FROM mercury.hr_paycor_report
-         INNER JOIN mercury.hr_paycor_directory ON mercury.hr_paycor_report.EEId = mercury.hr_paycor_directory.EEId
+         INNER JOIN mercury.hr_timesheet_directory ON mercury.hr_paycor_report.EEId = mercury.hr_timesheet_directory.EEId