|
@@ -327,11 +327,21 @@ class HomeController extends Controller
|
|
->orWhereRaw('id IN (SELECT client_id FROM appointment WHERE pro_id = ?)', [$proID]);
|
|
->orWhereRaw('id IN (SELECT client_id FROM appointment WHERE pro_id = ?)', [$proID]);
|
|
});
|
|
});
|
|
}
|
|
}
|
|
|
|
+
|
|
switch ($filter) {
|
|
switch ($filter) {
|
|
case 'not-yet-seen':
|
|
case 'not-yet-seen':
|
|
$query = $query->where('has_mcp_done_onboarding_visit', '<>', 'YES');
|
|
$query = $query->where('has_mcp_done_onboarding_visit', '<>', 'YES');
|
|
break;
|
|
break;
|
|
|
|
|
|
|
|
+ case 'program-onboarding-pending':
|
|
|
|
+ $query = $query->where(function ($_query) {
|
|
|
|
+ $_query->select(DB::raw('COUNT(id)'))
|
|
|
|
+ ->from('client_program')
|
|
|
|
+ ->whereColumn('client_id', 'client.id')
|
|
|
|
+ ->where('has_mcp_done_onboarding_visit', '!=', 'YES');
|
|
|
|
+ }, '>=', 1);
|
|
|
|
+ break;
|
|
|
|
+
|
|
// more cases can be added as needed
|
|
// more cases can be added as needed
|
|
default:
|
|
default:
|
|
break;
|
|
break;
|
|
@@ -350,7 +360,7 @@ class HomeController extends Controller
|
|
$q->where('name_first', 'ILIKE', '%' . $term . '%')
|
|
$q->where('name_first', 'ILIKE', '%' . $term . '%')
|
|
->orWhere('name_last', 'ILIKE', '%' . $term . '%');
|
|
->orWhere('name_last', 'ILIKE', '%' . $term . '%');
|
|
});
|
|
});
|
|
-
|
|
|
|
|
|
+
|
|
if($pro->pro_type != 'ADMIN'){
|
|
if($pro->pro_type != 'ADMIN'){
|
|
$clientQuery->whereIn('id', $pro->getMyClientIds());
|
|
$clientQuery->whereIn('id', $pro->getMyClientIds());
|
|
}
|
|
}
|