code review comments.

bcgov · Apr 9, 2024 · c56cd82 · c56cd82
1 parent db34d61
commit c56cd82
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 28 deletions.
diff --git a/source/backend/api/Constants/TakeStatusTypes.cs b/source/backend/api/Constants/TakeStatusTypes.cs
diff --git a/source/backend/api/Services/TakeService.cs b/source/backend/api/Services/TakeService.cs
@@ -71,7 +71,7 @@ public IEnumerable<PimsTake> UpdateAcquisitionPropertyTakes(long acquisitionFile
             {
                 throw new BusinessRuleViolationException("Retired records are referenced for historical purposes only and cannot be edited or deleted. If the take has been added in error, contact your system administrator to re-open the file, which will allow take deletion.");
             }
-            else if (takes.Any(t => t.TakeStatusTypeCode == TakeStatusTypes.COMPLETE.ToString() && t.CompletionDt == null))
+            else if (takes.Any(t => t.TakeStatusTypeCode == AcquisitionTakeStatusTypes.COMPLETE.ToString() && t.CompletionDt == null))
             {
                 throw new BusinessRuleViolationException("A completed take must have a completion date.");
             }

diff --git a/source/frontend/src/constants/takesStatusTypes.ts b/source/frontend/src/constants/takesStatusTypes.ts
diff --git a/source/frontend/src/features/mapSideBar/property/tabs/takes/update/TakeSubForm.tsx b/source/frontend/src/features/mapSideBar/property/tabs/takes/update/TakeSubForm.tsx
@@ -10,7 +10,6 @@ import { SectionField } from '@/components/common/Section/SectionField';
 import AreaContainer from '@/components/measurements/AreaContainer';
 import { Roles } from '@/constants';
 import * as API from '@/constants/API';
-import { TakesStatusTypes } from '@/constants/takesStatusTypes';
 import useKeycloakWrapper from '@/hooks/useKeycloakWrapper';
 import useLookupCodeHelpers from '@/hooks/useLookupCodeHelpers';
 import { getDeleteModalProps, useModalContext } from '@/hooks/useModalContext';
@@ -56,7 +55,10 @@ const TakeSubForm: React.FunctionComponent<ITakeSubFormProps> = ({
   const takeStatusTypeCode = getIn(values, withNameSpace(nameSpace, 'takeStatusTypeCode'));
 
   React.useEffect(() => {
-    if (currentTake.completionDt && currentTake.takeStatusTypeCode !== TakesStatusTypes.COMPLETE) {
+    if (
+      currentTake.completionDt &&
+      currentTake.takeStatusTypeCode !== ApiGen_CodeTypes_AcquisitionTakeStatusTypes.COMPLETE
+    ) {
       setFieldValue(withNameSpace(nameSpace, 'completionDt'), '');
     }
   }, [currentTake.completionDt, currentTake.takeStatusTypeCode, nameSpace, setFieldValue]);
@@ -130,7 +132,9 @@ const TakeSubForm: React.FunctionComponent<ITakeSubFormProps> = ({
       </SectionField>
       <SectionField
         label="Completion date"
-        required={currentTake.takeStatusTypeCode === TakesStatusTypes.COMPLETE}
+        required={
+          currentTake.takeStatusTypeCode === ApiGen_CodeTypes_AcquisitionTakeStatusTypes.COMPLETE
+        }
         tooltip={`This will be enabled when the file status is set to "Completed"`}
         labelWidth="4"
         contentWidth="5"
@@ -139,7 +143,9 @@ const TakeSubForm: React.FunctionComponent<ITakeSubFormProps> = ({
           formikProps={formikProps}
           field={withNameSpace(nameSpace, 'completionDt')}
           maxDate={new Date()}
-          disabled={currentTake.takeStatusTypeCode !== TakesStatusTypes.COMPLETE}
+          disabled={
+            currentTake.takeStatusTypeCode !== ApiGen_CodeTypes_AcquisitionTakeStatusTypes.COMPLETE
+          }
         />
       </SectionField>
       <SectionField label="Site contamination" labelWidth="4" contentWidth="5">