Эх сурвалжийг харах

PM > pro calendar - dna should be able to see calendar of pros (accessible via teams)

Vijayakrishnan 3 жил өмнө
parent
commit
e23b5d2ae2

+ 12 - 0
app/Http/Controllers/HomeController.php

@@ -915,6 +915,7 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
                 ->orWhereRaw('LOWER(name_last::text) LIKE ?', ['%' . $term . '%'])
                 ->orWhereRaw('cell_number LIKE ?', ['%' . $term . '%']);
         });
+
         if($this->performer->pro && $this->performer->pro->pro_type != 'ADMIN'){
             $accessiblePros = ProProAccess::where('owner_pro_id', $this->performer->pro->id);
             $accessibleProIds = [];
@@ -922,6 +923,17 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
                 $accessibleProIds[] = $accessiblePro->id;
             }
             $accessibleProIds[] = $this->performer->pro->id;
+
+            // for dna, add pros accessible via pro teams
+            if($this->performer->pro->isDefaultNA()) {
+                $teams = $this->performer->pro->teamsWhereAssistant;
+                foreach ($teams as $team) {
+                    if(!in_array($team->mcp_pro_id, $accessibleProIds)) {
+                        $accessibleProIds[] = $team->mcp_pro_id;
+                    }
+                }
+            }
+
             $pros->whereIn('id', $accessibleProIds);
         }
         $suggestedPros = $pros->orderBy('name_last')->orderBy('name_first')->get();

+ 5 - 0
app/Models/Pro.php

@@ -49,6 +49,11 @@ class Pro extends Model
         return $this->hasMany(Bill::class, 'hcp_pro_id');
     }
 
+    public function teamsWhereAssistant()
+    {
+        return $this->hasMany(ProTeam::class, 'assistant_pro_id', 'id');
+    }
+
     public function isDefaultNA()
     {
         $numTeams = ProTeam::where('assistant_pro_id', $this->id)

+ 3 - 1
resources/views/app/practice-management/calendar.blade.php

@@ -61,6 +61,8 @@
             <h4 class="font-weight-bold m-0 font-size-16">
                 @if($pro->pro_type == 'ADMIN')
                     Admin Calendar
+                @elseif($pro->isDefaultNA())
+                    Calendar
                 @else
                     {{ $pro->displayName() }}'s Calendar
                 @endif
@@ -94,7 +96,7 @@
             </div>
         </div>
         <div class="d-block appt-form">
-            @if($pro->pro_type == 'ADMIN')
+            @if($pro->pro_type == 'ADMIN' || $pro->isDefaultNA())
             <form class="appt-form-col w-100 d-flex align-items-center">
                 <label class="mr-2 my-0 text-secondary text-nowrap">Show calendar for</label>
                 <select id="eventPros" name="proUid" xprovider-search