Jelajahi Sumber

Merge branch 'dev' into dev-vj

Vijayakrishnan 3 tahun lalu
induk
melakukan
d361936e07

+ 6 - 0
app/Helpers/helpers.php

@@ -909,4 +909,10 @@ if(!function_exists('format_phone_number')) {
         if(empty($number)) return $default;   
         return preg_replace('~.*(\d{3})[^\d]{0,7}(\d{3})[^\d]{0,7}(\d{4}).*~', '($1) $2-$3', $number). "\n";
     }
+}
+
+if(!function_exists('format_number')) {
+    function format_number($number, $places = 2) {     
+        return number_format((float)$number, $places, '.', '');
+    }
 }

+ 9 - 0
app/Models/ClientPrimaryCoverage.php

@@ -48,6 +48,15 @@ class ClientPrimaryCoverage extends Model
         return null;
 
     }
+    public function insuranceDisplayPayerName(){
+        if($this->plan_type === 'MEDICAID'){
+            if($this->mcdPayer) return $this->mcdPayer->name;
+        } 
+        if($this->plan_type === 'COMMERCIAL'){
+            if($this->payer) return $this->payer->name;
+        } 
+        return $this->insuranceDisplayName();
+    }
 
     public function toString() {
         $parts = [];

+ 2 - 2
public/css/style.css

@@ -3333,7 +3333,7 @@ body.forced-masking #mask {
     box-shadow: none;
 }
 .inline-input-underlined.width-50 {
-    width: 50px;
+    width: 32px;
 }
 .note_template_omega_soap_visit .system_segment .d-flex.border-bottom:last-of-type {
     border-bottom: 0 !important;
@@ -3559,4 +3559,4 @@ table.v-top th {
 .note_template_psych_intake_visit .edit-container [visit-moe]>form>div:last-child>.d-inline-flex,
 .note_template_psych_followup_visit .edit-container [visit-moe]>form>div:last-child>.d-inline-flex {
     display: flex !important;
-}
+}

+ 7 - 0
resources/views/app/admin/patients-table-extended.blade.php

@@ -73,6 +73,13 @@
                 <td>{{$patient->mailing_address_state}}</td>
                 <td>
                     @include('app.patient.coverage_column_renderer', ['patient'=>$patient])
+                    @if($performer->pro->pro_type == 'ADMIN')
+                        @if(@$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining)
+                        <small class="d-block text-sm text-muted ml-3">
+                            Deductible: <span class="font-weight-bold">{{ format_number(@$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining)}}</span>
+                        </small>
+                        @endif
+                    @endif 
                 </td>
                 <td>
                     {{ friendly_date($patient->most_recent_completed_mcp_note_date) }}

+ 1 - 1
resources/views/app/admin/patients_missing_default_settings.blade.php

@@ -7,7 +7,7 @@
 		<div class="card-header px-3 py-2 d-flex align-items-center">
 			<strong class="mr-4">
 				<i class="fas fa-users"></i>
-				PatientsMissing Default Settings
+				Patients Missing Default Settings
 			</strong>
 		</div>
 		<div class="p-3">

+ 3025 - 0
resources/views/app/patient/note/dashboard-old.blade.php

@@ -0,0 +1,3025 @@
+<?php
+/** @var App\Models\Note $note */
+
+use App\Models\Handout;
+
+/** @var App\Models\Pro $pro */
+/** @var App\Models\Section $section */
+/** @var $allSections */
+?>
+@extends ('layouts.patient')
+
+@section('inner-content')
+
+    <?php
+    $hasBills = false;
+    if ($note->bills->count()) {
+        foreach ($note->bills as $bill) {
+            if (!$bill->is_cancelled) {
+                $hasBills = true;
+                break;
+            }
+        }
+    }
+
+    // is based on visit template
+    $isVisitTemplateBased = !!$note->visitTemplate;
+
+    $uiConfigsPath = $isVisitTemplateBased ? storage_path("visit-template-ui-configs/{$note->visitTemplate->internal_name}.json") : null;
+    $doesVisitTemplateUiConfigExist = $uiConfigsPath && file_exists($uiConfigsPath);
+    $visitTemplateUiConfig = $doesVisitTemplateUiConfigExist ? json_decode(file_get_contents($uiConfigsPath), true) : null;
+
+    $visitLayoutPath = '';
+    $doesVisitTemplateLayoutExist = false;
+
+    if($isVisitTemplateBased) {
+        $visitLayoutPath = "app.patient.note.visit-template-ui-layouts.{$note->visitTemplate->internal_name}";
+        $doesVisitTemplateLayoutExist = $isVisitTemplateBased && \Illuminate\Support\Facades\View::exists($visitLayoutPath);
+    }
+
+    $segmentMap = [];
+    foreach($note->segments as $segment):
+        $segmentMap[$segment->segmentTemplate->internal_name] = $segment;
+    endforeach;
+
+    $hasRightSegments = $isVisitTemplateBased && !!count($note->segmentsRight);
+
+    ?>
+    <div id="note-single-header" class="pb-3 d-flex align-items-start screen-only zero-height note_template_{{$note->visitTemplate ? $note->visitTemplate->internal_name : ''}}">
+        <h6 class="my-0 text-secondary d-flex align-items-center w-100">
+            <a href="/patients/view/{{ $patient->uid }}/notes" class="small text-decoration-none mr-3">
+                <i class="fa fa-chevron-left"></i>
+            </a>
+            <div class="mr-auto d-inline-flex align-items-center">
+                <span class="text-dark font-weight-bold">Note
+                    <span class="text-secondary font-weight-normal">{{ $note->is_cancelled ? '(CANCELLED)' : '' }}</span>
+                </span>
+                @if($pro->pro_type === 'ADMIN')
+                    @if(!!$note->visitTemplate)
+                        <a native target="_blank"
+                           href="{{route('note-pdf', ['note' => $note])}}"
+                           class="ml-3 btn btn-sm btn-primary text-white font-weight-bold"><i class="fa fa-print"></i> Print</a>
+                    @else
+                        <a href="#" class="print-note ml-3 btn btn-sm btn-primary text-white font-weight-bold invisible"><i class="fa fa-print"></i> Print</a>
+                    @endif
+                    <?php
+                    $isBad = false;
+                    $isGood = false;
+		            if($note->detail_json) {
+                        $parsed = json_decode($note->detail_json);
+                        $isBad = $parsed && @$parsed->isBad;
+			            $isGood = $parsed && @$parsed->isGood;
+                    }
+                    ?>
+                    @if(!$isBad)
+                        <div moe relative>
+                            <a href="#" start show  class="print-note ml-2 btn btn-sm btn-danger text-white font-weight-bold invisible"><i class="fa fa-exclamation-triangle"></i> Mark as Bad Note</a>
+                            <form url="/api/note/markNoteAsBad" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <p class="min-width-200px">Mark this note as <b>bad</b>?</p>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Yes</button>
+                                    <button cancel class="btn btn-sm btn-default border">No</button>
+                                </div>
+                            </form>
+                        </div>
+                    @else
+                        <div moe relative>
+                            <a href="#" start show class="print-note ml-2 btn btn-sm btn-info text-white font-weight-bold invisible"><i class="fa fa-undo"></i> Marked as bad! Click to undo.</a>
+                            <form url="/api/note/undoMarkNoteAsBad" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <p class="min-width-200px">Mark this note as <b>not bad</b>?</p>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Yes</button>
+                                    <button cancel class="btn btn-sm btn-default border">No</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+		            @if(!$isGood)
+                        <div moe relative>
+                            <a href="#" start show  class="print-note ml-2 btn btn-sm btn-success text-white font-weight-bold invisible"><i class="fa fa-check"></i> Mark as Good Note</a>
+                            <form url="/api/note/markNoteAsGood" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <p class="min-width-200px">Mark this note as <b>good</b>?</p>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Yes</button>
+                                    <button cancel class="btn btn-sm btn-default border">No</button>
+                                </div>
+                            </form>
+                        </div>
+                    @else
+                        <div moe relative>
+                            <a href="#" start show class="print-note ml-2 btn btn-sm btn-info text-white font-weight-bold invisible"><i class="fa fa-undo"></i> Marked as good! Click to undo.</a>
+                            <form url="/api/note/undoMarkNoteAsGood" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <p class="min-width-200px">Mark this note as <b>not good</b>?</p>
+                                <div>
+                                    <button submit class="btn btn-sm btn-primary mr-1">Yes</button>
+                                    <button cancel class="btn btn-sm btn-default border">No</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                @endif
+            </div>
+            @if($patient->has_mcp_done_onboarding_visit !== 'YES')
+                <div class="ml-auto">
+                    <div moe relative>
+                        <a start show class="font-weight-bold">Mark as Onboarding Visit Note</a>
+                        <form url="/api/client/updateMcpOnboardingVisitInfo" class="mcp-theme-1" right>
+                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                            <input type="hidden" name="mcpOnboardingVisitNoteUid" value="{{$note->uid}}">
+                            <input type="hidden" name="hasMcpDoneOnboardingVisit" value="YES">
+                            <input type="hidden" name="mcpOnboardingVisitDate" value="{{$note->effective_dateest}}">
+                            <p class="min-width-200px">Mark this patient's onboarding as completed using this note?</p>
+                            <div>
+                                <button submit class="btn btn-sm btn-primary mr-1">Yes</button>
+                                <button cancel class="btn btn-sm btn-default border">No</button>
+                            </div>
+                        </form>
+                    </div>
+                </div>
+            @endif
+        </h6>
+    </div>
+
+    <div class="card mb-0 {{ $note->is_cancelled ? 'cancelled-item' : '' }} border-0 rounded-0">
+        <div class="card-header d-flex align-items-start px-3 py-2 border-bottom rounded-0" id="note-card-header">
+            <div class="pr-2">
+                {{$note->title}}
+                @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
+                    <div moe class="ml-1">
+                        <a href="" show start><i class="fa fa-edit"></i></a>
+                        <form url="/api/note/putTitle">
+                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                            <div class="mb-2">
+                                <input type="text" name="title" value="{{$note->title}}" class="form-control form-control-sm"
+                                       placeholder="Title">
+                            </div>
+                            <div class="form-group mb-0">
+                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+                    @if($note->visitTemplate && $note->visitTemplate->internal_name == 'omega_soap_visit' &&  $note->new_or_fu_or_na !== 'NEW')
+                        <div moe relative class="d-inline border-left pl-2 ml-2">
+                            <a start show>Clone</a>
+                            <form url="/api/visit/clone" class="mcp-theme-1" left
+                                  redir="/patients/view/{{$patient->uid}}/notes/view/[data]">
+                                <input type="hidden" name="visitToCloneUid" value="{{$note->uid}}">
+                                <div class="mb-2">
+                                    <label for="" class="text-sm text-secondary mb-1">Effective Date</label>
+                                    <input type="date" name="effectiveDate" class="form-control input-sm" value="{{get_current_date($pro->display_timezone)}}">
+                                </div>
+                                <div class="mb-2">
+                                    <label for="" class="text-secondary text-sm mb-1">New/Follow-up</label>
+                                    <div class="d-flex align-items-baseline py-1">
+                                        <label class="mr-3 my-0 d-inline-flex align-items-center c-pointer">
+                                            <input type="radio" name="newOrFuOrNa" value="NEW" required>
+                                            <span class="ml-1 text-dark">New</span>
+                                        </label>
+                                        <label class="my-0 d-inline-flex align-items-center c-pointer">
+                                            <input type="radio" name="newOrFuOrNa" value="FU" required checked>
+                                            <span class="ml-1 text-dark">Follow-Up</span>
+                                        </label>
+                                    </div>
+                                </div>
+
+                                <div class="mb-2">
+                                    <label for="" class="text-sm text-secondary mb-1">Method</label>
+                                    <select name="noteContactMethod" id="" class="form-control input-sm">
+                                        <option value="">--select--</option>
+                                        <option value="VIDEO">Video</option>
+                                        <option value="AUDIO">Audio</option>
+                                        <option value="IN_CLINIC">In Clinic</option>
+                                        <option value="HOUSE_CALL">House Call</option>
+                                    </select>
+                                </div>
+                                <div class="m-0">
+                                    <button submit class="btn btn-primary btn-sm">submit</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                @endif
+            </div>
+            <div class="px-2 border-left border-right">
+                <div class="d-flex">
+                    <span class="mr-2">{{friendly_date_time($note->effective_dateest, false, '')}}</span>
+                    @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
+                    <span moe class="ml-auto">
+                        <a href="" show start><i class="fa fa-calendar"></i></a>
+                        <form url="/api/note/putEffectiveDateEST">
+                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                            <div class="mb-2">
+                                <label for="" class="text-secondary text-sm">Effective date EST</label>
+                                <input type="date" name="effectiveDateEST" value="{{$note->effective_dateest}}" class="form-control form-control-sm">
+                            </div>
+                            <div class="mb-0">
+                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                            </div>
+                        </form>
+                    </span>
+                    @endif
+                </div>
+            </div>
+
+            {{--<div class="px-2 border-left border-right">
+                <div class="d-flex">
+                    <span class="mr-2">{{friendly_time($note->effective_time, '')}}</span>
+                    @if(!$note->is_signed_by_hcp)
+                        <span moe class="ml-auto">
+                            <a href="" show start><i class="fa fa-clock"></i></a>
+                            <form url="/api/note/putEffectiveTime">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <div class="mb-2">
+                                    <label for="" class="text-secondary text-sm">Effective time </label>
+                                    <input type="time" name="effectiveTime" value="{{ date("H:i", strtotime($note->effective_time)) }}" class="form-control form-control-sm">
+                                </div>
+                                <div class="mb-0">
+                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </span>
+                    @endif
+                </div>
+            </div>--}}
+
+            <div class="px-2 border-right">
+                <div class="d-flex">
+                    <span><span class="text-secondary">HCP:</span> {{$note->hcpPro->displayName()}}</span>
+                    @if($pro->pro_type === 'ADMIN')
+                    <div moe class="ml-2">
+                        <a href="" show start><i class="fa fa-edit"></i></a>
+                        <form url="/api/note/putHcp">
+                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                            <div class="mb-2">
+                                <select provider-search data-pro-uid="{{ @$note->hcpPro->uid }}"
+                                        name="hcpProUid" class="form-control form-control-sm">
+                                    <option value="">-- Select HCP Pro --</option>
+                                </select>
+                            </div>
+                            <div class="mb-0">
+                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+                    @endif
+                </div>
+            </div>
+
+
+            @if($performer->pro->pro_type == 'ADMIN' || ($note->allyPro && $note->allyPro->uid === $performer->pro->uid))
+                <span class="px-2 border-right d-flex">
+                    @if($note->allyPro)
+                        <span class="mr-2"><span class="text-secondary">NA:</span>  {{$note->allyPro->name_first}} {{$note->allyPro->name_last}}</span>
+                        @if($performer->pro->pro_type == 'ADMIN')
+                            <span class="d-inline-block" moe>
+                                <a class="text-danger" href="" show start>
+                                    <i class="fa fa-edit"></i>
+                                </a>
+                                <form url="/api/note/putNa">
+                                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                                    <div class="mb-2">
+                                        <select provider-search data-pro-uid="{{ @$note->allyPro->uid }}"
+                                                name="naProUid" class="form-control form-control-sm">
+                                            <option value="">-- Select Ally Pro --</option>
+                                        </select>
+                                    </div>
+                                    <div class="mb-2">
+                                        <textarea class="form-control" name="memo" placeholder="memo"></textarea>
+                                    </div>
+                                    <div class="mb-0">
+                                        <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </span>
+                            <span class="inline-block ml-2"></span>
+                            <span class="d-inline-block" moe>
+                                <a class="text-danger" href="" show start>
+                                    <i class="fa fa-times"></i>
+                                </a>
+                                <form url="/api/note/removeNa">
+                                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                                    <p>Remove NA ssss?</p>
+                                    <div class="mb-0">
+                                        <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </span>
+                        @endif
+                    @else
+                        <span class="mr-2"><span class="text-secondary">NA:</span> - </span>
+                        <span class="d-block" moe>
+                            <a class="" href="" show start>
+                                <i class="fa fa-edit"></i>
+                            </a>
+                            <form url="/api/note/putNa">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <div class="form-group">
+                                    <label for="" class="control-label">NA</label>
+                                    <select name="naProUid" class="form-control" provider-search>
+                                        <option value="">--select--</option>
+                                    </select>
+                                </div>
+                                <div class="mb-0">
+                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </span>
+                    @endif
+
+                </span>
+            @endif
+
+
+            <div class="px-2 border-right">
+                <div class="d-flex">
+                    <span class="mr-2"><span class="text-secondary">Type:</span> {{$note->new_or_fu_or_na ? ($note->new_or_fu_or_na === 'NEW' ? 'New Patient' : $note->new_or_fu_or_na) : '-'}}</span>
+                    @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
+                        <div moe class="ml-auto">
+                            <a href="" show start><i class="fa fa-edit"></i></a>
+                            <form url="/api/note/updateNewOrFuOrNa">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <div class="mb-2">
+                                    <select name="newOrFuOrNa" class="form-control form-control-sm" required>
+                                        <option value="">-- select --</option>
+                                        <option value="NEW" {{ $note->new_or_fu_or_na === "NEW" ? "selected" : "" }}>New</option>
+                                        <option value="FU" {{ $note->new_or_fu_or_na === "FU" ? "selected" : "" }}>Follow-up</option>
+                                        <option value="NA" {{ $note->new_or_fu_or_na === "NA" ? "selected" : "" }}>N/A</option>
+                                    </select>
+                                </div>
+                                <div class="mb-0">
+                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                </div>
+            </div>
+
+            <div class="px-2">
+                <div class="d-flex">
+                    <span class="mr-2"><span class="text-secondary">Method:</span> {{$note->method ? noteMethodDisplay($note->method) : '-'}}</span>
+                    @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
+                        <div moe class="ml-auto">
+                            <a href="" show start><i class="fa fa-edit"></i></a>
+                            <form url="/api/note/updateMethod" hook="onNoteMethodUpdate">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <div class="mb-2">
+                                    <select name="method" class="form-control form-control-sm note-method-select" required>
+                                        <option value="AUDIO" {{ $note->method === "AUDIO" ? "selected" : "" }}>Audio</option>
+                                        <option value="VIDEO" {{ $note->method === "VIDEO" ? "selected" : "" }}>Video</option>
+                                        <option value="IN_CLINIC" {{ $note->method === "IN_CLINIC" ? "selected" : "" }}>In-Clinic</option>
+                                        <option value="HOUSE_CALL" {{ $note->method === "HOUSE_CALL" ? "selected" : "" }}>House Call</option>
+                                    </select>
+                                </div>
+                                <div class="form-group if-in-clinic">
+                                    <label for="" class="text-secondary text-sm mb-1">Location</label>
+                                    <select name="hcpCompanyLocationUid" class="form-control">
+                                        <option value=""></option>
+                                        @foreach($pro->companyLocations() as $location)
+                                            <option value="{{$location->uid}}" {{$location->id === $note->hcp_company_location_id ? 'selected' : ''}}>{{$location->line1}} {{$location->city}}</option>
+                                        @endforeach
+                                    </select>
+                                </div>
+                                <div class="mb-0">
+                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                </div>
+            </div>
+
+            <div class="px-2 border-left screen-only">
+                <a href="{{route('print-note', ['patient' => $patient, 'note' => $note])}}" native target="_blank" class=""><i class="fa fa-print"></i> Print</a>
+            </div>
+
+            @if($pro->pro_type === 'ADMIN' || $pro->is_enrolled_as_mcp)
+            <div class="px-2 border-left screen-only">
+                <a native target="_blank"
+                   open-in-stag-popup
+                   mc-initer="patient-calendar-{{$patient->id}}"
+                   title="Calendar: {{$patient->displayName()}}"
+                   popup-style="medium-large"
+                   href="{{route('patients.view.calendar', ['patient' => $patient])}}?opUid={{$note->hcpPro ? $note->hcpPro->uid : ''}}">
+                    <i class="fa fa-clock"></i>
+                    Book Appt.
+                </a>
+            </div>
+            @endif
+
+            {{-- additional modules --}}
+            @if(!$note->is_signed_by_hcp)
+            <?php
+            $availableModules = [
+                [
+                    "name" => 'Nutrition Rx',
+                    "title" => '<img src=\'/img/nutrition-rx.png\'/> Nutrition Rx',
+                    "href" => "/nutrition-center/{$note->client->uid}/{$note->uid}",
+                    "initer" => "nutrition-center-{$note->id}"
+                ],
+                [
+                    "name" => 'Exercise Rx',
+                    "title" => '<img src=\'/img/exercise-rx.png\'/> Exercise Rx',
+                    "href" => "/exercise-center/{$note->client->uid}/{$note->uid}",
+                    "initer" => "exercise-center-{$note->id}"
+                ],
+                [
+                    "name" => 'Behavior Rx',
+                    "title" => '<img src=\'/img/behavior-rx.png\'/> Behavior Rx',
+                    "href" => "/behavior-center/{$note->client->uid}/{$note->uid}",
+                    "initer" => "behavior-center-{$note->id}"
+                ],
+                [], // for separator
+                [
+                    "name" => 'COVID-19 Intake',
+                    "title" => 'COVID-19 Intake',
+                    "href" => "/note-segment-view-by-name/{$note->uid}/covid_intake/edit",
+                    "initer" => "edit-module-covid-intake-{$note->id}"
+                ],
+                [
+                    "name" => 'COVID-19 Follow-up',
+                    "title" => 'COVID-19 Follow-up',
+                    "href" => "/note-segment-view-by-name/{$note->uid}/covid_follow-up/edit",
+                    "initer" => "covid-follow-up-{$note->id}"
+                ],
+                [], // for separator
+                [
+                    "name" => 'Lifestyle General',
+                    "title" => 'Lifestyle General',
+                    "style" => 'stag-popup-md',
+                    "href" => "/module-view/{$note->uid}/lifestyle_general/edit",
+                    "initer" => "edit-univ_sub_lifestyle_general-container-{$note->id}"
+                ],
+                [
+                    "name" => 'Lifestyle Nutrition',
+                    "title" => 'Lifestyle Nutrition',
+                    "style" => 'stag-popup-md',
+                    "href" => "/module-view/{$note->uid}/lifestyle_nutrition/edit",
+                    "initer" => "edit-univ_sub_nutrition_assessment-container-{$note->id}"
+                ],
+                [
+                    "name" => 'Lifestyle Physical Activity',
+                    "title" => 'Lifestyle Physical Activity',
+                    "style" => 'stag-popup-md',
+                    "href" => "/module-view/{$note->uid}/lifestyle_physical_activity/edit",
+                    "initer" => "edit-univ_sub_physical_activity_assessment-container-{$note->id}"
+                ],
+                [
+                    "name" => 'Lifestyle Sleep',
+                    "title" => 'Lifestyle Sleep',
+                    "style" => 'stag-popup-md',
+                    "href" => "/module-view/{$note->uid}/lifestyle_sleep/edit",
+                    "initer" => "edit-univ_sub_sleep_assessment-container-{$note->id}"
+                ],
+                [
+                    "name" => 'Lifestyle Social',
+                    "title" => 'Lifestyle Social',
+                    "style" => 'stag-popup-md',
+                    "href" => "/module-view/{$note->uid}/lifestyle_social/edit",
+                    "initer" => "edit-univ_sub_social_relationships_assessment-container-{$note->id}"
+                ],
+                [
+                    "name" => 'Lifestyle Stress',
+                    "title" => 'Lifestyle Stress',
+                    "style" => 'stag-popup-md',
+                    "href" => "/module-view/{$note->uid}/lifestyle_stress/edit",
+                    "initer" => "edit-univ_sub_stress_assessment-container-{$note->id}"
+                ],
+                [
+                    "name" => 'Lifestyle Substances',
+                    "title" => 'Lifestyle Substances',
+                    "style" => 'stag-popup-md',
+                    "href" => "/module-view/{$note->uid}/lifestyle_substances/edit",
+                    "initer" => "edit-univ_sub_substance_use_assessment-container-{$note->id}"
+                ],
+                [
+                    "name" => 'Weight Loss Intake',
+                    "title" => 'Weight Loss Intake',
+                    "style" => 'stag-popup-md',
+                    "href" => "/module-view/{$note->uid}/weight_loss_intake/edit",
+                    "initer" => "edit-weight_loss_intake-container-{$note->id}"
+                ],
+            ];
+            ?>
+            <div moe relative class="px-2 border-left screen-only">
+                <a href="#" start show>+ Form</a>
+                <form url="#" right>
+                    <p class="font-weight-bold text-secondary">Additional Forms</p>
+                    @foreach($availableModules as $module)
+                        @if(@$module['name'])
+                            <a href="{{$module['href']}}"
+                               open-in-stag-popup
+                               popup-style="overflow-visible {{@$module['style']}}"
+                               title="{!! $module['title'] !!}"
+                               mc-initer="{{ @$module['initer']  }}"
+                               class="d-block mb-1 text-nowrap">{!! $module['name'] !!}</a>
+                        @else
+                            <hr class="my-2">
+                        @endif
+                    @endforeach
+                </form>
+            </div>
+            @endif
+
+
+            @if($note->is_signed_by_hcp)
+                @php
+                    $suggestionMode = request()->get('suggestion_mode');
+                @endphp
+                @if($suggestionMode == 'on')
+                    <a class="ml-3 native font-weight-normal refresh-segment c-pointer screen-only"
+                        href="/patients/view/{{$note->client->uid}}/notes/view/{{$note->uid}}?suggestion_mode=off"
+                        title="Update with latest patient data">
+                        Suggestion Mode
+                    </a>
+                @else
+                    <a class="ml-3 native font-weight-normal refresh-segment c-pointer screen-only"
+                        href="/patients/view/{{$note->client->uid}}/notes/view/{{$note->uid}}?suggestion_mode=on"
+                        title="Update with latest patient data">
+                        Suggestion Mode
+                    </a>
+                @endif
+            @endif
+
+            <div class="ml-auto d-flex align-items-start">
+                <div class="">
+                    <div>
+
+                        @if($note->is_signed_by_hcp )
+                            <div class="d-flex align-items-baseline">
+                                <div class="text-secondary">
+                                    <i class="fa fa-check"></i>
+                                    Note Signed
+                                </div>
+                                @if($pro->pro_type === 'ADMIN')
+                                    <div class="ml-3">
+                                        <div moe>
+                                            <a class="" href="" show start>Undo Sign As HCP</a>
+                                            <form url="/api/note/adminUndoSignAsHcp" right>
+                                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                                <p>Undo HCP signature?</p>
+                                                <div class="mb-0">
+                                                    <button class="btn btn-primary btn-sm" submit>Undo</button>
+                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                @endif
+                                @if($pro->pro_type === 'ADMIN' || ($note->hcpPro && $pro->id === $note->hcpPro->id))
+                                    <div class="ml-3 screen-only">
+                                        @include('app/patient/note/_create-bill-only')
+                                    </div>
+                                @endif
+                            </div>
+                        @endif
+                        @if(!$note->is_signed_by_hcp )
+                            @if($note->hcp_pro_id !== $pro->id)
+                                <span class="text-sm text-secondary screen-only">Only the note's HCP can sign</span>
+                            @else
+                                @if(!$isVisitTemplateBased)
+                                    <div moe relative
+                                         class="{{ $note->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }} screen-only"
+                                         title="{{ $note->hcp_pro_id !== $pro->id ? 'Only the note\'s HCP can sign' : '' }}">
+                                        <a class="" href="" show start>Sign As HCP</a>
+                                        <form url="/api/note/signAsHcp" right>
+                                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                                            <p>Sign this note as HCP?</p>
+                                            <div class="mb-0">
+                                                <button class="btn btn-success btn-sm" submit>Sign</button>
+                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                @else
+                                    <a native target="_blank"
+                                       open-in-stag-popup
+                                       update-parent
+                                       mc-initer="note-sign-confirmation-{{$note->id}}"
+                                       popup-style="stag-popup-md"
+                                       title="Confirm and Sign"
+                                       class="screen-only"
+                                       href="{{route('patients.view.notes.view.sign-confirmation', compact('patient', 'note'))}}">
+                                        Sign Note As HCP
+                                    </a>
+                                @endif
+                            @endif
+                        @endif
+                    </div>
+                </div>
+                @if($note->allyPro && $pro->id === $note->allyPro->id)
+                <div class="ml-3">
+                    <div>
+                        @if($note->is_signed_by_ally)
+                            <span class="text-secondary">
+                                <i class="fa fa-check"></i>
+                                Note Signed By NA
+                                @if(!$note->is_signed_by_hcp)
+                                <span moe class="ml-2">
+                                    <a class="" href="" show start>Undo sign?</a>
+                                    <form url="/api/note/undoSignAsAlly" right>
+                                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                                        <p>Undo sign?</p>
+                                        <div class="mb-0">
+                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </span>
+                                @endif
+                            </span>
+                        @else
+                            <div moe
+                                 class="{{ $note->ally_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                 title="{{ $note->ally_pro_id !== $pro->id ? 'Only the note\'s Ally can sign' : '' }}">
+                                <a class="" href="" show start>Sign As NA</a>
+                                <form url="/api/note/signAsAlly" right>
+                                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                                    <p>Sign this NA?</p>
+                                    <div class="mb-0">
+                                        <button class="btn btn-success btn-sm" submit>Sign</button>
+                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                        @endif
+                    </div>
+                </div>
+                @endif
+                @if($note->is_cancelled || (!$note->is_cancelled && !$note->is_signed_by_hcp))
+                <div class="ml-2 pl-2 border-left">
+                    <div class="d-flex justify-content-end">
+                        @if(!$note->is_cancelled)
+                        <div moe relatve
+                             class="{{ $hasBills ? 'moe-disabled' : '' }}"
+                             title="{{ $hasBills ? 'Cannot cancel note since it has un-cancelled bills in it' : '' }}">
+                            <a class="text-danger" href="" show start>Cancel</a>
+                            <form url="/api/note/cancel" right>
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <p class="small mb-2">Are you sure you want to cancel this note?</p>
+                                <div class="mb-2">
+                                    <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo" class="memo-textarea form-control form-control-sm"></textarea>
+                                </div>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-danger mr-2" submit>Yes</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>No</button>
+                                </div>
+                            </form>
+                        </div>
+                        @else
+                            <span class="text-secondary font-weight-bold">CANCELLED</span>
+                        @endif
+                    </div>
+                </div>
+                @endif
+
+            </div>
+        </div>
+        <div class="card-body p-0">
+            <div class="note-container note_template_{{$note->visitTemplate ? $note->visitTemplate->internal_name : ''}}">
+                @if(!$hasRightSegments)
+                    @include('app.patient.note.lhs-tree')
+                @endif
+                <div class="note-rhs-content">
+                <div>
+                <div class="border-bottom pb-3">
+                    <div class="{{$hasRightSegments ? 'd-flex align-items-stretch' : ''}}">
+                        <?php
+                        $shortCutsObject = [];
+                        foreach ($pro->allShortcuts() as $shortcut) {
+
+                            // %replaceables%
+                            $shortcut->text = str_replace("%AGE%", $patient->age_in_years, $shortcut->text);
+                            $shortcut->text = str_replace("%GENDER%", $patient->sex, $shortcut->text);
+                            $shortcut->text = str_replace("%NAME%", $patient->displayName(), $shortcut->text);
+
+                            $shortCutsObject[] = [
+                                "name" => $shortcut->shortcut,
+                                "value" => $shortcut->text
+                            ];
+                        }
+                        ?>
+                        <script>window.userShortcuts = <?= json_encode($shortCutsObject); ?>;</script>
+                        <script>
+                            window.hpiShortcuts = [
+                                {
+                                    name: 'Explain the problem.',
+                                    value: 'Explain the problem. ',
+                                },
+                                {
+                                    name: 'What happened between today and our last visit?',
+                                    value: 'What happened between today and our last visit? ',
+                                },
+                                {
+                                    name: 'How did it go with the plan I gave you?',
+                                    value: 'How did it go with the plan I gave you? ',
+                                },
+                                {
+                                    name: 'What barriers have you felt following the plan?',
+                                    value: 'What barriers have you felt following the plan? ',
+                                },
+                                {
+                                    name: 'How long have you had this?',
+                                    value: 'How long have you had this? ',
+                                },
+                                {
+                                    name: 'When does it get worse?',
+                                    value: 'When does it get worse? ',
+                                },
+                                {
+                                    name: 'When does it get better?',
+                                    value: 'When does it get better? ',
+                                },
+                                {
+                                    name: 'What have you done for treatment?',
+                                    value: 'What have you done for treatment? ',
+                                },
+                                {
+                                    name: 'How does it affect your ADLs?',
+                                    value: 'How does it affect your ADLs? ',
+                                },
+                                {
+                                    name: 'How do you cope?',
+                                    value: 'How do you cope? ',
+                                },
+                                {
+                                    name: 'How does this affect you emotionally?',
+                                    value: 'How does this affect you emotionally? ',
+                                },
+                            ];
+                        </script>
+                        <script>window.segmentInitializers = {};</script>
+                        <?php
+                        $shortcuts = "";
+                        $latestSectionTS = 0;
+                        ?>
+                        <div class="{{ $note->is_signed_by_hcp ? 'note-signed-by-hcp' : '' }} {{$hasRightSegments ? 'w-30 border-right note-left-panel stag-scrollbar' : ''}}">
+                            <div class="min-width-300px stag-scrollbar">
+                                <?php $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_create($patient->created_at))->invert === 1); ?>
+                                @if($isOldClient)
+                                    <div class="p-2 bg-light border-bottom screen-only">
+                                        <div class="d-flex align-items-baseline">
+                                            <div class="font-weight-bold font-size-14 text-warning-dark">
+                                                <i class="fa fa-clock text-secondary text-sm"></i>
+                                                Data from old notes
+                                            </div>
+                                            <a href="#" class="ml-3" onclick="$(this).parent().next().toggleClass('d-none'); return false;">Toggle</a>
+                                        </div>
+                                        <div class="mt-3 ml-3 d-none">
+                                            <?php $hasAllergiesInCanvas = $patient->hasDataInCanvas('allergies'); ?>
+                                            @if($hasAllergiesInCanvas)
+                                                <div class="uucol-4">
+                                                    <div class="d-flex align-items-center pb-2">
+                                                        <h6 class="my-0 font-weight-bold text-secondary">Allergies</h6>
+                                                    </div>
+                                                    <div class="bg-light border p-2 mb-3">
+                                                        @include('app.patient.canvas-sections.allergies.summary')
+                                                    </div>
+                                                </div>
+                                            @endif
+                                            <?php $hasRxInCanvas = $patient->hasDataInCanvas('rx'); ?>
+                                            @if($hasRxInCanvas)
+                                                <div class="uucol-4">
+                                                    <div class="d-flex align-items-center pb-2">
+                                                        <h6 class="my-0 font-weight-bold text-secondary">Current Medications</h6>
+                                                    </div>
+                                                    <div class="bg-light border p-2 mb-3">
+                                                        @include('app.patient.canvas-sections.rx.summary')
+                                                    </div>
+                                                </div>
+                                            @endif
+                                            <?php $hasDxInCanvas = $patient->hasDataInCanvas('dx'); ?>
+                                            @if($hasDxInCanvas)
+                                                <div class="uucol-4">
+                                                    <div class="d-flex align-items-center pb-2">
+                                                        <h6 class="my-0 font-weight-bold text-secondary">Current Problems / Focus Areas</h6>
+                                                    </div>
+                                                    <div class="bg-light border p-2 mb-3">
+                                                        @include('app.patient.canvas-sections.dx.summary')
+                                                    </div>
+                                                </div>
+                                            @endif
+                                            <?php $hasCareTeamInCanvas = $patient->hasDataInCanvas('care-team'); ?>
+                                            @if($hasCareTeamInCanvas)
+                                                <div class="uucol-4">
+                                                    <div class="d-flex align-items-center pb-2">
+                                                        <h6 class="my-0 font-weight-bold text-secondary">Care Team</h6>
+                                                    </div>
+                                                    <div class="bg-light border p-2 mb-3">
+                                                        @include('app.patient.canvas-sections.care-team.summary')
+                                                    </div>
+                                                </div>
+                                            @endif
+                                            <?php $hasPmhxInCanvas = $patient->hasDataInCanvas('pmhx'); ?>
+                                            @if($hasPmhxInCanvas)
+                                                <div class="uucol-4">
+                                                    <div class="d-flex align-items-center pb-2">
+                                                        <h6 class="my-0 font-weight-bold text-secondary">Medical History</h6>
+                                                    </div>
+                                                    <div class="bg-light border p-2 mb-3">
+                                                        @include('app.patient.canvas-sections.pmhx.summary')
+                                                    </div>
+                                                </div>
+                                            @endif
+                                            <?php $hasPshxInCanvas = $patient->hasDataInCanvas('pshx'); ?>
+                                            @if($hasPshxInCanvas)
+                                                <div class="mt-2 border-top pt-2">
+                                                    <div class="d-flex align-items-center pb-2">
+                                                        <h6 class="my-0 font-weight-bold text-secondary">Surgical History</h6>
+                                                    </div>
+                                                    <div class="bg-light border p-2 mb-3">
+                                                        @include('app.patient.canvas-sections.pshx.summary')
+                                                    </div>
+                                                </div>
+                                            @endif
+                                            <?php $hasFhxInCanvas = $patient->hasDataInCanvas('fhx'); ?>
+                                            @if($hasFhxInCanvas)
+                                                <div class="uucol-4">
+                                                    <div class="d-flex align-items-center pb-2">
+                                                        <h6 class="my-0 font-weight-bold text-secondary">Family History</h6>
+                                                    </div>
+                                                    <div class="bg-light border p-2 mb-3">
+                                                        @include('app.patient.canvas-sections.fhx.summary')
+                                                    </div>
+                                                </div>
+                                            @endif
+                                            <?php $hasSochxInCanvas = $patient->hasDataInCanvas('sochx'); ?>
+                                            @if($hasSochxInCanvas)
+                                                <div class="uucol-4">
+                                                    <div class="d-flex align-items-center pb-2">
+                                                        <h6 class="my-0 font-weight-bold text-secondary">Social History</h6>
+                                                    </div>
+                                                    <div class="bg-light border p-2 mb-3">
+                                                        @include('app.patient.canvas-sections.sochx.summary')
+                                                    </div>
+                                                </div>
+                                            @endif
+                                        </div>
+                                    </div>
+                                @endif
+
+                                @if($isVisitTemplateBased && $doesVisitTemplateLayoutExist)
+                                    @include($visitLayoutPath)
+                                @elseif($isVisitTemplateBased && !$doesVisitTemplateUiConfigExist)
+                                    @if($note->visitTemplate->is_slim)
+                                        @include('app.patient.note.note-segment-list-slim')
+                                    @else
+                                        @include('app.patient.note.note-segment-list')
+                                    @endif
+                                @elseif($isVisitTemplateBased && $doesVisitTemplateUiConfigExist)
+                                    @include('app.patient.note.custom-visit')
+                                @else
+                                    @include('app.patient.note.note-section-list')
+                                @endif
+                            </div>
+                        </div>
+                        @if($hasRightSegments)
+                        <div class="w-70 border-left note-right-panel stag-scrollbar">
+                            <div class="min-width-700px">
+                                @include('app.patient.note.note-segment-list-rhs')
+                            </div>
+                        </div>
+                        @endif
+                    </div>
+                </div>
+
+                {{-- follow-up appt. --}}
+                <div class="pt-3 px-3 screen-only border-bottom" data-non-segment-section="Follow-up Appointment">
+                    @include('app/patient/note/follow-up-appointment')
+                </div>
+
+                <span class="d-none latest-section-ts">{{ $latestSectionTS }}</span>
+
+                <!-- handouts -->
+                <div class="p-3 border-bottom screen-only" data-non-segment-section="Handouts">
+                    <?php
+                        $handouts = Handout::where('is_active', true)->get();
+                        $clientHandouts = $patient->handouts($note);
+                    ?>
+                    @include('app.patient.handouts-list', compact('patient', 'clientHandouts', 'handouts', 'note'))
+                </div>
+
+                @if($pro->pro_type === 'ADMIN' && $note->hcpPro)
+                <div class="p-3 border-bottom mt-2 screen-only">
+                    <div class="">
+                        @include('app/patient/partials/company-pro-documents')
+                    </div>
+                </div>
+                @endif
+
+                <div class="p-3 border-bottom screen-only" data-non-segment-section="Prescriptions">
+                    @include('app.patient.prescriptions.list', compact('patient', 'note'))
+                </div>
+
+                <div class="p-3 border-bottom screen-only" data-non-segment-section="Incoming Reports">
+                    @include('app.patient.partials.incoming-reports')
+                </div>
+
+                <div class="p-3 border-bottom screen-only" data-non-segment-section="Supply Orders Summary">
+                    <div class="">
+                        <div class="d-flex align-items-center mb-2">
+                            <p class="font-weight-bold text-secondary m-0 font-size-14">Supply Orders Summary</p>
+                            <span class="mx-2 text-secondary screen-only">|</span>
+                            <a native target="_blank"
+                               class="screen-only"
+                               open-in-stag-popup
+                               update-parent
+                               mc-initer="patient-supply-orders"
+                               title="{{$patient->displayName()}} - Supply Orders"
+                               popup-style="medium"
+                               href="/patients/view/{{$patient->uid}}/supply-orders?popupmode=1&note-uid={{$note->uid}}&filter=active">
+                                Manage Supply Orders
+                            </a>
+                        </div>
+                        <div class="p-3 border">
+
+                            <p class="font-weight-bold text-secondary mb-2 mr-2">Associated with this note</p>
+                            <div>
+                                @if($supplyOrdersOnNote && count($supplyOrdersOnNote))
+                                    <table class="table table-sm table-bordered mb-0 bg-white">
+                                        <thead>
+                                        <tr class="bg-light">
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Title</div></th>
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Reason</div></th>
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Created At</div></th>
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Pro Signed?</div></th>
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Cancelled?</div></th>
+                                            <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Shipment</div></th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        @foreach($supplyOrdersOnNote as $iSupplyOrder)
+                                            <tr class="">
+                                                <td class="px-2">
+                                                    {{ $iSupplyOrder->product->title }}
+                                                </td>
+                                                <td class="px-2">{{ $iSupplyOrder->reason }}</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>
+                                                        {{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>
+                                                        Cleared for shipment
+                                                    </span>
+                                                    @else
+                                                        <span class="text-warning-mellow">
+                                                        <i class="fa fa-user-nurse"></i>
+                                                        Not cleared for shipment
+                                                    </span>
+                                                    @endif
+                                                </td>
+                                            </tr>
+                                        @endforeach
+                                        </tbody>
+                                    </table>
+                                @else
+                                    <div class="text-secondary">-</div>
+                                @endif
+                            </div>
+
+                            <hr class="my-2">
+
+                            <p class="font-weight-bold text-secondary mb-2 mr-2">Others as of {{friendlier_date(date('Y-m-d'))}}</p>
+                            @if($otherOpenSupplyOrders && count($otherOpenSupplyOrders))
+                                <table class="table table-sm table-bordered mb-0 bg-white">
+                                    <thead>
+                                    <tr class="bg-light">
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Title</div></th>
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Reason</div></th>
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Created At</div></th>
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Pro Signed?</div></th>
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Cancelled?</div></th>
+                                        <th class="px-2 text-nowrap text-secondary border-bottom-0"><div class="text-ellipsis">Shipment</div></th>
+                                    </tr>
+                                    </thead>
+                                    <tbody>
+                                    @foreach($otherOpenSupplyOrders as $iSupplyOrder)
+                                        <tr class="">
+                                            <td class="px-2">
+                                                {{ $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">{{ $iSupplyOrder->is_cancelled ? 'Yes' : 'No' }}</td>
+                                            <td class="px-2">
+                                                @if($iSupplyOrder->shipment_id)
+                                                    <i class="fa fa-building"></i>
+                                                    {{ 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>
+                                                        Cleared for shipment
+                                                    </span>
+                                                @else
+                                                    <span class="text-warning-mellow">
+                                                        <i class="fa fa-user-nurse"></i>
+                                                        Not cleared for shipment
+                                                    </span>
+                                                @endif
+                                            </td>
+                                        </tr>
+                                    @endforeach
+                                    </tbody>
+                                </table>
+                            @else
+                                <div class="text-secondary">-</div>
+                            @endif
+
+                        </div>
+                    </div>
+                </div>
+
+                <div class="row border-bottom mx-0">
+                    <div class="col-12 px-0">
+                        <div class="p-3 screen-only h-100" data-non-segment-section="RM Setup">
+                            <div class="d-flex align-items-center mb-3">
+                                <p class="font-weight-bold text-secondary m-0 font-size-14">Remote Monitoring</p>
+                            </div>
+                            @include('app.patient.note.rm-setup')
+                        </div>
+
+                    </div>
+                </div>
+
+                <div class="p-3 border-bottom screen-only" data-non-segment-section="Vitals Settings">
+                    <div class="d-flex align-items-center mb-3">
+                        <p class="font-weight-bold text-secondary m-0 font-size-14">Vitals Settings</p>
+                    </div>
+                    <div class="row" id="vitals-settings-{{$patient->uid}}">
+                        <div class="col-4 border-right">
+                            <div class="d-flex align-items-baseline">
+                                <b>BMI/Weight Management</b>
+                                <span class="mx-2 text-secondary">|</span>
+                                @include('app.patient.vitals-settings.bmi-management-form')
+                            </div>
+                            <div class="pt-3">
+                                @include('app.patient.vitals-settings.bmi-management-summary')
+                            </div>
+                        </div>
+                        <div class="col-8">
+                            <div class="d-flex align-items-baseline">
+                                <b>BP Management</b>
+                                <span class="mx-2 text-secondary">|</span>
+                                @include('app.patient.vitals-settings.bp-management-form')
+                            </div>
+                            <div class="pt-3">
+                                @include('app.patient.vitals-settings.bp-management-summary')
+                            </div>
+                        </div>
+                    </div>
+                    <script>
+                        (function () {
+                            function calculateUsualBmi() {
+                                let h = $('#bmi-management-settings [name="currentHeightInInches"]').val(),
+                                    wMin = $('#bmi-management-settings [name="usualWeightInPoundsMin"]').val(),
+                                    wMax = $('#bmi-management-settings [name="usualWeightInPoundsMax"]').val();
+                                let bmiMinElem = $('#bmi-management-settings [name="usualBmiMin"]').val(''),
+                                    bmiMinCategoryElem = $('#bmi-management-settings [name="usualBmiMinCategory"]').val(''),
+                                    bmiMaxElem = $('#bmi-management-settings [name="usualBmiMax"]').val(''),
+                                    bmiMaxCategoryElem = $('#bmi-management-settings [name="usualBmiMaxCategory"]').val('');
+                                calculateBmi(h, wMin, bmiMinElem, bmiMinCategoryElem);
+                                calculateBmi(h, wMax, bmiMaxElem, bmiMaxCategoryElem);
+                                return false;
+                            }
+
+                            function calculateIdealBmi() {
+                                let h = $('#bmi-management-settings [name="currentHeightInInches"]').val(),
+                                    w = $('#bmi-management-settings [name="idealWeightInPounds"]').val();
+                                let bmiElem = $('#bmi-management-settings [name="idealBmi"]').val(''),
+                                    bmiCategoryElem = $('#bmi-management-settings [name="idealBmiCategory"]').val('');
+                                calculateBmi(h, w, bmiElem, bmiCategoryElem);
+                                return false;
+                            }
+
+                            function calculateBmi(h, w, bmiElem, bmiCategoryElem) {
+                                let bmi = 0,
+                                    bmiCategory = '';
+                                try {
+                                    h = +h;
+                                    w = +w;
+                                    bmi = (w / (h * h)) * 703;
+                                    bmiElem.val(bmi.toFixed(1));
+                                    if (bmi < 18.5) {
+                                        bmiCategory = '(Underweight)';
+                                    }
+                                    if (bmi >= 18.5 && bmi < 25) {
+                                        bmiCategory = '(Healthy)';
+                                    }
+                                    if (bmi >= 25 && bmi < 30) {
+                                        bmiCategory = '(Overweight)';
+                                    }
+                                    if (bmi >= 30) {
+                                        bmiCategory = '(Obese)';
+                                    }
+                                    bmiCategoryElem.show();
+                                    if (bmiCategory == '') {
+                                      bmiCategoryElem.hide();
+                                    }
+                                    bmiCategoryElem.val(bmiCategory);
+                                } catch (e) {
+                                    return false;
+                                }
+                            }
+
+                            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"]')
+                                    .on('change input paste keyup',
+                                        '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="usualWeightInPoundsMin"],  #bmi-management-settings [name="usualWeightInPoundsMax"]', function () {
+                                            return calculateUsualBmi();
+                                        });
+                                $(document)
+                                    .off('change input paste keyup',
+                                        '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="idealWeightInPounds"]')
+                                    .on('change input paste keyup',
+                                        '#bmi-management-settings [name="currentHeightInInches"], #bmi-management-settings [name="idealWeightInPounds"]', function () {
+                                            return calculateIdealBmi();
+                                        });
+
+                                $('#bmi-management-settings [name="currentHeightInInches"]').trigger('change');
+
+                                let parentSegment = $('#bmi-management-settings');
+                                parentSegment.find('[heightFeetInput], [heightInchesInput]').off('change input paste');
+                                parentSegment.find('[heightFeetInput], [heightInchesInput]').on('change input paste', function () {
+                                    let inches = 0;
+                                    let ft = +(parentSegment.find('[heightFeetInput]').val()),
+                                        inc = +(parentSegment.find('[heightInchesInput]').val());
+                                    inches = Math.round(ft * 12 + inc);
+                                    parentSegment.find('[name="currentHeightInInches"]').val(inches).trigger('change');
+                                });
+                            }
+
+                            addMCInitializer('vitals-settings-{{$patient->uid}}', init, '#vitals-settings-{{$patient->uid}}')
+                        }).call(window);
+                    </script>
+                </div>
+
+                <div class="px-2 pt-2 pb-1 border-bottom" data-non-segment-section="ICDs">
+                    <div class="d-flex alignt-items-start">
+                        <div class="d-flex mr-2">
+                            <p class="font-weight-bold text-secondary m-0 mr-2">ICDs</p>
+                            @include('app.patient.partials.put-rm-reasons', ['recordType' => 'NOTE', 'record' => $note])
+                        </div>
+                        <?php
+                            $noteICDData = [
+                                'icd_1' => [
+                                    'title' => 'ICD 1',
+                                    'reason' => $note->note_reason_icd1,
+                                    'description' => $note->note_reason_icd1description
+                                ],
+                                'icd_2' => [
+                                    'title' => 'ICD 2',
+                                    'reason' => $note->note_reason_icd2,
+                                    'description' => $note->note_reason_icd2description
+                                ],
+                                'icd_3' => [
+                                    'title' => 'ICD 3',
+                                    'reason' => $note->note_reason_icd3,
+                                    'description' => $note->note_reason_icd3description
+                                ],
+                                'icd_4' => [
+                                    'title' => 'ICD 4',
+                                    'reason' => $note->note_reason_icd4,
+                                    'description' => $note->note_reason_icd4description
+                                ],
+                            ];
+                        ?>
+                        <div class="d-flex align-items-start flex-wrap">
+                            <?php $emptyNoteICDs = true; ?>
+                                @foreach ($noteICDData as $noteICDKey => $noteICD)
+                                    <?php
+                                        $emptyICD = true;
+                                        if(!empty($noteICD['reason']) || !empty($noteICD['description'])){
+                                            $emptyNoteICDs = false;
+                                            $emptyICD = false;
+                                        }
+                                    ?>
+                                    @if(!$emptyICD)
+                                        <span class="badge badge-info px-2 mb-1 mr-2">{{$noteICD['reason']}} @if(!empty($noteICD['description']))({{ $noteICD['description'] }})@endif</span>
+                                    @endif
+                                @endforeach
+                            @if($emptyNoteICDs)
+                                <small class="text-dark">-</small>
+                            @endif
+                        </div>
+                    </div>
+                    @if(!empty($note->note_reason_memo))
+                        <div style="padding-left: 60px;">
+                            <small><b>Reason:</b> {{ $note->note_reason_memo }}</small>
+                        </div>
+                    @endif
+                </div>
+
+                @if($pro->pro_type === 'ADMIN')
+                <div class="p-3 border-bottom screen-only" data-non-segment-section="Bills & Claims Summary">
+                    <div>
+                        <h2 class="font-weight-bold text-secondary">Bills & Claims Summary</h2>
+                        <div class="d-flex justify-content-center align-items-start">
+                            <table class="w-25 flex-grow-1 table-bordered table-condensed table-sm table-striped">
+                                <tbody>
+                                <tr>
+                                    <td class="text-secondary">Bill Total Exp.</td>
+                                    <td>${{friendly_money($note->bill_total_expected)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">Is Billing Closed</td>
+                                    <td>{{$note->is_bill_closed ? 'Yes' : 'No'}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">Bill Summary</td>
+                                    <td>{{$note->bill_summary ? $note->bill_summary : '-'}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">Bill Total Paid</td>
+                                    <td>${{friendly_money($note->bill_total_paid)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">Billing Closed At</td>
+                                    <td>{{friendlier_date_time($note->bill_closed_at)}}</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="w-25 flex-grow-1 table-bordered table-condensed table-sm table-striped ml-2">
+                                <tbody>
+                                <tr>
+                                    <td class="text-secondary">Claim Total Exp.</td>
+                                    <td>${{friendly_money($note->claim_total_expected)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">Is Claiming Closed</td>
+                                    <td>{{$note->is_claim_closed ? 'Yes' : 'No'}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">Claim Summary</td>
+                                    <td>{{$note->claim_summary ? $note->claim_summary : '-'}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">Claim Total Paid</td>
+                                    <td>${{friendly_money($note->claim_total_paid)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">Claiming Closed At</td>
+                                    <td>{{$note->claim_closed_at ? friendlier_date_time($note->claim_closed_at) : '-'}}</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="w-25 flex-grow-1 table-bordered table-condensed table-sm table-striped ml-2">
+                                <tbody>
+                                <tr>
+                                    <td class="text-secondary">HCP Bill Total Exp.</td>
+                                    <td>${{friendly_money($note->hcp_bill_total_expected)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">NA Bill Total Exp.</td>
+                                    <td>${{friendly_money($note->na_bill_total_expected)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">RMM Bill Total Exp.</td>
+                                    <td>${{friendly_money($note->rmm_bill_total_expected)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">RME Bill Total Exp.</td>
+                                    <td>${{friendly_money($note->rme_bill_total_expected)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">RMS Bill Total Exp.</td>
+                                    <td>${{friendly_money($note->rms_bill_total_expected)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">RMG Bill Total Exp.</td>
+                                    <td>${{friendly_money($note->rmg_bill_total_expected)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">CM Bill Total Exp.</td>
+                                    <td>${{friendly_money($note->cm_bill_total_expected)}}</td>
+                                </tr>
+                                </tbody>
+                            </table>
+                            <table class="w-25 flex-grow-1 table-bordered table-condensed table-sm table-striped ml-2">
+                                <tbody>
+                                <tr>
+                                    <td class="text-secondary">HCP Bill Total Paid</td>
+                                    <td>${{friendly_money($note->hcp_bill_total_paid)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">NA Bill Total Paid</td>
+                                    <td>${{friendly_money($note->na_bill_total_paid)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">RMM Bill Total Paid</td>
+                                    <td>${{friendly_money($note->rmm_bill_total_paid)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">RME Bill Total Paid</td>
+                                    <td>${{friendly_money($note->rme_bill_total_paid)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">RMS Bill Total Paid</td>
+                                    <td>${{friendly_money($note->rms_bill_total_paid)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">RMG Bill Total Paid</td>
+                                    <td>${{friendly_money($note->rmg_bill_total_paid)}}</td>
+                                </tr>
+                                <tr>
+                                    <td class="text-secondary">CM Bill Total Paid</td>
+                                    <td>${{friendly_money($note->cm_bill_total_paid)}}</td>
+                                </tr>
+<!--                                <tr>
+                                    <td class="text-secondary">HCP Company Pro</td>
+                                    <td>{{$note->hcp_company_pro_id}}</td>
+                                </tr>-->
+                                </tbody>
+                            </table>
+                        </div>
+                    </div>
+                </div>
+                @endif
+
+                {{-- companyPro, payer and location --}}
+                @if($note->method === 'IN_CLINIC' || $pro->pro_type === 'ADMIN')
+                <div class="p-3 border-bottom screen-only" data-non-segment-section="Pro/Payer Settings">
+                    <div class="ml-auto d-flex align-items-center">
+
+                        <div class="d-inline-flex align-items-center">
+                            <span class="text-secondary font-weight-bold">Company Pro:&nbsp;</span>
+                            <b>{{$note->hcpCompanyPro && $note->hcpCompanyPro->company ? $note->hcpCompanyPro->pro->displayName() . ' / ' . $note->hcpCompanyPro->company->name : '-'}}</b>
+                            @if($note->hcpCompanyPro && $note->hcpCompanyPro->company)
+                                <div moe class="ml-1">
+                                    <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
+                                    <form url="/api/note/wipeHcpCompanyPro">
+                                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                                        <p>Wipe company pro from this note?</p>
+                                        <div class="mb-0">
+                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @else
+                                <div moe class="ml-1">
+                                    <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
+                                    <form url="/api/note/putHcpCompanyPro">
+                                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                                        <div class="mb-2">
+                                            <select name="hcpCompanyProUid" class="form-control form-control-sm">
+                                                <option value="">-- select --</option>
+                                                @foreach($note->hcpPro->companyPros as $companyPro)
+                                                    <option value="{{$companyPro->uid}}">{{$companyPro->pro->displayName() . ' / ' . $companyPro->company->name}}</option>
+                                                @endforeach
+                                            </select>
+                                        </div>
+                                        <div class="mb-0">
+                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @endif
+                        </div>
+
+                        @if($note->hcpCompanyPro && $note->hcpCompanyPro->company)
+                            <span class="mx-2 text-secondary">|</span>
+                            <div class="d-inline-flex align-items-center">
+                                <span class="text-secondary font-weight-bold">Payer 1°:&nbsp;</span>
+                                <b>
+                                    {{$note->hcpCompanyProPayer && $note->hcpCompanyProPayer->payer ? $note->hcpCompanyProPayer->payer->name : '-'}}
+                                </b>
+                                @if($note->hcpCompanyProPayer && $note->hcpCompanyProPayer->payer)
+                                    <div moe class="ml-1">
+                                        <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
+                                        <form url="/api/note/wipeHcpCompanyProPayer">
+                                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                                            <p>Wipe payer from this note?</p>
+                                            <div class="mb-0">
+                                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                @else
+                                    <div moe class="ml-1">
+                                        <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
+                                        <form url="/api/note/putHcpCompanyProPayer">
+                                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                                            <div class="mb-2">
+                                                <select name="hcpCompanyProPayerUid" class="form-control form-control-sm">
+                                                    <option value="">-- select --</option>
+                                                    @foreach($note->hcpCompanyPro->companyProPayers as $companyProPayer)
+                                                        <option value="{{$companyProPayer->uid}}">{{$companyProPayer->payer->name}}</option>
+                                                    @endforeach
+                                                </select>
+                                            </div>
+                                            <div class="mb-0">
+                                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                @endif
+                            </div>
+
+                            <span class="mx-2 text-secondary">|</span>
+                            <span>
+                                <span class="text-secondary font-weight-bold">Payer 2°: </span>
+                            </span>
+
+                            <span class="mx-2 text-secondary">|</span>
+                            <div class="d-inline-flex align-items-center">
+                                <span class="text-secondary font-weight-bold">Location:&nbsp;</span><b>{{$note->hcpCompanyLocation ? $note->hcpCompanyLocation->line1 . ', ' . $note->hcpCompanyLocation->city : '-'}}</b>
+                                @if($note->hcpCompanyLocation)
+                                    <div moe class="ml-1">
+                                        <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
+                                        <form url="/api/note/wipeHcpCompanyLocation">
+                                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                                            <p>Wipe location from this note?</p>
+                                            <div class="mb-0">
+                                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                @else
+                                    <div moe class="ml-1">
+                                        <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
+                                        <form url="/api/note/putHcpCompanyLocation">
+                                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                                            <div class="mb-2">
+                                                <select name="hcpCompanyLocationUid" class="form-control form-control-sm">
+                                                    <option value="">-- select --</option>
+                                                    @if($note->hcpCompany && $note->hcpCompany->locations)
+                                                        @foreach($note->hcpCompany->locations as $location)
+                                                            <option value="{{$location->uid}}">{{$location->line1 . ', ' . $location->city}}</option>
+                                                        @endforeach
+                                                    @endif
+                                                </select>
+                                            </div>
+                                            <div class="mb-0">
+                                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                @endif
+                            </div>
+                        @endif
+                        <span class="mx-2 text-secondary">|</span>
+                        <div class="d-inline-flex align-items-center">
+                            <span class="text-secondary font-weight-bold">Primary Coverage:&nbsp;</span>
+                            <b>@include('app.patient.coverage_column_renderer', ['patient'=>$patient, 'truncateName' => true])</b>
+                        </div>
+                    </div>
+                </div>
+                @endif
+
+                {{-- bills --}}
+                @if($pro->pro_type === 'ADMIN' || ($note->hcpPro && $pro->id === $note->hcpPro->id))
+                    <div class="screen-only" data-non-segment-section="HCP Bills">
+                    @if($note->bills->count())
+                        <div class="p-3 border-bottom">
+                    <div class="d-flex align-items-center mb-2">
+                        <p class="font-weight-bold text-secondary font-size-13 m-0">Bills</p>
+                        @if($pro->pro_type === 'ADMIN' || ($note->hcpPro && $pro->id === $note->hcpPro->id))
+                            @include('app/patient/note/_create-bill')
+                        @endif
+                    </div>
+
+                    @if($pro->pro_type === 'ADMIN')
+                    <table class="table table-sm tabe-striped mb-0 table-bordered">
+                        <thead class="bg-light">
+                        <tr class="text-secondary">
+                            <?php /* <th class="border-bottom-0"></th> */ ?>
+                            <th class="border-bottom-0">Date</th>
+                            <th class="border-bottom-0">Service</th>
+                            <th class="border-bottom-0">Billable</th>
+                            <th class="border-bottom-0">HCP</th>
+                            <th class="border-bottom-0 screen-only">Total</th>
+                            <th class="border-bottom-0">Sign</th>
+                            <th class="border-bottom-0 screen-only">Bal Post Date</th>
+                            <th class="border-bottom-0">Verification</th>
+                            <th class="border-bottom-0">Cancellation</th>
+                            <th class="border-bottom-0 screen-only">Payment</th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        @foreach ($note->bills as $bill)
+                            <tr class="{{$bill->is_cancelled ? 'bg-light text-secondary' : ''}}">
+                                <?php /* <td class="p-0">
+                                    <table class="table-striped table-sm table-condensed border border-left-0 border-top-0 border-bottom-0">
+                                        <tbody>
+                                            <tr><td>collected_amount</td><td>{{$bill->collected_amount}}</td></tr>
+                                            <tr><td>effective_date</td><td>{{$bill->effective_date}}</td></tr>
+                                            <tr><td>has_hcp_been_paid</td><td>{{$bill->has_hcp_been_paid}}</td></tr>
+                                            <tr><td>hcp_expected_payment_amount</td><td>{{$bill->hcp_expected_payment_amount}}</td></tr>
+                                            <tr><td>hcp_payment_amount</td><td>{{$bill->hcp_payment_amount}}</td></tr>
+                                            <tr><td>is_cancelled</td><td>{{$bill->is_cancelled}}</td></tr>
+                                            <tr><td>hcp_payment_pro_transaction_id</td><td>{{$bill->hcp_payment_pro_transaction_id}}</td></tr>
+                                            <tr><td>balance_post_date</td><td>{{$bill->balance_post_date}}</td></tr>
+                                            <tr><td>is_verified</td><td>{{$bill->is_verified}}</td></tr>
+                                            <tr><td>is_cancellation_acknowledged</td><td>{{$bill->is_cancellation_acknowledged}}</td></tr>
+                                            <tr><td>is_cancelled_by_administrator</td><td>{{$bill->is_cancelled_by_administrator}}</td></tr>
+                                            <tr><td>total_expected</td><td>{{$bill->total_expected}}</td></tr>
+                                            <tr><td>total_paid</td><td>{{$bill->total_paid}}</td></tr>
+                                        </tbody>
+                                    </table>
+                                </td> */ ?>
+                                <td class="text-nowrap">{{friendlier_date_time($bill->effective_date, false)}}</td>
+                                <td>{{$bill->code}}</td>
+                                <td class="">
+                                    @if(strpos(strtolower($bill->code), 'treatment services') !== FALSE)
+                                        <?php
+                                        $totalSeconds = $bill->number_of_units * 3600;
+                                        $remainder = $totalSeconds % 60;
+                                        if ($remainder !== 0) {
+                                            if ($remainder < 30) {
+                                                $totalSeconds = $totalSeconds - $remainder;
+                                            } else {
+                                                $totalSeconds = $totalSeconds + (60 - $remainder);
+                                            }
+                                        }
+                                        ?>
+                                        {{ time_in_hrminsec($totalSeconds) }}
+                                    @else
+                                        @if(!!$bill->number_of_units)
+                                            {{ $bill->number_of_units }} unit(s)
+                                        @else
+                                            -
+                                        @endif
+                                    @endif
+                                </td>
+                                <td class="">
+                                    <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->hcp->displayName() }} (HCP)</div>
+                                    <div class="text-nowrap mt-1 screen-only">
+                                        <span class="text-secondary">Paid: </span>
+                                        <span>{{ $bill->has_hcp_been_paid ? 'Yes' : 'No' }}</span>
+                                    </div>
+                                    @if(!$bill->has_hcp_been_paid)
+                                        <div class="text-nowrap mt-1 screen-only">
+                                            <span class="text-secondary">Expected: </span>
+                                            <span class="font-weight-bold">${{ $bill->hcp_expected_payment_amount }}</span>
+                                        </div>
+                                    @else
+                                        <div class="text-nowrap mt-1 screen-only">
+                                            <span class="text-secondary">Amount: </span>
+                                            <span class="font-weight-bold">${{ $bill->hcp_payment_amount }}</span>
+                                        </div>
+                                    @endif
+                                    @if($bill->ally && !!floatval($bill->na_expected_payment_amount))
+                                        <hr>
+                                        <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->ally->displayName() }} (NA)</div>
+                                        <div class="text-nowrap mt-1 screen-only">
+                                            <span class="text-secondary">Paid: </span>
+                                            <span>{{ $bill->has_na_been_paid ? 'Yes' : 'No' }}</span>
+                                        </div>
+                                        @if(!$bill->has_na_been_paid)
+                                            <div class="text-nowrap mt-1 screen-only">
+                                                <span class="text-secondary">Expected: </span>
+                                                <span class="font-weight-bold">${{ $bill->na_expected_payment_amount }}</span>
+                                            </div>
+                                        @else
+                                            <div class="text-nowrap mt-1 screen-only">
+                                                <span class="text-secondary">Amount: </span>
+                                                <span class="font-weight-bold">${{ $bill->na_payment_amount }}</span>
+                                            </div>
+                                        @endif
+                                    @endif
+
+                                    @if($pro->pro_type === 'ADMIN')
+                                        <b>{{$bill->hcpCompanyPro && $bill->hcpCompanyPro->company ? $bill->hcpCompanyPro->pro->displayName() . ' / ' . $bill->hcpCompanyPro->company->name : '-'}}</b>
+                                        <div moe class="ml-1">
+                                            <a class="text-primary" href="" show start>Swap HCP Company Pro</a>
+                                            <form url="/api/bill/swapHcpCompanyPro">
+                                                <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                <div class="mb-2">
+                                                    <select name="hcpCompanyProUid" class="form-control form-control-sm">
+                                                        <option value="">-- select --</option>
+                                                        @foreach($bill->hcp->companyPros as $companyPro)
+                                                            <option value="{{$companyPro->uid}}">{{$companyPro->pro->displayName() . ' / ' . $companyPro->company->name}}</option>
+                                                        @endforeach
+                                                    </select>
+                                                </div>
+                                                <div class="mb-0">
+                                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    @endif
+                                    <div>
+                                        @include('app.patient.note.flag-bill')
+                                    </div>
+
+                                </td>
+                                <td class="pr-3 screen-only">
+                                    @if($bill->has_hcp_been_paid)
+                                        <span class="text-secondary">Paid. </span>
+                                        <span class="font-weight-bold">${{ friendly_money($bill->total_paid) }}</span>
+                                    @else
+                                        <span class="text-secondary">Exp. </span>
+                                        <span class="font-weight-bold">{{ $bill->total_expected ? '$' . friendly_money($bill->total_expected) : '-' }}</span>
+                                    @endif
+                                </td>
+                                <td>
+                                    @if(!$bill->is_cancelled)
+                                        @if($bill->is_signed_by_hcp)
+                                            <span class="d-block text-secondary text-nowrap">
+                                                    <i class="fa fa-check"></i>
+                                                    HCP Signed
+                                                </span>
+                                        @else
+                                            <span moe
+                                                  class="d-block {{ $bill->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                                  title="{{ $bill->hcp_pro_id !== $pro->id ? 'Only the bill\'s HCP can sign' : '' }}">
+                                                <a class="" href="" show start>Sign As HCP</a>
+                                                <form url="/api/bill/signAsHcp">
+                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                    <p>Sign this bill as HCP?</p>
+                                                    <div class="mb-0">
+                                                        <button class="btn btn-success btn-sm" submit>Sign</button>
+                                                        <button class="btn btn-default border btn-sm"
+                                                                cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </span>
+                                        @endif
+
+                                        @if($bill->is_signed_by_na)
+                                            <span class="d-block text-secondary text-nowrap">
+                                                <i class="fa fa-check"></i>
+                                                NA Signed
+                                            </span>
+                                        @else
+                                            <span moe
+                                                  class="d-block {{ $bill->na_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                                  title="{{ $bill->na_pro_id !== $pro->id ? 'Only the bill\'s NA can sign' : '' }}">
+                                                <a class="" href="" show start>Sign As NA</a>
+                                                <form url="/api/bill/signAsNa">
+                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                    <p>Sign this bill as NA?</p>
+                                                    <div class="mb-0">
+                                                        <button class="btn btn-success btn-sm" submit>Sign</button>
+                                                        <button class="btn btn-default border btn-sm"
+                                                                cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </span>
+                                        @endif
+                                    @endif
+                                </td>
+                                <td class="screen-only">
+                                    @if(!$bill->is_cancelled)
+                                        <span class="d-block" moe>
+                                            <a class="" href="" show start>
+                                                {{$bill->balance_post_date ? friendlier_date_time($bill->balance_post_date, false) : '(not set)' }}
+                                            </a>
+                                            <form url="/api/bill/updateBalancePostDate">
+                                                <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                <p>Update Balance Post Date</p>
+                                                <div class="mb-0">
+                                                    <input type="date" class="text form-control form-control-sm"
+                                                           name="balancePostDate"
+                                                           value="{{$bill->balance_post_date}}"
+                                                           placeholder="balance post date"><br>
+                                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                    <button class="btn btn-default border btn-sm"
+                                                            cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </span>
+                                    @endif
+                                </td>
+                                <td> <!-- verification -->
+                                    @if($pro->pro_type === 'ADMIN' && !$bill->is_cancelled)
+                                        @if(!$bill->is_verified)
+                                            <div class="text-warning-mellow font-weight-bold">Not Verified</div>
+                                            <span class="d-block mt-1" moe>
+                                                <a href="" show start>Mark Verified</a>
+                                                <form url="/api/bill/markAsVerified">
+                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                    <p>Mark As Verfified?</p>
+                                                    <div class="mb-0">
+                                                        <button class="btn btn-primary btn-sm"
+                                                                submit>Submit</button>
+                                                        <button class="btn btn-default border btn-sm"
+                                                                cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </span>
+                                        @else
+                                            <div class="text-success font-weight-bold"><i class="fa fa-check"></i> Verified</div>
+                                            <span class="d-block mt-1" moe>
+                                                <a class="" href="" show start>Undo</a>
+                                                <form url="/api/bill/undoMarkAsVerified">
+                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                    <p>Undo Mark As Verfified?</p>
+                                                    <div class="mb-0">
+                                                        <button class="btn btn-primary btn-sm"
+                                                                submit>Submit</button>
+                                                        <button class="btn btn-default border btn-sm"
+                                                                cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </span>
+                                        @endif
+                                    @endif
+                                </td>
+                                <td>  <!-- cancellation -->
+                                    @if($bill->is_cancelled)
+                                        <div class="text-warning-mellow font-weight-bold">Cancelled</div>
+                                        @if($bill->cancellation_memo)
+                                            <div class="text-dark text-sm font-italic my-1">{{$bill->cancellation_memo}}</div>
+                                        @endif
+                                        @if($bill->is_cancelled_by_administrator)
+                                            <div class="text-secondary text-sm">(by Administrator)</div>
+                                        @endif
+                                        <div moe class="mt-1">
+                                            <a class="" href="" show start>Update Memo</a>
+                                            <form url="/api/bill/updateCancellationMemo">
+                                                <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                <p>Update Cancellation Memo</p>
+                                                <div class="mb-2">
+                                                    <textarea class="text form-control form-control-sm"
+                                                              name="cancellationMemo"
+                                                              placeholder="">{{$bill->cancellation_memo ? $bill->cancellation_memo : 'Please contact billing.'}}</textarea>
+                                                </div>
+                                                <div>
+                                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                    <button class="btn btn-default border btn-sm"
+                                                            cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    @else
+                                        <span class="d-block" moe relative="">
+                                            <a class="text-danger" href="" show start>Cancel</a>
+                                            <form url="/api/bill/markCancelled" right="">
+                                                <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                <p class="mb-2">Cancel this bill?</p>
+                                                <div class="mb-2">
+                                                    <label class="mb-1 text-secondary">Cancellation Memo</label>
+                                                    <textarea type="text" name="memo" placeholder="Memo"
+                                                              class="form-control form-control-sm">Please contact billing.</textarea>
+                                                </div>
+                                                <div class="mb-0">
+                                                    <button class="btn btn-danger btn-sm" submit>Yes</button>
+                                                    <button class="btn btn-default border btn-sm" cancel>No</button>
+                                                </div>
+                                            </form>
+                                        </span>
+                                    @endif
+
+                                    @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
+                                        <div class="mt-2 text-secondary">
+                                            <i class="fa fa-exclamation-triangle"></i>
+                                            Not Ack.
+                                        </div>
+                                        <div class="d-block mt-1" moe>
+                                            <a class="" href="" show start>Ack. Cancellation</a>
+                                            <form url="/api/bill/acknowledgeCancellation">
+                                                <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                <p>Acknowledge Cancellation?</p>
+                                                <div class="mb-0">
+                                                    {{--<input type="text" class="text form-control form-control-sm" name="cancellationMemo" value="{{$bill->cancellation_memo}}" placeholder=""><br>--}}
+                                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                    <button class="btn btn-default border btn-sm"
+                                                            cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    @endif
+
+                                    @if($bill->is_cancellation_acknowledged && !$note->is_billing_marked_done)
+                                        <div class="mt-2 text-secondary">
+                                            <i class="fa fa-check"></i>
+                                            Ack.
+                                        </div>
+                                        <div class="d-block mt-1" moe>
+                                            <a class="" href="" show start>Undo Cancellation Ack.</a>
+                                            <form url="/api/bill/undoAcknowledgeCancellation">
+                                                <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                <p>Undo Acknowledge Cancellation?</p>
+                                                <div class="mb-0">
+                                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                    <button class="btn btn-default border btn-sm"
+                                                            cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    @endif
+
+                                </td>
+                                <td class="screen-only"> <!-- submit payment -->
+                                    <div class="my-1">
+                                        @if(!$bill->is_cancelled && !$bill->has_hcp_been_paid )
+                                            @if(+$bill->hcp_expected_payment_amount && $bill->is_signed_by_hcp)
+                                                <span class="d-block" moe relative="">
+                                                    <a class="font-weight-bold" href="" show start>Submit Payment For HCP</a>
+                                                    <form url="/api/bill/payHcpAmount" right>
+                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                        <p>Submit Payment</p>
+                                                        <div class="mb-0">
+                                                            <input type="text"
+                                                                   class="text form-control form-control-sm"
+                                                                   name="hcpPaymentAmount"
+                                                                   value="{{$bill->hcp_expected_payment_amount}}"
+                                                                   placeholder="amount"><br>
+                                                            <button class="btn btn-primary btn-sm"
+                                                                    submit>Submit</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                            @else
+                                                @if(!+$bill->hcp_expected_payment_amount)
+                                                    <div class="mb-1 text-danger">
+                                                        <i class="fa fa-exclamation-triangle"></i>
+                                                        HCP expected amount is invalid
+                                                    </div>
+                                                @endif
+                                                @if(!$bill->is_signed_by_hcp)
+                                                    <div class="mb-1 text-danger">
+                                                        <i class="fa fa-exclamation-triangle"></i>
+                                                        HCP has not signed the bill
+                                                    </div>
+                                                @endif
+                                            @endif
+                                        @endif
+                                    </div>
+                                    <div class="my-1">
+                                        @if(!$bill->is_cancelled && !$bill->has_na_been_paid && $bill->ally)
+                                            @if(+$bill->na_expected_payment_amount && $bill->is_signed_by_na)
+                                                <span class="d-block" moe relative="">
+                                                    <a class="font-weight-bold" href="" show start>Submit Payment For NA</a>
+                                                    <form url="/api/bill/payNaAmount" right>
+                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                        <p>Submit Payment For NA</p>
+                                                        <div class="mb-0">
+                                                            <input type="text"
+                                                                   class="text form-control form-control-sm"
+                                                                   name="naPaymentAmount"
+                                                                   value="{{$bill->na_expected_payment_amount}}"
+                                                                   placeholder="amount"><br>
+                                                            <button class="btn btn-primary btn-sm"
+                                                                    submit>Submit</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                            @else
+                                                @if(!+$bill->na_expected_payment_amount)
+                                                    <div class="mb-1 text-danger">
+                                                        <i class="fa fa-exclamation-triangle"></i>
+                                                        NA expected amount is invalid
+                                                    </div>
+                                                @endif
+                                                @if(!$bill->is_signed_by_na)
+                                                    <div class="mb-1 text-danger">
+                                                        <i class="fa fa-exclamation-triangle"></i>
+                                                        NA has not signed the bill
+                                                    </div>
+                                                @endif
+                                            @endif
+                                        @endif
+                                    </div>
+                                </td>
+                            </tr>
+                        @endforeach
+                        </tbody>
+                    </table>
+                            @elseif($note->hcpPro && $pro->id === $note->hcpPro->id)
+                                <table class="table table-sm tabe-striped mb-3 border-left border-right border-bottom">
+                        <thead class="bg-light">
+                        <tr>
+                            <th class="border-bottom-0 pl-3">HCP</th>
+                            @if($note->ally_pro_id === $pro->id)
+                                <th class="border-bottom-0 pl-3">NA</th>
+                            @endif
+                            <th class="border-bottom-0 w-25 pl-3">Service</th>
+                            {{--<th class="border-bottom-0 w-25 pl-2">Reason</th>--}}
+                            <th class="border-bottom-0 pl-3">Billable</th>
+                            <th class="border-bottom-0 pl-2">Amount</th>
+                            <th class="border-bottom-0 pl-2">Verification</th>
+                            <th class="border-bottom-0"></th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        @foreach ($note->bills as $bill)
+                            <tr>
+                                <td class="pl-3">{{ $bill->hcp->displayName() }}</td>
+                                @if($note->ally_pro_id === $pro->id)
+                                    <td class="pl-3">{{ $note->allyPro->displayName() }}</td>
+                                @endif
+                                <td class="pl-3 {{ $bill->is_cancelled ? 'text-secondary' : '' }}">{{$bill->code}}</td>
+                                {{--<td class="pl-2">
+                                    {{ $bill->reason1 }}
+                                    <div class="text-secondary small">{{ $bill->reason2 }}</div>
+                                </td>--}}
+                                <td class="pl-3">
+                                    @if(strpos(strtolower($bill->code), 'treatment services') !== FALSE)
+                                        <?php
+                                        $totalSeconds = $bill->number_of_units * 3600;
+                                        $remainder = $totalSeconds % 60;
+                                        if ($remainder !== 0) {
+                                            if ($remainder < 30) {
+                                                $totalSeconds = $totalSeconds - $remainder;
+                                            } else {
+                                                $totalSeconds = $totalSeconds + (60 - $remainder);
+                                            }
+                                        }
+                                        ?>
+                                        {{ time_in_hrminsec($totalSeconds) }}
+                                    @else
+                                        @if(!!$bill->number_of_units)
+                                            {{ $bill->number_of_units }} unit(s)
+                                        @else
+                                            -
+                                        @endif
+                                    @endif
+                                </td>
+                                <td class="pl-2">
+                                    @if($bill->hcp_pro_id === $pro->id)
+                                        @if($bill->has_hcp_been_paid)
+                                            <span class="text-dark">Processed:</span><span
+                                                    class="font-weight-bold text-success ml-2">${{ $bill->hcp_payment_amount }}</span>
+                                        @else
+                                            <span class="text-dark">Expected:</span><span
+                                                    class="font-weight-bold text-dark ml-2">{{ $bill->hcp_expected_payment_amount ? '$' . $bill->hcp_expected_payment_amount : '-' }}</span>
+                                        @endif
+                                    @elseif($bill->na_pro_id === $pro->id)
+                                        @if($bill->has_na_been_paid)
+                                            <span class="text-dark">Processed:</span><span
+                                                    class="font-weight-bold text-success ml-2">${{ $bill->na_payment_amount }}</span>
+                                        @else
+                                            <span class="text-dark">Expected:</span><span
+                                                    class="font-weight-bold text-dark ml-2">{{ $bill->na_expected_payment_amount ? '$' . $bill->na_expected_payment_amount : '-' }}</span>
+                                        @endif
+                                    @endif
+                                </td>
+                                <td class="pl-2">
+                                    @if(!$bill->is_cancelled)
+                                        @if(!$bill->is_verified)
+                                            <div class="text-warning-mellow font-weight-bold">Not Verified</div>
+                                        @else
+                                            <div class="text-info font-weight-bold"><i class="fa fa-check"></i> Verified</div>
+                                        @endif
+                                    @endif
+                                </td>
+                                <td>
+                                    <div class="d-flex align-items-center">
+                                        @if(!$bill->is_cancelled)
+                                            @if($bill->is_signed_by_hcp)
+                                                <span class="d-block text-secondary">
+                                                    <i class="fa fa-check"></i>
+                                                    HCP Signed
+                                                </span>
+                                            @else
+                                                <span moe
+                                                      class="d-block {{ $bill->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                                      title="{{ $bill->hcp_pro_id !== $pro->id ? 'Only the bill\'s HCP can sign' : '' }}">
+                                                    <a class="" href="" show start>Sign as HCP</a>
+                                                    <form url="/api/bill/signAsHcp">
+                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                        <p>Sign this bill as HCP?</p>
+                                                        <div class="mb-0">
+                                                            <button class="btn btn-success btn-sm"
+                                                                    submit>Sign</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </span>
+                                            @endif
+                                            @if($bill->na_pro_id === $pro->id)
+                                                <span class="mx-2 text-secondary">|</span>
+                                                @if($bill->is_signed_by_na)
+                                                    <span class="d-block text-secondary">
+                                                        <i class="fa fa-check"></i>
+                                                        NA Signed
+                                                    </span>
+                                                @else
+                                                    <span moe
+                                                          class="d-block {{ $bill->na_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                                          title="{{ $bill->hcp_pro_id !== $pro->id ? 'Only the bill\'s NA can sign' : '' }}">
+                                                        <a class="" href="" show start>Sign as NA</a>
+                                                        <form url="/api/bill/signAsNa">
+                                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                            <p>Sign this bill as NA?</p>
+                                                            <div class="mb-0">
+                                                                <button class="btn btn-success btn-sm"
+                                                                        submit>Sign</button>
+                                                                <button class="btn btn-default border btn-sm"
+                                                                        cancel>Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </span>
+                                                @endif
+                                            @endif
+                                        @endif
+                                        @if(!$bill->has_hcp_been_paid && $pro->pro_type === 'ADMIN')
+                                            <span class="mx-2 text-secondary">|</span>
+                                            <span class="d-block" moe>
+                                                <a class="text-danger" href="" show start>Submit Payment</a>
+                                                <form url="/api/bill/payHcpAmount">
+                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                    <p>Submit payment:</p>
+                                                    <div class="mb-0">
+                                                        <input type="text" class="text form-control form-control-sm"
+                                                               name="hcpPaymentAmount"
+                                                               value="{{$bill->hcp_expected_payment_amount}}"
+                                                               placeholder="amount"><br>
+                                                        <button class="btn btn-primary btn-sm"
+                                                                submit>Submit</button>
+                                                        <button class="btn btn-default border btn-sm"
+                                                                cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </span>
+                                        @endif
+                                        @if(!$bill->has_na_been_paid && $bill->ally && $pro->pro_type === 'ADMIN')
+                                            <span class="d-block" moe relative="">
+                                                <a class="font-weight-bold" href="" show
+                                                   start>Submit Payment For NA</a>
+                                                <form url="/api/bill/payNaAmount" right>
+                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                    <p>Submit Payment For NA</p>
+                                                    <div class="mb-0">
+                                                        <input type="text" class="text form-control form-control-sm"
+                                                               name="naPaymentAmount"
+                                                               value="{{$bill->na_expected_payment_amount}}"
+                                                               placeholder="amount"><br>
+                                                        <button class="btn btn-primary btn-sm"
+                                                                submit>Submit</button>
+                                                        <button class="btn btn-default border btn-sm"
+                                                                cancel>Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </span>
+                                        @endif
+                                        @if($bill->is_cancelled)
+                                            <span class="mx-2 text-secondary">|</span>
+                                            <span class="d-block text-secondary">
+                                                Cancelled
+                                            </span>
+                                            @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
+                                                <div class="ml-2 text-secondary">
+                                                    <i class="fa fa-exclamation-triangle"></i>
+                                                    Not Ack.
+                                                </div>
+                                                <div class="d-block ml-2" moe>
+                                                    <a class="" href="" show start>Ack. Cancellation</a>
+                                                    <form url="/api/bill/acknowledgeCancellation">
+                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                        <p>Acknowledge Cancellation?</p>
+                                                        <div class="mb-0">
+                                                            {{--<input type="text" class="text form-control form-control-sm" name="cancellationMemo" value="{{$bill->cancellation_memo}}" placeholder=""><br>--}}
+                                                            <button class="btn btn-primary btn-sm"
+                                                                    submit>Submit</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            @endif
+
+                                            @if($bill->is_cancellation_acknowledged && !$note->is_billing_marked_done)
+                                                <div class="ml-2 text-secondary">
+                                                    <i class="fa fa-check"></i>
+                                                    Ack.
+                                                </div>
+                                                <div class="d-block ml-2" moe>
+                                                    <a class="" href="" show start>Undo</a>
+                                                    <form url="/api/bill/undoAcknowledgeCancellation">
+                                                        <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                        <p>Undo Acknowledge Cancellation?</p>
+                                                        <div class="mb-0">
+                                                            <button class="btn btn-primary btn-sm"
+                                                                    submit>Submit</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            @endif
+                                        @else
+                                            <span class="mx-2 text-secondary">|</span>
+                                            <span class="d-block" moe>
+                                                <a class="text-danger" href="" show start>Cancel</a>
+                                                <form url="/api/bill/markCancelled" right>
+                                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                                    <p>Cancel this bill?</p>
+                                                    <div class="mb-0">
+                                                        <button class="btn btn-danger btn-sm" submit>Yes</button>
+                                                        <button class="btn btn-default border btn-sm"
+                                                                cancel>No</button>
+                                                    </div>
+                                                </form>
+                                            </span>
+                                        @endif
+                                    </div>
+                                    @include('app.patient.note.flag-bill')
+                                </td>
+                            </tr>
+                        @endforeach
+                        </tbody>
+                    </table>
+                    @endif
+
+
+                </div>
+                    @else
+                        <div class="p-3 d-flex  border-bottom">
+                            <p class="font-weight-bold mb-0 text-secondary">No bills in this note</p>
+                            @include('app/patient/note/_create-bill')
+                        </div>
+                    @endif
+                    </div>
+                @endif
+
+                {{-- generic bills --}}
+                @if($pro->pro_type === 'ADMIN' || ($note->allyPro && $pro->id === $note->allyPro->id))
+                    <div class="screen-only" data-non-segment-section="NA Bills">
+                    @include('app.generic-bills.inline', ['patient' => $patient, 'note' => $note, 'class' => 'p-3 border-bottom', 'label' => 'NA', 'entityType' => 'Note', 'entityUid' => $note->uid])
+                    </div>
+                @endif
+
+                {{-- claims --}}
+                @if($pro->pro_type === 'ADMIN')
+                    <div class="screen-only" data-non-segment-section="Claims">
+                    @if($note->claims->count())
+                        <div class="screen-only p-3">
+                        <div class="d-flex align-items-center mb-2">
+                            <p class="font-weight-bold text-secondary m-0">Claims</p>
+                            @include('app/patient/note/_create-claim')
+                            <div class="ml-auto">
+                                <select class="form-control form-control-sm"
+                                        onchange="fastLoad('{{route('patients.view.notes.view.dashboard', ['patient' => $patient, 'note' => $note])}}?claims-filter=' + this.value)">
+                                    <option value="active" {{!request('claims-filter') || request('claims-filter') === 'active' ? 'selected' : ''}}>Active Claims</option>
+                                    <option value="all" {{request('claims-filter') === 'all' ? 'selected' : ''}}>All Claims</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <table class="table table-sm tabe-striped mb-3 border-left border-right border-bottom">
+                            <thead class="bg-light">
+                            <tr>
+                                <th class="border-bottom-0 pl-2">IID</th>
+                                <th class="border-bottom-0">Details</th>
+                                <th class="border-bottom-0">Status</th>
+                                <th class="border-bottom-0">Submissions</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            @foreach ($note->claims as $claim)
+                                @if($claim->status !== 'CANCELLED' || request('claims-filter') === 'all')
+                                    <tr class="bg-secondary on-hover-opaque">
+                                        <td colspan="5" class="pt-0 pb-1"></td>
+                                    </tr>
+                                    <tr class="{{ $claim->status === 'CANCELLED' ? 'text-secondary bg-light on-hover-opaque' : '' }}">
+                                        <td class="pl-2">
+                                            <div>{{ $claim->iid }}</div>
+                                            <div class="text-sm text-secondary font-weight-bold mt-1">Current Version:</div>
+                                            <div class="text-sm text-secondary">{{$claim->currentVersion ? friendlier_date_time($claim->currentVersion->created_at) : '-'}}</div>
+                                            @if($claim->status === 'CANCELLED')
+                                                <div class="text-secondary font-weight-bold text-sm mt-1">[CANCELLED]</div>
+                                            @else
+                                                <div moe class="text-left mt-1" title="Cancel Claim">
+                                                    <a class="" href="" show start>Cancel</a>
+                                                    <form url="/api/claim/updateStatus">
+                                                        <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                        <input type="hidden" name="status" value="CANCELLED">
+                                                        <p>Cancel this claim?</p>
+                                                        <div class="mb-2">
+                                                            <label for="" class="control-label">Cancellation Memo</label>
+                                                            <textarea name="memo" class="form-control"></textarea>
+                                                        </div>
+                                                        <div class="mb-0">
+                                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            @endif
+                                        </td>
+                                        <td class="p-0 border-left border-right">
+                                            @if($claim->lines->count())
+                                                <table class="table table-sm table-condensed border-0 mb-0">
+                                                    <thead>
+                                                        <tr class="bg-light">
+                                                            <th class="border-0">CPT</th>
+                                                            <th class="border-0">DOS</th>
+                                                            <th class="border-0">ICDs</th>
+                                                        </tr>
+                                                    </thead>
+                                                    <tbody class="pb-3">
+                                                        @foreach($claim->lines as $line)
+                                                            <tr class="claim-line">
+                                                            <td>{{$line->cpt}}
+                                                                <div>Units: <b>{{!@$line->units ? 1 : $line->units}}</b></div>
+                                                            </td>
+                                                            <td class="text-nowrap">{{friendlier_date($line->date_of_service)}}</td>
+                                                            <td>
+                                                                @if(count($line->claimLineIcds))
+                                                                    @foreach($line->claimLineIcds as $icd)
+                                                                        <div>
+                                                                            <b class="c-pointer border-secondary border-bottom" title="{{$icd->description}}">{{$icd->code}}</b>
+                                                                        </div>
+                                                                    @endforeach
+                                                                @else
+                                                                    <p>No ICDs set</p>
+                                                                @endif
+                                                            </td>
+                                                        </tr>
+                                                        @endforeach
+                                                    </tbody>
+                                                </table>
+                                            @else
+                                                <p>No lines for this claim</p>
+                                            @endif
+                                        </td>
+                                        <td class="border-right p-0">
+
+                                            <!-- payer, company, location -->
+                                            <div class="p-1">
+                                                <div class="mt-1">
+                                                    <div>
+                                                    <span class="text-secondary text-sm">Payer (1°): </span>
+                                                    <b>{{$claim->primaryPayer ? $claim->primaryPayer->name : '-'}}</b>
+                                                    @if(0 && $claim->status !== 'CANCELLED')
+                                                            <span moe class="ml-1">
+                                                            <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
+                                                            <form url="/api/claim/putPrimaryPayer">
+                                                                <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                <div class="mb-2">
+                                                                    <select name="primaryPayerUid" class="form-control form-control-sm">
+                                                                        <option value="">-- select --</option>
+                                                                        @foreach($note->hcpPro->companyProPayers as $companyProPayer)
+                                                                            <option value="{{$companyProPayer->payer->uid}}"
+                                                                                    {{$claim->primaryPayer && $claim->primaryPayer->uid === $companyProPayer->payer->uid ? 'selected' : ''}}>{{$companyProPayer->payer->name}}</option>
+                                                                        @endforeach
+                                                                    </select>
+                                                                </div>
+                                                                <div class="mb-0">
+                                                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                </div>
+                                                            </form>
+                                                        </span>
+                                                            @if($claim->primaryPayer)
+                                                                <span moe class="ml-1">
+                                                            <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
+                                                            <form url="/api/claim/wipePrimaryPayer">
+                                                                <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                <p>Wipe payer from this claim?</p>
+                                                                <div class="mb-0">
+                                                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                </div>
+                                                            </form>
+                                                        </span>
+                                                            @endif
+                                                        @endif
+                                                    </div>
+                                                    <div class="py-1 border-bottom d-flex align-items-center">
+                                                        <span class="text-secondary text-sm pr-1">Status: </span>
+                                                        <div>
+                                                            {{$claim->status ? $claim->status : '(not set)'}}
+                                                            @if($claim->status !== 'CANCELLED')
+                                                                <span moe class="d-inline-block text-left ml-1" title="Update Status">
+                                                                    <a class="" href="" show start><i class="fa fa-edit"></i></a>
+                                                                    <form url="/api/claim/updateStatus">
+                                                                        <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                        <div class="mb-2">
+                                                                            <label for="" class="control-label">Status</label>
+                                                                            <select name="status" class="form-control form-control-sm" required>
+                                                                                <option value="">-- select --</option>
+                                                                                <option value="NEW" {{$claim->status === 'NEW' ? 'selected' : ''}}>New</option>
+                                                                                <option value="PICKED_UP" {{$claim->status === 'PICKED_UP' ? 'selected' : ''}}>Picked Up</option>
+                                                                                <option value="SUBMITTED" {{$claim->status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
+                                                                                <option value="IN_PROCESS" {{$claim->status === 'IN_PROCESS' ? 'selected' : ''}}>In Process</option>
+                                                                                <option value="ACCEPTED" {{$claim->status === 'ACCEPTED' ? 'selected' : ''}}>Accepted</option>
+                                                                                <option value="REJECTED" {{$claim->status === 'REJECTED' ? 'selected' : ''}}>Rejected</option>
+                                                                                <option value="ABANDONED" {{$claim->status === 'ABANDONED' ? 'selected' : ''}}>Abandoned</option>
+                                                                            </select>
+                                                                        </div>
+                                                                        <div class="mb-2">
+                                                                            <label for="" class="control-label">Status Memo</label>
+                                                                            <textarea name="memo" class="form-control"></textarea>
+                                                                        </div>
+                                                                        <div class="mb-0">
+                                                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                        </div>
+                                                                    </form>
+                                                                </span>
+                                                            @endif
+                                                        </div>
+                                                        @if($claim->status_memo)
+                                                            <div class="text-secondary font-italic text-sm">{{$claim->status_memo}}</div>
+                                                        @endif
+                                                    </div>
+                                                </div>
+
+                                                <div class="mt-1">
+                                                    <span class="text-secondary text-sm">Payer (2°): </span>
+                                                    <b>-</b>
+                                                </div>
+
+                                                <div class="mt-1">
+                                                    <span class="text-secondary text-sm">Company: </span>
+                                                    <b>{{$claim->companyPro && $claim->companyPro->company ? $claim->companyPro->company->name : '-'}}</b>
+                                                    @if(0 && $claim->status !== 'CANCELLED')
+                                                        <span moe class="ml-1">
+                                                            <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
+                                                            <form url="/api/claim/putCompanyPro">
+                                                                <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                <div class="mb-2">
+                                                                    <select name="companyProUid" class="form-control form-control-sm">
+                                                                        <option value="">-- select --</option>
+                                                                        @foreach($note->hcpPro->companyProPayers as $companyProPayer)
+                                                                            <option value="{{$companyProPayer->companyPro->uid}}"
+                                                                                    {{$claim->companyPro && $claim->companyPro->uid === $companyProPayer->companyPro->uid ? 'selected' : ''}}>{{$companyProPayer->company->name}}</option>
+                                                                        @endforeach
+                                                                    </select>
+                                                                </div>
+                                                                <div class="mb-0">
+                                                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                </div>
+                                                            </form>
+                                                        </span>
+                                                        @if($claim->companyPro && $claim->companyPro->company)
+                                                            <span moe class="ml-1">
+                                                                <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
+                                                                <form url="/api/claim/wipeCompanyPro">
+                                                                    <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                    <p>Wipe company from this claim?</p>
+                                                                    <div class="mb-0">
+                                                                        <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                    </div>
+                                                                </form>
+                                                            </span>
+                                                        @endif
+                                                    @endif
+                                                </div>
+
+                                                <div class="mt-1">
+                                                    <span class="text-secondary text-sm">Location: </span>
+                                                    <b>{{$claim->companyLocation ? $claim->companyLocation->line1 . ', ' . $claim->companyLocation->city : '-'}}</b>
+                                                    @if(0 && $claim->status !== 'CANCELLED')
+                                                        <span moe class="ml-1">
+                                                            <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
+                                                            <form url="/api/claim/putCompanyLocation">
+                                                                <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                <div class="mb-2">
+                                                                    <select name="companyLocationUid" class="form-control form-control-sm">
+                                                                        <option value="">-- select --</option>
+                                                                        @if($claim->company && $claim->company->locations)
+                                                                            @foreach($claim->company->locations as $location)
+                                                                                <option value="{{$location->uid}}"
+                                                                                        {{$claim->companyLocation && $claim->companyLocation->uid === $location->uid ? 'selected' : ''}}>
+                                                                                    {{$location->line1 . ', ' . $location->city}}
+                                                                                </option>
+                                                                            @endforeach
+                                                                        @endif
+                                                                    </select>
+                                                                </div>
+                                                                <div class="mb-0">
+                                                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                </div>
+                                                            </form>
+                                                        </span>
+                                                        @if($claim->companyLocation)
+                                                            <span moe class="ml-1">
+                                                            <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
+                                                            <form url="/api/claim/wipeCompanyLocation">
+                                                                <input type="hidden" name="uid" value="{{$claim->uid}}">
+                                                                <p>Wipe location from this claim?</p>
+                                                                <div class="mb-0">
+                                                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                </div>
+                                                            </form>
+                                                        </span>
+                                                        @endif
+                                                    @endif
+                                                </div>
+                                            </div>
+                                        </td>
+                                        <td class="p-0 border-left border-right">
+                                            <table class="table table-sm table-condensed border-0 mb-0">
+                                                @if($claim->status !== 'CANCELLED')
+                                                    <thead>
+                                                    <tr class="">
+                                                        <th colspan="3" class="border-top-0 border-bottom">
+                                                            <div>
+                                                                <span moe class="d-block" title="Submit Claim">
+                                                                    <a class="" href="" show start>Generate Submission to Payer (1°)</a>
+                                                                    <form url="/api/mbClaim/createFromClaimForPrimaryPayer">
+                                                                        <input type="hidden" name="claimUid" value="{{$claim->uid}}">
+                                                                        <p>Generate Submission?</p>
+                                                                        <div class="mb-0">
+                                                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                        </div>
+                                                                    </form>
+                                                                </span>
+                                                            </div>
+                                                        </th>
+                                                    </tr>
+                                                    </thead>
+                                                @endif
+                                                @if(count($claim->mbClaims))
+                                                    <thead>
+                                                    <tr class="bg-light">
+                                                        <th class="border-0">Created</th>
+                                                        <th class="border-0">Status</th>
+                                                        <th class="border-0">&nbsp;</th>
+                                                    </tr>
+                                                    </thead>
+                                                    <tbody class="pb-3">
+                                                    @foreach($claim->mbClaims as $mbClaim)
+                                                        <tr>
+                                                            <td>
+                                                                @if($mbClaim->claim_version_id !== $claim->current_version_id)
+                                                                    <i class="fa fa-exclamation-triangle text-warning-mellow text-sm" title="This submission was generated using an older version of the claim"></i>
+                                                                @else
+                                                                    <i class="fa fa-asterisk text-secondary text-sm" title="This submission is up to date"></i>
+                                                                @endif
+                                                                <a native target="_blank"
+                                                                   open-in-stag-popup
+                                                                   title="Submission Details"
+                                                                   href="{{route('mb-claim', ['patient' => $patient, 'mbClaim' => $mbClaim])}}">
+                                                                    {{ friendlier_date_time($mbClaim->created_at) }}
+                                                                </a>
+                                                            </td>
+                                                            <td>
+                                                                {{$mbClaim->status}}
+                                                                @if($mbClaim->status_memo)
+                                                                    <div class="font-italic text-secondary text-sm">{{$mbClaim->status_memo}}</div>
+                                                                @endif
+                                                            </td>
+                                                            <td class="text-right pr-2">
+                                                                 <span moe relative title="Submit Claim">
+                                                                    <a class="" href="" show start><i class="fa fa-edit"></i></a>
+                                                                    <form url="/api/mbClaim/updateStatus" right>
+                                                                        <input type="hidden" name="uid" value="{{$mbClaim->uid}}">
+                                                                        <div class="form-group">
+                                                                            <label for="" class="control-label">Status</label>
+                                                                            <select name="status" class="form-control form-control-sm" required>
+                                                                                <option value="">-- select --</option>
+                                                                                <option value="NEW" {{$mbClaim->status === 'NEW' ? 'selected' : ''}}>New</option>
+                                                                                <option value="PROCESSING" {{$mbClaim->status === 'PROCESSING' ? 'selected' : ''}}>Processing</option>
+                                                                                <option value="SUBMITTED" {{$mbClaim->status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
+                                                                                <option value="CANCELLED" {{$mbClaim->status === 'CANCELLED' ? 'selected' : ''}}>Cancelled</option>
+                                                                            </select>
+                                                                        </div>
+                                                                        <div class="form-group">
+                                                                            <label for="" class="control-label">Status Memo</label>
+                                                                            <textarea name="memo" class="form-control"></textarea>
+                                                                        </div>
+                                                                        <div class="mb-0">
+                                                                            <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                                        </div>
+                                                                    </form>
+                                                                </span>
+                                                                <a class="ml-1" target="_blank" native href="/api/mbClaim/downloadEDI/{{$mbClaim->uid}}" show start><i class="fa fa-file-download"></i></a>
+                                                                <a class="ml-1 text-success" href="" show start><i class="fa fa-arrow-right"></i></a>
+                                                            </td>
+                                                        </tr>
+                                                    @endforeach
+                                                    </tbody>
+                                                @else
+                                                    <tbody>
+                                                        <tr>
+                                                            <td colspan="3">
+                                                                <p class="p-1 text-secondary m-0">No submissions in this claim</p>
+                                                            </td>
+                                                        </tr>
+                                                    </tbody>
+                                                @endif
+                                            </table>
+                                        </td>
+                                    </tr>
+                                @endif
+                            @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                    @else
+                        <div class="screen-only p-3 d-flex">
+                        <p class="font-weight-bold mb-0 text-secondary">No claims in this note</p>
+                        @include('app/patient/note/_create-claim')
+                    </div>
+                    @endif
+                    </div>
+                @endif
+
+                {{-- addendums --}}
+                @if($note->is_signed_by_hcp)
+                <div class="border-top p-3" data-non-segment-section="Addendums">
+                    @if($note->addendums->count())
+                        <div class="">
+                            <div class="d-flex align-items-center mb-2">
+                                <p class="font-weight-bold text-secondary m-0">Addendums</p>
+                                @include('app/patient/note/_create-addendum')
+                            </div>
+                            <table class="table table-sm tabe-striped border-left border-right border-bottom m-0">
+                                <thead class="bg-light">
+                                <tr>
+                                    <th class="border-bottom-0 pl-2 w-75">Addendum</th>
+                                    <th class="border-bottom-0">Created</th>
+                                    <th class="border-bottom-0 delete-column"></th>
+                                </tr>
+                                </thead>
+                                <tbody>
+                                @foreach ($note->addendums as $addendum)
+                                    <tr>
+                                        <td class="pl-2">{{ $addendum->memo }}</td>
+                                        <td class="">{{ friendly_date_time($addendum->created_at, false)}}</td>
+                                        <td>
+                                            <div class="d-flex align-items-center">
+                                                <div moe relative class="mr-2">
+                                                    <a href="" show start><i class="fa fa-edit"></i></a>
+                                                    <form url="/api/noteAddendum/updateMemo" right>
+                                                        <input type="hidden" name="uid" value="{{$addendum->uid}}">
+                                                        <div class="mb-2 d-block">
+                                                            <label class="d-block text-sm text-secondary mb-1">Addendum</label>
+                                                            <textarea class="form-control form-control-sm" name="memo" rows="5">{{$addendum->memo}}</textarea>
+                                                        </div>
+                                                        <div class="form-group mb-0">
+                                                            <button class="btn btn-primary btn-sm mr-1" submit>Submit</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                                <div moe relative class="mr-1">
+                                                    <a href="" show start class="text-danger"><i class="fa fa-trash"></i></a>
+                                                    <form url="/api/noteAddendum/remove" right>
+                                                        <input type="hidden" name="uid" value="{{$addendum->uid}}">
+                                                        <p>Remove this addendum?</p>
+                                                        <div class="form-group mb-0">
+                                                            <button class="btn btn-danger btn-sm mr-1" submit>Yes</button>
+                                                            <button class="btn btn-default border btn-sm" cancel>No</button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            </div>
+                                        </td>
+                                    </tr>
+                                @endforeach
+                                </tbody>
+                            </table>
+                        </div>
+                    @else
+                        <div class="d-flex">
+                            <p class="font-weight-bold mb-0 text-secondary">No addendums in this note</p>
+                            @include('app/patient/note/_create-addendum')
+                        </div>
+                    @endif
+                </div>
+                @endif
+
+                <div class="screen-only">
+                    @include('app/patient/note/_cancel-signed-note')
+                </div>
+
+                </div>
+
+                @if($isVisitTemplateBased && !$note->is_signed_by_hcp)
+                <div class="position-sticky note-bottom-toolbar border-top border-info p-0 bg-aliceblue d-flex align-items-stretch screen-only">
+                    <div class="nbt-container border-right border-info">
+                        <div native target="_blank"
+                             class="c-pointer d-inline-flex align-items-center px-2 py-1"
+                             open-in-stag-popup
+                             title="Medrisk Vigilence"
+                             popup-style="overflow-visible mrv-content"
+                             href="/mrv-summary/{{$note->uid}}">
+                            <span>MRV</span>
+                        </div>
+                    </div>
+                    <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                        <div native target="_blank"
+                             class="c-pointer d-inline-flex align-items-center medications-center-trigger px-2 py-1"
+                             open-in-stag-popup
+                             mc-initer="medications-center-{{$note->id}}"
+                             title="Medications Center"
+                             popup-style="overflow-visible"
+                             href="/medications-center/{{$patient->uid}}/{{$note->uid}}">
+                            <i class="fa fa-bolt mr-1"></i>
+                            <span>Rx</span>
+                        </div>
+                    </div>
+                    <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                        <div native target="_blank"
+                             class="c-pointer d-inline-flex align-items-center problems-center-trigger px-2 py-1"
+                             open-in-stag-popup
+                             mc-initer="problems-center-{{$note->id}}"
+                             title="Problems Center"
+                             popup-style="overflow-visible"
+                             href="/problems-center/{{$patient->uid}}/{{$note->uid}}">
+                            <i class="fa fa-bolt mr-1"></i>
+                            <span>Dx</span>
+                        </div>
+                    </div>
+                    <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                        <div native target="_blank"
+                             class="c-pointer d-inline-flex align-items-center goals-center-trigger px-2 py-1"
+                             open-in-stag-popup
+                             mc-initer="goals-center-{{$note->id}}"
+                             title="Goals Center"
+                             popup-style="overflow-visible"
+                             href="/goals-center/{{$patient->uid}}/{{$note->uid}}">
+                            <i class="fa fa-bolt mr-1"></i>
+                            <span>Goals</span>
+                        </div>
+                    </div>
+                    <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                        <div native target="_blank"
+                             class="c-pointer d-inline-flex align-items-center allergies-center-trigger px-2 py-1"
+                             open-in-stag-popup
+                             mc-initer="allergies-center-{{$note->id}}"
+                             title="Allergies Center"
+                             popup-style="overflow-visible"
+                             href="/allergies-center/{{$patient->uid}}/{{$note->uid}}">
+                            <i class="fa fa-bolt mr-1"></i>
+                            <span>Allergies</span>
+                        </div>
+                    </div>
+                    <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                        <div native target="_blank"
+                             class="c-pointer d-inline-flex align-items-center careteam-center-trigger px-2 py-1"
+                             open-in-stag-popup
+                             mc-initer="careteam-center-{{$note->id}}"
+                             title="Care Team Center"
+                             popup-style="overflow-visible"
+                             href="/careteam-center/{{$patient->uid}}/{{$note->uid}}">
+                            <i class="fa fa-bolt mr-1"></i>
+                            <span>Care Team</span>
+                        </div>
+                    </div>
+                    <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                        <a native="" target="_top"
+                           class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                           data-non-segment-target="Incoming Reports" href="#">Inc. Rpts.</a>
+                    </div>
+                    <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                        <a native="" target="_top"
+                           class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                           data-non-segment-target="Handouts" href="#">Handouts</a>
+                    </div>
+                    <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                        <a native="" target="_top"
+                           class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                           data-non-segment-target="Prescriptions" href="#">ERx</a>
+                    </div>
+                    @if($pro->pro_type === 'ADMIN')
+                        <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                            <a native="" target="_top"
+                               class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                               data-non-segment-target="HCP Bills" href="#">HCP Bills</a>
+                        </div>
+                        <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                            <a native="" target="_top"
+                               class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                               data-non-segment-target="NA Bills" href="#">NA Bills</a>
+                        </div>
+                    @else
+                        @if($note->hcpPro && $pro->id === $note->hcpPro->id)
+                            <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                                <a native="" target="_top"
+                                   class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                                   data-non-segment-target="HCP Bills" href="#">Bills</a>
+                            </div>
+                        @endif
+                        @if($note->allyPro && $pro->id === $note->allyPro->id)
+                            <div class="nbt-container border-right border-info d-inline-flex align-self-stretch">
+                                <a native="" target="_top"
+                                   class="c-pointer d-inline-flex align-items-center handouts-trigger px-2 py-1 text-dark"
+                                   data-non-segment-target="NA Bills" href="#">Bills</a>
+                            </div>
+                        @endif
+                    @endif
+                </div>
+                @endif
+
+                </div>
+                @if(1 || !$hasRightSegments)
+                    @include('app.patient.note.rhs-sidebar')
+                @endif
+            </div>
+        </div>
+    </div>
+    <div class="note-templates-underlay"></div>
+    @include('app.patient.note.dashboard_script')
+    @if(!$isVisitTemplateBased)
+    @include('app.patient.canvas-sections.canvas-editor-modal', ['key' => 'rx', 'class' => 'wide', 'noEditLink' => true])
+    <script>
+        (function() {
+            function init() {
+                $('.trigger-clone')
+                    .off('click.clone')
+                    .on('click.clone', function() {
+                        $.post('/api/note/clone', {
+                            uid: $(this).attr('data-uid')
+                        }, function(_data) {
+                            if(_data) {
+                                if(_data.success) {
+                                    toastr.success('Note cloned successfully');
+                                    fastLoad('/patients/view/{{$patient->uid}}/notes/view/' + _data.data);
+                                }
+                                else {
+                                    toastr.error(_data.message);
+                                }
+                            }
+                            else {
+                                toastr.error('Unable to clone the note!');
+                            }
+                        }, 'json');
+                    });
+            }
+            addMCInitializer('non-visit-template', init, '#note-single-header');
+        })();
+    </script>
+    @endif
+    @if($isVisitTemplateBased)
+    <script>
+        (function() {
+            function init() {
+                @if(1 || !$hasRightSegments)
+                fixTreeTopAndHeight();
+                $(window).on('resize', fixTreeTopAndHeight);
+                $(window).on('scroll', fixTreeTopAndHeight);
+                $('.note-tree-node>a[data-segment-uid]')
+                    .off('click.scroll-to-segment')
+                    .on('click.scroll-to-segment', function() {
+                        let section = $('div.note-section[data-segment-uid="' + $(this).attr('data-segment-uid') + '"]').first();
+                        if(section.length) {
+                            section[0].scrollIntoView({
+                                behavior: "smooth",
+                                block: "center",
+                                inline: "center"
+                            });
+                            section.addClass('spot-highlight');
+                            setTimeout(() => {
+                                section.removeClass('spot-highlight');
+                            }, 1500);
+                            $('.note-tree-node.active').removeClass('active');
+                            $(this).closest('.note-tree-node').addClass('active');
+                        }
+                        return false;
+                    });
+                // clicking node parent - go to first child
+                $('.note-tree-node.note-tree-heading>a:not([data-segment-uid])')
+                    .off('click.scroll-to-first-child-segment')
+                    .on('click.scroll-to-first-child-segment', function() {
+                         $(this).parent().find('>.note-tree-children>.note-tree-node>a[data-segment-uid]').first().trigger('click');
+                         return false;
+                    });
+                @endif
+                $(document)
+                    .off('click.scroll-to-non-segment', '[data-non-segment-target]')
+                    .on('click.scroll-to-non-segment', '[data-non-segment-target]', function() {
+                        closeStagPopup(true);
+                        let section = $('div[data-non-segment-section="' + $(this).attr('data-non-segment-target') + '"]').first();
+                        if(section.length) {
+                            section[0].scrollIntoView({
+                                behavior: "smooth",
+                                block: "center",
+                                inline: "center"
+                            });
+                            section.addClass('spot-highlight');
+                            setTimeout(() => {
+                                section.removeClass('spot-highlight');
+                            }, 1500);
+                            $('.note-tree-node.active').removeClass('active');
+                            $(this).closest('.note-tree-node').addClass('active');
+                        }
+                        return false;
+                    });
+
+                // update disclaimers on fastReload()
+                // NOTE: this is NOT the ideal place to put this
+                @if(!$note->is_signed_by_hcp)
+                refreshSegment('disclaimers');
+                @endif
+            }
+            function fixTreeTopAndHeight() {
+                let tree = $('#note-lhs-tree'), noteCardHeader = $('#note-card-header');
+                if(!noteCardHeader.length) return;
+                let resultTop = (noteCardHeader.offset().top + noteCardHeader.outerHeight(true)) - $(window).scrollTop();
+                if(resultTop <= 55) {
+                    @if(!$note->is_signed_by_hcp)
+                    tree.addClass('fixed');
+                    @else
+                    tree.addClass('fixed-left');
+                    @endif
+                }
+                else {
+                    @if(!$note->is_signed_by_hcp)
+                    tree.removeClass('fixed');
+                    @else
+                    tree.removeClass('fixed-left');
+                    @endif
+                    tree.css('height', 'calc(100vh - ' + resultTop + 'px)');
+                    tree.css('max-height', 'calc(100vh - ' + resultTop + 'px)');
+                }
+            }
+            addMCInitializer('note-tree', init, '#note-lhs-tree');
+        })();
+    </script>
+    <script>
+        (function() {
+            function init() {
+                fixRhsSidebarTopAndHeight();
+                $(window).on('resize', fixRhsSidebarTopAndHeight);
+                $(window).on('scroll', fixRhsSidebarTopAndHeight);
+            }
+            function fixRhsSidebarTopAndHeight() {
+                let rhsSidebar = $('#note-rhs-sidebar'), noteCardHeader = $('#note-card-header');
+                if(!noteCardHeader.length) return;
+                let resultTop = (noteCardHeader.offset().top + noteCardHeader.outerHeight(true)) - $(window).scrollTop();
+                if(resultTop <= 55) {
+                    @if(!$note->is_signed_by_hcp)
+                    rhsSidebar.addClass('fixed');
+                    rhsSidebar.closest('.note-container').addClass('rhs-sidebar-fixed');
+                    @endif
+                }
+                else {
+                    rhsSidebar.removeClass('fixed');
+                    rhsSidebar.closest('.note-container').removeClass('rhs-sidebar-fixed');
+                    rhsSidebar.css('height', 'calc(100vh - ' + resultTop + 'px)');
+                    rhsSidebar.css('max-height', 'calc(100vh - ' + resultTop + 'px)');
+                }
+            }
+            addMCInitializer('rhs-sidebar', init, '#note-rhs-sidebar');
+        })();
+    </script>
+
+        @if($isVisitTemplateBased)
+        <script>
+            (function() {
+                function init() {
+                    @if($hasRightSegments)
+                    initVSplitter('stag-note', $('.note-left-panel'), $('.note-right-panel'));
+                    initStagScrollbar({{$note->is_signed_by_hcp ? 1 : 34}});
+                    @endif
+                    addMCHook('onNoteMethodUpdate', function() {
+                        refreshSegment('disclaimers');
+                        fastReload();
+                    });
+                    $(document)
+                        .off('click.scroll-to-non-segment', '[data-non-segment-target]')
+                        .on('click.scroll-to-non-segment', '[data-non-segment-target]', function() {
+                            closeStagPopup(true);
+                            let section = $('div[data-non-segment-section="' + $(this).attr('data-non-segment-target') + '"]').first();
+                            if(section.length) {
+                                section[0].scrollIntoView({
+                                    behavior: "smooth",
+                                    block: "center",
+                                    inline: "center"
+                                });
+                                section.addClass('spot-highlight');
+                                setTimeout(() => {
+                                    section.removeClass('spot-highlight');
+                                }, 1500);
+                                $('.note-tree-node.active').removeClass('active');
+                                $(this).closest('.note-tree-node').addClass('active');
+                            }
+                            return false;
+                        });
+                }
+                addMCInitializer('soap-visit', init, '#note-single-header');
+            })();
+        </script>
+        @endif
+    @endif
+
+    @endsection
+@if(!$isVisitTemplateBased)
+@section('left-nav-content')
+    @if(!$note->is_signed_by_hcp)
+    <div class="left-nav-content" id="note-sections-app">
+        <div class="note-widget-title px-2 py-1">Note Sections</div>
+        <input type="search" class="d-block w-100 border-0 outline-0 px-2 py-1"
+               v-model="q" placeholder="Filter">
+        <div class="border-top py-1">
+            <div v-for="section in sections"
+                 v-show="section.title.toLowerCase().indexOf(q.toLowerCase()) !== -1">
+                <div class="d-flex pr-1 align-items-center note-widget-item c-pointer"
+                     :title="section.title + ' - Click to remove'"
+                     v-if="section.used"
+                     v-on:click.once="remove(section.section_uid)">
+                    <span class="mx-2">
+                        <a class="font-12 text-secondary" href="#">
+                            <i class="fa fa-minus-circle"></i>
+                        </a>
+                    </span>
+                    <span class="font-smaller text-ellipsis">
+                        @{{section.title}}
+                    </span>
+                </div>
+                <div class="d-flex pr-1 align-items-center note-widget-item c-pointer"
+                     :title="section.title + ' - Click to add'"
+                     v-if="!section.used"
+                     v-on:click.once="add(section.uid, section.internal_name)">
+                    <span class="mx-2">
+                        <a class="font-12" href="#">
+                            <i class="fa fa-plus-circle"></i>
+                        </a>
+                    </span>
+                    <span class="font-smaller text-ellipsis">
+                        @{{section.title}}
+                    </span>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        (function() {
+            function initSectionsWidget() {
+                var allSections = <?= json_encode($allSections) ?>;
+                new Vue({
+                    el: '#note-sections-app',
+                    delimiters: ['@{{', '}}'],
+                    data: {
+                        q: '',
+                        sections: allSections
+                    },
+                    methods: {
+                        add: function(_uid, _section) {
+                            $.post('/api/section/create', {
+                                noteUid: '{{$note->uid}}',
+                                sectionTemplateUid: _uid,
+                            }, function(_data) {
+                                if(_data) {
+                                    if(_data.success) {
+                                        fastReload();
+                                    }
+                                    else {
+                                        toastr.error(_data.message);
+                                    }
+                                }
+                                else {
+                                    toastr.error('Unable to add section!');
+                                }
+                            }, 'json');
+                        },
+                        remove: function(_uid) {
+                            $.post('/api/section/deactivate', {
+                                uid: _uid,
+                                memo: 'Deactivated from note',
+                            }, function(_data) {
+                                if(_data) {
+                                    if(_data.success) {
+                                        fastReload();
+                                    }
+                                    else {
+                                        toastr.error(_data.message);
+                                    }
+                                }
+                                else {
+                                    toastr.error('Unable to remove section!');
+                                }
+                            }, 'json');
+                        }
+                    }
+                });
+
+                $('div[embed]').each(function() {
+                    $(this).load($(this).attr('embed'));
+                });
+            }
+            addMCInitializer('note-sections-widget', initSectionsWidget, '#note-sections-app');
+        })();
+    </script>
+    @endif
+@endsection
+@endif

+ 13 - 242
resources/views/app/patient/note/dashboard.blade.php

@@ -148,262 +148,33 @@ use App\Models\Handout;
         <div class="card-header d-flex align-items-start px-3 py-2 border-bottom rounded-0" id="note-card-header">
             <div class="pr-2">
                 {{$note->title}}
-                @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
-                    <div moe class="ml-1">
-                        <a href="" show start><i class="fa fa-edit"></i></a>
-                        <form url="/api/note/putTitle">
-                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                            <div class="mb-2">
-                                <input type="text" name="title" value="{{$note->title}}" class="form-control form-control-sm"
-                                       placeholder="Title">
-                            </div>
-                            <div class="form-group mb-0">
-                                <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                            </div>
-                        </form>
-                    </div>
-                    @if($note->visitTemplate && $note->visitTemplate->internal_name == 'omega_soap_visit' &&  $note->new_or_fu_or_na !== 'NEW')
-                        <div moe relative class="d-inline border-left pl-2 ml-2">
-                            <a start show>Clone</a>
-                            <form url="/api/visit/clone" class="mcp-theme-1" left
-                                  redir="/patients/view/{{$patient->uid}}/notes/view/[data]">
-                                <input type="hidden" name="visitToCloneUid" value="{{$note->uid}}">
-                                <div class="mb-2">
-                                    <label for="" class="text-sm text-secondary mb-1">Effective Date</label>
-                                    <input type="date" name="effectiveDate" class="form-control input-sm" value="{{get_current_date($pro->display_timezone)}}">
-                                </div>
-                                <div class="mb-2">
-                                    <label for="" class="text-secondary text-sm mb-1">New/Follow-up</label>
-                                    <div class="d-flex align-items-baseline py-1">
-                                        <label class="mr-3 my-0 d-inline-flex align-items-center c-pointer">
-                                            <input type="radio" name="newOrFuOrNa" value="NEW" required>
-                                            <span class="ml-1 text-dark">New</span>
-                                        </label>
-                                        <label class="my-0 d-inline-flex align-items-center c-pointer">
-                                            <input type="radio" name="newOrFuOrNa" value="FU" required checked>
-                                            <span class="ml-1 text-dark">Follow-Up</span>
-                                        </label>
-                                    </div>
-                                </div>
-
-                                <div class="mb-2">
-                                    <label for="" class="text-sm text-secondary mb-1">Method</label>
-                                    <select name="noteContactMethod" id="" class="form-control input-sm">
-                                        <option value="">--select--</option>
-                                        <option value="VIDEO">Video</option>
-                                        <option value="AUDIO">Audio</option>
-                                        <option value="IN_CLINIC">In Clinic</option>
-                                        <option value="HOUSE_CALL">House Call</option>
-                                    </select>
-                                </div>
-                                <div class="m-0">
-                                    <button submit class="btn btn-primary btn-sm">submit</button>
-                                </div>
-                            </form>
-                        </div>
-                    @endif
-                @endif
             </div>
             <div class="px-2 border-left border-right">
                 <div class="d-flex">
-                    <span class="mr-2">{{friendly_date_time($note->effective_dateest, false, '')}}</span>
-                    @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
-                    <span moe class="ml-auto">
-                        <a href="" show start><i class="fa fa-calendar"></i></a>
-                        <form url="/api/note/putEffectiveDateEST">
-                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                            <div class="mb-2">
-                                <label for="" class="text-secondary text-sm">Effective date EST</label>
-                                <input type="date" name="effectiveDateEST" value="{{$note->effective_dateest}}" class="form-control form-control-sm">
-                            </div>
-                            <div class="mb-0">
-                                <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                            </div>
-                        </form>
-                    </span>
-                    @endif
+                    <span>{{friendly_date_time($note->effective_dateest, false, '')}}</span>
                 </div>
             </div>
 
-            {{--<div class="px-2 border-left border-right">
-                <div class="d-flex">
-                    <span class="mr-2">{{friendly_time($note->effective_time, '')}}</span>
-                    @if(!$note->is_signed_by_hcp)
-                        <span moe class="ml-auto">
-                            <a href="" show start><i class="fa fa-clock"></i></a>
-                            <form url="/api/note/putEffectiveTime">
-                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                <div class="mb-2">
-                                    <label for="" class="text-secondary text-sm">Effective time </label>
-                                    <input type="time" name="effectiveTime" value="{{ date("H:i", strtotime($note->effective_time)) }}" class="form-control form-control-sm">
-                                </div>
-                                <div class="mb-0">
-                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </span>
-                    @endif
-                </div>
-            </div>--}}
-
             <div class="px-2 border-right">
                 <div class="d-flex">
-                    <span><span class="text-secondary">HCP:</span> {{$note->hcpPro->displayName()}}</span>
-                    @if($pro->pro_type === 'ADMIN')
-                    <div moe class="ml-2">
-                        <a href="" show start><i class="fa fa-edit"></i></a>
-                        <form url="/api/note/putHcp">
-                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                            <div class="mb-2">
-                                <select provider-search data-pro-uid="{{ @$note->hcpPro->uid }}"
-                                        name="hcpProUid" class="form-control form-control-sm">
-                                    <option value="">-- Select HCP Pro --</option>
-                                </select>
-                            </div>
-                            <div class="mb-0">
-                                <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                            </div>
-                        </form>
-                    </div>
-                    @endif
+                    <span><span class="text-secondary">HCP:</span> {{$note->hcpPro->name_first}} {{$note->hcpPro->name_last}}</span>
                 </div>
             </div>
 
-
-            @if($performer->pro->pro_type == 'ADMIN' || ($note->allyPro && $note->allyPro->uid === $performer->pro->uid))
-                <span class="px-2 border-right d-flex">
-                    @if($note->allyPro)
-                        <span class="mr-2"><span class="text-secondary">NA:</span>  {{$note->allyPro->name_first}} {{$note->allyPro->name_last}}</span>
-                        @if($performer->pro->pro_type == 'ADMIN')
-                            <span class="d-inline-block" moe>
-                                <a class="text-danger" href="" show start>
-                                    <i class="fa fa-edit"></i>
-                                </a>
-                                <form url="/api/note/putNa">
-                                    <input type="hidden" name="uid" value="{{$note->uid}}">
-                                    <div class="mb-2">
-                                        <select provider-search data-pro-uid="{{ @$note->allyPro->uid }}"
-                                                name="naProUid" class="form-control form-control-sm">
-                                            <option value="">-- Select Ally Pro --</option>
-                                        </select>
-                                    </div>
-                                    <div class="mb-2">
-                                        <textarea class="form-control" name="memo" placeholder="memo"></textarea>
-                                    </div>
-                                    <div class="mb-0">
-                                        <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                    </div>
-                                </form>
-                            </span>
-                            <span class="inline-block ml-2"></span>
-                            <span class="d-inline-block" moe>
-                                <a class="text-danger" href="" show start>
-                                    <i class="fa fa-times"></i>
-                                </a>
-                                <form url="/api/note/removeNa">
-                                    <input type="hidden" name="uid" value="{{$note->uid}}">
-                                    <p>Remove NA ssss?</p>
-                                    <div class="mb-0">
-                                        <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                    </div>
-                                </form>
-                            </span>
-                        @endif
-                    @else
-                        <span class="mr-2"><span class="text-secondary">NA:</span> - </span>
-                        <span class="d-block" moe>
-                            <a class="" href="" show start>
-                                <i class="fa fa-edit"></i>
-                            </a>
-                            <form url="/api/note/putNa">
-                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                <div class="form-group">
-                                    <label for="" class="control-label">NA</label>
-                                    <select name="naProUid" class="form-control" provider-search>
-                                        <option value="">--select--</option>
-                                    </select>
-                                </div>
-                                <div class="mb-0">
-                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </span>
-                    @endif
-
-                </span>
-            @endif
-
-
             <div class="px-2 border-right">
                 <div class="d-flex">
-                    <span class="mr-2"><span class="text-secondary">Type:</span> {{$note->new_or_fu_or_na ? ($note->new_or_fu_or_na === 'NEW' ? 'New Patient' : $note->new_or_fu_or_na) : '-'}}</span>
-                    @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
-                        <div moe class="ml-auto">
-                            <a href="" show start><i class="fa fa-edit"></i></a>
-                            <form url="/api/note/updateNewOrFuOrNa">
-                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                <div class="mb-2">
-                                    <select name="newOrFuOrNa" class="form-control form-control-sm" required>
-                                        <option value="">-- select --</option>
-                                        <option value="NEW" {{ $note->new_or_fu_or_na === "NEW" ? "selected" : "" }}>New</option>
-                                        <option value="FU" {{ $note->new_or_fu_or_na === "FU" ? "selected" : "" }}>Follow-up</option>
-                                        <option value="NA" {{ $note->new_or_fu_or_na === "NA" ? "selected" : "" }}>N/A</option>
-                                    </select>
-                                </div>
-                                <div class="mb-0">
-                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    @endif
+                    <span><span class="text-secondary">Type:</span> {{$note->new_or_fu_or_na ? ($note->new_or_fu_or_na === 'NEW' ? 'New Patient' : $note->new_or_fu_or_na) : '-'}}</span>
                 </div>
             </div>
 
             <div class="px-2">
                 <div class="d-flex">
-                    <span class="mr-2"><span class="text-secondary">Method:</span> {{$note->method ? noteMethodDisplay($note->method) : '-'}}</span>
-                    @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
-                        <div moe class="ml-auto">
-                            <a href="" show start><i class="fa fa-edit"></i></a>
-                            <form url="/api/note/updateMethod" hook="onNoteMethodUpdate">
-                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                <div class="mb-2">
-                                    <select name="method" class="form-control form-control-sm note-method-select" required>
-                                        <option value="AUDIO" {{ $note->method === "AUDIO" ? "selected" : "" }}>Audio</option>
-                                        <option value="VIDEO" {{ $note->method === "VIDEO" ? "selected" : "" }}>Video</option>
-                                        <option value="IN_CLINIC" {{ $note->method === "IN_CLINIC" ? "selected" : "" }}>In-Clinic</option>
-                                        <option value="HOUSE_CALL" {{ $note->method === "HOUSE_CALL" ? "selected" : "" }}>House Call</option>
-                                    </select>
-                                </div>
-                                <div class="form-group if-in-clinic">
-                                    <label for="" class="text-secondary text-sm mb-1">Location</label>
-                                    <select name="hcpCompanyLocationUid" class="form-control">
-                                        <option value=""></option>
-                                        @foreach($pro->companyLocations() as $location)
-                                            <option value="{{$location->uid}}" {{$location->id === $note->hcp_company_location_id ? 'selected' : ''}}>{{$location->line1}} {{$location->city}}</option>
-                                        @endforeach
-                                    </select>
-                                </div>
-                                <div class="mb-0">
-                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    @endif
+                    <span><span class="text-secondary">Method:</span> {{$note->method ? noteMethodDisplay($note->method) : '-'}}</span>
                 </div>
             </div>
 
             <div class="px-2 border-left screen-only">
-                <a href="{{route('print-note', ['patient' => $patient, 'note' => $note])}}" native target="_blank" class=""><i class="fa fa-print"></i> Print</a>
+                <a href="{{route('print-note', ['patient' => $patient, 'note' => $note])}}" native target="_blank" class=""><i class="fa fa-print"></i></a>
             </div>
 
             @if($pro->pro_type === 'ADMIN' || $pro->is_enrolled_as_mcp)
@@ -415,7 +186,7 @@ use App\Models\Handout;
                    popup-style="medium-large"
                    href="{{route('patients.view.calendar', ['patient' => $patient])}}?opUid={{$note->hcpPro ? $note->hcpPro->uid : ''}}">
                     <i class="fa fa-clock"></i>
-                    Book Appointment
+                    Book Appt.
                 </a>
             </div>
             @endif
@@ -543,13 +314,13 @@ use App\Models\Handout;
                     <a class="ml-3 native font-weight-normal refresh-segment c-pointer screen-only"
                         href="/patients/view/{{$note->client->uid}}/notes/view/{{$note->uid}}?suggestion_mode=off"
                         title="Update with latest patient data">
-                        Toggle Suggestion Mode Off
+                        Suggestion Mode
                     </a>
                 @else
                     <a class="ml-3 native font-weight-normal refresh-segment c-pointer screen-only"
                         href="/patients/view/{{$note->client->uid}}/notes/view/{{$note->uid}}?suggestion_mode=on"
                         title="Update with latest patient data">
-                        Turn Suggestion Mode On
+                        Suggestion Mode
                     </a>
                 @endif
             @endif
@@ -1059,7 +830,7 @@ use App\Models\Handout;
                             </div>
                             @include('app.patient.note.rm-setup')
                         </div>
-                       
+
                     </div>
                 </div>
 
@@ -1215,7 +986,7 @@ use App\Models\Handout;
                         <div class="d-flex align-items-start flex-wrap">
                             <?php $emptyNoteICDs = true; ?>
                                 @foreach ($noteICDData as $noteICDKey => $noteICD)
-                                    <?php 
+                                    <?php
                                         $emptyICD = true;
                                         if(!empty($noteICD['reason']) || !empty($noteICD['description'])){
                                             $emptyNoteICDs = false;
@@ -1229,7 +1000,7 @@ use App\Models\Handout;
                             @if($emptyNoteICDs)
                                 <small class="text-dark">-</small>
                             @endif
-                        </div>                        
+                        </div>
                     </div>
                     @if(!empty($note->note_reason_memo))
                         <div style="padding-left: 60px;">
@@ -1494,7 +1265,7 @@ use App\Models\Handout;
                         <span class="mx-2 text-secondary">|</span>
                         <div class="d-inline-flex align-items-center">
                             <span class="text-secondary font-weight-bold">Primary Coverage:&nbsp;</span>
-                            <b>@include('app.patient.coverage_column_renderer', ['patient'=>$patient, 'truncateName' => true])</b>                                                           
+                            <b>@include('app.patient.coverage_column_renderer', ['patient'=>$patient, 'truncateName' => true])</b>
                         </div>
                     </div>
                 </div>
@@ -1636,7 +1407,7 @@ use App\Models\Handout;
                                     <div>
                                         @include('app.patient.note.flag-bill')
                                     </div>
-                                    
+
                                 </td>
                                 <td class="pr-3 screen-only">
                                     @if($bill->has_hcp_been_paid)

+ 54 - 0
resources/views/app/patient/partials/quick-actions-buttons.blade.php

@@ -0,0 +1,54 @@
+<div class="d-flex justify-content-around">
+	<div>
+		<div moe relative>
+			<a href="#" start show class="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="ml-2 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="ml-2 d-block" 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="ml-2 d-block" show onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')"><i class="fa fa-video mr-1"></i></a>
+	</div>
+</div>

+ 20 - 25
resources/views/app/patient/vitals-settings/bp-management-form.blade.php

@@ -90,11 +90,10 @@
                                     <td>
                                         <input type="text" class="inline-input-underlined width-50" name="usualAmRestingSbpMin" v-model="form.usualAmRestingSbpMin" />
                                         <span>/</span>
-                                        <input type="text" class="inline-input-underlined width-50 mr-2" name="usualAmRestingDbpMin" v-model="form.usualAmRestingDbpMin" />
+                                        <input type="text" class="inline-input-underlined width-50" name="usualAmRestingDbpMin" v-model="form.usualAmRestingDbpMin" />
                                     </td>
                                     <td>
-                                        <input type="text" class="inline-input-underlined width-50" name="usualAmRestingPulseMin" v-model="form.usualAmRestingPulseMin" />
-                                        <span>BPM</span>
+                                        <input type="text" class="inline-input-underlined width-50" name="usualAmRestingPulseMin" v-model="form.usualAmRestingPulseMin" /> <span class="ml-1">BPM</span>
                                     </td>
                                 </tr>
                                 <tr v-if="form.doesUsualBpHaveRange">
@@ -105,7 +104,7 @@
                                     <td>
                                         <input type="text" class="inline-input-underlined width-50" name="usualAmRestingSbpMax" value="{{ $patient->usual_am_resting_sbp_max }}" />
                                         <span>/</span>
-                                        <input type="text" class="inline-input-underlined width-50 mr-2" name="usualAmRestingDbpMax" value="{{ $patient->usual_am_resting_dbp_max }}" />
+                                        <input type="text" class="inline-input-underlined width-50" name="usualAmRestingDbpMax" value="{{ $patient->usual_am_resting_dbp_max }}" />
                                     </td>
                                     <td><input type="text" class="inline-input-underlined width-50" name="usualAmRestingPulseMax" value="{{ $patient->usual_am_resting_pulse_max }}" /> <span>BPM</span></td>
                                 </tr>
@@ -117,7 +116,7 @@
                                     <td>
                                         <input type="text" class="inline-input-underlined width-50" name="usualPmRestingSbpMin" value="{{ $patient->usual_pm_resting_sbp_min }}" />
                                         <span>/</span>
-                                        <input type="text" class="inline-input-underlined width-50 mr-2" name="usualPmRestingDbpMin" value="{{ $patient->usual_pm_resting_dbp_min }}" />
+                                        <input type="text" class="inline-input-underlined width-50" name="usualPmRestingDbpMin" value="{{ $patient->usual_pm_resting_dbp_min }}" />
                                     </td>
                                     <td><input type="text" class="inline-input-underlined width-50" name="usualPmRestingPulseMin" value="{{ $patient->usual_pm_resting_pulse_min }}" /> <span>BPM</span></td>
                                 </tr>
@@ -129,7 +128,7 @@
                                     <td>
                                         <input type="text" class="inline-input-underlined width-50" name="usualPmRestingSbpMax" value="{{ $patient->usual_pm_resting_sbp_max }}" />
                                         <span>/</span>
-                                        <input type="text" class="inline-input-underlined width-50 mr-2" name="usualPmRestingDbpMax" value="{{ $patient->usual_pm_resting_dbp_max }}" />
+                                        <input type="text" class="inline-input-underlined width-50" name="usualPmRestingDbpMax" value="{{ $patient->usual_pm_resting_dbp_max }}" />
                                     </td>
                                     <td><input type="text" class="inline-input-underlined width-50" name="usualPmRestingPulseMax" value="{{ $patient->usual_pm_resting_pulse_max }}" /> <span>BPM</span></td>
                                 </tr>
@@ -141,9 +140,9 @@
                         <div class="text-secondary font-weight-bold mr-2">Ideal BP:</div>
                         <div class="d-flex align-items-center">
                             <input type="text" class="inline-input-underlined width-50" name="idealAmRestingSbpMin" value="{{ $patient->ideal_am_resting_sbp_min }}" />
-                            <span>/</span>
-                            <input type="text" class="inline-input-underlined width-50 mr-3" name="idealAmRestingDbpMin" value="{{ $patient->ideal_am_resting_dbp_min }}" />
-                            <input type="text" class="inline-input-underlined width-50" name="idealAmRestingPulse" value="{{ $patient->ideal_am_resting_pulse }}" /> <span>BPM</span>
+                            <span class="mx-1">/</span>
+                            <input type="text" class="inline-input-underlined width-50 mr-2" name="idealAmRestingDbpMin" value="{{ $patient->ideal_am_resting_dbp_min }}" />
+                            <input type="text" class="inline-input-underlined width-50" name="idealAmRestingPulse" value="{{ $patient->ideal_am_resting_pulse }}" /> <span class="ml-1">BPM</span>
                         </div>
                     </div>
                     <hr class="my-3">
@@ -155,19 +154,17 @@
                                 <h6 class="mb-0 mr-3">Above:</h6>
                                 <h6 class="mb-0 mr-3">BP:</h6>
                                 <input type="text" class="inline-input-underlined width-50" name="redAlertWhenSbpAbove" value="{{ $patient->red_alert_when_sbp_above }}" />
-                                <span>/</span>
-                                <input type="text" class="inline-input-underlined width-50 mr-3" name="redAlertWhenDbpAbove" value="{{ $patient->red_alert_when_dbp_above }}" />
-                                <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseAbove" value="{{ $patient->red_alert_when_pulse_above }}" />
-                                <span>BPM</span>
+                                <span class="mx-1">/</span>
+                                <input type="text" class="inline-input-underlined width-50 mr-2" name="redAlertWhenDbpAbove" value="{{ $patient->red_alert_when_dbp_above }}" />
+                                <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseAbove" value="{{ $patient->red_alert_when_pulse_above }}" /> <span class="ml-1">BPM</span>
                             </div>
                             <div class="d-flex align-items-center mb-2">
                                 <h6 class="mb-0 mr-3">Below:</h6>
                                 <h6 class="mb-0 mr-3">BP:</h6>
                                 <input type="text" class="inline-input-underlined width-50" name="redAlertWhenSbpBelow" value="{{ $patient->red_alert_when_sbp_below }}" />
-                                <span>/</span>
-                                <input type="text" class="inline-input-underlined width-50 mr-3" name="redAlertWhenDbpBelow" value="{{ $patient->red_alert_when_dbp_below }}" />
-                                <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseBelow" value="{{ $patient->red_alert_when_pulse_below }}" />
-                                <span>BPM</span>
+                                <span class="mx-1">/</span>
+                                <input type="text" class="inline-input-underlined width-50 mr-2" name="redAlertWhenDbpBelow" value="{{ $patient->red_alert_when_dbp_below }}" />
+                                <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseBelow" value="{{ $patient->red_alert_when_pulse_below }}" /> <span class="ml-1">BPM</span>
                             </div>
                         </div>
                     </div>
@@ -178,19 +175,17 @@
                                 <h6 class="mb-0 mr-3">Above:</h6>
                                 <h6 class="mb-0 mr-3">BP:</h6>
                                 <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenSbpAbove" value="{{ $patient->yellow_alert_when_sbp_above }}" />
-                                <span>/</span>
-                                <input type="text" class="inline-input-underlined width-50 mr-3" name="yellowAlertWhenDbpAbove" value="{{ $patient->yellow_alert_when_dbp_above }}" />
-                                <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseAbove" value="{{ $patient->yellow_alert_when_pulse_above }}" />
-                                <span>BPM</span>
+                                <span class="mx-1">/</span>
+                                <input type="text" class="inline-input-underlined width-50 mr-2" name="yellowAlertWhenDbpAbove" value="{{ $patient->yellow_alert_when_dbp_above }}" />
+                                <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseAbove" value="{{ $patient->yellow_alert_when_pulse_above }}" /> <span class="ml-1">BPM</span>
                             </div>
                             <div class="d-flex align-items-center mb-2">
                                 <h6 class="mb-0 mr-3">Below:</h6>
                                 <h6 class="mb-0 mr-3">BP:</h6>
                                 <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenSbpBelow" value="{{ $patient->yellow_alert_when_sbp_below }}" />
-                                <span>/</span>
-                                <input type="text" class="inline-input-underlined width-50 mr-3" name="yellowAlertWhenDbpBelow" value="{{ $patient->yellow_alert_when_dbp_below }}" />
-                                <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseBelow" value="{{ $patient->yellow_alert_when_pulse_below }}" />
-                                <span>BPM</span>
+                                <span class="mx-1">/</span>
+                                <input type="text" class="inline-input-underlined width-50 mr-2" name="yellowAlertWhenDbpBelow" value="{{ $patient->yellow_alert_when_dbp_below }}" />
+                                <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseBelow" value="{{ $patient->yellow_alert_when_pulse_below }}" /> <span class="ml-1">BPM</span>
                             </div>
                         </div>
                     </div>

+ 9 - 13
resources/views/app/patient/vitals-settings/bp-management-summary.blade.php

@@ -138,7 +138,7 @@
                         <div class="text-secondary font-weight-bold mr-2">Ideal BP:</div>
                         <div class="d-flex align-items-center">
                             <input type="text" class="inline-input-underlined width-50" name="idealAmRestingSbpMin" value="{{ $patient->ideal_am_resting_sbp_min }}" />
-                            <span>/</span>
+                            <span class="mx-1">/</span>
                             <input type="text" class="inline-input-underlined width-50 mr-3" name="idealAmRestingDbpMin" value="{{ $patient->ideal_am_resting_dbp_min }}" />
                             <input type="text" class="inline-input-underlined width-50" name="idealAmRestingPulse" value="{{ $patient->ideal_am_resting_pulse }}" /> <span>BPM</span>
                         </div>
@@ -152,19 +152,17 @@
                                 <h6 class="mb-0 mr-3">Above:</h6>
                                 <h6 class="mb-0 mr-3">BP:</h6>
                                 <input type="text" class="inline-input-underlined width-50" name="redAlertWhenSbpAbove" value="{{ $patient->red_alert_when_sbp_above }}" />
-                                <span>/</span>
+                                <span class="mx-1">/</span>
                                 <input type="text" class="inline-input-underlined width-50 mr-3" name="redAlertWhenDbpAbove" value="{{ $patient->red_alert_when_dbp_above }}" />
-                                <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseAbove" value="{{ $patient->red_alert_when_pulse_above }}" />
-                                <span>BPM</span>
+                                <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseAbove" value="{{ $patient->red_alert_when_pulse_above }}" /> <span>BPM</span>
                             </div>
                             <div class="d-flex align-items-center mb-2">
                                 <h6 class="mb-0 mr-3">Below:</h6>
                                 <h6 class="mb-0 mr-3">BP:</h6>
                                 <input type="text" class="inline-input-underlined width-50" name="redAlertWhenSbpBelow" value="{{ $patient->red_alert_when_sbp_below }}" />
-                                <span>/</span>
+                                <span class="mx-1">/</span>
                                 <input type="text" class="inline-input-underlined width-50 mr-3" name="redAlertWhenDbpBelow" value="{{ $patient->red_alert_when_dbp_below }}" />
-                                <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseBelow" value="{{ $patient->red_alert_when_pulse_below }}" />
-                                <span>BPM</span>
+                                <input type="text" class="inline-input-underlined width-50" name="redAlertWhenPulseBelow" value="{{ $patient->red_alert_when_pulse_below }}" /> <span>BPM</span>
                             </div>
                         </div>
                     </div>
@@ -175,19 +173,17 @@
                                 <h6 class="mb-0 mr-3">Above:</h6>
                                 <h6 class="mb-0 mr-3">BP:</h6>
                                 <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenSbpAbove" value="{{ $patient->yellow_alert_when_sbp_above }}" />
-                                <span>/</span>
+                                <span class="mx-1">/</span>
                                 <input type="text" class="inline-input-underlined width-50 mr-3" name="yellowAlertWhenDbpAbove" value="{{ $patient->yellow_alert_when_dbp_above }}" />
-                                <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseAbove" value="{{ $patient->yellow_alert_when_pulse_above }}" />
-                                <span>BPM</span>
+                                <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseAbove" value="{{ $patient->yellow_alert_when_pulse_above }}" /> <span>BPM</span>
                             </div>
                             <div class="d-flex align-items-center mb-2">
                                 <h6 class="mb-0 mr-3">Below:</h6>
                                 <h6 class="mb-0 mr-3">BP:</h6>
                                 <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenSbpBelow" value="{{ $patient->yellow_alert_when_sbp_below }}" />
-                                <span>/</span>
+                                <span class="mx-1">/</span>
                                 <input type="text" class="inline-input-underlined width-50 mr-3" name="yellowAlertWhenDbpBelow" value="{{ $patient->yellow_alert_when_dbp_below }}" />
-                                <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseBelow" value="{{ $patient->yellow_alert_when_pulse_below }}" />
-                                <span>BPM</span>
+                                <input type="text" class="inline-input-underlined width-50" name="yellowAlertWhenPulseBelow" value="{{ $patient->yellow_alert_when_pulse_below }}" /> <span>BPM</span>
                             </div>
                         </div>
                     </div>

+ 60 - 113
resources/views/layouts/patient-header.blade.php

@@ -103,60 +103,28 @@ $addressParts .= implode(", ", $addressPart2);
         @endif
       </div>
     </div>
-    <div class="d-flex justify-content-around">
-      <div>
-        <div moe relative>
-          <a href="#" start show class="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 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>
+
+        <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>
+
       </div>
-      <div>
-        <span moe relative class="">
-          <a href="#" start show class="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="ml-3 d-block" 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="ml-3 d-block" 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">
@@ -273,41 +241,44 @@ $addressParts .= implode(", ", $addressPart2);
             </form>
             @endif
           </div>
-          <div class="">
-            <span>Status:</small>
-            {{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}
+          <div class="d-flex">
+              <div>
+                <span>Status:</small>
+                {{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}
 
-            @if($pro->pro_type == 'ADMIN')
-            <div moe class="ml-2 hide-inside-popup">
-              <a start show><i class="fa fa-edit on-hover-opaque"></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>
+                @if($pro->pro_type == 'ADMIN')
+                <div moe class="ml-2 hide-inside-popup">
+                  <a start show><i class="fa fa-edit on-hover-opaque"></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>
-                <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
+                @endif
+              </div>
+            @include('app.patient.partials.quick-actions-buttons')
           </div>
 
           <div class="">
@@ -346,7 +317,7 @@ $addressParts .= implode(", ", $addressPart2);
           <div>DOB: {{friendly_date($patient->dob, false,null, true)}} </div>
           @if($patient->getPrimaryCoverage() && $patient->getPrimaryCoverageStatus() === 'YES')
             <div class="text-nowrap screen-only ml-2 pl-2 border-left">
-              {{$patient->getPrimaryCoverage()->insuranceDisplayName()}}
+              {{$patient->getPrimaryCoverage()->insuranceDisplayPayerName()}}
               <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">
@@ -355,7 +326,9 @@ $addressParts .= implode(", ", $addressPart2);
               </span> 
             </div>
             @if($performer->pro->pro_type == 'ADMIN')
-              <div class="ml-2">Deductible: {{@$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining}} </div>
+              @if(@$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining)
+                <div class="ml-2">Deductible: {{format_number(@$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining)}} </div>
+              @endif
             @endif 
           @endif
         </div>
@@ -533,32 +506,6 @@ $addressParts .= implode(", ", $addressPart2);
           {{$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="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>