Browse Source

Manage supply order- auto-go to new record after create

Vijayakrishnan 3 years ago
parent
commit
f676348277

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

@@ -820,6 +820,7 @@
                                update-parent
                                mc-initer="patient-supply-orders"
                                title="{{$patient->displayName()}} - Supply Orders"
+                               popup-style="medium"
                                href="/patients/view/{{$patient->uid}}/supply-orders?popupmode=1&note-uid={{$note->uid}}&filter=active">
                                 Manage Supply Orders
                             </a>
@@ -829,7 +830,7 @@
                             <p class="font-weight-bold text-secondary mb-2 mr-2">Associated with this note</p>
                             <div>
                                 @if($supplyOrdersOnNote && count($supplyOrdersOnNote))
-                                    <table class="table table-sm table-bordered mb-0">
+                                    <table class="table table-sm table-bordered mb-0 bg-white">
                                         <thead>
                                         <tr class="bg-light">
                                             <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Title</div></th>
@@ -879,7 +880,7 @@
 
                             <p class="font-weight-bold text-secondary mb-2 mr-2">Others as of {{friendlier_date(date('Y-m-d'))}}</p>
                             @if($otherOpenSupplyOrders && count($otherOpenSupplyOrders))
-                                <table class="table table-sm table-bordered mb-0">
+                                <table class="table table-sm table-bordered mb-0 bg-white">
                                     <thead>
                                     <tr class="bg-light">
                                         <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Title</div></th>

+ 3 - 3
resources/views/app/patient/supply-orders.blade.php

@@ -1,13 +1,13 @@
 @extends(request()->input('popupmode') ? 'layouts.popup' : 'layouts.patient')
 @section('inner-content')
     <div class="" id="patient-supply-orders">
-        <div class="d-flex align-items-baseline pb-2">
-            <h4 class="font-weight-bold m-0 font-size-16">Supply Orders</h4>
+        <div class="d-flex align-items-baseline mb-3">
+            <div class="font-weight-bold m-0 font-size-16">Supply Orders</div>
             @if($pro->pro_type === 'ADMIN' || request()->input('note-uid'))
                 <span class="mx-2 text-secondary">|</span>
                 <div moe large>
                     <a start show href="#">Add</a>
-                    <form url="/api/supplyOrder/create" redir="/patients/view/{{ $patient->uid }}/supply-orders/[data]">
+                    <form url="/api/supplyOrder/create" redir="/patients/view/{{ $patient->uid }}/supply-orders/[data]{{request()->input('popupmode') ? '?popupmode=1' : ''}}">
 
                         {{--@if(!$patient->has_cm_setup_been_performed)
                             <p class="font-weight-bold alert alert-warning border-warning mb-0">You need to enroll this patient into CM before adding supply orders.</p>