Quellcode durchsuchen

Merge branch 'master' into dev-vj

Vijayakrishnan vor 3 Jahren
Ursprung
Commit
689cd56c39

+ 7 - 2
app/Http/Controllers/Controller.php

@@ -92,11 +92,16 @@ class Controller extends BaseController
         ];
     }
 
-    public function filterMultiQuery(Request $request, $query, $columnName, $keyName, $valueName1, $valueName2) {
+    public function filterMultiQuery(Request $request, $query, $columnName, $keyName, $valueName1, $valueName2, $onlyDate = true) {
         switch($request->input($keyName)) {
             case 'EXACTLY':
                 if($request->input($valueName1)) {
-                    $query->where($columnName, $request->input($valueName1));
+                    if($onlyDate){
+                        $query->whereDate($columnName, $request->input($valueName1));
+                    }else{
+                        $query->where($columnName, $request->input($valueName1));
+                    }
+                    
                 }
                 break;
             case 'LESS_THAN':

+ 41 - 1
app/Http/Controllers/PracticeManagementController.php

@@ -299,10 +299,50 @@ SELECT effective_date, count(*), sum(number_of_units) as units FROM bill WHERE c
             default:
                 break;
         }
-        $notes = $query->orderBy('created_at', 'desc')->get();
+
+        $notes = $query->orderBy('created_at', 'desc')->paginate(30);
         return view('app.practice-management.notes', compact('notes', 'filter'));
     }
 
+    public function allNotes(Request $request)
+    {
+        $query = Note::query();
+        
+        $filters = $request->all();
+
+        $this->filterMultiQuery($request, $query, 'created_at', 'created_at_category', 'created_at_value_1', 'created_at_value_2');
+        $this->filterMultiQuery($request, $query, 'effective_dateest', 'effective_date_category', 'effective_date_value_1', 'effective_date_value_2');
+       
+        $filterByProsIDs = $request->get('pros');
+        if($filterByProsIDs && count($filterByProsIDs)){
+            $query = $query->whereIn('hcp_pro_id', $filterByProsIDs);
+        }
+
+        $filterByPatientsIDs = $request->get('patients');
+        if($filterByPatientsIDs && count($filterByPatientsIDs)){
+            $query = $query->whereIn('client_id', $filterByPatientsIDs);
+        } 
+        
+        $status = $request->get('status');
+        if($status){
+            if($status == 'CANCELLED') $query = $query->where('is_cancelled', true);
+            if($status == 'NOT_YET_SIGNED') $query = $query->where('is_signed_by_hcp', false);
+            if($status == 'NOT_YET_SIGNED_BUT_ALLY_SIGNED') $query = $query->where('is_signed_by_hcp', false)->where('is_signed_by_ally', true);
+            if($status == 'WITHOUT_BILLS') $query = $query->where('is_signed_by_hcp', true)->where('is_cancelled', false)->whereDoesntHave('bills');
+        }
+
+        
+        $allProsWithNotesIDs = Note::pluck('hcp_pro_id')->toArray();
+        $allProsWithNotes = Pro::whereIn('id', $allProsWithNotesIDs)->get();
+
+        $allPatientsWithNotesIDs = Note::pluck('client_id')->toArray();
+        $allPatientsWithNotes = Client::whereIn('id', $allPatientsWithNotesIDs)->get();
+
+        $notes = $query->orderBy('created_at', 'desc')->paginate(30);
+
+        return view('app.practice-management.all-notes', compact('notes', 'filters','allProsWithNotes', 'allPatientsWithNotes'));
+    }
+
     public function dnaNotesPendingMcpSign(Request $request)
     {
         $proID = $this->performer()->pro->id;

+ 5 - 0
app/Models/SupplyOrder.php

@@ -44,4 +44,9 @@ class SupplyOrder extends Model
     {
         return $this->hasOne(AppSession::class, 'id', 'created_by_session_id');
     }
+
+    public function createdByPro()
+    {
+        return $this->hasOne(Pro::class, 'id', 'created_by_pro_id');
+    }
 }

+ 4 - 0
js-dev/icd-autocomplete.js

@@ -5,6 +5,10 @@
         $('[icd-autocomplete-code]:not([ac-initialized])').each(function() {
             let elem = this, dynID = 'icd-' + Math.ceil(Math.random() * 1000000),
                 codeElem = $(this), descElem = $(this).closest('form').find('[icd-autocomplete-description]');
+            var targetDescElem = $(this).data('target');
+            if(targetDescElem){
+                descElem = $(this).closest('form').find(targetDescElem);
+            }
             $(elem).attr('id', dynID);
             new window.Def.Autocompleter.Search(dynID,
                 'https://clinicaltables.nlm.nih.gov/api/icd10cm/v3/search?sf=code,name&ef=name', {

+ 17 - 4
public/css/style.css

@@ -107,7 +107,20 @@ body>.navbar .dropdown-menu {
 main {
   padding:0 1rem;
 }
-
+.bg-dark-primary {
+  background-color: #3061ad;
+}
+.flex-header {
+  display: flex;
+  gap: 10px;
+}
+.flex-header >div {
+  flex-grow: 1;
+}
+.patient-header-address {
+  list-style-type: none;
+  padding-left: 0;
+}
 /* ability to toggle the video pane (rhs) */
 .stag_rhs_toggle, .stag_rhs_toggle:hover {
     position: fixed;
@@ -3358,7 +3371,7 @@ body.forced-masking #mask {
 }
 
 .ql-editor {
-    padding: 6px 6px; 
+    padding: 6px 6px;
 }
 
 .pdf-form-preloader {
@@ -3373,7 +3386,7 @@ body.forced-masking #mask {
 }
 
 .ql-editor {
-    padding: 6px 6px; 
+    padding: 6px 6px;
 }
 #handoutSelectComponent img {
     max-width: 100%;
@@ -3404,4 +3417,4 @@ body.forced-masking #mask {
 
 .mcp-theme-1 .point-table [if-read-mode] .inline-html-container {
     cursor: pointer;
-}
+}

+ 4 - 0
public/js/icd-autocomplete.js

@@ -5,6 +5,10 @@
         $('[icd-autocomplete-code]:not([ac-initialized])').each(function() {
             let elem = this, dynID = 'icd-' + Math.ceil(Math.random() * 1000000),
                 codeElem = $(this), descElem = $(this).closest('form').find('[icd-autocomplete-description]');
+            var targetDescElem = $(this).data('target');
+            if(targetDescElem){
+                descElem = $(this).closest('form').find(targetDescElem);
+            }
             $(elem).attr('id', dynID);
             new window.Def.Autocompleter.Search(dynID,
                 'https://clinicaltables.nlm.nih.gov/api/icd10cm/v3/search?sf=code,name&ef=name', {

+ 58 - 0
resources/views/app/patient/care-month/put-rm-reasons.blade.php

@@ -0,0 +1,58 @@
+<div moe>
+	<a start show><i class="fas fa-edit"></i></a>
+	<form url="/api/careMonth/putRmReasons" class="mcp-theme-1">
+		<input type="hidden" name="uid" value="{{$careMonth->uid}}">
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 1</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code data-target="input[name=rmReasonIcd1Description]" name="rmReasonIcd1" value="{{ $careMonth->rm_reason_icd1 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 1 Description</label>
+				<input id="" type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd1Description" value="{{ $careMonth->rm_reason_icd1description }}">
+			</div>
+		</div>
+
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 2</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd2" data-target="input[name=rmReasonIcd2Description]" value="{{ $careMonth->rm_reason_icd2 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 2 Description</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd2Description" value="{{ $careMonth->rm_reason_icd2description }}">
+			</div>
+		</div>
+
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 3</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd3" data-target="input[name=rmReasonIcd3Description]" value="{{ $careMonth->rm_reason_icd3 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 3 Description</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd3Description" value="{{ $careMonth->rm_reason_icd3description }}">
+			</div>
+		</div>
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 4</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd4" data-target="input[name=rmReasonIcd4Description]" value="{{ $careMonth->rm_reason_icd4 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 4 Description</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd4Description" value="{{ $careMonth->rm_reason_icd4description }}">
+			</div>
+		</div>
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Memo</label>
+				<input type="text" class="form-control form-control-sm" name="rmReasonMemo" value="{{ $careMonth->rm_reason_memo }}">
+			</div>
+		</div>
+		<div>
+			<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+			<button cancel class="btn btn-sm btn-default border">Cancel</button>
+		</div>
+	</form>
+</div>

+ 44 - 56
resources/views/app/patient/care-month/rm-reasons.blade.php

@@ -1,62 +1,50 @@
+<div class="d-flex align-items-center mb-1">
+    <span class="mr-2">RM Reasons:</span>
+    @include('app.patient.care-month.put-rm-reasons')
+</div>
 <div class="">
-    <div class="">
-        <div class="d-flex align-items-center mb-2 border-bottom pb-2">
-            <p class="font-weight-bold text-secondary m-0 mr-2">RM Reasons</p>
-        </div>
-        @if(!$careMonth->rmReasons || !count($careMonth->rmReasons))
-            <span class="text-secondary">None</span>
-        @else
-            <div>
-                @foreach($careMonth->rmReasons as $reason)
-                    <div class="border-bottom pb-1 mb-1 d-flex align-items-start">
-                        <b class="width-90px">{{$reason->code}}</b>
-                        <span class="width-200px">{{$reason->description}}</span>
-                        <div moe class="ml-3">
-                            <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
-                            <form url="/api/careMonthCmRmReason/updateBasic" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$reason->uid}}">
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Code *</label>
-                                    <input type="text" class="form-control form-control-sm"
-                                           name="code" value="{{$reason->code}}" required>
-                                </div>
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Description</label>
-                                    <input type="text" class="form-control form-control-sm"
-                                           name="description" value="{{$reason->description}}">
-                                </div>
-                                <div>
-                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
-                        </div>
+    <table class="table table-sm table-striped table-bordered">
+        <tbody>
+            <tr>
+                <td class="text-nowrap">RM Reason Icd 1</td>
+                <td>
+                    <div class="d-flex flex-column">
+                        <span class="font-weight-bold">{{ $careMonth->rm_reason_icd1 }}</span>
+                        <small class="text-muted">{{ $careMonth->rm_reason_icd1description }}</small>
                     </div>
-                @endforeach
-            </div>
-        @endif
-        <div>
-            <div moe>
-                <a start show>+ Add</a>
-                <form url="/api/careMonthCmRmReason/create" class="mcp-theme-1">
-                    <input type="hidden" name="careMonthUid" value="{{$careMonth->uid}}">
-                    <input type="hidden" name="cmOrRm" value="RM">
-                    <div class="mb-2">
-                        <label class="text-sm mb-1 text-secondary">Code *</label>
-                        <input type="text" class="form-control form-control-sm"
-                               name="code" value="" required>
+                </td>
+            </tr>
+            <tr>
+                <td class="text-nowrap">RM Reason Icd 2</td>
+                <td>
+                    <div class="d-flex flex-column">
+                        <span class="font-weight-bold">{{ $careMonth->rm_reason_icd2 }}</span>
+                        <small class="text-muted">{{ $careMonth->rm_reason_icd2description }}</small>
                     </div>
-                    <div class="mb-2">
-                        <label class="text-sm mb-1 text-secondary">Description</label>
-                        <input type="text" class="form-control form-control-sm"
-                               name="description" value="">
+                </td>
+            </tr>
+            <tr>
+                <td class="text-nowrap">RM Reason Icd 3</td>
+                <td>
+                    <div class="d-flex flex-column">
+                        <span class="font-weight-bold">{{ $careMonth->rm_reason_icd3 }}</span>
+                        <small class="text-muted">{{ $careMonth->rm_reason_icd3description }}</small>
                     </div>
-                    <div>
-                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                </td>
+            </tr>
+            <tr>
+                <td class="text-nowrap">RM Reason Icd 4</td>
+                <td>
+                    <div class="d-flex flex-column">
+                        <span class="font-weight-bold">{{ $careMonth->rm_reason_icd4 }}</span>
+                        <small class="text-muted">{{ $careMonth->rm_reason_icd4description }}</small>
                     </div>
-                </form>
-            </div>
-        </div>
-    </div>
+                </td>
+            </tr>
+            <tr>
+                <td class="text-nowrap">RM Reason Memo</td>
+                <td>{{ $careMonth->rm_reason_memo }}</td>
+            </tr>
+        </tbody>
+    </table>
 </div>

+ 62 - 0
resources/views/app/patient/care-month/rm-reasons_depricated.blade.php

@@ -0,0 +1,62 @@
+<div class="">
+    <div class="">
+        <div class="d-flex align-items-center mb-2 border-bottom pb-2">
+            <p class="font-weight-bold text-secondary m-0 mr-2">RM Reasons</p>
+        </div>
+        @if(!$careMonth->rmReasons || !count($careMonth->rmReasons))
+            <span class="text-secondary">None</span>
+        @else
+            <div>
+                @foreach($careMonth->rmReasons as $reason)
+                    <div class="border-bottom pb-1 mb-1 d-flex align-items-start">
+                        <b class="width-90px">{{$reason->code}}</b>
+                        <span class="width-200px">{{$reason->description}}</span>
+                        <div moe class="ml-3">
+                            <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                            <form url="/api/careMonthCmRmReason/updateBasic" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$reason->uid}}">
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Code *</label>
+                                    <input type="text" class="form-control form-control-sm"
+                                           name="code" value="{{$reason->code}}" required>
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-sm mb-1 text-secondary">Description</label>
+                                    <input type="text" class="form-control form-control-sm"
+                                           name="description" value="{{$reason->description}}">
+                                </div>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    </div>
+                @endforeach
+            </div>
+        @endif
+        <div>
+            <div moe>
+                <a start show>+ Add</a>
+                <form url="/api/careMonthCmRmReason/create" class="mcp-theme-1">
+                    <input type="hidden" name="careMonthUid" value="{{$careMonth->uid}}">
+                    <input type="hidden" name="cmOrRm" value="RM">
+                    <div class="mb-2">
+                        <label class="text-sm mb-1 text-secondary">Code *</label>
+                        <input type="text" class="form-control form-control-sm"
+                               name="code" value="" required>
+                    </div>
+                    <div class="mb-2">
+                        <label class="text-sm mb-1 text-secondary">Description</label>
+                        <input type="text" class="form-control form-control-sm"
+                               name="description" value="">
+                    </div>
+                    <div>
+                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                    </div>
+                </form>
+            </div>
+        </div>
+    </div>
+</div>

+ 1 - 1
resources/views/app/patient/coverage-status.blade.php

@@ -1,4 +1,4 @@
-<div>
+<div class="table-responsive">
     @php
         $coverage = $patient->latestClientPrimaryCoverage;
         $mcnDetails = json_decode($patient->mcn_response_detail ?? null);

+ 12 - 4
resources/views/app/patient/note/dashboard.blade.php

@@ -856,13 +856,16 @@ use App\Models\Handout;
                                                     {{ $iSupplyOrder->product->title }}
                                                 </td>
                                                 <td class="px-2">{{ $iSupplyOrder->reason }}</td>
-                                                <td class="px-2">{{ friendlier_date_time($iSupplyOrder->created_at) }}</td>
-                                                <td class="px-2">{{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}</td>
+                                                <td class="px-2">{{ friendlier_date($iSupplyOrder->created_at) }} <i class="fas fa-info-circle text-primary" data-toggle="tooltip" data-placement="top" data-html="true" title="Created at: {{ friendlier_date_time($iSupplyOrder->created_at) }} By: {{ $iSupplyOrder->createdByPro->displayName() }}"></i> </td>
+                                                <td class="px-2">
+                                                    {{ $iSupplyOrder->is_signed_by_pro ? $iSupplyOrder->signedPro->displayName() : '-' }}
+                                                    <i class="fas fa-info-circle text-primary" data-toggle="tooltip" data-placement="top" data-html="true" title="Signed at: {{ friendlier_date_time($iSupplyOrder->pro_signed_at) }}"></i>
+                                                </td>
                                                 <td class="px-2">{{ $iSupplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
                                                 <td class="px-2">
                                                     @if($iSupplyOrder->shipment_id)
                                                         <i class="fa fa-building"></i>
-                                                        {{$iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'}}
+                                                        {{ucwords(strtolower($iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'))}}
                                                     @elseif($iSupplyOrder->is_cleared_for_shipment)
                                                         <span class="text-info">
                                                         <i class="fa fa-user-nurse"></i>
@@ -912,7 +915,7 @@ use App\Models\Handout;
                                             <td class="px-2">
                                                 @if($iSupplyOrder->shipment_id)
                                                     <i class="fa fa-building"></i>
-                                                    {{$iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'}}
+                                                    {{ ucwords(strtolower($iSupplyOrder->shipment->status ? $iSupplyOrder->shipment->status : 'CREATED'))}}
                                                 @elseif($iSupplyOrder->is_cleared_for_shipment)
                                                     <span class="text-info">
                                                         <i class="fa fa-user-nurse"></i>
@@ -1029,6 +1032,11 @@ use App\Models\Handout;
                             }
 
                             function init() {
+                                $(function () {
+                                    $('[data-toggle="tooltip"]').tooltip({
+                                        html: true
+                                    })
+                                });
                                 $(document)
                                     .off('change input paste keyup',
                                         '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="usualWeightInPoundsMin"],  #bmi-management-settings [name="usualWeightInPoundsMax"]')

+ 58 - 0
resources/views/app/patient/partials/put-rm-reasons.blade.php

@@ -0,0 +1,58 @@
+<div moe>
+	<a start show><i class="fas fa-edit"></i></a>
+	<form url="/api/client/putRmReasons" class="mcp-theme-1">
+		<input type="hidden" name="uid" value="{{$patient->uid}}">
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 1</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code data-target="input[name=rmReasonIcd1Description]" name="rmReasonIcd1" value="{{ $patient->rm_reason_icd1 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 1 Description</label>
+				<input id="" type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd1Description" value="{{ $patient->rm_reason_icd1description }}">
+			</div>
+		</div>
+
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 2</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd2" data-target="input[name=rmReasonIcd2Description]" value="{{ $patient->rm_reason_icd2 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 2 Description</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd2Description" value="{{ $patient->rm_reason_icd2description }}">
+			</div>
+		</div>
+
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 3</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd3" data-target="input[name=rmReasonIcd3Description]" value="{{ $patient->rm_reason_icd3 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 3 Description</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd3Description" value="{{ $patient->rm_reason_icd3description }}">
+			</div>
+		</div>
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 4</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-code name="rmReasonIcd4" data-target="input[name=rmReasonIcd4Description]" value="{{ $patient->rm_reason_icd4 }}" />
+			</div>
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Icd 4 Description</label>
+				<input type="text" class="form-control form-control-sm" icd-autocomplete-description name="rmReasonIcd4Description" value="{{ $patient->rm_reason_icd4description }}">
+			</div>
+		</div>
+		<div class="bg-light p-3 mb-2">
+			<div class="mb-2">
+				<label class="text-sm mb-1 text-secondary">RM Reason Memo</label>
+				<input type="text" class="form-control form-control-sm" name="rmReasonMemo" value="{{ $patient->rm_reason_memo }}">
+			</div>
+		</div>
+		<div>
+			<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+			<button cancel class="btn btn-sm btn-default border">Cancel</button>
+		</div>
+	</form>
+</div>

+ 52 - 3
resources/views/app/patient/partials/rm-setup.blade.php

@@ -104,8 +104,57 @@
                 </div>
             </div>
         </div>
-
-        <div class="d-flex align-items-baseline mb-3">
+        <div class="d-flex align-items-center mb-1">
+            <span class="mr-2">RM Reasons:</span>
+            @include('app.patient.partials.put-rm-reasons')
+        </div>
+        <div class="pl-3" style="width: 400px;">
+            <table class="table table-sm table-striped table-bordered">
+                <tbody>
+                    <tr>
+                        <td class="text-nowrap">RM Reason Icd 1</td>
+                        <td>
+                            <div class="d-flex flex-column">
+                                <span class="font-weight-bold">{{ $patient->rm_reason_icd1 }}</span>
+                                <small class="text-muted">{{ $patient->rm_reason_icd1description }}</small>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="text-nowrap">RM Reason Icd 2</td>
+                        <td>
+                        <div class="d-flex flex-column">
+                                <span class="font-weight-bold">{{ $patient->rm_reason_icd2 }}</span>
+                                <small class="text-muted">{{ $patient->rm_reason_icd2description }}</small>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="text-nowrap">RM Reason Icd 3</td>
+                        <td>
+                        <div class="d-flex flex-column">
+                                <span class="font-weight-bold">{{ $patient->rm_reason_icd3 }}</span>
+                                <small class="text-muted">{{ $patient->rm_reason_icd3description }}</small>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="text-nowrap">RM Reason Icd 4</td>
+                        <td>
+                        <div class="d-flex flex-column">
+                                <span class="font-weight-bold">{{ $patient->rm_reason_icd4 }}</span>
+                                <small class="text-muted">{{ $patient->rm_reason_icd4description }}</small>
+                            </div>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td class="text-nowrap">RM Reason Memo</td>
+                        <td>{{ $patient->rm_reason_memo }}</td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+        {{--<div class="d-flex align-items-baseline mb-3">
             <span class="width-200px">RM Reasons:</span>
             <div class="ml-3">
                 @if(!$patient->rmReasons || !count($patient->rmReasons))
@@ -168,7 +217,7 @@
                     </div>
                 </div>
             </div>
-        </div>
+        </div>--}}
 
         @if($pro->pro_type === 'ADMIN')
             <div class="d-flex align-items-baseline mb-3">

+ 13 - 9
resources/views/app/patient/settings.blade.php

@@ -1,7 +1,6 @@
 @extends ('layouts.patient')
 
 @section('inner-content')
-
     <div id="client-settings-container">
     <h4 class="font-size-16 m-0 mb-3">Settings</h4>
         <div class="row">
@@ -27,6 +26,7 @@
                                     <option {{ $patient->client_engagement_status_category === 'DUPLICATE' ? 'selected' : '' }} value="DUPLICATE">Duplicate</option>
                                     <option {{ $patient->client_engagement_status_category === 'NO_LONGER_INTERESTED' ? 'selected' : '' }} value="NO_LONGER_INTERESTED">No Longer Interested</option>
                                     <option {{ $patient->client_engagement_status_category === 'BAD_RECORD' ? 'selected' : '' }} value="BAD_RECORD">Bad Record</option>
+                                    <option {{ $patient->client_engagement_status_category === 'NO_LONGER_ELIGIBLE' ? 'selected' : '' }} value="NO_LONGER_ELIGIBLE">No Longer Eligible</option>
                                 </select>
                             </div>
                             <div class="mb-2">
@@ -488,6 +488,9 @@
                     <div class="mb-1">
                       RD Pro: <b>{{ $patient->rd->name_display ?? ''}}</b>
                     </div>
+                    <div class="mb-1">
+                      Physician Pro: <b>{{ $patient->pcp->rd->name_display ?? ''}}</b>
+                    </div>
                 </div>
 
                 <hr class="m-negator-3 my-3">
@@ -576,7 +579,7 @@
 		            <p>Why Not Eligible For RM Memo: {{$patient->why_not_eligible_for_rm_memo}}</p>
                 </div>
                 <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Update RM Eligiblity</a>
+                    <a start show><i class="fa fa-edit"></i> Update RM Eligiblity</a>
                     <form url="/api/client/updateRmEligibility" class="mcp-theme-1">
                         <input type="hidden" name="uid" value="{{$patient->uid}}">
                         <div class="form-group">
@@ -616,7 +619,7 @@
                 </div>
                 @if($patient->is_enrolled_in_rm == 'YES')
                 <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Set is enrolled to RM to false</a>
+                    <a start show><i class="fa fa-edit"></i> Set is enrolled to RM to false</a>
                     <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
                         <input type="hidden" name="uid" value="{{$patient->uid}}">
                         <div class="form-group">
@@ -639,7 +642,7 @@
 
                 @else
                 <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Set is enrolled to RM to YES</a>
+                    <a start show><i class="fa fa-edit"></i> Set is enrolled to RM to YES</a>
                     <form url="/api/client/setIsEnrolledInRmToTrue" class="mcp-theme-1">
                         <input type="hidden" name="uid" value="{{$patient->uid}}">
                         <div class="form-group">
@@ -657,7 +660,7 @@
                 </div>
 
                 <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Update Why Not Enrolled In RM</a>
+                    <a start show><i class="fa fa-edit"></i> Update Why Not Enrolled In RM</a>
                     <form url="/api/client/updateWhyNotEnrolledInRm" class="mcp-theme-1">
                         <input type="hidden" name="uid" value="{{$patient->uid}}">
                         <div class="form-group">
@@ -688,7 +691,7 @@
 		            <p>Detail: {{$patient->adminEngagementAssessmentStatus->status_detail ?? ''}}</p>
                 </div>
                 <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Update Admin Engagement Assessment Status</a>
+                    <a start show><i class="fa fa-edit"></i> Update Admin Engagement Assessment Status</a>
                     <form url="/api/client/updateAdminEngagementAssessmentStatus" class="mcp-theme-1">
                         <input type="hidden" name="uid" value="{{$patient->uid}}">
                         <div class="form-group">
@@ -733,7 +736,7 @@
 		            <p>Detail: {{$patient->mcpEngagementAssessmentStatus->status_detail ?? ''}}</p>
                 </div>
                 <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Update MCP Engagement Assessment Status</a>
+                    <a start show><i class="fa fa-edit"></i> Update MCP Engagement Assessment Status</a>
                     <form url="/api/client/updateMcpEngagementAssessmentStatus" class="mcp-theme-1">
                         <input type="hidden" name="uid" value="{{$patient->uid}}">
                         <div class="form-group">
@@ -777,7 +780,7 @@
 		            <p>Detail: {{$patient->defaultNaEngagementAssessmentStatus->status_detail ?? ''}}</p>
                 </div>
                 <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Update Default NA Engagement Assessment Status</a>
+                    <a start show><i class="fa fa-edit"></i> Update Default NA Engagement Assessment Status</a>
                     <form url="/api/client/updateDefaultNaEngagementAssessmentStatus" class="mcp-theme-1">
                         <input type="hidden" name="uid" value="{{$patient->uid}}">
                         <div class="form-group">
@@ -822,7 +825,7 @@
 		            <p>Detail: {{$patient->client_engagement_status_category_detail ?? ''}}</p>
                 </div>
                 <div moe class="ml-2">
-                    <a start show><i class="fa fa-edit"></i>Update Client Engagement Assessment Status</a>
+                    <a start show><i class="fa fa-edit"></i> Update Client Engagement Assessment Status</a>
                     <form url="/api/client/updateClientEngagementAssessmentStatus" class="mcp-theme-1">
                         <input type="hidden" name="uid" value="{{$patient->uid}}">
                         <div class="form-group">
@@ -837,6 +840,7 @@
 	                            <option {{$patient->client_engagement_status_category == 'DUPLICATE' ? 'selected' :''}} value="DUPLICATE">DUPLICATE</option>
                                 <option {{$patient->client_engagement_status_category == 'NO_LONGER_INTERESTED' ? 'selected' :''}} value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option>
                                 <option {{$patient->client_engagement_status_category == 'BAD_RECORD' ? 'selected' :''}} value="BAD_RECORD">BAD_RECORD</option>
+                                <option {{ $patient->client_engagement_status_category === 'NO_LONGER_ELIGIBLE' ? 'selected' : '' }} value="NO_LONGER_ELIGIBLE">No Longer Eligible</option>
                             </select>
                         </div>
                         <div class="form-group">

+ 67 - 0
resources/views/app/practice-management/all-notes.blade.php

@@ -0,0 +1,67 @@
+@extends ('layouts/template')
+
+@section('content')
+
+<div class="p-3 mcp-theme-1">
+    <div class="card">
+
+        <div class="card-header p-0">
+            <div class="d-flex align-items-center border-bottom px-2 py-1">
+                <strong class="mr-4">
+                    <i class="fas fa-notes-medical"></i>
+                    All Notes
+                </strong>
+            </div>
+            <div class="px-2 py-1">
+                @include('app.practice-management.notes_filters')
+            </div>
+        </div>
+        <div class="card-body p-0">
+
+            <table class="table table-sm table-striped p-0 m-0">
+                <thead class="bg-light">
+                    <tr>
+                        <th class="px-3 border-0">Created</th>
+                        <th class="border-0">Effective Date</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0">MCP</th>
+                        <th class="border-0 w-50">Content</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach ($notes as $note)
+                    <tr class="{{ $note->is_cancelled ? 'cancelled-item always-clickable' : '' }}">
+                        <td class="px-3">
+                            {{ friendly_date_time($note->created_at, true) }}
+                        </td>
+                        <td class="">
+                            <a href="/patients/view/{{ $note->client->uid }}/notes/view/{{ $note->uid }}">
+                                {{ friendly_date_time($note->effective_dateest, false) }}
+                            </a>
+                            <span class="ml-1">{{ $note->is_cancelled ? '[cancelled]' : '' }}</span>
+                        </td>
+                        <td class="">
+                            <a href="/patients/view/{{ $note->client->uid }}">{{ $note->client->displayName() }}</a>
+                        </td>
+                        <td>{{ $note->hcpPro ? $note->hcpPro->displayName() : '-' }}</td>
+                        <td class="">
+                            <?php
+                            $textContent = strip_tags($note->free_text_html);
+                            if (strlen($textContent) > 200) {
+                                $textContent = substr($textContent, 0, 200) . '…';
+                            }
+                            ?>
+                            {!! empty($textContent) ? '-' : $textContent !!}
+                        </td>
+                    </tr>
+                    @endforeach
+                </tbody>
+            </table>
+            <div class="mt-3">
+                {{ $notes->appends(request()->input())->links() }}
+            </div>
+        </div>
+    </div>
+</div>
+
+@endsection

+ 31 - 22
resources/views/app/practice-management/notes.blade.php

@@ -2,33 +2,39 @@
 
 @section('content')
 
-    <div class="p-3 mcp-theme-1">
+<div class="p-3 mcp-theme-1">
     <div class="card">
 
-        <div class="card-header px-2 py-1 d-flex align-items-center">
-            <strong class="mr-4">
-                <i class="fas fa-user"></i>
-                Notes
-            </strong>
-            <select class="ml-auto max-width-300px form-control form-control-sm" onchange="fastLoad('/practice-management/notes/' + this.value, true, false, false)">
-                <option value="" {{ $filter === '' ? 'selected' : '' }}>All notes</option>
-                <option value="not-yet-signed" {{ $filter === 'not-yet-signed' ? 'selected' : '' }}>Notes not yet signed</option>
-                <option value="not-yet-signed-but-ally-signed" {{ $filter === 'not-yet-signed-but-ally-signed' ? 'selected' : '' }}>Notes not yet signed (but ally signed)</option>
-            </select>
+        <div class="card-header p-0">
+            <div class="d-flex align-items-center border-bottom px-2 py-1">
+                <strong class="mr-4">
+                    <i class="fas fa-notes-medical"></i>
+                    Notes
+                </strong>
+                <div class="ml-auto">
+                    <div class="d-flex align-items-center">
+                        <select class="max-width-300px form-control form-control-sm" onchange="fastLoad('/practice-management/notes/' + this.value, true, false, false)">
+                            <option value="" {{ $filter === '' ? 'selected' : '' }}>All notes</option>
+                            <option value="not-yet-signed" {{ $filter === 'not-yet-signed' ? 'selected' : '' }}>Notes not yet signed</option>
+                            <option value="not-yet-signed-but-ally-signed" {{ $filter === 'not-yet-signed-but-ally-signed' ? 'selected' : '' }}>Notes not yet signed (but ally signed)</option>
+                        </select>
+                    </div>
+                </div>
+            </div>
         </div>
         <div class="card-body p-0">
 
             <table class="table table-sm table-striped p-0 m-0">
                 <thead class="bg-light">
-                <tr>
-                    <th class="px-3 border-0">Created</th>
-                    <th class="border-0">Effective Date</th>
-                    <th class="border-0">Patient</th>
-                    <th class="border-0 w-50">Content</th>
-                </tr>
+                    <tr>
+                        <th class="px-3 border-0">Created</th>
+                        <th class="border-0">Effective Date</th>
+                        <th class="border-0">Patient</th>
+                        <th class="border-0 w-50">Content</th>
+                    </tr>
                 </thead>
                 <tbody>
-                @foreach ($notes as $note)
+                    @foreach ($notes as $note)
                     <tr class="{{ $note->is_cancelled ? 'cancelled-item always-clickable' : '' }}">
                         <td class="px-3">
                             {{ friendly_date_time($note->created_at, true) }}
@@ -45,18 +51,21 @@
                         <td class="">
                             <?php
                             $textContent = strip_tags($note->free_text_html);
-                            if(strlen($textContent) > 200) {
+                            if (strlen($textContent) > 200) {
                                 $textContent = substr($textContent, 0, 200) . '…';
                             }
                             ?>
                             {!! empty($textContent) ? '-' : $textContent !!}
                         </td>
                     </tr>
-                @endforeach
+                    @endforeach
                 </tbody>
             </table>
+            <div class="mt-3">
+                {{ $notes->appends(request()->input())->links() }}
+            </div>
         </div>
     </div>
-    </div>
+</div>
 
-@endsection
+@endsection

+ 165 - 0
resources/views/app/practice-management/notes_filters.blade.php

@@ -0,0 +1,165 @@
+<link href="/select2/select2.min.css" rel="stylesheet" />
+<script src="/select2/select2.min.js"></script>
+<style>
+	#notes-filters label {
+		font-weight: bold;
+	}
+
+	#notes-filters .mw-100px {
+		min-width: 100px;
+	}
+
+	.filter-container {
+		display: flex;
+		align-items: flex-start;
+		flex-wrap: wrap;
+	}
+
+	.filter-container>div {
+		width: 200px;
+	}
+
+	.filter-container>div:not(:last-child) {
+		margin-right: 15px;
+	}
+
+	.select2-container {
+		width: 100% !important;
+	}
+</style>
+<form id="notes-filters" method="GET" action="{{ route('practice-management.allNotes') }}" class="filter-container" v-cloak>
+	<!-- DATE -->
+	<div>
+		<div class="form-group">
+			<label>Created At:</label>
+			<select name="created_at_category" class="form-control input-sm" v-model="filters.created_at_category">
+				<option value="">All</option>
+				<option value="EXACTLY">Exactly</option>
+				<option value="LESS_THAN">Less Than</option>
+				<option value="GREATER_THAN">Greater Than</option>
+				<option value="BETWEEN">Between</option>
+				<option value="NOT_BETWEEN">Not Between</option>
+			</select>
+			<div v-show="filters.created_at_category" class="mt-2">
+				<div>
+					<input name="created_at_value_1" v-model="filters.created_at_value_1" type="date" class="form-control input-sm" />
+				</div>
+				<div v-show="filters.created_at_category === 'BETWEEN' || filters.created_at_category === 'NOT_BETWEEN'" class="mt-2">
+					<input name="created_at_value_2" v-model="filters.created_at_value_2" type="date" class="form-control input-sm" />
+				</div>
+			</div>
+		</div>
+	</div>
+	<div>
+		<div class="form-group">
+			<label>Effective Date:</label>
+			<select name="effective_date_category" class="form-control input-sm" v-model="filters.effective_date_category">
+				<option value="">All</option>
+				<option value="EXACTLY">Exactly</option>
+				<option value="LESS_THAN">Less Than</option>
+				<option value="GREATER_THAN">Greater Than</option>
+				<option value="BETWEEN">Between</option>
+				<option value="NOT_BETWEEN">Not Between</option>
+			</select>
+			<div v-show="filters.effective_date_category" class="mt-2">
+				<div>
+					<input name="effective_date_value_1" v-model="filters.effective_date_value_1" type="date" class="form-control input-sm" />
+				</div>
+				<div v-show="filters.effective_date_category === 'BETWEEN' || filters.effective_date_category === 'NOT_BETWEEN'" class="mt-2">
+					<input name="effective_date_value_2" v-model="filters.effective_date_value_2" type="date" class="form-control input-sm" />
+				</div>
+			</div>
+		</div>
+	</div>
+	<div>
+		<div class="form-group">
+			<label>Pro(s):</label>
+			<select multiple class="form-control form-control-sm mr-2" name="pros[]" v-model="filters.pros">
+				<option value="">All Pros</option>
+				@foreach($allProsWithNotes as $notePro)
+				<option value="{{ $notePro->id }}">{{ $notePro->displayName() }}</option>
+				@endforeach
+			</select>
+		</div>
+	</div>
+	<div>
+		<div class="form-group">
+			<label>Patients(s):</label>
+			<select multiple class="form-control form-control-sm mr-2" name="patients[]" v-model="filters.patients">
+				<option value="">All Patients</option>
+				@foreach($allPatientsWithNotes as $notePatient)
+				<option value="{{ $notePatient->id }}">{{ $notePatient->displayName() }}</option>
+				@endforeach
+			</select>
+		</div>
+	</div>
+
+	<div>
+		<div class="form-group">
+			<label>Status:</label>
+			<select class="form-control form-control-sm mr-2" name="status" v-model="filters.status">
+				<option value="">All Notes</option>
+				<option value="CANCELLED">Cancelled</option>
+				<option value="NOT_YET_SIGNED">Notes not yet signed</option>
+				<option value="NOT_YET_SIGNED_BUT_ALLY_SIGNED">Notes not yet signed (but ally signed)</option>
+				<option value="WITHOUT_BILLS">Without Bills</option>
+			</select>
+		</div>
+	</div>
+
+
+	<div>
+		<div class="form-group">
+			<label>&nbsp;</label>
+			<div class="d-flex">
+				<button type="submit" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+				<a href="#" v-on:click.prevent="fastLoad('{{route('practice-management.allNotes')}}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
+			</div>
+		</div>
+	</div>
+</form>
+<?php
+$loadedFilters = $filters;
+$allFilterKeys = [
+	'created_at_category',
+	'created_at_value_1',
+	'created_at_value_2',
+	'effective_date_category',
+	'effective_date_value_1',
+	'effective_date_value_2',
+	'pros',
+	'patients',
+	'status'
+];
+for ($i = 0; $i < count($allFilterKeys); $i++) {
+	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
+		$loadedFilters[$allFilterKeys[$i]] = '';
+	}
+}
+?>
+<script>
+	(function() {
+		function init() {
+			window.apapp = new Vue({
+				el: '#notes-filters',
+				delimiters: ['@{{', '}}'],
+				data: {
+					filters: <?= json_encode($loadedFilters) ?>
+				},
+				methods: {
+					doSubmit: function() {
+						fastLoad('{{ route("practice-management.allNotes") }}?' + $('#notes-filters').serialize());
+						return false;
+					},
+					init: function() {
+						$('select[multiple]').select2();
+					}
+				},
+				mounted: function() {
+					this.init();
+				},
+			});
+		}
+		addMCInitializer('notes-filters', init, '#notes-filters');
+	})();
+</script>

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

@@ -125,7 +125,7 @@ function cleanStatus($_status)
                                 @endif
                             </td>
                             <td>
-                                {{$shipment->status}}
+                                {{ ucwords(strtolower($shipment->status)) }}
                                 @if($shipment->status === 'DELIVERED' && $shipment->delivered_date)
                                 <div class="text-secondary text-sm mt-1">
                                     on {{friendlier_date_time($shipment->delivered_date)}}

+ 587 - 0
resources/views/layouts/patient-header.blade.php

@@ -0,0 +1,587 @@
+<?php
+$thumbnail = $patient->profile_picture_base64;
+$initials = !$thumbnail ? substr($patient->name_first, 0, 1) . substr($patient->name_last, 0, 1) : '';
+$online = $patient->is_online ? 'online' : '';
+$patientName = implode(', ', array_filter([$patient->name_last, $patient->name_first]));
+
+$confirmedCell = empty($patient->cell_number) ? '-' : $patient->cell_number;
+$hasConfirmedEmail = empty($patient->email_address) ? false:true;
+$confirmedEmail = empty($patient->email_address) ? '-' : $patient->email_address;
+
+$location = implode(', ', array_filter([$patient->home_address_city, $patient->home_address_state]));
+$location = empty($location) ? '-' : $location;
+
+$mcpName = $patient->mcp ? implode(', ', array_filter([$patient->mcp->name_last, $patient->mcp->name_first])) : null;
+$cmName = $patient->cm ? implode(', ', array_filter([$patient->cm->name_last, $patient->cm->name_first])) : null;
+
+$memberSince = date_diff(date_create($patient->created_at), date_create('now'))->days;
+if ($memberSince > 30) $memberSince = date('F, Y', strtotime($patient->created_at));
+else if ($memberSince > 1) $memberSince .= ' days ago';
+else if ($memberSince === 1) $memberSince = 'yesterday';
+else if ($memberSince === 0) $memberSince = 'today';
+
+$addressParts = [];
+if (!!$patient->mailing_address_line1) $addressParts[] = trim($patient->mailing_address_line1);
+if (!!$patient->mailing_address_line2) $addressParts[] = trim($patient->mailing_address_line2);
+$addressParts = implode(", ", $addressParts) . "<br/>";
+$addressPart2 = [];
+if (!!$patient->mailing_address_city) $addressPart2[] = trim($patient->mailing_address_city);
+if (!!$patient->mailing_address_state) $addressPart2[] = trim($patient->mailing_address_state);
+$addressParts .= implode(", ", $addressPart2);
+?>
+<style media="screen">
+	.header-info h6 {
+		font-size: 1rem !important;
+	}
+</style>
+<div class="p-2 bg-dark-primary text-white mcp-theme-1">
+  @if($patient->is_duplicate)
+  <div class="alert alert-warning p-1 mb-2 border-dark mcp-theme-1 screen-only">
+    <span class="text-dark">This chart is a duplicate of&nbsp;</span>
+    <a class="font-weight-bold" href="/patients/view/{{ $patient->duplicateOf->uid }}">
+      {{ $patient->duplicateOf->displayName() }}
+    </a>
+  </div>
+  @endif
+  <div class="d-flex justify-content-between">
+    <div class="d-flex align-items-end header-info">
+      <h6>{{$patientName}},</h6>
+      <h6 class="ml-2">{{$patient->age_in_years}} Y, {{$patient->sex}}</h6>
+      <h6 class="d-inline-flex align-items-baseline ml-2">
+        <span><i class="chart mr-2">#{{$patient->chart_number}}</i></span>
+        <span class="on-hover-show d-inline-block on-hover-opaque">
+          <i class="fa fa-info-circle ml-1 text-white"></i>
+          <div class="on-hover-content py-2 pl-3 text-nowrap text-dark" style="left:0;right:auto;">
+            Joined
+            <?=$memberSince?>
+            @if($pro->pro_type === 'ADMIN')
+            <div class="mt-1">
+              Created by <b>{{$patient->creator ? $patient->creator->displayName() : '-'}}</b>
+            </div>
+            <div class="mt-1">
+              Created on <b>{{friendly_date_time($patient->created_at)}}</b>
+            </div>
+            @endif
+          </div>
+        </span>
+      </h6>
+    </div>
+    <div class="d-flex justify-content-around">
+      <div>
+        <div moe relative>
+          <a href="#" start show class="text-white ml-3 d-flex align-items-baseline"><i class="fa fa-comment mr-1"></i></a>
+          <form right url="/api/clientSms/createOutgoing" class="mcp-theme-1" noreload>
+            <input type="hidden" name="uid" value="{{ $patient->uid }}">
+            <div class="mb-2">
+              <label for="" class="text-sm text-secondary mb-1">Cell
+                Number</label>
+              <input type="text" class="form-control form-control-sm" name="cellNumber" value="{{$patient->cell_number}}">
+            </div>
+            <div class="mb-2">
+              <label for="" class="text-sm text-secondary mb-1">Message</label>
+              <textarea type="text" class="form-control form-control-sm" name="message"></textarea>
+            </div>
+            <div class="d-flex align-items-center">
+              <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+              <button class="btn btn-sm btn-default mr-2 border" cancel>
+                Cancel
+              </button>
+            </div>
+          </form>
+        </div>
+      </div>
+      <div>
+        <span moe relative class="">
+          <a href="#" start show class="text-white ml-3 d-flex align-items-baseline" title="SMS check-in link to the patient"><i class="fa fa-paper-plane mr-1"></i></a>
+          <form right url="/api/client/sendCheckInTokenViaSmsOrEmail" class="mcp-theme-1">
+            <input type="hidden" name="uid" value="{{ $patient->uid }}">
+            <p class="small min-width-200px mb-2">Send Check-In link to patient?</p>
+            <div class="mb-2">
+              <label for="" class="text-sm text-secondary mb-1">Cell Number</label>
+              <input type="text" class="form-control input-sm" name="cellNumber" value="{{$patient->cell_number}}">
+            </div>
+            <div class="mb-2">
+              <label for="" class="text-sm text-secondary mb-1">Email address</label>
+              <input type="text" class="form-control input-sm" name="emailAddress" value="{{$patient->email_address}}">
+            </div>
+            <div class="d-flex align-items-center">
+              <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+              <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+            </div>
+          </form>
+        </span>
+      </div>
+      @if($performer->pro->pro_type == 'ADMIN')
+      <div>
+        <a href="#" start class="text-white ml-3" show onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i class="fa fa-eye mr-1"></i></a>
+      </div>
+      @endif
+      <div>
+        <a href="#" start class="text-white ml-3" show onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')"><i class="fa fa-video mr-1"></i></a>
+      </div>
+    </div>
+  </div>
+
+  <div class="flex-header text-dark">
+    <div class="d-flex bg-light p-2">
+      <!-- <div class="">
+        <img src="{{asset('img/patient.png')}}" width="80" alt="">
+      </div> -->
+      <div class="position-relative ml-2">
+        <div class="screen-only">
+          <div class="">
+            <span>Status:</small>
+            <b>{{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}</b>
+
+            @if($pro->pro_type == 'ADMIN')
+            <div moe class="ml-2 hide-inside-popup">
+              <a start show><i class="fa fa-edit"></i></a>
+              <form url="/api/client/updateClientEngagementAssessmentStatus" class="mcp-theme-1" target="#patient-header-content">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                  <label class="mb-1 text-secondary text-sm">Status</label>
+                  <select name="category" class="form-control form-control-sm">
+                    <option value=""> --select--</option>
+                    <option {{ $patient->client_engagement_status_category === 'ACTIVE' ? 'selected' : '' }} value="ACTIVE">Active</option>
+                    <option {{ $patient->client_engagement_status_category === 'INACTIVE' ? 'selected' : '' }} value="INACTIVE">Inactive</option>
+                    <option {{ $patient->client_engagement_status_category === 'ENTRY_ERROR' ? 'selected' : '' }} value="ENTRY_ERROR">Entry Error</option>
+                    <option {{ $patient->client_engagement_status_category === 'DUMMY' ? 'selected' : '' }} value="DUMMY">Test Chart</option>
+                    <option {{ $patient->client_engagement_status_category === 'DECEASED' ? 'selected' : '' }} value="DECEASED">Deceased</option>
+                    <option {{ $patient->client_engagement_status_category === 'DUPLICATE' ? 'selected' : '' }} value="DUPLICATE">Duplicate</option>
+                    <option {{ $patient->client_engagement_status_category === 'NO_LONGER_INTERESTED' ? 'selected' : '' }} value="NO_LONGER_INTERESTED">No Longer Interested</option>
+                    <option {{ $patient->client_engagement_status_category === 'BAD_RECORD' ? 'selected' : '' }} value="BAD_RECORD">Bad Record</option>
+                    <option {{ $patient->client_engagement_status_category === 'NO_LONGER_ELIGIBLE' ? 'selected' : '' }} value="NO_LONGER_ELIGIBLE">No Longer Eligible</option>
+                  </select>
+                </div>
+                <div class="mb-2">
+                  <label class="mb-1 text-secondary text-sm">Memo</label>
+                  <textarea class="form-control form-control-sm" name="memo"></textarea>
+                </div>
+                <div>
+                  <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                  <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                </div>
+              </form>
+            </div>
+            @endif
+          </div>
+          <div class="mt-2">
+            @if($patient->has_mcp_done_onboarding_visit !== 'YES')
+            <span class="text-dark d-inline-flex align-items-center">
+              <span class="mr-2">
+                <i class="fa fa-exclamation-triangle"></i>
+                <span>MCP Onboarding Visit Pending</span>
+              </span>
+            </span>
+            <span moe class="hide-inside-popup">
+              <a start show><i class="fa fa-edit"></i></a>
+              <form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2">
+                  <select name="hasMcpDoneOnboardingVisit" class="form-control form-control-sm" onchange="toggleDisabledAsNeeded(this, 'YES', 'if-visit-done')">
+                    <option value="">-- Select Status --</option>
+                    <option value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
+                    <option value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
+                    <option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+                  </select>
+                </div>
+                <div class="mb-2">
+                  <input type="date" class="if-visit-done form-control form-control-sm" disabled name="mcpOnboardingVisitDate" value="{{ date('Y-m-d') }}" max="{{ date('Y-m-d') }}">
+                </div>
+                <div class="mb-2">
+                  <select name="mcpOnboardingVisitNoteUid" disabled class="form-control form-control-sm if-visit-done" onchange="if(this.value === '-- create --') createNewNote('{{$patient->uid}}', '{{$pro->uid}}', '{{date('Y-m-d')}}');">
+                    <option value="">-- Visit Note --</option>
+                    <?php $notes = \App\Models\Note::where('client_id', $patient->id)->get() ?>
+                    @foreach ($notes as $note)
+                    @if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
+                    <option {{ $patient->mcp_onboarding_visit_note_id === $note->id ? 'selected' : '' }} value="{{$note->uid}}">{{$note->hcpPro->displayName()}} ({{friendly_date_time($note->effective_dateest, false)}})</option>
+                    @endif
+                    @endforeach
+                    {{--<option value="-- create --">-- Create Note --</option>--}}
+                  </select>
+                </div>
+                <div class="mb-2 if-note-outside-system">
+                  <textarea class="form-control form-control-sm" name="reasonOnboardingVisitNoteOutsideSystem" placeholder="Visit note outside the system reason" spellcheck="false" data-gramm="false"></textarea>
+                </div>
+                <div>
+                  <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                  <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                </div>
+              </form>
+            </span>
+            @else
+            <span class="text-dark d-inline-flex align-items-center">
+              <span class="mr-2 text-secondary">
+                <i class="fa fa-check text-sm"></i>
+                <span>MCP Onboarding Visit Completed</span>
+              </span>
+            </span>
+            @endif
+          </div>
+        </div>
+        @if($patient->mcp && $patient->mcp->id === $pro->id || $pro->pro_type == 'ADMIN')
+        <div class="mt-2">
+          <label>Follow-up Freq (days):</label>
+          <span>{!! is_null($patient->mcp_usual_follow_up_frequency_in_days) ? '<span class="text-danger">Not Set</span>' : $patient->mcp_usual_follow_up_frequency_in_days !!}</span>
+          <div moe relative class="ml-2">
+            <a href="#" start show class="text-sm"><i class="fa fa-edit"></i></a>
+            <form url="/api/client/putMcpUsualFollowUpFrequencyInDays">
+              <input type="hidden" name="uid" value="{{$patient->uid}}">
+              <div class="mb-2">
+                <label class="text-sm text-secondary mb-1 text-nowrap">Follow-up Frequency (days)</label>
+                <input type="number" required name="mcpUsualFollowUpFrequencyInDays" class="form-control form-control-sm" value="{{@$patient->mcp_usual_follow_up_frequency_in_days}}">
+              </div>
+              <div class="d-flex align-items-center">
+                <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+              </div>
+            </form>
+          </div>
+        </div>
+        @endif
+        <span>DOB: {{friendly_date($patient->dob, false,null, true)}} </span>
+      </div>
+    </div>
+
+
+    @if(!$patient->getPrimaryCoverage() || $patient->getPrimaryCoverageStatus() !== 'YES')
+    <div class="d-flex bg-light p-2">
+      @include('app.patient.coverage-status')
+    </div>
+    @endif
+    <div class="bg-light p-2">
+      <div>
+        <label>MCP:</label> {{$mcpName}}
+        @if($patient->has_mcp_done_onboarding_visit !== 'YES' && $pro->pro_type == 'ADMIN')
+        <div moe class="ml-2 hide-inside-popup">
+          <a start show><i class="fa fa-edit"></i></a>
+          <form url="/api/client/putMcp" class="mcp-theme-1">
+            <input type="hidden" name="uid" value="{{$patient->uid}}">
+            <div class="mb-2">
+              <label class="text-secondary text-sm">MCP Pro</label>
+              <select name="mcpProUid" provider-search data-pro-uid="{{ @$patient->mcp->uid }}" class="form-control form-control-sm">
+                <option value=""> --select--</option>
+                @foreach($pros as $iPro)
+                <option value="{{$iPro->uid}}" {{ $patient->mcp && $iPro->uid === $patient->mcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                @endforeach
+              </select>
+            </div>
+            <div>
+              <button submit class="btn btn-sm btn-primary mr-1">
+                Submit
+              </button>
+              <button cancel class="btn btn-sm btn-default border">
+                Cancel
+              </button>
+            </div>
+          </form>
+        </div>
+        @if($patient->mcp)
+        <div moe class="ml-2 hide-inside-popup">
+          <a start show><i class="fa fa-times"></i></a>
+          <form url="/api/client/removeMcp" class="mcp-theme-1">
+            <input type="hidden" name="uid" value="{{$patient->uid}}">
+            <div class="mb-2">
+              <label class="text-secondary text-sm">Remove MCP Pro</label>
+
+            </div>
+            <div>
+              <button submit class="btn btn-sm btn-primary mr-1">Submit
+              </button>
+              <button cancel class="btn btn-sm btn-default border">
+                Cancel
+              </button>
+            </div>
+          </form>
+        </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 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">
+              <label class="text-sm text-secondary mb-1">Category </label>
+              <select name="category" class="form-control form-control-sm">
+                <option value="NULL">--</option>
+                <option value="ACTIVE">ACTIVE</option>
+                <option value="INACTIVE">INACTIVE</option>
+                <option value="ENTRY_ERROR">ENTRY_ERROR</option>
+                <option value="DUMMY">DUMMY</option>
+                <option value="DECEASED">DECEASED</option>
+                <option value="DUPLICATE">DUPLICATE</option>
+                <option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option>
+                <option value="BAD_RECORD">BAD_RECORD</option>
+              </select>
+            </div>
+            <div class="mb-2">
+              <label class="text-sm text-secondary mb-1">Memo</label>
+              <input type="text" name="memo" class="form-control form-control-sm">
+            </div>
+            <div class="mb-2">
+              <label class="text-sm text-secondary mb-1">Detail</label>
+              <input type="text" name="detail" class="form-control form-control-sm">
+            </div>
+            <div>
+              <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+              <button cancel class="btn btn-sm btn-default border">Cancel</button>
+            </div>
+          </form>
+        </div>
+      </div>
+      @endif
+      <div>
+        <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 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">
+              <label class="text-secondary text-sm">Care Coordinator</label>
+              <select provider-search data-pro-uid="{{ @$patient->defaultNaPro->uid }}" name="defaultNaProUid" class="form-control form-control-sm">
+                <option value=""> --select--</option>
+                @foreach($pros as $iPro)
+                <option value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->pcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+                @endforeach
+              </select>
+            </div>
+            <div>
+              <button submit class="btn btn-sm btn-primary mr-1">Submit
+              </button>
+              <button cancel class="btn btn-sm btn-default border">
+                Cancel
+              </button>
+            </div>
+          </form>
+        </div>
+        @if($patient->pcp)
+        <div moe class="ml-2 hide-inside-popup">
+          <a start show><i class="fa fa-times"></i></a>
+          <form url="/api/client/removeDefaultNaPro" class="mcp-theme-1">
+            <input type="hidden" name="uid" value="{{$patient->uid}}">
+            <div class="mb-2">
+              <label class="text-secondary text-sm">Remove Care Coordinator</label>
+
+            </div>
+            <div>
+              <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+              <button cancel class="btn btn-sm btn-default border">Cancel</button>
+            </div>
+          </form>
+        </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 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">
+              <label class="text-sm text-secondary mb-1">Category </label>
+              <select name="category" class="form-control form-control-sm">
+                <option value="NULL">--</option>
+                <option value="ACTIVE">ACTIVE</option>
+                <option value="INACTIVE">INACTIVE</option>
+                <option value="ENTRY_ERROR">ENTRY_ERROR</option>
+                <option value="DUMMY">DUMMY</option>
+                <option value="DECEASED">DECEASED</option>
+                <option value="DUPLICATE">DUPLICATE</option>
+                <option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option>
+                <option value="BAD_RECORD">BAD_RECORD</option>
+              </select>
+            </div>
+            <div class="mb-2">
+              <label class="text-sm text-secondary mb-1">Memo</label>
+              <input type="text" name="memo" class="form-control form-control-sm">
+            </div>
+            <div class="mb-2">
+              <label class="text-sm text-secondary mb-1">Detail</label>
+              <input type="text" name="detail" class="form-control form-control-sm">
+            </div>
+            <div>
+              <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+              <button cancel class="btn btn-sm btn-default border">Cancel</button>
+            </div>
+          </form>
+        </div>
+      </div>
+      @endif
+    </div>
+
+    <div class="bg-light p-2">
+      <div class="mb-1">Cell. BP: <b>{{$patient->hasBPDevice()?'Yes':'No'}}</b></div>
+      @if($patient->most_recent_cellular_bp_sbp_mm_hg && $patient->most_recent_cellular_bp_dbp_mm_hg)
+      <div class="mb-1">Last BP:
+        <b>{{$patient->most_recent_cellular_bp_sbp_mm_hg ?: '-'}}/{{$patient->most_recent_cellular_bp_dbp_mm_hg ?: '-'}}</b>
+        @if($patient->most_recent_cellular_bp_measurement_at)
+        <span class="text-sm text-secondary text-nowrap ml-1" title="{{friendly_date_time($patient->most_recent_cellular_bp_measurement_at)}}">({{friendly_date($patient->most_recent_cellular_bp_measurement_at)}})</span>
+        @endif
+      </div>
+      @endif
+      <div class="mb-1">Wt. Scale: <b>{{$patient->hasWeightScaleDevice()?'Yes':'No'}}</b></div>
+      @if($patient->most_recent_cellular_weight_value)
+      <div class="mb-1">Last Wt.:
+        <b>{{round($patient->most_recent_cellular_weight_value, 1)}}</b>
+        @if($patient->most_recent_cellular_weight_measurement_at)
+        <span class="text-sm text-secondary text-nowrap ml-1" title="{{friendly_date_time($patient->most_recent_cellular_weight_measurement_at)}}">({{friendly_date($patient->most_recent_cellular_weight_measurement_at)}})</span>
+        @endif
+      </div>
+      @endif
+
+      <?php $currentCareMonth = $patient->currentCareMonth(); ?>
+      @if($currentCareMonth && ($pro->pro_type === 'ADMIN' || $pro->id === $currentCareMonth->mcp_pro_id))
+      <div class="text-primary c-pointer" open-in-stag-popup mc-initer="care-month-dashboard-{{$patient->uid}}" title="Care Month: {{friendly_month($currentCareMonth->start_date)}}" popup-style="overflow-visible" href="/patients/view/{{ $patient->uid }}/care-months/view/{{$currentCareMonth->uid}}">
+        <?php $spoken = $currentCareMonth->has_anyone_interacted_with_client_about_rm_outside_note; ?>
+        <span class="">RPM comm. this month:</span>
+        <b class="{{$spoken ? 'text-success' : ''}}">
+          {{$spoken ? 'Yes' : 'No'}}
+          @if(!$spoken)
+          <i class="fa fa-exclamation-triangle"></i>
+          @else
+          <i class="fa fa-check"></i>
+          @endif
+        </b>
+      </div>
+      @endif
+    </div>
+
+    <div class="bg-light p-2 max-width-300px">
+      <div>
+        <div class="max-width-300px d-flex">
+          <label class="mb-1">Sticky Note:</label>
+          <div moe relative wide class="ml-2 hide-inside-popup">
+            <a start show><i class="fa fa-edit"></i></a>
+            <form url="/api/client/updateStickyNote" class="mcp-theme-1" right>
+              <input type="hidden" name="uid" value="{{$patient->uid}}">
+              <div class="mb-2">
+                <label class="text-secondary text-sm">Sticky Note</label>
+                <textarea name="stickyNote" class="form-control" rows="8" cols="80">{{$patient->sticky_note}}</textarea>
+              </div>
+              <div>
+                <button submit class="btn btn-sm btn-primary mr-1">Submit
+                </button>
+                <button cancel class="btn btn-sm btn-default border">
+                  Cancel
+                </button>
+              </div>
+            </form>
+          </div>
+        </div>
+        @if($patient->sticky_note)
+        <div class="mb-2">
+          <span class="d-block text-secondary">{{$patient->sticky_note ?? '-' }}</span>
+        </div>
+        @endif
+      </div>
+      @if($pro->pro_type === 'ADMIN')
+      <div>
+        <label>Intake Data: - </label> <span class="text-secondary"></span>
+        @include('app.patient.intake-data.patient-intake-data-form')
+      </div>
+      @endif
+    </div>
+    <div class="bg-light p-2">
+      <ul class="vbox align-self-start patient-header-address ">
+        <li class="mb-1 d-flex align-items-start">
+          <span class="aligned-icon">
+            <i class="fa fa-map-marker-alt" aria-hidden="true"></i>
+          </span>
+          <div class="position-relative">
+            <?php
+            $addressParts = [];
+            if (!!$patient->mailing_address_line1) $addressParts[] = trim($patient->mailing_address_line1);
+            if (!!$patient->mailing_address_line2) $addressParts[] = trim($patient->mailing_address_line2);
+            $addressParts = implode(", ", $addressParts) . "<br/>";
+            $addressPart2 = [];
+            if (!!$patient->mailing_address_city) $addressPart2[] = trim($patient->mailing_address_city);
+            if (!!$patient->mailing_address_state) $addressPart2[] = trim($patient->mailing_address_state);
+            $addressParts .= implode(", ", $addressPart2);
+            echo $addressParts;
+            ?>
+            {{ $patient->mailing_address_zip ? $patient->mailing_address_zip : '' }}
+            @if($patient->mailing_address_memo)
+            <span class="position-relative c-pointer text-center stag-tooltip ml-2">
+              <i class="fa fa-info-circle"></i>
+              <div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
+                <div class="text-left font-weight-bold pb-1">Special Instructions</div>
+                <div class="text-left font-weight-normal">{{$patient->mailing_address_memo}}</div>
+              </div>
+            </span>
+            @endif
+          </div>
+        </li>
+        @if($patient->cell_number)
+        <li class="mb-1">
+          <span class="aligned-icon">
+            <i class="fa fa-phone-alt" aria-hidden="true"></i>
+          </span>
+          {{$patient->cell_number}}
+          <span class="small text-secondary ml-1">
+            {{ $patient->cell_number_memo ? '(' . $patient->cell_number_memo . ')' : '' }}
+          </span>
+        </li>
+        @endif
+        @if($patient->phone_home)
+        <li class="mb-1">
+          <span class="aligned-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
+          {{$patient->phone_home}}
+        </li>
+        @endif
+        <li class="mb-1 d-flex align-items-start">
+          <div class="d-flex align-items-center flex-wrap">
+            <span class="ml-1 mr-2"><i class="fa fa-envelope"></i>
+              @if($hasConfirmedEmail)
+              {{$confirmedEmail}}
+              @else
+              <i>(No email address)</i>
+              @endif
+            </span>
+            {{--<div>
+                @include('app.patient.send_email')
+              </div>--}}
+          </div>
+        </li>
+
+        <li class="mb-1 d-flex align-items-start">
+          <div class="d-inline-flex screen-only">
+            <span class="aligned-icon text-primary">
+              <i class="fa fa-link" aria-hidden="true"></i>
+            </span>
+            <?php $numLinkedAccounts = $patient->linkedAccounts ? count($patient->linkedAccounts) : 0; ?>
+            <a href="{{route('patients.view.accounts', ['patient' => $patient])}}">
+              Accounts ({{$numLinkedAccounts}})
+            </a>
+          </div>
+        </li>
+      </ul>
+
+    </div>
+
+  </div>
+</div>

+ 992 - 0
resources/views/layouts/patient-old.blade.php

@@ -0,0 +1,992 @@
+@extends(request()->input('popupmode') ? 'layouts.empty' : 'layouts.template')
+<?php
+/** @var \App\Models\Client $patient */
+?>
+<?php
+$trimLayout = true;
+$routeName = request()->route()->getName();
+$isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note && !!$note->visitTemplate);
+$isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_create($patient->created_at))->invert === 1);
+?>
+<style media="screen">
+	.pt-name {
+		font-size: 1.5rem !important;
+	}
+</style>
+@section('content')
+<div class="container-fluid h-100 popup-content-container">
+	<div class="main-row h-100 {{ !request()->input('popupmode') ? '' : 'px-0' }} {{$isVisitNote ? 'autohide-leftnav' : ''}}">
+		@if(!request()->input('popupmode'))
+		<nav id="sidebarMenu" class="d-block bg-light sidebar collapse px-0">
+			<div class="sidebar-sticky pt-3">
+				<ul class="nav flex-column mcp-theme-1">
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.dashboard') === 0 ? 'active' : '' }}" href="{{ route('patients.view.dashboard', ['patient' => $patient]) }}">Dashboard</a>
+					</li>
+					@if($performer->pro->pro_type == 'ADMIN')
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.migrate-canvas') === 0 ? 'active' : '' }}" href="{{ route('patients.view.migrate-canvas', ['patient' => $patient]) }}">Canvas Migrate</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.canvas') === 0 ? 'active' : '' }}" href="{{ route('patients.view.canvas', ['patient' => $patient]) }}">Canvas</a>
+					</li>
+					@endif
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.calendar') === 0 ? 'active' : '' }}" href="{{ route('patients.view.calendar', ['patient' => $patient]) }}">Calendar</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.appointments') === 0 ? 'active' : '' }}" href="{{ route('patients.view.appointments', ['patient' => $patient, 'forPro' => 'all', 'status' => 'all']) }}">Appointments</a>
+					</li>
+					{{--
+						<li class="nav-item">
+							<a class="nav-link {{ strpos($routeName, 'patients.view.programs') === 0 ? 'active' : '' }}"
+					href="{{ route('patients.view.programs', ['patient' => $patient]) }}">Programs</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.flowsheets') === 0 ? 'active' : '' }}" href="{{ route('patients.view.flowsheets', ['patient' => $patient]) }}">Flowsheets</a>
+					</li>
+					--}}
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.vitals-settings') === 0 ? 'active' : '' }}" href="{{ route('patients.view.vitals-settings', ['patient' => $patient]) }}">Vitals Settings</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.vitals-graph') === 0 ? 'active' : '' }}" href="{{ route('patients.view.vitals-graph', ['patient' => $patient]) }}">Vitals Graph</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.care-months') === 0 ? 'active' : '' }}" href="{{ route('patients.view.care-months', ['patient' => $patient]) }}">Care Months</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.devices') === 0 ? 'active' : '' }}" href="{{ route('patients.view.devices', ['patient' => $patient]) }}">Devices</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.measurements') === 0 ? 'active' : '' }}" href="{{ route('patients.view.measurements', ['patient' => $patient]) }}">Measurements</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.notes') === 0 ? 'active' : '' }}" href="{{ route('patients.view.notes', ['patient' => $patient]) }}">Notes</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.generic-bills') === 0 ? 'active' : '' }}" href="{{ route('patients.view.generic-bills', ['patient' => $patient]) }}">Admin. Bills</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.handouts') === 0 ? 'active' : '' }}" href="{{ route('patients.view.handouts', ['patient' => $patient]) }}">Handouts</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.rm-setup') === 0 ? 'active' : '' }}" href="{{ route('patients.view.rm-setup', ['patient' => $patient]) }}">RM Setup</a>
+					</li>
+					<?php /* <li class="nav-item">
+							<a class="nav-link d-flex align-items-center {{ strpos($routeName, 'patients.view.action-items') === 0 ? 'active' : '' }}"
+							   native onclick="return false">
+								<span class="text-dark">ERx/Orders</span>
+							</a>
+							<ul class="m-0 p-0 nav-child-list">
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.action-items-erx') === 0 ? 'active' : '' }}"
+									   href="{{ route('patients.view.action-items-erx', ['patient' => $patient]) }}">ERx</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.action-items-lab') === 0 ? 'active' : '' }}"
+									   href="{{ route('patients.view.action-items-lab', ['patient' => $patient]) }}">Lab</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.action-items-imaging') === 0 ? 'active' : '' }}"
+									   href="{{ route('patients.view.action-items-imaging', ['patient' => $patient]) }}">Imaging</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.action-items-equipment') === 0 ? 'active' : '' }}"
+									   href="{{ route('patients.view.action-items-equipment', ['patient' => $patient]) }}">Equipment</a>
+								</li>
+							</ul>
+						</li> */ ?>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.patient-prescriptions') === 0 ? 'active' : '' }}" href="{{ route('patients.view.patient-prescriptions', ['patient' => $patient]) }}">ERx &amp; Orders</a>
+						<?php /*
+							<ul class="m-0 p-0 nav-child-list">
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === '' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => '']) }}">All</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'erx' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'erx']) }}">Drug</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'lab' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'lab']) }}">Lab</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'imaging' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'imaging']) }}">Imaging</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'referral' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'referral']) }}">Referral</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'supply' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'supply']) }}">Supply</a>
+								</li>
+								<li class="nav-item">
+									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === 'other' ? 'active' : '' }}"
+									   href="{{ route('patients.view.patient-erx', ['patient' => $patient, 'type' => 'other']) }}">Other</a>
+								</li>
+							</ul>
+							*/ ?>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === '' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => '']) }}">Tickets</a>
+					</li>
+					@if($isOldClient)
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient]) }}" title="Deprecated">ERx / Orders
+							<span class="text-secondary text-sm pl-2">(dep)</span>
+						</a>
+						<ul class="m-0 p-0 nav-child-list">
+							<li class="nav-item">
+								<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === '' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => '']) }}">All</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'erx' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'erx']) }}">ERx</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'lab' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'lab']) }}">Lab</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'imaging' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'imaging']) }}">Imaging</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'other' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'other']) }}">Other</a>
+							</li>
+						</ul>
+					</li>
+					@endif
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.supply-orders') === 0 ? 'active' : '' }}" href="{{ route('patients.view.supply-orders', ['patient' => $patient]) }}">Supply Orders</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.shipments') === 0 ? 'active' : '' }}" href="{{ route('patients.view.shipments', ['patient' => $patient]) }}">Shipments</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.incoming-reports') === 0 ? 'active' : '' }}" href="{{ route('patients.view.incoming-reports', ['patient' => $patient]) }}">Incoming Reports</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.allergies') === 0 ? 'active' : '' }}" href="{{ route('patients.view.allergies', ['patient' => $patient]) }}">Allergies</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.medications') === 0 ? 'active' : '' }}" href="{{ route('patients.view.medications', ['patient' => $patient]) }}">Medications</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.dx-and-focus-areas') === 0 ? 'active' : '' }}" href="{{ route('patients.view.dx-and-focus-areas', ['patient' => $patient]) }}">Dx and
+							Focus Areas</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.care-team') === 0 ? 'active' : '' }}" href="{{ route('patients.view.care-team', ['patient' => $patient]) }}">Care Team</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.history') === 0 ? 'active' : '' }}" href="{{ route('patients.view.history', ['patient' => $patient]) }}">History</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.memos') === 0 ? 'active' : '' }}" href="{{ route('patients.view.memos', ['patient' => $patient]) }}">Memos</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ $routeName === 'patients.view.sms' ? 'active' : '' }}" href="{{ route('patients.view.sms', ['patient' => $patient]) }}">SMS</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.sms-numbers') === 0 ? 'active' : '' }}" href="{{ route('patients.view.sms-numbers', ['patient' => $patient]) }}">SMS Numbers</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ $routeName === 'patients.view.outgoing-sms-log' ? 'active' : '' }}" href="{{ route('patients.view.outgoing-sms-log', ['patient' => $patient]) }}">Outgoing SMS Log</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.documents') === 0 ? 'active' : '' }}" href="{{ route('patients.view.documents', ['patient' => $patient]) }}">Documents</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.settings') === 0 ? 'active' : '' }}" href="{{ route('patients.view.settings', ['patient' => $patient]) }}">Settings</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.sms-reminders') === 0 ? 'active' : '' }}" href="{{ route('patients.view.sms-reminders', ['patient' => $patient]) }}">SMS Reminders</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.measurement-confirmation-numbers') === 0 ? 'active' : '' }}" href="{{ route('patients.view.measurement-confirmation-numbers', ['patient' => $patient]) }}">Meas. Conf. Numbers</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.pros') === 0 ? 'active' : '' }}" href="{{ route('patients.view.pros', ['patient' => $patient]) }}">Pros</a>
+					</li>
+					@if($performer->pro->pro_type == 'ADMIN')
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.pro-changes') === 0 ? 'active' : '' }}" href="{{ route('patients.view.pro-changes', ['patient' => $patient]) }}">Client Pro Changes</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.client-pro-access') === 0 ? 'active' : '' }}" href="{{ route('patients.view.client-pro-access', ['patient' => $patient]) }}">Client Pro Access</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.client-documents') === 0 ? 'active' : '' }}" href="{{ route('patients.view.client-documents', ['patient' => $patient]) }}">Client Documents</a>
+					</li>
+					@endif
+					<li class="nav-item">
+						<a class="nav-link" href="/patients/view/{{ $patient->uid }}/intake">Intake</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.primary-coverage') === 0 ? 'active' : '' }}" href="{{ route('patients.view.primary-coverage', $patient) }}">Primary Coverage</a>
+					</li>
+					@if($performer->pro->pro_type == 'ADMIN' || $performer->pro->id == $patient->default_na_pro_id)
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.mcp-requests') === 0 ? 'active' : '' }}" href="{{ route('patients.view.mcp-requests', $patient) }}">MCP Requests</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.eligible-refreshes') === 0 ? 'active' : '' }}" href="{{ route('patients.view.eligible-refreshes', $patient) }}">Eligible Refreshes</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.insurance-coverage') === 0 ? 'active' : '' }}" href="{{ route('patients.view.insurance-coverage', $patient) }}">Insurance Coverage</a>
+					</li>
+
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.claims-resolver') === 0 ? 'active' : '' }}" href="{{ route('patients.view.claims-resolver', $patient) }}">Claims Resolver</a>
+					</li>
+					@endif
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.accounts') === 0 ? 'active' : '' }}" href="{{ route('patients.view.accounts', $patient) }}">Linked Accounts</a>
+					</li>
+				</ul>
+				<div class="mt-3 mcp-theme-1">
+					@yield('left-nav-content')
+				</div>
+			</div>
+		</nav>
+		@endif
+		<main role="main" class="w-100 {{$trimLayout || $isVisitNote ? 'p-0' : ''}}">
+			@if($pro->is_enrolled_as_mcp && !$patient->mcp)
+			<div class="alert alert-info bg-white mt-3 mcp-theme-1 p-3 hide-inside-ticket-popup m-1">
+				<div class="font-size-16">
+					<i class="fa fa-exclamation-triangle text-warning-mellow"></i>
+					This patient currently does not have an MCP assigned.
+				</div>
+				<div class="mt-3 d-flex align-items-center">
+					<button class="btn btn-info" onclick="$('.in-conv-confirmed').removeClass('d-none').addClass('d-inline-flex')">I am currently seeing or talking to this patient</button>
+					<div class="in-conv-confirmed d-none align-items-center">
+						<i class="fa fa-chevron-right mx-3 text-secondary"></i>
+						<div moe class=" hide-inside-popup">
+							<a href="" start show class="btn btn-primary font-weight-bold text-white">
+								Assign myself as the MCP for this patient
+							</a>
+							<form url="/api/client/putMcp" class="mcp-theme-1">
+								<input type="hidden" name="uid" value="{{$patient->uid}}">
+								<input type="hidden" name="mcpProUid" value="{{$pro->uid}}">
+								<p>Are you sure?</p>
+								<div>
+									<button submit class="btn btn-sm btn-primary mr-2">
+										Submit
+									</button>
+									<button cancel class="btn btn-sm btn-default border">
+										Cancel
+									</button>
+								</div>
+							</form>
+						</div>
+					</div>
+				</div>
+			</div>
+			@endif
+			@if($patient->has_mcp_done_onboarding_visit !== 'YES' && $patient->is_mcp_onboarding_active === 'NO')
+			<div class="alert alert-warning mt-3 mcp-theme-1 p-3 hide-inside-ticket-popup">
+				<div class="font-weight-bold text-dark font-size-16">MCP onboarding is not active for this patient.</div>
+				<div class="text-secondary p-2 border mt-2 bg-light">
+					<div class="font-weight-bold">{{$patient->why_is_mcp_onboarding_not_active_category}}</div>
+					<div>{{$patient->why_is_mcp_onboarding_not_active_memo}}</div>
+				</div>
+			</div>
+			@endif
+			<div class="card {{$trimLayout || $isVisitNote ? 'card m-0 border-0 rounded-0' : 'my-3'}}" id="patient-header">
+				<div id="patient-header-content">
+					<div class="card-header @if($patient->client_engagement_status_category == 'DUMMY') alert-warning @endif py-1 hide-inside-ticket-popup">
+						<?php
+						$thumbnail = $patient->profile_picture_base64;
+						$initials = !$thumbnail ? substr($patient->name_first, 0, 1) . substr($patient->name_last, 0, 1) : '';
+						$online = $patient->is_online ? 'online' : '';
+						$patientName = implode(', ', array_filter([$patient->name_last, $patient->name_first]));
+
+						$confirmedCell = empty($patient->cell_number) ? '-' : $patient->cell_number;
+						$hasConfirmedEmail = empty($patient->email_address) ? false:true;
+						$confirmedEmail = empty($patient->email_address) ? '-' : $patient->email_address;
+
+						$location = implode(', ', array_filter([$patient->home_address_city, $patient->home_address_state]));
+						$location = empty($location) ? '-' : $location;
+
+						$mcpName = $patient->mcp ? implode(', ', array_filter([$patient->mcp->name_last, $patient->mcp->name_first])) : null;
+						$cmName = $patient->cm ? implode(', ', array_filter([$patient->cm->name_last, $patient->cm->name_first])) : null;
+
+						$memberSince = date_diff(date_create($patient->created_at), date_create('now'))->days;
+						if ($memberSince > 30) $memberSince = date('F, Y', strtotime($patient->created_at));
+						else if ($memberSince > 1) $memberSince .= ' days ago';
+						else if ($memberSince === 1) $memberSince = 'yesterday';
+						else if ($memberSince === 0) $memberSince = 'today';
+						?>
+						<div class=z>
+							<div class=header>
+								@if($patient->is_duplicate)
+								<div class="alert alert-secondary border-dark mcp-theme-1 screen-only">
+									<span class="text-dark">This chart is a duplicate of&nbsp;</span>
+									<a class="font-weight-bold" href="/patients/view/{{ $patient->duplicateOf->uid }}">
+										{{ $patient->duplicateOf->displayName() }}
+									</a>
+								</div>
+								@endif
+								<div class="hbox mr-auto">
+
+									{{--<div>
+										<div @if($patient->is_microphone_available)style="color:green" @else style="color:gray"  @endif>
+											<i class="fa fa-microphone"></i>
+										</div>
+										<div @if($patient->is_camera_available)style="color:green" @else style="color:gray"  @endif>
+											<i class="fa fa-video"></i>
+										</div>
+									</div>--}}
+									<section class="align-self-start mt-2 mr-4">
+										<div class="hbox">
+											<h4 class="pt-name">{{$patientName}}</h4>
+											<div class="screen-only mr-1 patient-presence-indicator thumbnail {{$online}}" data-patient-uid="{{$patient->uid}}" style="background-image:<?=$thumbnail?>">
+												<?=$initials?>
+											</div>
+											<div class="d-inline-flex align-items-baseline">
+												<i class="chart mr-2">#{{$patient->chart_number}}</i>
+												<span class="on-hover-show d-inline-block on-hover-opaque">
+													<i class="fa fa-info-circle ml-1 text-primary"></i>
+													<div class="on-hover-content py-2 pl-3 text-nowrap">
+														Joined
+														<?=$memberSince?>
+														@if($pro->pro_type === 'ADMIN')
+														<div class="mt-1">
+															Created by <b>{{$patient->creator ? $patient->creator->displayName() : '-'}}</b>
+														</div>
+														<div class="mt-1">
+															Created on <b>{{friendly_date_time($patient->created_at)}}</b>
+														</div>
+														@endif
+													</div>
+												</span>
+											</div>
+										</div>
+										<div class=separators>
+											<div>{{friendly_date($patient->dob, false,null, true)}} ({{$patient->age_in_years}}
+												y.o {{$patient->sex}})
+											</div>
+											@if($patient->getPrimaryCoverage() && $patient->getPrimaryCoverageStatus() === 'YES')
+											<div class="text-nowrap screen-only">
+												{{$patient->getPrimaryCoverage()->insuranceDisplayName()}}
+												<span class="on-hover-show d-inline-block on-hover-opaque">
+													<i class="fa fa-check-circle text-success"></i>
+													<div class="on-hover-content py-2 pl-3 text-nowrap">
+														Covered
+													</div>
+												</span>
+											</div>
+											@endif
+										</div>
+										<div class="screen-only">
+											<label>Status:</label>
+											<b>{{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}</b>
+
+											@if($pro->pro_type == 'ADMIN')
+											<div moe class="ml-2 hide-inside-popup">
+												<a start show><i class="fa fa-edit"></i></a>
+												<form url="/api/client/updateClientEngagementAssessmentStatus" class="mcp-theme-1" target="#patient-header-content">
+													<input type="hidden" name="uid" value="{{$patient->uid}}">
+													<div class="mb-2">
+														<label class="mb-1 text-secondary text-sm">Status</label>
+														<select name="category" class="form-control form-control-sm">
+															<option value=""> --select--</option>
+															<option {{ $patient->client_engagement_status_category === 'ACTIVE' ? 'selected' : '' }} value="ACTIVE">Active</option>
+															<option {{ $patient->client_engagement_status_category === 'INACTIVE' ? 'selected' : '' }} value="INACTIVE">Inactive</option>
+															<option {{ $patient->client_engagement_status_category === 'ENTRY_ERROR' ? 'selected' : '' }} value="ENTRY_ERROR">Entry Error</option>
+															<option {{ $patient->client_engagement_status_category === 'DUMMY' ? 'selected' : '' }} value="DUMMY">Test Chart</option>
+															<option {{ $patient->client_engagement_status_category === 'DECEASED' ? 'selected' : '' }} value="DECEASED">Deceased</option>
+															<option {{ $patient->client_engagement_status_category === 'DUPLICATE' ? 'selected' : '' }} value="DUPLICATE">Duplicate</option>
+															<option {{ $patient->client_engagement_status_category === 'NO_LONGER_INTERESTED' ? 'selected' : '' }} value="NO_LONGER_INTERESTED">No Longer Interested</option>
+															<option {{ $patient->client_engagement_status_category === 'BAD_RECORD' ? 'selected' : '' }} value="BAD_RECORD">Bad Record</option>
+															<option {{ $patient->client_engagement_status_category === 'NO_LONGER_ELIGIBLE' ? 'selected' : '' }} value="NO_LONGER_ELIGIBLE">No Longer Eligible</option>
+														</select>
+													</div>
+													<div class="mb-2">
+														<label class="mb-1 text-secondary text-sm">Memo</label>
+														<textarea class="form-control form-control-sm" name="memo"></textarea>
+													</div>
+													<div>
+														<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+														<button cancel class="btn btn-sm btn-default border">Cancel</button>
+													</div>
+												</form>
+											</div>
+											@endif
+										</div>
+										<div class="screen-only">
+											<div>
+												<div>
+													@if($patient->has_mcp_done_onboarding_visit !== 'YES')
+													<span class="text-dark d-inline-flex align-items-center">
+														<span class="mr-2">
+															<i class="fa fa-exclamation-triangle"></i>
+															MCP Onboarding Visit Pending
+														</span>
+													</span>
+													<span moe class="hide-inside-popup">
+														<a start show><i class="fa fa-edit"></i></a>
+														<form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
+															<input type="hidden" name="uid" value="{{$patient->uid}}">
+															<div class="mb-2">
+																<select name="hasMcpDoneOnboardingVisit" class="form-control form-control-sm" onchange="toggleDisabledAsNeeded(this, 'YES', 'if-visit-done')">
+																	<option value="">-- Select Status --</option>
+																	<option value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
+																	<option value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
+																	<option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+																</select>
+															</div>
+															<div class="mb-2">
+																<input type="date" class="if-visit-done form-control form-control-sm" disabled name="mcpOnboardingVisitDate" value="{{ date('Y-m-d') }}" max="{{ date('Y-m-d') }}">
+															</div>
+															<div class="mb-2">
+																<select name="mcpOnboardingVisitNoteUid" disabled class="form-control form-control-sm if-visit-done" onchange="if(this.value === '-- create --') createNewNote('{{$patient->uid}}', '{{$pro->uid}}', '{{date('Y-m-d')}}');">
+																	<option value="">-- Visit Note --</option>
+																	<?php $notes = \App\Models\Note::where('client_id', $patient->id)->get() ?>
+																	@foreach ($notes as $note)
+																	@if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
+																	<option {{ $patient->mcp_onboarding_visit_note_id === $note->id ? 'selected' : '' }} value="{{$note->uid}}">{{$note->hcpPro->displayName()}} ({{friendly_date_time($note->effective_dateest, false)}})</option>
+																	@endif
+																	@endforeach
+																	{{--<option value="-- create --">-- Create Note --</option>--}}
+																</select>
+															</div>
+															<div class="mb-2 if-note-outside-system">
+																<textarea class="form-control form-control-sm" name="reasonOnboardingVisitNoteOutsideSystem" placeholder="Visit note outside the system reason" spellcheck="false" data-gramm="false"></textarea>
+															</div>
+															<div>
+																<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+																<button cancel class="btn btn-sm btn-default border">Cancel</button>
+															</div>
+														</form>
+													</span>
+													@else
+													<span class="text-dark d-inline-flex align-items-center">
+														<span class="mr-2 text-secondary">
+															<i class="fa fa-check text-sm"></i>
+															MCP Onboarding Visit Completed
+														</span>
+													</span>
+													@endif
+												</div>
+											</div>
+
+											<div class="">
+												@if($patient->mcp && $patient->mcp->id === $pro->id || $pro->pro_type == 'ADMIN')
+												<div>
+													<label>Follow-up Freq (days):</label>
+													<span>{!! is_null($patient->mcp_usual_follow_up_frequency_in_days) ? '<span class="text-danger">Not Set</span>' : $patient->mcp_usual_follow_up_frequency_in_days !!}</span>
+													<div moe relative class="ml-2">
+														<a href="#" start show class="text-sm"><i class="fa fa-edit"></i></a>
+														<form url="/api/client/putMcpUsualFollowUpFrequencyInDays">
+															<input type="hidden" name="uid" value="{{$patient->uid}}">
+															<div class="mb-2">
+																<label class="text-sm text-secondary mb-1 text-nowrap">Follow-up Frequency (days)</label>
+																<input type="number" required name="mcpUsualFollowUpFrequencyInDays" class="form-control form-control-sm" value="{{@$patient->mcp_usual_follow_up_frequency_in_days}}">
+															</div>
+															<div class="d-flex align-items-center">
+																<button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+																<button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+															</div>
+														</form>
+													</div>
+												</div>
+												@endif
+											</div>
+
+
+										</div>
+										@if(!$patient->getPrimaryCoverage() || $patient->getPrimaryCoverageStatus() !== 'YES')
+										<div class="mt-2">
+											@include('app.patient.coverage-status')
+										</div>
+										@endif
+									</section>
+									<section class="hide-inside-popup screen-only vbox mt-2 pt-1 align-self-stretch ml-2 px-2 mcp-theme-1 align-items-center">
+										<div>
+											<div moe relative>
+												<a href="#" start show class="d-flex align-items-baseline"><i class="fa fa-comment text-sm mr-1"></i></a>
+												<form url="/api/clientSms/createOutgoing" class="mcp-theme-1" noreload>
+													<input type="hidden" name="uid" value="{{ $patient->uid }}">
+													<div class="mb-2">
+														<label for="" class="text-sm text-secondary mb-1">Cell
+															Number</label>
+														<input type="text" class="form-control form-control-sm" name="cellNumber" value="{{$patient->cell_number}}">
+													</div>
+													<div class="mb-2">
+														<label for="" class="text-sm text-secondary mb-1">Message</label>
+														<textarea type="text" class="form-control form-control-sm" name="message"></textarea>
+													</div>
+													<div class="d-flex align-items-center">
+														<button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+														<button class="btn btn-sm btn-default mr-2 border" cancel>
+															Cancel
+														</button>
+													</div>
+												</form>
+											</div>
+										</div>
+										<div>
+											<span moe relative class="">
+												<a href="#" start show class="d-flex align-items-baseline" title="SMS check-in link to the patient"><i class="fa fa-paper-plane text-sm mr-1"></i></a>
+												<form url="/api/client/sendCheckInTokenViaSmsOrEmail" class="mcp-theme-1">
+													<input type="hidden" name="uid" value="{{ $patient->uid }}">
+													<p class="small min-width-200px mb-2">Send Check-In link to patient?</p>
+													<div class="mb-2">
+														<label for="" class="text-sm text-secondary mb-1">Cell Number</label>
+														<input type="text" class="form-control input-sm" name="cellNumber" value="{{$patient->cell_number}}">
+													</div>
+													<div class="mb-2">
+														<label for="" class="text-sm text-secondary mb-1">Email address</label>
+														<input type="text" class="form-control input-sm" name="emailAddress" value="{{$patient->email_address}}">
+													</div>
+													<div class="d-flex align-items-center">
+														<button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+														<button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+													</div>
+												</form>
+											</span>
+										</div>
+										@if($performer->pro->pro_type == 'ADMIN')
+										<div>
+											<a href="#" start show onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i class="fa fa-eye text-sm mr-1"></i></a>
+										</div>
+										@endif
+										<div>
+											<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 mcp-theme-1">
+										<div>
+											<label>MCP:</label> {{$mcpName}}
+											@if($patient->has_mcp_done_onboarding_visit !== 'YES' && $pro->pro_type == 'ADMIN')
+											<div moe class="ml-2 hide-inside-popup">
+												<a start show><i class="fa fa-edit"></i></a>
+												<form url="/api/client/putMcp" class="mcp-theme-1">
+													<input type="hidden" name="uid" value="{{$patient->uid}}">
+													<div class="mb-2">
+														<label class="text-secondary text-sm">MCP Pro</label>
+														<select name="mcpProUid" provider-search data-pro-uid="{{ @$patient->mcp->uid }}" class="form-control form-control-sm">
+															<option value=""> --select--</option>
+															@foreach($pros as $iPro)
+															<option value="{{$iPro->uid}}" {{ $patient->mcp && $iPro->uid === $patient->mcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+															@endforeach
+														</select>
+													</div>
+													<div>
+														<button submit class="btn btn-sm btn-primary mr-1">
+															Submit
+														</button>
+														<button cancel class="btn btn-sm btn-default border">
+															Cancel
+														</button>
+													</div>
+												</form>
+											</div>
+											@if($patient->mcp)
+											<div moe class="ml-2 hide-inside-popup">
+												<a start show><i class="fa fa-times"></i></a>
+												<form url="/api/client/removeMcp" class="mcp-theme-1">
+													<input type="hidden" name="uid" value="{{$patient->uid}}">
+													<div class="mb-2">
+														<label class="text-secondary text-sm">Remove MCP Pro</label>
+
+													</div>
+													<div>
+														<button submit class="btn btn-sm btn-primary mr-1">Submit
+														</button>
+														<button cancel class="btn btn-sm btn-default border">
+															Cancel
+														</button>
+													</div>
+												</form>
+											</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 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">
+														<label class="text-sm text-secondary mb-1">Category </label>
+														<select name="category" class="form-control form-control-sm">
+															<option value="NULL">--</option>
+															<option value="ACTIVE">ACTIVE</option>
+															<option value="INACTIVE">INACTIVE</option>
+															<option value="ENTRY_ERROR">ENTRY_ERROR</option>
+															<option value="DUMMY">DUMMY</option>
+															<option value="DECEASED">DECEASED</option>
+															<option value="DUPLICATE">DUPLICATE</option>
+															<option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option>
+															<option value="BAD_RECORD">BAD_RECORD</option>
+														</select>
+													</div>
+													<div class="mb-2">
+														<label class="text-sm text-secondary mb-1">Memo</label>
+														<input type="text" name="memo" class="form-control form-control-sm">
+													</div>
+													<div class="mb-2">
+														<label class="text-sm text-secondary mb-1">Detail</label>
+														<input type="text" name="detail" class="form-control form-control-sm">
+													</div>
+													<div>
+														<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+														<button cancel class="btn btn-sm btn-default border">Cancel</button>
+													</div>
+												</form>
+											</div>
+										</div>
+										@endif
+										<div>
+											<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 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">
+														<label class="text-secondary text-sm">Care Coordinator</label>
+														<select provider-search data-pro-uid="{{ @$patient->defaultNaPro->uid }}" name="defaultNaProUid" class="form-control form-control-sm">
+															<option value=""> --select--</option>
+															@foreach($pros as $iPro)
+															<option value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->pcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
+															@endforeach
+														</select>
+													</div>
+													<div>
+														<button submit class="btn btn-sm btn-primary mr-1">Submit
+														</button>
+														<button cancel class="btn btn-sm btn-default border">
+															Cancel
+														</button>
+													</div>
+												</form>
+											</div>
+											@if($patient->pcp)
+											<div moe class="ml-2 hide-inside-popup">
+												<a start show><i class="fa fa-times"></i></a>
+												<form url="/api/client/removeDefaultNaPro" class="mcp-theme-1">
+													<input type="hidden" name="uid" value="{{$patient->uid}}">
+													<div class="mb-2">
+														<label class="text-secondary text-sm">Remove Care Coordinator</label>
+
+													</div>
+													<div>
+														<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+														<button cancel class="btn btn-sm btn-default border">Cancel</button>
+													</div>
+												</form>
+											</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 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">
+														<label class="text-sm text-secondary mb-1">Category </label>
+														<select name="category" class="form-control form-control-sm">
+															<option value="NULL">--</option>
+															<option value="ACTIVE">ACTIVE</option>
+															<option value="INACTIVE">INACTIVE</option>
+															<option value="ENTRY_ERROR">ENTRY_ERROR</option>
+															<option value="DUMMY">DUMMY</option>
+															<option value="DECEASED">DECEASED</option>
+															<option value="DUPLICATE">DUPLICATE</option>
+															<option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option>
+															<option value="BAD_RECORD">BAD_RECORD</option>
+														</select>
+													</div>
+													<div class="mb-2">
+														<label class="text-sm text-secondary mb-1">Memo</label>
+														<input type="text" name="memo" class="form-control form-control-sm">
+													</div>
+													<div class="mb-2">
+														<label class="text-sm text-secondary mb-1">Detail</label>
+														<input type="text" name="detail" class="form-control form-control-sm">
+													</div>
+													<div>
+														<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+														<button cancel class="btn btn-sm btn-default border">Cancel</button>
+													</div>
+												</form>
+											</div>
+										</div>
+										@endif
+									</section>
+									<section class="screen-only vbox align-self-start mt-2 mx-2 border-left pl-2 mcp-theme-1">
+										<div>Cell. BP: <b>{{$patient->hasBPDevice()?'Yes':'No'}}</b></div>
+										@if($patient->most_recent_cellular_bp_sbp_mm_hg && $patient->most_recent_cellular_bp_dbp_mm_hg)
+										<div>Last BP:
+											<b>{{$patient->most_recent_cellular_bp_sbp_mm_hg ?: '-'}}/{{$patient->most_recent_cellular_bp_dbp_mm_hg ?: '-'}}</b>
+											@if($patient->most_recent_cellular_bp_measurement_at)
+											<span class="text-sm text-secondary text-nowrap ml-1" title="{{friendly_date_time($patient->most_recent_cellular_bp_measurement_at)}}">({{friendly_date($patient->most_recent_cellular_bp_measurement_at)}})</span>
+											@endif
+										</div>
+										@endif
+										<div>Wt. Scale: <b>{{$patient->hasWeightScaleDevice()?'Yes':'No'}}</b></div>
+										@if($patient->most_recent_cellular_weight_value)
+										<div>Last Wt.:
+											<b>{{round($patient->most_recent_cellular_weight_value, 1)}}</b>
+											@if($patient->most_recent_cellular_weight_measurement_at)
+											<span class="text-sm text-secondary text-nowrap ml-1" title="{{friendly_date_time($patient->most_recent_cellular_weight_measurement_at)}}">({{friendly_date($patient->most_recent_cellular_weight_measurement_at)}})</span>
+											@endif
+										</div>
+										@endif
+
+										<?php $currentCareMonth = $patient->currentCareMonth(); ?>
+										@if($currentCareMonth && ($pro->pro_type === 'ADMIN' || $pro->id === $currentCareMonth->mcp_pro_id))
+										<div class="text-primary c-pointer" open-in-stag-popup mc-initer="care-month-dashboard-{{$patient->uid}}" title="Care Month: {{friendly_month($currentCareMonth->start_date)}}" popup-style="overflow-visible" href="/patients/view/{{ $patient->uid }}/care-months/view/{{$currentCareMonth->uid}}">
+											<?php $spoken = $currentCareMonth->has_anyone_interacted_with_client_about_rm_outside_note; ?>
+											<span class="">RPM comm. this month:</span>
+											<b class="{{$spoken ? 'text-success' : ''}}">
+												{{$spoken ? 'Yes' : 'No'}}
+												@if(!$spoken)
+												<i class="fa fa-exclamation-triangle"></i>
+												@else
+												<i class="fa fa-check"></i>
+												@endif
+											</b>
+										</div>
+										@endif
+									</section>
+									<section class="mr-4 align-self-start mt-2 ml-auto mcp-theme-1">
+										<div class="d-flex align-items-start">
+											<div class="max-width-300px max-height-100px overflow-auto d-inline-block">
+												<label>Sticky Note:</label> <span class="text-secondary">{{$patient->sticky_note ?? '-' }}</span>
+											</div>
+											<div moe relative wide class="ml-2 hide-inside-popup">
+												<a start show><i class="fa fa-edit"></i></a>
+												<form url="/api/client/updateStickyNote" class="mcp-theme-1" right>
+													<input type="hidden" name="uid" value="{{$patient->uid}}">
+													<div class="mb-2">
+														<label class="text-secondary text-sm">Sticky Note</label>
+														<textarea name="stickyNote" class="form-control" rows="8" cols="80">{{$patient->sticky_note}}</textarea>
+													</div>
+													<div>
+														<button submit class="btn btn-sm btn-primary mr-1">Submit
+														</button>
+														<button cancel class="btn btn-sm btn-default border">
+															Cancel
+														</button>
+													</div>
+												</form>
+											</div>
+										</div>
+										@if($pro->pro_type === 'ADMIN')
+										<div class="mt-1">
+											<label>Intake Data: - </label> <span class="text-secondary"></span>
+											@include('app.patient.intake-data.patient-intake-data-form')
+										</div>
+										@endif
+									</section>
+									<ul class="vbox mt-2 align-self-start patient-header-address ">
+										<li class="d-flex align-items-start">
+											<span class="aligned-icon">
+												<i class="fa fa-map-marker-alt" aria-hidden="true"></i>
+											</span>
+											<div class="position-relative">
+												<?php
+												$addressParts = [];
+												if (!!$patient->mailing_address_line1) $addressParts[] = trim($patient->mailing_address_line1);
+												if (!!$patient->mailing_address_line2) $addressParts[] = trim($patient->mailing_address_line2);
+												$addressParts = implode(", ", $addressParts) . "<br/>";
+												$addressPart2 = [];
+												if (!!$patient->mailing_address_city) $addressPart2[] = trim($patient->mailing_address_city);
+												if (!!$patient->mailing_address_state) $addressPart2[] = trim($patient->mailing_address_state);
+												$addressParts .= implode(", ", $addressPart2);
+												echo $addressParts;
+												?>
+												{{ $patient->mailing_address_zip ? $patient->mailing_address_zip : '' }}
+												@if($patient->mailing_address_memo)
+												<span class="position-relative c-pointer text-center stag-tooltip ml-2">
+													<i class="fa fa-info-circle"></i>
+													<div class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
+														<div class="text-left font-weight-bold pb-1">Special Instructions</div>
+														<div class="text-left font-weight-normal">{{$patient->mailing_address_memo}}</div>
+													</div>
+												</span>
+												@endif
+											</div>
+										</li>
+										@if($patient->cell_number)
+										<li>
+											<span class="aligned-icon">
+												<i class="fa fa-phone-alt" aria-hidden="true"></i>
+											</span>
+											{{$patient->cell_number}}
+											<span class="small text-secondary ml-1">
+												{{ $patient->cell_number_memo ? '(' . $patient->cell_number_memo . ')' : '' }}
+											</span>
+										</li>
+										@endif
+										@if($patient->phone_home)
+										<li>
+											<span class="aligned-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
+											{{$patient->phone_home}}
+										</li>
+										@endif
+										<li class="d-flex align-items-start">
+											<div class="d-flex align-items-center flex-wrap">
+												<span class="ml-1 mr-2"><i class="fa fa-envelope"></i>
+													@if($hasConfirmedEmail)
+													{{$confirmedEmail}}
+													@else
+													<i>(No email address)</i>
+													@endif
+												</span>
+												{{--<div>
+														@include('app.patient.send_email')
+													</div>--}}
+											</div>
+										</li>
+
+										<li class="d-flex align-items-start">
+											<div class="d-inline-flex screen-only">
+												<span class="aligned-icon text-primary">
+													<i class="fa fa-link" aria-hidden="true"></i>
+												</span>
+												<?php $numLinkedAccounts = $patient->linkedAccounts ? count($patient->linkedAccounts) : 0; ?>
+												<a href="{{route('patients.view.accounts', ['patient' => $patient])}}">
+													Accounts ({{$numLinkedAccounts}})
+												</a>
+											</div>
+										</li>
+									</ul>
+
+								</div>
+
+							</div>
+						</div> <!-- z -->
+					</div>
+				</div>
+				@if($pro->pro_type === 'ADMIN')
+				<div class="screen-only card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue hide-inside-popup">
+					<b class="">Tags ({{count($patient->clientTags)}}):</b>
+					@foreach($patient->clientTags as $tag)
+					<div class="d-inline-flex align-items-center ml-2 py-1 px-2 rounded bg-aliceblue text-info">
+						<span class="text-sm">{{$tag->tag}}</span>
+						<div moe relative class="ml-2">
+							<a href="" start show><i class="fa fa-times text-secondary on-hover-opaque"></i></a>
+							<form url="/api/clientTag/cancel" class="mcp-theme-1 min-width-200px">
+								<input type="hidden" name="uid" value="{{$tag->uid}}">
+								<p class="text-nowrap text-dark">Cancel this tag?</p>
+								<div>
+									<button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+									<button cancel class="btn btn-sm btn-default border">Cancel</button>
+								</div>
+							</form>
+						</div>
+					</div>
+					@endforeach
+					<div moe relative class="ml-2">
+						<a href="" start show class="text-sm">+ Add</a>
+						<form url="/api/clientTag/create" class="mcp-theme-1">
+							<input type="hidden" name="clientUid" value="{{$patient->uid}}">
+							<div class="mb-2">
+								<label class="text-secondary text-sm">Tag</label>
+								<input type="text" class="form-control form-control-sm" name="tag" placeholder="Tag" required>
+							</div>
+							<div>
+								<button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+								<button cancel class="btn btn-sm btn-default border">Cancel</button>
+							</div>
+						</form>
+					</div>
+				</div>
+				@endif
+				{{--<div class="text-container border-bottom d-flex align-items-center mcp-theme-1 px-3">
+
+						@if($patient->mcp_pro_id !== $pro->id && $patient->active_mcp_request_id)
+							<div moe relative class="ml-2">
+								<a href="" start show class="btn btn-sm btn-success text-white font-weight-bold small">Claim as MCP</a>
+								<form url="/api/mcpRequest/claim" class="mcp-theme-1" right>
+									<input type="hidden" name="clientUid" value="{{$patient->uid}}">
+				<p>Claim this patient?</p>
+				<div>
+					<button submit class="btn btn-sm btn-primary mr-2">Yes</button>
+					<button cancel class="btn btn-sm btn-default border">Cancel</button>
+				</div>
+				</form>
+			</div>
+			@endif
+	</div>--}}
+	<div class="card-body {{$routeName === 'patients.view.notes.view.dashboard' ? 'p-0' : ''}}">
+		{{--<h1 class="h3">@yield('section-title')</h1>--}}
+		<div class="mcp-theme-1">
+			@yield('inner-content')
+		</div>
+	</div>
+</div>
+</main>
+</div>
+</div>
+<script>
+	(function() {
+		function init() {
+			$('.note-method-select').change(function() {
+				let form = $(this).closest('form');
+				if (this.value === 'IN_CLINIC') {
+					form.find('.if-in-clinic').show();
+				} else {
+					form.find('.if-in-clinic').hide();
+				}
+			});
+
+			$('.note-method-select').each(function() {
+				let form = $(this).closest('form');
+				if (this.value === 'IN_CLINIC') {
+					form.find('.if-in-clinic').show();
+				} else {
+					form.find('.if-in-clinic').hide();
+				}
+			});
+		}
+		addMCInitializer('patient-add-note-popup', init, '#patient-header')
+	}).call(window);
+</script>
+<script>
+	(function() {
+		function init() {
+			$('#sidebarMenu')
+				.off('scroll')
+				.on('scroll', function() {
+					localStorage.sidebarMenuScrollTop = $(this).scrollTop();
+				});
+			if (localStorage.sidebarMenuScrollTop) {
+				$('#sidebarMenu').scrollTop(+localStorage.sidebarMenuScrollTop);
+			}
+		}
+		addMCInitializer('sidebarMenu', init, '#sidebarMenu')
+	}).call(window);
+</script>
+@endsection

+ 310 - 993
resources/views/layouts/patient.blade.php

@@ -14,81 +14,66 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 	}
 </style>
 @section('content')
-	<div class="container-fluid h-100 popup-content-container">
-		<div class="main-row h-100 {{ !request()->input('popupmode') ? '' : 'px-0' }} {{$isVisitNote ? 'autohide-leftnav' : ''}}">
-			@if(!request()->input('popupmode'))
-			<nav id="sidebarMenu" class="d-block bg-light sidebar collapse px-0">
-				<div class="sidebar-sticky pt-3">
-					<ul class="nav flex-column mcp-theme-1">
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.dashboard') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.dashboard', ['patient' => $patient]) }}">Dashboard</a>
-						</li>
-                        @if($performer->pro->pro_type == 'ADMIN')
-                            <li class="nav-item">
-                                <a class="nav-link {{ strpos($routeName, 'patients.view.migrate-canvas') === 0 ? 'active' : '' }}"
-                                   href="{{ route('patients.view.migrate-canvas', ['patient' => $patient]) }}">Canvas Migrate</a>
-                            </li>
-                            <li class="nav-item">
-                                <a class="nav-link {{ strpos($routeName, 'patients.view.canvas') === 0 ? 'active' : '' }}"
-                                   href="{{ route('patients.view.canvas', ['patient' => $patient]) }}">Canvas</a>
-                            </li>
-                        @endif
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.calendar') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.calendar', ['patient' => $patient]) }}">Calendar</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.appointments') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.appointments', ['patient' => $patient, 'forPro' => 'all', 'status' => 'all']) }}">Appointments</a>
-						</li>
-						{{--
+<div class="container-fluid h-100 popup-content-container">
+	<div class="main-row h-100 {{ !request()->input('popupmode') ? '' : 'px-0' }} {{$isVisitNote ? 'autohide-leftnav' : ''}}">
+		@if(!request()->input('popupmode'))
+		<nav id="sidebarMenu" class="d-block bg-light sidebar collapse px-0">
+			<div class="sidebar-sticky pt-3">
+				<ul class="nav flex-column mcp-theme-1">
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.dashboard') === 0 ? 'active' : '' }}" href="{{ route('patients.view.dashboard', ['patient' => $patient]) }}">Dashboard</a>
+					</li>
+					@if($performer->pro->pro_type == 'ADMIN')
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.migrate-canvas') === 0 ? 'active' : '' }}" href="{{ route('patients.view.migrate-canvas', ['patient' => $patient]) }}">Canvas Migrate</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.canvas') === 0 ? 'active' : '' }}" href="{{ route('patients.view.canvas', ['patient' => $patient]) }}">Canvas</a>
+					</li>
+					@endif
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.calendar') === 0 ? 'active' : '' }}" href="{{ route('patients.view.calendar', ['patient' => $patient]) }}">Calendar</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.appointments') === 0 ? 'active' : '' }}" href="{{ route('patients.view.appointments', ['patient' => $patient, 'forPro' => 'all', 'status' => 'all']) }}">Appointments</a>
+					</li>
+					{{--
 						<li class="nav-item">
 							<a class="nav-link {{ strpos($routeName, 'patients.view.programs') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.programs', ['patient' => $patient]) }}">Programs</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.flowsheets') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.flowsheets', ['patient' => $patient]) }}">Flowsheets</a>
-						</li>
-						--}}
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.vitals-settings') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.vitals-settings', ['patient' => $patient]) }}">Vitals Settings</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.vitals-graph') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.vitals-graph', ['patient' => $patient]) }}">Vitals Graph</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.care-months') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.care-months', ['patient' => $patient]) }}">Care Months</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.devices') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.devices', ['patient' => $patient]) }}">Devices</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.measurements') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.measurements', ['patient' => $patient]) }}">Measurements</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.notes') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.notes', ['patient' => $patient]) }}">Notes</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.generic-bills') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.generic-bills', ['patient' => $patient]) }}">Admin. Bills</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.handouts') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.handouts', ['patient' => $patient]) }}">Handouts</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.rm-setup') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.rm-setup', ['patient' => $patient]) }}">RM Setup</a>
-						</li>
-						<?php /* <li class="nav-item">
+					href="{{ route('patients.view.programs', ['patient' => $patient]) }}">Programs</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.flowsheets') === 0 ? 'active' : '' }}" href="{{ route('patients.view.flowsheets', ['patient' => $patient]) }}">Flowsheets</a>
+					</li>
+					--}}
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.vitals-settings') === 0 ? 'active' : '' }}" href="{{ route('patients.view.vitals-settings', ['patient' => $patient]) }}">Vitals Settings</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.vitals-graph') === 0 ? 'active' : '' }}" href="{{ route('patients.view.vitals-graph', ['patient' => $patient]) }}">Vitals Graph</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.care-months') === 0 ? 'active' : '' }}" href="{{ route('patients.view.care-months', ['patient' => $patient]) }}">Care Months</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.devices') === 0 ? 'active' : '' }}" href="{{ route('patients.view.devices', ['patient' => $patient]) }}">Devices</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.measurements') === 0 ? 'active' : '' }}" href="{{ route('patients.view.measurements', ['patient' => $patient]) }}">Measurements</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.notes') === 0 ? 'active' : '' }}" href="{{ route('patients.view.notes', ['patient' => $patient]) }}">Notes</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.generic-bills') === 0 ? 'active' : '' }}" href="{{ route('patients.view.generic-bills', ['patient' => $patient]) }}">Admin. Bills</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.handouts') === 0 ? 'active' : '' }}" href="{{ route('patients.view.handouts', ['patient' => $patient]) }}">Handouts</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.rm-setup') === 0 ? 'active' : '' }}" href="{{ route('patients.view.rm-setup', ['patient' => $patient]) }}">RM Setup</a>
+					</li>
+					<?php /* <li class="nav-item">
 							<a class="nav-link d-flex align-items-center {{ strpos($routeName, 'patients.view.action-items') === 0 ? 'active' : '' }}"
 							   native onclick="return false">
 								<span class="text-dark">ERx/Orders</span>
@@ -112,10 +97,9 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 								</li>
 							</ul>
 						</li> */ ?>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.patient-prescriptions') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.patient-prescriptions', ['patient' => $patient]) }}">ERx &amp; Orders</a>
-							<?php /*
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.patient-prescriptions') === 0 ? 'active' : '' }}" href="{{ route('patients.view.patient-prescriptions', ['patient' => $patient]) }}">ERx &amp; Orders</a>
+						<?php /*
 							<ul class="m-0 p-0 nav-child-list">
 								<li class="nav-item">
 									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-erx') === 0 && @$type === '' ? 'active' : '' }}"
@@ -147,941 +131,274 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 								</li>
 							</ul>
 							*/ ?>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === '' ? 'active' : '' }}"
-							   href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => '']) }}">Tickets</a>
-						</li>
-						@if($isOldClient)
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.patient-tickets', ['patient' => $patient]) }}" title="Deprecated">ERx / Orders
-								<span class="text-secondary text-sm pl-2">(dep)</span>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === '' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => '']) }}">Tickets</a>
+					</li>
+					@if($isOldClient)
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient]) }}" title="Deprecated">ERx / Orders
+							<span class="text-secondary text-sm pl-2">(dep)</span>
+						</a>
+						<ul class="m-0 p-0 nav-child-list">
+							<li class="nav-item">
+								<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === '' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => '']) }}">All</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'erx' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'erx']) }}">ERx</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'lab' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'lab']) }}">Lab</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'imaging' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'imaging']) }}">Imaging</a>
+							</li>
+							<li class="nav-item">
+								<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'other' ? 'active' : '' }}" href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'other']) }}">Other</a>
+							</li>
+						</ul>
+					</li>
+					@endif
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.supply-orders') === 0 ? 'active' : '' }}" href="{{ route('patients.view.supply-orders', ['patient' => $patient]) }}">Supply Orders</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.shipments') === 0 ? 'active' : '' }}" href="{{ route('patients.view.shipments', ['patient' => $patient]) }}">Shipments</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.incoming-reports') === 0 ? 'active' : '' }}" href="{{ route('patients.view.incoming-reports', ['patient' => $patient]) }}">Incoming Reports</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.allergies') === 0 ? 'active' : '' }}" href="{{ route('patients.view.allergies', ['patient' => $patient]) }}">Allergies</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.medications') === 0 ? 'active' : '' }}" href="{{ route('patients.view.medications', ['patient' => $patient]) }}">Medications</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.dx-and-focus-areas') === 0 ? 'active' : '' }}" href="{{ route('patients.view.dx-and-focus-areas', ['patient' => $patient]) }}">Dx and
+							Focus Areas</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.care-team') === 0 ? 'active' : '' }}" href="{{ route('patients.view.care-team', ['patient' => $patient]) }}">Care Team</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.history') === 0 ? 'active' : '' }}" href="{{ route('patients.view.history', ['patient' => $patient]) }}">History</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.memos') === 0 ? 'active' : '' }}" href="{{ route('patients.view.memos', ['patient' => $patient]) }}">Memos</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ $routeName === 'patients.view.sms' ? 'active' : '' }}" href="{{ route('patients.view.sms', ['patient' => $patient]) }}">SMS</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.sms-numbers') === 0 ? 'active' : '' }}" href="{{ route('patients.view.sms-numbers', ['patient' => $patient]) }}">SMS Numbers</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ $routeName === 'patients.view.outgoing-sms-log' ? 'active' : '' }}" href="{{ route('patients.view.outgoing-sms-log', ['patient' => $patient]) }}">Outgoing SMS Log</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.documents') === 0 ? 'active' : '' }}" href="{{ route('patients.view.documents', ['patient' => $patient]) }}">Documents</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.settings') === 0 ? 'active' : '' }}" href="{{ route('patients.view.settings', ['patient' => $patient]) }}">Settings</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.sms-reminders') === 0 ? 'active' : '' }}" href="{{ route('patients.view.sms-reminders', ['patient' => $patient]) }}">SMS Reminders</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.measurement-confirmation-numbers') === 0 ? 'active' : '' }}" href="{{ route('patients.view.measurement-confirmation-numbers', ['patient' => $patient]) }}">Meas. Conf. Numbers</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.pros') === 0 ? 'active' : '' }}" href="{{ route('patients.view.pros', ['patient' => $patient]) }}">Pros</a>
+					</li>
+					@if($performer->pro->pro_type == 'ADMIN')
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.pro-changes') === 0 ? 'active' : '' }}" href="{{ route('patients.view.pro-changes', ['patient' => $patient]) }}">Client Pro Changes</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.client-pro-access') === 0 ? 'active' : '' }}" href="{{ route('patients.view.client-pro-access', ['patient' => $patient]) }}">Client Pro Access</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.client-documents') === 0 ? 'active' : '' }}" href="{{ route('patients.view.client-documents', ['patient' => $patient]) }}">Client Documents</a>
+					</li>
+					@endif
+					<li class="nav-item">
+						<a class="nav-link" href="/patients/view/{{ $patient->uid }}/intake">Intake</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.primary-coverage') === 0 ? 'active' : '' }}" href="{{ route('patients.view.primary-coverage', $patient) }}">Primary Coverage</a>
+					</li>
+					@if($performer->pro->pro_type == 'ADMIN' || $performer->pro->id == $patient->default_na_pro_id)
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.mcp-requests') === 0 ? 'active' : '' }}" href="{{ route('patients.view.mcp-requests', $patient) }}">MCP Requests</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.eligible-refreshes') === 0 ? 'active' : '' }}" href="{{ route('patients.view.eligible-refreshes', $patient) }}">Eligible Refreshes</a>
+					</li>
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.insurance-coverage') === 0 ? 'active' : '' }}" href="{{ route('patients.view.insurance-coverage', $patient) }}">Insurance Coverage</a>
+					</li>
+
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.claims-resolver') === 0 ? 'active' : '' }}" href="{{ route('patients.view.claims-resolver', $patient) }}">Claims Resolver</a>
+					</li>
+					@endif
+					<li class="nav-item">
+						<a class="nav-link {{ strpos($routeName, 'patients.view.accounts') === 0 ? 'active' : '' }}" href="{{ route('patients.view.accounts', $patient) }}">Linked Accounts</a>
+					</li>
+				</ul>
+				<div class="mt-3 mcp-theme-1">
+					@yield('left-nav-content')
+				</div>
+			</div>
+		</nav>
+		@endif
+		<main role="main" class="w-100 {{$trimLayout || $isVisitNote ? 'p-0' : ''}}">
+			@if($pro->is_enrolled_as_mcp && !$patient->mcp)
+			<div class="alert alert-info bg-white mt-3 mcp-theme-1 p-3 hide-inside-ticket-popup m-1">
+				<div class="font-size-16">
+					<i class="fa fa-exclamation-triangle text-warning-mellow"></i>
+					This patient currently does not have an MCP assigned.
+				</div>
+				<div class="mt-3 d-flex align-items-center">
+					<button class="btn btn-info" onclick="$('.in-conv-confirmed').removeClass('d-none').addClass('d-inline-flex')">I am currently seeing or talking to this patient</button>
+					<div class="in-conv-confirmed d-none align-items-center">
+						<i class="fa fa-chevron-right mx-3 text-secondary"></i>
+						<div moe class=" hide-inside-popup">
+							<a href="" start show class="btn btn-primary font-weight-bold text-white">
+								Assign myself as the MCP for this patient
 							</a>
-							<ul class="m-0 p-0 nav-child-list">
-								<li class="nav-item">
-									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === '' ? 'active' : '' }}"
-									   href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => '']) }}">All</a>
-								</li>
-								<li class="nav-item">
-									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'erx' ? 'active' : '' }}"
-									   href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'erx']) }}">ERx</a>
-								</li>
-								<li class="nav-item">
-									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'lab' ? 'active' : '' }}"
-									   href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'lab']) }}">Lab</a>
-								</li>
-								<li class="nav-item">
-									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'imaging' ? 'active' : '' }}"
-									   href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'imaging']) }}">Imaging</a>
-								</li>
-								<li class="nav-item">
-									<a class="nav-link {{ strpos($routeName, 'patients.view.patient-tickets') === 0 && @$type === 'other' ? 'active' : '' }}"
-									   href="{{ route('patients.view.patient-tickets', ['patient' => $patient, 'type' => 'other']) }}">Other</a>
-								</li>
-							</ul>
-						</li>
-						@endif
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.supply-orders') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.supply-orders', ['patient' => $patient]) }}">Supply Orders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.shipments') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.shipments', ['patient' => $patient]) }}">Shipments</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.incoming-reports') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.incoming-reports', ['patient' => $patient]) }}">Incoming Reports</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.allergies') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.allergies', ['patient' => $patient]) }}">Allergies</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.medications') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.medications', ['patient' => $patient]) }}">Medications</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.dx-and-focus-areas') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.dx-and-focus-areas', ['patient' => $patient]) }}">Dx and
-								Focus Areas</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.care-team') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.care-team', ['patient' => $patient]) }}">Care Team</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.history') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.history', ['patient' => $patient]) }}">History</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.memos') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.memos', ['patient' => $patient]) }}">Memos</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ $routeName === 'patients.view.sms' ? 'active' : '' }}"
-							   href="{{ route('patients.view.sms', ['patient' => $patient]) }}">SMS</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.sms-numbers') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.sms-numbers', ['patient' => $patient]) }}">SMS Numbers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ $routeName === 'patients.view.outgoing-sms-log' ? 'active' : '' }}"
-							   href="{{ route('patients.view.outgoing-sms-log', ['patient' => $patient]) }}">Outgoing SMS Log</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.documents') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.documents', ['patient' => $patient]) }}">Documents</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.settings') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.settings', ['patient' => $patient]) }}">Settings</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.sms-reminders') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.sms-reminders', ['patient' => $patient]) }}">SMS Reminders</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.measurement-confirmation-numbers') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.measurement-confirmation-numbers', ['patient' => $patient]) }}">Meas. Conf. Numbers</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.pros') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.pros', ['patient' => $patient]) }}">Pros</a>
-						</li>
-						@if($performer->pro->pro_type == 'ADMIN')
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.pro-changes') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.pro-changes', ['patient' => $patient]) }}">Client Pro Changes</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.client-pro-access') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.client-pro-access', ['patient' => $patient]) }}">Client Pro Access</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.client-documents') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.client-documents', ['patient' => $patient]) }}">Client Documents</a>
-						</li>
-						@endif
-						<li class="nav-item">
-							<a class="nav-link" href="/patients/view/{{ $patient->uid }}/intake">Intake</a>
-						</li>
-						<li class="nav-item">
-                            <a class="nav-link {{ strpos($routeName, 'patients.view.primary-coverage') === 0 ? 'active' : '' }}"
-                               href="{{ route('patients.view.primary-coverage', $patient) }}">Primary Coverage</a>
-                        </li>
-						@if($performer->pro->pro_type == 'ADMIN' || $performer->pro->id == $patient->default_na_pro_id)
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.mcp-requests') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.mcp-requests', $patient) }}">MCP Requests</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.eligible-refreshes') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.eligible-refreshes', $patient) }}">Eligible Refreshes</a>
-						</li>
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.insurance-coverage') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.insurance-coverage', $patient) }}">Insurance Coverage</a>
-						</li>
-                       
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.claims-resolver') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.claims-resolver', $patient) }}">Claims Resolver</a>
-						</li>
-						@endif
-						<li class="nav-item">
-							<a class="nav-link {{ strpos($routeName, 'patients.view.accounts') === 0 ? 'active' : '' }}"
-							   href="{{ route('patients.view.accounts', $patient) }}">Linked Accounts</a>
-						</li>
-					</ul>
-					<div class="mt-3 mcp-theme-1">
-						@yield('left-nav-content')
+							<form url="/api/client/putMcp" class="mcp-theme-1">
+								<input type="hidden" name="uid" value="{{$patient->uid}}">
+								<input type="hidden" name="mcpProUid" value="{{$pro->uid}}">
+								<p>Are you sure?</p>
+								<div>
+									<button submit class="btn btn-sm btn-primary mr-2">
+										Submit
+									</button>
+									<button cancel class="btn btn-sm btn-default border">
+										Cancel
+									</button>
+								</div>
+							</form>
+						</div>
 					</div>
 				</div>
-			</nav>
+			</div>
 			@endif
-			<main role="main" class="w-100 {{$trimLayout || $isVisitNote ? 'p-0' : ''}}">
-				@if($pro->is_enrolled_as_mcp && !$patient->mcp)
-					<div class="alert alert-info bg-white mt-3 mcp-theme-1 p-3 hide-inside-ticket-popup m-1">
-						<div class="font-size-16">
-							<i class="fa fa-exclamation-triangle text-warning-mellow"></i>
-							This patient currently does not have an MCP assigned.
-						</div>
-						<div class="mt-3 d-flex align-items-center">
-							<button class="btn btn-info" onclick="$('.in-conv-confirmed').removeClass('d-none').addClass('d-inline-flex')">I am currently seeing or talking to this patient</button>
-							<div class="in-conv-confirmed d-none align-items-center">
-								<i class="fa fa-chevron-right mx-3 text-secondary"></i>
-								<div moe class=" hide-inside-popup">
-									<a href="" start show class="btn btn-primary font-weight-bold text-white">
-										Assign myself as the MCP for this patient
-									</a>
-									<form url="/api/client/putMcp" class="mcp-theme-1">
-										<input type="hidden" name="uid" value="{{$patient->uid}}">
-										<input type="hidden" name="mcpProUid" value="{{$pro->uid}}">
-										<p>Are you sure?</p>
-										<div>
-											<button submit class="btn btn-sm btn-primary mr-2">
-												Submit
-											</button>
-											<button cancel class="btn btn-sm btn-default border">
-												Cancel
-											</button>
-										</div>
-									</form>
-								</div>
-							</div>
-						</div>
+			@if($patient->has_mcp_done_onboarding_visit !== 'YES' && $patient->is_mcp_onboarding_active === 'NO')
+			<div class="alert alert-warning mt-3 mcp-theme-1 p-3 hide-inside-ticket-popup">
+				<div class="font-weight-bold text-dark font-size-16">MCP onboarding is not active for this patient.</div>
+				<div class="text-secondary p-2 border mt-2 bg-light">
+					<div class="font-weight-bold">{{$patient->why_is_mcp_onboarding_not_active_category}}</div>
+					<div>{{$patient->why_is_mcp_onboarding_not_active_memo}}</div>
+				</div>
+			</div>
+			@endif
+			<div class="card {{$trimLayout || $isVisitNote ? 'card m-0 border-0 rounded-0' : 'my-3'}}" id="patient-header">
+				<div id="patient-header-content">
+					<div class="px-2 @if($patient->client_engagement_status_category == 'DUMMY') alert-warning @endif py-1 hide-inside-ticket-popup">
+						@include('layouts.patient-header')
 					</div>
-				@endif
-				@if($patient->has_mcp_done_onboarding_visit !== 'YES' && $patient->is_mcp_onboarding_active === 'NO')
-					<div class="alert alert-warning mt-3 mcp-theme-1 p-3 hide-inside-ticket-popup">
-						<div class="font-weight-bold text-dark font-size-16">MCP onboarding is not active for this patient.</div>
-						<div class="text-secondary p-2 border mt-2 bg-light">
-							<div class="font-weight-bold">{{$patient->why_is_mcp_onboarding_not_active_category}}</div>
-							<div>{{$patient->why_is_mcp_onboarding_not_active_memo}}</div>
+				</div>
+				@if($pro->pro_type === 'ADMIN')
+				<div class="screen-only card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue hide-inside-popup">
+					<b class="">Tags ({{count($patient->clientTags)}}):</b>
+					@foreach($patient->clientTags as $tag)
+					<div class="d-inline-flex align-items-center ml-2 py-1 px-2 rounded bg-aliceblue text-info">
+						<span class="text-sm">{{$tag->tag}}</span>
+						<div moe relative class="ml-2">
+							<a href="" start show><i class="fa fa-times text-secondary on-hover-opaque"></i></a>
+							<form url="/api/clientTag/cancel" class="mcp-theme-1 min-width-200px">
+								<input type="hidden" name="uid" value="{{$tag->uid}}">
+								<p class="text-nowrap text-dark">Cancel this tag?</p>
+								<div>
+									<button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+									<button cancel class="btn btn-sm btn-default border">Cancel</button>
+								</div>
+							</form>
 						</div>
 					</div>
-				@endif
-				<div class="card {{$trimLayout || $isVisitNote ? 'card m-0 border-0 rounded-0' : 'my-3'}}" id="patient-header">
-					<div id="patient-header-content">
-					<div class="card-header @if($patient->client_engagement_status_category == 'DUMMY') alert-warning @endif py-1 hide-inside-ticket-popup">
-						<?php
-						$thumbnail = $patient->profile_picture_base64;
-						$initials = !$thumbnail ? substr($patient->name_first, 0, 1) . substr($patient->name_last, 0, 1) : '';
-						$online = $patient->is_online ? 'online' : '';
-						$patientName = implode(', ', array_filter([$patient->name_last, $patient->name_first]));
-
-						$confirmedCell = empty($patient->cell_number) ? '-' : $patient->cell_number;
-						$hasConfirmedEmail = empty($patient->email_address) ? false:true;
-						$confirmedEmail = empty($patient->email_address) ? '-' : $patient->email_address;
-
-						$location = implode(', ', array_filter([$patient->home_address_city, $patient->home_address_state]));
-						$location = empty($location) ? '-' : $location;
-
-						$mcpName = $patient->mcp ? implode(', ', array_filter([$patient->mcp->name_last, $patient->mcp->name_first])) : null;
-						$cmName = $patient->cm ? implode(', ', array_filter([$patient->cm->name_last, $patient->cm->name_first])) : null;
-
-						$memberSince = date_diff(date_create($patient->created_at), date_create('now'))->days;
-						if ($memberSince > 30) $memberSince = date('F, Y', strtotime($patient->created_at));
-						else if ($memberSince > 1) $memberSince .= ' days ago';
-						else if ($memberSince === 1) $memberSince = 'yesterday';
-						else if ($memberSince === 0) $memberSince = 'today';
-						?>
-
-						<div class=z>
-							<div class=header>
-								@if($patient->is_duplicate)
-									<div class="alert alert-secondary border-dark mcp-theme-1 screen-only">
-										<span class="text-dark">This chart is a duplicate of&nbsp;</span>
-										<a class="font-weight-bold"
-										   href="/patients/view/{{ $patient->duplicateOf->uid }}">
-											{{ $patient->duplicateOf->displayName() }}
-										</a>
-									</div>
-								@endif
-								<div class="hbox mr-auto">
-
-									{{--<div>
-										<div @if($patient->is_microphone_available)style="color:green" @else style="color:gray"  @endif>
-											<i class="fa fa-microphone"></i>
-										</div>
-										<div @if($patient->is_camera_available)style="color:green" @else style="color:gray"  @endif>
-											<i class="fa fa-video"></i>
-										</div>
-									</div>--}}
-									<section class="align-self-start mt-2">
-										<div class="hbox">
-											<h4 class="pt-name">{{$patientName}}</h4>
-											<div class="screen-only mr-1 patient-presence-indicator thumbnail {{$online}}"
-											data-patient-uid="{{$patient->uid}}"
-											style="background-image:<?=$thumbnail?>"><?=$initials?></div>
-											<div class="d-inline-flex align-items-baseline">
-												<i class="chart mr-2">#{{$patient->chart_number}}</i>
-												<span class="on-hover-show d-inline-block on-hover-opaque">
-													<i class="fa fa-info-circle ml-1 text-primary"></i>
-													<div class="on-hover-content py-2 pl-3 text-nowrap">
-														Joined <?=$memberSince?>
-														@if($pro->pro_type === 'ADMIN')
-															<div class="mt-1">
-																Created by <b>{{$patient->creator ? $patient->creator->displayName() : '-'}}</b>
-															</div>
-															<div class="mt-1">
-																Created on <b>{{friendly_date_time($patient->created_at)}}</b>
-															</div>
-														@endif
-													</div>
-												</span>
-											</div>
-										</div>
-										<div class=separators>
-											<div>{{friendly_date($patient->dob, false,null, true)}} ({{$patient->age_in_years}}
-												y.o {{$patient->sex}})
-											</div>
-											@if($patient->getPrimaryCoverage() &&  $patient->getPrimaryCoverageStatus() === 'YES')
-												<div class="text-nowrap screen-only">
-													{{$patient->getPrimaryCoverage()->insuranceDisplayName()}}
-													<span class="on-hover-show d-inline-block on-hover-opaque">
-														<i class="fa fa-check-circle text-success"></i>
-														<div class="on-hover-content py-2 pl-3 text-nowrap">
-															Covered
-														</div>
-													</span>
-												</div>
-											@endif
-											<div class="screen-only">
-												<label>Status:</label>
-												<b>{{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}</b>
-											
-												@if($pro->pro_type == 'ADMIN')
-													<div moe class="ml-2 hide-inside-popup">
-														<a start show><i class="fa fa-edit"></i></a>
-														<form url="/api/client/updateClientEngagementAssessmentStatus" class="mcp-theme-1" target="#patient-header-content">
-															<input type="hidden" name="uid" value="{{$patient->uid}}">
-															<div class="mb-2">
-																<label class="mb-1 text-secondary text-sm">Status</label>
-																<select name="category" class="form-control form-control-sm">
-																	<option value=""> --select--</option>
-																	<option {{ $patient->client_engagement_status_category === 'ACTIVE' ? 'selected' : '' }} value="ACTIVE">Active</option>
-																	<option {{ $patient->client_engagement_status_category === 'INACTIVE' ? 'selected' : '' }} value="INACTIVE">Inactive</option>
-																	<option {{ $patient->client_engagement_status_category === 'ENTRY_ERROR' ? 'selected' : '' }} value="ENTRY_ERROR">Entry Error</option>
-																	<option {{ $patient->client_engagement_status_category === 'DUMMY' ? 'selected' : '' }} value="DUMMY">Test Chart</option>
-																	<option {{ $patient->client_engagement_status_category === 'DECEASED' ? 'selected' : '' }} value="DECEASED">Deceased</option>
-																	<option {{ $patient->client_engagement_status_category === 'DUPLICATE' ? 'selected' : '' }} value="DUPLICATE">Duplicate</option>
-																	<option {{ $patient->client_engagement_status_category === 'NO_LONGER_INTERESTED' ? 'selected' : '' }} value="NO_LONGER_INTERESTED">No Longer Interested</option>
-																	<option {{ $patient->client_engagement_status_category === 'BAD_RECORD' ? 'selected' : '' }} value="BAD_RECORD">Bad Record</option>
-																</select>
-															</div>
-															<div class="mb-2">
-																<label class="mb-1 text-secondary text-sm">Memo</label>
-																<textarea class="form-control form-control-sm" name="memo"></textarea>
-															</div>
-															<div>
-																<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-																<button cancel class="btn btn-sm btn-default border">Cancel</button>
-															</div>
-														</form>
-													</div>
-												@endif
-											</div>
-										</div>
-										<div class="screen-only">
-											<div>
-												<div>
-													@if($patient->has_mcp_done_onboarding_visit !== 'YES')
-														<span class="text-dark d-inline-flex align-items-center">
-														<span class="mr-2">
-															<i class="fa fa-exclamation-triangle"></i>
-															MCP Onboarding Visit Pending
-														</span>
-													</span>
-														<span moe class="hide-inside-popup">
-														<a start show><i class="fa fa-edit"></i></a>
-														<form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1">
-															<input type="hidden" name="uid" value="{{$patient->uid}}">
-															<div class="mb-2">
-																<select name="hasMcpDoneOnboardingVisit"
-																		class="form-control form-control-sm"
-																		onchange="toggleDisabledAsNeeded(this, 'YES', 'if-visit-done')">
-																	<option value="">-- Select Status --</option>
-																	<option value="YES" {{ $patient->has_mcp_done_onboarding_visit === 'YES' ? 'selected' : '' }}>YES</option>
-																	<option value="NO" {{ $patient->has_mcp_done_onboarding_visit === 'NO' ? 'selected' : '' }}>NO</option>
-																	<option value="UNKNOWN" {{ $patient->has_mcp_done_onboarding_visit === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
-																</select>
-															</div>
-															<div class="mb-2">
-																<input type="date"
-																	   class="if-visit-done form-control form-control-sm" disabled
-																	   name="mcpOnboardingVisitDate" value="{{ date('Y-m-d') }}"
-																	   max="{{ date('Y-m-d') }}">
-															</div>
-															<div class="mb-2">
-																<select name="mcpOnboardingVisitNoteUid" disabled
-																		class="form-control form-control-sm if-visit-done"
-																		onchange="if(this.value === '-- create --') createNewNote('{{$patient->uid}}', '{{$pro->uid}}', '{{date('Y-m-d')}}');">
-																	<option value="">-- Visit Note --</option>
-																	<?php $notes = \App\Models\Note::where('client_id', $patient->id)->get() ?>
-																	@foreach ($notes as $note)
-																		@if(!empty($note->title) && $note->client_id === $patient->id && !$note->is_cancelled)
-																			<option
-																					{{ $patient->mcp_onboarding_visit_note_id === $note->id ? 'selected' : '' }}
-																					value="{{$note->uid}}">{{$note->hcpPro->displayName()}} ({{friendly_date_time($note->effective_dateest, false)}})</option>
-																		@endif
-																	@endforeach
-																	{{--<option value="-- create --">-- Create Note --</option>--}}
-																</select>
-															</div>
-															<div class="mb-2 if-note-outside-system">
-																<textarea class="form-control form-control-sm"
-																		  name="reasonOnboardingVisitNoteOutsideSystem"
-																		  placeholder="Visit note outside the system reason"
-																		  spellcheck="false" data-gramm="false"></textarea>
-															</div>
-															<div>
-																<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-																<button cancel class="btn btn-sm btn-default border">Cancel</button>
-															</div>
-														</form>
-													</span>
-													@else
-														<span class="text-dark d-inline-flex align-items-center">
-														<span class="mr-2 text-secondary">
-															<i class="fa fa-check text-sm"></i>
-															MCP Onboarding Visit Completed
-														</span>
-													</span>
-													@endif
-												</div>
-											</div>
-
-											<div class="">
-												@if($patient->mcp && $patient->mcp->id === $pro->id || $pro->pro_type == 'ADMIN')
-													<div>
-														<label>Follow-up Freq (days):</label>
-														<span>{!! is_null($patient->mcp_usual_follow_up_frequency_in_days) ? '<span class="text-danger">Not Set</span>' : $patient->mcp_usual_follow_up_frequency_in_days !!}</span>
-														<div moe relative class="ml-2">
-															<a href="#" start show class="text-sm"><i class="fa fa-edit"></i></a>
-															<form url="/api/client/putMcpUsualFollowUpFrequencyInDays">
-																<input type="hidden" name="uid" value="{{$patient->uid}}">
-																<div class="mb-2">
-																	<label class="text-sm text-secondary mb-1 text-nowrap">Follow-up Frequency (days)</label>
-																	<input type="number" required name="mcpUsualFollowUpFrequencyInDays" class="form-control form-control-sm" value="{{@$patient->mcp_usual_follow_up_frequency_in_days}}">
-																</div>
-																<div class="d-flex align-items-center">
-																	<button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-																	<button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-																</div>
-															</form>
-														</div>
-													</div>
-												@endif
-											</div>
-
-
-                                        </div>
-										@if(!$patient->getPrimaryCoverage() || $patient->getPrimaryCoverageStatus() !== 'YES')
-											<div class="mt-2">
-												@include('app.patient.coverage-status')
-											</div>
-										@endif
-                                    </section>
-                                    <section class="hide-inside-popup screen-only vbox mt-2 pt-1 align-self-stretch ml-2 px-2 mcp-theme-1 align-items-center">
-                                        <div>
-                                            <div moe relative>
-                                                <a href="#" start show class="d-flex align-items-baseline"><i class="fa fa-comment text-sm mr-1"></i></a>
-                                                <form url="/api/clientSms/createOutgoing" class="mcp-theme-1" noreload>
-                                                    <input type="hidden" name="uid" value="{{ $patient->uid }}">
-                                                    <div class="mb-2">
-                                                        <label for="" class="text-sm text-secondary mb-1">Cell
-                                                            Number</label>
-                                                        <input type="text" class="form-control form-control-sm"
-                                                               name="cellNumber" value="{{$patient->cell_number}}">
-                                                    </div>
-                                                    <div class="mb-2">
-                                                        <label for=""
-                                                               class="text-sm text-secondary mb-1">Message</label>
-                                                        <textarea type="text" class="form-control form-control-sm"
-                                                                  name="message"></textarea>
-                                                    </div>
-                                                    <div class="d-flex align-items-center">
-                                                        <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
-                                                        <button class="btn btn-sm btn-default mr-2 border" cancel>
-                                                            Cancel
-                                                        </button>
-                                                    </div>
-                                                </form>
-                                            </div>
-                                        </div>
-                                        <div>
-                                        <span moe relative class="">
-                                            <a href="#" start show class="d-flex align-items-baseline" title="SMS check-in link to the patient"><i class="fa fa-paper-plane text-sm mr-1"></i></a>
-                                            <form url="/api/client/sendCheckInTokenViaSmsOrEmail"
-                                                  class="mcp-theme-1">
-                                                <input type="hidden" name="uid" value="{{ $patient->uid }}">
-                                                <p class="small min-width-200px mb-2">Send Check-In link to patient?</p>
-                                                <div class="mb-2">
-                                                    <label for=""
-                                                           class="text-sm text-secondary mb-1">Cell Number</label>
-                                                    <input type="text" class="form-control input-sm" name="cellNumber"
-                                                           value="{{$patient->cell_number}}">
-                                                </div>
-                                                <div class="mb-2">
-                                                    <label for=""
-                                                           class="text-sm text-secondary mb-1">Email address</label>
-                                                    <input type="text" class="form-control input-sm" name="emailAddress"
-                                                           value="{{$patient->email_address}}">
-                                                </div>
-                                                <div class="d-flex align-items-center">
-                                                    <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
-                                                    <button class="btn btn-sm btn-default mr-2 border"
-                                                            cancel>Cancel</button>
-                                                </div>
-                                            </form>
-                                        </span>
-                                        </div>
-										@if($performer->pro->pro_type == 'ADMIN')
-										<div>
-											<a href="#" start show onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i class="fa fa-eye text-sm mr-1"></i></a>
-										</div>
-										@endif
-										<div>
-											<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 mcp-theme-1">
-										<div>
-											<label>MCP:</label> {{$mcpName}}
-											@if($patient->has_mcp_done_onboarding_visit !== 'YES' && $pro->pro_type == 'ADMIN')
-												<div moe class="ml-2 hide-inside-popup">
-													<a start show><i class="fa fa-edit"></i></a>
-													<form url="/api/client/putMcp" class="mcp-theme-1">
-														<input type="hidden" name="uid" value="{{$patient->uid}}">
-														<div class="mb-2">
-															<label class="text-secondary text-sm">MCP Pro</label>
-															<select name="mcpProUid" provider-search data-pro-uid="{{ @$patient->mcp->uid }}"
-																	class="form-control form-control-sm">
-																<option value=""> --select--</option>
-																@foreach($pros as $iPro)
-																	<option
-																			value="{{$iPro->uid}}" {{ $patient->mcp && $iPro->uid === $patient->mcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
-																@endforeach
-															</select>
-														</div>
-														<div>
-															<button submit class="btn btn-sm btn-primary mr-1">
-																Submit
-															</button>
-															<button cancel class="btn btn-sm btn-default border">
-																Cancel
-															</button>
-														</div>
-													</form>
-												</div>
-												@if($patient->mcp)
-													<div moe class="ml-2 hide-inside-popup">
-														<a start show><i class="fa fa-times"></i></a>
-														<form url="/api/client/removeMcp" class="mcp-theme-1">
-															<input type="hidden" name="uid" value="{{$patient->uid}}">
-															<div class="mb-2">
-																<label class="text-secondary text-sm">Remove MCP Pro</label>
-
-															</div>
-															<div>
-																<button submit class="btn btn-sm btn-primary mr-1">Submit
-																</button>
-																<button cancel class="btn btn-sm btn-default border">
-																	Cancel
-																</button>
-															</div>
-														</form>
-													</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 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">
-																<label class="text-sm text-secondary mb-1">Category </label>
-																<select name="category" class="form-control form-control-sm">
-																	<option value="NULL">--</option>
-																	<option value="ACTIVE">ACTIVE</option>
-																	<option value="INACTIVE">INACTIVE</option>
-																	<option value="ENTRY_ERROR">ENTRY_ERROR</option>
-																	<option value="DUMMY">DUMMY</option>
-																	<option value="DECEASED">DECEASED</option>
-																	<option value="DUPLICATE">DUPLICATE</option>
-																	<option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option>
-																	<option value="BAD_RECORD">BAD_RECORD</option>
-																</select>
-															</div>
-															<div class="mb-2">
-																<label class="text-sm text-secondary mb-1">Memo</label>
-																<input type="text" name="memo" class="form-control form-control-sm">
-															</div>
-															<div class="mb-2">
-																<label class="text-sm text-secondary mb-1">Detail</label>
-																<input type="text" name="detail" class="form-control form-control-sm">
-															</div>
-															<div>
-																<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-																<button cancel class="btn btn-sm btn-default border">Cancel</button>
-															</div>
-														</form>
-													</div>
-												</div>
-											@endif
-										<div>
-											<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 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">
-															<label class="text-secondary text-sm">Care Coordinator</label>
-															<select provider-search data-pro-uid="{{ @$patient->defaultNaPro->uid }}"
-																	name="defaultNaProUid"
-																	class="form-control form-control-sm">
-																<option value=""> --select--</option>
-																@foreach($pros as $iPro)
-																	<option
-																			value="{{$iPro->uid}}" {{ $patient->pcp && $iPro->uid === $patient->pcp->uid ? 'selected' : '' }}>{{$iPro->displayName()}}</option>
-																@endforeach
-															</select>
-														</div>
-														<div>
-															<button submit class="btn btn-sm btn-primary mr-1">Submit
-															</button>
-															<button cancel class="btn btn-sm btn-default border">
-																Cancel
-															</button>
-														</div>
-													</form>
-												</div>
-												@if($patient->pcp)
-													<div moe class="ml-2 hide-inside-popup">
-														<a start show><i class="fa fa-times"></i></a>
-														<form url="/api/client/removeDefaultNaPro" class="mcp-theme-1">
-															<input type="hidden" name="uid" value="{{$patient->uid}}">
-															<div class="mb-2">
-																<label class="text-secondary text-sm">Remove Care Coordinator</label>
-
-															</div>
-															<div>
-																<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-																<button cancel class="btn btn-sm btn-default border">Cancel</button>
-															</div>
-														</form>
-													</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 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">
-															<label class="text-sm text-secondary mb-1">Category </label>
-															<select name="category" class="form-control form-control-sm">
-																<option value="NULL">--</option>
-																<option value="ACTIVE">ACTIVE</option>
-																<option value="INACTIVE">INACTIVE</option>
-																<option value="ENTRY_ERROR">ENTRY_ERROR</option>
-																<option value="DUMMY">DUMMY</option>
-																<option value="DECEASED">DECEASED</option>
-																<option value="DUPLICATE">DUPLICATE</option>
-																<option value="NO_LONGER_INTERESTED">NO_LONGER_INTERESTED</option>
-																<option value="BAD_RECORD">BAD_RECORD</option>
-															</select>
-														</div>
-														<div class="mb-2">
-															<label class="text-sm text-secondary mb-1">Memo</label>
-															<input type="text" name="memo" class="form-control form-control-sm">
-														</div>
-														<div class="mb-2">
-															<label class="text-sm text-secondary mb-1">Detail</label>
-															<input type="text" name="detail" class="form-control form-control-sm">
-														</div>
-														<div>
-															<button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-															<button cancel class="btn btn-sm btn-default border">Cancel</button>
-														</div>
-													</form>
-												</div>
-											</div>
-										@endif
-									</section>
-									<section class="screen-only vbox align-self-start mt-2 mx-2 border-left pl-2 mcp-theme-1">
-										<div>Cell. BP: <b>{{$patient->hasBPDevice()?'Yes':'No'}}</b></div>
-										@if($patient->most_recent_cellular_bp_sbp_mm_hg && $patient->most_recent_cellular_bp_dbp_mm_hg)
-											<div>Last BP:
-												<b>{{$patient->most_recent_cellular_bp_sbp_mm_hg ?: '-'}}/{{$patient->most_recent_cellular_bp_dbp_mm_hg ?: '-'}}</b>
-												@if($patient->most_recent_cellular_bp_measurement_at)
-													<span class="text-sm text-secondary text-nowrap ml-1"
-														  title="{{friendly_date_time($patient->most_recent_cellular_bp_measurement_at)}}">({{friendly_date($patient->most_recent_cellular_bp_measurement_at)}})</span>
-												@endif
-											</div>
-										@endif
-										<div>Wt. Scale: <b>{{$patient->hasWeightScaleDevice()?'Yes':'No'}}</b></div>
-										@if($patient->most_recent_cellular_weight_value)
-											<div>Last Wt.:
-												<b>{{round($patient->most_recent_cellular_weight_value, 1)}}</b>
-												@if($patient->most_recent_cellular_weight_measurement_at)
-													<span class="text-sm text-secondary text-nowrap ml-1"
-														  title="{{friendly_date_time($patient->most_recent_cellular_weight_measurement_at)}}">({{friendly_date($patient->most_recent_cellular_weight_measurement_at)}})</span>
-												@endif
-											</div>
-										@endif
-
-										<?php $currentCareMonth = $patient->currentCareMonth(); ?>
-										@if($currentCareMonth && ($pro->pro_type === 'ADMIN' || $pro->id === $currentCareMonth->mcp_pro_id))
-											<div class="text-primary c-pointer"
-												 open-in-stag-popup
-												 mc-initer="care-month-dashboard-{{$patient->uid}}"
-												 title="Care Month: {{friendly_month($currentCareMonth->start_date)}}"
-												 popup-style="overflow-visible"
-												 href="/patients/view/{{ $patient->uid }}/care-months/view/{{$currentCareMonth->uid}}">
-												<?php $spoken = $currentCareMonth->has_anyone_interacted_with_client_about_rm_outside_note; ?>
-												<span class="">RPM comm. this month:</span>
-												<b class="{{$spoken ? 'text-success' : ''}}">
-													{{$spoken ? 'Yes' : 'No'}}
-													@if(!$spoken)
-														<i class="fa fa-exclamation-triangle"></i>
-													@else
-														<i class="fa fa-check"></i>
-													@endif
-												</b>
-											</div>
-										@endif
-									</section>
-									<section class="mr-4 align-self-start mt-2 ml-auto mcp-theme-1">
-										<div class="d-flex align-items-start">
-											<div class="max-width-300px max-height-100px overflow-auto d-inline-block">
-												<label>Sticky Note:</label> <span class="text-secondary">{{$patient->sticky_note ?? '-' }}</span>
-											</div>
-											<div moe relative wide class="ml-2 hide-inside-popup">
-												<a start show><i class="fa fa-edit"></i></a>
-												<form url="/api/client/updateStickyNote" class="mcp-theme-1" right>
-													<input type="hidden" name="uid" value="{{$patient->uid}}">
-													<div class="mb-2">
-														<label class="text-secondary text-sm">Sticky Note</label>
-														<textarea name="stickyNote" class="form-control" rows="8" cols="80">{{$patient->sticky_note}}</textarea>
-													</div>
-													<div>
-														<button submit class="btn btn-sm btn-primary mr-1">Submit
-														</button>
-														<button cancel class="btn btn-sm btn-default border">
-															Cancel
-														</button>
-													</div>
-												</form>
-											</div>
-										</div>
-										@if($pro->pro_type === 'ADMIN')
-											<div class="mt-1">
-												<label>Intake Data: - </label> <span class="text-secondary"></span>
-												@include('app.patient.intake-data.patient-intake-data-form')
-											</div>
-										@endif
-									</section>
-									<ul class="vbox mt-2 align-self-start patient-header-address ">
-										<li class="d-flex align-items-start">
-											<span class="aligned-icon">
-												<i class="fa fa-map-marker-alt" aria-hidden="true"></i>
-											</span>
-											<div class="position-relative">
-												<?php
-												$addressParts = [];
-												if (!!$patient->mailing_address_line1) $addressParts[] = trim($patient->mailing_address_line1);
-												if (!!$patient->mailing_address_line2) $addressParts[] = trim($patient->mailing_address_line2);
-												$addressParts = implode(", ", $addressParts) . "<br/>";
-												$addressPart2 = [];
-												if (!!$patient->mailing_address_city) $addressPart2[] = trim($patient->mailing_address_city);
-												if (!!$patient->mailing_address_state) $addressPart2[] = trim($patient->mailing_address_state);
-												$addressParts .= implode(", ", $addressPart2);
-												echo $addressParts;
-												?>
-												{{ $patient->mailing_address_zip ? $patient->mailing_address_zip : '' }}
-												@if($patient->mailing_address_memo)
-													<span class="position-relative c-pointer text-center stag-tooltip ml-2">
-														<i class="fa fa-info-circle"></i>
-														<div
-															class="position-absolute bg-white border rounded p-2 stag-tooltip-content">
-															<div class="text-left font-weight-bold pb-1">Special Instructions</div>
-															<div
-																class="text-left font-weight-normal">{{$patient->mailing_address_memo}}</div>
-														</div>
-													</span>
-												@endif
-											</div>
-										</li>
-										@if($patient->cell_number)
-											<li>
-												<span class="aligned-icon">
-													<i class="fa fa-phone-alt" aria-hidden="true"></i>
-												</span>
-												{{$patient->cell_number}}
-												<span class="small text-secondary ml-1">
-													{{ $patient->cell_number_memo ? '(' . $patient->cell_number_memo . ')' : '' }}
-												</span>
-											</li>
-										@endif
-										@if($patient->phone_home)
-											<li>
-												<span class="aligned-icon"><i class="fa fa-home" aria-hidden="true"></i></span>
-												{{$patient->phone_home}}
-											</li>
-										@endif
-										<li class="d-flex align-items-start">
-											<div class="d-flex align-items-center flex-wrap">												
-													<span class="ml-1 mr-2"><i class="fa fa-envelope"></i> 
-														@if($hasConfirmedEmail)
-															{{$confirmedEmail}}
-														@else
-															<i>(No email address)</i>
-														@endif
-													</span>
-													<div>
-														@include('app.patient.send_email')
-													</div>
-											</div>								
-										</li>
-
-										<li class="d-flex align-items-start">
-											<div class="d-inline-flex screen-only">
-												<span class="aligned-icon text-primary">
-													<i class="fa fa-link" aria-hidden="true"></i>
-												</span>
-												<?php $numLinkedAccounts = $patient->linkedAccounts ? count($patient->linkedAccounts) : 0; ?>
-												<a href="{{route('patients.view.accounts', ['patient' => $patient])}}">
-													Accounts ({{$numLinkedAccounts}})
-												</a>
-											</div>
-										</li>
-									</ul>
-									
-								</div>
-								
+					@endforeach
+					<div moe relative class="ml-2">
+						<a href="" start show class="text-sm">+ Add</a>
+						<form url="/api/clientTag/create" class="mcp-theme-1">
+							<input type="hidden" name="clientUid" value="{{$patient->uid}}">
+							<div class="mb-2">
+								<label class="text-secondary text-sm">Tag</label>
+								<input type="text" class="form-control form-control-sm" name="tag" placeholder="Tag" required>
 							</div>
-						</div> <!-- z -->
-					</div>
-					</div>
-					@if($pro->pro_type === 'ADMIN')
-						<div class="screen-only card-header py-2 d-flex align-items-center mcp-theme-1 bg-aliceblue hide-inside-popup">
-							<b class="">Tags ({{count($patient->clientTags)}}):</b>
-							@foreach($patient->clientTags as $tag)
-								<div class="d-inline-flex align-items-center ml-2 py-1 px-2 rounded bg-aliceblue text-info">
-									<span class="text-sm">{{$tag->tag}}</span>
-									<div moe relative class="ml-2">
-										<a href="" start show><i class="fa fa-times text-secondary on-hover-opaque"></i></a>
-										<form url="/api/clientTag/cancel" class="mcp-theme-1 min-width-200px">
-											<input type="hidden" name="uid" value="{{$tag->uid}}">
-											<p class="text-nowrap text-dark">Cancel this tag?</p>
-											<div>
-												<button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-												<button cancel class="btn btn-sm btn-default border">Cancel</button>
-											</div>
-										</form>
-									</div>
-								</div>
-							@endforeach
-							<div moe relative class="ml-2">
-								<a href="" start show class="text-sm">+ Add</a>
-								<form url="/api/clientTag/create" class="mcp-theme-1">
-									<input type="hidden" name="clientUid" value="{{$patient->uid}}">
-									<div class="mb-2">
-										<label class="text-secondary text-sm">Tag</label>
-										<input type="text" class="form-control form-control-sm"
-											   name="tag"
-											   placeholder="Tag" required>
-									</div>
-									<div>
-										<button submit class="btn btn-sm btn-primary mr-2">Submit</button>
-										<button cancel class="btn btn-sm btn-default border">Cancel</button>
-									</div>
-								</form>
+							<div>
+								<button submit class="btn btn-sm btn-primary mr-2">Submit</button>
+								<button cancel class="btn btn-sm btn-default border">Cancel</button>
 							</div>
-						</div>
-					@endif
-					{{--<div class="text-container border-bottom d-flex align-items-center mcp-theme-1 px-3">
+						</form>
+					</div>
+				</div>
+				@endif
+				{{--<div class="text-container border-bottom d-flex align-items-center mcp-theme-1 px-3">
 
 						@if($patient->mcp_pro_id !== $pro->id && $patient->active_mcp_request_id)
 							<div moe relative class="ml-2">
 								<a href="" start show class="btn btn-sm btn-success text-white font-weight-bold small">Claim as MCP</a>
 								<form url="/api/mcpRequest/claim" class="mcp-theme-1" right>
 									<input type="hidden" name="clientUid" value="{{$patient->uid}}">
-									<p>Claim this patient?</p>
-									<div>
-										<button submit class="btn btn-sm btn-primary mr-2">Yes</button>
-										<button cancel class="btn btn-sm btn-default border">Cancel</button>
-									</div>
-								</form>
-							</div>
-						@endif
-					</div>--}}
-					<div class="card-body {{$routeName === 'patients.view.notes.view.dashboard' ? 'p-0' : ''}}">
-						{{--<h1 class="h3">@yield('section-title')</h1>--}}
-						<div class="mcp-theme-1">
-							@yield('inner-content')
-						</div>
-					</div>
+				<p>Claim this patient?</p>
+				<div>
+					<button submit class="btn btn-sm btn-primary mr-2">Yes</button>
+					<button cancel class="btn btn-sm btn-default border">Cancel</button>
 				</div>
-			</main>
+				</form>
+			</div>
+			@endif
+	</div>--}}
+	<div class="card-body {{$routeName === 'patients.view.notes.view.dashboard' ? 'p-0' : ''}}">
+		{{--<h1 class="h3">@yield('section-title')</h1>--}}
+		<div class="mcp-theme-1">
+			@yield('inner-content')
 		</div>
 	</div>
-	<script>
-		(function() {
-			function init() {
-				$('.note-method-select').change(function() {
-					let form = $(this).closest('form');
-					if(this.value === 'IN_CLINIC') {
-						form.find('.if-in-clinic').show();
-					}
-					else {
-						form.find('.if-in-clinic').hide();
-					}
-				});
+</div>
+</main>
+</div>
+</div>
+<script>
+	(function() {
+		function init() {
+			$('.note-method-select').change(function() {
+				let form = $(this).closest('form');
+				if (this.value === 'IN_CLINIC') {
+					form.find('.if-in-clinic').show();
+				} else {
+					form.find('.if-in-clinic').hide();
+				}
+			});
 
-				$('.note-method-select').each(function() {
-					let form = $(this).closest('form');
-					if(this.value === 'IN_CLINIC') {
-						form.find('.if-in-clinic').show();
-					}
-					else {
-						form.find('.if-in-clinic').hide();
-					}
-				});
-			}
-			addMCInitializer('patient-add-note-popup', init, '#patient-header')
-		}).call(window);
-	</script>
-	<script>
-		(function() {
-			function init() {
-				let sbMenu = $('#sidebarMenu');
-				sbMenu
-					.off('scroll')
-					.on('scroll', function() {
-						localStorage.sidebarMenuScrollTop = $(this).scrollTop();
-					});
-				if(localStorage.sidebarMenuScrollTop) {
-					sbMenu.scrollTop(+localStorage.sidebarMenuScrollTop);
-					let sbMenuPos = sbMenu.offset(),
-						activeItem = sbMenu.find('.nav-item>.nav-link.active').first(),
-						activeItemPos = activeItem.offset();
-					if(activeItem.length) {
-						if(activeItemPos.top < sbMenuPos.top || (activeItemPos.top + activeItem.outerHeight(true)) > (sbMenuPos.top + sbMenu.outerHeight(true))) {
-							activeItem[0].scrollIntoView({behavior : "auto", block: "nearest"});
-						}
-					}
+			$('.note-method-select').each(function() {
+				let form = $(this).closest('form');
+				if (this.value === 'IN_CLINIC') {
+					form.find('.if-in-clinic').show();
+				} else {
+					form.find('.if-in-clinic').hide();
 				}
+			});
+		}
+		addMCInitializer('patient-add-note-popup', init, '#patient-header')
+	}).call(window);
+</script>
+<script>
+	(function() {
+		function init() {
+			$('#sidebarMenu')
+				.off('scroll')
+				.on('scroll', function() {
+					localStorage.sidebarMenuScrollTop = $(this).scrollTop();
+				});
+			if (localStorage.sidebarMenuScrollTop) {
+				$('#sidebarMenu').scrollTop(+localStorage.sidebarMenuScrollTop);
 			}
-			addMCInitializer('sidebarMenu', init, '#sidebarMenu')
-		}).call(window);
-	</script>
+		}
+		addMCInitializer('sidebarMenu', init, '#sidebarMenu')
+	}).call(window);
+</script>
 @endsection

+ 1 - 0
resources/views/layouts/template.blade.php

@@ -169,6 +169,7 @@
                             <a class="dropdown-item" href="{{ route('practice-management.client-ccm-rm-status') }}">Client RM Status</a>
                             <a class="dropdown-item" href="{{ route('practice-management.rmActionReport') }}">RM Action Report</a>
                             <a class="dropdown-item" href="{{ route('practice-management.hcp-note-activity') }}">HCP Note Activity</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.allNotes') }}">All Notes</a>
                             
                             @if($pro->id == '1' || $pro->id == '16')
                                 <a class="dropdown-item" href="{{ route('practice-management.treatmentServiceUtil') }}">Treatment Service Util.</a>

+ 1 - 0
routes/web.php

@@ -244,6 +244,7 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('w9', 'PracticeManagementController@w9')->name('w9');
         Route::get('contract', 'PracticeManagementController@contract')->name('contract');
         Route::get('notes/{filter?}', 'PracticeManagementController@notes')->name('notes');
+        Route::get('all-notes', 'PracticeManagementController@allNotes')->name('allNotes');
         Route::get('dna-notes-pending-mcp-sign', 'PracticeManagementController@dnaNotesPendingMcpSign')->name('dna-notes-pending-mcp-sign');
         Route::get('na-billable-signed-notes/{filter?}', 'PracticeManagementController@naBillableSignedNotes')->name('na-billable-signed-notes');
         Route::get('bills/{filter?}', 'PracticeManagementController@bills')->name('bills');