Changes

app/Http/Controllers/AdminController.php

@@ -514,14 +514,27 @@ class AdminController extends Controller
             }
 
         }
-
+        
         $insurance = $request->get('insurance');
         if($insurance){
             if($insurance === 'MEDICARE'){
                 $patients = $patients->whereHas('latestClientPrimaryCoverage', function($cpcQuery){
                     return $cpcQuery->where('is_partbprimary', '=', 'YES');
                 });
-            }else{
+            }elseif($insurance === 'MEDICARE_PENDING'){
+                $patients = $patients->whereHas('latestClientPrimaryCoverage', function($cpcQuery){
+                    return $cpcQuery->where('plan_type', 'MEDICARE')->where('is_covered', '!=', 'YES');
+                });
+            }elseif($insurance === 'NOT_COVERED'){
+                $patients = $patients->whereHas('latestClientPrimaryCoverage', function($cpcQuery){
+                    return $cpcQuery->where('is_covered', '!=', 'YES');
+                });
+            }elseif($insurance === 'PENDING'){
+                $patients = $patients->whereHas('latestClientPrimaryCoverage', function($cpcQuery){
+                    return $cpcQuery->where('is_covered', '=', 'UNKNOWN');
+                });
+            }
+            else{
                 $patients = $patients->whereDoesntHave('latestClientPrimaryCoverage', function($cpcQuery){
                     return $cpcQuery->where('is_partbprimary', '=', 'YES');
                 });

app/Http/Controllers/PracticeManagementController.php

@@ -114,8 +114,29 @@ SELECT effective_date, count(*), sum(number_of_units) as units FROM bill WHERE c
 
     public function clientProChanges(Request $request)
     {
-        $rows = ClientProChange::orderByRaw('created_at::date DESC')->orderBy('client_id', 'desc')->paginate(20);
-        return view ('app.practice-management.client-pro-changes', compact('rows'));
+        $filters = $request->all();
+        $rows = ClientProChange::query();
+        $associationTypes = DB::table('client_pro_change')->select('responsibility_type')->distinct()->pluck('responsibility_type')->toArray();
+
+        $this->filterMultiQuery($request, $rows, 'created_at', 'date_category', 'date_value_1', 'date_value_2');
+        $this->filterSimpleQuery($request, $rows, 'responsibility_type', 'responsibility_type');
+
+        $oldProUid = $request->get('old_pro');
+        if($oldProUid){
+            $oldPro = Pro::where('uid', $oldProUid)->first();
+            $rows = $rows->where('previous_pro_id',$oldPro->id);
+
+        }
+
+        $newProUid = $request->get('new_pro');
+        if($newProUid){
+            $newPro = Pro::where('uid', $newProUid)->first();
+            $rows = $rows->where('new_pro_id',$newPro->id);
+
+        }
+
+        $rows = $rows->orderByRaw('created_at::date DESC')->orderBy('client_id', 'desc')->paginate(20);
+        return view ('app.practice-management.client-pro-changes', compact('rows', 'filters', 'associationTypes'));
     }
 
     public function billingReport(Request $request)

resources/views/app/admin/patients_missing_default_settings.blade.php

@@ -22,7 +22,7 @@
 					<th class="border-0">Default MCP Company Pro</th>
 					<th class="border-0">Default MCP Company Pro Payer</th>
 					<th class="border-0">Default MCP Company Location</th>
-
+					<th class="border-0">Insurance</th>
 				</tr>
 			</thead>
 			<tbody>
@@ -42,12 +42,15 @@
 					<td>{{ $patient->defaultMcpCompanyPro ? $patient->defaultMcpCompanyPro->company->name : 'NO' }}</td>
 					<td>{{ $patient->defaultMcpCompanyProPayer ? $patient->defaultMcpCompanyProPayer->payer->name : 'NO' }}</td>
 					<td>{{$patient->default_mcp_company_location_id? implode(" ", [$patient->defaultMcpCompanyLocation->line1, $patient->defaultMcpCompanyLocation->city, $patient->defaultMcpCompanyLocation->state]):'NO'}}</td>
+					<td>
+						@include('app.patient.coverage_column_renderer', ['patient'=>$patient])
+					</td>
 				</tr>
 				@endforeach
 
 				@if(count($patients) === 0)
 				<tr>
-					<td colspan="6">No records found!</td>
+					<td colspan="7">No records found!</td>
 				</tr>
 				@endif
 			</tbody>

resources/views/app/admin/patients_missing_defsult_settings_filters.blade.php

@@ -58,8 +58,11 @@
 			<label>Insurance:</label>
 			<select class="form-control"  name="insurance" v-model="filters.insurance">
 				<option value=""></option>
+				<option value="MEDICARE_PENDING">Medicare Pending</option>
 				<option value="MEDICARE">Medicare (Part B)</option>
 				<option value="OTHER">Other</option>
+				<option value="PENDING">Pending</option>
+				<option value="NOT_COVERED">Not Covered</option>
 			</select>
 		</div>
 	</div>

resources/views/app/patient/note/flag-bill.blade.php

@@ -1,200 +1,201 @@
-<div <?= $bill->is_flagged_by_administrator && !$bill->is_administrator_flag_cleared ? 'class="alert alert-danger p-1 rounded-0" style="min-width: 380px;"' : '' ?>>
-<?php #dump($bill); ?>
-@if($pro->pro_type === 'ADMIN')
-	@if($bill->is_flagged_by_administrator && !$bill->is_administrator_flag_cleared)
-		<div class="d-flex flex-column">
-			<div class="d-flex align-items-center flex-wrap">
-				<span class="mr-2"><b>Flagged At:</b> {{ friendly_date_time($bill->flagged_administrator_at) }}</span>
-				<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByProAdmin->displayName() }}</small>
+@if(!$bill->is_cancelled)
+	<div <?= $bill->is_flagged_by_administrator && !$bill->is_administrator_flag_cleared ? 'class="alert alert-danger p-1 rounded-0" style="min-width: 380px;"' : '' ?>>
+	<?php #dump($bill); ?>
+	@if($pro->pro_type === 'ADMIN')
+		@if($bill->is_flagged_by_administrator && !$bill->is_administrator_flag_cleared)
+			<div class="d-flex flex-column">
+				<div class="d-flex align-items-center flex-wrap">
+					<span class="mr-2"><b>Flagged At:</b> {{ friendly_date_time($bill->flagged_administrator_at) }}</span>
+					<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByProAdmin->displayName() }}</small>
+				</div>
+				
+				<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque text-primary"></i></b> {{ $bill->administrator_flag_memo }}</small>
 			</div>
-			
-			<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque text-primary"></i></b> {{ $bill->administrator_flag_memo }}</small>
-		</div>
 
-		@if($bill->is_administrator_flag_acknowledged && $bill->administrator_flag_acknowledged_at > $bill->flagged_administrator_at)
-			<!-- This is resolved -->
-			<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
-				<div class="d-flex flex-column">
-					<div class="d-flex align-items-center flex-wrap">
-						<span class="mr-2"><b>Ack. At:</b> {{ friendly_date_time($bill->administrator_flag_acknowledged_at) }}</span>
-						<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByPro->displayName() }}</small>
+			@if($bill->is_administrator_flag_acknowledged && $bill->administrator_flag_acknowledged_at > $bill->flagged_administrator_at)
+				<!-- This is resolved -->
+				<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
+					<div class="d-flex flex-column">
+						<div class="d-flex align-items-center flex-wrap">
+							<span class="mr-2"><b>Ack. At:</b> {{ friendly_date_time($bill->administrator_flag_acknowledged_at) }}</span>
+							<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByPro->displayName() }}</small>
+						</div>
+						
+						<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque"></i></b> {{ $bill->administrator_flag_acknowledgement_memo }}</small>
 					</div>
-					
-					<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque"></i></b> {{ $bill->administrator_flag_acknowledgement_memo }}</small>
 				</div>
-			</div>
-		@endif
-			<!-- Flagged by admin, pending ack. by pro -->
-			<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
-				<div class="d-flex">
-					@if($bill->is_administrator_flag_acknowledged)
-						<div moe>
-							<a start show class="text-success"><i class="fas fa-flag  on-hover-opaque"></i> Clear Flag</a>
-							<form url="/api/bill/clearFlag" class="mcp-theme-1">
-								<input type="hidden" name="uid" value="{{$bill->uid}}">
-								<div class="form-group">
-									<label>Memo:</label>
-									<textarea name="memo" rows="2" class="form-control"></textarea>
-								</div>
-								<div>
-									<button submit class="btn btn-sm btn-success mr-1">Clear Flag</button>
-									<button cancel class="btn btn-sm btn-default border">Cancel</button>
-								</div>
-							</form>
-						</div>
-					@else
-						<div moe>
-							<a start show class="text-success"><i class="fas fa-flag  on-hover-opaque"></i> Unflag Bill</a>
-							<form url="/api/bill/undoFlagAsAdministrator" class="mcp-theme-1">
-								<input type="hidden" name="uid" value="{{$bill->uid}}">
-								<div class="form-group">
-									<label>Memo:</label>
-									<textarea name="memo" rows="2" class="form-control"></textarea>
-								</div>
-								<div>
-									<button submit class="btn btn-sm btn-success mr-1">Unflag Bill</button>
-									<button cancel class="btn btn-sm btn-default border">Cancel</button>
-								</div>
-							</form>
-						</div>
-					@endif
-					<span class="mx-1 text-muted">|</span>
-					@if($bill->is_administrator_flag_acknowledged)
-						<div moe>
-							<a start show class="text-danger"><i class="fas fa-flag  on-hover-opaque"></i> Flag Bill Again</a>
-							<form url="/api/bill/flagAsAdministrator" class="mcp-theme-1">
-								<input type="hidden" name="uid" value="{{$bill->uid}}">
-								<div class="form-group">
-									<label>Memo:</label>
-									<textarea name="memo" rows="2" class="form-control" required></textarea>
-								</div>
-								<div>
-									<button submit class="btn btn-sm btn-danger mr-1">Flag Bill</button>
-									<button cancel class="btn btn-sm btn-default border">Cancel</button>
-								</div>
-							</form>
+			@endif
+				<!-- Flagged by admin, pending ack. by pro -->
+				<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
+					<div class="d-flex">
+						@if($bill->is_administrator_flag_acknowledged)
+							<div moe>
+								<a start show class="text-success"><i class="fas fa-flag  on-hover-opaque"></i> Clear Flag</a>
+								<form url="/api/bill/clearFlag" class="mcp-theme-1">
+									<input type="hidden" name="uid" value="{{$bill->uid}}">
+									<div class="form-group">
+										<label>Memo:</label>
+										<textarea name="memo" rows="2" class="form-control"></textarea>
+									</div>
+									<div>
+										<button submit class="btn btn-sm btn-success mr-1">Clear Flag</button>
+										<button cancel class="btn btn-sm btn-default border">Cancel</button>
+									</div>
+								</form>
+							</div>
+						@else
+							<div moe>
+								<a start show class="text-success"><i class="fas fa-flag  on-hover-opaque"></i> Unflag Bill</a>
+								<form url="/api/bill/undoFlagAsAdministrator" class="mcp-theme-1">
+									<input type="hidden" name="uid" value="{{$bill->uid}}">
+									<div class="form-group">
+										<label>Memo:</label>
+										<textarea name="memo" rows="2" class="form-control"></textarea>
+									</div>
+									<div>
+										<button submit class="btn btn-sm btn-success mr-1">Unflag Bill</button>
+										<button cancel class="btn btn-sm btn-default border">Cancel</button>
+									</div>
+								</form>
+							</div>
+						@endif
+						<span class="mx-1 text-muted">|</span>
+						@if($bill->is_administrator_flag_acknowledged)
+							<div moe>
+								<a start show class="text-danger"><i class="fas fa-flag  on-hover-opaque"></i> Flag Bill Again</a>
+								<form url="/api/bill/flagAsAdministrator" class="mcp-theme-1">
+									<input type="hidden" name="uid" value="{{$bill->uid}}">
+									<div class="form-group">
+										<label>Memo:</label>
+										<textarea name="memo" rows="2" class="form-control" required></textarea>
+									</div>
+									<div>
+										<button submit class="btn btn-sm btn-danger mr-1">Flag Bill</button>
+										<button cancel class="btn btn-sm btn-default border">Cancel</button>
+									</div>
+								</form>
+							</div>
+						@else
+							<div moe>
+								<a start show class="text-primary">Update Memo</a>
+								<form url="/api/bill/updateFlagMemo" class="mcp-theme-1">
+									<input type="hidden" name="uid" value="{{$bill->uid}}">
+									<div class="form-group">
+										<label>Memo:</label>
+										<textarea name="memo" rows="2" class="form-control"><?= $bill->administrator_flag_memo ?></textarea>
+									</div>
+									<div>
+										<button submit class="btn btn-sm btn-primary mr-1">Update</button>
+										<button cancel class="btn btn-sm btn-default border">Cancel</button>
+									</div>
+								</form>
+							</div>
+						@endif
+						<span class="ml-1 text-muted">|</span>
+						@include('app.patient.note.partials.bill-flags-history')
+					</div>
+				</div>
+			
+		@else
+			<!-- Not flagged, show flag popup -->
+			<!-- //api/bill//flagAsAdministrator -->
+			<div class="d-flex align-items-center">
+				<div moe>
+					<a start show class="text-danger"><i class="fas fa-flag  on-hover-opaque"></i> Flag Bill</a>
+					<form url="/api/bill/flagAsAdministrator" class="mcp-theme-1">
+						<input type="hidden" name="uid" value="{{$bill->uid}}">
+						<div class="form-group">
+							<label>Memo:</label>
+							<textarea name="memo" rows="2" class="form-control" required></textarea>
 						</div>
-					@else
-						<div moe>
-							<a start show class="text-primary">Update Memo</a>
-							<form url="/api/bill/updateFlagMemo" class="mcp-theme-1">
-								<input type="hidden" name="uid" value="{{$bill->uid}}">
-								<div class="form-group">
-									<label>Memo:</label>
-									<textarea name="memo" rows="2" class="form-control"><?= $bill->administrator_flag_memo ?></textarea>
-								</div>
-								<div>
-									<button submit class="btn btn-sm btn-primary mr-1">Update</button>
-									<button cancel class="btn btn-sm btn-default border">Cancel</button>
-								</div>
-							</form>
+						<div>
+							<button submit class="btn btn-sm btn-danger mr-1">Flag Bill</button>
+							<button cancel class="btn btn-sm btn-default border">Cancel</button>
 						</div>
-					@endif
-					<span class="ml-1 text-muted">|</span>
-					@include('app.patient.note.partials.bill-flags-history')
+					</form>
 				</div>
+				@include('app.patient.note.partials.bill-flags-history')
 			</div>
-		
+			
+		@endif
+
 	@else
-		<!-- Not flagged, show flag popup -->
-		<!-- //api/bill//flagAsAdministrator -->
-		<div class="d-flex align-items-center">
-			<div moe>
-				<a start show class="text-danger"><i class="fas fa-flag  on-hover-opaque"></i> Flag Bill</a>
-				<form url="/api/bill/flagAsAdministrator" class="mcp-theme-1">
-					<input type="hidden" name="uid" value="{{$bill->uid}}">
-					<div class="form-group">
-						<label>Memo:</label>
-						<textarea name="memo" rows="2" class="form-control" required></textarea>
-					</div>
-					<div>
-						<button submit class="btn btn-sm btn-danger mr-1">Flag Bill</button>
-						<button cancel class="btn btn-sm btn-default border">Cancel</button>
-					</div>
-				</form>
+	<!-- HCP -->
+		@if($bill->is_flagged_by_administrator && !$bill->is_administrator_flag_cleared)
+			<div class="d-flex flex-column">
+				<div class="d-flex align-items-center flex-wrap">
+					<span class="mr-2"><b>Flagged At:</b> {{ friendly_date_time($bill->flagged_administrator_at) }}</span>
+					<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByProAdmin->displayName() }}</small>
+				</div>			
+				<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque text-primary"></i></b> {{ $bill->administrator_flag_memo }}</small>
 			</div>
-			@include('app.patient.note.partials.bill-flags-history')
-		</div>
-		
-	@endif
-
-@else
-<!-- HCP -->
-	@if($bill->is_flagged_by_administrator && !$bill->is_administrator_flag_cleared)
-		<div class="d-flex flex-column">
-			<div class="d-flex align-items-center flex-wrap">
-				<span class="mr-2"><b>Flagged At:</b> {{ friendly_date_time($bill->flagged_administrator_at) }}</span>
-				<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByProAdmin->displayName() }}</small>
-			</div>			
-			<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque text-primary"></i></b> {{ $bill->administrator_flag_memo }}</small>
-		</div>
 
-		@if($bill->is_administrator_flag_acknowledged && $bill->administrator_flag_acknowledged_at > $bill->flagged_administrator_at)
-			<!-- hcp has ack. -->
-			<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
-				<div class="d-flex flex-column">
-					<div class="d-flex align-items-center flex-wrap">
-						<span class="mr-2"><b>Ack. At:</b> {{ friendly_date_time($bill->administrator_flag_acknowledged_at) }}</span>
-						<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByPro->displayName() }}</small>
-					</div>
-					
-					<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque"></i></b> {{ $bill->administrator_flag_acknowledgement_memo }}</small>
-					
-					<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
-						<div moe>
-							<a start show class="text-danger"><i class="fas fa-undo fa-fw  on-hover-opaque"></i> Undo Ack.</a>
-							<form url="/api/bill/undoAcknowledgeAdministratorFlag" class="mcp-theme-1">
-								<input type="hidden" name="uid" value="{{$bill->uid}}">
-								<div class="form-group">
-									<label>Memo:</label>
-									<textarea name="memo" rows="2" class="form-control"></textarea>
-								</div>
-								<div>
-									<button submit class="btn btn-sm btn-danger mr-1">Undo Ack.</button>
-									<button cancel class="btn btn-sm btn-default border">Cancel</button>
-								</div>
-							</form>
+			@if($bill->is_administrator_flag_acknowledged && $bill->administrator_flag_acknowledged_at > $bill->flagged_administrator_at)
+				<!-- hcp has ack. -->
+				<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
+					<div class="d-flex flex-column">
+						<div class="d-flex align-items-center flex-wrap">
+							<span class="mr-2"><b>Ack. At:</b> {{ friendly_date_time($bill->administrator_flag_acknowledged_at) }}</span>
+							<small class="text-sm">By: <i class="fas fa-user"></i> {{ $bill->billFlagAcknowledgedByPro->displayName() }}</small>
 						</div>
-						<span class="mx-1 text-muted">|</span>
-						<div moe>
-							<a start show class="text-primary">Update Memo</a>
-							<form url="/api/bill/updateAcknowledgementMemo" class="mcp-theme-1">
-								<input type="hidden" name="uid" value="{{$bill->uid}}">
-								<div class="form-group">
-									<label>Memo:</label>
-									<textarea name="memo" rows="2" class="form-control"><?= $bill->administrator_flag_acknowledgement_memo ?></textarea>
-								</div>
-								<div>
-									<button submit class="btn btn-sm btn-primary mr-1">Update</button>
-									<button cancel class="btn btn-sm btn-default border">Cancel</button>
-								</div>
-							</form>
+						
+						<small class="text-muted"><b><i class="fas fa-comment on-hover-opaque"></i></b> {{ $bill->administrator_flag_acknowledgement_memo }}</small>
+						
+						<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
+							<div moe>
+								<a start show class="text-danger"><i class="fas fa-undo fa-fw  on-hover-opaque"></i> Undo Ack.</a>
+								<form url="/api/bill/undoAcknowledgeAdministratorFlag" class="mcp-theme-1">
+									<input type="hidden" name="uid" value="{{$bill->uid}}">
+									<div class="form-group">
+										<label>Memo:</label>
+										<textarea name="memo" rows="2" class="form-control"></textarea>
+									</div>
+									<div>
+										<button submit class="btn btn-sm btn-danger mr-1">Undo Ack.</button>
+										<button cancel class="btn btn-sm btn-default border">Cancel</button>
+									</div>
+								</form>
+							</div>
+							<span class="mx-1 text-muted">|</span>
+							<div moe>
+								<a start show class="text-primary">Update Memo</a>
+								<form url="/api/bill/updateAcknowledgementMemo" class="mcp-theme-1">
+									<input type="hidden" name="uid" value="{{$bill->uid}}">
+									<div class="form-group">
+										<label>Memo:</label>
+										<textarea name="memo" rows="2" class="form-control"><?= $bill->administrator_flag_acknowledgement_memo ?></textarea>
+									</div>
+									<div>
+										<button submit class="btn btn-sm btn-primary mr-1">Update</button>
+										<button cancel class="btn btn-sm btn-default border">Cancel</button>
+									</div>
+								</form>
+							</div>
 						</div>
 					</div>
 				</div>
-			</div>
-		
-		@else
-			<!-- Needs hcp ack. -->
-			<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
-			<div moe>
-				<a start show class="text-primary"><i class="fa fa-check text-sm on-hover-opaque"></i> Ack.</a>
-				<form url="/api/bill/acknowledgeAdministratorFlag" class="mcp-theme-1">
-					<input type="hidden" name="uid" value="{{$bill->uid}}">
-					<div class="form-group">
-						<label>Memo:</label>
-						<textarea name="memo" rows="2" class="form-control" required></textarea>
-					</div>
-					<div>
-						<button submit class="btn btn-sm btn-primary mr-1">Ack. Flag</button>
-						<button cancel class="btn btn-sm btn-default border">Cancel</button>
-					</div>
-				</form>
-			</div>
-			</div>
+			
+			@else
+				<!-- Needs hcp ack. -->
+				<div class="border-top mt-1 pt-1" style="border-color: #f3bcc1!important;">
+				<div moe>
+					<a start show class="text-primary"><i class="fa fa-check text-sm on-hover-opaque"></i> Ack.</a>
+					<form url="/api/bill/acknowledgeAdministratorFlag" class="mcp-theme-1">
+						<input type="hidden" name="uid" value="{{$bill->uid}}">
+						<div class="form-group">
+							<label>Memo:</label>
+							<textarea name="memo" rows="2" class="form-control" required></textarea>
+						</div>
+						<div>
+							<button submit class="btn btn-sm btn-primary mr-1">Ack. Flag</button>
+							<button cancel class="btn btn-sm btn-default border">Cancel</button>
+						</div>
+					</form>
+				</div>
+				</div>
 
+			@endif
 		@endif
 	@endif
-@endif
-
-</div>
+	</div>
+@endif

resources/views/app/practice-management/client-pro-changes-filters.blade.php

@@ -0,0 +1,134 @@
+<style>
+	#client-pro-changes-filters label {
+		font-weight: bold;
+	}
+
+	#client-pro-changes-filters .mw-100px {
+		min-width: 100px;
+	}
+
+	.filter-container {
+		display: flex;
+		align-items: flex-start;
+		flex-wrap: wrap;
+	}
+
+	.filter-container>div {
+		width: 165px;
+	}
+
+	.filter-container>div:not(:last-child) {
+		margin-right: 15px;
+	}
+</style>
+<form id="client-pro-changes-filters" method="GET" action="{{ route('practice-management.client-pro-changes') }}" class="filter-container" v-cloak>
+	<!-- DATE	 -->
+	<div>
+		<div class="form-group">
+			<label>Date:</label>
+			<select name="date_category" class="form-control input-sm" v-model="filters.date_category">
+				<option value="">All</option>
+				<option value="EXACTLY">Exactly</option>
+				<option value="LESS_THAN">Less Than</option>
+				<option value="GREATER_THAN">Greater Than</option>
+				<option value="BETWEEN">Between</option>
+				<option value="NOT_BETWEEN">Not Between</option>
+			</select>
+			<div v-show="filters.date_category" class="mt-2">
+				<div>
+					<input name="date_value_1" v-model="filters.date_value_1" type="date" class="form-control input-sm" />
+				</div>
+				<div v-show="filters.date_category === 'BETWEEN' || filters.date_category === 'NOT_BETWEEN'" class="mt-2">
+					<input name="date_value_2" v-model="filters.date_value_2" type="date" class="form-control input-sm" />
+				</div>
+			</div>
+		</div>
+	</div>
+
+	<!-- STATUS -->
+	<div>
+		<div class="form-group">
+			<label>Association Type:</label>
+			<select name="responsibility_type" class="form-control input-sm" v-model="filters.responsibility_type">
+				<option value="">All</option>
+				@foreach($associationTypes as $at)
+				<option value="{{ $at }}">{{ $at }}</option>
+				@endforeach
+			</select>
+		</div>
+	</div>
+
+	<div>
+		<div class="form-group">
+			<div class="old-pro-filter-container">
+				<label>Old Pro:</label>
+			</div>
+		</div>
+	</div>
+
+	<div>
+		<div class="form-group">
+			<div class="new-pro-filter-container">
+				<label>New Pro:</label>
+			</div>
+		</div>
+	</div>
+
+	<div>
+		<div class="form-group">
+			<label>&nbsp;</label>
+			<div class="d-flex">
+				<button type="submit" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('practice-management.client-pro-changes')}}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
+			</div>
+		</div>
+	</div>
+</form>
+<?php
+$loadedFilters = $filters;
+$allFilterKeys = [
+	'date_category',
+	'date_value_1',
+	'date_value_2',
+	'responsibility_type',
+	'old_pro',
+	'new_pro'
+];
+for ($i = 0; $i < count($allFilterKeys); $i++) {
+	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
+		$loadedFilters[$allFilterKeys[$i]] = '';
+	}
+}
+?>
+<script>
+	(function() {
+		function init() {
+			window.apapp = new Vue({
+				el: '#client-pro-changes-filters',
+				delimiters: ['@{{', '}}'],
+				data: {
+					filters: <?= json_encode($loadedFilters) ?>
+				},
+				methods: {
+					doSubmit: function() {
+						fastLoad('{{ route("practice-management.client-pro-changes") }}?' + $('#client-pro-changes-filters').serialize());
+						return false;
+					},
+					init: function() {
+
+					}
+				},
+				mounted: function() {
+					this.init();
+
+					let oldProSelect = $('<select name="old_pro" class="form-control min-width-unset input-sm" provider-search data-pro-uid="{{request()->input("old_pro")}}" provider-type="hcp"><option value="">--select--</option></select>').appendTo('.old-pro-filter-container');
+					let newProSelect = $('<select name="new_pro" class="form-control min-width-unset input-sm" provider-search data-pro-uid="{{request()->input("new_pro")}}" provider-type="hcp"><option value="">--select--</option></select>').appendTo('.new-pro-filter-container');
+					initProSuggest();
+				},
+			});
+
+
+		}
+		addMCInitializer('client-pro-changes-filters', init, '#client-pro-changes-filters');
+	})();
+</script>

resources/views/app/practice-management/client-pro-changes.blade.php

@@ -9,6 +9,9 @@
                 </strong>
             </div>
             <div class="card-body p-0">
+                <div class="p-3">
+                    @include('app.practice-management.client-pro-changes-filters')
+                </div>
                 <table class="table table-striped table-sm table-bordered mb-3">
                     @if($rows && count($rows))
                         <thead class="bg-light">