Resolved conflict

app/Http/Controllers/AdminController.php

@@ -142,6 +142,8 @@ class AdminController extends Controller
                     return $q->where('client_engagement_status_category', $status)
                     ->orWhereNull('client_engagement_status_category');
                 });    
+            }elseif($status = 'NONE'){
+                $patients->whereNull('client_engagement_status_category');
             }else {
                 $patients->where('client_engagement_status_category', $status);
             }

app/Http/Controllers/NoteController.php

@@ -118,6 +118,10 @@ class NoteController extends Controller
         return view("app.patient.note.print", compact('patient', 'note'));
     }
 
+    public function resolve(Request $request, Client $patient, Note $note) {
+        return view("app.patient.note.resolve", compact('patient', 'note'));
+    }
+
     public function getHtmlForSegment($segmentUid, $sessionKey){
 
         $summaryHtml = '';

app/Http/Controllers/PracticeManagementController.php

@@ -38,6 +38,7 @@ use App\Models\ClientMeasurementDaysPerMonth;
 use App\Models\ClientBDTDevice;
 use App\Models\ClientMemo;
 use Carbon\Carbon;
+use Illuminate\Pagination\LengthAwarePaginator;
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Facades\Http;
 use PDF;
@@ -1317,6 +1318,66 @@ WHERE care_month.uid = '{$careMonthUid}' AND client.uid = '{$clientUid}'
         return view('app.practice-management.remote-monitoring-row-by-pro-type', ['iPatient' => $patients[0], 'trIndex' => $request->input('trIndex'), 'mode' => $mode]);
     }
 
+    private function remoteMonitoring_RowForAdmin(Request $request) {
+
+        $clientUid = $request->input('clientUid');
+        $careMonthUid = $request->input('careMonthUid');
+
+        $query = "
+SELECT client.name_first, client.name_last,
+       (client.name_first || ' ' || client.name_last) as client_name,
+       client.uid as client_uid, 
+       client.dob,
+       client.is_enrolled_in_rm,
+       client.most_recent_completed_mcp_note_date,
+       client.most_recent_completed_mcp_note_id,
+       mrmnote.effective_dateest::date as most_recent_completed_mcp_note_date_cm,
+       mrmnote.id as most_recent_completed_mcp_note_id_cm,
+       mrmnote.uid as most_recent_completed_mcp_note_uid_cm,
+       client.cell_number,
+       client.is_assigned_cellular_bp_device,
+       client.is_assigned_cellular_weight_scale_device,
+       care_month.uid as care_month_uid,
+       care_month.id as care_month_id,
+       care_month.start_date,
+       care_month.rm_total_time_in_seconds_by_mcp,
+       care_month.rm_total_time_in_seconds_by_rmm_pro,
+       care_month.number_of_days_with_remote_measurements,
+       care_month.has_mcp_interacted_with_client_about_rm,
+       care_month.rm_num_measurements_not_stamped_by_mcp,
+       care_month.rm_num_measurements_not_stamped_by_non_hcp,
+       care_month.rm_num_measurements_not_stamped_by_rmm,
+       care_month.rm_num_measurements_not_stamped_by_rme,
+       care_month.mcp_pro_id as care_month_mcp_pro_id,
+       care_month.rmm_pro_id as care_month_rmm_pro_id,
+       client.mcp_pro_id,
+       client.default_na_pro_id,
+       client.rmm_pro_id,
+       client.rme_pro_id,
+       client.cell_number,
+       care_month.most_recent_cellular_bp_dbp_mm_hg,
+       care_month.most_recent_cellular_bp_sbp_mm_hg,
+       care_month.most_recent_cellular_bp_measurement_at,      
+       care_month.most_recent_cellular_weight_value,
+       care_month.most_recent_cellular_weight_measurement_at
+FROM care_month join client on care_month.client_id = client.id join note mrnote on client.most_recent_completed_mcp_note_id = mrnote.id
+     left join note mrmnote on mrmnote.id = (
+        select max(n.id) from note n 
+        where 
+              n.client_id = client.id AND 
+              n.is_cancelled = FALSE AND
+              (n.is_signed_by_hcp IS NOT NULL AND n.is_signed_by_hcp = TRUE) AND
+              n.effective_dateest::date >= care_month.start_date::date AND 
+              n.effective_dateest::date < (care_month.start_date::date + INTERVAL '1 month')
+     )
+WHERE care_month.uid = '{$careMonthUid}' AND client.uid = '{$clientUid}'
+";
+
+        $patients = DB::select($query);
+
+        return view('app.practice-management.remote-monitoring-row-for-admin', ['iPatient' => $patients[0], 'trIndex' => $request->input('trIndex')]);
+    }
+
     private function rpmMatrixByProType(Request $request, $mode) {
 
         $performer = $this->performer();
@@ -1524,6 +1585,196 @@ WHERE
         return view('app.practice-management.rpm-matrix-by-pro-type', compact('patients', 'daysRemaining', 'careMonthStart', 'mode'));
     }
 
+    public function rpmMatrixForAdmin(Request $request) {
+
+        $performer = $this->performer();
+
+        // abort_if($performer->pro->pro_type !== 'ADMIN' && !$performer->pro->can_view_rm_matrix, 403);
+
+        $ym = ($request->input('y') ?: 'Y') . '-' . ($request->input('m') ?: 'm');
+        $careMonthStart = date($ym . '-01');
+
+        $rc = $request->input('rc') ?: 1;
+        $rc2 = $request->input('rc2') ?: 2;
+
+        $conditions = [];// $this->rpmConditions($performer, $rc, $rc2);
+
+        $sortBy = $request->input('sort_by') ?: 'name_first';
+        $sortDir = $request->input('sort_dir') ?: 'ASC';
+        $orderBy = "ORDER BY $sortBy $sortDir NULLS LAST";
+
+        // special case of if-bill-exists
+        if($sortBy === 'mcp_rm_generic_bill_id' || $sortBy === 'rmm_rm_generic_bill_id') {
+            if($sortDir === 'ASC') {
+                $orderBy = "ORDER BY $sortBy $sortDir NULLS FIRST";
+            }
+            else {
+                $orderBy = "ORDER BY $sortBy $sortDir NULLS LAST";
+            }
+        }
+
+        // filters from the UI
+        if(trim($request->input('f_name'))) {
+            $v = trim($request->input('f_name'));
+            $conditions[] = "(client.name_first ILIKE '%{$v}%' OR client.name_last ILIKE '%{$v}%')";
+        }
+        if(trim($request->input('f_dob_op')) && trim($request->input('f_dob'))) {
+            $o = trim($request->input('f_dob_op'));
+            $v = trim($request->input('f_dob'));
+            $conditions[] = "(client.dob {$o} '{$v}')";
+        }
+        if(trim($request->input('f_rpm'))) {
+            $v = trim($request->input('f_rpm'));
+            if($v === 'yes') {
+                $conditions[] = "(client.is_enrolled_in_rm IS NOT NULL AND client.is_enrolled_in_rm = 'YES')";
+            }
+            elseif($v === 'no') {
+                $conditions[] = "(client.is_enrolled_in_rm IS NULL OR client.is_enrolled_in_rm != 'YES')";
+            }
+        }
+        if(trim($request->input('f_cell_bp'))) {
+            $v = trim($request->input('f_cell_bp'));
+            if($v === 'yes') {
+                $conditions[] = "(client.is_assigned_cellular_bp_device IS NOT NULL AND client.is_assigned_cellular_bp_device = TRUE)";
+            }
+            elseif($v === 'no') {
+                $conditions[] = "(client.is_assigned_cellular_bp_device IS NULL OR client.is_assigned_cellular_bp_device = FALSE)";
+            }
+        }
+        if(trim($request->input('f_cell_wt'))) {
+            $v = trim($request->input('f_cell_wt'));
+            if($v === 'yes') {
+                $conditions[] = "(client.is_assigned_cellular_weight_scale_device IS NOT NULL AND client.is_assigned_cellular_weight_scale_device = TRUE)";
+            }
+            elseif($v === 'no') {
+                $conditions[] = "(client.is_assigned_cellular_weight_scale_device IS NULL OR client.is_assigned_cellular_weight_scale_device = FALSE)";
+            }
+        }
+        if(trim($request->input('f_comm'))) {
+            $v = trim($request->input('f_comm'));
+            if($v === 'yes') {
+                $conditions[] = "(care_month.has_mcp_interacted_with_client_about_rm IS NOT NULL AND care_month.has_mcp_interacted_with_client_about_rm = TRUE)";
+            }
+            elseif($v === 'no') {
+                $conditions[] = "(care_month.has_mcp_interacted_with_client_about_rm IS NULL OR care_month.has_mcp_interacted_with_client_about_rm = FALSE)";
+            }
+        }
+
+        if(trim($request->input('f_mcp_billable'))) {
+            $v = trim($request->input('f_mcp_billable'));
+            if($v === 'yes') {
+                $conditions[] = "(care_month.mcp_rm_generic_bill_id IS NOT NULL)";
+            }
+            elseif($v === 'no') {
+                $conditions[] = "(care_month.mcp_rm_generic_bill_id IS NULL)";
+            }
+        }
+
+        if(trim($request->input('f_rmm_billable'))) {
+            $v = trim($request->input('f_rmm_billable'));
+            if($v === 'yes') {
+                $conditions[] = "(care_month.rmm_rm_generic_bill_id IS NOT NULL)";
+            }
+            elseif($v === 'no') {
+                $conditions[] = "(care_month.rmm_rm_generic_bill_id IS NULL)";
+            }
+        }
+
+        if(trim($request->input('f_md_op')) && trim($request->input('f_md')) !== '') {
+            $o = trim($request->input('f_md_op'));
+            $v = trim($request->input('f_md'));
+            $conditions[] = "(care_month.number_of_days_with_remote_measurements {$o} {$v})";
+        }
+        if(trim($request->input('f_unst_op')) && trim($request->input('f_unst')) !== '') {
+            $o = trim($request->input('f_unst_op'));
+            $v = trim($request->input('f_unst'));
+            $conditions[] = "(care_month.rm_num_measurements_not_stamped_by_mcp {$o} {$v})";
+        }
+        if(trim($request->input('f_mcp_mins_op')) && trim($request->input('f_mcp_mins')) !== '') {
+            $o = trim($request->input('f_mcp_mins_op'));
+            $v = intval(trim($request->input('f_mcp_mins'))) * 60;
+            $conditions[] = "(care_month.rm_total_time_in_seconds_by_mcp {$o} {$v})";
+        }
+        if(trim($request->input('f_rmm_mins_op')) && trim($request->input('f_rmm_mins')) !== '') {
+            $o = trim($request->input('f_rmm_mins_op'));
+            $v = intval(trim($request->input('f_rmm_mins'))) * 60;
+            $conditions[] = "(care_month.rm_total_time_in_seconds_by_rmm_pro {$o} {$v})";
+        }
+
+        $genericBillIdColumns = "care_month.mcp_rm_generic_bill_id,
+                   mcpBill.uid as mcp_rm_generic_bill_uid,
+                   mcpBill.generic_pro_id as mcp_rm_generic_bill_generic_pro_id,
+                   mcpBill.generic_pro_expected_payment_amount as mcp_rm_generic_bill_expected_payment_amount,
+                   mcpBill.is_signed_by_generic_pro as mcp_rm_generic_bill_signed,
+                   care_month.rmm_rm_generic_bill_id,
+                   rmmBill.uid as rmm_rm_generic_bill_uid,
+                   rmmBill.generic_pro_id as rmm_rm_generic_bill_generic_pro_id,
+                   rmmBill.generic_pro_expected_payment_amount as rmm_rm_generic_bill_expected_payment_amount,
+                   rmmBill.is_signed_by_generic_pro as rmm_rm_generic_bill_signed";
+        $genericBillJoinClause = "left join bill mcpBill on care_month.mcp_rm_generic_bill_id = mcpBill.id
+                   left join bill rmmBill on care_month.rmm_rm_generic_bill_id = rmmBill.id";
+
+        $query = "
+SELECT client.name_first, client.name_last,
+       (client.name_first || ' ' || client.name_last) as client_name,
+       client.uid as client_uid, 
+       client.dob,
+       client.is_enrolled_in_rm,
+       client.most_recent_completed_mcp_note_date,
+       client.most_recent_completed_mcp_note_id,
+       client.cell_number,
+       client.is_assigned_cellular_bp_device,
+       client.is_assigned_cellular_weight_scale_device,
+       care_month.uid as care_month_uid,
+       care_month.id as care_month_id,
+       care_month.start_date,
+       care_month.rm_total_time_in_seconds_by_mcp,
+       care_month.rm_total_time_in_seconds_by_rmm_pro,
+       care_month.number_of_days_with_remote_measurements,
+       care_month.has_mcp_interacted_with_client_about_rm,
+       care_month.rm_num_measurements_not_stamped_by_mcp,
+       care_month.rm_num_measurements_not_stamped_by_non_hcp,
+       care_month.rm_num_measurements_not_stamped_by_rmm,
+       care_month.rm_num_measurements_not_stamped_by_rme,
+       care_month.mcp_pro_id as care_month_mcp_pro_id,
+       care_month.rmm_pro_id as care_month_rmm_pro_id,
+       client.mcp_pro_id,
+       client.default_na_pro_id,
+       client.rmm_pro_id,
+       client.rme_pro_id,
+       client.cell_number,
+       care_month.most_recent_cellular_bp_dbp_mm_hg,
+       care_month.most_recent_cellular_bp_sbp_mm_hg,
+       care_month.most_recent_cellular_bp_measurement_at,      
+       care_month.most_recent_cellular_weight_value,
+       care_month.most_recent_cellular_weight_measurement_at,
+       mcpPro.mcp_rpm_payment_strategy,
+       mcpPro.mcp_rpm_payment_amount,
+       rmmPro.rmm_payment_strategy,
+       rmmPro.rmm_payment_amount,
+       {$genericBillIdColumns}
+FROM care_month join client on care_month.client_id = client.id 
+    join note mrnote on client.most_recent_completed_mcp_note_id = mrnote.id
+    left join pro mcpPro on care_month.mcp_pro_id = mcpPro.id
+    left join pro rmmPro on care_month.rmm_pro_id = rmmPro.id
+    {$genericBillJoinClause}
+WHERE
+      EXTRACT(MONTH from care_month.start_date) = " . ($request->input('m') ?: 'EXTRACT(MONTH from now())') . "
+      AND EXTRACT(YEAR from care_month.start_date) = " . ($request->input('y') ?: 'EXTRACT(YEAR from now())') . "
+      " . (count($conditions) > 0 ? 'AND ' . implode(" AND ", $conditions) : '') . "
+      $orderBy
+";
+
+        // dd($query);
+
+        $patients = DB::select($query);
+
+        $timestamp = strtotime(date('Y-m-d'));
+        $daysRemaining = (int)date('t', $timestamp) - (int)date('j', $timestamp);
+
+        return view('app.practice-management.rpm-matrix-for-admin', compact('patients', 'daysRemaining', 'careMonthStart'));
+    }
+
     public function remoteMonitoringMCP(Request $request) {
         return $this->rpmMatrixByProType($request, 'mcp');
     }
@@ -1548,6 +1799,10 @@ WHERE
         return $this->remoteMonitoring_RowByProType($request, 'rme');
     }
 
+    public function remoteMonitoring_RowADMIN(Request $request) {
+        return $this->remoteMonitoring_RowForAdmin($request);
+    }
+
     public function rpm_work_matrix(Request $request) {
 
         // get the patient having most recent unstamped measurement
@@ -3284,5 +3539,171 @@ ORDER BY c.name_last, c.name_first
 
     }
 
+    public function notesResolutionCenter(Request $request) {
+
+        $columns = "(c.name_first || ' ' || c.name_last) as client_name,
+            (hcp.name_first || ' ' || hcp.name_last) as hcp_name,
+            (na.name_first || ' ' || na.name_last) as na_name,
+            c.chart_number,
+            c.uid as client_uid,
+            n.effective_dateest,
+            n.uid,
+            n.detail_json,
+	        n.is_claim_closed,
+	        n.visit_number,
+            ROUND(b.number_of_units * 60) as minutes,
+
+ n.note_reason_icd1 AS icd1,
+ n.note_reason_icd1description AS icd1description,
+ n.note_reason_icd2 AS icd2,
+ n.note_reason_icd2description AS icd2description,
+ n.note_reason_icd3 AS icd3,
+ n.note_reason_icd3description AS icd3description,
+ n.note_reason_icd4 AS icd4,
+ n.note_reason_icd4description AS icd4description,
+ n.note_reason_memo AS icd_memo,
+ n.visit_number
+
+            ";
+        $from = "FROM note AS n
+            LEFT JOIN pro AS hcp ON n.hcp_pro_id = hcp.id
+            LEFT JOIN pro AS na ON n.ally_pro_id = na.id
+            JOIN client AS c ON n.client_id = c.id
+	    JOIN bill AS b ON (b.note_id = n.id AND b.is_cancelled IS NOT TRUE AND b.code ILIKE '%treatment%')
+            ";
+        $where = "WHERE
+            -- n.visit_number IN (1,2) AND
+	    n.is_signed_by_hcp IS TRUE AND
+            -- n.is_claim_closed IS NOT TRUE AND
+            n.is_cancelled IS NOT TRUE AND 
+            n.created_at::DATE >= '2022-01-01'::DATE AND
+            c.client_engagement_status_category <> 'DUMMY' AND
+            c.name_first NOT ILIKE '%test%' AND 
+            c.name_last NOT ILIKE '%test%' AND
+            n.id IN (SELECT note_id FROM bill WHERE code ILIKE '%treatment%' AND bill.is_cancelled IS NOT TRUE AND note_id IS NOT NULL) AND
+            -- n.id NOT IN (SELECT note_id FROM claim WHERE note_id IS NOT NULL) AND
+            c.is_part_b_primary = 'YES' AND
+            c.latest_eligible_refresh_at::DATE >= '2022-01-01' AND
+            c.mpb_remaining = 0 AND
+            c.created_at::DATE >= '2022-01-01'::DATE
+            ";
+        $filters = [];
+        if($request->input('f')) {
+            $filters[] =  "(n.detail_json IS NOT NULL AND ((n.detail_json)::json->'farah_decision')::text = '\"" . $request->input('f') . "\"')";
+        }
+        if($request->input('s')) {
+            $filters[] =  "(n.detail_json IS NOT NULL AND ((n.detail_json)::json->'shawn_decision')::text = '\"" . $request->input('s') . "\"')";
+        }
+        if(count($filters)) {
+            $filters = 'AND ' . implode(' AND ',  $filters);
+        }
+        else {
+            $filters = '';
+        }
+        // $filters = '';
+        $orderBy = "ORDER BY c.id ASC, n.visit_number ASC";
+
+        $countQuery = "SELECT count(*) {$from} {$where} {$filters}";
+        // dd($countQuery);
+        $countResult = DB::select($countQuery);
+        $total = $countResult[0]->count;
+
+	$defaultPageSize = 25;
+
+        $page = $request->input('page') ?: 1;
+        $perPage = $request->input('per_page') ?: $defaultPageSize;
+        $offset = ($page - 1) * $perPage;
+
+        $dataQuery = "SELECT {$columns} {$from} {$where} {$filters} {$orderBy} OFFSET {$offset} LIMIT {$perPage}";
+        $rows = DB::select($dataQuery);
+
+        $paginator = new LengthAwarePaginator($rows, $total, $request->input('per_page') ?: $defaultPageSize, $request->input('page') ?: 1);
+        $paginator->setPath(route('practice-management.notes-resolution-center'));
+
+        return view('app.practice-management.notes-resolution-center', compact('rows', 'paginator'));
+    }
+
+    public function notesResolutionCenterV2(Request $request) {
+
+        $columns = "(c.name_first || ' ' || c.name_last) as client_name,
+            (hcp.name_first || ' ' || hcp.name_last) as hcp_name,
+            (na.name_first || ' ' || na.name_last) as na_name,
+            c.chart_number,
+            c.uid as client_uid,
+            n.effective_dateest,
+            n.uid,
+            n.detail_json,
+	        n.is_claim_closed,
+	        n.visit_number,
+            ROUND(b.number_of_units * 60) as minutes,
+
+ n.note_reason_icd1 AS icd1,
+ n.note_reason_icd1description AS icd1description,
+ n.note_reason_icd2 AS icd2,
+ n.note_reason_icd2description AS icd2description,
+ n.note_reason_icd3 AS icd3,
+ n.note_reason_icd3description AS icd3description,
+ n.note_reason_icd4 AS icd4,
+ n.note_reason_icd4description AS icd4description,
+ n.note_reason_memo AS icd_memo
+
+            ";
+        $from = "FROM note AS n
+            LEFT JOIN pro AS hcp ON n.hcp_pro_id = hcp.id
+            LEFT JOIN pro AS na ON n.ally_pro_id = na.id
+            JOIN client AS c ON n.client_id = c.id
+	    JOIN bill AS b ON (b.note_id = n.id AND b.is_cancelled IS NOT TRUE AND b.code ILIKE '%treatment%')
+            ";
+        $where = "WHERE
+            n.is_signed_by_hcp IS TRUE AND
+            -- n.is_claim_closed IS NOT TRUE AND
+            n.is_cancelled IS NOT TRUE AND 
+            n.created_at::DATE >= '2022-01-01'::DATE AND
+            c.client_engagement_status_category <> 'DUMMY' AND
+            c.name_first NOT ILIKE '%test%' AND 
+            c.name_last NOT ILIKE '%test%' AND
+            n.id IN (SELECT note_id FROM bill WHERE code ILIKE '%treatment%' AND bill.is_cancelled IS NOT TRUE AND note_id IS NOT NULL) AND
+            -- n.id NOT IN (SELECT note_id FROM claim WHERE note_id IS NOT NULL) AND
+            c.is_part_b_primary = 'YES' AND
+            c.latest_eligible_refresh_at::DATE >= '2022-01-01' AND
+            c.mpb_remaining = 0 AND
+            c.created_at::DATE >= '2022-01-01'::DATE
+            ";
+        $filters = [];
+        if($request->input('f')) {
+            $filters[] =  "(n.detail_json IS NOT NULL AND ((n.detail_json)::json->'farah_decision')::text = '\"" . $request->input('f') . "\"')";
+        }
+        if($request->input('s')) {
+            $filters[] =  "(n.detail_json IS NOT NULL AND ((n.detail_json)::json->'shawn_decision')::text = '\"" . $request->input('s') . "\"')";
+        }
+        if(count($filters)) {
+            $filters = 'AND ' . implode(' AND ',  $filters);
+        }
+        else {
+            $filters = '';
+        }
+        // $filters = '';
+        $orderBy = "ORDER BY c.id ASC, n.effective_dateest ASC";
+
+        $countQuery = "SELECT count(*) {$from} {$where} {$filters}";
+        // dd($countQuery);
+        $countResult = DB::select($countQuery);
+        $total = $countResult[0]->count;
+
+        $defaultPageSize = 50;
+
+        $page = $request->input('page') ?: 1;
+        $perPage = $request->input('per_page') ?: $defaultPageSize;
+        $offset = ($page - 1) * $perPage;
+
+        $dataQuery = "SELECT {$columns} {$from} {$where} {$filters} {$orderBy} OFFSET {$offset} LIMIT {$perPage}";
+        $rows = DB::select($dataQuery);
+
+        $paginator = new LengthAwarePaginator($rows, $total, $request->input('per_page') ?: $defaultPageSize, $request->input('page') ?: 1);
+        $paginator->setPath(route('practice-management.notes-resolution-center-v2'));
+
+        return view('app.practice-management.notes-resolution-center-v2', compact('rows', 'paginator'));
+    }
+
    
 }

app/Models/Segment.php

@@ -37,7 +37,7 @@ class Segment extends Model
         return $this->hasOne(SegmentSummarySuggestion::class, 'id', 'accepted_segment_summary_suggestion_id');
     }
 
-    public function getRecalculatedHtml($performer, $sessionKey){
+    public function getRecalculatedHtml($performer, $sessionKey, $getSummaryOnly = false){
         $pro = $performer->pro;
         $segment = $this; 
         $segmentTemplate = $this->segmentTemplate;
@@ -64,7 +64,8 @@ class Segment extends Model
             'intake_supplements',
             'plan_supplements'
         ];
-        if(!in_array($segmentTemplate->internal_name, $wizardPowered)) {
+	$editHtml = null;
+        if(!in_array($segmentTemplate->internal_name, $wizardPowered) && !$getSummaryOnly) {
             $editHtml = view('app.patient.segment-templates.' . $segmentTemplate->internal_name . '/edit', $data)->render();
         }
 

config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 86,
+    'asset_version' => 89,
 
     'temp_dir' => env('TEMP_DIR'),
 
@@ -147,7 +147,7 @@ return [
     'googleSpreadsheetProductsSheetName' => env('GOOGLE_SPREADSHEET_PRODUCTS_SHEET_NAME'),
 
     'adminNoteHcpProUid' => env('ADMIN_NOTE_HCP_PRO_UID'),
-
+    @
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers

js-dev/icd-autocomplete.js

@@ -4,7 +4,7 @@
         let self = this;
         $('[icd-autocomplete-code]:not([ac-initialized])').each(function() {
             let elem = this, dynID = 'icd-' + Math.ceil(Math.random() * 1000000),
-                codeElem = $(this), descElem = $(this).closest('form').find('[icd-autocomplete-description]');
+                codeElem = $(this), descElem = $(this).closest('form, tr').first().find('[icd-autocomplete-description]');
             var targetDescElem = $(this).data('target');
             if(targetDescElem){
                 descElem = $(this).closest('form').find(targetDescElem);
@@ -20,7 +20,7 @@
             window.Def.Autocompleter.Event.observeListSelections(dynID, function() {
                 let autocomp = elem.autocomp, acData = autocomp.getSelectedItemData();
                 codeElem.val(acData[0].code).trigger('change');
-                descElem.val(acData[0].data['name']).trigger('change');
+                descElem.val(acData[0].data['name']).attr('title', acData[0].data['name']).trigger('change');
                 return false;
             });
             $(elem).attr('ac-initialized', 1);

js-dev/yemi.js

@@ -325,6 +325,11 @@ var initMoes = function() {
         var submit = moe.find('[submit]'); // REQUIRED
         var cancel = moe.find('[cancel]')[0]; // OPTIONAL
 
+        let moeRefreshContainer = moe.closest('[moe-refresh-container][id]');
+        if(!target && moeRefreshContainer.length) {
+            target = '#' + moeRefreshContainer.attr('id');
+        }
+
         // ajax load - OPTIONAL
         var moeParent = $(form).closest('[moe-parent][url]');
 

public/css/style.css

@@ -384,6 +384,9 @@ body>nav.navbar {
 .mcp-theme-1 .width-200px {
     width: 200px !important;
 }
+.mcp-theme-1 .width-250px {
+    width: 250px !important;
+}
 .mcp-theme-1 .width-300px {
     width: 300px !important;
 }
@@ -445,6 +448,9 @@ body>nav.navbar {
 .mcp-theme-1 .min-width-200px {
     min-width: 200px !important;
 }
+.mcp-theme-1 .min-width-250px {
+    min-width: 250px !important;
+}
 .mcp-theme-1 .min-width-300px {
     min-width: 300px;
 }
@@ -487,6 +493,9 @@ body>nav.navbar {
     width: 100% !important;
     min-width: unset !important;
 }
+.mcp-theme-1 .max-width-170px {
+    max-width: 170px;
+}
 .mcp-theme-1 .max-width-200px {
     max-width: 200px;
 }
@@ -3333,7 +3342,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;
@@ -3560,9 +3569,16 @@ table.v-top th {
 .note_template_psych_followup_visit .edit-container [visit-moe]>form>div:last-child>.d-inline-flex {
     display: flex !important;
 }
+<<<<<<< HEAD
 .cpc-cancelled {
     pointer-events: none;
     opacity: 0.4;
     border: 1px dashed #333;
     padding: 5px;
-}
+}
+=======
+.note-container .segments-list p>br:first-child:last-child,
+.note-container .segments-list p:empty {
+    display: none;
+}
+>>>>>>> c1e0c71f9c582039c8765ac74613532abceffe59

public/css/yemi.css

@@ -3,6 +3,7 @@
 }
 [moe] {
     display: inline-block;
+    position: relative;
 }
 [moe][relative] {
     position: relative;
@@ -13,6 +14,7 @@
     background-color: white;
     padding: 10px;
     border: 1px solid gray;
+    min-width: 180px;
 }
 [moe][fixed-center] [url]:not([show]) {
     position: fixed !important;

public/js/icd-autocomplete.js

@@ -4,7 +4,7 @@
         let self = this;
         $('[icd-autocomplete-code]:not([ac-initialized])').each(function() {
             let elem = this, dynID = 'icd-' + Math.ceil(Math.random() * 1000000),
-                codeElem = $(this), descElem = $(this).closest('form').find('[icd-autocomplete-description]');
+                codeElem = $(this), descElem = $(this).closest('form, tr').first().find('[icd-autocomplete-description]');
             var targetDescElem = $(this).data('target');
             if(targetDescElem){
                 descElem = $(this).closest('form').find(targetDescElem);
@@ -20,7 +20,7 @@
             window.Def.Autocompleter.Event.observeListSelections(dynID, function() {
                 let autocomp = elem.autocomp, acData = autocomp.getSelectedItemData();
                 codeElem.val(acData[0].code).trigger('change');
-                descElem.val(acData[0].data['name']).trigger('change');
+                descElem.val(acData[0].data['name']).attr('title', acData[0].data['name']).trigger('change');
                 return false;
             });
             $(elem).attr('ac-initialized', 1);

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

@@ -150,6 +150,7 @@
 			<label>Status:</label>
 			<select name="status" class="form-control input-sm" v-model="filters.status">
 				<option value="">All</option>
+				<option value="NONE">None</option>
  				<option value="ACTIVE">Active</option>
  				<option value="DUMMY">Test Record</option>
  				<option value="NO_LONGER_INTERESTED">No Longer Interested</option>

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">

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

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;">
@@ -1364,1183 +1135,7 @@ use App\Models\Handout;
                 </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
+                @include('app.patient.note.partials.cpp-bills-claims-container')
 
                 {{-- addendums --}}
                 @if($note->is_signed_by_hcp)

resources/views/app/patient/note/note-segment-list-resolve.blade.php

@@ -0,0 +1,14 @@
+<div class="segments-list d-flex align-items-stretch" id="note-segments-list">
+
+	@if(count($note->segmentsLeft))
+		<div class="flex-grow-1">
+			@include('app.patient.note.note-segment-list-single-col', ['segments' => $note->segmentsLeft])
+		</div>
+	@endif
+	@if(count($note->segmentsRight))
+		<div class="min-width-50 width-50 border-left">
+			@include('app.patient.note.note-segment-list-single-col', ['segments' => $note->segmentsRight])
+		</div>
+	@endif
+</div>
+

resources/views/app/patient/note/note-segment-list-single-col.blade.php

@@ -0,0 +1,33 @@
+<?php
+$previousHeading = null;
+$previousSubHeading = null;
+?>
+@foreach($segments as $segment)
+    @if($segment->segmentTemplate->internal_name !== 'medrisk_vigilence')
+        <?php
+        if ($segment->heading !== $previousHeading) {
+        if (!empty($previousHeading)) {
+            echo '</div></div>'; // <!-- end the previous parent section -->
+        }
+        if (!empty($segment->heading)) {
+
+        ?>
+        <div class="note-content-node note-content-heading">
+            <div class="py-2 px-3 border-bottom font-size-16 font-weight-bold bg-light text-secondary {{ $previousHeading ? 'mt-4 border-top' : '' }}">
+                {{ $segment->heading }}
+            </div>
+            <div class="note-content-children ml-5 border-left">
+                <!-- open new node -->
+        <?php
+        }
+        $previousHeading = $segment->heading;
+        }
+        ?>
+        @include('app.patient.note.segment-resolve')
+    @endif
+@endforeach
+<?php
+if (!empty($previousHeading)) {
+    echo '</div></div>'; // <!-- close any open parent section -->
+}
+?>

resources/views/app/patient/note/partials/care-plan-details.blade.php

@@ -0,0 +1,100 @@
+<table class="table-sm table-bordered v-top">
+    <tr>
+        <td class="text-secondary">Care Plan:</td>
+        <td>
+            <div class="{{ $patient->has_care_plan_flag && !$patient->is_flag_cleared ? '':'d-flex' }}">
+                <div class="d-inline-flex align-items-center">
+                    @if($patient->has_cm_setup_been_performed)
+                        <div class="text-nowrap text-success">
+                            @if($patient->cm_setup_note_id === $note->id)
+                                <i class="fa fa-check"></i>
+                                <b>Created on this note</b>
+                            @elseif($patient->cmSetupNote)
+                                <i class="fa fa-check"></i>
+                                <b>Created on</b>
+                                <div class="d-inline position-relative on-click-menu">
+                                    <span class="text-primary c-pointer">{{friendly_date($patient->cmSetupNote->effective_dateest)}}</span>
+                                    <div menu right class="bg-white border">
+                                        <a native target="_blank"
+                                           href="<?= route('patients.view.notes.view.dashboard', ['patient' => $patient, 'note' => $patient->cmSetupNote]) ?>"
+                                           class="px-2 py-1 d-block text-nowrap text-sm">Go to note</a>
+                                    </div>
+                                </div>
+                            @else
+                                <i class="fa fa-exclamation-triangle text-warning-mellow"></i>
+                                <b class="text-warning-mellow">Performed, but CM setup note missing!</b> <!-- will never reach this point -->
+                            @endif
+                        </div>
+                        @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
+                            <div moe class="ml-3">
+                                <a href="" show start>Undo</a>
+                                <form url="/api/note/undoMarkCmSetupPerformed" >
+                                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                                    <p>Mark Comprehensive Care Plan as not created?</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="text-nowrap text-warning-mellow">
+                                    <i class="fa fa-times"></i>
+                                    <b>Not Created</b>
+                                </span>
+                        @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
+                            <div moe class="ml-3">
+                                <a href="#" show start>Mark as created</a>
+                                <form url="/api/note/markCmSetupPerformed" >
+                                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                                    <p>Mark Comprehensive Care Plan as created?</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
+                    @endif
+                </div>
+                @if($pro->pro_type === 'ADMIN' && $note->was_cm_setup_performed)
+                    <div class="d-flex align-items-baseline">
+                        <div class="d-inline-flex align-items-center flex-grow-1">
+                            <span class="pr-2">Manager Signature:</span>
+                            @if($note->cm_setup_manager_signature_status !== 'SIGNED')
+                                <div moe class="">
+                                    <a start show>Sign</a>
+                                    <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
+                                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                                        <input type="hidden" name="managerSignatureStatus" value="SIGNED">
+                                        <p>Sign Off Care Plan Creation as Manager?</p>
+                                        <div>
+                                            <button submit class="btn btn-sm btn-success mr-1">Sign</button>
+                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @else
+                                <b>SIGNED</b>
+                                <div moe class="ml-3">
+                                    <a start show>Undo</a>
+                                    <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
+                                        <input type="hidden" name="uid" value="{{$note->uid}}">
+                                        <input type="hidden" name="managerSignatureStatus" value="">
+                                        <p>Undo sign as manager for Care Plan Creation?</p>
+                                        <div>
+                                            <button submit class="btn btn-sm btn-primary mr-1">Undo</button>
+                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @endif
+                        </div>
+                    </div>
+                @endif
+                @include('app.patient.note.flag-care-plan')
+            </div>
+        </td>
+    </tr>
+</table>

resources/views/app/patient/note/partials/cpp-bills-claims-container.blade.php

@@ -0,0 +1,1181 @@
+<div id="cpp-bills-claims-container" moe-refresh-container>
+
+    {{-- 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
+
+    </div>

resources/views/app/patient/note/partials/resolve-content.blade.php

@@ -0,0 +1,440 @@
+@php
+    $parsedDetailJson = new stdClass();
+    if($note->detail_json) {
+        try {
+            $parsedDetailJson = json_decode($note->detail_json);
+        }
+        catch (Exception $e) {}
+    }
+@endphp
+
+<style>.nrc-badge.bgyellow { background-color: lightyellow; }</style>
+<style>.nrc-badge.bggreen { background-color: #caffca; }</style>
+<style>.nrc-badge.bgblue { background-color: #d0f2fd; }</style>
+<style>.nrc-badge.claim-closed { background-color: lightgray; }</style>
+
+<div class="popup-content-container pt-2" id="note-resolve-{{$note->uid}}">
+
+    <div class="d-flex align-items-center mb-2 mx-3">
+
+        <div class="rounded py-1 px-2 font-weight-bold mr-2 {{ $note->visit_number > 2 ? 'nrc-badge bgyellow': ($note->visit_number == 1 ? 'nrc-badge bggreen': ($note->visit_number == 2 ? 'nrc-badge bgblue':'')) }}">Visit #{{$note->visit_number}}</div>
+
+        <div moe>
+            <a href="" start show class="">Memo to Shawn: </a> <b>{{ @$parsedDetailJson->memo_to_shawn }}</b> &nbsp;
+
+            <form url="/api/note/upsertDetailJsonKeyVal" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$note->uid}}" class="form-control input-sm" />
+                <input type="hidden" name="key" value="memo_to_shawn" class="form-control input-sm" />
+                <div class="form-group">
+                    <textarea name="val" class="form-control" >{{ @$parsedDetailJson->memo_to_shawn }}</textarea>
+                </div>
+                <div class="form-group text-nowrap mb-0">
+                    <button class="btn btn-sm btn-primary" submit>Submit</button>
+                    <button class="btn btn-sm btn-default border" close>Close</button>
+                </div>
+            </form>
+        </div>
+
+        @if(@$parsedDetailJson->farah_decision)
+            <span class="mr-2">Farah:</span>
+            <span class="mr-3">
+                @if(@$parsedDetailJson->farah_decision == 'green')
+                    <span class="text-success font-weight-bold"><i class="fa fa-check"></i> Yes</span>
+                @elseif(@$parsedDetailJson->farah_decision == 'red')
+                    <span class="text-warning-dark font-weight-bold"><i class="fa fa-exclamation-triangle"></i> No</span>
+                @else
+                    -
+                @endif
+            </span>
+        @endif
+
+        @if(@$parsedDetailJson->shawn_decision)
+            <span class="mr-2">Shawn:</span>
+            <span class="mr-3">
+                @if(@$parsedDetailJson->shawn_decision == 'green')
+                    <span class="text-success font-weight-bold"><i class="fa fa-check"></i> Green</span>
+                @elseif(@$parsedDetailJson->shawn_decision == 'red')
+                    <span class="text-danger font-weight-bold"><i class="fa fa-exclamation-triangle"></i> Rejected</span>
+                @else
+                    -
+                @endif
+            </span>
+        @endif
+
+        @if(@$parsedDetailJson->kyle_billed)
+            <span class="mr-2">Kyle:</span>
+            <span class="mr-3">
+                @if(@$parsedDetailJson->kyle_billed == 'yes')
+                    <span class="text-success font-weight-bold"><i class="fa fa-check"></i> Billed</span>
+                @else
+                    -
+                @endif
+            </span>
+        @endif
+
+        @if(@$parsedDetailJson->kyle_billed !== 'yes')
+            <span class="mr-2">Mark as:</span>
+            <div moe>
+                <form url="/api/note/upsertDetailJsonKeyVal" show>
+                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                    <input type="hidden" name="key" value="farah_decision">
+                    <input type="hidden" name="val" value="green">
+                    <button submit class="mr-2 btn btn-sm font-weight-bold btn-success">Farah Green</button>
+                </form>
+            </div>
+            <div moe>
+                <form url="/api/note/upsertDetailJsonKeyVal" show>
+                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                    <input type="hidden" name="key" value="farah_decision">
+                    <input type="hidden" name="val" value="red">
+                    <button submit class="mr-2 btn btn-sm font-weight-bold btn-warning">Shawn Review</button>
+                </form>
+            </div>
+            @if(@$parsedDetailJson->farah_decision)
+                @if(@$parsedDetailJson->farah_decision === 'red')
+                    <div moe>
+                        <form url="/api/note/upsertDetailJsonKeyVal" show>
+                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                            <input type="hidden" name="key" value="shawn_decision">
+                            <input type="hidden" name="val" value="green">
+                            <button submit class="mr-2 btn btn-sm font-weight-bold btn-success">Shawn Green</button>
+                        </form>
+                    </div>
+                    <div moe>
+                        <form url="/api/note/upsertDetailJsonKeyVal" show>
+                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                            <input type="hidden" name="key" value="shawn_decision">
+                            <input type="hidden" name="val" value="red">
+                            <button submit class="mr-2 btn btn-sm font-weight-bold btn-danger">Shawn Reject</button>
+                        </form>
+                    </div>
+                @endif
+                @if(@$parsedDetailJson->farah_decision == 'green' || @$parsedDetailJson->shawn_decision == 'green')
+                    <div moe>
+                        <form url="/api/note/upsertDetailJsonKeyVal" show>
+                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                            <input type="hidden" name="key" value="kyle_billed">
+                            <input type="hidden" name="val" value="yes">
+                            <button submit class="mr-2 btn btn-sm font-weight-bold btn-primary">Kyle Billed</button>
+                        </form>
+                    </div>
+                @endif
+            @endif
+        @endif
+        @if(!$note->is_claim_closed)
+            <div moe>
+                <form show url="/api/note/processNoteShortcut">
+                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                    <button submit class="mr-2 btn btn-sm font-weight-bold btn-primary">Submit Claim</button>
+                </form>
+            </div>
+        @else
+            <h6>CLAIM CLOSED</h6>
+        @endif
+        <button type="button" class="ml-auto btn btn-sm font-weight-bold btn-info btn-prev-row"><i class="fa fa-chevron-left"></i> Prev</button>
+        <button type="button" class="ml-2 btn btn-sm font-weight-bold btn-info btn-next-row">Next <i class="fa fa-chevron-right"></i></button>
+    </div>
+
+    <div class="mx-3 border">
+        <div id="note-single-header" class="d-flex border-bottom align-items-start note_template_{{$note->visitTemplate ? $note->visitTemplate->internal_name : ''}}">
+
+            <div class="p-2 d-inline-flex align-items-baseline w-100">
+                <div class="d-inline-flex mr-4 align-items-baseline">
+                    <div class="font-weight-bold font-size-14">{{$patient->displayName()}}</div>
+                </div>
+                <div class="d-inline-flex mr-4 align-items-baseline">
+                    <div class="mr-1 text-secondary">DOB:</div>
+                    <div>{{$patient->dob}}</div>
+                </div>
+                <div class="d-inline-flex mr-4 align-items-baseline">
+                    <div class="mr-1 text-secondary">Visit Date:</div>
+                    <div>{{friendly_date($note->effective_dateest)}}</div>
+                </div>
+                <div class="d-inline-flex align-items-baseline">
+                    <div class="mr-1 text-secondary">Signed By:</div>
+                    <div class="mr-2">{{$note->hcpPro->displayName()}}</div>
+                    <div class="mr-2">on</div>
+                    <div class="mr-2 text-info">{{friendlier_date_time($note->signed_by_hcp_at)}}</div>
+                </div>
+                <a href="#" native class="ml-2" onclick="$('[data-non-segment-section=Claims]')[0].scrollIntoView({behavior: 'smooth', block: 'end'}); return false;">Go to end</a>
+            </div>
+
+            @if($patient->sticky_note)
+                <div class="flex-grow-1 border-left p-2 d-inline-flex align-items-baseline bg-aliceblue">
+                    <span class="">{{$patient->sticky_note}}</span>
+                </div>
+            @endif
+
+
+        </div>
+
+        <div class="card mb-0 {{ $note->is_cancelled ? 'cancelled-item' : '' }} border-0 rounded-0">
+
+            <div class="card-body d-flex align-items-start p-0">
+                <div class="flex-grow-1 overflow-auto resolve-segments" style="max-height: calc(100vh - 270px);">
+                    <div class="note_template_{{$note->visitTemplate ? $note->visitTemplate->internal_name : ''}}">
+                        @include('app.patient.note.note-segment-list-resolve')
+                        <div class="border-top mt-3 pt-3 px-3" id="care-plan-details-{{$note->uid}}" moe-refresh-container>
+                            @include('app.patient.note.partials.care-plan-details')
+                        </div>
+                        <div class="border-top mt-3">
+                            @include('app.patient.note.partials.cpp-bills-claims-container')
+                        </div>
+                    </div>
+                </div>
+                <div class="overflow-auto min-width-250px width-250px" style="max-height: calc(100vh - 270px);">
+                    <div class="p-2 border-bottom nrc-icds">
+                        <div class="d-flex align-items-baseline mb-1">
+                            <div class="font-weight-bold mr-2">ICDs</div>
+                            <?php
+                            $commonICDs = [
+                                [
+                                    "code" => "Z71.9",
+                                    "desc" => "Counseling, unspecified"
+                                ],
+                                [
+                                    "code" => "I10",
+                                    "desc" => "Essential (primary) hypertension"
+                                ]
+                            ]
+                            ?>
+                            @foreach($commonICDs as $commonICD)
+                                <div class="d-inline position-relative on-hover-show ml-2">
+                                        <span class="text-primary c-pointer text-sm">
+                                            {{$commonICD['code']}}
+                                        </span>
+                                    <div menu right class="bg-white border on-hover-content">
+                                        @for($i = 1; $i <= 4; $i++)
+                                            <a native target="_blank" href="#"
+                                               data-code="{{$commonICD['code']}}"
+                                               data-description="{{$commonICD['desc']}}"
+                                               data-target="{{$i - 1}}"
+                                               class="px-2 py-1 d-block text-nowrap text-sm common-icd-item">
+                                                Add to ICD {{$i}}
+                                            </a>
+                                        @endfor
+                                    </div>
+                                </div>
+                            @endforeach
+                            <a native target="_blank" href="#"
+                               data-code="Z71.9"
+                               data-description="Counseling, unspecified"
+                               data-target="0"
+                               class="text-primary c-pointer text-sm ml-2 common-icd-item">
+                                Z@1
+                            </a>
+                            <a native target="_blank" href="#"
+                               data-code="I10"
+                               data-description="Essential (primary) hypertension"
+                               data-target="1"
+                               class="text-primary c-pointer text-sm ml-2 common-icd-item">
+                                I@2
+                            </a>
+                            <div class="d-inline position-relative on-hover-show ml-auto">
+                                    <span class="text-primary c-pointer text-sm">
+                                        Clear <i class="fa fa-caret-down"></i>
+                                    </span>
+                                <div menu class="bg-white border on-hover-content">
+                                    @for($i = 1; $i <= 4; $i++)
+                                        <a native target="_blank" href="#"
+                                           data-code=""
+                                           data-description=""
+                                           data-target="{{$i - 1}}"
+                                           class="px-2 py-1 d-block text-nowrap text-sm common-icd-item">
+                                            Clear ICD {{$i}}
+                                        </a>
+                                    @endfor
+                                    <a native target="_blank" href="#"
+                                       data-code=""
+                                       data-description=""
+                                       data-target="{{$i - 1}}"
+                                       class="px-2 py-1 d-block text-nowrap text-sm common-icd-item-clear-all">
+                                        Clear All
+                                    </a>
+                                </div>
+                            </div>
+                        </div>
+                        <div moe="">
+                            <form show url="/api/note/putReasons" class="mcp-theme-1" hook="onICDUpdate-{{$note->uid}}">
+                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                <div>
+                                    <table class="table table-sm table-bordered mb-2">
+                                        <thead class="bg-light">
+                                        <tr>
+                                            <th class="border-bottom-0">ICD</th>
+                                            <th class="border-bottom-0">Desc.</th>
+                                        </tr>
+                                        </thead>
+                                        <tbody>
+                                        <tr>
+                                            <td class="p-0">
+                                                <input icd-autocomplete-code type="text" class="rounded-0 border-0 shadow-none icd-input width-70px pr-0 min-width-unset"
+                                                       name="reasonIcd1" placeholder="ICD 1" value="{{@$note->note_reason_icd1}}" autocomplete="off">
+                                            </td>
+                                            <td class="p-0">
+                                                <input icd-autocomplete-description type="text" class="rounded-0 border-0 shadow-none form-control form-control-sm min-width-unset"
+                                                       name="reasonIcd1Description" value="{{@$note->note_reason_icd1description}}"
+                                                       title="{{@$note->note_reason_icd1description}}">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="p-0">
+                                                <input icd-autocomplete-code type="text" class="rounded-0 border-0 shadow-none icd-input width-70px pr-0 min-width-unset"
+                                                       name="reasonIcd2" placeholder="ICD 2" value="{{@$note->note_reason_icd2}}" autocomplete="off">
+                                            </td>
+                                            <td class="p-0">
+                                                <input icd-autocomplete-description type="text" class="rounded-0 border-0 shadow-none form-control form-control-sm min-width-unset"
+                                                       name="reasonIcd2Description" value="{{@$note->note_reason_icd2description}}"
+                                                       title="{{@$note->note_reason_icd2description}}">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="p-0">
+                                                <input icd-autocomplete-code type="text" class="rounded-0 border-0 shadow-none icd-input width-70px pr-0 min-width-unset"
+                                                       name="reasonIcd3" placeholder="ICD 3" value="{{@$note->note_reason_icd3}}" autocomplete="off">
+                                            </td>
+                                            <td class="p-0">
+                                                <input icd-autocomplete-description type="text" class="rounded-0 border-0 shadow-none form-control form-control-sm min-width-unset"
+                                                       name="reasonIcd3Description" value="{{@$note->note_reason_icd3description}}"
+                                                       title="{{@$note->note_reason_icd3description}}">
+                                            </td>
+                                        </tr>
+                                        <tr>
+                                            <td class="p-0">
+                                                <input icd-autocomplete-code type="text" class="rounded-0 border-0 shadow-none icd-input width-70px pr-0 min-width-unset"
+                                                       name="reasonIcd4" placeholder="ICD 4" value="{{@$note->note_reason_icd4}}" autocomplete="off">
+                                            </td>
+                                            <td class="p-0">
+                                                <input icd-autocomplete-description type="text" class="rounded-0 border-0 shadow-none form-control form-control-sm min-width-unset"
+                                                       name="reasonIcd4Description" value="{{@$note->note_reason_icd4description}}"
+                                                       title="{{@$note->note_reason_icd4description}}">
+                                            </td>
+                                        </tr>
+                                        </tbody>
+                                    </table>
+                                </div>
+                                <div class="mb-2">
+                                    <label class="text-secondary mb-1">Reason Memo:</label>
+                                    <input type="text" class="form-control form-control-sm min-width-unset" name="reasonMemo" value="{{@$note->note_reason_memo}}">
+                                </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>
+                    @include('app.patient.note.rhs-sidebar')
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
+<script>
+    (function() {
+        function __initRTEs(_collection) {
+            _collection.each(function() {
+
+                let noteRTE = $(this);
+
+                $(this).wrap(
+                    $('<div class="rte-holder"/>')
+                        .attr('data-shortcuts', '')
+                );
+
+                // give a unique id to this editor instance
+                var editorID = Math.ceil(Math.random() * 99999),
+                    fieldName = $(this).attr('data-field-name') ? $(this).attr('data-field-name') : 'free_text';
+
+                var el = this;
+                var existingContent = $(el).html();
+                var quill = new Quill(el, {
+                    theme: 'snow',
+                    modules: {
+                        toolbar: false,
+                        keyboard: {
+                            bindings: {
+                                'tab': {
+                                    key: 9,
+                                    handler: function(range, context) {
+                                        return true;
+                                    }
+                                }
+                            }
+                        }
+                    },
+                    /*formats: [
+                        'bold',
+                        'italic',
+                        'link',
+                        'size',
+                        'strike',
+                        'underline',
+                        'blockquote',
+                        'header',
+                        'indent',
+                        'list',
+                        'align',
+                    ]*/
+                });
+
+                var toolbar = $(quill.container).prev('.ql-toolbar');
+
+                quill.root.innerHTML = existingContent;
+
+                $(quill.container)
+                    .find('.ql-editor[contenteditable]')
+                    .attr('data-field', fieldName)
+                    .attr('data-editor-id', editorID)
+                    .attr('with-shortcuts', 1);
+
+                $(el).data('quillInstance', quill);
+
+            });
+        }
+        function init() {
+            let parentSegment = $('#note-resolve-{{$note->uid}}');
+            // __initRTEs(parentSegment.find('[note-rte]:not(.ql-container)'));
+            runMCInitializer('icd-autocomplete');
+            parentSegment.find('.btn-apply-override')
+                .off('click.apply-override')
+                .on('click.apply-override', function() {
+                    let html = $.trim($(this).closest('.rhs-edit').find('[contenteditable]').first().html());
+                    $.post('/api/segment/proposeSegmentSummarySuggestion', {
+                        uid: $(this).attr('data-segment-uid'),
+                        proposedSuggestedSummaryHtml: html,
+                        autoAccept: true
+                    }, _data => {
+                        if(!hasResponseError(_data)) {
+                            toastr.success('Updated');
+                            $(this).closest('.overridable').find('.lhs-read').first().html(html);
+                        }
+                    }, 'json');
+                });
+
+            parentSegment.find('.common-icd-item')
+                .off('click.add-common-icd')
+                .on('click.add-common-icd', function () {
+                    let table = $(this).closest('.nrc-icds').find('table').first(),
+                        tr = table.find('tbody>tr:eq(' + $(this).attr('data-target') + ')');
+                    tr.find('>td:eq(0) input').first().val($(this).attr('data-code'));
+                    tr.find('>td:eq(1) input').first().val($(this).attr('data-description'));
+                    $(this).closest('.on-hover-content').find('[menu]').hide();
+                    return false;
+                });
+
+            parentSegment.find('.common-icd-item-clear-all')
+                .off('click.common-icd-item-clear-all')
+                .on('click.common-icd-item-clear-all', function () {
+                    let table = $(this).closest('.nrc-icds').find('table').first();
+                    table.find('td input').val('');
+                    $(this).closest('.on-hover-content').find('[menu]').hide();
+                    return false;
+                });
+        }
+        addMCInitializer('note-resolve-{{$note->uid}}', init, '#note-resolve-{{$note->uid}}');
+        addMCHook('onICDUpdate-{{$note->uid}}', function() {
+            toastr.success('ICDs updated');
+        });
+    }).call(window);
+</script>

resources/views/app/patient/note/resolve.blade.php

@@ -0,0 +1,12 @@
+<?php
+/** @var App\Models\Note $note */
+/** @var App\Models\Pro $pro */
+/** @var App\Models\Section $section */
+/** @var $allSections */
+?>
+@extends ('layouts.print')
+
+@section('content')
+
+    @include('app.patient.note.partials.resolve-content')
+@endsection

resources/views/app/patient/note/rm-setup.blade.php

@@ -229,106 +229,7 @@
             </div>
         </div>
         <div class="my-2">
-            <table class="table-sm table-bordered v-top">
-                <tr>
-                    <td class="text-secondary">Care Plan:</td>
-                    <td>
-                        <div class="{{ $patient->has_care_plan_flag && !$patient->is_flag_cleared ? '':'d-flex' }}">
-                        <div class="d-inline-flex align-items-center">
-                            @if($patient->has_cm_setup_been_performed)
-                                <div class="text-nowrap text-success">
-                                    @if($patient->cm_setup_note_id === $note->id)
-                                        <i class="fa fa-check"></i>
-                                        <b>Created on this note</b>
-                                    @elseif($patient->cmSetupNote)
-                                        <i class="fa fa-check"></i>
-                                        <b>Created on</b>
-                                        <div class="d-inline position-relative on-click-menu">
-                                            <span class="text-primary c-pointer">{{friendly_date($patient->cmSetupNote->effective_dateest)}}</span>
-                                            <div menu right class="bg-white border">
-                                                <a native target="_blank"
-                                                href="<?= route('patients.view.notes.view.dashboard', ['patient' => $patient, 'note' => $patient->cmSetupNote]) ?>"
-                                                class="px-2 py-1 d-block text-nowrap text-sm">Go to note</a>
-                                            </div>
-                                        </div>
-                                    @else
-                                        <i class="fa fa-exclamation-triangle text-warning-mellow"></i>
-                                        <b class="text-warning-mellow">Performed, but CM setup note missing!</b> <!-- will never reach this point -->
-                                    @endif
-                                </div>
-                                @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
-                                    <div moe class="ml-3">
-                                        <a href="" show start>Undo</a>
-                                        <form url="/api/note/undoMarkCmSetupPerformed" >
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Mark Comprehensive Care Plan as not created?</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="text-nowrap text-warning-mellow">
-                                    <i class="fa fa-times"></i>
-                                    <b>Not Created</b>
-                                </span>
-                                @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
-                                    <div moe class="ml-3">
-                                        <a href="#" show start>Mark as created</a>
-                                        <form url="/api/note/markCmSetupPerformed" >
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Mark Comprehensive Care Plan as created?</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
-                            @endif
-                        </div>
-                        @if($pro->pro_type === 'ADMIN' && $note->was_cm_setup_performed)
-                            <div class="d-flex align-items-baseline">
-                                <div class="d-inline-flex align-items-center flex-grow-1">
-                                    <span class="pr-2">Manager Signature:</span>
-                                    @if($note->cm_setup_manager_signature_status !== 'SIGNED')
-                                        <div moe class="">
-                                            <a start show>Sign</a>
-                                            <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
-                                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                                <input type="hidden" name="managerSignatureStatus" value="SIGNED">
-                                                <p>Sign Off Care Plan Creation as Manager?</p>
-                                                <div>
-                                                    <button submit class="btn btn-sm btn-success mr-1">Sign</button>
-                                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                                </div>
-                                            </form>
-                                        </div>
-                                    @else
-                                        <b>SIGNED</b>
-                                        <div moe class="ml-3">
-                                            <a start show>Undo</a>
-                                            <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
-                                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                                <input type="hidden" name="managerSignatureStatus" value="">
-                                                <p>Undo sign as manager for Care Plan Creation?</p>
-                                                <div>
-                                                    <button submit class="btn btn-sm btn-primary mr-1">Undo</button>
-                                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                                </div>
-                                            </form>
-                                        </div>
-                                    @endif
-                                </div>
-                            </div>
-                        @endif
-                        @include('app.patient.note.flag-care-plan')
-                        </div>
-                    </td>
-                </tr>
-            </table>
+            @include('app.patient.note.partials.care-plan-details')
         </div>
 
 

resources/views/app/patient/note/segment-resolve.blade.php

@@ -0,0 +1,97 @@
+<?php $iName = $segment->segmentTemplate->internal_name; ?>
+<?php $isLSSegment = strpos($iName, 'lifestyle_') === 0; ?>
+
+<div class="border-bottom note-section visit-segment {{$note->is_signed_by_hcp ? '' : 'edit-trigger'}} {{strpos($iName, 'lifestyle_') === 0 && $iName !== 'lifestyle_general' ? 'zero-height' : ''}}"
+     data-segment-uid="{{ $segment->uid }}"
+     data-segment-template-uid="{{ $segment->segmentTemplate->uid }}"
+     data-segment-template-name="{{ $segment->segmentTemplate->internal_name }}">
+
+    <div class="d-flex align-items-baseline bg-light text-secondary p-2" style="border-bottom: 1px solid #dee2e6;">
+
+    <!-- title -->
+
+        <span class="font-weight-bold d-flex align-items-center {{$isLSSegment || $iName === 'medrisk_vigilence' ? '' : 'xxxmb-2'}}" style="">
+            <span style="color: black; text-decoration: underline; font-size: 13px;">
+                {{$segment->display_title}}
+            </span>
+        </span>
+
+        @if($isLSSegment)
+            @if($iName === 'lifestyle_general')
+                <a href="#" class="ls-segment-trigger ml-2" data-target="lifestyle_general">General</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_nutrition">Nutrition</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_physical_activity">Physical Act.</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_sleep">Sleep</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_social">Social Relns.</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_substances">Subst. Use</a>
+                <span class="mx-2 text-secondary text-sm">|</span>
+                <a href="#" class="ls-segment-trigger" data-target="lifestyle_stress">Stress</a>
+            @else
+                <span class="text-info ml-auto font-weight-normal">(click to view)</span>
+            @endif
+        @endif
+
+    </div>
+
+    <?php
+    $rhsEdit = (in_array($segment->segmentTemplate->internal_name, [
+            'informed_consent',
+            'omega_informed_consent',
+            'chief_complaint',
+            'omega_cc',
+            'ros',
+            'omega_ros',
+            'subjective_general',
+            'omega_subjective_free_text',
+            'objective_free_text',
+            'omega_objective_free_text',
+            'assessment_free_text',
+            'omega_assessment_free_text',
+            'plan_free_text',
+            'omega_plan_free_text',
+        ]) === TRUE);
+    ?>
+
+    @if(!$isLSSegment)
+        <?php
+            $html = '';
+            if($note->is_signed_by_hcp && $segment->accepted_suggestion_summary_html) {
+                $recalculated = $html = $segment->accepted_suggestion_summary_html;
+            }
+            else {
+                $recalculated = $html = $segment->summary_html;
+                if(in_array($segment->segmentTemplate->internal_name, ['chief_complaint', 'omega_cc']) === TRUE) {
+                    $recalculated = $segment->getRecalculatedHtml($performer, $performer->session_key, true)['summaryHtml'];
+                }
+            }
+        ?>
+        @if(!$rhsEdit)
+            <div class="inset-comment summary-container p-2">
+                {!! $html !!}
+            </div>
+        @else
+            <div class="d-flex align-items-stretch overridable">
+                <div class="min-width-50">
+                    <label class="font-weight-bold text-sm py-1 mb-0 ml-2">Current:</label>
+                    <div class="inset-comment summary-container border-top p-2 lhs-read">
+                        {!! $html !!}
+                    </div>
+                </div>
+                <div class="min-width-50 rhs-edit">
+                    <label class="font-weight-bold text-sm py-1 mb-0 ml-2">Override:</label>
+                    <div contenteditable class="border border-info p-2">{!! trim($recalculated) !!}</div>
+                    <div class="my-1">
+                        <a href="#" class="btn-apply-override" data-segment-uid="{{$segment->uid}}">Apply</a>
+                    </div>
+                </div>
+            </div>
+        @endif
+    @endif
+
+</div>
+

resources/views/app/patient/note/segment/suggestions_and_updates.blade.php

@@ -1,4 +1,3 @@
-
 <?php $iName = $segment->segmentTemplate->internal_name; ?>
 <?php $isLSSegment = strpos($iName, 'lifestyle_') === 0; ?>
 <div class="ml-2">
@@ -106,16 +105,22 @@
         @endif 
         <hr>
         <div class="d-block mt-1" moe>
-            <a href="" start>Propose suggestion</a>
+            <a href="" start show>Propose suggestion</a>
             <form url="/api/segment/proposeSegmentSummarySuggestion">
                 <input type="hidden" name="uid" value="{{$segment->uid}}">
                 <textarea name="proposedSuggestedSummaryHtml" rte>
                     @if($segment->accepted_suggestion_summary_html)
                         {!! $segment->accepted_suggestion_summary_html !!}
                     @else 
-                        {!! $segment->getRecalculatedHtml($performer, $performer->session_key)['summaryHtml'] !!}
+                        {!! 1 ? $segment->getRecalculatedHtml($performer, $performer->session_key, true)['summaryHtml'] : '' !!}
                     @endif 
                 </textarea>
+                @if($performer->pro->pro_type == 'ADMIN')
+                <div class="checkbox mt-1">
+                    <input type="checkbox" name="autoAccept">
+                    <label for="" class="checkbox-label">Auto-accept</label>
+                </div>
+                @endif
                 <div class="mb-0 mt-2">
                     <button class="btn btn-primary btn-sm" submit>Submit</button>
                     <button class="btn btn-default border btn-sm" cancel>Cancel</button>

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>

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>

resources/views/app/practice-management/notes-resolution-center-v2.blade.php

@@ -0,0 +1,176 @@
+@extends ('layouts/template')
+
+@section('content')
+
+	<style>tr.bgyellow>td, tr.bgyellow>th { background-color: lightyellow; }</style>
+	<style>tr.bggreen>td, tr.bggreen>th { background-color: #caffca; }</style>
+	<style>tr.bgblue>td, tr.bgblue>th { background-color: #d0f2fd; }</style>
+	<style>tr.claim-closed>td:not(:first-child), tr.claim-closed>th:not(:first-child) { background-color: lightgray; }</style>
+
+    <div id="notes-resolution-center" class="px-3 pt-3 mcp-theme-1" v-cloak>
+
+        <div class="d-flex align-items-baseline">
+            <h6 class="font-size-16 font-weight-bold text-secondary mb-3">Notes Resolution Center</h6>
+            <form class="ml-5 d-inline-flex align-items-center" action="{{route('practice-management.notes-resolution-center-v2')}}" method="GET">
+                <span class="">Farah:</span>
+                <select name="f" class="form-control form-control-sm min-width-unset max-width-110px ml-2"
+                        onchange="fastLoad('{{route('practice-management.notes-resolution-center-v2')}}?' + $(this).closest('form').serialize()); return false;">
+                    <option value="">Any</option>
+                    <option {{ request()->input('f') === 'green' ? 'selected' : '' }} value="green">Green</option>
+                    <option {{ request()->input('f') === 'red' ? 'selected' : '' }} value="red">Red</option>
+                </select>
+                <span class=" ml-3">Shawn:</span>
+                <select name="s" class="form-control form-control-sm min-width-unset max-width-110px ml-2"
+                        onchange="fastLoad('{{route('practice-management.notes-resolution-center-v2')}}?' + $(this).closest('form').serialize()); return false;">
+                    <option value="">Any</option>
+                    <option {{ request()->input('s') === 'green' ? 'selected' : '' }} value="green">Green</option>
+                    <option {{ request()->input('s') === 'red' ? 'selected' : '' }} value="red">Red</option>
+                </select>
+            </form>
+        </div>
+
+        <div class="d-flex align-items-start">
+            <div class="overflow-overlay-on-hover width-300px max-width-300px min-width-300px border-bottom row-scroller" style="height: calc(100vh - 170px);">
+                <table class="table table-sm table-bordered table-striped m-0 w-100">
+                    <thead>
+                    <tr>
+                        <th class="border-bottom-0 text-nowrap width-22px"></th>
+                        <th class="border-bottom-0 text-nowrap width-30px text-right pr-2">V#</th>
+                        <th class="border-bottom-0 text-nowrap">Details</th>
+                    </tr>
+                    </thead>
+                    <tbody>
+                    @foreach($rows as $row)
+                        @php
+                            $parsedDetailJson = new stdClass();
+                            if($row->detail_json) {
+                                try {
+                                    $parsedDetailJson = json_decode($row->detail_json);
+                                }
+                                catch (Exception $e) {}
+                            }
+                        @endphp
+                        <tr class="{{request('uid') === $row->uid ? 'current-row' : ''}} {{ $row->visit_number > 2 ? 'bgyellow':'' }} {{ $row->visit_number == 1 ? 'bggreen first-visit':'' }} {{ $row->visit_number == 2 ? 'bgblue':'' }} {{ $row->is_claim_closed ? 'claim-closed' : '' }}"
+                            data-uid="{{$row->uid}}">
+                            <td class="{{request('uid') === $row->uid ? 'bg-info' : ''}}"></td>
+                            <td class="text-nowrap text-right pr-2">{{$row->visit_number}}</td>
+                            <td class="p-0">
+                                <div class="p-1 {{request('uid') === $row->uid ? 'border border-info' : ''}}">
+                                    <div class="text-nowrap d-flex align-items-baseline" >
+                                        @if(request('uid') === $row->uid)
+                                            <b>{{$row->client_name}}</b>
+                                        @else
+                                            <a class="text-nowrap select-row" href="/practice-management/notes-resolution-center-v2?uid={{$row->uid}}&{{queryLineExcept(['uid'])}}" data-uid="{{$row->uid}}">{{$row->client_name}}</a>
+                                        @endif
+                                        <a href="/patients/view/{{ $row->client_uid }}/notes/view/{{ $row->uid }}?suggestion_mode=on" target="top" native class="ml-2"><i class="fa fa-arrow-right"></i></a>
+                                    </div>
+                                    <a href="/patients/view/{{$row->client_uid}}" class="text-nowrap d-block pl-2" target="top" native>Chart #: {{$row->chart_number}}</a>
+                                    <span class="text-nowrap d-block pl-2">Pro: {{$row->hcp_name}}</span>
+                                    <span class="text-nowrap d-block pl-2">Date: {{friendly_date($row->effective_dateest)}}</span>
+                                </div>
+                            </td>
+                        </tr>
+                    @endforeach
+                    </tbody>
+                </table>
+            </div>
+            <div class="flex-grow-1 border-top">
+                @if(request('uid'))
+                    <div class="bg-white">
+                        @php
+                            $note = \App\Models\Note::where('uid', request('uid'))->first();
+                            $patient = $note->client;
+                        @endphp
+                        @include('app.patient.note.partials.resolve-content')
+                    </div>
+                @endif
+            </div>
+        </div>
+
+        <div class="d-flex align-items-baseline mt-3">
+            {!! $paginator->withQueryString()->links() !!}
+            <div class="mb-3">
+                <div class="ml-4 mb-3">Showing <b>{{$paginator->firstItem()}}</b> to <b>{{$paginator->lastItem()}}</b> (page {{$paginator->currentPage()}}) of <b>{{$paginator->total()}}</b> notes</div>
+            </div>
+        </div>
+
+    </div>
+
+    <script>
+        (function() {
+            function init() {
+                @php $nrcPage = request()->input('page') ?: 1; @endphp
+                let parent = $('#notes-resolution-center');
+                parent.find('.row-scroller')
+                    .off('scroll')
+                    .on('scroll', function() {
+                        localStorage.nrcv2RowScrollTop_{{$nrcPage}} = $(this).scrollTop();
+                    });
+                @if(request('uid'))
+                window.setTimeout(() => {
+                    if(localStorage.nrcv2RowScrollTop_{{$nrcPage}}) {
+                        parent.find('.row-scroller').scrollTop(+localStorage.nrcv2RowScrollTop_{{$nrcPage}});
+                    }
+                    else {
+                        let selectedTr = parent.find('tr[data-uid="{{request('uid')}}"]').first();
+                        if (selectedTr.length) {
+                            selectedTr[0].scrollIntoView({behavior: "auto", block: "center"});
+                        }
+                    }
+                    parent.removeAttr('v-cloak');
+                }, 0);
+                @else
+                localStorage.nrcv2RowScrollTop_{{$nrcPage}} = '';
+                parent.find('tr[data-uid]').first().find('.select-row').trigger('click');
+                @endif
+                parent.removeAttr('v-cloak');
+
+                parent
+                    .off('click.next-row', '.btn-next-row')
+                    .on('click.next-row', '.btn-next-row', function () {
+                        let currentRow = parent.find('tr.current-row').first(),
+                            nextRow = false;
+                        while(currentRow.length) {
+                            if(currentRow.next().is('.first-visit:not(.claim-closed)')) {
+                                nextRow = currentRow.next();
+                                break;
+                            }
+                            currentRow = currentRow.next();
+                        }
+                        if(nextRow && nextRow.length) {
+                            localStorage.nrcv2RowScrollTop_{{$nrcPage}} = '';
+                            nextRow.find('.select-row').trigger('click');
+                        }
+                        else {
+                            toastr.error('No can do!');
+                        }
+                        return false;
+                    });
+
+                parent
+                    .off('click.prev-row', '.btn-prev-row')
+                    .on('click.prev-row', '.btn-prev-row', function () {
+                        let currentRow = parent.find('tr.current-row').first(),
+                            prevRow = false;
+                        while(currentRow.length) {
+                            if(currentRow.prev().is('.first-visit:not(.claim-closed)')) {
+                                prevRow = currentRow.prev();
+                                break;
+                            }
+                            currentRow = currentRow.prev();
+                        }
+                        if(prevRow && prevRow.length) {
+                            localStorage.nrcv2RowScrollTop_{{$nrcPage}} = '';
+                            prevRow.find('.select-row').trigger('click');
+                        }
+                        else {
+                            toastr.error('No can do!');
+                        }
+                        return false;
+                    });
+            }
+            addMCInitializer('notes-resolution-center', init, '#notes-resolution-center');
+        }).call(window);
+    </script>
+
+@endsection

resources/views/app/practice-management/notes-resolution-center.blade.php

@@ -0,0 +1,153 @@
+@extends ('layouts/template')
+
+@section('content')
+
+	<style>tr.bgyellow td, tr.bgyellow th { background-color: lightyellow; }</style>
+	<style>tr.bggreen td, tr.bggreen th { background-color: #caffca; }</style>
+	<style>tr.bgblue td, tr.bgblue th { background-color: #d0f2fd; }</style>
+	<style>tr.claim-closed td:not(:first-child), tr.claim-closed th:not(:first-child) { background-color: lightgray; }</style>
+
+    <div id="notes-resolution-center" class="p-3 mcp-theme-1">
+
+        <div class="d-flex align-items-baseline">
+            <h6 class="font-size-16 font-weight-bold text-secondary mb-3">Notes Resolution Center</h6>
+            <form class="ml-5 d-inline-flex align-items-center" action="{{route('practice-management.notes-resolution-center')}}" method="GET">
+                <span class="">Farah:</span>
+                <select name="f" class="form-control form-control-sm min-width-unset max-width-110px ml-2"
+                        onchange="fastLoad('{{route('practice-management.notes-resolution-center')}}?' + $(this).closest('form').serialize()); return false;">
+                    <option value="">Any</option>
+                    <option {{ request()->input('f') === 'green' ? 'selected' : '' }} value="green">Green</option>
+                    <option {{ request()->input('f') === 'red' ? 'selected' : '' }} value="red">Red</option>
+                </select>
+                <span class=" ml-3">Shawn:</span>
+                <select name="s" class="form-control form-control-sm min-width-unset max-width-110px ml-2"
+                        onchange="fastLoad('{{route('practice-management.notes-resolution-center')}}?' + $(this).closest('form').serialize()); return false;">
+                    <option value="">Any</option>
+                    <option {{ request()->input('s') === 'green' ? 'selected' : '' }} value="green">Green</option>
+                    <option {{ request()->input('s') === 'red' ? 'selected' : '' }} value="red">Red</option>
+                </select>
+            </form>
+        </div>
+
+        <table class="table table-sm table-bordered table-striped">
+            <thead>
+            <tr>
+                <th class="border-bottom-0 text-nowrap text-right pr-2">V#</th>
+                <th class="border-bottom-0 text-nowrap">Name</th>
+                <th class="border-bottom-0 text-nowrap">MCP</th>
+                <th class="border-bottom-0 text-nowrap d-none">NA</th>
+                <th class="border-bottom-0 text-nowrap d-none">Chart #</th>
+                <th class="border-bottom-0 text-nowrap">Date</th>
+                <th class="border-bottom-0 text-nowrap">Minutes</th>
+                <th class="border-bottom-0 text-nowrap">Note ICDs</th>
+                <th class="border-bottom-0 text-nowrap">Note Link</th>
+                <th class="border-bottom-0 text-nowrap"></th>
+                <th class="border-bottom-0 text-nowrap"></th>
+                <th class="border-bottom-0 text-nowrap">Farah Green?</th>
+                <th class="border-bottom-0 text-nowrap">Shawn Review?</th>
+                <th class="border-bottom-0 text-nowrap">Memo to Shawn</th>
+                <th class="border-bottom-0 text-nowrap">Shawn Green?</th>
+                <th class="border-bottom-0 text-nowrap">Shawn Reject?</th>
+                <th class="border-bottom-0 text-nowrap">Claiming Closed?</th>
+                <th class="border-bottom-0 text-nowrap d-none">Kyle Billed?</th>
+                <th class="border-bottom-0 w-50 d-none"></th>
+            </tr>
+            </thead>
+            <tbody>
+            @foreach($rows as $row)
+                @php
+		    $visitCount = $row->visit_number;
+                    $parsedDetailJson = new stdClass();
+                    if($row->detail_json) {
+                        try {
+                            $parsedDetailJson = json_decode($row->detail_json);
+                        }
+                        catch (Exception $e) {}
+                    }
+                @endphp
+                <tr class="{{ $row->visit_number > 2 ? 'bgyellow':'' }} {{ $row->visit_number == 1 ? 'bggreen':'' }} {{ $row->visit_number == 2 ? 'bgblue':'' }} {{ $row->is_claim_closed ? 'claim-closed' : '' }}">
+                    <td class="text-nowrap text-right pr-2">{{$row->visit_number}}</td>
+                    <td class="text-nowrap"><a href="/patients/view/{{$row->client_uid}}">{{$row->client_name}}</a></td>
+                    <td class="text-nowrap">{{$row->hcp_name}}</td>
+                    <td class="text-nowrap d-none">{{$row->na_name}}</td>
+                    <td class="text-nowrap d-none">{{$row->chart_number}}</td>
+                    <td class="text-nowrap">{{friendly_date($row->effective_dateest)}}</td>
+                    <td class="text-nowrap">{{ $row->minutes }}</td>
+                    <td class="">
+                        @if($row->icd1) <div class="grow-till-300px">{{$row->icd1}} {{$row->icd1description}}</div>@endif
+                        @if($row->icd2) <div class="grow-till-300px">{{$row->icd2}} {{$row->icd2description}}</div>@endif
+                        @if($row->icd3) <div class="grow-till-300px">{{$row->icd3}} {{$row->icd3description}}</div>@endif
+                        @if($row->icd4) <div class="grow-till-300px">{{$row->icd4}} {{$row->icd4description}}</div>@endif
+                        @if($row->icd_memo) <div class="grow-till-300px">{{$row->icd_memo}}</div>@endif
+                    </td>
+                    <td class="text-nowrap">
+                        <a open-in-stag-popup popup-style="medium-large" update-parent
+                           mc-initer="note-resolve-{{$row->uid}}"
+                           title="Note: {{$row->client_name}}  -  {{friendly_date($row->effective_dateest)}} - Visit# {{$row->visit_number}}"
+                           href="/resolve-note/{{$row->client_uid}}/{{$row->uid}}">View</a>&nbsp;
+			            <a href="/patients/view/{{ $row->client_uid }}/notes/view/{{ $row->uid }}?suggestion_mode=on" target="popup" onclick="window.open("/patients/view/{{ $row->client_uid }}/notes/view/{{ $row->uid }}?suggestion_mode=on",'popup','width=600,height=600,scrollbars=no,resizable=no'); return false;"><i class="fa fa-arrow-right"></i></a>
+                    </td>
+                    <td>
+			@if(!$row->is_claim_closed)
+                            <div moe>
+                                <a start show>Submit claim</a>
+                                <form url="/api/note/processNoteShortcut">
+                                    <input type="hidden" name="uid" value="{{$row->uid}}">
+                                    <div class="form-group mb-2">
+                                        <p>Are you sure?</p>
+                                    </div>
+                                    <div class="form-group m-0">
+                                        <button submit class="btn btn-primary btn-sm">submit</button>
+                                        <button cancel class="btn btn-primary btn-sm">cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+			@endif
+                    </td>
+                    <td>
+                        @if($row->visit_number == 1 && !$row->is_claim_closed)
+                            <div moe>
+                                <form show url="/api/note/processVisit1ForCovidIntake">
+                                    <input type="hidden" name="uid" value="{{$row->uid}}">
+                                    <div class="form-group mb-2 d-none">
+                                        <p>Are you sure?</p>
+                                    </div>
+                                    <div class="form-group m-0">
+                                        <button submit class="btn btn-danger btn-sm" process-intake="true">Process Intake</button>
+                                    </div>
+                                </form>
+                            </div>
+                        @endif
+                    </td>
+                    <td class="font-weight-bold text-success">{!! @$parsedDetailJson->farah_decision && @$parsedDetailJson->farah_decision === 'green' ? '<i class="fa fa-check"></i> Yes' : '' !!}</td>
+                    <td class="font-weight-bold text-warning-dark">{!! @$parsedDetailJson->farah_decision && @$parsedDetailJson->farah_decision === 'red' ? '<i class="fa fa-exclamation-triangle"></i> Yes' : '' !!}</td>
+                    <td class="font-weight-bold">{{ @$parsedDetailJson->memo_to_shawn }}</td>
+                    <td class="font-weight-bold text-success">{!! @$parsedDetailJson->shawn_decision && @$parsedDetailJson->shawn_decision === 'green' ? '<i class="fa fa-check"></i> Yes' : '' !!}</td>
+                    <td class="font-weight-bold text-danger">{!! @$parsedDetailJson->shawn_decision && @$parsedDetailJson->shawn_decision === 'red' ? '<i class="fa fa-times"></i> Rejected' : '' !!}</td>
+                    <td class="font-weight-bold text-success">{{ $row->is_claim_closed }}</td>
+                    <td class="font-weight-bold text-success d-none">{!! @$parsedDetailJson->kyle_billed && @$parsedDetailJson->kyle_billed === 'yes' ? '<i class="fa fa-check"></i> Yes' : '' !!}</td>
+                    
+                    <td class="d-none">
+		            {{--
+			<a href="/patients/view/{{ $row->client_uid }}/notes/view/{{ $row->uid }}?suggestion_mode=on" target="popup"
+				onclick="window.open("/patients/view/{{ $row->client_uid }}/notes/view/{{ $row->uid }}?suggestion_mode=on",'popup','width=600,height=600,scrollbars=no,resizable=no'); return false;"></a>
+
+                        <a open-in-stag-popup update-parent title="Note: {{$row->client_name}}  -  {{friendly_date($row->effective_dateest)}} - SUGGESTION MODE"
+				href="/patients/view/{{ $row->client_uid }}/notes/view/{{ $row->uid }}?suggestion_mode=on">Go to note</a>
+                    </td>
+                    --}}
+                </tr>
+            @endforeach
+            </tbody>
+        </table>
+
+        <div class="d-flex align-items-baseline">
+            {!! $paginator->withQueryString()->links() !!}
+            <div class="mb-3">
+                <div class="ml-4 mb-3">Showing <b>{{$paginator->firstItem()}}</b> to <b>{{$paginator->lastItem()}}</b> (page {{$paginator->currentPage()}}) of <b>{{$paginator->total()}}</b> notes</div>
+            </div>
+        </div>
+
+    </div>
+
+@endsection

resources/views/app/practice-management/process-claims.blade.php

@@ -36,6 +36,10 @@
                                    class="form-control form-control-sm w-100 min-width-unset"
                                    :class="filter.to ? 'bg-aliceblue' : ''">
                         </div>
+                        <div class="width-150px mr-2 form-check mt-2">
+                          <input type="checkbox" class="form-check-input" name="zero_deductibles_only">
+                          <label for="" class="form-check-label">Zero Deductibles Only</label>
+                        </div>
                         <div class="">
                             <label class="mb-1 text-sm text-secondary">&nbsp;</label>
                             <div class="d-flex align-items-center">

resources/views/app/practice-management/remote-monitoring-row-for-admin.blade.php

@@ -0,0 +1,18 @@
+<?php
+
+$mStr = request()->input('m') ? request()->input('m') : date('m');
+$yStr = request()->input('y') ? request()->input('y') : date('Y');
+$rcmStartDate = $yStr . '-' . $mStr . '-' . '01';
+$m = +$mStr;
+$y = +$yStr;
+
+$daysDiff = -1;
+if($iPatient->most_recent_completed_mcp_note_date) {
+    $careMonthLastDay = date_add(date_create($rcmStartDate), date_interval_create_from_date_string("1 month"));
+    $careMonthLastDay = date_sub($careMonthLastDay, date_interval_create_from_date_string("1 day"));
+    $daysDiff = date_diff($careMonthLastDay, date_create($iPatient->most_recent_completed_mcp_note_date))->days;
+}
+$lastVisitWithin90Days = ($daysDiff !== -1 && $daysDiff <= 90);
+
+?>
+@include('app.practice-management.remote-monitoring-row-markup-for-admin')

resources/views/app/practice-management/remote-monitoring-row-markup-for-admin.blade.php

@@ -0,0 +1,114 @@
+<tr data-client-uid="{{$iPatient->client_uid}}" data-care-month-uid="{{$iPatient->care_month_uid}}">
+    <td class="pl-2">
+        <a href="/patients/view/{{ $iPatient->client_uid }}/care-months/view/{{$iPatient->care_month_uid}}"
+           native target="_blank"
+           open-in-stag-popup
+           update-parent="refresh-rpm-row-{{$trIndex}}"
+           popup-style="tall overflow-visible"
+           mc-initer="care-month-dashboard-{{$iPatient->client_uid}}"
+           title="{{$iPatient->client_name}}"
+           class="text-nowrap d-block max-width-170px overflow-hidden text-ellipsis"
+        ><span class="sort-data">{{ $iPatient->client_name }}</span></a>
+    </td>
+
+    <td>{{friendly_date($iPatient->dob)}}</td>
+    <td>{!! $iPatient->is_enrolled_in_rm === 'YES' ? '<i class="fa fa-check text-success"></i>' : 'No' !!}</td>
+    <td>{!! $iPatient->is_assigned_cellular_bp_device ? '<i class="fa fa-check text-success"></i>' : 'No' !!}</td>
+    <td>{!! $iPatient->is_assigned_cellular_weight_scale_device ? '<i class="fa fa-check text-success"></i>' : 'No' !!}</td>
+    <td>
+        <div class="text-nowrap">
+            <span class="sort-data">{{$iPatient->most_recent_cellular_bp_sbp_mm_hg ?: '-'}}</span>/{{$iPatient->most_recent_cellular_bp_dbp_mm_hg ?: '-'}}
+            @if($iPatient->most_recent_cellular_bp_measurement_at)
+                <span class="text-sm text-secondary text-nowrap ml-1"
+                      title="{{friendly_date_time($iPatient->most_recent_cellular_bp_measurement_at)}}">({{friendly_date_est($iPatient->most_recent_cellular_bp_measurement_at)}})</span>
+            @endif
+        </div>
+    </td>
+    <td>
+        <div class="text-nowrap">
+            <span class="sort-data">{{$iPatient->most_recent_cellular_weight_value ? round($iPatient->most_recent_cellular_weight_value, 1) : '-'}}</span>
+            @if($iPatient->most_recent_cellular_weight_measurement_at)
+                <span class="text-sm text-secondary text-nowrap ml-1"
+                      title="{{friendly_date_time($iPatient->most_recent_cellular_weight_measurement_at)}}">({{friendly_date_est($iPatient->most_recent_cellular_weight_measurement_at)}})</span>
+            @endif
+        </div>
+    </td>
+    
+    <td>
+        <div class="d-flex align-items-baseline">
+            <i class="mr-1 text-sm fa {{$lastVisitWithin90Days ? 'fa-check text-success' : 'fa-exclamation-triangle text-danger on-hover-opaque'}}"></i>
+            <span class="sort-data">{{$daysDiff !== -1 ? $daysDiff : '-'}}</span>
+        </div>
+    </td>
+
+    <td>
+        <div class="d-flex align-items-baseline">
+            <i class="mr-1 text-sm fa {{$iPatient->has_mcp_interacted_with_client_about_rm ? 'fa-check text-success' : 'fa-exclamation-triangle text-danger on-hover-opaque'}}"></i>
+            <span class="sort-data">{{$iPatient->has_mcp_interacted_with_client_about_rm ? 'Yes' : 'No'}}</span>
+        </div>
+    </td>
+
+    <td>
+        <div class="d-flex align-items-baseline">
+            <i class="mr-1 text-sm fa {{$iPatient->number_of_days_with_remote_measurements >= 16 ? 'fa-check text-success' : 'fa-exclamation-triangle text-danger on-hover-opaque'}}"></i>
+            <span class="sort-data">{{$iPatient->number_of_days_with_remote_measurements ?: 0}}</span>
+        </div>
+    </td>
+
+    <td>
+        <span class="sort-data">{{$iPatient->rm_num_measurements_not_stamped_by_mcp}}</span>
+    </td>
+
+    <td>
+        <span class="sort-data">{{$iPatient->rm_num_measurements_not_stamped_by_rmm}}</span>
+    </td>
+
+    <td>
+        <div class="d-flex align-items-baseline">
+            <i class="mr-1 text-sm fa {{$iPatient->rm_total_time_in_seconds_by_mcp >= 1200 ? 'fa-check text-success' : 'fa-exclamation-triangle text-danger on-hover-opaque'}}"></i>
+            <span class="text-nowrap">{{round($iPatient->rm_total_time_in_seconds_by_mcp / 60)}}m {{round($iPatient->rm_total_time_in_seconds_by_mcp % 60)}}s</span>
+            <span class="sort-data d-none">{{$iPatient->rm_total_time_in_seconds_by_mcp}}</span>
+        </div>
+    </td>
+
+    <td>
+        <div class="d-flex align-items-baseline">
+            <i class="mr-1 text-sm fa {{$iPatient->rm_total_time_in_seconds_by_rmm_pro >= 1200 ? 'fa-check text-success' : 'fa-exclamation-triangle text-danger on-hover-opaque'}}"></i>
+            <span class="text-nowrap">{{round($iPatient->rm_total_time_in_seconds_by_rmm_pro / 60)}}m {{round($iPatient->rm_total_time_in_seconds_by_rmm_pro % 60)}}s</span>
+            <span class="sort-data d-none">{{$iPatient->rm_total_time_in_seconds_by_rmm_pro}}</span>
+        </div>
+    </td>
+
+    <td>
+        @if($iPatient->mcp_rm_generic_bill_id)
+            <span class="text-success font-weight-bold">
+                <i class="fa fa-check"></i>
+                Yes
+            </span>
+            (${{friendly_money($iPatient->mcp_rm_generic_bill_expected_payment_amount)}})
+            @if($iPatient->mcp_rm_generic_bill_signed)
+                <span class="text-success">Signed</span>
+            @endif
+        @else
+            <span class="text-danger font-weight-normal">
+                Not yet
+            </span>
+        @endif
+    </td>
+    <td>
+        @if($iPatient->rmm_rm_generic_bill_id)
+            <span class="text-success font-weight-bold">
+                <i class="fa fa-check"></i>
+                Yes
+            </span>
+            (${{friendly_money($iPatient->rmm_rm_generic_bill_expected_payment_amount)}})
+            @if($iPatient->rmm_rm_generic_bill_signed)
+                <span class="text-success">Signed</span>
+            @endif
+        @else
+            <span class="text-danger font-weight-normal">
+                Not yet
+            </span>
+        @endif
+    </td>
+</tr>

resources/views/app/practice-management/rpm-matrix-for-admin.blade.php

@@ -0,0 +1,403 @@
+@extends ('layouts/template')
+
+@section('content')
+    <style>
+        #admin-table-rm-matrix_wrapper {
+            padding-top: 10px;
+        }
+    </style>
+    <link rel="stylesheet" href="https://cdn.datatables.net/1.11.5/css/jquery.dataTables.min.css">
+    <script src="https://cdn.datatables.net/1.11.5/js/jquery.dataTables.min.js"></script>
+    <style>
+        #table-rm-matrix_length, #table-rm-matrix_info {
+            padding-left: 0.5rem;
+        }
+
+        #table-rm-matrix_filter {
+            padding-right: 0.5rem;
+        }
+
+        #table-rm-matrix_paginate {
+            padding: 0.5rem;
+        }
+    </style>
+    <div class="p-3 mcp-theme-1 body-height" id="practice-remote-monitoring" v-cloak>
+
+        <div class="card h-100">
+
+            <div class="card-header px-2 py-2 d-flex align-items-baseline">
+                <form class="d-block w-100" action="" method="GET">
+
+                    <div class="d-flex align-items-end">
+                        <span class="mr-4">
+                            <span class="font-size-14">Remote Monitoring</span>
+                            <i class="fas fa-arrow-right text-sm mx-1"></i>
+                            <b class="font-size-14">{{friendly_month(date((request()->input('y') ?: 'Y') . '-' . (request()->input('m') ?: 'm') . '-d'))}}</b>
+                        </span>
+                        <?php
+
+                        $mStr = request()->input('m') ? request()->input('m') : date('m');
+                        $yStr = request()->input('y') ? request()->input('y') : date('Y');
+                        $rcmStartDate = $yStr . '-' . $mStr . '-' . '01';
+                        $m = +$mStr;
+                        $y = +$yStr;
+                        ?>
+
+                        <div class="ml-auto d-inline-flex flex-nowrap align-items-baseline">
+                            <span class="mr-2">Month</span>
+                            <select class="form-control form-control-sm min-width-unset width-100px mr-3" name="m"
+                                    onchange="fastLoad('{{route('practice-management.rpm-matrix-admin')}}?' + $(this).closest('form').serialize())">
+                                <option value="01" {{$m === 1 ? 'selected' : ''}}>Jan</option>
+                                <option value="02" {{$m === 2 ? 'selected' : ''}}>Feb</option>
+                                <option value="03" {{$m === 3 ? 'selected' : ''}}>Mar</option>
+                                <option value="04" {{$m === 4 ? 'selected' : ''}}>Apr</option>
+                                <option value="05" {{$m === 5 ? 'selected' : ''}}>May</option>
+                                <option value="06" {{$m === 6 ? 'selected' : ''}}>Jun</option>
+                                <option value="07" {{$m === 7 ? 'selected' : ''}}>Jul</option>
+                                <option value="08" {{$m === 8 ? 'selected' : ''}}>Aug</option>
+                                <option value="09" {{$m === 9 ? 'selected' : ''}}>Sep</option>
+                                <option value="10" {{$m === 10 ? 'selected' : ''}}>Oct</option>
+                                <option value="11" {{$m === 11 ? 'selected' : ''}}>Nov</option>
+                                <option value="12" {{$m === 12 ? 'selected' : ''}}>Dec</option>
+                            </select>
+                            <span class="mr-2">Year</span>
+                            <select class="form-control form-control-sm min-width-unset width-100px" name="y"
+                                    onchange="fastLoad('{{route('practice-management.rpm-matrix-admin')}}?' + $(this).closest('form').serialize())">
+                                <option value="2020" {{$y === 2020 ? 'selected' : ''}}>2020</option>
+                                <option value="2021" {{$y === 2021 ? 'selected' : ''}}>2021</option>
+                                <option value="2022" {{$y === 2022 ? 'selected' : ''}}>2022</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="d-flex align-items-start mt-2 pt-1 border-top">
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_name') ? 'text-info' : 'text-secondary'}}">Name</label>
+                            <input type="text"
+                                   class="mr-2 form-control form-control-sm min-width-unset max-width-110px"
+                                   name="f_name" value="{{request()->input('f_name')}}">
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_dob') ? 'text-info' : 'text-secondary'}}">DOB</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_dob_op"
+                                        class="mr-1 form-control form-control-sm min-width-unset width-40px pl-0">
+                                    <option {{request()->input('f_dob_op') === '=' ? 'selected' : ''}} value="=">&equals;</option>
+                                    <option {{request()->input('f_dob_op') === '>' ? 'selected' : ''}} value=">">&gt;</option>
+                                    <option {{request()->input('f_dob_op') === '<' ? 'selected' : ''}} value="<">&lt;</option>
+                                    <option {{request()->input('f_dob_op') === '>=' ? 'selected' : ''}} value=">=">&ge;</option>
+                                    <option {{request()->input('f_dob_op') === '<=' ? 'selected' : ''}} value="<=">&le;</option>
+                                </select>
+                                <input type="date" name="f_dob"
+                                       value="{{request()->input('f_dob')}}"
+                                       class="mr-2 form-control form-control-sm min-width-unset max-width-140px">
+                            </div>
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_rpm') && request()->input('f_rpm') !== 'any' ? 'text-info' : 'text-secondary'}}">RPM</label>
+                            <select name="f_rpm"
+                                    class="mr-2 form-control form-control-sm min-width-unset width-70px pl-0">
+                                <option {{request()->input('f_rpm') === 'any' ? 'selected' : ''}} value="any">Any</option>
+                                <option {{request()->input('f_rpm') === 'yes' ? 'selected' : ''}} value="yes">Yes</option>
+                                <option {{request()->input('f_rpm') === 'no' ? 'selected' : ''}} value="no">No</option>
+                            </select>
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_cell_bp') && request()->input('f_cell_bp') !== 'any' ? 'text-info' : 'text-secondary'}}">Cell. BP</label>
+                            <select name="f_cell_bp"
+                                    class="mr-2 form-control form-control-sm min-width-unset width-70px pl-0">
+                                <option {{request()->input('f_cell_bp') === 'any' ? 'selected' : ''}} value="any">Any</option>
+                                <option {{request()->input('f_cell_bp') === 'yes' ? 'selected' : ''}} value="yes">Yes</option>
+                                <option {{request()->input('f_cell_bp') === 'no' ? 'selected' : ''}} value="no">No</option>
+                            </select>
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_cell_wt') && request()->input('f_cell_wt') !== 'any' ? 'text-info' : 'text-secondary'}}">Cell. Wt</label>
+                            <select name="f_cell_wt"
+                                    class="mr-2 form-control form-control-sm min-width-unset width-70px pl-0">
+                                <option {{request()->input('f_cell_wt') === 'any' ? 'selected' : ''}} value="any">Any</option>
+                                <option {{request()->input('f_cell_wt') === 'yes' ? 'selected' : ''}} value="yes">Yes</option>
+                                <option {{request()->input('f_cell_wt') === 'no' ? 'selected' : ''}} value="no">No</option>
+                            </select>
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_comm') && request()->input('f_comm') !== 'any' ? 'text-info' : 'text-secondary'}}">Comm.</label>
+                            <select name="f_comm"
+                                    class="mr-2 form-control form-control-sm min-width-unset width-70px pl-0">
+                                <option {{request()->input('f_comm') === 'any' ? 'selected' : ''}} value="any">Any</option>
+                                <option {{request()->input('f_comm') === 'yes' ? 'selected' : ''}} value="yes">Yes</option>
+                                <option {{request()->input('f_comm') === 'no' ? 'selected' : ''}} value="no">No</option>
+                            </select>
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_md') ? 'text-info' : 'text-secondary'}}">Meas. Days</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_md_op"
+                                        class="mr-1 form-control form-control-sm min-width-unset width-40px pl-0">
+                                    <option {{request()->input('f_md_op') === '=' ? 'selected' : ''}} value="=">&equals;</option>
+                                    <option {{request()->input('f_md_op') === '>' ? 'selected' : ''}} value=">">&gt;</option>
+                                    <option {{request()->input('f_md_op') === '<' ? 'selected' : ''}} value="<">&lt;</option>
+                                    <option {{request()->input('f_md_op') === '>=' ? 'selected' : ''}} value=">=">&ge;</option>
+                                    <option {{request()->input('f_md_op') === '<=' ? 'selected' : ''}} value="<=">&le;</option>
+                                </select>
+                                <input type="number" name="f_md"
+                                       value="{{request()->input('f_md')}}"
+                                       class="mr-2 form-control form-control-sm min-width-unset width-70px">
+                            </div>
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_unst') ? 'text-info' : 'text-secondary'}}">Unstamped</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_unst_op"
+                                        class="mr-1 form-control form-control-sm min-width-unset width-40px pl-0">
+                                    <option {{request()->input('f_unst_op') === '=' ? 'selected' : ''}} value="=">&equals;</option>
+                                    <option {{request()->input('f_unst_op') === '>' ? 'selected' : ''}} value=">">&gt;</option>
+                                    <option {{request()->input('f_unst_op') === '<' ? 'selected' : ''}} value="<">&lt;</option>
+                                    <option {{request()->input('f_unst_op') === '>=' ? 'selected' : ''}} value=">=">&ge;</option>
+                                    <option {{request()->input('f_unst_op') === '<=' ? 'selected' : ''}} value="<=">&le;</option>
+                                </select>
+                                <input type="number" name="f_unst"
+                                       value="{{request()->input('f_unst')}}"
+                                       class="mr-2 form-control form-control-sm min-width-unset width-70px">
+                            </div>
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_mcp_mins') ? 'text-info' : 'text-secondary'}}">MCP Mins.</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_mcp_mins_op"
+                                        class="mr-1 form-control form-control-sm min-width-unset width-40px pl-0">
+                                    <option {{request()->input('f_mcp_mins_op') === '=' ? 'selected' : ''}} value="=">&equals;</option>
+                                    <option {{request()->input('f_mcp_mins_op') === '>' ? 'selected' : ''}} value=">">&gt;</option>
+                                    <option {{request()->input('f_mcp_mins_op') === '<' ? 'selected' : ''}} value="<">&lt;</option>
+                                    <option {{request()->input('f_mcp_mins_op') === '>=' ? 'selected' : ''}} value=">=">&ge;</option>
+                                    <option {{request()->input('f_mcp_mins_op') === '<=' ? 'selected' : ''}} value="<=">&le;</option>
+                                </select>
+                                <input type="number" name="f_mcp_mins"
+                                       value="{{request()->input('f_mcp_mins')}}"
+                                       class="mr-2 form-control form-control-sm min-width-unset width-70px">
+                            </div>
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_rmm_mins') ? 'text-info' : 'text-secondary'}}">RMM Mins.</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_rmm_mins_op"
+                                        class="mr-1 form-control form-control-sm min-width-unset width-40px pl-0">
+                                    <option {{request()->input('f_rmm_mins_op') === '=' ? 'selected' : ''}} value="=">&equals;</option>
+                                    <option {{request()->input('f_rmm_mins_op') === '>' ? 'selected' : ''}} value=">">&gt;</option>
+                                    <option {{request()->input('f_rmm_mins_op') === '<' ? 'selected' : ''}} value="<">&lt;</option>
+                                    <option {{request()->input('f_rmm_mins_op') === '>=' ? 'selected' : ''}} value=">=">&ge;</option>
+                                    <option {{request()->input('f_rmm_mins_op') === '<=' ? 'selected' : ''}} value="<=">&le;</option>
+                                </select>
+                                <input type="number" name="f_rmm_mins"
+                                       value="{{request()->input('f_rmm_mins')}}"
+                                       class="mr-2 form-control form-control-sm min-width-unset width-70px">
+                            </div>
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_mcp_billable') && request()->input('f_mcp_billable') !== 'any' ? 'text-info' : 'text-secondary'}}">MCP Billable</label>
+                            <select name="f_mcp_billable"
+                                    class="mr-2 form-control form-control-sm min-width-unset width-70px pl-0">
+                                <option {{request()->input('f_mcp_billable') === 'all' ? 'selected' : ''}} value="any">All</option>
+                                <option {{request()->input('f_mcp_billable') === 'yes' ? 'selected' : ''}} value="yes">Yes</option>
+                                <option {{request()->input('f_mcp_billable') === 'no' ? 'selected' : ''}} value="no">No</option>
+                            </select>
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm {{request()->input('f_rmm_billable') && request()->input('f_rmm_billable') !== 'any' ? 'text-info' : 'text-secondary'}}">RMM Billable</label>
+                            <select name="f_rmm_billable"
+                                    class="mr-2 form-control form-control-sm min-width-unset width-70px pl-0">
+                                <option {{request()->input('f_rmm_billable') === 'all' ? 'selected' : ''}} value="any">All</option>
+                                <option {{request()->input('f_rmm_billable') === 'yes' ? 'selected' : ''}} value="yes">Yes</option>
+                                <option {{request()->input('f_rmm_billable') === 'no' ? 'selected' : ''}} value="no">No</option>
+                            </select>
+                        </div>
+
+                        <div>
+                            <label class="mb-0 text-sm text-secondary">&nbsp;</label>
+                            <div class="d-flex align-items-start">
+                                <button class="btn-apply btn btn-sm btn-primary mr-2"><i class="fa fa-check"></i></button>
+                                <button class="btn-reset btn btn-sm btn-default bg-white text-secondary border"><i class="fa fa-times"></i></button>
+                            </div>
+                        </div>
+                    </div>
+
+                </form>
+            </div>
+
+            <?php $rc = request()->input('rc') ? request()->input('rc') : 1; ?>
+
+            <div class="card-body p-0">
+                <div class="d-flex align-items-stretch m-0 h-100">
+                    <div class="flex-grow-1 px-0 overflow-auto h-100 rpm-matrix-right-column">
+                        <?php $trIndex = 0; ?>
+                        @foreach ($patients as $iPatient)
+                            <script>
+                                addMCHook(
+                                    'refresh-rpm-row-{{$trIndex}}',
+                                    function () {
+                                        refreshRpmRow({{$trIndex}});
+                                    }
+                                );
+                            </script>
+                            <?php $trIndex++; ?>
+                        @endforeach
+                        <table class="table table-sm table-striped table-hover p-0 m-0 min-width-1100px" id="table-rm-matrix">
+                            <thead class="bg-light">
+                            <tr>
+
+                                <th class="border-0 pl-2">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Name', 'key' => 'client_name'])</th>
+                                <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'DOB', 'key' => 'dob'])</th>
+                                <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'RPM?', 'key' => 'is_enrolled_in_rm'])</th>
+                                <th class="border-0 text-secondary">Cell. BP?</th>
+                                <th class="border-0 text-secondary">Cell. Scale?</th>
+                                <th class="border-0 text-secondary">Latest BP</th>
+                                <th class="border-0 text-secondary">Latest Wt</th>
+                                <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Days Since Last Visit', 'key' => 'most_recent_completed_mcp_note_date'])</th>
+                                <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Comm?', 'key' => 'has_mcp_interacted_with_client_about_rm'])</th>
+                                <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '#Meas. Days', 'key' => 'number_of_days_with_remote_measurements'])</th>
+                                <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '#MCP Unst.', 'key' => 'rm_num_measurements_not_stamped_by_mcp'])</th>
+                                <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '#RMM Unst.', 'key' => 'rm_num_measurements_not_stamped_by_rmm'])</th>
+                                <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '#MCP Mins.', 'key' => 'rm_total_time_in_seconds_by_mcp'])</th>
+                                <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '#RMM Mins.', 'key' => 'rm_total_time_in_seconds_by_rmm_pro'])</th>
+                                @if(!request()->input('f_mcp_billable') || request()->input('f_mcp_billable') === 'all')
+                                    <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'MCP Bill', 'key' => 'mcp_rm_generic_bill_id'])</th>
+                                @else
+                                    <th class="border-0 text-secondary">MCP Bill</th>
+                                @endif
+                                @if(!request()->input('f_rmm_billable') || request()->input('f_rmm_billable') === 'all')
+                                    <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'RMM Bill', 'key' => 'rmm_rm_generic_bill_id'])</th>
+                                @else
+                                    <th class="border-0 text-secondary">RMM Bill</th>
+                                @endif
+                            </tr>
+                            </thead>
+                            <tbody>
+                            <?php $trIndex = 0; ?>
+                            @foreach ($patients as $iPatient)
+                                <?php
+
+                                $daysDiff = -1;
+                                if ($iPatient->most_recent_completed_mcp_note_date) {
+                                    $careMonthLastDay = date_add(date_create($rcmStartDate), date_interval_create_from_date_string("1 month"));
+                                    $careMonthLastDay = date_sub($careMonthLastDay, date_interval_create_from_date_string("1 day"));
+                                    $daysDiff = date_diff($careMonthLastDay, date_create($iPatient->most_recent_completed_mcp_note_date))->days;
+                                }
+                                $lastVisitWithin90Days = ($daysDiff !== -1 && $daysDiff <= 90);
+
+                                ?>
+                                @include('app.practice-management.remote-monitoring-row-markup-for-admin')
+                                <?php $trIndex++; ?>
+                            @endforeach
+                            </tbody>
+                        </table>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+    <script>
+        (function () {
+            let dataTableInst = null;
+            window.refreshRpmRow = function (_index) {
+                let tr = $('#table-rm-matrix tbody tr:eq(' + _index + ')');
+                if (!tr.length) return;
+                let clientUid = tr.attr('data-client-uid'), careMonthUid = tr.attr('data-care-month-uid');
+                $.get('/rpm-matrix-row-for-admin?m={{$mStr}}&y={{$yStr}}&clientUid=' + clientUid + '&careMonthUid=' + careMonthUid + '&trIndex=' + _index, _data => {
+                    let row = $(_data);
+                    @if(request()->input('dt'))
+                    row.find('>td').each(function (_columnIndex) {
+                        dataTableInst.cell(_index, _columnIndex).data(this.innerHTML); //.draw();
+                    });
+                    @else
+                    tr.replaceWith(row);
+                    @endif
+                    $('#practice-remote-monitoring [moe][initialized]').removeAttr('initialized');
+                    initMoes();
+                    tr.addClass('post-refresh-highlight');
+                    setTimeout(function () {
+                        tr.removeClass('post-refresh-highlight');
+                    }, 1000);
+                });
+            }
+
+            function init() {
+                @if(request()->input('dt'))
+                    dataTableInst = $('#table-rm-matrix').DataTable({
+                    paging: false,
+                    columnDefs: [
+                        {
+                            targets: [0, 8],
+                            type: 'string',
+                            render: function (data, type, row, meta) {
+                                if (type === 'sort') {
+                                    return $(data).find('.sort-data').first().text();
+                                }
+                                return data;
+                            },
+                        },
+                        {targets: 1, type: 'date'},
+                        {
+                            targets: 7,
+                            type: 'num',
+                            render: function (data, type, row, meta) {
+                                if (type === 'sort') {
+                                    return $(data).find('.sort-data').first().text();
+                                }
+                                return data;
+                            },
+                        },
+                        {
+                            targets: [5, 6, 10, 11, 12],
+                            type: 'num',
+                            render: function (data, type, row, meta) {
+                                if (type === 'sort') {
+                                    return +($(data).find('.sort-data').first().text());
+                                }
+                                return data;
+                            },
+                        },
+                    ]
+                });
+                @endif
+                $('#practice-remote-monitoring').removeAttr('v-cloak');
+                $('#practice-remote-monitoring [moe][initialized]').removeAttr('initialized');
+
+                let parent = $('#practice-remote-monitoring');
+
+                parent.find('.btn-apply')
+                    .off('click.filter')
+                    .on('click.filter', function() {
+                        fastLoad('{{route('practice-management.rpm-matrix-admin')}}?' + $(this).closest('form').serialize());
+                        return false;
+                    });
+
+                parent.find('.btn-reset')
+                    .off('click.reset')
+                    .on('click.reset', function() {
+                        fastLoad('{{route("practice-management.rpm-matrix-admin")}}');
+                        return false;
+                    });
+
+                initMoes();
+
+                // hack - init split at 22%
+                localStorage['v-split-rounded-rpm-matrix-split'] = 22;
+                initVSplitter('rpm-matrix-split', $('.rpm-matrix-left-column'), $('.rpm-matrix-right-column'), null, {marginLeft: '-3px', width: '5px', height: '100%', marginTop: 0, borderRadius: 0});
+            }
+
+            addMCInitializer('practice-remote-monitoring', init, '#practice-remote-monitoring');
+        }).call(window);
+    </script>
+@endsection

resources/views/layouts/patient-header.blade.php

@@ -326,7 +326,7 @@ $addressParts .= implode(", ", $addressPart2);
               </span> 
             </div>
             @if($performer->pro->pro_type == 'ADMIN')
-              @if(@$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining)
+              @if(true || @$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining)
                 <div class="ml-2">Deductible: {{format_number(@$patient->latestClientPrimaryCoverage->auto_medicare_mpb_remaining)}} </div>
               @endif
             @endif 

resources/views/layouts/template.blade.php

@@ -184,6 +184,8 @@
                             <i class="mr-1 fas fa-tasks"></i> Admin
                         </a>
                         <div class="dropdown-menu mcp-theme-1 no-overflow-menu p-0" aria-labelledby="practice-management">
+                            <a class="dropdown-item" href="{{ route('practice-management.notes-resolution-center') }}">Notes Resolution Center</a>
+                            <a class="dropdown-item" href="{{ route('practice-management.notes-resolution-center-v2') }}">Notes Resolution Center V2</a>
                             <a class="dropdown-item" href="{{ route('practice-management.remote-monitoring-admin') }}">Remote Monitoring (admin)</a>
                             <a class="dropdown-item" href="{{ route('practice-management.daily-treatment-services') }}">Daily Treatment Services</a>
 

routes/web.php

@@ -233,6 +233,10 @@ Route::middleware('pro.auth')->group(function () {
         // rpm work matrix - latest patient with unstamped measurements
         Route::get('rpm-work-matrix', 'PracticeManagementController@rpm_work_matrix')->name('rpm_work_matrix');
 
+        // notes resolution
+        Route::get('notes-resolution-center', 'PracticeManagementController@notesResolutionCenter')->name('notes-resolution-center');
+        Route::get('notes-resolution-center-v2', 'PracticeManagementController@notesResolutionCenterV2')->name('notes-resolution-center-v2');
+
         Route::get('rates/{selectedProUid?}', 'PracticeManagementController@rates')->name('rates');
         Route::get('dashboard', 'PracticeManagementController@dashboard')->name('dashboard');
         Route::get('previous-bills', 'PracticeManagementController@previousBills')->name('previousBills');
@@ -349,6 +353,7 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('rpm-mcp', 'PracticeManagementController@remoteMonitoringMCP')->name('rpm-matrix-mcp');
         Route::get('rpm-rmm', 'PracticeManagementController@remoteMonitoringRMM')->name('rpm-matrix-rmm');
         Route::get('rpm-rme', 'PracticeManagementController@remoteMonitoringRME')->name('rpm-matrix-rme');
+        Route::get('rpm-admin', 'PracticeManagementController@rpmMatrixForAdmin')->name('rpm-matrix-admin');
 
 
         //stat tree stuff
@@ -648,6 +653,7 @@ Route::middleware('pro.auth')->group(function () {
     Route::get('rpm-matrix-row-mcp', 'PracticeManagementController@remoteMonitoring_RowMCP')->name('rpm-matrix-row-mcp');
     Route::get('rpm-matrix-row-rmm', 'PracticeManagementController@remoteMonitoring_RowRMM')->name('rpm-matrix-row-rmm');
     Route::get('rpm-matrix-row-rme', 'PracticeManagementController@remoteMonitoring_RowRME')->name('rpm-matrix-row-rme');
+    Route::get('rpm-matrix-row-admin', 'PracticeManagementController@remoteMonitoring_RowADMIN')->name('rpm-matrix-row-admin');
 
     Route::get('/appointment-confirmation-history/{appointment}', 'AppointmentController@appointmentConfirmationHistory')->name('appointment-confirmation-history');
 
@@ -713,6 +719,7 @@ Route::middleware('pro.auth')->group(function () {
     Route::get('/search-facility/json', 'HomeController@facilitySuggestJSON')->name('facilitySuggestJSON');
 
     Route::get('print-note/{patient}/{note}', 'NoteController@print')->name('print-note');
+    Route::get('resolve-note/{patient}/{note}', 'NoteController@resolve')->name('resolve-note');
 
 });