Merge branch 'master' into dev-vj

app/Http/Controllers/HomeController.php

@@ -1911,7 +1911,12 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
                     }
                 }
             }
-
+                $teams = $this->performer->pro->teamsWhereMcp;
+                foreach ($teams as $team) {
+                    if(!in_array($team->assistant_pro_id, $accessibleProIds)) {
+                        $accessibleProIds[] = $team->assistant_pro_id;
+                    }
+	        }
             $pros->whereIn('id', $accessibleProIds);
         }
         $suggestedPros = $pros->orderBy('name_last')->orderBy('name_first')->get();

app/Models/Pro.php

@@ -58,6 +58,11 @@ class Pro extends Model
         return $this->hasMany(Bill::class, 'hcp_pro_id');
     }
 
+    public function teamsWhereMcp()
+    {
+        return $this->hasMany(ProTeam::class, 'mcp_pro_id', 'id');
+    }
+    
     public function teamsWhereAssistant()
     {
         return $this->hasMany(ProTeam::class, 'assistant_pro_id', 'id');

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

@@ -37,7 +37,7 @@
 				<option value="NO_MCP">No MCP</option>
 				<?php $mcpPros = \App\Models\Pro::where('is_active', true)->where('is_enrolled_as_mcp', true)->orderBy('name_display')->get(); ?>
 				@foreach($mcpPros as $mcpPro)
-					<option value="{{$mcpPro->uid}}">{{$mcpPro->name_display}}</option>
+					<option value="{{$mcpPro->uid}}">{{$mcpPro->displayName()}}</option>
 				@endforeach
 			</select>
 		</div>

resources/views/app/generic-bills/add-bill-form/_default-fields.blade.php

@@ -41,7 +41,7 @@
 <div class="mb-2">
     <?php
     if(!@$maxMinutes) {
-        $maxMinutes = 20;
+        $maxMinutes = 30;
     }
     ?>
     <label for="" class="text-secondary text-sm">Minutes</label>

resources/views/app/patient/create-patient/demographics-form.blade.php

@@ -90,6 +90,16 @@
 			</div>
 		</div>
 	</div>
+	<div class="col-12">
+                <div class="row align-items-center form-group">
+                        <label class='col-md-2 pr-0 font-weight-bold m-0' style="font-size:10px !important;">Coordinator:</label>
+                        <div class="col-md-10">
+                                <select name="assistantProUid" class="form-control input-sm" provider-search provider-type="default-na">
+                                        <option value="">--select--</option>
+                                </select>
+                        </div>
+                </div>
+        </div>
 </div>
 @elseif($pro->isDefaultNA())
 <div class="row">