Parcourir la source

Medications - DOM scope fix

Vijayakrishnan il y a 3 ans
Parent
commit
dbc7eb6027

+ 17 - 17
resources/views/app/patient/segment-templates/intake_medications/edit.blade.php

@@ -133,11 +133,11 @@ $medications = Point::getIntakePointsOfCategory($patient, 'MEDICATION', $note);
                 // _data is {med_name_id: "50567", text: "Children's Tylenol"}
 
                 let medNameID = _data.med_name_id;
-                $('input[data-name="medNameId"]').val(medNameID);
+                parentSegment.find('input[data-name="medNameId"]').val(medNameID);
 
-                let routeSelect = $('[data-name="routedMedId"]').empty().prop('disabled', true);
-                let dosageSelect = $('[data-name="routedDosageFormMedId"]').empty().prop('disabled', true);
-                let strengthSelect = $('[data-name="gcnSeqno"]').empty().prop('disabled', true);
+                let routeSelect = parentSegment.find('[data-name="routedMedId"]').empty().prop('disabled', true);
+                let dosageSelect = parentSegment.find('[data-name="routedDosageFormMedId"]').empty().prop('disabled', true);
+                let strengthSelect = parentSegment.find('[data-name="gcnSeqno"]').empty().prop('disabled', true);
 
                 $.get('/fdb-routed-meds?med-name-id=' + medNameID, _data => {
                     routeSelect
@@ -154,14 +154,14 @@ $medications = Point::getIntakePointsOfCategory($patient, 'MEDICATION', $note);
             });
 
         // on route selection
-        $(document).off('change', '[data-name="routedMedId"]');
-        $(document).on('change', '[data-name="routedMedId"]', function () {
+        $(document).off('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="routedMedId"]');
+        $(document).on('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="routedMedId"]', function () {
 
             // clear
-            let dosageSelect = $('[data-name="routedDosageFormMedId"]').empty().prop('disabled', true);
-            let strengthSelect = $('[data-name="gcnSeqno"]').empty().prop('disabled', true);
+            let dosageSelect = parentSegment.find('[data-name="routedDosageFormMedId"]').empty().prop('disabled', true);
+            let strengthSelect = parentSegment.find('[data-name="gcnSeqno"]').empty().prop('disabled', true);
             let routedMedID = $(this).val();
-            $('input[data-name="route"]').val($(this).find('option:selected').text());
+            parentSegment.find('input[data-name="route"]').val($(this).find('option:selected').text());
 
             $.get('/fdb-routed-dosages?routed-med-id=' + routedMedID, _data => {
                 dosageSelect
@@ -178,13 +178,13 @@ $medications = Point::getIntakePointsOfCategory($patient, 'MEDICATION', $note);
         });
 
         // on dosage selection
-        $(document).off('change', '[data-name="routedDosageFormMedId"]');
-        $(document).on('change', '[data-name="routedDosageFormMedId"]', function () {
+        $(document).off('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="routedDosageFormMedId"]');
+        $(document).on('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="routedDosageFormMedId"]', function () {
 
             // clear
-            let strengthSelect = $('[data-name="gcnSeqno"]').empty().prop('disabled', true);
+            let strengthSelect = parentSegment.find('[data-name="gcnSeqno"]').empty().prop('disabled', true);
             let dosageFormMedID = $(this).val();
-            $('input[data-name="dose"]').val($(this).find('option:selected').text());
+            parentSegment.find('input[data-name="dose"]').val($(this).find('option:selected').text());
 
             $.get('/fdb-meds?dosage-form-med-id=' + dosageFormMedID, _data => {
                 strengthSelect
@@ -202,11 +202,11 @@ $medications = Point::getIntakePointsOfCategory($patient, 'MEDICATION', $note);
         });
 
         // on strength (medid) selection
-        $(document).off('change', '[data-name="gcnSeqno"]');
-        $(document).on('change', '[data-name="gcnSeqno"]', function () {
+        $(document).off('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="gcnSeqno"]');
+        $(document).on('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="gcnSeqno"]', function () {
 
-            $('input[data-name="medId"]').val($(this).find('option:selected').attr('data-medid'));
-            $('input[data-name="strength"]').val($(this).find('option:selected').text());
+            parentSegment.find('input[data-name="medId"]').val($(this).find('option:selected').attr('data-medid'));
+            parentSegment.find('input[data-name="strength"]').val($(this).find('option:selected').text());
 
         });
 

+ 19 - 18
resources/views/app/patient/segment-templates/plan_medications/edit.blade.php

@@ -125,7 +125,8 @@ $intakeOrVisit = 'PLAN';
         // any JS can come here
         // will be run on page-load as well as whenever this segment is refreshed
 
-        $('input[stag-suggest][data-name="name"]')
+        let parentSegment = $('[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] ');
+        parentSegment.find('input[stag-suggest][data-name="name"]')
             .off('stag-suggest-selected')
             .on('stag-suggest-selected', (_e, _input, _data) => {
 
@@ -133,11 +134,11 @@ $intakeOrVisit = 'PLAN';
                 // _data is {med_name_id: "50567", text: "Children's Tylenol"}
 
                 let medNameID = _data.med_name_id;
-                $('input[data-name="medNameId"]').val(medNameID);
+                parentSegment.find('input[data-name="medNameId"]').val(medNameID);
 
-                let routeSelect = $('[data-name="routedMedId"]').empty().prop('disabled', true);
-                let dosageSelect = $('[data-name="routedDosageFormMedId"]').empty().prop('disabled', true);
-                let strengthSelect = $('[data-name="gcnSeqno"]').empty().prop('disabled', true);
+                let routeSelect = parentSegment.find('[data-name="routedMedId"]').empty().prop('disabled', true);
+                let dosageSelect = parentSegment.find('[data-name="routedDosageFormMedId"]').empty().prop('disabled', true);
+                let strengthSelect = parentSegment.find('[data-name="gcnSeqno"]').empty().prop('disabled', true);
 
                 $.get('/fdb-routed-meds?med-name-id=' + medNameID, _data => {
                     routeSelect
@@ -154,14 +155,14 @@ $intakeOrVisit = 'PLAN';
             });
 
         // on route selection
-        $(document).off('change', '[data-name="routedMedId"]');
-        $(document).on('change', '[data-name="routedMedId"]', function () {
+        $(document).off('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="routedMedId"]');
+        $(document).on('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="routedMedId"]', function () {
 
             // clear
-            let dosageSelect = $('[data-name="routedDosageFormMedId"]').empty().prop('disabled', true);
-            let strengthSelect = $('[data-name="gcnSeqno"]').empty().prop('disabled', true);
+            let dosageSelect = parentSegment.find('[data-name="routedDosageFormMedId"]').empty().prop('disabled', true);
+            let strengthSelect = parentSegment.find('[data-name="gcnSeqno"]').empty().prop('disabled', true);
             let routedMedID = $(this).val();
-            $('input[data-name="route"]').val($(this).find('option:selected').text());
+            parentSegment.find('input[data-name="route"]').val($(this).find('option:selected').text());
 
             $.get('/fdb-routed-dosages?routed-med-id=' + routedMedID, _data => {
                 dosageSelect
@@ -178,13 +179,13 @@ $intakeOrVisit = 'PLAN';
         });
 
         // on dosage selection
-        $(document).off('change', '[data-name="routedDosageFormMedId"]');
-        $(document).on('change', '[data-name="routedDosageFormMedId"]', function () {
+        $(document).off('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="routedDosageFormMedId"]');
+        $(document).on('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="routedDosageFormMedId"]', function () {
 
             // clear
-            let strengthSelect = $('[data-name="gcnSeqno"]').empty().prop('disabled', true);
+            let strengthSelect = parentSegment.find('[data-name="gcnSeqno"]').empty().prop('disabled', true);
             let dosageFormMedID = $(this).val();
-            $('input[data-name="dose"]').val($(this).find('option:selected').text());
+            parentSegment.find('input[data-name="dose"]').val($(this).find('option:selected').text());
 
             $.get('/fdb-meds?dosage-form-med-id=' + dosageFormMedID, _data => {
                 strengthSelect
@@ -202,11 +203,11 @@ $intakeOrVisit = 'PLAN';
         });
 
         // on strength (medid) selection
-        $(document).off('change', '[data-name="gcnSeqno"]');
-        $(document).on('change', '[data-name="gcnSeqno"]', function () {
+        $(document).off('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="gcnSeqno"]');
+        $(document).on('change', '[data-segment-template-name="<?= $segment->segmentTemplate->internal_name ?>"] [data-name="gcnSeqno"]', function () {
 
-            $('input[data-name="medId"]').val($(this).find('option:selected').attr('data-medid'));
-            $('input[data-name="strength"]').val($(this).find('option:selected').text());
+            parentSegment.find('input[data-name="medId"]').val($(this).find('option:selected').attr('data-medid'));
+            parentSegment.find('input[data-name="strength"]').val($(this).find('option:selected').text());
 
         });