bug/CE-610-Unable-to-enter-text-into-outcome-by-animal-drug-text-fiel…

…ds (#381) Co-authored-by: Mike <100624415+marqueone-ps@users.noreply.github.com> Co-authored-by: afwilcox <alecwilcox@gmail.com>
bcgov · Apr 26, 2024 · d17148e · d17148e
1 parent 4c9fb57
commit d17148e
Show file tree

Hide file tree

Showing 4 changed files with 38 additions and 15 deletions.
diff --git a/frontend/src/app/components/containers/complaints/outcomes/animal-outcomes/add-drug.tsx b/frontend/src/app/components/containers/complaints/outcomes/animal-outcomes/add-drug.tsx
@@ -18,6 +18,7 @@ type props = {
   amountUsed: string;
   amountUsedErrorMessage: string;
   amountDiscarded: string;
+  amountDiscardedErrorMessage: string;
 
   reactions: string;
   remainingUse: string;
@@ -42,6 +43,7 @@ export const AddDrug: FC<props> = ({
   injectionMethodErrorMessage,
   discardMethod,
   amountDiscarded,
+  amountDiscardedErrorMessage,
   reactions,
   remainingUse,
   remove,
@@ -262,6 +264,7 @@ export const AddDrug: FC<props> = ({
                 placeholder="Example"
                 inputClass="comp-form-control"
                 value={amountDiscarded}
+                error={amountDiscardedErrorMessage}
                 onChange={(evt: any) => {
                   const {
                     target: { value },

diff --git a/frontend/src/app/components/containers/complaints/outcomes/animal-outcomes/drug-item.tsx b/frontend/src/app/components/containers/complaints/outcomes/animal-outcomes/drug-item.tsx
@@ -104,12 +104,12 @@ export const DrugItem: FC<props> = ({
       </Row>
       <Row>
         <Col md={6}>
-          <span className="comp-fake-label">Fate of remaining drug in vial</span> {remaining}
+          <span className="comp-fake-label">Fate of remaining drug in vial </span> {remaining}
         </Col>
         <Col md={3}>
           {remainingUse === "DISC" && (
             <>
-              <span className="comp-fake-label">Amount discarded</span> {amountDiscarded}ml
+              <span className="comp-fake-label">Amount discarded</span> {amountDiscarded} {amountDiscarded ? "ml" : ""}
             </>
           )}
         </Col>

diff --git a/...src/app/components/containers/complaints/outcomes/animal-outcomes/edit-animal-outcome.tsx b/...src/app/components/containers/complaints/outcomes/animal-outcomes/edit-animal-outcome.tsx
@@ -239,6 +239,7 @@ export const EditAnimalOutcome: FC<EditAnimalOutcomeProps> = ({
         amountUsed: "",
         amountUsedErrorMessage: "",
         amountDiscarded: "",
+        amountDiscardedErrorMessage: "",
         reactions: "",
         remainingUse: "",
         injectionMethod: "",
@@ -279,19 +280,11 @@ export const EditAnimalOutcome: FC<EditAnimalOutcomeProps> = ({
     switch (type) {
       case "vial":
         currentDrug.vial = drug.vial;
-        if (!drug.vial) {
-          currentDrug.vialErrorMessage = "Required";
-        } else {
-          currentDrug.vialErrorMessage = "";
-        }
+        setErrorMessage(currentDrug, "vial");
         break;
       case "drug":
         currentDrug.drug = drug.drug;
-        if (!drug.drug) {
-          currentDrug.drugErrorMessage = "Required";
-        } else {
-          currentDrug.drugErrorMessage = "";
-        }
+        setErrorMessage(currentDrug, "drug");
         break;
 
       case "amountUsed":
@@ -306,19 +299,39 @@ export const EditAnimalOutcome: FC<EditAnimalOutcomeProps> = ({
         break;
       case "injectionMethod":
         currentDrug.injectionMethod = drug.injectionMethod;
-        if (!drug.injectionMethod) {
-          currentDrug.injectionMethodErrorMessage = "Required";
+        setErrorMessage(currentDrug, "injectionMethod");
+        break;
+      case "reactions":
+        currentDrug.reactions = drug.reactions;
+        break;
+      case "amountDiscarded":
+        currentDrug.amountDiscarded = drug.amountDiscarded;
+        if (drug.amountDiscarded && !isPositiveNum(drug.amountDiscarded)) {
+          currentDrug.amountDiscardedErrorMessage = "Must be a positive number";
         } else {
-          currentDrug.injectionMethodErrorMessage = "";
+          currentDrug.amountDiscardedErrorMessage = "";
         }
         break;
+      case "discardMethod":
+        currentDrug.discardMethod = drug.discardMethod;
+        break;
+      case "remainingUse":
+        currentDrug.remainingUse = drug.remainingUse;
+        break;
+
       default:
     }
     const update = [...otherDrugs, currentDrug];
 
     setDrugs(update);
   };
 
+  const setErrorMessage = (drug: any, field: string) => {
+    const dataField = field as keyof DrugUsed;
+    const errorField = (field + "ErrorMessage") as keyof DrugUsed;
+    drug[errorField] = drug[dataField] ? "" : "Required";
+  };
+
   //update all input validation
   const updateDrug = (drug: DrugUsed) => {
     if (!drug.vial) {
@@ -343,6 +356,12 @@ export const EditAnimalOutcome: FC<EditAnimalOutcomeProps> = ({
     } else {
       drug.injectionMethodErrorMessage = "";
     }
+    if (drug.amountDiscarded && !isPositiveNum(drug.amountDiscarded)) {
+      drug.amountDiscardedErrorMessage = "Must be a positive number";
+    } else {
+      drug.amountDiscardedErrorMessage = "";
+    }
+
     const items = drugs.filter(({ id }) => id !== drug.id);
     const update = [...items, drug];
 

diff --git a/frontend/src/app/types/app/complaints/outcomes/wildlife/drug-used.ts b/frontend/src/app/types/app/complaints/outcomes/wildlife/drug-used.ts
@@ -8,6 +8,7 @@ export interface DrugUsed {
   amountUsed: string;
   amountUsedErrorMessage: string;
   amountDiscarded: string;
+  amountDiscardedErrorMessage: string;
 
   injectionMethod: string;
   injectionMethodErrorMessage: string;