Forráskód Böngészése

Caremonth popup from note leanview

Vijayakrishnan 3 éve
szülő
commit
b4fff372f3

+ 15 - 3
resources/views/app/patient/care-month/dashboard.blade.php

@@ -1,10 +1,16 @@
 <?php
 /** @var App\Models\CareMonth $careMonth */
 /** @var App\Models\Pro $pro */
+
+    $leanView = request()->input('popupmode') && request()->input('fromNoteUid');
+
 ?>
-@extends ('layouts.patient')
 
-@section('inner-content')
+@extends($leanView ? 'layouts.empty' : 'layouts.patient')
+
+@section($leanView ? 'content' : 'inner-content')
+
+    <div class="popup-content-container {{$leanView ? 'px-3 mx-1 pb-3' : ''}}">
 
     <?php
     $shortCutsObject = [];
@@ -88,6 +94,8 @@
     @else
 
     <div id="care-month-container-{{$patient->uid}}">
+
+        @if(!$leanView)
         <div class="pt-2 d-flex align-items-start">
             <h6 class="my-0 text-secondary d-flex align-items-start">
                 <a href="/patients/view/{{ $patient->uid }}/care-months" class="small text-decoration-none mr-3">
@@ -101,7 +109,9 @@
             </h6>
         </div>
 
-        <hr class="m-negator mb-0">
+        @endif
+
+        <hr class="m-negator mb-0 {{ $leanView ? 'mt-0' : '' }}">
 
         <div class="row m-negator bg-light py-1 text-sm-incl-children">
             <div class="col-3 pl-3-5">
@@ -1948,4 +1958,6 @@
     </script>
 
     @endif
+
+    </div>
 @endsection

+ 1 - 1
resources/views/app/patient/note/rhs-sidebar.blade.php

@@ -10,7 +10,7 @@
          mc-initer="care-month-dashboard-{{$patient->uid}}"
          title="Care Month: {{friendly_month($careMonth->start_date)}}"
          popup-style="overflow-visible"
-         href="/patients/view/{{ $note->client->uid }}/care-months/view/{{$careMonth->uid}}">
+         href="/patients/view/{{ $note->client->uid }}/care-months/view/{{$careMonth->uid}}?fromNoteUid={{$note->uid}}">
         <div class="font-weight-bold">
             Recent Measurements
         </div>