Fix : Minimum value in forms should be greater than 0 (#7273)

* Triage Form Fix * Added Validation for Negative Values in forms * Update src/Components/Facility/ConsultationForm.tsx Co-authored-by: Khavin Shankar <[email protected]> * fix lint --------- Co-authored-by: Ashesh <[email protected]> Co-authored-by: Mohammed Nihal <[email protected]> Co-authored-by: Rithvik Nishad <[email protected]> Co-authored-by: Khavin Shankar <[email protected]> Co-authored-by: Rithvik Nishad <[email protected]>
ohcnetwork · May 7, 2024 · 9a1c337 · 9a1c337
1 parent ca4040e
commit 9a1c337
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 0 deletions.
diff --git a/src/Components/Facility/ConsultationForm.tsx b/src/Components/Facility/ConsultationForm.tsx
@@ -642,6 +642,18 @@ export const ConsultationForm = ({ facilityId, patientId, id }: Props) => {
           }
           return;
         }
+        case "weight":
+        case "height": {
+          if (state.form.suggestion !== "DD") {
+            const value = state.form[field];
+            if (!value || parseFloat(value) <= 0) {
+              errors[field] = `Please enter a valid ${field}`;
+              invalidForm = true;
+              break;
+            }
+          }
+          return;
+        }
 
         default:
           return;

diff --git a/src/Components/Facility/TriageForm.tsx b/src/Components/Facility/TriageForm.tsx
@@ -102,6 +102,42 @@ export const TriageForm = ({ facilityId, id }: Props) => {
             invalidForm = true;
           }
           return;
+        case "num_patients_visited":
+          if (state.form[field] < 0) {
+            errors[field] =
+              "Number of patients visited must be greater than or equal to 0";
+            invalidForm = true;
+          }
+          return;
+        case "num_patients_home_quarantine":
+          if (state.form[field] < 0) {
+            errors[field] =
+              "Number of patients in Home Qurantine must be greater than or equal to 0";
+            invalidForm = true;
+          }
+          return;
+        case "num_patients_isolation":
+          if (state.form[field] < 0) {
+            errors[field] =
+              "Number of patients in Isolation must be greater than or equal to 0";
+            invalidForm = true;
+          }
+          return;
+        case "num_patient_referred":
+          if (state.form[field] < 0) {
+            errors[field] =
+              "Number of patients referred must be greater than or equal to 0";
+            invalidForm = true;
+          }
+          return;
+        case "num_patient_confirmed_positive":
+          if (state.form[field] < 0) {
+            errors[field] =
+              "Number of patients confirmed positive must be greater than or equal to 0";
+            invalidForm = true;
+          }
+          return;
+
         default:
           return;
       }

diff --git a/src/Components/Patient/PatientRegister.tsx b/src/Components/Patient/PatientRegister.tsx
@@ -649,6 +649,16 @@ export const PatientRegister = (props: PatientRegisterProps) => {
             errors[field] = "Please select a blood group";
           }
           return;
+        case "number_of_primary_contacts":
+          if (form[field] < 0) {
+            errors[field] = "Number of primary contacts cannot be negative";
+          }
+          return;
+        case "number_of_secondary_contacts":
+          if (form[field] < 0) {
+            errors[field] = "Number of secondary contacts cannot be negative";
+          }
+          return;
 
         case "is_vaccinated":
           if (form.is_vaccinated === "true") {