resolved conflicts

resources/views/app/patient/note/_manage_note_ally.blade.php

@@ -1,40 +0,0 @@
-@if($performer->pro->pro_type == 'ADMIN')
-    <div>
-        @if($note->allyPro)
-            <h2>NA: {{$note->allyPro->name_first}} {{$note->allyPro->name_last}}</h2>
-            <span class="d-block" moe>
-                <a class="text-danger" href="" show start>Remove NA</a>
-                <form url="/api/note/removeNa">
-                    <input type="hidden" name="uid" value="{{$note->uid}}">
-                    <p>Remove NA?</p>
-                    <div class="mb-0">
-                        <button class="btn btn-success btn-sm" submit>Submit</button>
-                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                    </div>
-                </form>
-            </span>
-        @else
-            <div class="alert alert-info">No NA set</div>
-            <span class="d-block" moe>
-                <a class="text-danger" href="" show start>Set NA</a>
-                <form url="/api/note/putNa">
-                    <input type="hidden" name="uid" value="{{$note->uid}}">
-                    <div class="form-group">
-                        <label for="" class="control-label">NA</label>
-                        <select name="naProUid" class="form-control">
-                            <option value="">--select--</option>
-                            @foreach($allyPros as $allyPro)
-                                <option value="{{$allyPro->uid}}">{{$allyPro->name_first}} {{$allyPro->name_last}}</option>
-                            @endforeach
-                        </select>
-                    </div>
-                    <div class="mb-0">
-                        <button class="btn btn-success btn-sm" submit>Submit</button>
-                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                    </div>
-                </form>
-            </span>
-        @endif
-
-    </div>
-@endif

resources/views/app/patient/note/dashboard.blade.php

@@ -53,7 +53,7 @@
     </div>
 
     <div class="card mb-0 {{ $note->is_cancelled ? 'cancelled-item' : '' }}">
-        <div class="card-header d-flex align-items-start px-3 py-2 border-bottom">
+        <span class="card-header d-flex align-items-start px-3 py-2 border-bottom">
             <div class="pr-2">
                 {{$note->title}}
                 @if(!$note->is_signed_by_hcp)
@@ -144,6 +144,53 @@
                 </div>
             </div>
 
+
+            @if($performer->pro->pro_type == 'ADMIN')
+                <span class="px-2 border-right d-flex">
+                    @if($note->allyPro)
+                        <span class="mr-2"><span class="text-secondary">NA:</span>  {{$note->allyPro->name_first}} {{$note->allyPro->name_last}}</span>
+                        <span class="d-inline-block" moe>
+                            <a class="text-danger" href="" show start>
+                                <i class="fa fa-times"></i>
+                            </a>
+                            <form url="/api/note/removeNa">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <p>Remove NA?</p>
+                                <div class="mb-0">
+                                    <button class="btn btn-success btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </span>
+                    @else
+                        <span class="mr-2"><span class="text-secondary">NA:</span> - </span>
+                        <span class="d-block" moe>
+                            <a class="text-danger" href="" show start>
+                                <i class="fa fa-edit"></i>
+                            </a>
+                            <form url="/api/note/putNa">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <div class="form-group">
+                                    <label for="" class="control-label">NA</label>
+                                    <select name="naProUid" class="form-control">
+                                        <option value="">--select--</option>
+                                        @foreach($allyPros as $allyPro)
+                                            <option value="{{$allyPro->uid}}">{{$allyPro->name_first}} {{$allyPro->name_last}}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="mb-0">
+                                    <button class="btn btn-success btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </span>
+                    @endif
+
+                </span>
+            @endif
+
+
             <div class="px-2 border-right">
                 <div class="d-flex">
                     <span class="mr-2"><span class="text-secondary">Type:</span> {{$note->new_or_fu_or_na ? ($note->new_or_fu_or_na === 'NEW' ? 'New Patient' : $note->new_or_fu_or_na) : '-'}}</span>
@@ -1181,9 +1228,6 @@
 
                 @include('app/patient/note/_cancel-signed-note')
 
-                <div class="border-top p-3">
-                    @include('app/patient/note/_manage_note_ally')
-                </div>
 
             </div>
         </div>

resources/views/layouts/template.blade.php

@@ -122,7 +122,6 @@
                             <a class="dropdown-item" href="{{ route('practice-management.cellularDeviceManager') }}">Cellular Device Manager</a>
                             <a class="dropdown-item" href="{{ route('practice-management.claims') }}">Claims</a>
                             <a class="dropdown-item" href="{{ route('practice-management.hcpBillMatrix') }}">HCP Bill Matrix</a>
-                            <a class="dropdown-item" href="{{ route('practice-management.treatmentServiceUtil') }}">Treatment Service Util.</a>
                             <a class="dropdown-item" href="{{ route('practice-management.tickets') }}">Tickets</a>
                             <a class="dropdown-item" href="{{ route('practice-management.supply-orders') }}">Supply Orders</a>
                             <a class="dropdown-item" href="{{ route('practice-management.shipments') }}">Shipments</a>

routes/web.php

@@ -113,6 +113,7 @@ Route::middleware('pro.auth')->group(function () {
             // Route::get('shipments', 'PracticeManagementController@shipments')->name('shipments');
 
             // v2 supply-orders & shipments management (wh)
+
             Route::get('supply-orders', 'PracticeManagementController@supplyOrders')->name('supply-orders');
             Route::get('supply-orders/ready-to-ship', 'PracticeManagementController@supplyOrdersReadyToShip')->name('supply-orders-ready-to-ship');
             Route::get('supply-orders/shipment-underway', 'PracticeManagementController@supplyOrdersShipmentUnderway')->name('supply-orders-shipment-underway');