瀏覽代碼

Sidebar, file org updates for tickets

Vijayakrishnan 4 年之前
父節點
當前提交
f16dc27d92

+ 30 - 0
app/Http/Controllers/PatientController.php

@@ -43,6 +43,36 @@ class PatientController extends Controller
         return view('app.patient.action-items', compact('patient', 'facilities'));
     }
 
+    public function actionItemsErx(Request $request, Client $patient)
+    {
+        $facilities = Facility::where('is_active', true)->get();
+        return view('app.patient.action-items-erx', compact('patient', 'facilities'));
+    }
+
+    public function actionItemsLab(Request $request, Client $patient)
+    {
+        $facilities = Facility::where('is_active', true)->get();
+        return view('app.patient.action-items-lab', compact('patient', 'facilities'));
+    }
+
+    public function actionItemsImaging(Request $request, Client $patient)
+    {
+        $facilities = Facility::where('is_active', true)->get();
+        return view('app.patient.action-items-imaging', compact('patient', 'facilities'));
+    }
+
+    public function actionItemsEquipment(Request $request, Client $patient)
+    {
+        $facilities = Facility::where('is_active', true)->get();
+        return view('app.patient.action-items-equipment', compact('patient', 'facilities'));
+    }
+
+    public function actionItemsOther(Request $request, Client $patient)
+    {
+        $facilities = Facility::where('is_active', true)->get();
+        return view('app.patient.action-items-other', compact('patient', 'facilities'));
+    }
+
     public function intake(Request $request, Client $patient )
     {
         $files = File::allFiles(resource_path('views/app/intake-templates'));

+ 19 - 1
public/css/style.css

@@ -58,6 +58,24 @@
 .sidebar .nav-item {
     margin-right: 0;
 }
+.sidebar .nav-item .nav-child-list {
+    list-style: none;
+}
+.sidebar .nav-item .nav-child-list .nav-item .nav-link {
+    padding-left: 2rem;
+}
+.sidebar .if-not-collapsed, .sidebar .if-collapsed {
+    display: none;
+}
+.sidebar .nav-item.nav-child-collapsed .if-collapsed {
+    display: block;
+}
+.sidebar .nav-item:not(.nav-child-collapsed) .if-not-collapsed {
+    display: block;
+}
+.sidebar .nav-item.nav-child-collapsed .nav-child-list {
+    display: none;
+}
 .navbar-dark .nav-item .nav-link {
   color: #fff;
 }
@@ -405,7 +423,7 @@ input.search_field, textarea.search_field {
         top: 55px;
         z-index: 8;
         height: calc(100% - 55px);
-        overflow-y: auto;
+        overflow-y: overlay;
     }
     .main-row {
         padding-left: 180px;

+ 25 - 0
resources/views/app/patient/action-items-equipment.blade.php

@@ -0,0 +1,25 @@
+@extends ('layouts.patient')
+<?php
+/** @var \App\Models\Client $patient */
+?>
+@section('inner-content')
+
+    <div class="mb-5">
+
+    @include('app/patient/partials/erx')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/lab')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/imaging')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/equipment')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/other')
+
+    </div>
+
+@endsection

+ 25 - 0
resources/views/app/patient/action-items-erx.blade.php

@@ -0,0 +1,25 @@
+@extends ('layouts.patient')
+<?php
+/** @var \App\Models\Client $patient */
+?>
+@section('inner-content')
+
+    <div class="mb-5">
+
+    @include('app/patient/partials/erx')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/lab')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/imaging')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/equipment')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/other')
+
+    </div>
+
+@endsection

+ 25 - 0
resources/views/app/patient/action-items-imaging.blade.php

@@ -0,0 +1,25 @@
+@extends ('layouts.patient')
+<?php
+/** @var \App\Models\Client $patient */
+?>
+@section('inner-content')
+
+    <div class="mb-5">
+
+    @include('app/patient/partials/erx')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/lab')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/imaging')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/equipment')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/other')
+
+    </div>
+
+@endsection

+ 25 - 0
resources/views/app/patient/action-items-lab.blade.php

@@ -0,0 +1,25 @@
+@extends ('layouts.patient')
+<?php
+/** @var \App\Models\Client $patient */
+?>
+@section('inner-content')
+
+    <div class="mb-5">
+
+    @include('app/patient/partials/erx')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/lab')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/imaging')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/equipment')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/other')
+
+    </div>
+
+@endsection

+ 25 - 0
resources/views/app/patient/action-items-other.blade.php

@@ -0,0 +1,25 @@
+@extends ('layouts.patient')
+<?php
+/** @var \App\Models\Client $patient */
+?>
+@section('inner-content')
+
+    <div class="mb-5">
+
+    @include('app/patient/partials/erx')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/lab')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/imaging')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/equipment')
+
+    <hr class="m-neg-4 my-4">
+    @include('app/patient/partials/other')
+
+    </div>
+
+@endsection

+ 31 - 5
resources/views/layouts/patient.blade.php

@@ -45,10 +45,36 @@
                             <a class="nav-link {{ strpos($routeName, 'patients.view.handouts') === 0 ? 'active' : '' }}"
                                href="{{ route('patients.view.handouts', ['patient' => $patient]) }}">Handouts</a>
                         </li>
-                        <li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.action-items') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.action-items', ['patient' => $patient]) }}">ERx/Orders</a>
-                        </li>
+                            <li class="nav-item">
+                                <a class="nav-link d-flex align-items-center {{ strpos($routeName, 'patients.view.action-items') === 0 ? 'active' : '' }}"
+                                   native onclick="return false">
+                                    <span class="text-dark">ERx/Orders</span>
+                                    {{--<i class="fa if-collapsed fa-chevron-down text-secondary ml-auto mr-1"></i>
+                                    <i class="fa if-not-collapsed fa-chevron-up text-secondary ml-auto mr-1"></i>--}}
+                                </a>
+                                <ul class="m-0 p-0 nav-child-list">
+                                    <li class="nav-item">
+                                        <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-erx') === 0 ? 'active' : '' }}"
+                                           href="{{ route('patients.view.action-items-erx', ['patient' => $patient]) }}">ERx</a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-lab') === 0 ? 'active' : '' }}"
+                                           href="{{ route('patients.view.action-items-lab', ['patient' => $patient]) }}">Lab</a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-imaging') === 0 ? 'active' : '' }}"
+                                           href="{{ route('patients.view.action-items-imaging', ['patient' => $patient]) }}">Imaging</a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-equipment') === 0 ? 'active' : '' }}"
+                                           href="{{ route('patients.view.action-items-equipment', ['patient' => $patient]) }}">Equipment</a>
+                                    </li>
+                                    <li class="nav-item">
+                                        <a class="nav-link {{ strpos($routeName, 'patients.view.action-items-other') === 0 ? 'active' : '' }}"
+                                           href="{{ route('patients.view.action-items-other', ['patient' => $patient]) }}">Other</a>
+                                    </li>
+                                </ul>
+                            </li>
                         <li class="nav-item">
                             <a class="nav-link {{ strpos($routeName, 'patients.view.allergies') === 0 ? 'active' : '' }}"
                                href="{{ route('patients.view.allergies', ['patient' => $patient]) }}">Allergies</a>
@@ -381,7 +407,7 @@
                                                 </div>
                                             </form>
                                         </span>
-                                        
+
                                     </div>
                                 </section>
                                 {{--<section>

+ 8 - 4
resources/views/layouts/template.blade.php

@@ -191,6 +191,10 @@
 
     <script>
         $(document).ready(function() {
+            window.toggleChildLinks = function(_element) {
+                $(_element).closest('.nav-item').toggleClass('nav-child-collapsed');
+                return false;
+            }
             const debounce = (func, wait) => {
                 let timeout;
                 return function executedFunction(...args) {
@@ -291,13 +295,13 @@
 
             window.socketClient.subscribe("/user/topic/newMcpRequest", function(message) {
                 console.log("Received new mcp request: ", message);
-                //TODO: Update the mcp queue on the DOM 
+                //TODO: Update the mcp queue on the DOM
             }); // once in 15 seconds
 
             window.socketClient.subscribe("/user/topic/removeMcpRequest", function(message) {
                 console.log("An mcp request has been removed: ", message);
-                //TODO: Update the mcp queue on the DOM 
-            }); 
+                //TODO: Update the mcp queue on the DOM
+            });
 
             window.socketClient.subscribe("/user/topic/myCurrentProClientWork", function(message) {
                 console.log("You have a client pro work: ", message);
@@ -305,7 +309,7 @@
                     $('.current-work').html(_data);
                     initFastLoad($('.current-work'));
                 });
-            });   
+            });
 
         });
     </script>

+ 5 - 0
routes/web.php

@@ -101,6 +101,11 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('immunizations', 'PatientController@immunizations')->name('immunizations');
         Route::get('allergies', 'PatientController@allergies')->name('allergies');
         Route::get('action-items', 'PatientController@actionItems')->name('action-items');
+        Route::get('action-items-erx', 'PatientController@actionItemsErx')->name('action-items-erx');
+        Route::get('action-items-lab', 'PatientController@actionItemsLab')->name('action-items-lab');
+        Route::get('action-items-imaging', 'PatientController@actionItemsImaging')->name('action-items-imaging');
+        Route::get('action-items-equipment', 'PatientController@actionItemsEquipment')->name('action-items-equipment');
+        Route::get('action-items-other', 'PatientController@actionItemsOther')->name('action-items-other');
         Route::get('notes/{filter?}', 'PatientController@notes')->name('notes');
         Route::name('notes.view.')->prefix('notes/view/{note}')->group(function () {
             Route::get('', 'NoteController@dashboard')->name('dashboard');