fixed triage submission

FEMR · Dec 11, 2024 · 7900611 · 7900611
1 parent c10dbf3
commit 7900611
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/public/js/triage/triage.js b/public/js/triage/triage.js
@@ -391,8 +391,8 @@ var triageFields = {
         address: $('#address'),
         phoneNumber: $('#phoneNumber'),
         age: $('#age'),//doesn't work for an existing patient
-        years: $('#years'),
-        months: $('#months'),
+        years: $('#yearsInput'),
+        months: $('#monthsInput'),
         ageClassification: $('[name=ageClassification]'),
         city: $('#city'),
         maleButton: $('#maleBtn'),
@@ -691,8 +691,14 @@ $(document).ready(function () {
                 //checkIfDuplicatePatient();
                 checkIfDuplicatePatientMatch();
             }
+
             pass = !isDiabeticScreeningPromptNecessary;
         }
+
+        if (pass === true) {
+            $('.triage-form').submit(); // Submit the form only if validation is successful
+        }
+
         return pass; //located in triageClientValidation.js
     });
 

diff --git a/public/js/triage/triageClientValidation.js b/public/js/triage/triageClientValidation.js
@@ -34,7 +34,7 @@ var triageFieldValidator = {
         }
 
         //Validate Age
-        if ( (patientInformation.months.val().length > 0 && !integerCheck(patientInformation.months.val())) ||
+        if ((patientInformation.months.val().length > 0 && !integerCheck(patientInformation.months.val())) ||
             (patientInformation.years.val().length > 0 && !integerCheck(patientInformation.years.val()))
         ){
             $('#ageClassificationWrap').children(".generalInfoInput").addClass("has-errors");