Преглед изворни кода

MRV in bottom sticky toolbar

Vijayakrishnan пре 3 година
родитељ
комит
fa1eb21ed6

+ 4 - 0
app/Http/Controllers/NoteController.php

@@ -304,6 +304,10 @@ class NoteController extends Controller
         }
     }
 
+    public function segmentSummary(Request $request, Segment $segment) {
+        return '<div class="mrv-content border-top px-3 pt-2 mt-3">' . @$segment->summary_html . '</div>';
+    }
+
     // TODO move to utility
     private function callJava($request, $endPoint, $data, $guestAccessCode = null)
     {

+ 18 - 15
public/css/style.css

@@ -2029,7 +2029,7 @@ body.in-iframe .main-row > .sidebar {
     border: 0 !important;
     overflow: hidden;
 }
-.note-section[data-segment-template-name="medrisk_vigilence"] {
+/*.note-section[data-segment-template-name="medrisk_vigilence"] {
     position: fixed;
     right: 0;
     top: 55px;
@@ -2039,21 +2039,14 @@ body.in-iframe .main-row > .sidebar {
     padding: 0 !important;
     border-left: 1px solid #ddd;
     transition: width 0.1s ease;
+}*/
+.on-trigger-only,
+.on-content-only {
+    display: none !important;
 }
-.note-section[data-segment-template-name="medrisk_vigilence"] .on-hover-only {
-    display: none;
-}
-.note-section[data-segment-template-name="medrisk_vigilence"]:hover {
-    padding: 1rem !important;
-    width: 550px;
-    border-left: 1px solid #ddd;
-    overflow: auto;
-}
-.note-section[data-segment-template-name="medrisk_vigilence"]:hover .on-hover-only {
-    display: block;
-}
-.note-section[data-segment-template-name="medrisk_vigilence"]:hover .on-hover-hide {
-    display: none;
+.mrv-trigger .on-trigger-only,
+.mrv-content .on-content-only {
+    display: inherit !important;
 }
 .mrv-badge {
     border-radius: 100%;
@@ -2074,4 +2067,14 @@ body.in-iframe .main-row > .sidebar {
 }
 .mrv-badge>span {
     font-size: 10px !important;
+}
+.note-bottom-toolbar {
+    bottom: 0;
+}
+.note-bottom-toolbar .nbt-container:hover {
+    cursor: pointer;
+    background: #fff !important;
+}
+[open-in-stag-popup] * {
+    pointer-events: none;
 }

+ 3 - 3
public/js/stag-popup.js

@@ -160,11 +160,11 @@ function hasResponseError(_data) {
             });
 
         $(document)
-            .off('click.open-in-stag-popup', 'a[open-in-stag-popup]')
-            .on('click.open-in-stag-popup', 'a[open-in-stag-popup]', function() {
+            .off('click.open-in-stag-popup', '[open-in-stag-popup]')
+            .on('click.open-in-stag-popup', '[open-in-stag-popup]', function() {
                 let trig = $(this);
                 openDynamicStagPopup(
-                    this.href,
+                    trig.attr('href'),
                     trig.attr('mc-initer'),
                     trig.attr('title'),
                     trig.is('[update-parent]'),

+ 29 - 2
resources/views/app/patient/note/dashboard.blade.php

@@ -515,7 +515,7 @@
                 </div>
                 @endif
                 <div class="note-rhs-content">
-            <div>
+                <div>
                 <div class="">
                     <div>
                         <?php
@@ -2207,7 +2207,34 @@
                     @include('app/patient/note/_cancel-signed-note')
                 </div>
 
-            </div>
+                </div>
+
+                    @if($isVisitTemplateBased)
+                    <div class="position-sticky note-bottom-toolbar border-top border-info p-0 bg-aliceblue d-flex align-items-stretch">
+                        <div class="nbt-container p-2 border-right border-info">
+                            <!-- render mrv segment here -->
+                            <?php $segment = null; ?>
+                            @foreach($note->segments as $segment)
+                                @if($segment->segmentTemplate->internal_name === 'medrisk_vigilence')
+                                    <div native target="_blank"
+                                         class="d-block c-pointer mrv-trigger d-flex align-items-center"
+                                         open-in-stag-popup
+                                         title="MedRisk Vigilance"
+                                         popup-style="stag-popup-md"
+                                         href="/segment-summary/{{$segment->uid}}">
+                                        <div class="text-info font-weight-bold text-center font-size-11">MRV</div>
+                                        {!! $segment->summary_html !!}
+                                    </div>
+                                @endif
+                            @endforeach
+                        </div>
+                        <div class="nbt-container p-2 border-right border-info d-flex align-items-center">
+                            <i class="fa fa-bolt mr-1"></i>
+                            Rx
+                        </div>
+                    </div>
+                    @endif
+
                 </div>
             </div>
         </div>

+ 0 - 2
resources/views/app/patient/note/dashboard_script.blade.php

@@ -341,8 +341,6 @@
                         $(this).find('.edit-trigger').first().click();
                         return false;
                     });
-                @else
-                    $('#patient-header').closest('[role="main"]').css('padding-right', '50px');
                 @endif
 
                 // $(document)

+ 3 - 1
resources/views/app/patient/note/note-segment-list.blade.php

@@ -1,6 +1,8 @@
 <div class="segments-list" id="note-segments-list">
     @foreach($note->segments as $segment)
-        @include('app.patient.note.segment')
+        <div class="{{$segment->segmentTemplate->internal_name === 'medrisk_vigilence' ? 'd-none' : ''}}">
+            @include('app.patient.note.segment')
+        </div>
     @endforeach
 </div>
 @include('app.patient.note.segment_script')

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

@@ -27,7 +27,7 @@
             </div>
         @else
             <span class="font-weight-bold d-flex align-items-center {{$isLSSegment || $iName === 'medrisk_vigilence' ? '' : 'mb-2'}}">
-			@if($isLSSegment && $iName === 'lifestyle_general')
+                @if($isLSSegment && $iName === 'lifestyle_general')
                     Lifestyle
                 @else
                     {{$segment->display_title}}
@@ -36,7 +36,7 @@
                 @if($segment->heading && $iName !== 'medrisk_vigilence')
                     <span class="text-secondary ml-2 text-sm font-weight-normal">({{$segment->heading}})</span>
                 @endif
-		</span>
+            </span>
         @endif
 
         @if($isLSSegment)

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

@@ -20,6 +20,15 @@
                                     segmentUid: _response.data.listenerSegmentUids[i]
                                 }, _data => {
                                     updateAllSegmentsInResponse(_data, false);
+
+                                    // ugly hack!
+                                    if(listenerSegmentTemplateName === 'medrisk_vigilence') {
+                                        $('.mrv-trigger')
+                                            .empty()
+                                            .append('<div class="text-info font-weight-bold text-center font-size-11">MRV</div>')
+                                            .append(_data.data.summaryHtml);
+                                    }
+
                                 }, 'json');
                             }
                         }

+ 12 - 12
resources/views/app/patient/segment-templates/medrisk_vigilence/summary.blade.php

@@ -28,8 +28,8 @@ $hasMRVData = false;
 
 @if(!!$dptInfo)
     <?php $hasMRVData = true; ?>
-    <div class="mrv-badge mt-2 align-self-center on-hover-hide mx-auto" title="Duplicate Therapy Notes"><span>DT</span></div>
-    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-hover-only">
+    <div class="mrv-badge ml-1 align-self-center on-trigger-only" title="Duplicate Therapy Notes"><span>DT</span></div>
+    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-content-only">
         <p class="font-weight-bold m-0 font-size-14 text-info">Duplicate Therapy Notes</p>
         <div class="mt-3 ml-3">
             {!! $dptInfo !!}
@@ -39,8 +39,8 @@ $hasMRVData = false;
 
 @if(!!$coadministration)
     <?php $hasMRVData = true; ?>
-    <div class="mrv-badge mt-2 align-self-center on-hover-hide mx-auto" title="Coadministration Notes"><span>CA</span></div>
-    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-hover-only">
+    <div class="mrv-badge ml-1 align-self-center on-trigger-only" title="Coadministration Notes"><span>CA</span></div>
+    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-content-only">
         <p class="font-weight-bold m-0 font-size-14 text-info">Coadministration Notes</p>
         <div class="mt-3 ml-3">
             {!! $coadministration !!}
@@ -50,8 +50,8 @@ $hasMRVData = false;
 
 @if(!!$dam)
     <?php $hasMRVData = true; ?>
-    <div class="mrv-badge mt-2 align-self-center on-hover-hide mx-auto" title="Drug Allergy Notes"><span>DA</span></div>
-    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-hover-only">
+    <div class="mrv-badge ml-1 align-self-center on-trigger-only" title="Drug Allergy Notes"><span>DA</span></div>
+    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-content-only">
         <p class="font-weight-bold m-0 font-size-14 text-info">Drug Allergy Notes</p>
         <div class="mt-3 ml-3">
             {!! $dam !!}
@@ -61,8 +61,8 @@ $hasMRVData = false;
 
 @if(!!$ddi)
     <?php $hasMRVData = true; ?>
-    <div class="mrv-badge mt-2 align-self-center on-hover-hide mx-auto" title="Drug-Drug Interaction Notes"><span>DI</span></div>
-    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-hover-only">
+    <div class="mrv-badge ml-1 align-self-center on-trigger-only" title="Drug-Drug Interaction Notes"><span>DI</span></div>
+    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-content-only">
         <p class="font-weight-bold m-0 font-size-14 text-info">Drug-Drug Interaction Notes</p>
         <div class="mt-3 ml-3">
             {!! $ddi !!}
@@ -72,8 +72,8 @@ $hasMRVData = false;
 
 @if(count($sideeffects))
     <?php $hasMRVData = true; ?>
-    <div class="mrv-badge mt-2 align-self-center on-hover-hide mx-auto" title="Side Effects"><span>SE</span></div>
-    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-hover-only">
+    <div class="mrv-badge ml-1 align-self-center on-trigger-only" title="Side Effects"><span>SE</span></div>
+    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-content-only">
         <p class="font-weight-bold m-0 font-size-14 text-info">Side Effects</p>
         @foreach($sideeffects as $drug => $sideeffect)
             <div class="mt-3 ml-3">
@@ -90,8 +90,8 @@ $hasMRVData = false;
 
 @if(count($contraindications))
     <?php $hasMRVData = true; ?>
-    <div class="mrv-badge mt-2 align-self-center on-hover-hide mx-auto" title="Contraindications"><span>CI</span></div>
-    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-hover-only">
+    <div class="mrv-badge ml-1 align-self-center on-trigger-only" title="Contraindications"><span>CI</span></div>
+    <div class="p-3 mb-3 mt-2 border bg-white mr-0 on-content-only">
         <p class="font-weight-bold m-0 font-size-14 text-info">Contraindications</p>
         @foreach($contraindications as $drug => $contraindication)
             <div class="mt-3 ml-3">

+ 1 - 0
routes/web.php

@@ -315,6 +315,7 @@ Route::middleware('pro.auth')->group(function () {
     Route::get('/point/review-log/{point}', 'NoteController@reviewLog')->name('point-review-log');
     Route::get('/point/plan-log/{point}', 'NoteController@planLog')->name('point-plan-log');
     Route::get('/note/pdf/{note}', 'NoteController@downloadAsPdf')->name('note-pdf');
+    Route::get('/segment-summary/{segment}', 'NoteController@segmentSummary')->name('segment-summary');
 
     //mb claim single view
     Route::get('mb-claims/view/{mbClaim}', 'PatientController@mbClaim')->name('mb-claim');