feat: compete and accept the test (#2046)

Author: xiaopeng0202

frontend/src/views/CONSEP/TestingActivities/MoistureContent/index.tsx

@@ -162,7 +162,7 @@ const MoistureContent = () => {
 
   const validateTest = useMutation({
     mutationFn: () => testingActivitiesAPI(
-      'purityTest',
+      'moistureTest',
       'validateTestResult',
       { riaKey }
     ),
@@ -195,7 +195,7 @@ const MoistureContent = () => {
 
   const acceptTest = useMutation({
     mutationFn: () => testingActivitiesAPI(
-      'purityTest',
+      'moistureTest',
       'acceptResult',
       { riaKey }
     ),
@@ -271,7 +271,7 @@ const MoistureContent = () => {
       kind: 'tertiary',
       size: 'lg',
       icon: Checkmark,
-      disabled: !!testActivity?.testCompleteInd,
+      disabled: testActivity?.testCompleteInd === 1,
       action: () => validateTest.mutate()
     },
     {
@@ -280,7 +280,7 @@ const MoistureContent = () => {
       kind: 'tertiary',
       size: 'lg',
       icon: CheckmarkOutline,
-      disabled: !testActivity?.testCompleteInd || !!testActivity?.acceptResult,
+      disabled: testActivity?.acceptResult === 1 || testActivity?.testCompleteInd !== 1,
       action: () => acceptTest.mutate()
     },
     {

frontend/src/views/CONSEP/TestingActivities/PurityContent/constants.ts

@@ -41,3 +41,21 @@ export const fieldsConfig = {
     placeholder: 'My comments about this activity'
   }
 };
+
+export const actionModalOptions = {
+  complete: {
+    modalLabel: 'Are you sure you want to complete the test?',
+    modalHeading: 'Complete purity test',
+    primaryButtonText: 'Yes',
+    secondaryButtonText: 'Cancel'
+  },
+  accept: {
+    modalLabel: 'Are you sure you want to accept the test result?',
+    modalHeading: 'Accept purity test result',
+    primaryButtonText: 'Yes',
+    secondaryButtonText: 'Cancel'
+  }
+};
+
+export const COMPLETE = 'complete';
+export const ACCEPT = 'accept';

frontend/src/views/CONSEP/TestingActivities/PurityContent/index.tsx

@@ -13,7 +13,8 @@ import {
   ComboBox,
   Button,
   InlineNotification,
-  TextInput
+  TextInput,
+  Modal
 } from '@carbon/react';
 import {
   CheckmarkFilled,
@@ -42,7 +43,7 @@ import ButtonGroup from '../ButtonGroup';
 import { categoryMap, categoryMapReverse } from '../SharedConstants';
 import { ImpurityType } from './definitions';
 import {
-  DATE_FORMAT, fieldsConfig
+  DATE_FORMAT, fieldsConfig, actionModalOptions, COMPLETE, ACCEPT
 } from './constants';
 import './styles.scss';
 
@@ -55,6 +56,8 @@ const PurityContent = () => {
   const [activityRecord, setActivityRecord] = useState<ActivityRecordType>();
   const [activitySummary, setActivitySummary] = useState<ActivitySummaryType>();
   const [alert, setAlert] = useState<{ isSuccess: boolean; message: string } | null>(null);
+  const [isModalOpen, setModalOpen] = useState(false);
+  const [modalType, setModalType] = useState<'complete' | 'accept'>(COMPLETE);
 
   const tableBodyRef = useRef<HTMLTableSectionElement>(null);
 
@@ -92,6 +95,64 @@ const PurityContent = () => {
     }
   });
 
+  const validateTest = useMutation({
+    mutationFn: () => testingActivitiesAPI(
+      'purityTest',
+      'validateTestResult',
+      { riaKey }
+    ),
+    onSuccess: () => {
+      const testActivityData: TestingActivityType = {
+        ...testActivity!,
+        testCompleteInd: 1,
+        sampleDesc: testActivity?.sampleDesc || '',
+        moistureStatus: testActivity?.moistureStatus || '',
+        moisturePct: testActivity?.moisturePct || 0,
+        acceptResult: testActivity?.acceptResult || 0,
+        requestId: testActivity?.requestId || '',
+        seedlotNumber: testActivity?.seedlotNumber || '',
+        activityType: testActivity?.activityType || '',
+        replicatesList: testActivity?.replicatesList || []
+      };
+      setTestActivity(testActivityData);
+      setAlert({ isSuccess: true, message: 'Test validated successfully' });
+      setTimeout(() => {
+        setAlert(null);
+      }, 3000);
+    },
+    onError: (error) => {
+      setAlert({
+        isSuccess: false,
+        message: `Failed to validate test: ${(error as AxiosError).message}`
+      });
+    }
+  });
+
+  const acceptTest = useMutation({
+    mutationFn: () => testingActivitiesAPI(
+      'purityTest',
+      'acceptResult',
+      { riaKey }
+    ),
+    onSuccess: () => {
+      const testActivityData: TestingActivityType = {
+        ...testActivity!,
+        acceptResult: 1
+      };
+      setTestActivity(testActivityData);
+      setAlert({ isSuccess: true, message: 'Test accepted successfully' });
+      setTimeout(() => {
+        setAlert(null);
+      }, 3000);
+    },
+    onError: (error) => {
+      setAlert({
+        isSuccess: false,
+        message: `Failed to accept test: ${(error as AxiosError).message}`
+      });
+    }
+  });
+
   useEffect(() => {
     if (!riaKey) {
       navigate(ROUTES.FOUR_OH_FOUR);
@@ -201,28 +262,42 @@ const PurityContent = () => {
     setAverage(7.8); // Set the test average value from the API response
   };
 
+  const handleCompleteTestModal = () => {
+    setModalType(COMPLETE);
+    setModalOpen(true);
+  };
+
+  const handleAcceptTestModal = () => {
+    setModalType(ACCEPT);
+    setModalOpen(true);
+  };
+
   const buttons = [
     {
       id: 'calculate-average',
       text: 'Calculate average',
       kind: 'primary',
       size: 'lg',
       icon: Calculator,
-      onClick: handleCalculateAverage
+      action: handleCalculateAverage
     },
     {
       id: 'complete-test',
       text: 'Complete test',
       kind: 'tertiary',
       size: 'lg',
-      icon: Checkmark
+      icon: Checkmark,
+      disabled: testActivity?.testCompleteInd === 1,
+      action: handleCompleteTestModal
     },
     {
       id: 'accept-test',
       text: 'Accept test',
       kind: 'tertiary',
       size: 'lg',
-      icon: CheckmarkOutline
+      icon: CheckmarkOutline,
+      disabled: testActivity?.acceptResult === 1 || testActivity?.testCompleteInd !== 1,
+      action: handleAcceptTestModal
     },
     {
       id: 'test-history',
@@ -322,21 +397,42 @@ const PurityContent = () => {
           </Alert>
         )
       }
+      <Modal
+        className="action-modal"
+        modalLabel={actionModalOptions[modalType].modalLabel}
+        modalHeading={actionModalOptions[modalType].modalHeading}
+        primaryButtonText={actionModalOptions[modalType].primaryButtonText}
+        secondaryButtonText={actionModalOptions[modalType].secondaryButtonText}
+        open={isModalOpen}
+        onRequestClose={() => {
+          setModalOpen(false);
+        }}
+        onRequestSubmit={() => {
+          if (modalType === COMPLETE) {
+            validateTest.mutate();
+          } else if (modalType === ACCEPT) {
+            acceptTest.mutate();
+          }
+          setModalOpen(false);
+        }}
+        size="sm"
+        danger
+      />
       <Row className="consep-purity-content-breadcrumb">
         <Breadcrumbs crumbs={createBreadcrumbItems()} />
       </Row>
       <Row className="consep-purity-content-title">
         <PageTitle title={`${fieldsConfig.titleSection.title} ${seedlotNumber}`} />
         <>
           {
-            testActivity?.testCompleteInd
+            testActivity?.testCompleteInd === 1
               ? (
                 <StatusTag type="Completed" renderIcon={CheckmarkFilled} />
               )
               : null
           }
           {
-            testActivity?.acceptResult
+            testActivity?.acceptResult === 1
               ? (
                 <StatusTag type="Accepted" renderIcon={CheckmarkFilled} />
               )

frontend/src/views/CONSEP/TestingActivities/PurityContent/styles.scss

@@ -1,5 +1,7 @@
+@use '@carbon/type';
 @use '@bcgov-nr/nr-theme/design-tokens/variables.scss' as vars;
 
+
 .consep-purity-content-title {
   justify-content: flex-start;
   gap: 0.5rem;
@@ -115,3 +117,17 @@
 .consep-purity-content-comments > div {
   padding: 0rem;
 }
+
+.action-modal {
+  .#{vars.$bcgov-prefix}--btn {
+    height: 1rem;
+  }
+
+  .#{vars.$bcgov-prefix}--modal-footer{
+    height: auto;
+  }
+
+  .#{vars.$bcgov-prefix}--modal-header__label{
+    @include type.type-style('label-01');
+  }
+}

oracle-api/src/main/java/ca/bc/gov/oracleapi/endpoint/consep/MoistureContentConesEndpoint.java

@@ -215,6 +215,7 @@ public void validateMoistureContentData(
       activityData.setActualBeginDateTime(moistureContent.get().actualBeginDateTime());
       activityData.setActualEndDateTime(moistureContent.get().actualEndDateTime());
       activityData.setTestCategoryCode(moistureContent.get().testCategoryCode());
+      
       activityService.validateActivityData(activityData);
       testResultService.updateTestResultStatusToCompleted(riaKey);