Merge branch 'dev' into dev-vj

app/Http/Controllers/HomeController.php

@@ -323,7 +323,8 @@ class HomeController extends Controller
                     ->orWhere('cm_pro_id', $proID)
                     ->orWhere('rmm_pro_id', $proID)
                     ->orWhere('rme_pro_id', $proID)
-                    ->orWhereRaw('id IN (SELECT client_id FROM client_pro_access WHERE is_active AND pro_id = ?)', [$proID]);
+                    ->orWhereRaw('id IN (SELECT client_id FROM client_pro_access WHERE is_active AND pro_id = ?)', [$proID])
+                    ->orWhereRaw('id IN (SELECT client_id FROM appointment WHERE pro_id = ?)', [$proID]);
             });
         }
         switch ($filter) {
@@ -341,12 +342,20 @@ class HomeController extends Controller
 
     public function patientsSuggest(Request $request)
     {
+
+        $pro = $this->pro;
         $term = $request->input('term') ? trim($request->input('term')) : '';
         if (empty($term)) return '';
-        $clients = Client::where(function ($q) use ($term) {
+        $clientQuery= Client::where(function ($q) use ($term) {
             $q->where('name_first', 'ILIKE', '%' . $term . '%')
                 ->orWhere('name_last', 'ILIKE', '%' . $term . '%');
-        })->get();
+        });
+        
+        if($pro->pro_type != 'ADMIN'){
+            $clientQuery->whereIn('id', $pro->getMyClientIds());
+        }
+
+        $clients = $clientQuery->get();
         return view('app/patient-suggest', compact('clients'));
     }
 

app/Models/ClientProAccess.php

@@ -6,5 +6,6 @@ namespace App\Models;
 
 class ClientProAccess extends Model
 {
-    //
+    
+    protected $table = 'client_pro_access';
 }

app/Models/Pro.php

@@ -257,6 +257,39 @@ class Pro extends Model
 
         return $events;
 
+    }
+
+    public function getMyClientIds(){
+
+        $accessibleClientIds = [];
+        
+        $clientProAccesses = ClientProAccess::where('pro_id', $this->id)->get();
+        foreach($clientProAccesses as $cpa){
+            $accessibleClientIds[] = $cpa->client_id;
+        }
+
+        $appointmentClientIds = [];
+    
+        $appointments = Appointment::where('pro_id', $this->id)->get();
+        foreach($appointments as $appts){
+            $appointmentClientIds[] = $appts->client_id;
+        }
+
+        $clients = Client::where('mcp_pro_id', $this->id)
+            ->orWhere('cm_pro_id', $this->id)
+            ->orWhere('rmm_pro_id', $this->id)
+            ->orWhere('rme_pro_id', $this->id)
+            ->orWhere('rd_pro_id', $this->id)
+            ->orWhereIn('id', $accessibleClientIds)
+            ->orWhereIn('id', $appointmentClientIds)->get();
+
+        $clientIds = [];
 
+        foreach($clients as $client){
+            $clientIds[] = $client->id;
+        }
+        
+        return $clientIds;
     }
+
 }