Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

app/Http/Controllers/PracticeManagementController.php

@@ -99,7 +99,7 @@ class PracticeManagementController extends Controller
                     return $noteQuery->has('claims', '=', 0);
                 })->whereHas('client', function($clientQuery){
                     return $clientQuery->where('client_engagement_status_category','<>' ,'DUMMY');
-                })->paginate(50);
+                })->orderBy('effective_date_est', 'desc')->paginate(50);
             }else{
                 $rows =  BillingReport::whereHas('note', function($noteQuery) use ($claimStatus){
                     return $noteQuery->whereHas('claims', function($claimQuery) use ($claimStatus) {
@@ -107,12 +107,12 @@ class PracticeManagementController extends Controller
                     });
                 })->whereHas('client', function($clientQuery){
                     return $clientQuery->where('client_engagement_status_category','<>' ,'DUMMY');
-                })->paginate(50);
+                })->orderBy('effective_date_est', 'desc')->paginate(50);
             }
         }else {
             $rows =  BillingReport::whereHas('client', function($clientQuery){
                 return $clientQuery->where('client_engagement_status_category','<>' ,'DUMMY');
-            })->paginate(50);    
+            })->orderBy('effective_date_est', 'desc')->paginate(50);    
         }
 
         $claimStatuses = DB::select('SELECT distinct status FROM claim ORDER BY status DESC');

resources/views/layouts/patient.blade.php

@@ -743,7 +743,28 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 											@include('app.patient.coverage-status')
 									</section>
 									@endif
-									<ul class="vbox mt-2 align-self-start patient-header-address ml-auto">
+
+									<section class="mr-4 align-self-start mt-2 ml-auto">
+										<label>Sticky Note:</label> <span class="text-secondary">{{$patient->sticky_note ?? '-' }}</span>
+											<div moe right class="ml-2 hide-inside-popup">
+												<a start show><i class="fa fa-edit"></i></a>
+												<form url="/api/client/updateStickyNote" class="mcp-theme-1">
+													<input type="hidden" name="uid" value="{{$patient->uid}}">
+													<div class="mb-2">
+														<label class="text-secondary text-sm">Sticky Note</label>
+														<textarea name="stickyNote" class="form-control" rows="8" cols="80"></textarea>
+													</div>
+													<div>
+														<button submit class="btn btn-sm btn-primary mr-1">Submit
+														</button>
+														<button cancel class="btn btn-sm btn-default border">
+															Cancel
+														</button>
+													</div>
+												</form>
+											</div>
+									</section>
+									<ul class="vbox mt-2 align-self-start patient-header-address ">
 										<li class="d-flex align-items-start">
 											<span class="aligned-icon">
 												<i class="fa fa-map-marker-alt" aria-hidden="true"></i>