Client header - if admin - login in as icon right next to mcp and cc

app/Http/Controllers/HomeController.php

@@ -2074,7 +2074,7 @@ WHERE measurement.label NOT IN ('SBP', 'DBP')
 
             Cookie::queue('sessionKey', $data->data->sessionKey);
 
-            return redirect('/mc');
+            return redirect($request->input('redir') ?: '/mc');
         } catch (\Exception $e) {
             return redirect()->to(route('log-in-as'))
                 ->with('message', 'Unable to process your request at the moment. Please try again later.')

resources/views/layouts/patient.blade.php

@@ -628,7 +628,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 											<a href="#" start show onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')"><i class="fa fa-video text-sm mr-1"></i></a>
 										</div>
                                     </section>
-									<section class="screen-only vbox align-self-start mt-2 ml-0 mr-2 border-left pl-2">
+									<section class="screen-only vbox align-self-start mt-2 ml-0 mr-2 border-left pl-2 mcp-theme-1">
 										<div>
 											<label>MCP:</label> {{$mcpName}}
 											@if($patient->has_mcp_done_onboarding_visit !== 'YES' && $pro->pro_type == 'ADMIN')
@@ -677,13 +677,20 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 													</div>
 												@endif
 											@endif
+											@if($patient->mcp && $pro->pro_type === 'ADMIN' && $pro->uid !== $patient->mcp->uid)
+												<form action="{{route('process-log-in-as')}}?redir={{request()->url()}}" onsubmit="window.top.localStorage.currentProUid = '{{$patient->mcp->uid}}';" method="POST" target="_top" class="d-inline-block">
+													@csrf
+													<input type="hidden" name="proUid" value="{{$patient->mcp->uid}}">
+													<button class="bg-transparent text-primary border-0 text-sm"><i class="fa fa-user"></i></button>
+												</form>
+											@endif
 										</div>
 										@if($patient->mcp && $patient->mcp->id === $pro->id || $pro->pro_type == 'ADMIN')
 												<div>
 													<label>Status (mcp):</label>
 													<span>{!! $patient->mcpEngagementAssessmentStatus && $patient->mcpEngagementAssessmentStatus->status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->mcpEngagementAssessmentStatus->status_category))) : '<span class="text-danger">Not Set</span>'  !!}</span>
 													<div moe class="ml-2">
-														<a start show><i class="fa fa-edit"></i></a>
+														<a start show><i class="fa fa-edit text-sm"></i></a>
 														<form url="/api/client/updateMcpEngagementAssessmentStatus" class="mcp-theme-1">
 															<input type="hidden" name="uid" value="{{$patient->uid}}">
 															<div class="mb-2">
@@ -720,7 +727,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 											<label>CC:</label> {{$patient->defaultNaPro ? $patient->defaultNaPro->displayName() : '-' }}
 											@if($pro->pro_type == 'ADMIN')
 												<div moe class="ml-2 hide-inside-popup">
-													<a start show><i class="fa fa-edit"></i></a>
+													<a start show><i class="fa fa-edit text-sm"></i></a>
 													<form url="/api/client/putDefaultNaPro" class="mcp-theme-1">
 														<input type="hidden" name="uid" value="{{$patient->uid}}">
 														<div class="mb-2">
@@ -761,13 +768,20 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 													</div>
 												@endif
 											@endif
+											@if($patient->defaultNaPro && $pro->pro_type === 'ADMIN' && $pro->uid !== $patient->defaultNaPro->uid)
+												<form action="{{route('process-log-in-as')}}?redir={{request()->url()}}" onsubmit="window.top.localStorage.currentProUid = '{{$patient->defaultNaPro->uid}}';" method="POST" target="_top" class="d-inline-block">
+													@csrf
+													<input type="hidden" name="proUid" value="{{$patient->defaultNaPro->uid}}">
+													<button class="bg-transparent text-primary border-0 text-sm"><i class="fa fa-user"></i></button>
+												</form>
+											@endif
 										</div>
 										@if($patient->defaultNaPro && $patient->defaultNaPro->id === $pro->id || $pro->pro_type == 'ADMIN')
 											<div>
 												<label>Status (cc):</label>
 												<span>{!! $patient->defaultNaEngagementAssessmentStatus && $patient->defaultNaEngagementAssessmentStatus->status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->defaultNaEngagementAssessmentStatus->status_category))) : '<span class="text-danger">Not Set</span>'  !!}</span>
 												<div moe class="ml-2">
-													<a start show><i class="fa fa-edit"></i></a>
+													<a start show><i class="fa fa-edit text-sm"></i></a>
 													<form url="/api/client/updateDefaultNaEngagementAssessmentStatus" class="mcp-theme-1">
 														<input type="hidden" name="uid" value="{{$patient->uid}}">
 														<div class="mb-2">