UHM-5972: code refactoring for Fix start and end dates for syphilis (#156)

Author: louidorjp

configuration/pih/htmlforms/hiv/section-hiv-state.xml

@@ -165,8 +165,7 @@
                 );
 
                 setUpNextButtonForSections('hiv-state');
-                setUpDatepickerStartAndEndDateValidation('mom-syph-treat-start','mom-syph-treat-end');
-                setUpDatepickerStartAndEndDateValidation('partner-syph-treat-start','partner-syph-treat-end');
+                setUpDatepickerStartAndEndDateValidation();
                 setUpObsWithObsDateTime('syph-checkbox');
             });
         </script>
@@ -956,9 +955,9 @@
                                 <obs conceptId="CIEL:1628" style="checkbox" answerConceptId="CIEL:112493"
                                      answerCode="pihcore.syphilisTreatmentPregnantMother" toggle="mom-syph-treat"/>
                             </p>
-                            <p id="mom-syph-treat">
-                                <obs id="mom-syph-treat-start" conceptId="CIEL:163526" labelCode="pihcore.treatmentStartDate"/>
-                                <obs id="mom-syph-treat-end" conceptId="CIEL:164384" labelCode="pihcore.treatmentEndDate"/>
+                            <p id="mom-syph-treat" class="startDateEndDate">
+                                <obs id="mom-syph-treat-start" conceptId="CIEL:163526" labelCode="pihcore.treatmentStartDate" class="startDate"/>
+                                <obs id="mom-syph-treat-end" conceptId="CIEL:164384" labelCode="pihcore.treatmentEndDate" class="endDate"/>
                             </p>
                         </obsgroup>
                     </div>
@@ -969,9 +968,9 @@
                                 <obs conceptId="CIEL:1628" style="checkbox" answerConceptId="CIEL:112493"
                                      answerCode="pihcore.syphilisTreatmentPartner" toggle="partner-syph-treat"/>
                             </p>
-                            <p id="partner-syph-treat">
-                                <obs id="partner-syph-treat-start" conceptId="CIEL:163526" labelCode="pihcore.treatmentStartDate" />
-                                <obs id="partner-syph-treat-end" conceptId="CIEL:164384" labelCode="pihcore.treatmentEndDate" />
+                            <p id="partner-syph-treat" class="startDateEndDate">
+                                <obs id="partner-syph-treat-start" conceptId="CIEL:163526" labelCode="pihcore.treatmentStartDate" class="startDate"/>
+                                <obs id="partner-syph-treat-end" conceptId="CIEL:164384" labelCode="pihcore.treatmentEndDate" class="endDate"/>
                             </p>
                         </obsgroup>
                     </div>

configuration/pih/htmlforms/hiv/section-pmtct-history.xml

@@ -134,8 +134,7 @@
                 setUpNextButtonForSections('pmtct-history');
                 setUpExpandableContacts('<uimessage code="pihcore.invalid.phoneNumber"/>');
                 setUpExpandableTransferAndReferralDetails();
-                setUpDatepickerStartAndEndDateValidation('mom-syph-treat-start','mom-syph-treat-end');
-                setUpDatepickerStartAndEndDateValidation('partner-syph-treat-start','partner-syph-treat-end');
+                setUpDatepickerStartAndEndDateValidation();
                 setUpObsWithObsDateTime('syph-checkbox');
             });
         </script>
@@ -482,9 +481,9 @@
                                  answerCode="pihcore.syphilisTreatmentPregnantMother"
                                  toggle="mom-syph-treat"/>
                         </p>
-                        <p id="mom-syph-treat">
-                            <obs id="mom-syph-treat-start" conceptId="CIEL:163526" labelCode="pihcore.treatmentStartDate"/>
-                            <obs id="mom-syph-treat-end" conceptId="CIEL:164384" labelCode="pihcore.treatmentEndDate"/>
+                        <p id="mom-syph-treat" class="startDateEndDate">
+                            <obs id="mom-syph-treat-start" conceptId="CIEL:163526" labelCode="pihcore.treatmentStartDate" class="startDate"/>
+                            <obs id="mom-syph-treat-end" conceptId="CIEL:164384" labelCode="pihcore.treatmentEndDate" class="endDate"/>
                         </p>
                     </obsgroup>
                 </div>
@@ -496,9 +495,9 @@
                                  answerConceptId="CIEL:112493"
                                  answerCode="pihcore.syphilisTreatmentPartner" toggle="partner-syph-treat"/>
                         </p>
-                        <p id="partner-syph-treat">
-                            <obs id="partner-syph-treat-start" conceptId="CIEL:163526" labelCode="pihcore.treatmentStartDate" />
-                            <obs id="partner-syph-treat-end" conceptId="CIEL:164384" labelCode="pihcore.treatmentEndDate" />
+                        <p id="partner-syph-treat" class="startDateEndDate">
+                            <obs id="partner-syph-treat-start" conceptId="CIEL:163526" labelCode="pihcore.treatmentStartDate" class="startDate"/>
+                            <obs id="partner-syph-treat-end" conceptId="CIEL:164384" labelCode="pihcore.treatmentEndDate" class="endDate"/>
                         </p>
                     </obsgroup>
                 </div>

configuration/pih/scripts/global/zl.js

@@ -93,28 +93,31 @@ function setUpExpandableContacts(badPhoneNumberMsg) {
  * and that the "end date" cannot be before the "start date" by updating the min and max dates of the respective
  * datepickers
  */
-function setUpDatepickerStartAndEndDateValidation(startDateWidgetId, endDateWidgetId){
+function setUpDatepickerStartAndEndDateValidation(){
 
-    const startDatepicker = getField(startDateWidgetId + '.value');
-    const endDatepicker = getField(endDateWidgetId + '.value');
+    jq(".startDateEndDate").each(function (j, domEl) {
 
-    if (startDatepicker) {
-      startDatepicker.change(function () {
-        let startDate = getField(startDateWidgetId + '.value').datepicker('getDate');
-        if (startDate) {
-          endDatepicker.datepicker('option', 'minDate', startDate);
+        const startDatepicker = jq(jq(this).find('.startDate'));
+        const endDatepicker = jq(jq(this).find('.endDate'));
+
+        if (startDatepicker) {
+            startDatepicker.change(function () {
+                let startDate = startDatepicker.find('input[type=text]').datepicker('getDate');
+                if (startDate) {
+                    endDatepicker.find('input[type=text]').datepicker('option', 'minDate', startDate);
+                }
+            });
         }
-      });
-    }
 
-    if (endDatepicker) {
-      endDatepicker.change(function() {
-        let endDate = getField(endDateWidgetId + '.value').datepicker('getDate');
-        if (endDate) {
-          startDatepicker.datepicker('option', 'maxDate', endDate);
+        if (endDatepicker) {
+            endDatepicker.change(function () {
+                let endDate = endDatepicker.find('input[type=text]').datepicker('getDate');
+                if (endDate) {
+                    startDatepicker.find('input[type=text]').datepicker('option', 'maxDate', endDate);
+                }
+            });
         }
-      });
-    }
+    });
 }
 
 function setUpExpandableTransferAndReferralDetails(){