Changes for committee

Author: datajohnson

api/src/data/migrations/20251208162632.update-action-committee.ts

@@ -0,0 +1,21 @@
+import * as knex from "knex";
+
+export async function up(knex: knex.Knex) {
+  await knex.schema.alterTable("actions", function (table) {
+    table.integer("is_committee_task").nullable();
+    table.string("committee_supervisor_response", 500).nullable();
+    table.string("committee_task_rationale", 2000).nullable();
+    table.text("comments").nullable();
+  });
+
+  await knex("actions").whereNull("is_committee_task").update({ is_committee_task: 0 });
+}
+
+export async function down(knex: knex.Knex) {
+  await knex.schema.alterTable("actions", function (table) {
+    table.dropColumn("is_committee_task");
+    table.dropColumn("committee_supervisor_response");
+    table.dropColumn("committee_task_rationale");
+    table.dropColumn("comments");
+  });
+}

api/src/data/models/action-model.ts

@@ -26,6 +26,11 @@ export interface Action {
   categories?: string | string[];
   title?: string | null;
 
+  is_committee_task?: number;
+  committee_supervisor_response?: string;
+  committee_task_rationale?: string;
+  comments?: string;
+
   type?: ActionType;
   status?: ActionStatus;
   actor_display_name?: string;

api/src/data/models/incident-model.ts

@@ -35,6 +35,7 @@ export interface Incident {
   attachments?: any[];
   steps?: IncidentStep[];
   actions?: Action[];
+  committee_actions?: Action[];
   hazards?: IncidentHazard[];
   investigation?: Investigation;
   location?: Location;

api/src/routes/action-router.ts

@@ -125,6 +125,7 @@ actionRouter.post("/", async (req: Request, res: Response) => {
     control,
     categories,
     title,
+    is_committee_task,
   } = req.body;
 
   const incident = await knex("incidents")
@@ -154,6 +155,7 @@ actionRouter.post("/", async (req: Request, res: Response) => {
     control,
     categories: newCategories.join(","),
     title,
+    is_committee_task: is_committee_task ?? 0,
   } as Action;
 
   await knex("actions").insert(action);
@@ -181,6 +183,9 @@ actionRouter.put("/:slug", async (req: Request, res: Response) => {
     control,
     categories,
     title,
+    committee_supervisor_response,
+    committee_task_rationale,
+    comments,
   } = req.body;
   let { actor_user_id } = req.body;
 
@@ -216,6 +221,9 @@ actionRouter.put("/:slug", async (req: Request, res: Response) => {
       control,
       categories: newCategories.join(","),
       title,
+      committee_supervisor_response,
+      committee_task_rationale,
+      comments,
     });
 
   await updateActionHazards(action, status_code, urgency_code, control);

api/src/routes/report-router.ts

@@ -561,21 +561,23 @@ reportRouter.post("/:id/send-committee-request", async (req: Request, res: Respo
 
   const incidentSteps = await knex("incident_steps").where({ incident_id: id }).orderBy("order");
 
-  const notificationStep = incidentSteps.find((step: IncidentStep) => step.step_title == "Employee Notification");
+  const implementedStep = incidentSteps.find((step: IncidentStep) => step.step_title == "Controls Implemented");
   const requestStep = incidentSteps.find((step: IncidentStep) => step.step_title == "Committee Review");
 
   if (!isNil(requestStep)) return res.status(400).send("Step already exists");
 
   const newStep = {
     incident_id: id,
     step_title: "Committee Review",
-    order: notificationStep.order,
+    order: implementedStep.order,
     activate_date: new Date(),
   };
 
-  await knex("incident_steps")
-    .where({ id: notificationStep.id })
-    .update({ order: notificationStep.order + 1 });
+  await knex.raw(`UPDATE "incident_steps" SET "order" = "order" + 1 WHERE "incident_id" = ? AND "order" >= ?`, [
+    id,
+    implementedStep.order,
+  ]);
+
   await knex("incident_steps").insert(newStep);
 
   for (const user of committeeUsers) {

api/src/services/incident-service.ts

@@ -71,7 +71,7 @@ export class IncidentService {
       .select("id", "incident_id", "added_by_email", "file_name", "file_type", "file_size", "added_date");
 
     item.steps = await db("incident_steps").where({ incident_id: item.id }).orderBy("order");
-    item.actions = await db("actions").where({ incident_id: item.id }).orderBy("due_date").orderBy("id");
+    const allActions = await db("actions").where({ incident_id: item.id }).orderBy("due_date").orderBy("id");
     item.investigation = await db("investigations").where({ incident_id: item.id }).first();
     item.access = await db("incident_users_view").where({
       incident_id: item.id,
@@ -100,7 +100,7 @@ export class IncidentService {
         .first();
     }
 
-    for (let action of item.actions) {
+    for (let action of allActions) {
       if (action.actor_role_type_id) {
         action.actor_display_name = (
           await db("role_types").where({ id: action.actor_role_type_id }).first()
@@ -112,9 +112,12 @@ export class IncidentService {
       }
 
       action.categories = action.categories ?? [];
-      if (!isArray(action.categories)) action.categories = action.categories.split(",").filter((c) => c);
+      if (!isArray(action.categories)) action.categories = action.categories.split(",").filter((c: string) => c);
     }
 
+    item.actions = allActions.filter((a) => a.is_committee_task !== 1);
+    item.committee_actions = allActions.filter((a) => a.is_committee_task === 1);
+
     return item;
   }
 

web/src/components/action/ActionCompleteForm.vue

@@ -1,5 +1,5 @@
 <template>
-  <div class="pa-4">
+  <div>
     <v-row>
       <v-col cols="12">
         <v-label>Title</v-label>

web/src/components/action/ActionDialog.vue

@@ -16,9 +16,12 @@
       </v-card-text>
 
       <v-card-text v-else>
-        <div class="bg-white" style="border: 1px #ddd solid; border-radius: 4px">
-          <ActionCompleteForm :action="action" :readonly="readonly" @do-close="closeClick" />
-        </div>
+        <ActionCompleteForm
+          v-if="action.is_committee_task == 0"
+          :action="action"
+          :readonly="readonly"
+          @do-close="closeClick" />
+        <CommitteeActionCompleteForm v-else :action="action" :readonly="readonly" @do-close="closeClick" />
 
         <div v-if="hazardId" class="mt-5">
           <v-label>Attachments</v-label>
@@ -65,6 +68,7 @@ const emit = defineEmits(["doClose"]);
 import { useHazardStore } from "@/store/HazardStore";
 import ActionCompleteForm from "./ActionCompleteForm.vue";
 import ActionClassifyForm from "./ActionClassifyForm.vue";
+import CommitteeActionCompleteForm from "./CommitteeActionCompleteForm.vue";
 
 const hazardStore = useHazardStore();
 const { attachments } = storeToRefs(hazardStore);