Procházet zdrojové kódy

Caremonth single - fix graph error when opened in popup from rpm (admin)

Vijayakrishnan před 3 roky
rodič
revize
84e4ef4b79

+ 6 - 6
resources/views/app/patient/care-month/_vitals_graph_unified.blade.php

@@ -3,8 +3,8 @@
     <script src="/c3/d3.v5.min.js" charset="utf-8"></script>
     <script src="/c3/c3.min.js"></script>
 
-    <div id="vitalsGraphComponentUnified" class="stag-chart mb-4 pt-3">
-        <div id="unified-chart">Unified Graph</div>
+    <div id="vitalsGraphComponentUnified_{{$careMonth->id}}" class="stag-chart mb-4 pt-3">
+        <div id="unified-chart_{{$careMonth->id}}">Unified Graph</div>
     </div>
 
     <?php
@@ -91,9 +91,9 @@
                 unifiedChart();
             }
             function unifiedChart() {
-
-                window.vgBPChart = c3.generate({
-                    bindto: '#unified-chart',
+                if(typeof window['vgUnifiedChart_{{$careMonth->id}}'] !== 'undefined') return;
+                window['vgUnifiedChart_{{$careMonth->id}}'] = c3.generate({
+                    bindto: '#unified-chart_{{$careMonth->id}}',
                     data: {
                         xs: {
                             'Systolic BP' : 'x1',
@@ -148,6 +148,6 @@
                     ]
                 });
             }
-            addMCInitializer('vitalsGraphUnified', init, '#vitalsGraphComponentUnified');
+            addMCInitializer('vitalsGraphUnified_{{$careMonth->id}}', init, '#vitalsGraphComponentUnified_{{$careMonth->id}}');
         }).call(window);
     </script>

+ 5 - 0
resources/views/app/patient/care-month/dashboard.blade.php

@@ -1360,6 +1360,11 @@
                     $('#caremonth-measurements-calendar-{{$calendarID}}').parent().addClass('d-none');
                 }, 10);
 
+                // if in popup, invoke vitals graph initer
+                if($('#care-month-container-{{$patient->uid}}').closest('.stag-popup').length) {
+                    runMCInitializer('vitalsGraphUnified_{{$careMonth->id}}');
+                }
+
             }
 
             addMCInitializer('care-month-dashboard-{{$patient->uid}}', init, '#care-month-container-{{$patient->uid}}');

+ 0 - 8
resources/views/app/practice-management/rpm-matrix-for-admin-table.blade.php

@@ -11,14 +11,6 @@
     <div class="flex-grow-1 px-0 overflow-auto h-100 rpm-matrix-right-column">
         <?php $trIndex = 0; ?>
         @foreach ($patients as $iPatient)
-            <script>
-                addMCHook(
-                    'refresh-rpm-row-{{$trIndex}}',
-                    function () {
-                        refreshRpmRow({{$trIndex}});
-                    }
-                );
-            </script>
             <?php $trIndex++; ?>
         @endforeach
         <table class="table table-sm table-striped table-hover p-0 m-0 min-width-1100px" id="table-rm-matrix">