RPM manager - patients list as per pro role

app/Http/Controllers/PracticeManagementController.php

@@ -2439,8 +2439,27 @@ WHERE
             abort(403);
         }
 
+        $proRoles = [];
+        if($pro->pro_type === 'ADMIN') $proRoles[] = 'ADMIN';
+        if($pro->pro_type === 'ADMIN' || $pro->is_considered_for_mcp_assignment) $proRoles[] = 'MCP';
+        if($pro->pro_type === 'ADMIN' || $pro->is_considered_for_rmm) $proRoles[] = 'RMM';
+        if($pro->pro_type === 'ADMIN' || $pro->is_considered_for_rme) $proRoles[] = 'RME';
+        $viewingAs = $request->input('viewingAs') ?: $proRoles[0];
+
         $conditions = [];
 
+        switch($viewingAs) {
+            case 'MCP':
+                $conditions[] = "(care_month.mcp_pro_id = {$pro->id})";
+                break;
+            case 'RMM':
+                $conditions[] = "(care_month.rmm_pro_id = {$pro->id})";
+                break;
+            case 'RME':
+                $conditions[] = "(care_month.rme_pro_id = {$pro->id})";
+                break;
+        }
+
         // show only if enrolled in RPM
         $conditions[] = "(care_month.is_client_enrolled_in_rm IS TRUE)";
 
@@ -2562,13 +2581,6 @@ WHERE
         $paginator = new LengthAwarePaginator($patients, $total, $request->input('per_page') ?: $defaultPageSize, $request->input('page') ?: 1);
         $paginator->setPath(route('practice-management.rpm-manager'));
 
-        $proRoles = [];
-        if($pro->pro_type === 'ADMIN') $proRoles[] = 'ADMIN';
-        if($pro->pro_type === 'ADMIN' || $pro->is_considered_for_mcp_assignment) $proRoles[] = 'MCP';
-        if($pro->pro_type === 'ADMIN' || $pro->is_considered_for_rmm) $proRoles[] = 'RMM';
-        if($pro->pro_type === 'ADMIN' || $pro->is_considered_for_rme) $proRoles[] = 'RME';
-        $viewingAs = $request->input('viewingAs') ?: $proRoles[0];
-
         return view('app.practice-management.rpm-manager.index', compact('patients', 'month', 'year','paginator', 'perPage', 'proRoles', 'viewingAs'));
     }
 

resources/views/app/practice-management/rpm-manager/index.blade.php

@@ -55,7 +55,7 @@
                                 </select>
                             </div>
                             <div class="mr-3 d-inline-flex align-items-center">
-                                <label class="mb-0 mr-2 text-nowrap">Viewing As</label>
+                                <label class="mb-0 mr-2 text-nowrap">View As</label>
                                 <select name="viewingAs" class="form-control form-control-sm min-width-unset pl-0"
                                     onchange="fastLoad('{{route('practice-management.rpm-manager')}}?' + $(this).closest('form').serialize())">
                                     @foreach($proRoles as $proRole)
@@ -433,6 +433,7 @@
             </div>
         </div>
         <div class="stag-popup tall draggable resizable mcp-theme-1"
+             update-parent
              stag-popup-key="rpm-manager-bp-popup">
             <div class="stag-popup-content p-0">
                 <h3 class="stag-popup-title mb-0 mt-3 mx-3 pb-0 border-bottom-0">
@@ -461,6 +462,7 @@
             </div>
         </div>
         <div class="stag-popup tall draggable resizable mcp-theme-1"
+             update-parent
              stag-popup-key="rpm-manager-weight-popup">
             <div class="stag-popup-content p-0">
                 <h3 class="stag-popup-title mb-0 mt-3 mx-3 pb-0 border-bottom-0">
@@ -488,7 +490,7 @@
                 </div>
             </div>
         </div>
-        <div id="stamp-moe-template">
+        <div id="stamp-moe-template" class="d-none">
             <div moe relative>
                 <a href="#" start show>Stamp</a>
                 <form url="/api/measurement/stamp" right class="width-300px">