Merge pull request #217 from dinesh-aot/COMP-317

New inspection status

Author: nitheesh-aot

compliance-api/migrations/versions/91f76d883f32_more_inspection_status_added.py

@@ -0,0 +1,49 @@
+"""More inspection status added
+
+Revision ID: 91f76d883f32
+Revises: 88ed0885be9e
+Create Date: 2025-02-03 15:06:34.042205
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '91f76d883f32'
+down_revision = '88ed0885be9e'
+branch_labels = None
+depends_on = None
+
+
+def upgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.execute("ALTER TYPE inspectionstatusenum ADD VALUE 'CLOSED_AS_NOTE'")
+    op.execute("COMMIT;")
+    op.execute("UPDATE inspections set inspection_status='CLOSED_AS_NOTE' WHERE inspection_status='CLOSED'")
+    op.execute("UPDATE inspections_version set inspection_status='CLOSED_AS_NOTE' WHERE inspection_status='CLOSED'")
+
+    # ### end Alembic commands ###
+
+
+def downgrade():
+    # ### commands auto generated by Alembic - please adjust! ###
+    op.execute("UPDATE inspections set inspection_status='CLOSED' WHERE inspection_status='CLOSED_AS_NOTE'")
+    op.execute("UPDATE inspections_version SET inspection_status='CLOSED' WHERE inspection_status='CLOSED_AS_NOTE'")
+    op.execute("""
+        CREATE TYPE inspectionstatusenum_old AS ENUM ('OPEN', 'CLOSED', 'CANCELED');
+    """)
+    op.execute("""
+        ALTER TABLE inspections 
+        ALTER COLUMN inspection_status TYPE inspectionstatusenum_old 
+        USING inspection_status::text::inspectionstatusenum_old;
+    """)
+    op.execute("""
+        ALTER TABLE inspections_version
+        ALTER COLUMN inspection_status TYPE inspectionstatusenum_old 
+        USING inspection_status::text::inspectionstatusenum_old;
+    """)
+    op.execute("DROP TYPE inspectionstatusenum;")
+    op.execute("ALTER TYPE inspectionstatusenum_old RENAME TO inspectionstatusenum;")
+    # ### end Alembic commands ###
+    pass

compliance-api/src/compliance_api/models/inspection/inspection_enum.py

@@ -21,4 +21,5 @@ class InspectionStatusEnum(enum.Enum):
 
     OPEN = "Open"
     CLOSED = "Closed"
+    CLOSED_AS_NOTE = "Closed as note"
     CANCELED = "Canceled"

compliance-api/src/compliance_api/schemas/inspection.py

@@ -391,8 +391,9 @@ def validate_status(
         # Retrieve the context to access other fields
         status = data.get("status")
         if status not in [
-            InspectionStatusEnum("Closed"),
-            InspectionStatusEnum("Canceled"),
+            InspectionStatusEnum.CANCELED,
+            InspectionStatusEnum.CLOSED,
+            InspectionStatusEnum.CLOSED_AS_NOTE
         ]:
             raise ValidationError(
                 "Invalid status value passed",

compliance-web/src/components/App/Inspections/Profile/InspectionFileActions.tsx

@@ -1,15 +1,15 @@
-import React, { useCallback } from "react";
 import MenuActionDropdown from "@/components/Shared/MenuActionDropdown";
 import ConfirmationModal from "@/components/Shared/Popups/ConfirmationModal";
-import { useModal } from "@/store/modalStore";
-import { useQueryClient } from "@tanstack/react-query";
-import { Inspection } from "@/models/Inspection";
-import { notify } from "@/store/snackbarStore";
 import {
   useDeleteInspection,
   useUpdateInspectionStatus,
 } from "@/hooks/useInspections";
+import { Inspection } from "@/models/Inspection";
+import { useModal } from "@/store/modalStore";
+import { notify } from "@/store/snackbarStore";
+import { useQueryClient } from "@tanstack/react-query";
 import { useRouter } from "@tanstack/react-router";
+import React, { useCallback } from "react";
 
 interface InspectionFileActionsProps {
   status: string;
@@ -73,7 +73,7 @@ const InspectionFileActions: React.FC<InspectionFileActionsProps> = ({
           ),
         });
       },
-      hidden: ["canceled", "closed"].includes(status?.toLowerCase()),
+      hidden: ["canceled", "closed", "closed as note"].includes(status?.toLowerCase()),
     },
     {
       text: "Close as Note to File",
@@ -85,6 +85,29 @@ const InspectionFileActions: React.FC<InspectionFileActionsProps> = ({
               title="Close Inspection as Note to File?"
               description="Are you sure you want to close inspection as note to file?"
               confirmButtonText="Close Inspection"
+              onConfirm={() => {
+                updateInspectionInspection({
+                  id: inspectionData?.id ?? 0,
+                  inspectionStatus: { status: "CLOSED_AS_NOTE" },
+                });
+              }}
+            />
+          ),
+          width: "420px",
+        });
+      },
+      hidden: ["canceled", "closed as note", "closed"].includes(status?.toLowerCase()),
+    },
+    {
+      text: "Closed",
+      onClick: () => {
+        // Handle closing inspection
+        setOpen({
+          content: (
+            <ConfirmationModal
+              title="Close Inspectio?"
+              description="Are you sure you want to close inspection?"
+              confirmButtonText="Close Inspection"
               onConfirm={() => {
                 updateInspectionInspection({
                   id: inspectionData?.id ?? 0,
@@ -96,7 +119,7 @@ const InspectionFileActions: React.FC<InspectionFileActionsProps> = ({
           width: "420px",
         });
       },
-      hidden: ["canceled", "closed"].includes(status?.toLowerCase()),
+      hidden: ["canceled", "closed", "closed as note"].includes(status?.toLowerCase()),
     },
     {
       text: "Delete Inspection",