Jelajahi Sumber

LS segments - refresh fix

Vijayakrishnan 3 tahun lalu
induk
melakukan
c2bfed8766

+ 19 - 18
resources/views/app/patient/note/segment.blade.php

@@ -53,14 +53,12 @@
 
     <?php endif ?>
 
-</div>
-
-<!-- popup hack for LS segments -->
-<?php if(strpos($segment->segmentTemplate->internal_name, 'lifestyle_') === 0): ?>
-<div class="stag-popup stag-popup-md"
-     stag-popup-key="segment-popup-<?= $segment->segmentTemplate->internal_name ?>">
-    <div class="stag-popup-content">
-        <h3 class="stag-popup-title m-neg-3 px-3 mt-0 pb-3 border-bottom mb-3 pt-1">
+    <!-- popup hack for LS segments -->
+    <?php if(strpos($segment->segmentTemplate->internal_name, 'lifestyle_') === 0): ?>
+    <div class="stag-popup stag-popup-md"
+         stag-popup-key="segment-popup-<?= $segment->segmentTemplate->internal_name ?>">
+        <div class="stag-popup-content">
+            <h3 class="stag-popup-title m-neg-3 px-3 mt-0 pb-3 border-bottom mb-3 pt-1">
             <span class="d-inline-flex align-items-center">
                 @if($segment->subheading)
                     {{$segment->subheading}}
@@ -69,16 +67,19 @@
                 {{$segment->display_title}}
             </span>
 
-            <a href="#" class="ml-auto text-secondary" onclick="return closeStagPopup()">
-                <i class="fa fa-times-circle"></i>
-            </a>
-        </h3>
-{{--        <div class="ls-segment-summary-html">--}}
-{{--            {!! $segment->summary_html !!}--}}
-{{--        </div>--}}
-        <div class="ls-segment-edit-html">
-            {!! $segment->edit_html !!}
+                <a href="#" class="ml-auto text-secondary" onclick="return closeStagPopup()">
+                    <i class="fa fa-times-circle"></i>
+                </a>
+            </h3>
+            {{--        <div class="ls-segment-summary-html">--}}
+            {{--            {!! $segment->summary_html !!}--}}
+            {{--        </div>--}}
+            <div class="ls-segment-edit-html">
+                {!! $segment->edit_html !!}
+            </div>
         </div>
     </div>
+    <?php endif ?>
+
 </div>
-<?php endif ?>
+

+ 7 - 0
resources/views/app/patient/note/segment_script.blade.php

@@ -37,6 +37,13 @@
             if(segment && segment.length) {
                 segment.find('.summary-container').html(_summaryHtml);
                 segment.find('.edit-container').html(_editHtml);
+
+                // special case for lifestyle
+                let popupContainer = $('[stag-popup-key="segment-popup-' + segment.attr('data-segment-template-name') + '"] .ls-segment-edit-html');
+                if(popupContainer.length) {
+                    popupContainer.html(_editHtml);
+                }
+
                 initRTEs(segment);
                 initSegmentMoes(segment);
                 initMoes();