Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2 into dev

app/Helpers/helpers.php

@@ -14,6 +14,90 @@ use App\Models\Bill;
 use Illuminate\Support\Facades\Http;
 use Soundasleep\Html2Text as Html2Text;
 
+
+if(!function_exists('chargeForCPT')) {
+    function chargeForCPT($cpt) {
+        switch($cpt) {
+            case "99202": return '$' . 172;
+            case "99203": return '$' . 262;
+            case "99204": return '$' . 387;
+            case "99205": return '$' . 512;
+            case "99211": return '$' . 56;
+            case "99212": return '$' . 133;
+            case "99213": return '$' . 212;
+            case "99214": return '$' . 297;
+            case "99215": return '$' . 418;
+            case "99354": return '$' . 289;
+            case "G0506": return '$' . 144;
+            case "99441": return '$' . 132;
+            case "99442": return '$' . 211;
+            case "99443": return '$' . 297;
+            case "99454": return '$' . 138;
+            case "99457": return '$' . 117;
+            case "99458": return '$' . 93;
+            case "90791": return '$' . 394;
+            case "90792": return '$' . 444;
+            case "90832": return '$' . 171;
+            case "90834": return '$' . 226;
+            case "90837": return '$' . 332;
+            case "90833": return '$' . 158;
+            case "90836": return '$' . 199;
+            case "90838": return '$' . 261;
+            case "99355": return '$' . 130;
+            case "97802": return '$' . 60;
+            case "97803": return '$' . 50;
+            case "99495": return '$' . 275;
+            case "99406": return '$' . 35.56;
+            case "99091": return '$' . 75;
+            case "99453": return '$' . 40;
+        }
+        
+        return '-';
+    }
+}
+
+if(!function_exists('currentSortForKey')) {
+    function currentSortForKey($current, $key) {
+        $found = false;
+        $current = $current ? $current : [];
+        for ($i = 0; $i < count($current); $i++) {
+            if($current[$i]['key'] === $key) { // if exists, reverse
+                return ["index" => ($i + 1), "order" => $current[$i]['order']];
+            }
+        }
+        return FALSE;
+    }
+}
+
+if(!function_exists('includeOrReverseInMultiSort')) {
+    function includeOrReverseInMultiSort($current, $key) {
+        $found = false;
+        $current = $current ? $current : [];
+        for ($i = 0; $i < count($current); $i++) {
+            if($current[$i]['key'] === $key) { // if exists, reverse
+                $current[$i]['order'] = ($current[$i]['order'] === 'DESC' ? 'ASC' : 'DESC');
+                $found = true;
+                break;
+            }
+        }
+        if (!$found) { // if not exists, include
+            $current[] = ["key" => $key, "order" => 'ASC'];
+        }
+        return $current;
+    }
+}
+
+if(!function_exists('removeFromMultiSort')) {
+    function removeFromMultiSort($current, $key) {
+        $found = false;
+        $current = $current ? $current : [];
+        $current = array_filter($current, function($_x) use ($key) {
+            return $_x['key'] !== $key;
+        });
+        return array_values($current);
+    }
+}
+
 if(!function_exists('toFeetAndInches')) {
     function toFeetAndInches($value, $ftLabel = ' ft.', $inLabel = ' in.') {
         if(!$value) return '-';
@@ -63,9 +147,15 @@ if(!function_exists('genericBills')) {
             $genericBills = $genericBills->where('client_id', $patient->id);
         }
         if($entityType && $entityUid) {
-            $genericBills = $genericBills
-                ->where('generic_target_entity_type', $entityType)
-                ->where('generic_target_entity_uid', $entityUid);
+            if($entityType == 'CareMonth'){
+                $genericBills = $genericBills
+                    ->where('care_month_id', $entityUid);
+            }else{
+                $genericBills = $genericBills
+                    ->where('generic_target_entity_type', $entityType)
+                    ->where('generic_target_entity_uid', $entityUid);
+            }
+            
         }
         return $genericBills->orderBy('created_at', 'DESC')->get();
     }

app/Http/Controllers/AdminController.php

@@ -92,11 +92,11 @@ class AdminController extends Controller
         if ($request->input('home_address_state')) {
 
             if($request->input('home_address_state') == 'NONE'){
-                $patients = $patients->whereNull('mailing_address_state');
+                $patients = $patients->whereRaw("mailing_address_state IS NULL OR TRIM(BOTH FROM mailing_address_state = ''");
             }else if($request->input('home_address_state') == 'NOT_MD'){
-                $patients = $patients->where('mailing_address_state', '<>' , 'MD');
+                $patients = $patients->whereRaw("(TRIM(BOTH FROM mailing_address_state) NOT ILIKE 'MD' AND TRIM(BOTH FROM mailing_address_state) NOT ILIKE 'MARYLAND')");
             }else{
-                $patients = $patients->where('mailing_address_state', '=' , $request->input('home_address_state'));
+                $patients = $patients->whereRaw("TRIM(BOTH FROM mailing_address_state) = '" . $request->input('home_address_state') . "'");
             }
         }
 
@@ -144,12 +144,12 @@ class AdminController extends Controller
 
         $status = $request->input('status');
         if($status){
-            if($status == 'ACTIVE'){
+            if($status === 'ACTIVE'){
                 $patients->where('is_active', true)->where(function($q) use ($status){
                     return $q->where('client_engagement_status_category', $status)
                     ->orWhereNull('client_engagement_status_category');
                 });    
-            }elseif($status = 'NONE'){
+            }elseif($status === 'NONE'){
                 $patients->whereNull('client_engagement_status_category');
             }else {
                 $patients->where('client_engagement_status_category', $status);
@@ -194,10 +194,13 @@ class AdminController extends Controller
         $sortBy = $request->input('sort_by') ?: 'created_at';
         $sortDir = $request->input('sort_dir') ?: 'DESC';
 
-        $patients = $patients->orderByRaw("$sortBy $sortDir NULLS LAST");
+        $sortBySQL = "$sortBy $sortDir NULLS LAST";
 
+        if($sortBy !== 'client_engagement_status_category' && $request->input('status')) {
+            $sortBySQL = "client_engagement_status_category DESC NULLS LAST";
+        }
 
-        $patients = $patients->orderBy('created_at', 'DESC')->paginate(25);
+        $patients = $patients->orderByRaw($sortBySQL)->paginate(25);
 
         $insurances = DB::select('SELECT DISTINCT commercial_payer_name, commercial_payer_id FROM client_primary_coverage WHERE commercial_payer_name IS NOT NULL ORDER BY commercial_payer_name ASC');
 

app/Http/Controllers/PatientController.php

@@ -337,7 +337,23 @@ class PatientController extends Controller
 
     public function rmSetup(Request $request, Client $patient)
     {
-        return view('app.patient.rm-setup', compact('patient'));
+
+        // get assigned devices
+        $assignedDeviceIDs = DB::select(DB::raw("SELECT device_id from client_bdt_device where is_active = true"));
+        $assignedDeviceIDs = array_map(function($_x) {
+            return $_x->device_id;
+        }, $assignedDeviceIDs);
+
+        // get all except assigned ones
+        $devices = BDTDevice::where('is_active', true)
+            ->whereNotIn('id', $assignedDeviceIDs)
+            ->orderBy('imei', 'asc')
+            ->get();
+
+        $assignedDeviceIDs = null;
+        unset($assignedDeviceIDs);
+
+        return view('app.patient.rm-setup', compact('patient', 'devices'));
     }
 
     public function handouts(Request $request, Client $patient )

app/Http/Controllers/PracticeManagementController.php

@@ -146,65 +146,141 @@ SELECT effective_date, count(*), sum(number_of_units) as units FROM bill WHERE c
         $filters = $request->all();
 
         $claimStatus = $request->get('status');
-        
-        
 
-        $rows =  BillingReport::whereHas('client', function($clientQuery){
-            return $clientQuery->where('client_engagement_status_category','<>' ,'DUMMY');
-        })->orderBy('note_date', 'desc');   
+        // conditions
+        $conditions = [];
+        $conditions[] = "(c.client_engagement_status_category != 'DUMMY')";
 
         $no_claims = $request->get('no_claims');
         $zero_deductible = $request->get('zero_deductible');
         $claim_status = $request->get('claim_status');
         $verified = $request->get('verified');
-     
+        $from = $request->get('from');
+        $to = $request->get('to');
+
         if($no_claims){
-            $rows = $rows->whereHas('note', function($noteQuery){
-                return $noteQuery->has('claims', '=', 0);
-            });
+            $conditions[] = "(clm.id IS NULL)";
         }
-        
+
         if($zero_deductible){
-            $rows = $rows->whereHas('client', function($clientQuery){
-                return $clientQuery->where('client_engagement_status_category','<>' ,'DUMMY')
-                ->whereHas('effectiveClientPrimaryCoverage', function($lcpcQuery){
-                    return $lcpcQuery->where('auto_medicare_mpb_deductible', 0);
-                });
-            });
+            $conditions[] = "(SELECT count(*) FROM client_primary_coverage cpc WHERE 
+            ((cpc.plan_type = 'MEDICARE' AND cpc.auto_medicare_mpb_deductible > 0) OR (cpc.plan_type = 'COMMERCIAL' AND cpc.deductible_amount > 0))
+            AND c.effective_client_primary_coverage_id = cpc.id) = 0";
         }
-        
+
         if($claim_status){
-            $rows = $rows->whereHas('note', function($noteQuery) use ($claim_status){
-                return $noteQuery->whereHas('claims', function($claimQuery) use ($claim_status) {
-                    return $claimQuery->where('status', $claim_status);
-                });
-            });
+            $conditions[] = "(clm.status = '{$claim_status}')";
         }
 
         if($verified){
             if($verified == 'VERIFIED'){
-                $rows = $rows->whereHas('note', function($noteQuery){
-                    return $noteQuery->whereHas('bills', function($billQuery) {
-                        return $billQuery->where('is_verified', true)->where('is_cancelled', false);
-                    });
-                });
+                $conditions[] = "(SELECT count(*) FROM bill b WHERE 
+            b.is_verified IS TRUE AND b.is_cancelled IS FALSE AND b.note_id = n.id) > 0";
             }
 
             if($verified == 'UNVERIFIED'){
-                $rows = $rows->whereHas('note', function($noteQuery){
-                    return $noteQuery->whereHas('bills', function($billQuery) {
-                        return $billQuery->where('is_verified', false)->where('is_cancelled', false);
-                    });
-                });
+                $conditions[] = "(SELECT count(*) FROM bill b WHERE 
+            b.is_verified IS FALSE AND b.is_cancelled IS FALSE AND b.note_id = n.id) > 0";
             }
         }
-       
 
-        $rows = $rows->paginate(20);
+        if($from) {
+            $conditions[] = "(n.effective_dateest::date >= '{$from}')";
+        }
+
+        if($to) {
+            $conditions[] = "(n.effective_dateest::date <= '{$to}')";
+        }
+
+        $from = "FROM note n
+         JOIN (SELECT count(*) AS count,
+                      bill.note_id
+               FROM bill
+               WHERE NOT bill.is_cancelled
+               GROUP BY bill.note_id) bill_sum ON n.id = bill_sum.note_id
+         LEFT JOIN client c ON n.client_id = c.id
+         LEFT JOIN pro p ON n.hcp_pro_id = p.id
+         LEFT JOIN claim clm on n.id = clm.note_id
+         LEFT JOIN client_primary_coverage cpc on c.effective_client_primary_coverage_id = cpc.id";
+
+        $defaultPageSize = 25;
+
+        $page = $request->input('page') ?: 1;
+        $perPage = $request->input('per_page') ?: $defaultPageSize;
+        $offset = ($page - 1) * $perPage;
+
+        $countQuery = "
+SELECT COUNT(*)
+$from
+WHERE n.is_cancelled IS NOT TRUE AND " . implode(' AND ', $conditions) . "
+        ";
+
+        $countResult = DB::select($countQuery);
+        $total = $countResult[0]->count;
+
+        $sql = "
+SELECT c.id                                                                 AS client_id,
+       c.uid                                                                AS client_uid,
+       n.id                                                                 AS note_id,
+       n.uid                                                                AS note_uid,
+       p.id                                                                 AS pro_id,
+       p.uid                                                                AS pro_uid,
+       (('https://care.leadershiphealth.org/mc/patients/view/'::text || c.uid::text) || '/notes/view/'::text) ||
+       n.uid::text                                                          AS link,
+       c.name_last                                                          AS client_last,
+       c.name_first                                                         AS client_first,
+       p.name_last                                                          AS pro_last,
+       p.name_first                                                         AS pro_first,
+       n.effective_dateest                                                  AS note_date,
+       n.new_or_fu                                                          AS new_or_fu_auto,
+       n.new_or_fu_or_na,
+       n.new_or_fu_or_na::text = n.new_or_fu                                AS new_or_fu_auto_match,
+       n.method,
+       n.is_bill_closed                                                     AS is_billing_closed,
+       n.is_claim_closed                                                    AS is_claiming_closed,
+       bill_sum.count                                                       AS bill_count,
+       clm.status                                                           AS claim_status,    
+       cpc.plan_type                                                        AS plan_type,
+       cpc.auto_medicare_is_partbprimary                                    AS auto_medicare_is_partbprimary,
+       cpc.auto_medicare_mpb_deductible                                     AS medicare_deductible,
+       cpc.deductible_amount                                                AS commercial_deductible,
+       (SELECT name from payer WHERE payer.id = cpc.commercial_payer_id)    AS payer_name,
+       array_to_string(
+               ARRAY(SELECT ((((bill.code::text || ' | '::text) || bill.number_of_units::text) || ' units | '::text) ||
+                             round(bill.number_of_units * 60::numeric)) || ' mins'::text
+                     FROM bill
+                     WHERE bill.note_id = n.id), '
+'::text)                   AS bills,
+       array_to_string(ARRAY(SELECT (note_reason.code || ' | '::text) || note_reason.description
+                             FROM note_reason
+                             WHERE note_reason.note_id = n.id
+                             ORDER BY note_reason.position_index), '
+'::text) AS icds,
+       array_to_string(ARRAY(SELECT ((cl.cpt::text || ' | '::text) || cl.units::text) || ' units'::text
+                             FROM claim_line cl
+                             WHERE (cl.claim_id IN (SELECT claim.id
+                                                    FROM claim
+                                                    WHERE claim.note_id = n.id))
+                             ORDER BY cl.position_index), '
+'::text)          AS claim_lines,
+       array_to_string(ARRAY(SELECT cl2.status FROM claim cl2 WHERE cl2.note_id = n.id 
+                                                              ORDER BY cl2.created_at DESC), '
+'::text)          AS claim_statuses
+$from
+WHERE n.is_cancelled IS NOT TRUE AND " . implode(' AND ', $conditions) . "
+ORDER BY n.effective_dateest DESC NULLS LAST, p.id
+OFFSET {$offset} LIMIT {$perPage}
+        ";
+
+        $rows = DB::select($sql);
 
         $claimStatuses = DB::select('SELECT distinct status FROM claim ORDER BY status DESC');
 
-        return view('app.practice-management.billing-report', compact('rows', 'claimStatuses', 'filters'));
+        $paginator = new LengthAwarePaginator($rows, $total, $request->input('per_page') ?: $defaultPageSize, $request->input('page') ?: 1);
+        $perPage = $request->input('per_page') ?: $defaultPageSize;
+        $paginator->setPath(route('practice-management.billing-report'));
+
+        return view('app.practice-management.billing-report', compact('rows', 'claimStatuses', 'filters', 'paginator'));
     }
 
     public function dashboard(Request $request)
@@ -302,7 +378,7 @@ SELECT effective_date, count(*), sum(number_of_units) as units FROM bill WHERE c
     public function notes(Request $request, $filter = '')
     {
         $proID = $this->performer()->pro->id;
-        $query = Note::where('hcp_pro_id', $proID);
+        $query = Note::where('hcp_pro_id', $proID)->where('is_cancelled', FALSE);
         switch ($filter) {
             case 'not-yet-signed':
                 $query = $query->where('is_signed_by_hcp', false);
@@ -412,67 +488,75 @@ SELECT effective_date, count(*), sum(number_of_units) as units FROM bill WHERE c
     public function bills(Request $request, $filter = '')
     {
         $proID = $this->performer()->pro->id;
-        $query = Bill::where('is_cancelled', false)->where('bill_service_type', '<>', 'CARE_MONTH');
+        $isAdmin = $this->performer()->pro->pro_type === 'ADMIN';
+        $query = Bill::where('is_cancelled', false)->whereRaw("(bill_service_type = 'NOTE' OR bill_service_type = 'GENERIC')");
         switch ($filter) {
             case 'not-yet-signed':
                 $query = $query
-                    ->where(function ($q) use ($proID) {
-                        $q->where(function ($q2) use ($proID) {
-                            $q2->where('hcp_pro_id', $proID)->where('is_signed_by_hcp', false);
-                        })
-                            ->orWhere(function ($q2) use ($proID) {
-                                $q2->where('cm_pro_id', $proID)->where('is_signed_by_cm', false);
-                            })
-                            ->orWhere(function ($q2) use ($proID) {
-                                $q2->where('rme_pro_id', $proID)->where('is_signed_by_rme', false);
-                            })
-                            ->orWhere(function ($q2) use ($proID) {
-                                $q2->where('rmm_pro_id', $proID)->where('is_signed_by_rmm', false);
-                            })
-                            ->orWhere(function ($q2) use ($proID) {
-                                $q2->where('generic_pro_id', $proID)->where('is_signed_by_generic_pro', false);
-                            });
+                    ->where(function ($q) use ($proID, $isAdmin) {
+                        $q->where(function ($q2) use ($proID, $isAdmin) {
+                            $q2->where('is_signed_by_hcp', false);
+                            if (!$isAdmin) {
+                                $q2->where('hcp_pro_id', $proID);
+                            } else {
+                                $q2->whereNotNull('hcp_pro_id');
+                            }
+                        })->orWhere(function ($q2) use ($proID, $isAdmin) {
+                            $q2->where('is_signed_by_generic_pro', false);
+                            if (!$isAdmin) {
+                                $q2->where('generic_pro_id', $proID);
+                            }
+                            else {
+                                $q2->whereNotNull('generic_pro_id');
+                            }
+                        });
                     });
                 break;
 
             case 'previous':
                 $query = $query
-                    ->where(function ($q) use ($proID) {
-                        $q->where(function ($q2) use ($proID) {
-                            $q2->where('hcp_pro_id', $proID)->where('is_signed_by_hcp', true);
-                        })
-                            ->orWhere(function ($q2) use ($proID) {
-                                $q2->where('cm_pro_id', $proID)->where('is_signed_by_cm', true);
-                            })
-                            ->orWhere(function ($q2) use ($proID) {
-                                $q2->where('rme_pro_id', $proID)->where('is_signed_by_rme', true);
-                            })
-                            ->orWhere(function ($q2) use ($proID) {
-                                $q2->where('rmm_pro_id', $proID)->where('is_signed_by_rmm', true);
-                            });
+                    ->where(function ($q) use ($proID, $isAdmin) {
+                        $q->where(function ($q2) use ($proID, $isAdmin) {
+                            $q2->where('is_signed_by_hcp', true);
+                            if (!$isAdmin) {
+                                $q2->where('hcp_pro_id', $proID);
+                            } else {
+                                $q2->whereNotNull('hcp_pro_id');
+                            }
+                        })->orWhere(function ($q2) use ($proID, $isAdmin) {
+                            $q2->where('is_signed_by_generic_pro', true);
+                            if (!$isAdmin) {
+                                $q2->where('generic_pro_id', $proID);
+                            }
+                            else {
+                                $q2->whereNotNull('generic_pro_id');
+                            }
+                        });
                     });
                 break;
 
             // more cases can be added as needed
             default:
                 $query = $query
-                    ->where(function ($q) use ($proID) {
-                        $q->where(function ($q2) use ($proID) {
-                            $q2->where('hcp_pro_id', $proID);
-                        })
-                            ->orWhere(function ($q2) use ($proID) {
-                                $q2->where('cm_pro_id', $proID);
-                            })
-                            ->orWhere(function ($q2) use ($proID) {
-                                $q2->where('rme_pro_id', $proID);
-                            })
-                            ->orWhere(function ($q2) use ($proID) {
-                                $q2->where('rmm_pro_id', $proID);
-                            });
+                    ->where(function ($q) use ($proID, $isAdmin) {
+                        $q->where(function ($q2) use ($proID, $isAdmin) {
+                            if (!$isAdmin) {
+                                $q2->where('hcp_pro_id', $proID);
+                            } else {
+                                $q2->whereNotNull('hcp_pro_id');
+                            }
+                        })->orWhere(function ($q2) use ($proID, $isAdmin) {
+                            if (!$isAdmin) {
+                                $q2->where('generic_pro_id', $proID);
+                            }
+                            else {
+                                $q2->whereNotNull('generic_pro_id');
+                            }
+                        });
                     });
                 break;
         }
-        $bills = $query->orderBy('created_at', 'desc')->get();
+        $bills = $query->orderBy('created_at', 'desc')->paginate(50);
         return view('app.practice-management.bills', compact('bills', 'filter'));
     }
 
@@ -1686,16 +1770,21 @@ WHERE
             $orderBy = "ORDER BY care_month.number_of_days_with_remote_measurements DESC NULLS LAST, care_month.rm_total_time_in_seconds_by_mcp DESC NULLS LAST, care_month.rm_total_time_in_seconds_by_rmm_pro DESC NULLS LAST";
         }
         else {
-            $sortBy = $request->input('sort_by');
-            $sortDir = $request->input('sort_dir');
-            if($sortBy && $sortDir) {
-                if(!in_array($sortBy, ['number_of_days_with_remote_measurements', 'rm_total_time_in_seconds_by_mcp', 'rm_total_time_in_seconds_by_rmm_pro'])) {
-                    $orderBy = "ORDER BY $sortBy $sortDir NULLS LAST, care_month.number_of_days_with_remote_measurements DESC NULLS LAST, care_month.rm_total_time_in_seconds_by_mcp DESC NULLS LAST, care_month.rm_total_time_in_seconds_by_rmm_pro DESC NULLS LAST";
-                }
-                else {
-                    $orderBy = "ORDER BY $sortBy $sortDir NULLS LAST";
+            $sortBy = json_decode($request->input('sort_by'));
+            $orderByClause = [];
+            $includeDefaultKeys = true;
+            foreach ($sortBy as $sortCriteria) {
+                $orderByClause[] = "{$sortCriteria->key} {$sortCriteria->order} NULLS LAST";
+                if(in_array($sortCriteria->key, ['number_of_days_with_remote_measurements', 'rm_total_time_in_seconds_by_mcp', 'rm_total_time_in_seconds_by_rmm_pro'])) {
+                    $includeDefaultKeys = false;
                 }
             }
+            if($includeDefaultKeys) {
+                $orderByClause[] = "care_month.number_of_days_with_remote_measurements DESC NULLS LAST";
+                $orderByClause[] = "care_month.rm_total_time_in_seconds_by_mcp DESC NULLS LAST";
+                $orderByClause[] = "care_month.rm_total_time_in_seconds_by_rmm_pro DESC NULLS LAST";
+            }
+            $orderBy = 'ORDER BY ' . implode(', ', $orderByClause);
         }
 
         // filters from the UI
@@ -1712,6 +1801,44 @@ WHERE
             $v = trim($request->input('f_name'));
             $conditions[] = "(client.name_first ILIKE '%{$v}%' OR client.name_last ILIKE '%{$v}%')";
         }
+
+        if(trim($request->input('f_payer_type'))) {
+            switch($request->input('f_payer_type')) {
+                case 'Medicare':
+                    $conditions[] = "(cpc.plan_type = 'MEDICARE')";
+                    break;
+                case 'Non Medicare':
+                    $conditions[] = "(cpc.plan_type != 'MEDICARE')";
+                    break;
+                case 'Medicaid':
+                    $conditions[] = "(cpc.plan_type = 'MEDICAID')";
+                    break;
+                case 'Commercial':
+                    $conditions[] = "(cpc.plan_type = 'COMMERCIAL')";
+                    break;
+            }
+        }
+
+        if((trim($request->input('f_payer_type')) === 'Non Medicare' || trim($request->input('f_payer_type')) === 'Commercial') && trim($request->input('f_payer'))) {
+            $v = trim($request->input('f_payer'));
+            $conditions[] = "(payer.name ILIKE '%{$v}%')";
+        }
+
+        if(trim($request->input('f_state'))) {
+            $v = trim($request->input('f_state'));
+            switch($v) {
+                case 'NONE':
+                    $conditions[] = "(client.mailing_address_state IS NULL)";
+                    break;
+                case 'NOT_MD':
+                    $conditions[] = "(client.mailing_address_state IS NOT NULL AND client.mailing_address_state != 'MD')";
+                    break;
+                default:
+                    $conditions[] = "(client.mailing_address_state ILIKE '%{$v}%')";
+                    break;
+            }
+        }
+
         if(trim($request->input('f_mcp'))) {
             $v = trim($request->input('f_mcp'));
             $conditions[] = "(mcpPro.uid = '{$v}')";
@@ -1816,6 +1943,12 @@ WHERE
             $conditions[] = "(care_month.rm_total_time_in_seconds_by_rmm_pro {$o} {$v})";
         }
 
+        if(trim($request->input('f_dslm_op')) && trim($request->input('f_dslm')) !== '') {
+            $o = trim($request->input('f_dslm_op'));
+            $v = trim($request->input('f_dslm'));
+            $conditions[] = "(DATE_PART('day', NOW() - client.most_recent_cellular_measurement_at) {$o} {$v})";
+        }
+
         if($request->input('not-enrolled')) {
             $conditions[] = "(client.is_enrolled_in_rm != 'YES')";
         }
@@ -1823,6 +1956,24 @@ WHERE
             $conditions[] = "(client.is_enrolled_in_rm = 'YES')";
         }
 
+        if($request->input('f_claim_closed')) {
+            if($request->input('f_claim_closed') === 'no') {
+                $conditions[] = "(care_month.is_claim_closed IS NULL OR care_month.is_claim_closed IS FALSE)";
+            }
+            else {
+                $conditions[] = "(care_month.is_claim_closed IS TRUE)";
+            }
+        }
+
+        if($request->input('f_visit_90_days')) {
+            /*if($request->input('f_visit_90_days') === 'yes') {
+                $conditions[] = "(care_month.is_claim_closed IS " . ($request->input('f_claim_closed') === 'yes' ? 'TRUE' : 'FALSE') . ")";
+            }
+            else {
+                $conditions[] = "(care_month.is_claim_closed IS " . ($request->input('f_claim_closed') === 'yes' ? 'TRUE' : 'FALSE') . ")";
+            }*/
+        }
+
         $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,
@@ -1848,6 +1999,8 @@ 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
+    left join client_primary_coverage cpc on client.effective_client_primary_coverage_id = cpc.id
+    left join payer on cpc.commercial_payer_id = payer.id
     {$genericBillJoinClause}
 WHERE
       EXTRACT(MONTH from care_month.start_date) = " . ($request->input('m') ?: 'EXTRACT(MONTH from now())') . "
@@ -1870,8 +2023,11 @@ SELECT client.name_first, client.name_last,
        client.cell_number,
        client.is_assigned_cellular_bp_device,
        client.is_assigned_cellular_weight_scale_device,
+       nv.raw_date as next_visit_date,
+       DATE_PART('day', NOW() - client.most_recent_cellular_measurement_at) as dslm,
        care_month.uid as care_month_uid,
        care_month.id as care_month_id,
+       care_month.is_claim_closed,
        care_month.start_date,
        care_month.rm_total_time_in_seconds_by_mcp,
        care_month.rm_total_time_in_seconds_by_rmm_pro,
@@ -1899,13 +2055,24 @@ SELECT client.name_first, client.name_last,
        (mcpPro.name_first || ' ' || mcpPro.name_last) as mcp_name,
        rmmPro.rmm_payment_strategy,
        rmmPro.rmm_payment_amount,
+       client.mailing_address_state,
+       care_month.most_recent_cellular_weight_measurement_at,
+       cpc.plan_type,
+       cpc.auto_medicare_is_partbprimary,
+       (CASE 
+           WHEN cpc.plan_type LIKE 'COMMERCIAL' THEN payer.name
+           ELSE cpc.plan_type
+       END) as payer_name,
        (SELECT COUNT(*) FROM claim_line where claim_line.cpt = '99454' AND claim_line.claim_id IN (SELECT claim.id FROM claim WHERE claim.care_month_id = care_month.id AND claim.status != 'CANCELLED')) as claim_454,
        (SELECT COUNT(*) FROM claim_line where claim_line.cpt = '99457' AND claim_line.claim_id IN (SELECT claim.id FROM claim WHERE claim.care_month_id = care_month.id AND claim.status != 'CANCELLED')) as claim_457,
        {$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 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
+    left join client_primary_coverage cpc on client.effective_client_primary_coverage_id = cpc.id
+    left join payer on cpc.commercial_payer_id = payer.id
+    left join appointment nv on nv.id = mrnote.follow_up_appointment_id
     {$genericBillJoinClause}
 WHERE
       EXTRACT(MONTH from care_month.start_date) = " . ($request->input('m') ?: 'EXTRACT(MONTH from now())') . "
@@ -1929,6 +2096,92 @@ WHERE
         return view('app.practice-management.rpm-matrix-for-admin', compact('patients', 'daysRemaining', 'careMonthStart', 'paginator', 'perPage'));
     }
 
+    public function claimsReport(Request $request) {
+
+        $performer = $this->performer();
+
+        $conditions = ["(claim.status = 'SUBMITTED')"];
+
+        // default sort
+        if(!$request->input('sort_by')) {
+            $orderBy = "cline.created_at DESC NULLS LAST";
+        }
+        else {
+            $sortBy = json_decode($request->input('sort_by'));
+            $orderByClause = [];
+            foreach ($sortBy as $sortCriteria) {
+                $orderByClause[] = "{$sortCriteria->key} {$sortCriteria->order} NULLS LAST";
+            }
+            $orderBy = implode(', ', $orderByClause);
+        }
+
+        // filters from the UI
+        if(trim($request->input('f_start'))) {
+            $v = trim($request->input('f_start'));
+            $conditions[] = "(cline.date_of_service >= '{$v}')";
+        }
+        if(trim($request->input('f_end'))) {
+            $v = trim($request->input('f_end'));
+            $conditions[] = "(cline.date_of_service <= '{$v}')";
+        }
+
+        $defaultPageSize = 25;
+
+        $page = $request->input('page') ?: 1;
+        $perPage = $request->input('per_page') ?: $defaultPageSize;
+        $offset = ($page - 1) * $perPage;
+
+        $countQuery = "
+SELECT COUNT(*)
+FROM claim_line cline
+    join claim on cline.claim_id = claim.id
+    join client on claim.client_id = client.id 
+    left join pro on claim.pro_id = pro.id
+    left join client_primary_coverage cpc on client.effective_client_primary_coverage_id = cpc.id
+    left join payer on cpc.commercial_payer_id = payer.id
+WHERE
+      " . implode(' AND ', $conditions) . "      
+";
+
+        $countResult = DB::select($countQuery);
+        $total = $countResult[0]->count;
+
+        $query = "
+SELECT (client.name_first || ' ' || client.name_last) as client_name,
+       client.uid as client_uid, 
+       client.dob,
+       client.age_in_years,
+       client.is_enrolled_in_rm,
+       client.mailing_address_state,
+       (pro.name_first || ' ' || pro.name_last) as pro_name,
+       (CASE 
+           WHEN cpc.plan_type LIKE 'COMMERCIAL' THEN payer.name
+           ELSE cpc.plan_type
+       END) as payer_name,
+       cline.date_of_service,
+       cline.cpt
+FROM claim_line cline 
+    join claim on cline.claim_id = claim.id
+    join client on claim.client_id = client.id 
+    left join pro on claim.pro_id = pro.id
+    left join client_primary_coverage cpc on client.effective_client_primary_coverage_id = cpc.id
+    left join payer on cpc.commercial_payer_id = payer.id
+WHERE
+      " . implode(' AND ', $conditions) . "
+      ORDER BY {$orderBy} OFFSET {$offset} LIMIT {$perPage}
+";
+
+        // dd($query);
+
+        $rows = DB::select($query);
+
+        $paginator = new LengthAwarePaginator($rows, $total, $request->input('per_page') ?: $defaultPageSize, $request->input('page') ?: 1);
+        $perPage = $request->input('per_page') ?: $defaultPageSize;
+        $paginator->setPath(route('practice-management.claims-report'));
+
+        return view('app.practice-management.claims-report', compact('rows', 'paginator', 'perPage'));
+    }
+
     public function remoteMonitoringMCP(Request $request) {
         return $this->rpmMatrixByProType($request, 'mcp');
     }
@@ -3621,61 +3874,189 @@ ORDER BY c.name_last, c.name_first
 
         $numOfMeasurements = $request->get('num_of_measurements'); //16_or_more, 12_or_more
         $hasRecentVisit = $request->get('has_recent_visit'); //yes no
-        $hasBeenSpokenToThisMonth = $request->get('has_been_spoken_to'); //yes no 
+        $hasBeenSpokenToThisMonth = $request->get('has_been_spoken_to'); //yes no
+
+        // default sort
+        if(!$request->input('sort_by')) {
+            $orderBy = "cm.start_date ASC NULLS LAST, cm.client_id ASC NULLS LAST";
+        }
+        else {
+            $sortBy = json_decode($request->input('sort_by'));
+            $orderByClause = [];
+            $includeDefaultKeys = true;
+            foreach ($sortBy as $sortCriteria) {
+                $orderByClause[] = "{$sortCriteria->key} {$sortCriteria->order} NULLS LAST";
+            }
+            $orderBy = implode(', ', $orderByClause);
+        }
 
-        $cmQuery = CareMonth::where('start_date', $careMonthStartDate);
+        $conditions = [];
 
-        //remove dummies
-        $cmQuery = $cmQuery->whereHas('client', function($clientQuery) {
-            return $clientQuery->where('client_engagement_status_category','<>', 'DUMMY')
-            ->orWhere('client_engagement_status_category', '=', null);
-        });
+        // start date
+        $conditions[] = "(cm.start_date >= '$careMonthStartDate')";
 
+        if($request->input('rm_eligible')) {
+            $conditions[] = "(c.is_eligible_for_rm = '" . $request->input('rm_eligible') . "')";
+        }
+        if($request->input('rm_enrolled')) {
+            $conditions[] = "(c.is_enrolled_in_rm = '" . $request->input('rm_enrolled') . "')";
+        }
+        if($request->input('rm_setup')) {
+            $conditions[] = "(c.has_rm_setup_been_performed IS " . ($request->input('rm_setup') === 'YES' ? 'TRUE' : 'FALSE') . ")";
+        }
+
+        // measurement days
         if($numOfMeasurements){
-            if($numOfMeasurements  == '16_or_more'){
-                $cmQuery = $cmQuery->where('number_of_days_with_remote_measurements', '>=', 16);
+            if($numOfMeasurements  == '16_or_more') {
+                $conditions[] = "(cm.number_of_days_with_remote_measurements >= 16)";
             }
-            if($numOfMeasurements  == 'min_or_more'){
-                $cmQuery = $cmQuery->where('number_of_days_with_remote_measurements', '>=', $minRequiredMeasurements)
-                ->where('number_of_days_with_remote_measurements', '<', 16);
+            elseif($numOfMeasurements  == 'min_or_more') {
+                $conditions[] = "(cm.number_of_days_with_remote_measurements >= $minRequiredMeasurements AND cm.number_of_days_with_remote_measurements < 16)";
             }
-
-            if($numOfMeasurements  == 'less_than_min'){
-                $cmQuery = $cmQuery->where('number_of_days_with_remote_measurements', '<', $minRequiredMeasurements);
+            elseif($numOfMeasurements  == 'less_than_min') {
+                $conditions[] = "(cm.number_of_days_with_remote_measurements < $minRequiredMeasurements)";
             }
         }
 
+        // days since last visit
         if($hasRecentVisit){
             if($hasRecentVisit == 'YES'){
-                $cmQuery = $cmQuery->whereHas('client', function($clientQuery) {
-                    return $clientQuery->whereRaw("most_recent_completed_mcp_note_date::DATE >= ((NOW() - interval '90 days')::DATE)");
-                });
+                $conditions[] = "(c.most_recent_completed_mcp_note_date >= ((NOW() - interval '90 days')::DATE))";
             }else{
-                $cmQuery = $cmQuery->whereHas('client', function($clientQuery) {
-                    return $clientQuery->whereRaw("most_recent_completed_mcp_note_date::DATE < ((NOW() - interval '90 days')::DATE)");
-                });
+                $conditions[] = "(c.most_recent_completed_mcp_note_date::DATE < ((NOW() - interval '90 days')::DATE))";
             }
         }
 
+        // communicated
         if($hasBeenSpokenToThisMonth){
-            if($hasBeenSpokenToThisMonth  == 'YES'){
-                $cmQuery = $cmQuery->where('has_anyone_interacted_with_client_about_rm_outside_note', '=', true);
-            }else{
-                $cmQuery = $cmQuery->where('has_anyone_interacted_with_client_about_rm_outside_note', '=', false);
+            if($hasBeenSpokenToThisMonth  == 'YES') {
+                $conditions[] = "(cm.has_anyone_interacted_with_client_about_rm_outside_note IS TRUE)";
+            }
+            else {
+                $conditions[] = "(cm.has_anyone_interacted_with_client_about_rm_outside_note IS NOT TRUE)";
             }
-           
         }
 
+        // claiming closed
         $claimingClosed = $request->get('claiming_closed');
         if($claimingClosed){
-            if($claimingClosed === 'YES') $cmQuery = $cmQuery->where('is_claim_closed', true);
-            if($claimingClosed === 'NO') $cmQuery = $cmQuery->where('is_claim_closed', false);
+            if($claimingClosed === 'YES') {
+                $conditions[] = "(cm.is_claim_closed IS TRUE)";
+            }
+            elseif($claimingClosed === 'NO') {
+                $conditions[] = "(cm.is_claim_closed IS TRUE)";
+            }
+        }
+
+        // mcp
+        if($request->input('mcp_uid')) {
+            $mcp = Pro::where('uid', $request->input('mcp_uid'))->first();
+            if($mcp) {
+                $conditions[] = "(cm.mcp_pro_id = $mcp->id)";
+            }
+        }
+
+        // client status
+        if($request->input('status')) {
+            $v = trim($request->input('status'));
+            if($v === 'ACTIVE') {
+                $conditions[] = "(c.client_engagement_status_category IS NULL OR c.client_engagement_status_category = '{$v}')";
+            }
+            else {
+                $conditions[] = "(c.client_engagement_status_category = '{$v}')";
+            }
         }
+        else {
+            $conditions[] = "(c.client_engagement_status_category IS NULL OR c.client_engagement_status_category = 'ACTIVE')";
+        }
+
+        $columns = "
+            cm.id as care_month_id,
+            cm.uid as care_month_uid,
+            cm.start_date,
+            c.uid as client_uid,
+            c.is_eligible_for_rm,
+            c.is_enrolled_in_rm,
+            c.has_rm_setup_been_performed,
+            (c.name_first || ' ' || c.name_last) as client_name,
+            (mcp.name_first || ' ' || mcp.name_last) as mcp_name,
+            (rmm.name_first || ' ' || rmm.name_last) as rmm_name,
+            cm.number_of_days_with_remote_measurements,
+            DATE_PART('day', NOW() - c.most_recent_cellular_measurement_at) as dslm,
+            c.most_recent_completed_mcp_note_date as mr_note_date,
+            cm.days_between_most_recent_mcp_note_date_and_end_of_care_month,
+            mrnote.uid as mr_note_uid,
+            cm.rm_total_time_in_seconds,
+            cm.rm_total_time_in_seconds_by_mcp,
+            cm.rm_total_time_in_seconds_by_rmm_pro,
+            cm.has_admin_interacted_with_client_about_rm,
+            cm.has_mcp_interacted_with_client_about_rm,
+            cm.claim_suggestion_json,
+            cm.is_claim_closed,
+            (CASE 
+               WHEN cm.mcp_rm_generic_bill_id IS NOT NULL AND mcp_rm_bill.is_cancelled IS NOT TRUE THEN TRUE
+               ELSE FALSE
+            END) as mcp_payable,
+            (CASE 
+               WHEN cm.rmm_rm_generic_bill_id IS NOT NULL AND rmm_rm_bill.is_cancelled IS NOT TRUE THEN TRUE
+               ELSE FALSE
+            END) as rmm_payable,
+            mcp_rm_bill.uid as mcp_rm_bill_uid,
+            rmm_rm_bill.uid as rmm_rm_bill_uid,
+            mcp_rm_bill.code as mcp_rm_bill_code,
+            rmm_rm_bill.code as rmm_rm_bill_code,
+            cl.status as claim_status,
+            cl.uid as claim_uid,
+            array_to_string(
+                ARRAY(SELECT claim_line.cpt FROM claim_line WHERE claim_line.claim_id = cl.id),
+                ', '::text
+                ) AS cpts
+        ";
+
+        $from = "
+            care_month cm 
+            join client c on cm.client_id = c.id
+            left join pro mcp on c.mcp_pro_id = mcp.id
+            left join pro rmm on c.rmm_pro_id = rmm.id
+            left join bill mcp_rm_bill on cm.mcp_rm_generic_bill_id = mcp_rm_bill.id
+            left join bill rmm_rm_bill on cm.rmm_rm_generic_bill_id = rmm_rm_bill.id
+            left join note mrnote on c.most_recent_completed_mcp_note_id = mrnote.id
+            left join claim cl on cl.care_month_id = cm.id AND cl.is_cancelled IS NOT TRUE
+        ";
+
+        $page = $request->input('page') ?: 1;
+        $perPage = $request->input('per_page') ?: 15;
+        $offset = ($page - 1) * $perPage;
+
+        $countSql = "
+        SELECT 
+            COUNT(*)
+        FROM
+            $from
+        where " . implode(" AND ", $conditions) . "
+            AND cl.is_cancelled IS NOT TRUE
+        ";
+
+        $countResult = DB::select($countSql);
+        $total = $countResult[0]->count;
+
+        $sql = "
+        SELECT 
+            $columns
+        FROM
+            $from
+        WHERE " . implode(" AND ", $conditions) . "
+        ORDER BY $orderBy
+        OFFSET {$offset} LIMIT {$perPage}
+        ";
 
-        $cmQuery = $cmQuery->orderBy('start_date', 'DESC')->orderBy('client_id', 'ASC');
-        $rows =$cmQuery->paginate(15);
+        $rows = DB::select($sql);
 
-        return view('app.practice-management.rm-action-report', compact('rows', 'filters', 'minRequiredMeasurements'));
+        $paginator = new LengthAwarePaginator($rows, $total, $request->input('per_page') ?: 15, $request->input('page') ?: 1);
+        $perPage = $request->input('per_page') ?: 15;
+        $paginator->setPath(route('practice-management.rmActionReport'));
+
+        return view('app.practice-management.rm-action-report', compact('rows', 'filters', 'minRequiredMeasurements', 'paginator'));
 
     }
 
@@ -3712,6 +4093,64 @@ ORDER BY c.name_last, c.name_first
         return view('app.notes-pending-physician-supervisor-stamping', compact('flaggedNotes', 'hideTitle'));
     }
 
+    public function clientsWithoutDefaultCompanyProPayer(Request $request){
+        $rows = \App\Models\Client::whereNull('shadow_pro_id')
+            ->where('is_active', true)
+            ->where(function ($q) {
+                $q->whereNull('client_engagement_status_category')
+                    ->orWhere('client_engagement_status_category', 'ACTIVE');
+            })
+            ->whereRaw('(default_mcp_company_pro_payer_id IS NULL OR default_mcp_company_location_id IS NULL)')
+            ->orderBy('created_at', 'DESC')
+            ->paginate(25);
+        return view('app.clients-without-default-company-pro-payer', compact('rows'));
+    }
+
+    public function notesWithoutHcpCompanyProPayer(Request $request){
+        $rows = \App\Models\Note::where('is_cancelled', false)
+            ->where('is_core_note', false)
+            ->where('is_signed_by_hcp', true)
+            ->whereNull('hcp_company_pro_payer_id')
+            ->orderBy('created_at', 'DESC')
+            ->paginate(25);
+        return view('app.notes-without-hcp-company-pro-payer', compact('rows'));
+    }
+
+    public function noteHcpBillsWithoutCompanyPro(Request $request){
+        $rows = \App\Models\Bill::where('bill_service_type', 'NOTE')
+            ->where('is_cancelled', false)
+            ->whereNotNull('hcp_pro_id')
+            ->whereNull('hcp_company_pro_id')
+            ->where('has_hcp_been_paid', false)
+            ->orderBy('created_at', 'DESC')
+            ->paginate(25);
+        return view('app.note-hcp-bills-without-company-pro', compact('rows'));
+    }
+
+    public function rpmMcpBillsWithoutCompanyPro(Request $request){
+        $rows = \App\Models\Bill::where('bill_service_type', 'GENERIC')
+            ->where('is_cancelled', false)
+            ->whereNotNull('generic_pro_id')
+            ->whereNull('generic_company_pro_id')
+            ->where('has_generic_pro_been_paid', false)
+            ->where('code', 'RM MCP')
+            ->orderBy('created_at', 'DESC')
+            ->paginate(25);
+        return view('app.rpm-mcp-bills-without-company-pro', compact('rows'));
+    }
+
+    public function rpmRmmBillsWithoutCompanyPro(Request $request){
+        $rows = \App\Models\Bill::where('bill_service_type', 'GENERIC')
+            ->where('is_cancelled', false)
+            ->whereNotNull('generic_pro_id')
+            ->whereNull('generic_company_pro_id')
+            ->where('has_generic_pro_been_paid', false)
+            ->where('code', 'RM RMM')
+            ->orderBy('created_at', 'DESC')
+            ->paginate(25);
+        return view('app.rpm-rmm-bills-without-company-pro', compact('rows'));
+    }
+
     public function notesResolutionCenter(Request $request) {
 
         $columns = "(c.name_first || ' ' || c.name_last) as client_name,

app/Models/CareMonth.php

@@ -117,11 +117,11 @@ class CareMonth extends Model
 
     public function mcpRmGenericBill()
     {
-        return $this->hasOne(Bill::class, 'id', 'mcp_rm_generic_bill_id');
+        return $this->hasOne(Bill::class, 'id', 'mcp_rm_generic_bill_id')->where('is_cancelled', false)->where('is_cancelled_by_administrator', false);
     }
     public function rmmRmGenericBill()
     {
-        return $this->hasOne(Bill::class, 'id', 'rmm_rm_generic_bill_id');
+        return $this->hasOne(Bill::class, 'id', 'rmm_rm_generic_bill_id')->where('is_cancelled', false)->where('is_cancelled_by_administrator', false);
     }
 
     public function showMeasurementDaysWarning(){

config/app.php

@@ -65,7 +65,7 @@ return [
 
     'hrm2_url' => env('HRM2_URL'),
 
-    'asset_version' => 96,
+    'asset_version' => 100,
 
 
     'temp_dir' => env('TEMP_DIR'),

public/css/style.css

@@ -2259,7 +2259,7 @@ form.non-interactive .form-content * {
     position: absolute;
 }
 table.dashboard-stats-table th {
-    padding: 0.5rem 0.75rem
+    padding: 0.2rem 0.75rem
 }
 .max-height-100px {
     max-height: 100px;
@@ -2369,9 +2369,9 @@ body.in-iframe .main-row > .sidebar {
 }
 .note-container .note-lhs-tree.fixed, .note-container .note-lhs-tree.fixed-left {
     position: fixed;
-    top: 55px;
-    max-height: calc(100vh - 55px) !important;
-    height: calc(100vh - 55px) !important;
+    top: 91px;
+    max-height: calc(100vh - 91px) !important;
+    height: calc(100vh - 91px) !important;
     z-index: 1;
 }
 .note-container .note-lhs-tree.fixed ~ .note-rhs-content {
@@ -2474,10 +2474,10 @@ body.in-iframe .main-row > .sidebar {
 }
 .note-container .note-rhs-sidebar.fixed {
     position: fixed;
-    top: 55px;
+    top: 91px;
     right: 0;
-    max-height: calc(100vh - 55px) !important;
-    height: calc(100vh - 55px) !important;
+    max-height: calc(100vh - 91px) !important;
+    height: calc(100vh - 91px) !important;
     z-index: 1;
 }
 .note-container .note-rhs-sidebar.fixed ~ .note-rhs-content {
@@ -3659,4 +3659,35 @@ table.v-top th {
 }
 .stag-video-bar:not(.collapsed) [if-not-collapsed] {
     display: block;
-}
+}
+.mcp-theme-1 .sticky-note-header {
+    height: 36px !important;
+    border-bottom: 1px solid transparent;
+}
+.mcp-theme-1 .sticky-note-header.sticky {
+    position: fixed;
+    top: 55px;
+    width: calc(100% - 30px);
+    height: 36px;
+    z-index: 2;
+    background: #fff;
+    border-bottom: 1px solid #ccc;
+    left: 30px;
+    padding-left: 0.5rem;
+    padding-right: 0.5rem;
+}
+.sort-header-arrows[sort-index]:after {
+    content: attr(sort-index);
+    font-weight: normal;
+    font-size: 9px;
+    position: absolute;
+    top: -16px;
+    width: 14px;
+    height: 14px;
+    color: #0d59af;
+    border: 1px solid #0d59af;
+    border-radius: 100%;
+    text-align: center;
+    line-height: 12px;
+    right: calc(50% - 7px);
+}

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

@@ -62,7 +62,7 @@
         <tbody>
         @foreach($patients as $patient)
             <tr>
-                <td style="background-color:<?= $patientEngagementColorCodes[$patient->client_engagement_status_category] ?? '' ?>;">{{$patient->client_engagement_status_category == 'DUMMY'? 'Test Record': $patient->client_engagement_status_category}}</td> 
+                <td style="background-color:<?= @$patientEngagementColorCodes[$patient->client_engagement_status_category] ?: '' ?>;">{{$patient->client_engagement_status_category == 'DUMMY'? 'Test Record': $patient->client_engagement_status_category}}</td>
                 <td>
                     <a native target="_blank" href="{{route('patients.view.dashboard', $patient)}}">
                         {{$patient->chart_number}}

resources/views/app/clients-without-default-company-pro-payer.blade.php

@@ -0,0 +1,183 @@
+@extends ('layouts/empty')
+
+@section('content')
+<div class="mcp-theme-1">
+    <div class="card-body">
+
+        <div class="mcp-theme-1">
+
+            <div class="card">
+                <div class="card-body p-0">
+
+                    <table class="table table-sm table-striped p-0 m-0">
+                        <thead class="bg-light">
+                            <tr>
+                                <th class="border-0">Created At</th>
+                                <th class="border-0">Patient</th>
+                                <th class="border-0">Insurance</th>
+                                <th class="border-0">State</th>
+                                <th class="border-0">MCP</th>
+                                <th class="border-0">Def. MCP CP</th>
+                                <th class="border-0">Def. MCP<br>Company Pro Payer</th>
+                                <th class="border-0">Def. MCP<br>Company Location</th>
+                            </tr>
+                        </thead>
+                        <tbody>
+                            @foreach($rows as $row)
+                            <tr>
+                                <td>{{ friendly_date_time($row->created_at, true) }}</td>
+                                <td>
+                                    <a native target="_blank" href="/patients/view/{{ $row->uid }}">{{ $row->displayName() }}</a>
+                                </td>
+                                <td>
+                                    <?php $_cpc = $row->getPrimaryCoverage();?>
+                                    @if($_cpc && $row->getPrimaryCoverageStatus() === 'YES')
+                                        {{$_cpc->insuranceDisplayPayerName()}}
+                                    @else
+                                        No
+                                    @endif
+                                </td>
+                                <td>
+                                    {{$row->mailing_address_state}}
+                                </td>
+                                <td>{{ $row->mcp ? $row->mcp->displayName() : '-' }}</td>
+                                <td>
+                                    <div>
+                                        <b>{{$row->default_mcp_company_pro_id? $row->defaultMcpCompanyPro->company->name:'-'}}</b>
+                                        @if($row->default_mcp_company_pro_id)
+                                            <div moe bottom relative class="ml-1">
+                                                <a start show><i class="fa fa-times text-danger"></i></a>
+                                                <form url="/api/client/wipeDefaultMcpCompanyPro"
+                                                      class="mcp-theme-1 min-width-200px" right>
+                                                    <input type="hidden" name="uid" value="{{$row->uid}}">
+                                                    <p>Remove default MCP company pro?</p>
+                                                    <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>
+                                        @elseif($row->mcp)
+                                            <div moe bottom relative class="ml-2">
+                                                <a start show>Edit</a>
+                                                <form url="/api/client/putDefaultMcpCompanyPro"
+                                                      class="mcp-theme-1  min-width-200px" right>
+                                                    <input type="hidden" name="uid" value="{{$row->uid}}">
+                                                    <div class="mb-2">
+                                                        <label class="text-sm text-secondary mb-1">Company</label>
+                                                        <select name="defaultMcpCompanyProUid" class="form-control form-control-sm">
+                                                            <option value="">-- select --</option>
+                                                            @foreach($row->mcp->companyPros as $companyPro)
+                                                                <option value="{{$companyPro->uid}}">{{$companyPro->company->name}}</option>
+                                                            @endforeach
+                                                        </select>
+                                                    </div>
+                                                    <div>
+                                                        <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                                        <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        @endif
+                                    </div>
+                                </td>
+                                <td>
+                                    @if($row->defaultMcpCompanyPro)
+                                        <div>
+                                            <b>{{$row->default_mcp_company_pro_payer_id? $row->defaultMcpCompanyProPayer->payer->name:'No'}}</b>
+                                            @if($row->default_mcp_company_pro_payer_id)
+                                                <div moe bottom relative class="ml-1">
+                                                    <a start show><i class="fa fa-times text-danger"></i></a>
+                                                    <form url="/api/client/wipeDefaultMcpCompanyProPayer"
+                                                          class="mcp-theme-1 min-width-200px" right>
+                                                        <input type="hidden" name="uid" value="{{$row->uid}}">
+                                                        <p>Remove default MCP company pro payer?</p>
+                                                        <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>
+                                            @else
+                                                <div moe bottom relative class="ml-2">
+                                                    <a start show>Edit</a>
+                                                    <form url="/api/client/putDefaultMcpCompanyProPayer"
+                                                          class="mcp-theme-1  min-width-200px" right>
+                                                        <input type="hidden" name="uid" value="{{$row->uid}}">
+                                                        <div class="mb-2">
+                                                            <label class="text-sm text-secondary mb-1">Payer</label>
+                                                            <select name="defaultMcpCompanyProPayerUid" class="form-control form-control-sm">
+                                                                <option value="">-- select --</option>
+                                                                @foreach($row->defaultMcpCompanyPro->companyProPayers as $companyProPayer)
+                                                                    <option value="{{$companyProPayer->uid}}">{{$companyProPayer->payer->name}}</option>
+                                                                @endforeach
+                                                            </select>
+                                                        </div>
+                                                        <div>
+                                                            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            @endif
+                                        </div>
+                                    @endif
+                                </td>
+                                <td>
+                                    @if($row->defaultMcpCompanyPro)
+                                        <div>
+                                            <b>{{$row->default_mcp_company_location_id? implode(" ", [$row->defaultMcpCompanyLocation->line1, $row->defaultMcpCompanyLocation->city, $row->defaultMcpCompanyLocation->state]):'No'}}</b>
+                                            @if($row->default_mcp_company_location_id)
+                                                <div moe bottom relative class="ml-1">
+                                                    <a start show><i class="fa fa-times text-danger"></i></a>
+                                                    <form url="/api/client/wipeDefaultMcpCompanyLocation"
+                                                          class="mcp-theme-1 min-width-200px" right>
+                                                        <input type="hidden" name="uid" value="{{$row->uid}}">
+                                                        <p>Remove default MCP company location?</p>
+                                                        <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>
+                                            @else
+                                                <div moe bottom relative class="ml-2">
+                                                    <a start show>Edit</a>
+                                                    <form url="/api/client/putDefaultMcpCompanyLocation"
+                                                          class="mcp-theme-1  min-width-200px" right>
+                                                        <input type="hidden" name="uid" value="{{$row->uid}}">
+                                                        <div class="mb-2">
+                                                            <label class="text-sm text-secondary mb-1">Location</label>
+                                                            <select name="defaultCompanyLocationUid" class="form-control form-control-sm">
+                                                                <option value="">-- select --</option>
+                                                                @foreach($row->defaultMcpCompanyPro->company->locations as $location)
+                                                                    <option value="{{$location->uid}}">
+                                                                        {{implode(" ", [$location->line1, $location->city, $location->state])}}
+                                                                    </option>
+                                                                @endforeach
+                                                            </select>
+                                                        </div>
+                                                        <div>
+                                                            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                                        </div>
+                                                    </form>
+                                                </div>
+                                            @endif
+                                        </div>
+                                    @endif
+                                </td>
+                            </tr>
+                            @endforeach
+                        </tbody>
+                    </table>
+                    <div class="pt-3 px-3">
+                        {{ $rows->links() }}
+                    </div>
+                </div>
+            </div>
+
+        </div>
+    </div>
+</div>
+@endsection

resources/views/app/dashboard-admin.blade.php

@@ -22,23 +22,23 @@
                             </strong>
                         </div>
                         <div class="card-body p-0">
-                            <table class="table mb-0 dashboard-stats-table">
+                            <table class="table mb-0 dashboard-stats-table table-sm">
                                 <tbody>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_patients_count_as_admin()}}</th>
-                                    <th class="pl-2">Patients</th>
+                                    <th class="pl-2 font-weight-normal">Patients</th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_new_patients_awaiting_visit_count_as_admin()}}</th>
-                                    <th class="pl-2">New Patients Awaiting Visit</th>
+                                    <th class="pl-2 font-weight-normal">New Patients Awaiting Visit</th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_notes_pending_signature_count_as_admin()}}</th>
-                                    <th class="pl-2">Notes Pending Signature</th>
+                                    <th class="pl-2 font-weight-normal">Notes Pending Signature</th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_notes_pending_summary_suggestion_count_as_admin()}}</th>
-                                    <th class="pl-2">
+                                    <th class="pl-2 font-weight-normal">
                                         <a href="{{ route('admin.notes_pending_summary_suggestion') }}"
                                            native target="_blank"
                                            open-in-stag-popup
@@ -50,7 +50,7 @@
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_notes_rejected_summary_suggestion_count_as_admin()}}</th>
-                                    <th class="pl-2">
+                                    <th class="pl-2 font-weight-normal">
                                         <a href="{{ route('admin.notes_rejected_summary_suggestion') }}"
                                            native target="_blank"
                                            open-in-stag-popup
@@ -62,45 +62,45 @@
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_notes_pending_billing_count_as_admin()}}</th>
-                                    <th class="pl-2">Notes Pending Billing</th>
+                                    <th class="pl-2 font-weight-normal">Notes Pending Billing</th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_incoming_reports_pending_signature_count_as_admin()}}</th>
-                                    <th class="pl-2">Reports Pending Signature</th>
+                                    <th class="pl-2 font-weight-normal">Reports Pending Signature</th>
                                 </tr>
 
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_patients_without_appointment_count_as_admin()}}</th>
-                                    <th class="pl-2">Patients w/o Appointments</th>
+                                    <th class="pl-2 font-weight-normal">Patients w/o Appointments</th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_patients_not_seen_in_45_days_count_as_mcp()}}</th>
-                                    <th class="pl-2">Patients Not Seen in 45 Days</th>
+                                    <th class="pl-2 font-weight-normal">Patients Not Seen in 45 Days</th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_cancelled_appointments_pending_acknowledgement_count_as_mcp()}}</th>
-                                    <th class="pl-2">Cancelled Appts. Pending Review</th>
+                                    <th class="pl-2 font-weight-normal">Cancelled Appts. Pending Review</th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_cancelled_bills_awaiting_review_count_as_mcp()}}</th>
-                                    <th class="pl-2">Cancelled Bills Pending Review</th>
+                                    <th class="pl-2 font-weight-normal">Cancelled Bills Pending Review</th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_cancelled_supply_orders_awaiting_review_count_as_mcp()}}</th>
-                                    <th class="pl-2">Cancelled Supply Orders</th>
+                                    <th class="pl-2 font-weight-normal">Cancelled Supply Orders</th>
                                 </tr>
 
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_erx_and_orders_awaiting_signature_count_as_mcp()}}</th>
-                                    <th class="pl-2">ERx & Orders Pending Signature</th>
+                                    <th class="pl-2 font-weight-normal">ERx & Orders Pending Signature</th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_supply_orders_awaiting_signature_count_as_mcp()}}</th>
-                                    <th class="pl-2">Supply Orders Pending Signature</th>
+                                    <th class="pl-2 font-weight-normal">Supply Orders Pending Signature</th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_open_tickets_count_as_mcp()}}</th>
-                                    <th class="pl-2">
+                                    <th class="pl-2 font-weight-normal">
                                         <a href="{{ route('practice-management.myTickets') }}">
                                             Open Ticket{{$pro->get_open_tickets_count_as_mcp() !== 1 ? 's' : ''}}
                                         </a>
@@ -108,7 +108,7 @@
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{ $pro->myNotesPendingSupervisorPhysicianStamping() }}</th>
-                                    <th class="pl-2">
+                                    <th class="pl-2 font-weight-normal">
                                         <a href="{{ route('practice-management.notes-pending-physician-supervisor-stamping', ['hideTitle' => true]) }}"
                                            native target="_blank"
                                            open-in-stag-popup
@@ -119,6 +119,126 @@
                                     </th>
                                 </tr>
 
+                                <!-- new -->
+                                <tr>
+                                    <th class="px-2 text-center">
+                                        <?php
+                                        $count = \App\Models\Client::whereNull('shadow_pro_id')
+                                            ->where('is_active', true)
+                                            ->where(function ($q) {
+                                                $q->whereNull('client_engagement_status_category')
+                                                    ->orWhere('client_engagement_status_category', 'ACTIVE');
+                                            })
+                                            ->whereRaw('(default_mcp_company_pro_payer_id IS NULL OR default_mcp_company_location_id IS NULL)')
+                                            ->count();
+                                        ?>
+                                        {{$count}}
+                                    </th>
+                                    <th class="pl-2 font-weight-normal">
+                                        <a href="{{ route('practice-management.clients-without-default-company-pro-payer') }}"
+                                           native target="_blank"
+                                           open-in-stag-popup
+                                           popup-style="overflow-visible"
+                                           update-parent=""
+                                           title="Patients without default company location / pro payer">
+                                            Patients without default company location / pro payer
+                                        </a>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th class="px-2 text-center">
+                                        <?php
+                                        $count = \App\Models\Note::where('is_cancelled', false)
+                                            ->where('is_core_note', false)
+                                            ->where('is_signed_by_hcp', true)
+                                            ->whereNull('hcp_company_pro_payer_id')
+                                            ->count();
+                                        ?>
+                                        {{$count}}
+                                    </th>
+                                    <th class="pl-2 font-weight-normal">
+                                        <a href="{{ route('practice-management.notes-without-hcp-company-pro-payer') }}"
+                                           native target="_blank"
+                                           open-in-stag-popup
+                                           popup-style="overflow-visible"
+                                           update-parent=""
+                                           title="Notes without HCP company pro payer">
+                                            Notes without HCP company pro payer
+                                        </a>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th class="px-2 text-center">
+                                        <?php
+                                        $count = \App\Models\Bill::where('bill_service_type', 'NOTE')
+                                            ->where('is_cancelled', false)
+                                            ->whereNotNull('hcp_pro_id')
+                                            ->whereNull('hcp_company_pro_id')
+                                            ->where('has_hcp_been_paid', false)
+                                            ->count();
+                                        ?>
+                                        {{$count}}
+                                    </th>
+                                    <th class="pl-2 font-weight-normal">
+                                        <a href="{{ route('practice-management.note-hcp-bills-without-company-pro') }}"
+                                           native target="_blank"
+                                           open-in-stag-popup
+                                           popup-style="overflow-visible"
+                                           update-parent=""
+                                           title="Note HCP bills without company pro">
+                                            Note HCP bills without company pro
+                                        </a>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th class="px-2 text-center">
+                                        <?php
+                                        $count = \App\Models\Bill::where('bill_service_type', 'GENERIC')
+                                            ->where('is_cancelled', false)
+                                            ->whereNotNull('generic_pro_id')
+                                            ->whereNull('generic_company_pro_id')
+                                            ->where('has_generic_pro_been_paid', false)
+                                            ->where('code', 'RM MCP')
+                                            ->count();
+                                        ?>
+                                        {{$count}}
+                                    </th>
+                                    <th class="pl-2 font-weight-normal">
+                                        <a href="{{ route('practice-management.rpm-mcp-bills-without-company-pro') }}"
+                                           native target="_blank"
+                                           open-in-stag-popup
+                                           popup-style="overflow-visible"
+                                           update-parent=""
+                                           title="RPM MCP bills without company pro">
+                                            RPM MCP bills without company pro
+                                        </a>
+                                    </th>
+                                </tr>
+                                <tr>
+                                    <th class="px-2 text-center">
+                                        <?php
+                                        $count = \App\Models\Bill::where('bill_service_type', 'GENERIC')
+                                            ->where('is_cancelled', false)
+                                            ->whereNotNull('generic_pro_id')
+                                            ->whereNull('generic_company_pro_id')
+                                            ->where('has_generic_pro_been_paid', false)
+                                            ->where('code', 'RM RMM')
+                                            ->count();
+                                        ?>
+                                        {{$count}}
+                                    </th>
+                                    <th class="pl-2 font-weight-normal">
+                                        <a href="{{ route('practice-management.rpm-rmm-bills-without-company-pro') }}"
+                                           native target="_blank"
+                                           open-in-stag-popup
+                                           popup-style="overflow-visible"
+                                           update-parent=""
+                                           title="RPM RMM bills without company pro">
+                                            RPM RMM bills without company pro
+                                        </a>
+                                    </th>
+                                </tr>
+
                                 </tbody>
                             </table>
                         </div>
@@ -134,11 +254,11 @@
                                 <tbody>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_measurements_awaiting_review_count_as_mcp() ?? '-'}}</th>
-                                    <th class="pl-2">Measurements Pending Review</th>
+                                    <th class="pl-2 font-weight-normal">Measurements Pending Review</th>
                                 </tr>
                                 <tr>
                                     <th class="px-2 text-center">{{$pro->get_patients_without_remote_measurement_in_48_hours_count_as_mcp() ?? '-'}}</th>
-                                    <th class="pl-2">Patients w/o Measurement in 48 hrs.</th>
+                                    <th class="pl-2 font-weight-normal">Patients w/o Measurement in 48 hrs.</th>
                                 </tr>
                                 </tbody>
                             </table>
@@ -164,7 +284,7 @@
                                 </tr>
                                 <!-- <tr>
                                     <th class="px-2">{{friendly_date_time($reimbursement['nextPaymentDate'], false)}}</th>
-                                    <th class="pl-2">Next Payment Date</th>
+                                    <th class="pl-2 font-weight-normal">Next Payment Date</th>
                                 </tr> -->
                                 <tr class="thin">
                                     <th class="font-weight-normal px-2 pl-4">${{friendly_money($reimbursement['nextPaymentAmount'])}}</th>
@@ -189,11 +309,11 @@
                                 {{--
                                 <tr>
                                     <th class="px-2">{{$reimbursement['lastPayment']}}</th>
-                                    <th class="pl-2"><a href="/practice-management/financial-transactions">Last payment</a></th>
+                                    <th class="pl-2 font-weight-normal"><a href="/practice-management/financial-transactions">Last payment</a></th>
                                 </tr>
                                 <tr>
                                     <th class="px-2">{{friendly_date_time($reimbursement['lastPaymentDate'], false)}}</th>
-                                    <th class="pl-2"><a href="/practice-management/financial-transactions">Last payment date</a></th>
+                                    <th class="pl-2 font-weight-normal"><a href="/practice-management/financial-transactions">Last payment date</a></th>
                                 </tr>
                                 --}}
                                 </tbody>

resources/views/app/generic-bills/inline-for-cm.blade.php

@@ -0,0 +1,274 @@
+<?php
+
+use App\Models\Note;
+use App\Models\Pro;
+use App\Models\Client;
+
+/** @var Note $note */
+/** @var Pro $genericPro */
+/** @var Pro $pro */
+/** @var Client $patient */
+/** @var $entityType */
+/** @var $entityUid */
+
+$genericBills = genericBills($pro, @$patient, @$entityType, @$entityUid);
+?>
+
+@if(!count($genericBills))
+    <div class="{{@$class ? $class : ''}} d-flex align-items-center">
+        <p class="font-weight-bold mb-0">No {{@$label ? $label : 'Admin.'}} Bills</p>
+    </div>
+@else
+    <div class="{{@$class ? $class : ''}}">
+        <div class="d-flex align-items-center mb-2">
+            <p class="font-weight-bold m-0">{{@$label ? $label : 'Admin.'}} Bills</p>
+        </div>
+            <table class="table table-sm table-striped mb-0 table-bordered">
+                <thead class="bg-light">
+                <tr class="text-secondary">
+                    <th class="border-bottom-0">Date</th>
+                    <th class="border-bottom-0">Pro</th>
+                    <th class="border-bottom-0 screen-only">Total</th>
+                    <th class="border-bottom-0">Sign</th>
+                    <th class="border-bottom-0">Cancellation</th>
+                    <th class="border-bottom-0">Verification</th>
+                    @if($pro->pro_type === 'ADMIN')
+                    <th class="border-bottom-0 screen-only">Payment</th>
+                    @endif
+                </tr>
+                </thead>
+                <tbody>
+                @foreach ($genericBills as $bill)
+                    <tr class="{{$bill->is_cancelled ? 'bg-light text-secondary' : ''}}">
+                        <td class="text-nowrap">{{friendlier_date_time($bill->effective_date ?: $bill->created_at, false)}}</td>
+                        <td class="">
+                            <div class="text-nowrap font-weight-bold text-secondary">{{ $bill->genericPro->displayName() }}</div>
+                            <div class="text-nowrap mt-1 screen-only">
+                                <span class="text-secondary">Paid: </span>
+                                <span>{{ $bill->has_generic_pro_been_paid ? 'Yes' : 'No' }}</span>
+                            </div>
+                            @if(!$bill->has_generic_pro_been_paid)
+                                <div class="text-nowrap mt-1 screen-only">
+                                    <span class="text-secondary">Expected: </span>
+                                    <span class="font-weight-bold">${{ round($bill->total_expected, 2) }}</span>
+                                </div>
+                            @else
+                                <div class="text-nowrap mt-1 screen-only">
+                                    <span class="text-secondary">Amount: </span>
+                                    <span class="font-weight-bold">${{ round($bill->total_paid, 2) }}</span>
+                                </div>
+                            @endif
+                            <div class="mt-1">
+                                Company Pro: <b>{{$bill->genericCompanyPro ? $bill->genericCompanyPro->company->name : '-'}}</b>
+                            </div>
+                            <div moe class="">
+                                <a class="text-primary" href="" show start>Swap Company Pro</a>
+                                <form url="/api/bill/swapGenericCompanyPro">
+                                    <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                    <div class="mb-2">
+                                        <select name="genericCompanyProUid" class="form-control form-control-sm">
+                                            <option value="">-- select --</option>
+                                            @foreach($bill->genericPro->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>
+                        </td>
+                        <td class="pr-3 screen-only text-nowrap">
+                            @if($bill->has_generic_pro_been_paid)
+                                <span class="text-secondary">Paid. </span>
+                                <span class="font-weight-bold">${{ round($bill->total_paid, 2) }}</span>
+                            @else
+                                <span class="text-secondary">Exp. </span>
+                                <span class="font-weight-bold">{{ $bill->total_expected ? '$' . round($bill->total_expected, 2) : '-' }}</span>
+                            @endif
+                        </td>
+                        <td>
+                            @if(!$bill->is_cancelled)
+                                @if($bill->is_signed_by_generic_pro)
+                                    <div class="d-block text-secondary text-nowrap">
+                                        <i class="fa fa-check"></i>
+                                        Signed
+                                    </div>
+                                @else
+                                    <div moe
+                                          class="d-block {{ $bill->generic_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
+                                          title="{{ $bill->generic_pro_id !== $pro->id ? 'Only the bill\'s pro can sign' : '' }}">
+                                        <a class="text-nowrap" href="" show start>Sign</a>
+                                        <form url="/api/bill/signAsGenericPro">
+                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
+                                            <p>Sign this bill?</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
+                            @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 text-nowrap">(by Administrator)</div>
+                                @endif
+                                <div moe class="mt-1">
+                                    <a class="text-nowrap" 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 : ($pro->pro_type === 'ADMIN' ? 'Please contact billing.' : '')}}</textarea>
+                                        </div>
+                                        <div>
+                                            <button class="btn btn-success btn-sm" submit>Submit</button>
+                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @else
+                                <div 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">@if($pro->pro_type === 'ADMIN')Please contact billing.@endif</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>
+                                </div>
+                            @endif
+
+                            @if($bill->is_cancelled && !$bill->is_cancellation_acknowledged)
+                                <div class="mt-2 text-secondary text-nowrap">
+                                    <i class="fa fa-exclamation-triangle"></i>
+                                    Not Ack.
+                                </div>
+                                <div class="d-block mt-1" moe>
+                                    <a class="text-nowrap" 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)
+                                <div class="mt-2 text-secondary">
+                                    <i class="fa fa-check"></i>
+                                    Ack.
+                                </div>
+                                <div class="d-block mt-1" moe>
+                                    <a class="text-nowrap" 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-success btn-sm" submit>Submit</button>
+                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+                            @endif
+
+                        </td>
+                        @if($pro->pro_type === 'ADMIN')
+                        <td> <!-- verification -->
+                            @if(!$bill->genericCompanyPro)
+                                <div class="mb-1 text-danger">
+                                    <i class="fa fa-exclamation-triangle"></i>
+                                    Company Pro isn't set on the bill
+                                </div>
+                            @else
+                                @if(!$bill->is_cancelled)
+                                    @if(!$bill->is_verified)
+                                        <div class="text-warning-mellow font-weight-bold text-nowrap">Not Verified</div>
+                                        <div 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 Verified?</p>
+                                                <div class="mb-0">
+                                                    <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    @else
+                                        <div class="text-success font-weight-bold"><i class="fa fa-check"></i> Verified</div>
+                                        <div 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 Verified?</p>
+                                                <div class="mb-0">
+                                                    <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    @endif
+                                @endif
+                            @endif
+                        </td>
+                        <td class="screen-only"> <!-- submit payment -->
+                            <div class="my-1">
+                                @if(!$bill->is_cancelled && !$bill->has_generic_pro_been_paid )
+                                    @if(+$bill->total_expected && $bill->is_signed_by_generic_pro)
+                                        <div class="d-block" moe relative="">
+                                            <a class="font-weight-bold text-nowrap" href="" show start>Submit Payment</a>
+                                            <form url="/api/bill/payGenericProAmount" 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="genericProPaymentAmount" value="{{$bill->total_expected}}" placeholder="amount"><br>
+                                                    <button class="btn btn-success btn-sm" submit>Submit</button>
+                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    @else
+                                        @if(!+$bill->total_expected)
+                                            <div class="mb-1 text-danger">
+                                                <i class="fa fa-exclamation-triangle"></i>
+                                                Pro expected amount is invalid
+                                            </div>
+                                        @endif
+                                        @if(!$bill->is_signed_by_generic_pro)
+                                            <div class="mb-1 text-danger">
+                                                <i class="fa fa-exclamation-triangle"></i>
+                                                Pro has not signed the bill
+                                            </div>
+                                        @endif
+                                    @endif
+                                @endif
+                            </div>
+                        </td>
+                        @endif
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+    </div>
+@endif

resources/views/app/note-hcp-bills-without-company-pro.blade.php

@@ -0,0 +1,81 @@
+@extends ('layouts/empty')
+
+@section('content')
+    <div class="mcp-theme-1">
+        <div class="card-body">
+
+            <div class="mcp-theme-1">
+
+                <div class="card">
+                    <div class="card-body p-0">
+
+                        <table class="table table-sm table-striped p-0 m-0">
+                            <thead class="bg-light">
+                            <tr>
+                                <th class="border-0">Date</th>
+                                <th class="border-0">Patient</th>
+                                <th class="border-0">Insurance</th>
+                                <th class="border-0">State</th>
+                                <th class="border-0">Note</th>
+                                <th class="border-0">HCP</th>
+                                <th class="border-0">Company Pro</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            @foreach($rows as $row)
+                                <?php $note = \App\Models\Note::where('id', $row->note_id)->first(); ?>
+                                <tr>
+                                    <td>{{ friendly_date_time($row->created_at, true) }}</td>
+                                    <td>
+                                        <a native target="_blank" href="/patients/view/{{ $row->client->uid }}">{{ $row->client->displayName() }}</a>
+                                    </td>
+                                    <td>
+                                        <?php $_cpc = $row->client->getPrimaryCoverage();?>
+                                        @if($_cpc && $row->client->getPrimaryCoverageStatus() === 'YES')
+                                            {{$_cpc->insuranceDisplayPayerName()}}
+                                        @else
+                                            No
+                                        @endif
+                                    </td>
+                                    <td>
+                                        {{$row->client->mailing_address_state}}
+                                    </td>
+                                    <td>
+                                        <a native target="_blank" href="/patients/view/{{ $row->client->uid }}/notes/view/{{$note->uid}}">{{ $note->effective_dateest }}</a>
+                                    </td>
+                                    <td>{{ $note->hcpPro ? $note->hcpPro->displayName() : '-' }}</td>
+                                    <td>
+                                        <b>{{$row->hcpCompanyPro && $row->hcpCompanyPro->company ? $row->hcpCompanyPro->company->name : '-'}}</b>
+                                        <div moe class="ml-1">
+                                            <a class="text-primary" href="" show start>Edit</a>
+                                            <form url="/api/bill/swapHcpCompanyPro">
+                                                <input type="hidden" name="uid" value="{{$row->uid}}">
+                                                <div class="mb-2">
+                                                    <select name="hcpCompanyProUid" class="form-control form-control-sm">
+                                                        <option value="">-- select --</option>
+                                                        @foreach($row->hcp->companyPros as $companyPro)
+                                                            <option value="{{$companyPro->uid}}">{{$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>
+                                    </td>
+                                </tr>
+                            @endforeach
+                            </tbody>
+                        </table>
+                        <div class="pt-3 px-3">
+                            {{ $rows->links() }}
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/notes-pending-physician-supervisor-stamping.blade.php

@@ -1,4 +1,4 @@
-@extends ('layouts/template')
+@extends ('layouts/empty')
 
 @section('content')
 <div class="mcp-theme-1">

resources/views/app/notes-without-hcp-company-pro-payer.blade.php

@@ -0,0 +1,184 @@
+@extends ('layouts/empty')
+
+@section('content')
+    <div class="mcp-theme-1">
+        <div class="card-body">
+
+            <div class="mcp-theme-1">
+
+                <div class="card">
+                    <div class="card-body p-0">
+
+                        <table class="table table-sm table-striped p-0 m-0">
+                            <thead class="bg-light">
+                            <tr>
+                                <th class="border-0">Date</th>
+                                <th class="border-0">Patient</th>
+                                <th class="border-0">Insurance</th>
+                                <th class="border-0">State</th>
+                                <th class="border-0">Note HCP</th>
+                                <th class="border-0">Company Pro</th>
+                                <th class="border-0">Company<br>Pro Payer</th>
+                                <th class="border-0">Company<br>Location</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            @foreach($rows as $row)
+                                <tr>
+                                    <td>{{ friendly_date_time($row->effective_dateest, true) }}</td>
+                                    <td>
+                                        <a native target="_blank" href="/patients/view/{{ $row->client->uid }}/notes/view/{{$row->uid}}">{{ $row->client->displayName() }}</a>
+                                    </td>
+                                    <td>
+                                        <?php $_cpc = $row->client->getPrimaryCoverage();?>
+                                        @if($_cpc && $row->client->getPrimaryCoverageStatus() === 'YES')
+                                            {{$_cpc->insuranceDisplayPayerName()}}
+                                        @else
+                                            No
+                                        @endif
+                                    </td>
+                                    <td>
+                                        {{$row->client->mailing_address_state}}
+                                    </td>
+                                    <td>{{ $row->hcpPro ? $row->hcpPro->displayName() : '-' }}</td>
+                                    <td>
+
+                                        <b>{{$row->hcpCompanyPro && $row->hcpCompanyPro->company ? $row->hcpCompanyPro->company->name : '-'}}</b>
+                                        @if($row->hcpCompanyPro && $row->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="{{$row->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="{{$row->uid}}">
+                                                    <div class="mb-2">
+                                                        <select name="hcpCompanyProUid" class="form-control form-control-sm">
+                                                            <option value="">-- select --</option>
+                                                            @if($row->hcpPro)
+                                                                @foreach($row->hcpPro->companyPros as $companyPro)
+                                                                    <option value="{{$companyPro->uid}}">{{$companyPro->pro->displayName() . ' / ' . $companyPro->company->name}}</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
+
+                                    </td>
+                                    <td>
+                                        @if($row->hcpCompanyPro && $row->hcpCompanyPro->company)
+
+                                            <div class="d-flex align-items-baseline mb-1">
+                                                <div class="">
+                                                    <b>{{$row->hcpCompanyProPayer && $row->hcpCompanyProPayer->payer ? $row->hcpCompanyProPayer->payer->name : '-'}}</b>
+                                                    @if($row->hcpCompanyProPayer && $row->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="{{$row->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="{{$row->uid}}">
+                                                                <div class="mb-2">
+                                                                    <select name="hcpCompanyProPayerUid" class="form-control form-control-sm">
+                                                                        <option value="">-- select --</option>
+                                                                        @foreach($row->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>
+                                            </div>
+
+                                        @endif
+                                    </td>
+                                    <td>
+                                        @if($row->hcpCompanyPro && $row->hcpCompanyPro->company)
+
+
+                                            <div class="d-flex align-items-baseline mb-1">
+                                                <div class="">
+                                                    <b>{{$row->hcpCompanyLocation ? $row->hcpCompanyLocation->line1 . ', ' . $row->hcpCompanyLocation->city : '-'}}</b>
+                                                    @if($row->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="{{$row->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="{{$row->uid}}">
+                                                                <div class="mb-2">
+                                                                    <select name="hcpCompanyLocationUid" class="form-control form-control-sm">
+                                                                        <option value="">-- select --</option>
+                                                                        @if($row->hcpCompany && $row->hcpCompany->locations)
+                                                                            @foreach($row->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>
+                                            </div>
+                                        @endif
+                                    </td>
+                                </tr>
+                            @endforeach
+                            </tbody>
+                        </table>
+                        <div class="pt-3 px-3">
+                            {{ $rows->links() }}
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/patient/care-month/_create-claim-table-action.blade.php

@@ -1,3 +1,4 @@
+<?php $careMonth = \App\Models\CareMonth::where('uid', $row->care_month_uid)->first(); ?>
 @if($careMonth->is_claim_closed)
     <b class="ml-2 text-info">[CLAIMING CLOSED]</b>
 @elseif($pro->pro_type === 'ADMIN' && $careMonth->was_rm_setup_performed && !$careMonth->rm_setup_claim_id)

resources/views/app/patient/care-month/dashboard.blade.php

@@ -321,13 +321,9 @@
                                     @include('app.practice-management.care_month_add_entry_form')
                                 </div>
 
-                                <div class="mt-2">
-                                    {{-- rm reasons --}}
-                                    <div class="mb-2">
-                                        @include('app/patient/care-month/rm-reasons')
-                                    </div>
-                                </div>
-
+                                <div class="mt-2 d-flex align-items-baseline">
+                                    <span class="font-weight-bold text-secondary mr-1">Billing:</span>
+                                    <div>
                                 @if($careMonth->mcpRmGenericBill == null )
                                     
                                     @php 
@@ -338,8 +334,8 @@
                                         <div class="alert alert-info">{{$rpmBillability['reason']}}</div>
                                     @else 
                                         <div moe relative class="d-inline-block">
-                                            <a class="font-weight-bold" href="" show start>Bill for {{$rpmBillability['amount']}}</a>
-                                            <form url="/api/careMonth/generateRmGenericBillForMcpAndAutoSign" right>
+                                            <a class="font-weight-bold" href="" show start>Bill ${{$rpmBillability['amount']}}</a>
+                                            <form url="/api/careMonth/generateRmGenericBillForMcpAndAutoSign">
                                                 <input type="hidden" name="uid" value="{{$careMonth->uid}}">
                                                 <p>Bill ${{$rpmBillability['amount']}} for this care month?</p>
                                                 <div class="mb-0">
@@ -350,12 +346,13 @@
                                         </div>   
                                     @endif
                                 @else 
-                                    <div class="font-weight-bold">
-                                        Billed: ${{$careMonth->mcpRmGenericBill->generic_pro_expected_payment_amount}} 
+                                    <div class="font-weight-bold text-success d-inline-flex align-items-baseline">
+                                        <i class="fa fa-check mr-1"></i>
+                                        <span>Billed: ${{$careMonth->mcpRmGenericBill->generic_pro_expected_payment_amount}}</span>
                                         @if($careMonth->mcpRmGenericBill->is_signed_by_generic_pro)
-                                            <span class="text-success"><i class="fa fa-check"></i> Signed </span>
+                                            <span class="text-success ml-1 text-sm">(Signed)</span>
                                         @else 
-                                            <div moe relative class="d-inline-block">
+                                            <div moe relative class="d-inline-block text-sm ml-2">
                                                 <a class="font-weight-bold" href="" show start>Sign</a>
                                                 <form url="/api/bill/signAsGenericPro" right>
                                                     <input type="hidden" name="uid" value="{{$careMonth->mcpRmGenericBill->uid}}">
@@ -369,6 +366,15 @@
                                         @endif 
                                     </div>
                                 @endif
+                                    </div>
+                                </div>
+
+                                <div class="mt-2">
+                                    {{-- rm reasons --}}
+                                    <div class="mb-2">
+                                        @include('app/patient/care-month/rm-reasons')
+                                    </div>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -581,134 +587,58 @@
         </div> --}}
 
         <hr class="m-negator mt-4 mb-3">
-        <div class="screen-only">
-            <div class="d-flex align-items-center mb-3">
-                <p class="font-weight-bold text-secondary m-0 font-size-14">RM Setup</p>
-            </div>
-
-            <div class="mb-3 d-flex align-items-center">
-                <span class="min-width-140px">RM Setup Status:</span>
-                <div class="d-inline-flex align-items-center flex-grow-1">
-                    @if($patient->has_rm_setup_been_performed)
-                        <span class="text-nowrap text-success">
-                            <i class="fa fa-check"></i>
-                            <b>Performed</b>
-                        </span>
-                        <div moe class="ml-3">
-                            <a href="" show start>Undo</a>
-                            <form url="/api/careMonth/undoMarkRmSetupPerformed">
-                                <input type="hidden" name="uid" value="{{$careMonth->uid}}">
-                                <p>Mark RM Setup as not performed?</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
-                        <span class="text-nowrap text-warning-mellow">
-                            <i class="fa fa-times"></i>
-                            <b>Not Performed</b>
-                        </span>
-                        <div moe class="ml-3">
-                            <a href="" show start>Mark RM setup as performed?</a>
-                            <form url="/api/careMonth/markRmSetupPerformed">
-                                <input type="hidden" name="uid" value="{{$careMonth->uid}}">
-                                <p>Mark as enrolled into RM?</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
-                </div>
-            </div>
-
-            @if($pro->pro_type === 'ADMIN')
-                <div class="d-flex align-items-center">
-                    <span class="min-width-140px">RM Setup Claim:</span>
-                    <div class="d-inline-flex align-items-center flex-grow-1">
-                        @if(!!$careMonth->rmSetupClaim)
-                            <span class="text-nowrap text-success">
-                                <i class="fa fa-check"></i>
-                                <b>Created</b>
-                            </span>
-                        @else
-                            <span class="text-nowrap text-warning-mellow">
-                                <i class="fa fa-times"></i>
-                                <b>Not Created</b>
-                            </span>
-                            <div moe class="ml-3">
-                                <a href="" show start>Generate</a>
-                                <form url="/api/careMonth/generateRmSetupClaim">
-                                    <input type="hidden" name="uid" value="{{$careMonth->uid}}">
-                                    <p>Generate RM setup 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>
-                            </div>
-                        @endif
-                    </div>
-                </div>
-            @endif
-
-        </div>
+        @include('app.patient.rm-setup-form')
 
         @if($pro->pro_type === 'ADMIN')
 
             <hr class="m-negator my-3">
             <div class="pb-3 screen-only">
-                <div class="ml-auto d-flex align-items-center">
-
-		    @if($careMonth->mcp)
-		            <div class="d-inline-flex align-items-center">
-		                <span class="text-secondary font-weight-bold">Company Pro:&nbsp;</span>
-		                <b>{{$careMonth->companyPro && $careMonth->companyPro->company ? $careMonth->companyPro->pro->displayName() . ' / ' . $careMonth->companyPro->company->name : '-'}}</b>
-		                @if($careMonth->companyPro && $careMonth->companyPro->company)
-		                    <div moe class="ml-1">
-		                        <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
-		                        <form url="/api/careMonth/wipeCompanyPro">
-		                            <input type="hidden" name="uid" value="{{$careMonth->uid}}">
-		                            <p>Wipe company pro from this care month?</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/careMonth/putCompanyPro">
-		                            <input type="hidden" name="uid" value="{{$careMonth->uid}}">
-		                            <div class="mb-2">
-		                                <select name="companyProUid" class="form-control form-control-sm">
-		                                    <option value="">-- select --</option>
-		                                    @foreach($careMonth->mcp->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-success btn-sm" submit>Submit</button>
-		                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-		                            </div>
-		                        </form>
-		                    </div>
-		                   
-		                @endif
-		            </div>
-			 @else 
-	            	<div class="alert alert-info">MCP has not been set on the care month.</div>
-	            @endif
+                <div class="">
+                    @if($careMonth->mcp)
+                        <div class="d-flex align-items-baseline">
+                            <div class="text-secondary font-weight-normal mb-1">Company Pro:&nbsp;</div>
+                            <b>{{$careMonth->companyPro && $careMonth->companyPro->company ? $careMonth->companyPro->pro->displayName() . ' / ' . $careMonth->companyPro->company->name : '-'}}</b>
+                            @if($careMonth->companyPro && $careMonth->companyPro->company)
+                                <div moe class="ml-1">
+                                    <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
+                                    <form url="/api/careMonth/wipeCompanyPro">
+                                        <input type="hidden" name="uid" value="{{$careMonth->uid}}">
+                                        <p>Wipe company pro from this care month?</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/careMonth/putCompanyPro">
+                                        <input type="hidden" name="uid" value="{{$careMonth->uid}}">
+                                        <div class="mb-2">
+                                            <select name="companyProUid" class="form-control form-control-sm">
+                                                <option value="">-- select --</option>
+                                                @foreach($careMonth->mcp->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-success btn-sm" submit>Submit</button>
+                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                        </div>
+                                    </form>
+                                </div>
+
+                            @endif
+                        </div>
+                    @else
+                        <div class="alert alert-info">MCP has not been set on the care month.</div>
+                    @endif
                     @if($careMonth->companyPro && $careMonth->companyPro->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>
+                        <div class="d-flex align-items-baseline">
+                            <div class="text-secondary font-weight-normal mb-1">Payer 1°:&nbsp;</div>
                             <b>
                                 {{$careMonth->companyProPayer && $careMonth->companyProPayer->payer ? $careMonth->companyProPayer->payer->name : '-'}}
                             </b>
@@ -746,14 +676,12 @@
                             @endif
                         </div>
 
-                        <span class="mx-2 text-secondary">|</span>
-                        <span>
-                                <span class="text-secondary font-weight-bold">Payer 2°: </span>
-                            </span>
+                        <div class="d-flex align-items-baseline">
+                            <div class="text-secondary font-weight-normal mb-1">Payer 2°: </div>
+                        </div>
 
-                        <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>{{$careMonth->companyLocation ? $careMonth->companyLocation->line1 . ', ' . $careMonth->companyLocation->city : '-'}}</b>
+                        <div class="d-flex align-items-baseline">
+                            <div class="text-secondary font-weight-normal mb-1">Location:&nbsp;</div><b>{{$careMonth->companyLocation ? $careMonth->companyLocation->line1 . ', ' . $careMonth->companyLocation->city : '-'}}</b>
                             @if($careMonth->companyLocation)
                                 <div moe class="ml-1">
                                     <a class="text-danger" href="" show start><i class="fa fa-trash-alt"></i></a>
@@ -789,6 +717,11 @@
                                 </div>
                             @endif
                         </div>
+
+                        <div class="d-flex align-items-baseline">
+                            <div class="text-secondary font-weight-normal">Primary Coverage:&nbsp;</div>
+                            <b class="d-inline-flex">@include('app.patient.coverage_column_renderer', ['patient'=>$patient, 'truncateName' => true])</b>
+                        </div>
                     @endif
                 </div>
             </div>
@@ -980,403 +913,15 @@
 
         @if($careMonth->number_of_days_with_remote_measurements >= 16)
 
-            <hr class="m-negator mt-4 mb-3">
+            <hr class="m-negator mt-4 mb-0">
 
             {{-- bills --}} {{-- only admins --}}
             @if($pro->pro_type === 'ADMIN')
-                @if($careMonth->bills->count())
-                    <div class="">
-                        <div class="d-flex align-items-center mb-2">
-                            <p class="font-weight-bold font-size-13 m-0">RM Bills</p>
-                            @include('app/patient/care-month/_create-bill')
-                        </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">
-                                    <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">Pro</th>
-                                    <th class="border-bottom-0">Total</th>
-                                    <th class="border-bottom-0">Sign</th>
-                                    <th class="border-bottom-0">Bal Post Date</th>
-                                    <th class="border-bottom-0">Verification</th>
-                                    <th class="border-bottom-0">Cancellation</th>
-                                    <th class="border-bottom-0">Payment</th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                @foreach ($careMonth->bills as $bill)
-                                    <tr class="{{$bill->is_cancelled ? 'bg-light text-secondary' : ''}}">
-                                        <td class="text-nowrap">{{friendlier_date_time($bill->careMonth->end_date, false)}}</td>
-                                        <td>{{$bill->code}} {{$bill->cm_or_rm}} {{$bill->is_cancelled}}</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->genericPro ? $bill->genericPro->displayName() : '' }} (HCP)</div>
-                                            <div class="text-nowrap mt-1">
-                                                <span class="text-secondary">Paid: </span>
-                                                <span>{{ $bill->has_generic_pro_been_paid ? 'Yes' : 'No' }}</span>
-                                            </div>
-                                            @if(!$bill->has_hcp_been_paid)
-                                                <div class="text-nowrap mt-1">
-                                                    <span class="text-secondary">Expected: </span>
-                                                    <span class="font-weight-bold">${{ $bill->generic_pro_expected_payment_amount }}</span>
-                                                </div>
-                                            @else
-                                                <div class="text-nowrap mt-1">
-                                                    <span class="text-secondary">Amount: </span>
-                                                    <span class="font-weight-bold">${{ $bill->generic_pro_payment_amount }}</span>
-                                                </div>
-                                            @endif
-                                        </td>
-                                        <td class="pr-3">
-                                            @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_generic_pro)
-                                                    <span class="d-block text-secondary text-nowrap">
-                                                            <i class="fa fa-check"></i>
-                                                            Pro Signed
-                                                        </span>
-                                                @else
-                                                    <span moe
-                                                          class="d-block {{ $bill->hcp_pro_id !== $pro->id && $pro->pro_type !== 'ADMIN' ? 'moe-disabled' : '' }}"
-                                                          title="{{ $bill->hcp_pro_id !== $pro->id  && $pro->pro_type !== 'ADMIN' ? 'Only the bill\'s Pro can sign' : '' }}">
-                                                        <a class="" href="" show start>Sign As HCP</a>
-                                                        <form url="/api/bill/signAsGenericPro">
-                                                            <input type="hidden" name="uid" value="{{$bill->uid}}">
-                                                            <p>Sign this bill?</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>
-                                            @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-success 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-success 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-success 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-success 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 && !$careMonth->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-success btn-sm" submit>Submit</button>
-                                                            <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                        </div>
-                                                    </form>
-                                                </div>
-                                            @endif
+                <div class="screen-only m-neg-4 mb-3">
+                    @include('app.generic-bills.inline-for-cm', ['patient' => $patient, 'careMonth' => $careMonth, 'class' => 'p-3 border-bottom', 'label' => 'MCP', 'entityType' => 'CareMonth', 'entityUid' => $careMonth->id])
+                </div>
 
-                                        </td>
-                                        <td> <!-- submit payment -->
-                                            <div class="my-1">
-                                                @if(!$bill->is_cancelled && !$bill->has_hcp_been_paid)
-                                                    <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-success btn-sm" submit>Submit</button>
-                                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                            </div>
-                                                        </form>
-                                                    </span>
-                                                @endif
-                                            </div>
-                                            <div class="my-1">
-                                                @if(!$bill->is_cancelled && !$bill->has_na_been_paid && $bill->ally)
-                                                    <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-success btn-sm" submit>Submit</button>
-                                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                                            </div>
-                                                        </form>
-                                                    </span>
-                                                @endif
-                                            </div>
-                                        </td>
-                                    </tr>
-                                @endforeach
-                                </tbody>
-                            </table>
-                        @else
-                            <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>
-                                    <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"></th>
-                                </tr>
-                                </thead>
-                                <tbody>
-                                @foreach ($careMonth->bills as $bill)
-                                    <tr>
-                                        <td class="pl-3">{{ $bill->hcp->displayName() }}</td>
-                                        <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->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
-                                        </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</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
-                                                @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-success 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>
-                                                @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>
-                                        </td>
-                                    </tr>
-                                @endforeach
-                                </tbody>
-                            </table>
-                        @endif
-                    </div>
-                @else
-                    <div class="d-flex">
-                        <p class="font-weight-bold mb-0">No bills in this care month</p>
-                        @include('app/patient/care-month/_create-bill')
-                    </div>
-                @endif
-                <hr class="m-negator mt-4 mb-3">
             @endif
 
             {{-- claims --}} {{-- only admins --}}
@@ -1809,7 +1354,7 @@
 
         {{-- generic bills --}}{{--
         <div class="row">
-            @include('app.generic-bills.inline', ['patient' => $patient, 'class' => 'col-12', 'entityType' => 'CareMonth', 'entityUid' => $careMonth->uid])
+            @include('app.generic-bills.inline', ['patient' => $patient, 'class' => 'col-12', 'entityType' => 'CareMonth', 'entityUid' => $careMonth->id])
         </div>--}}
 
     </div>

resources/views/app/patient/care-month/update-claim-status.blade.php

@@ -1,23 +1,23 @@
 <span moe relative title="Submit Claim">
 	<a class="" href="" show start><i class="fa fa-pencil-alt"></i></a>
 	<form url="/api/claim/updateStatus" right>
-		<input type="hidden" name="uid" value="{{$claim->uid}}">
+		<input type="hidden" name="uid" value="{{$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>
+				<option value="NEW" {{$status === 'NEW' ? 'selected' : ''}}>New</option>
+				<option value="PICKED_UP" {{$status === 'PICKED_UP' ? 'selected' : ''}}>Picked Up</option>
+				<option value="SUBMITTED" {{$status === 'SUBMITTED' ? 'selected' : ''}}>Submitted</option>
+				<option value="IN_PROCESS" {{$status === 'IN_PROCESS' ? 'selected' : ''}}>In Process</option>
+				<option value="ACCEPTED" {{$status === 'ACCEPTED' ? 'selected' : ''}}>Accepted</option>
+				<option value="REJECTED" {{$status === 'REJECTED' ? 'selected' : ''}}>Rejected</option>
+				<option value="ABANDONED" {{$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"><?= $claim->status_memo ?></textarea>
+			<textarea name="memo" class="form-control"></textarea>
 		</div>
 		<div class="mb-0">
 			<button class="btn btn-primary btn-sm" submit>Submit</button>

resources/views/app/patient/mb-claim-single.blade.php

@@ -1,4 +1,4 @@
-@extends ('layouts/template')
+@extends ('layouts/empty')
 
 @section('content')
     <div class="p-3 mcp-theme-1">

resources/views/app/patient/memos.blade.php

@@ -37,6 +37,7 @@
                 </thead>
                 <tbody>
                 @foreach($patient->memos as $memo)
+                    @if(!$memo->is_admin_only || ($memo->is_admin_only && $performer->pro->pro_type === 'ADMIN') )
                     <tr>
                         <td>{{ $memo->category }}</td>
                         <td><pre class="m-0 break-spaces">{{ $memo->content }}</pre></td>
@@ -81,6 +82,7 @@
                             </div>
                         </td>
                     </tr>
+                    @endif
                 @endforeach
                 </tbody>
             @else

resources/views/app/patient/note/_cancel-signed-note.blade.php

@@ -8,16 +8,20 @@
                 Cancel Signed Note
             </a>
             <form url="/api/note/cancel">
-                <input type="hidden" name="uid" value="{{$note->uid}}">
-                <p class="small mb-1 font-weight-bold">This note has been already signed by the HCP.</p>
-                <p class="mb-2">Do you still want to cancel this note?</p>
-                <div class="mb-2">
-                    <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo (required to cancel signed note)" class="memo-textarea form-control form-control-sm" required></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>
+                @if($patient->has_cm_setup_been_performed && $patient->cm_setup_note_id === $note->id)
+                    A care-plan was created during this note. Please undo that before cancelling the note.
+                @else
+                    <input type="hidden" name="uid" value="{{$note->uid}}">
+                    <p class="small mb-1 font-weight-bold">This note has been already signed by the HCP.</p>
+                    <p class="mb-2">Do you still want to cancel this note?</p>
+                    <div class="mb-2">
+                        <textarea name="memo" id="" cols="30" rows="5" placeholder="Memo (required to cancel signed note)" class="memo-textarea form-control form-control-sm" required></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>
+                @endif
             </form>
         </div>
     </div>

resources/views/app/patient/note/dashboard-bu-b4-pure-soap.blade.php

@@ -1,2778 +0,0 @@
-<?php
-/** @var App\Models\Note $note */
-/** @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;
-
-    ?>
-    <div id="note-single-header" class="pb-3 d-flex align-items-start screen-only zero-height">
-        <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>
-
-    <span 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>
-                    <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>
-                @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->name_display}}</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-times"></i>
-                                </a>
-                                <form url="/api/note/removeNa">
-                                    <input type="hidden" name="uid" value="{{$note->uid}}">
-                                    <p>Remove NA?</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">
-                                <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="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' || ($note->hcpPro && $pro->id === $note->hcpPro->id))
-                                    <div class="ml-3">
-                                        @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">Only the note's HCP can sign</span>
-                            @else
-                                @if(!$isVisitTemplateBased)
-                                    <div moe relative
-                                         class="{{ $note->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
-                                         title="{{ $note->hcp_pro_id !== $pro->id ? 'Only the note\'s HCP can sign' : '' }}">
-                                        <a class="" href="" show start>Sign Note 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"
-                                       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="mx-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 Note 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">
-                @if($isVisitTemplateBased && !$doesVisitTemplateUiConfigExist)
-                    @include('app.patient.note.lhs-tree')
-                @endif
-                <div class="note-rhs-content">
-                <div>
-                <div class="border-bottom pb-3">
-                    <div>
-                        <?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' : '' }}">
-                            @if($isVisitTemplateBased && $doesVisitTemplateLayoutExist)
-                                @include($visitLayoutPath)
-                            @elseif($isVisitTemplateBased && !$doesVisitTemplateUiConfigExist)
-                                @include('app.patient.note.note-segment-list')
-                            @elseif($isVisitTemplateBased && $doesVisitTemplateUiConfigExist)
-                                @include('app.patient.note.custom-visit')
-                            @else
-                                @include('app.patient.note.note-section-list')
-                            @endif
-                        </div>
-                    </div>
-                </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 = \App\Models\Handout::where('is_active', true)->get(); ?>
-                    @include('app.patient.handouts-list', compact('patient', 'handouts'))
-                </div>
-
-                @if($isVisitTemplateBased && $doesVisitTemplateUiConfigExist)
-
-                @else
-                <div class="p-3 border-bottom screen-only" data-non-segment-section="Prescriptions">
-                    @include('app.patient.prescriptions.list', compact('patient', 'note'))
-                </div>
-                @endif
-
-                <div class="p-3 border-bottom screen-only" data-non-segment-section="CM Setup">
-                    <div class="d-flex align-items-center mb-3">
-                        <p class="font-weight-bold text-secondary m-0 font-size-14">Chronic Care Management (CCM)</p>
-                    </div>
-
-                    <div class="mb-3 d-flex align-items-baseline">
-                        <span class="min-width-140px">CCM Enrollment:</span>
-                        <div class="d-inline-flex align-items-center flex-grow-1">
-                            @if($patient->is_enrolled_in_cm === 'YES')
-                                <span class="text-nowrap text-success">
-                                    <i class="fa fa-check"></i>
-                                    <b>Enrolled</b>
-                                </span>
-                                <div moe class="ml-3">
-                                    <a href="" show start>Undo</a>
-                                    <form url="/api/client/setIsEnrolledInCmToFalse" target='[data-non-segment-section="CM Setup"]'>
-                                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                        <p>Un-enroll from CCM?</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
-                                <span class="text-nowrap text-warning-mellow">
-                                    <i class="fa fa-times"></i>
-                                    <b>Not Enrolled</b>
-                                </span>
-                                @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
-                                    <a native target="_blank"
-                                       class="screen-only ml-3"
-                                       open-in-stag-popup
-                                       popup-style="medium overflow-visible"
-                                       mc-initer="ccm-agreement-{{$note->id}}"
-                                       title="Consent To Chronic Care Management Services"
-                                       href="/note/ccm-agreement/{{$note->uid}}?popupmode=1">
-                                        Mark as enrolled
-                                    </a>
-                                @endif
-                            @endif
-                        </div>
-                    </div>
-
-                    <div class="mb-3 d-flex align-items-baseline">
-                        <span class="min-width-140px">CCM Setup:</span>
-                        <div class="d-inline-flex align-items-center flex-grow-1">
-                            @if($patient->has_cm_setup_been_performed)
-                                <span class="text-nowrap text-success">
-                                    <i class="fa fa-check"></i>
-                                    <b>Performed</b>
-                                </span>
-                                @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" target='[data-non-segment-section="CM Setup"]'>
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Mark CCM Setup as not performed?</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 Performed</b>
-                                </span>
-                                @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
-                                    <div moe class="ml-3">
-                                        <a href="#" show start>Mark Performed</a>
-                                        <form url="/api/note/markCmSetupPerformed" target='[data-non-segment-section="CM Setup"]'>
-                                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                                            <p>Mark CCM Setup as performed?</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>
-                    </div>
-
-                    <div class="d-flex align-items-baseline mb-3">
-                        <span class="min-width-140px">CCM Reasons:</span>
-                        <div class="min-width-300px">
-                            @if(!$patient->cmReasons || !count($patient->cmReasons))
-                                <span class="text-secondary">None</span>
-                            @else
-                                <div>
-                                @foreach($patient->cmReasons as $reason)
-                                    <div class="border-bottom pb-1 mb-1 d-flex align-items-start">
-                                        <b class="min-width-70px">{{$reason->code}}</b>
-                                        <span class="max-width-200px mr-3">{{$reason->description}}</span>
-                                        <div moe relative class="ml-auto">
-                                            <a start show><i class="fa fa-pencil-alt"></i></a>
-                                            <form url="/api/clientCmRmReason/updateBasic" class="mcp-theme-1" right target='[data-non-segment-section="CM Setup"]'>
-                                                <input type="hidden" name="uid" value="{{$reason->uid}}">
-                                                <div class="mb-2">
-                                                    <label class="text-sm mb-1 text-secondary">Code *</label>
-                                                    <input type="text" class="form-control form-control-sm"
-                                                           icd-autocomplete-code
-                                                           name="code" value="{{$reason->code}}" required>
-                                                </div>
-                                                <div class="mb-2">
-                                                    <label class="text-sm mb-1 text-secondary">Description</label>
-                                                    <input type="text" class="form-control form-control-sm"
-                                                           icd-autocomplete-description
-                                                           name="description" value="{{$reason->description}}">
-                                                </div>
-                                                <div>
-                                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                                </div>
-                                            </form>
-                                        </div>
-                                        <div moe relative class="ml-2">
-                                            <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
-                                            <form url="/api/clientCmRmReason/remove" class="mcp-theme-1" right target='[data-non-segment-section="CM Setup"]'>
-                                                <input type="hidden" name="uid" value="{{$reason->uid}}">
-                                                <p>Remove this CM reason?</p>
-                                                <div>
-                                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                                </div>
-                                            </form>
-                                        </div>
-                                    </div>
-                                @endforeach
-                                </div>
-                            @endif
-                            @if(!$patient->cmReasons || count($patient->cmReasons) < 2)
-                                <div class="d-flex align-items-baseline">
-                                    <div moe>
-                                        <a start show>+ Add From Dx</a>
-                                        <form url="/api/clientCmRmReason/create" class="mcp-theme-1" target='[data-non-segment-section="CM Setup"]'>
-                                            <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                            <input type="hidden" name="cmOrRm" value="CM">
-                                            <input type="hidden" name="code" value="">
-                                            <input type="hidden" name="description" value="">
-                                            <div class="mb-2">
-                                                <label class="text-sm mb-1 text-secondary">Reason *</label>
-                                                <select type="text" class="form-control form-control-sm problem-select" name="problem" required>
-                                                    <?php $problems = \App\Models\Point::getPointsOfCategory($patient, "PROBLEM"); ?>
-                                                    <option value="">-- select --</option>
-                                                    @foreach($problems as $problem)
-                                                        @if(!!@($problem->data->icd))
-                                                            <option value="{{$problem->uid}}" data-icd="{{$problem->data->icd}}" data-name="{{$problem->data->name}}">{{$problem->data->icd}} - {{$problem->data->name}}</option>
-                                                        @endif
-                                                    @endforeach
-                                                </select>
-                                            </div>
-                                            <div>
-                                                <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                    <span class="mx-2 text-secondary text-sm">|</span>
-                                    <div moe>
-                                        <a start show>+ Add</a>
-                                        <form url="/api/clientCmRmReason/create" class="mcp-theme-1" target='[data-non-segment-section="CM Setup"]'>
-                                            <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                            <input type="hidden" name="cmOrRm" value="CM">
-                                            <div class="mb-2">
-                                                <label class="text-sm mb-1 text-secondary">Code *</label>
-                                                <input type="text" class="form-control form-control-sm"
-                                                       icd-autocomplete-code
-                                                       name="code" value="" required>
-                                            </div>
-                                            <div class="mb-2">
-                                                <label class="text-sm mb-1 text-secondary">Description</label>
-                                                <input type="text" class="form-control form-control-sm"
-                                                       icd-autocomplete-description
-                                                       name="description" value="">
-                                            </div>
-                                            <div>
-                                                <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                            </div>
-                                        </form>
-                                    </div>
-                                </div>
-                            @endif
-                        </div>
-                    </div>
-
-                    @if($pro->pro_type === 'ADMIN' && $note->was_cm_setup_performed)
-                    <div class="d-flex align-items-baseline">
-                        <span class="min-width-140px">Manager Signature:</span>
-                        <div class="d-inline-flex align-items-center flex-grow-1">
-                            @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 CM Setup Performed 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 CM Setup Performed?</p>
-                                        <div>
-                                            <button submit class="btn btn-sm btn-primary mr-1">Sign</button>
-                                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                        </div>
-                                    </form>
-                                </div>
-                            @endif
-                        </div>
-                    </div>
-                    @endif
-
-                </div>
-
-                <div class="p-3 border-bottom screen-only" 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">RM Setup</p>
-                    </div>
-                    @include('app.patient.note.rm-setup')
-                </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_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>
-                                                        {{$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>
-                                                    {{$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="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 = '';
-                                    }
-                                    if (bmi >= 25 && bmi < 30) {
-                                        bmiCategory = '(Overweight)';
-                                    }
-                                    if (bmi >= 30) {
-                                        bmiCategory = '(Obese)';
-                                    }
-                                    bmiCategoryElem.val(bmiCategory);
-                                } catch (e) {
-                                    return false;
-                                }
-                            }
-
-                            function init() {
-                                $(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="p-3 border-bottom" data-non-segment-section="ICDs">
-                    <div class="">
-                        <div class="d-flex align-items-center mb-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
-                    </div>
-                </div>
-                @endif
-
-                {{-- bills --}}
-                @if($pro->pro_type === 'ADMIN' || ($note->hcpPro && $pro->id === $note->hcpPro->id))
-                    <div 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
-
-                                </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> Verifiedxx</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>
-                                </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 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 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>
-                                                                            </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 screen-only" 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-pencil-alt"></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">
-                        <div class="nbt-container border-right border-info">
-                            <!-- render mrv segment here -->
-                            <?php $segment = null; ?>
-                            @foreach($note->segments as $segment)
-                                @if($segment->segmentTemplate->internal_name === 'medrisk_vigilence')
-                                    <div native target="_blank"
-                                         class="d-block c-pointer mrv-trigger d-flex align-items-center px-2 py-1"
-                                         open-in-stag-popup
-                                         title="MedRisk Vigilance"
-                                         popup-style="stag-popup-md"
-                                         href="/segment-summary/{{$segment->uid}}">
-                                        <div class="text-info font-weight-bold text-center font-size-11">MRV</div>
-                                        {!! $segment->summary_html !!}
-                                    </div>
-                                @endif
-                            @endforeach
-                        </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">
-                            <div class="position-relative on-click-menu d-inline-flex align-items-center px-2 py-1">
-                                <span class="">LS <i class="fa fa-caret-up"></i></span>
-                                <div menu bottom class="bg-white border">
-                                    <a href="#" class="ls-segment-trigger px-2 py-1 text-nowrap d-block" data-target="lifestyle_general">General</a>
-                                    <a href="#" class="ls-segment-trigger px-2 py-1 text-nowrap d-block" data-target="lifestyle_nutrition">Nutrition</a>
-                                    <a href="#" class="ls-segment-trigger px-2 py-1 text-nowrap d-block" data-target="lifestyle_physical_activity">Physical Activity</a>
-                                    <a href="#" class="ls-segment-trigger px-2 py-1 text-nowrap d-block" data-target="lifestyle_sleep">Sleep</a>
-                                    <a href="#" class="ls-segment-trigger px-2 py-1 text-nowrap d-block" data-target="lifestyle_social">Social Relationships</a>
-                                    <a href="#" class="ls-segment-trigger px-2 py-1 text-nowrap d-block" data-target="lifestyle_substances">Substance Use</a>
-                                    <a href="#" class="ls-segment-trigger px-2 py-1 text-nowrap d-block" data-target="lifestyle_stress">Stress</a>
-                                </div>
-                            </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 incoming-reports-trigger px-2 py-1"
-                                 open-in-stag-popup
-                                 mc-initer="incoming-reports"
-                                 title="Incoming Reports"
-                                 popup-style="wide overflow-visible"
-                                 href="/patients/view/{{$patient->uid}}/incoming-reports?noteUid={{$note->uid}}">
-                                <span>Inc. Rpts.</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 documents-trigger px-2 py-1"
-                                 open-in-stag-popup
-                                 title="Documents"
-                                 popup-style="wide overflow-visible"
-                                 href="/patients/view/{{$patient->uid}}/documents">
-                                <span>Docs</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 handouts-trigger px-2 py-1"
-                                 open-in-stag-popup
-                                 title="Handouts"
-                                 popup-style="wide overflow-visible"
-                                 href="/patients/view/{{$patient->uid}}/handouts?noteUid={{$note->uid}}">
-                                <span>Handouts</span>
-                            </div>
-                        </div>
-                    </div>
-                    @endif
-
-                </div>
-                @if($isVisitTemplateBased && !$note->is_signed_by_hcp)
-                    @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])
-    @endif
-    @if($isVisitTemplateBased)
-    <script>
-        (function() {
-            function init() {
-                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;
-                    });
-                $(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)
-                $('.visit-segment[data-segment-template-name="disclaimers"]').find('.refresh-segment').trigger('click');
-                @endif
-            }
-            function fixTreeTopAndHeight() {
-                let tree = $('#note-lhs-tree'), 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)
-                    tree.addClass('fixed');
-                    rhsSidebar.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)');
-                    rhsSidebar.removeClass('fixed');
-                    rhsSidebar.css('height', 'calc(100vh - ' + resultTop + 'px)');
-                    rhsSidebar.css('max-height', 'calc(100vh - ' + resultTop + 'px)');
-                }
-            }
-            addMCInitializer('note-tree', init, '#note-lhs-tree');
-        })();
-    </script>
-    @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-old.blade.php

@@ -1,3025 +0,0 @@
-<?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 = '';
-                                    }
-                                    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> Verifiedxxxx</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-univ.blade.php

@@ -1,2167 +0,0 @@
-<?php
-/** @var App\Models\Note $note */
-/** @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;
-            }
-        }
-    }
-    ?>
-
-    <div id="note-single-header" class="pb-3 d-flex align-items-start screen-only">
-        <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 (univ *)
-                    <span class="text-secondary font-weight-normal">{{ $note->is_cancelled ? '(CANCELLED)' : '' }}</span>
-                </span>
-                @if($pro->pro_type === 'ADMIN')
-                    <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>
-                    <?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-success 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-success 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-success 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-success 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-success 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' : '' }}">
-        <div class="card-header d-flex align-items-start px-3 py-2 border-bottom" id="note-card-header">
-            <div class="pr-2">
-                {{$note->title}}
-                @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
-                <div moe>
-                    <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>
-                @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 class="mr-2"><span class="text-secondary">HCP:</span> {{$note->hcpPro->name_display}}</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/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-times"></i>
-                                </a>
-                                <form url="/api/note/removeNa">
-                                    <input type="hidden" name="uid" value="{{$note->uid}}">
-                                    <p>Remove NA?</p>
-                                    <div class="mb-0">
-                                        <button class="btn btn-success 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 provider-search
-                                            name="naProUid" class="form-control form-control-sm">
-                                        <option value="">-- Select Ally Pro --</option>
-                                    </select>
-                                </div>
-                                <div class="mb-0">
-                                    <button class="btn btn-success 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">
-                                <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="ml-auto d-flex align-items-start">
-                <div class="">
-                    <div>
-                        @if($note->is_signed_by_hcp)
-                            <span class="text-secondary">
-                        <i class="fa fa-check"></i>
-                        Note Signed
-                        @if($pro->pro_type == 'ADMIN')
-                        <span moe class="ml-2 d-none">
-                            <a class="" href="" show start>Undo sign?</a>
-                            <form url="/api/note/adminUndoSignAsHcp" right>
-                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                <p>Undo sign?</p>
-                                <div class="mb-0">
-                                    <button class="btn btn-success 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->hcp_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
-                                 title="{{ $note->hcp_pro_id !== $pro->id ? 'Only the note\'s HCP can sign' : '' }}">
-                                <a class="" href="" show start>Sign Note 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>
-                        @endif
-                    </div>
-                </div>
-                @if($note->allyPro)
-                <div class="mx-4">
-                    <div>
-                        @if($note->is_signed_by_ally)
-                            <span class="text-secondary">
-                        <i class="fa fa-check"></i>
-                        Note Signed By NA
-                    </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 Note 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">
-                <div class="note-lhs-tree" id="note-lhs-tree">
-                    <?php
-                    $previousHeading = null;
-                    $sectionTemplates = $note->noteTemplate->sectionTemplatesRaw();
-                    ?>
-                    @foreach($sectionTemplates as $sectionTemplate)
-                        <?php
-                        if($sectionTemplate->heading !== $previousHeading) {
-                            if(!empty($previousHeading)) {
-                                echo '</div></div>'; // <!-- end the previous parent section -->
-                            }
-                            if(!empty($sectionTemplate->heading)) {
-                                echo '<div class="note-tree-node note-tree-heading">' .
-                                        '<a class="">' . $sectionTemplate->heading . '</a>' .
-                                        '<div class="note-tree-children">'; // <!-- open new node -->
-                            }
-                            $previousHeading = $sectionTemplate->heading;
-                        }
-                        echo '<div class="note-tree-node">' .
-                            '<a native target="_top" data-section-template-name="' . $sectionTemplate->internal_name . '" href="#" >' . $sectionTemplate->title . '</a>' .
-                            '</div>';
-                        ?>
-                    @endforeach
-                    <?php
-                    if(!empty($previousHeading)) {
-                        echo '</div></div>'; // <!-- close any open parent section -->
-                    }
-                    ?>
-                </div>
-                <div class="note-rhs-content">
-                    <div>
-                        <div class="">
-                            <div>
-                                <?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>
-                                <?php
-                                $shortcuts = "";
-                                $latestSectionTS = 0;
-                                ?>
-                                <div class="{{ $note->is_signed_by_hcp ? 'note-signed-by-hcp' : '' }}">
-                                    @include('app.patient.note.note-section-list')
-                                </div>
-                            </div>
-                        </div>
-
-                        <span class="d-none latest-section-ts">{{ $latestSectionTS }}</span>
-
-                        <div class="p-3 border-bottom">
-                            <div class="">
-                                <div class="d-flex align-items-center mb-2">
-                                    <p class="font-weight-bold text-secondary m-0 font-size-14">ERx/Orders Summary</p>
-                                    <span class="mx-2 text-secondary screen-only">|</span>
-                                    <a href="/patients/view/{{$patient->uid}}/tickets/erx/create?popupmode=1&note-uid={{$note->uid}}"
-                                       native target="_blank"
-                                       class="ticket-popup-trigger note-dashboard-action d-block text-nowrap screen-only">
-                                        + ERx
-                                    </a>
-                                    <span class="mx-2 text-secondary screen-only">|</span>
-                                    <a href="/patients/view/{{$patient->uid}}/tickets/lab/create?popupmode=1&note-uid={{$note->uid}}"
-                                       native target="_blank"
-                                       class="ticket-popup-trigger note-dashboard-action d-block text-nowrap screen-only">
-                                        + Lab
-                                    </a>
-                                    <span class="mx-2 text-secondary screen-only">|</span>
-                                    <a href="/patients/view/{{$patient->uid}}/tickets/imaging/create?popupmode=1&note-uid={{$note->uid}}"
-                                       native target="_blank"
-                                       class="ticket-popup-trigger note-dashboard-action d-block text-nowrap screen-only">
-                                        + Imaging
-                                    </a>
-                                    <span class="mx-2 text-secondary screen-only">|</span>
-                                    <a href="/patients/view/{{$patient->uid}}/tickets/other/create?popupmode=1&note-uid={{$note->uid}}"
-                                       native target="_blank"
-                                       class="ticket-popup-trigger note-dashboard-action d-block text-nowrap screen-only">
-                                        + Other
-                                    </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($ticketsOnNote && count($ticketsOnNote))
-                                            <table class="table table-sm table-bordered mb-0">
-                                                <thead>
-                                                <tr class="bg-light">
-                                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Created</th>
-                                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Type</th>
-                                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Pro</th>
-                                                    <th class="px-2 text-secondary border-bottom-0 width-30px">View</th>
-                                                    <th class="px-2 text-secondary border-bottom-0 width-30px">Status</th>
-                                                    <th class="px-2 text-secondary border-bottom-0">Detail</th>
-                                                </tr>
-                                                </thead>
-                                                <tbody>
-                                                @foreach($ticketsOnNote as $ticket)
-                                                    <?php $data = json_decode($ticket->data); ?>
-                                                    @if($ticket->category === 'erx' || $ticket->category === 'lab' || $ticket->category === 'imaging')
-                                                        <tr class="{{$ticket->is_open ? '' : 'bg-light on-hover-opaque'}}">
-                                                            <td class="px-2 text-nowrap">
-                                                                {{friendly_time($ticket->created_at)}}
-                                                            </td>
-                                                            <td class="px-2 text-nowrap">
-                                                                {{$ticket->category}}
-                                                            </td>
-                                                            <td class="px-2 text-nowrap">
-                                                                @if($ticket->orderingPro)
-                                                                    @if($ticket->orderingPro->id !== $pro->id)
-                                                                        <b>{{$ticket->orderingPro->displayName()}}</b>
-                                                                    @else
-                                                                        You
-                                                                    @endif
-                                                                @else
-                                                                    -
-                                                                @endif
-                                                            </td>
-                                                            <td class="px-2 text-nowrap">
-                                                                <div class="d-flex align-items-center flex-nowrap">
-                                                                    <a href="/patients/view/{{$ticket->patient->uid}}/tickets/{{$ticket->category}}/{{$ticket->uid}}?popupmode=1"
-                                                                       native target="_blank"
-                                                                       class="ticket-popup-trigger note-dashboard-action d-block text-nowrap mr-3">
-                                                                        View
-                                                                    </a>
-                                                                </div>
-                                                            </td>
-                                                            <td class="px-2 text-nowrap">
-                                                                {{$ticket->is_open ? 'Open' : 'Closed'}}
-                                                            </td>
-                                                            <td class="px-2">
-                                                                @if($ticket->category === 'erx')
-                                                                    <div class="font-size-13 mb-1">{{$data->medication}}</div>
-                                                                    <div class="d-flex align-items-center flex-wrap text-secondary">
-                                                                        @if($data->strength)
-                                                                            <span class="d-inline-flex align-items-center">
-                                                            <span class="mx-2 text-secondary">•</span>
-                                                            <span>{{$data->strength}}</span>
-                                                        </span>
-                                                                        @endif
-                                                                        @if($data->route)
-                                                                            <span class="d-inline-flex align-items-center">
-                                                            <span class="mx-2 text-secondary">•</span>
-                                                            <span>{{$data->route}}</span>
-                                                        </span>
-                                                                        @endif
-                                                                        @if($data->frequency)
-                                                                            <span class="d-inline-flex align-items-center">
-                                                            <span class="mx-2 text-secondary">•</span>
-                                                            <span>{{$data->frequency}}</span>
-                                                        </span>
-                                                                        @endif
-                                                                        @if($data->dispense)
-                                                                            <span class="d-inline-flex align-items-center">
-                                                            <span class="mx-2 text-secondary">•</span>
-                                                            <span>Dispense:</span> {{$data->dispense}}
-                                                        </span>
-                                                                        @endif
-                                                                        @if($data->frequency)
-                                                                            <span class="d-inline-flex align-items-center">
-                                                            <span class="mx-2 text-secondary">•</span>
-                                                            <span><span>Refills:</span> {{$data->refills}}</span>
-                                                        </span>
-                                                                        @endif
-                                                                        @if($data->dispense)
-                                                                            <span class="d-inline-flex align-items-center">
-                                                            <span class="mx-2 text-secondary">•</span>
-                                                            <span><span>Purpose:</span> {{$data->purpose}}</span>
-                                                        </span>
-                                                                        @endif
-                                                                    </div>
-                                                                @endif
-                                                                @if($ticket->category === 'lab' || $ticket->category === 'imaging')
-                                                                    @if(@$data->tests && is_array($data->tests))
-                                                                        <div>
-                                                                            <span class="text-secondary">Tests:</span>
-                                                                            {{implode(", ", $data->tests)}}
-                                                                        </div>
-                                                                    @endif
-                                                                    @if(@$data->icds && is_array($data->icds))
-                                                                        <div>
-                                                                            <span class="text-secondary">ICDs:</span>
-                                                                            {{implode(", ", $data->icds)}}
-                                                                        </div>
-                                                                    @endif
-                                                                @endif
-                                                            </td>
-                                                        </tr>
-                                                    @endif
-                                                @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 open as of {{friendlier_date(date('Y-m-d'))}}</p>
-                                    @if($otherOpenTickets && count($otherOpenTickets))
-                                        <table class="table table-sm table-bordered mb-0">
-                                            <thead>
-                                            <tr class="bg-light">
-                                                <th class="px-2 text-secondary border-bottom-0 width-30px">Created</th>
-                                                <th class="px-2 text-secondary border-bottom-0 width-30px">Type</th>
-                                                <th class="px-2 text-secondary border-bottom-0 width-30px">Pro</th>
-                                                <th class="px-2 text-secondary border-bottom-0 width-30px">View</th>
-                                                <th class="px-2 text-secondary border-bottom-0 width-30px">Status</th>
-                                                <th class="px-2 text-secondary border-bottom-0">Detail</th>
-                                            </tr>
-                                            </thead>
-                                            <tbody>
-                                            @foreach($otherOpenTickets as $ticket)
-                                                <?php $data = json_decode($ticket->data); ?>
-                                                @if($ticket->category === 'erx' || $ticket->category === 'lab' || $ticket->category === 'imaging' || $ticket->category === 'other')
-                                                    <tr class="{{$ticket->is_open ? '' : 'bg-light on-hover-opaque'}}">
-                                                        <td class="px-2 text-nowrap">
-                                                            {{friendly_time($ticket->created_at)}}
-                                                        </td>
-                                                        <td class="px-2 text-nowrap">
-                                                            {{$ticket->category}}
-                                                        </td>
-                                                        <td class="px-2 text-nowrap">
-                                                            @if($ticket->orderingPro)
-                                                                @if($ticket->orderingPro->id !== $pro->id)
-                                                                    <b>{{$ticket->orderingPro->displayName()}}</b>
-                                                                @else
-                                                                    You
-                                                                @endif
-                                                            @else
-                                                                -
-                                                            @endif
-                                                        </td>
-                                                        <td class="px-2 text-nowrap">
-                                                            <div class="d-flex align-items-center flex-nowrap">
-                                                                <a href="/patients/view/{{$ticket->patient->uid}}/tickets/{{$ticket->category}}/{{$ticket->uid}}?popupmode=1"
-                                                                   native target="_blank"
-                                                                   class="ticket-popup-trigger note-dashboard-action d-block text-nowrap mr-3">
-                                                                    View
-                                                                </a>
-                                                            </div>
-                                                        </td>
-                                                        <td class="px-2 text-nowrap">
-                                                            {{$ticket->is_open ? 'Open' : 'Closed'}}
-                                                        </td>
-                                                        <td class="px-2">
-                                                            @if($ticket->category === 'erx')
-                                                                <div class="font-size-13 mb-1">{{$data->medication}}</div>
-                                                                <div class="d-flex align-items-center flex-wrap text-secondary">
-                                                                    @if($data->strength)
-                                                                        <span class="d-inline-flex align-items-center">
-                                                                            <span class="mx-2 text-secondary">•</span>
-                                                                            <span>{{$data->strength}}</span>
-                                                                        </span>
-                                                                    @endif
-                                                                    @if($data->route)
-                                                                        <span class="d-inline-flex align-items-center">
-                                                                            <span class="mx-2 text-secondary">•</span>
-                                                                            <span>{{$data->route}}</span>
-                                                                        </span>
-                                                                    @endif
-                                                                    @if($data->frequency)
-                                                                        <span class="d-inline-flex align-items-center">
-                                                                            <span class="mx-2 text-secondary">•</span>
-                                                                            <span>{{$data->frequency}}</span>
-                                                                        </span>
-                                                                    @endif
-                                                                    @if($data->dispense)
-                                                                        <span class="d-inline-flex align-items-center">
-                                                                            <span class="mx-2 text-secondary">•</span>
-                                                                            <span>Dispense:</span> {{$data->dispense}}
-                                                                        </span>
-                                                                    @endif
-                                                                    @if($data->frequency)
-                                                                        <span class="d-inline-flex align-items-center">
-                                                                            <span class="mx-2 text-secondary">•</span>
-                                                                            <span><span>Refills:</span> {{$data->refills}}</span>
-                                                                        </span>
-                                                                    @endif
-                                                                    @if($data->dispense)
-                                                                        <span class="d-inline-flex align-items-center">
-                                                                            <span class="mx-2 text-secondary">•</span>
-                                                                            <span><span>Purpose:</span> {{$data->purpose}}</span>
-                                                                        </span>
-                                                                    @endif
-                                                                </div>
-                                                            @endif
-                                                            @if($ticket->category === 'lab' || $ticket->category === 'imaging')
-                                                                @if(@$data->tests && is_array($data->tests))
-                                                                    <div>
-                                                                        <span class="text-secondary">Tests:</span>
-                                                                        {{implode(", ", $data->tests)}}
-                                                                    </div>
-                                                                @endif
-                                                                @if(@$data->icds && is_array($data->icds))
-                                                                    <div>
-                                                                        <span class="text-secondary">ICDs:</span>
-                                                                        {{implode(", ", $data->icds)}}
-                                                                    </div>
-                                                                @endif
-                                                            @endif
-                                                            @if($ticket->category === 'other')
-                                                                <div>
-                                                                    {{$data->title}}
-                                                                </div>
-                                                            @endif
-                                                        </td>
-                                                    </tr>
-                                                @endif
-                                            @endforeach
-                                            </tbody>
-                                        </table>
-                                    @else
-                                        <div class="text-secondary">None</div>
-                                    @endif
-
-                                </div>
-
-                            </div>
-                        </div>
-
-                        <div class="p-3 border-bottom">
-                            <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"
-                                       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">
-                                                <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_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>
-                                                                {{$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">
-                                            <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>
-                                                            {{$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="p-3 border-bottom">
-                            <div class="">
-                                <div class="d-flex align-items-center mb-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">
-                                <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
-
-                        @if($note->method === 'IN_CLINIC' || $pro->pro_type === 'ADMIN')
-                            <div class="p-3 border-bottom screen-only">
-                                <div class="ml-auto d-inline-flex align-items-center">
-
-                                    <span class="text-secondary font-weight-bold">Pro:&nbsp;</span>
-                                    <b>{{$note->hcpPro ? $note->hcpPro->displayName() : '-'}}</b>
-
-                                    <span class="mx-2 text-secondary">|</span>
-                                    <span>
-                            <span class="text-secondary font-weight-bold">Payer 1°: </span>
-                            <b>
-                                {{$note->hcpCompanyProPayer && $note->hcpCompanyProPayer->company ? $note->hcpCompanyProPayer->company->name : '-'}}
-                                /
-                                {{$note->hcpCompanyProPayer && $note->hcpCompanyProPayer->payer ? $note->hcpCompanyProPayer->payer->name : '-'}}
-                            </b>
-                            <span 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->hcpPro->companyProPayers as $companyProPayer)
-                                                <option value="{{$companyProPayer->uid}}">{{$companyProPayer->company->name}} / {{$companyProPayer->payer->name}}</option>
-                                            @endforeach
-                                        </select>
-                                    </div>
-                                    <div class="mb-0">
-                                        <button class="btn btn-success btn-sm" submit>Submit</button>
-                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                    </div>
-                                </form>
-                            </span>
-                            @if($note->hcpCompanyProPayer && $note->hcpCompanyProPayer->payer)
-                                            <span 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>
-                            </span>
-                                        @endif
-                        </span>
-
-                                    <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>
-                                    <span>
-                            <span class="text-secondary font-weight-bold">Location: </span><b>{{$note->hcpCompanyLocation ? $note->hcpCompanyLocation->line1 . ', ' . $note->hcpCompanyLocation->city : '-'}}</b>
-                            <span 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-success btn-sm" submit>Submit</button>
-                                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                                    </div>
-                                </form>
-                            </span>
-                            @if($note->hcpCompanyLocation)
-                                            <span 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>
-                            </span>
-                                        @endif
-                        </span>
-                                </div>
-                            </div>
-                        @endif
-
-                        {{-- bills --}}
-                        @if($pro->pro_type === 'ADMIN' || ($note->hcpPro && $pro->id === $note->hcpPro->id) || ($note->allyPro && $pro->id === $note->allyPro->id))
-                            @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)
-                                                            <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
-
-                                                    </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-success 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-success 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-success 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 : 'Insufficient documentation for billable service.'}}</textarea>
-                                                                    </div>
-                                                                    <div>
-                                                                        <button class="btn btn-success 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">Insufficient documentation for billable service.</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-success 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-success 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-success 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>
-                                    @else
-                                        <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"></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>
-                                                        <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-success 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-success 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>
-                                                            @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>
-                                                    </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
-                        @endif
-
-                        {{-- claims --}}
-                        @if($pro->pro_type === 'ADMIN')
-                            @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-success 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>
-                                                                            </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 my-3 px-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
-                        @endif
-
-
-                        <div class="border-top p-3 screen-only">
-                            @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-pencil-alt"></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>
-
-                        <div class="screen-only">
-                            @include('app/patient/note/_cancel-signed-note')
-                        </div>
-
-
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-    <div class="note-templates-underlay"></div>
-    @include('app.patient.note.dashboard_script')
-    @include('app.patient.canvas-sections.canvas-editor-modal', ['key' => 'rx', 'class' => 'wide', 'noEditLink' => true])
-    <script>
-        (function() {
-            function init() {
-                fixTreeTopAndHeight();
-                $(window).on('resize', fixTreeTopAndHeight);
-                $(window).on('scroll', fixTreeTopAndHeight);
-                $('.note-tree-node>a[data-section-template-name]')
-                    .off('click.scroll-to-section')
-                    .on('click.scroll-to-section', function() {
-                         let section = $('div.note-section[data-section-template-name="' + $(this).attr('data-section-template-name') + '"]').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;
-                    });
-            }
-            function fixTreeTopAndHeight() {
-                let tree = $('#note-lhs-tree'), noteCardHeader = $('#note-card-header'),
-                    resultTop = (noteCardHeader.offset().top + noteCardHeader.outerHeight(true)) - $(window).scrollTop();
-                if(resultTop <= 55) {
-                    tree.addClass('fixed');
-                }
-                else {
-                    tree.removeClass('fixed');
-                    tree.css('height', 'calc(100vh - ' + resultTop + 'px)');
-                    tree.css('max-height', 'calc(100vh - ' + resultTop + 'px)');
-                }
-            }
-            addMCInitializer('note-tree', init, '#note-lhs-tree');
-        })();
-    </script>
-@endsection

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

@@ -685,15 +685,19 @@ use App\Models\Handout;
                              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>
+                                @if($patient->has_cm_setup_been_performed && $patient->cm_setup_note_id === $note->id)
+                                    A care-plan was created during this note. Please undo that before cancelling the note.
+                                @else
+                                    <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>
+                                @endif
                             </form>
                         </div>
                         @else
@@ -1068,15 +1072,20 @@ use App\Models\Handout;
                     </div>
                 </div>
 
+                {{--@if($patient->currentCareMonth())
+                <div class="row border-bottom mx-3 mt-2">
+                    @include('app.patient.rm-setup-form', ['careMonth' => $patient->currentCareMonth()])
+                </div>
+                @endif--}}
+
                 <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="p-3 screen-only h-100" data-non-segment-section="Remote Monitoring">
                             <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>
 
@@ -1718,7 +1727,8 @@ use App\Models\Handout;
                 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) {
+                let topMin = $('#patient-top-most-header').length ? 91 : 55;
+                if(resultTop <= topMin) {
                     @if(!$note->is_signed_by_hcp)
                     tree.addClass('fixed');
                     @else
@@ -1749,7 +1759,8 @@ use App\Models\Handout;
                 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) {
+                let topMin = $('#patient-top-most-header').length ? 91 : 55;
+                if(resultTop <= topMin) {
                     rhsSidebar.addClass('fixed');
                     rhsSidebar.closest('.note-container').addClass('rhs-sidebar-fixed');
                 }
@@ -1759,6 +1770,13 @@ use App\Models\Handout;
                     rhsSidebar.css('height', 'calc(100vh - ' + resultTop + 'px)');
                     rhsSidebar.css('max-height', 'calc(100vh - ' + resultTop + 'px)');
                 }
+
+                if($(window).scrollTop() > 0) {
+                    $('.sticky-note-header').addClass('sticky');
+                }
+                else {
+                    $('.sticky-note-header').removeClass('sticky');
+                }
             }
             addMCInitializer('rhs-sidebar', init, '#note-rhs-sidebar');
         })();

resources/views/app/patient/note/dashboard_script-bu-b4-oure-soap.blade.php

@@ -1,609 +0,0 @@
-<script>
-        (function() {
-
-            let numSectionsPendingInitialization = 0;
-
-            function init() {
-
-                // on note-section hover, highlight the according left-tree node(s)
-                $(document)
-                    .off('mouseenter', '.note-section')
-                    .on('mouseenter', '.note-section', function(){
-                        $('.note-tree-node').removeClass('hovered');
-                        let target = $('.note-tree-node a[data-segment-uid="' + $(this).attr('data-segment-uid') + '"]');
-                        target.parent().addClass('hovered');
-                        target.parent().parents('.note-tree-node').addClass('hovered');
-                        return false;
-                    });
-
-                $(document)
-                    .off('mouseenter', '[data-non-segment-section]')
-                    .on('mouseenter', '[data-non-segment-section]', function(){
-                        $('.note-tree-node').removeClass('hovered');
-                        let target = $('.note-tree-node a[data-non-segment-target="' + $(this).attr('data-non-segment-section') + '"]');
-                        target.parent().addClass('hovered');
-                        target.parent().parents('.note-tree-node').addClass('hovered');
-                        return false;
-                    });
-
-                $(document)
-                    .off('mouseleave', '.note-section')
-                    .on('mouseleave', '.note-section', () => {
-                        $('.note-tree-node').removeClass('hovered');
-                        return false;
-                    });
-
-                // print note
-                $(document)
-                    .off('click.print', '.print-note')
-                    .on('click.print', '.print-note', () => {
-                        window.print();
-                        return false;
-                    });
-                $('.print-note').removeClass('invisible');
-
-                $('.note-method-select').change(function() {
-                    let form = $(this).closest('form');
-                    if(this.value === 'IN_CLINIC') {
-                        form.find('.if-in-clinic').show();
-                    }
-                    else {
-                        form.find('.if-in-clinic').hide();
-                    }
-                });
-
-                $('.note-method-select').each(function() {
-                    let form = $(this).closest('form');
-                    if(this.value === 'IN_CLINIC') {
-                        form.find('.if-in-clinic').show();
-                    }
-                    else {
-                        form.find('.if-in-clinic').hide();
-                    }
-                });
-
-                $('textarea[rte]').each(function() {
-
-                    $(this).wrap(
-                        $('<div class="border-left border-right rte-holder"/>')
-                            .attr('data-shortcuts', '')
-                    );
-
-                    // give a unique id to this editor instance
-                    var editorID = Math.ceil(Math.random() * 99999),
-                        fieldName = this.name;
-
-                    var ti = $('<input type="hidden" />')
-                        .val(this.value)
-                        .attr('name', this.name)
-                        .insertBefore(this);
-                    var ce = $('<div data-editor-id="' + editorID + '" data-field="' + this.name + '"/>')
-                        .html(this.value)
-                        .insertBefore(this);
-                    $(this).remove();
-
-                    var qe = new Quill('[data-editor-id="' + editorID + '"]', {
-                        theme: 'snow',
-                        modules: stagQuillConfig
-                    });
-                    var toolbar = $(qe.container).prev('.ql-toolbar');
-
-                    // add button for new shortcut
-                    var newSCButton = $('<button class="btn bg-white btn-sm btn-default text-primary w-auto px-2 border py-0 ' +
-                        'text-sm add-shortcut" data-editor-id="' + editorID + '">+ Shortcut</button>');
-                    toolbar.append(newSCButton);
-
-                    qe.on('text-change', function() {
-                        ti.val(qe.root.innerHTML);
-                    });
-
-                    $(qe.container)
-                        .find('.ql-editor[contenteditable]')
-                            .attr('data-field', fieldName)
-                            .attr('data-editor-id', editorID)
-                            .attr('with-shortcuts', 1);
-
-                });
-
-                $(document)
-                    .off('click.edit-trigger', '.edit-trigger:not(.edit)')
-                    .on('click.edit-trigger', '.edit-trigger:not(.edit)', function() {
-
-                        if($('.note-section>.stag-popup:visible').length) return;
-
-                        let editParent = $(this).closest('.note-section');
-
-                        // TEMP: disable edit mode for medrisk_vigilance
-                        // TODO: do this in the proper place
-                        if(editParent.is('[data-segment-template-name="medrisk_vigilence"]')) return false;
-
-                        // TEMP: show wizard for allergies, rx, dx, goals
-                        if(editParent.is('[data-segment-template-name="plan_allergies"]') ||
-                            editParent.is('[data-segment-template-name="intake_allergies"]')) {
-                            $('.note-bottom-toolbar .allergies-center-trigger').trigger('click');
-                            return false;
-                        }
-                        else if(editParent.is('[data-segment-template-name="plan_problems"]') ||
-                            editParent.is('[data-segment-template-name="intake_problems"]')) {
-                            $('.note-bottom-toolbar .problems-center-trigger').trigger('click');
-                            return false;
-                        }
-                        else if(editParent.is('[data-segment-template-name="plan_medications"]') ||
-                            editParent.is('[data-segment-template-name="intake_medications"]')) {
-                            $('.note-bottom-toolbar .medications-center-trigger').trigger('click');
-                            return false;
-                        }
-                        else if(editParent.is('[data-segment-template-name="plan_goals"]') ||
-                            editParent.is('[data-segment-template-name="intake_goals"]')) {
-                            $('.note-bottom-toolbar .goals-center-trigger').trigger('click');
-                            return false;
-                        }
-                        else if(editParent.is('[data-segment-template-name="plan_care_team"]') ||
-                            editParent.is('[data-segment-template-name="intake_care_team"]')) {
-                            $('.note-bottom-toolbar .careteam-center-trigger').trigger('click');
-                            return false;
-                        }
-                        else if(editParent.is('[data-segment-template-name="plan_supplements"]') ||
-                            editParent.is('[data-segment-template-name="intake_supplements"]')) {
-                            $('.note-bottom-toolbar .supplements-center-trigger').trigger('click');
-                            return false;
-                        }
-
-                        // TEMP: open in popup if LS segment
-                        if(editParent.is('[data-segment-template-name^="lifestyle_"]')) {
-                            showStagPopup('segment-popup-' + editParent.attr('data-segment-template-name'), true);
-                            return false;
-                        }
-
-                        if(editParent.is('[data-segment-template-name="plan_nutrition"]') ||
-                            editParent.is('[data-segment-template-name="intake_nutrition"]')) {
-                            openDynamicStagPopup('/nutrition-center/{{$note->client->uid}}/{{$note->uid}}',
-                                'nutrition-center-{{$note->id}}',
-                                '<img src="/img/nutrition-rx.png" class=""/> Nutrition Rx',
-                                false,
-                                "overflow-visible");
-                            return false;
-                        }
-
-                        if(editParent.is('[data-segment-template-name="plan_exercise"]') ||
-                            editParent.is('[data-segment-template-name="intake_exercise"]')) {
-                            openDynamicStagPopup('/exercise-center/{{$note->client->uid}}/{{$note->uid}}',
-                                'exercise-center-{{$note->id}}',
-                                '<img src="/img/exercise-rx.png" class=""/> Exercise Rx',
-                                false,
-                                "overflow-visible");
-                            return false;
-                        }
-
-                        if(editParent.is('[data-segment-template-name="plan_behavior"]') ||
-                            editParent.is('[data-segment-template-name="intake_behavior"]')) {
-                            openDynamicStagPopup('/behavior-center/{{$note->client->uid}}/{{$note->uid}}',
-                                'behavior-center-{{$note->id}}',
-                                '<img src="/img/behavior-rx.png" class=""/> Behavior Rx',
-                                false,
-                                "overflow-visible");
-                            return false;
-                        }
-
-                        <?php
-                        $rosSegment = $note->getSegmentByInternalName('ros');
-                        ?>
-                        @if($rosSegment)
-                        if(editParent.is('[data-segment-template-name="ros"]')) {
-                            openDynamicStagPopup('/note-segment-view/{{$note->client->uid}}/{{$note->uid}}/{{$rosSegment->uid}}/ros/edit',
-                                'init-ros-{{$note->id}}',
-                                'Review of Systems',
-                                false,
-                                "overflow-visible");
-                            return false;
-                        }
-                        @endif
-
-                        // OPEN popup for if note-segment-view exists
-                        if($('.' + editParent.attr('data-segment-template-name') + '-trigger').length) {
-                            $('.' + editParent.attr('data-segment-template-name') + '-trigger').trigger('click');
-                            return false;
-                        }
-
-                        if(editParent.is('.edit')) {
-                            editParent.removeClass('edit');
-                        }
-                        else {
-                            let docRoot = $('html');
-                            let prevEffectiveTop = editParent.offset().top - docRoot.scrollTop();
-                            $('.note-section.edit').removeClass('edit');
-                            editParent.addClass('edit');
-                            let newEffectiveTop = editParent.offset().top - docRoot.scrollTop();
-                            if(newEffectiveTop < prevEffectiveTop) {
-                                docRoot.scrollTop(docRoot.scrollTop() - (prevEffectiveTop - newEffectiveTop));
-                            }
-                        }
-
-                        let visitTreeLink = $('.note-tree-node a[data-segment-internal-name="' + editParent.attr('data-segment-template-name') + '"]');
-                        if(visitTreeLink.length) {
-                            $('.note-tree-node.active').removeClass('active');
-                            visitTreeLink.closest('.note-tree-node').addClass('active');
-                        }
-
-                        return false;
-                    });
-
-                $('.note-templates-trigger')
-                    .off('click.note-templates-trigger')
-                    .on('click.note-templates-trigger', function() {
-                        $('.note-templates-underlay').show();
-                        let container = $(this).closest('.note-section').find('.note-template-container');
-                        container.find('.note-template-children').hide();
-                        container.find('.note-template-item.selected').removeClass('selected');
-                        container.find('.note-template-item[prefix]').removeAttr('prefix');
-                        container.find('input[type="checkbox"]').prop('checked', false);
-                        container.find('.note-template-output-text').empty();
-                        container.show();
-                        loadTemplateSet(container.find('.note-template-set-chooser'));
-                        loadExamTemplateSet(container.find('.note-exam-template-set-chooser'),
-                            container.find('.note-exam-exam-chooser').val(),
-                            container.find('.note-exam-template-set-chooser').val());
-                        return false;
-                    });
-
-                $(document)
-                    .off('click.note-templates-trigger-assessment', '.note-templates-trigger-assessment')
-                    .on('click.note-templates-trigger-assessment', '.note-templates-trigger-assessment', function() {
-                        $('.note-templates-underlay').show();
-                        let container = $(this).closest('.note-section').find('.note-template-container');
-                        container.find('.note-template-children').hide();
-                        container.find('.note-template-item.selected').removeClass('selected');
-                        container.find('.note-template-item[prefix]').removeAttr('prefix');
-                        container.find('input[type="checkbox"]').prop('checked', false);
-                        container.find('.note-template-output-text').empty();
-                        container.attr('data-editor-id', $(this).attr('data-editor-id'));
-                        container.show();
-                        container.css({
-                            left: ($(this).position().left - 140) + 'px',
-                            top: ($(this).position().top + 22) + 'px',
-                        });
-                        loadTemplateSet(container.find('.note-template-set-chooser'));
-                        loadExamTemplateSet(container.find('.note-exam-template-set-chooser'),
-                            container.find('.note-exam-exam-chooser').val(),
-                            container.find('.note-exam-template-set-chooser').val());
-                        return false;
-                    });
-
-                $(document)
-                    .off('click.note-templates-underlay', '.note-templates-underlay, .note-template-close-trigger')
-                    .on('click.note-templates-underlay', '.note-templates-underlay, .note-template-close-trigger', function() {
-                        $('.note-templates-underlay').hide();
-                         $('.note-template-container').hide();
-                    });
-
-                $(document)
-                    .off('click.note-template-label', '.note-template-item .label')
-                    .on('click.note-template-label', '.note-template-item .label', function() {
-                        let item = $(this).closest('.note-template-item');
-                        let isChecked = $(this).find('>input[type="checkbox"]').prop('checked');
-                        let hasChildren = !!item.find('>.note-template-children').length,
-                            childrenShown = item.find('>.note-template-children:visible').length;
-
-                        if(isChecked && hasChildren && !childrenShown) { // just show
-                            $('.note-template-children').hide();
-                            $(this).parents('.note-template-children').show();
-                            item.find('>.note-template-children').show()
-                                .find('>textarea,>input[type="number"],>input[type="date"]').first().focus();
-                            return false;
-                        }
-
-                        $(this).find('>input[type="checkbox"]').prop('checked', !isChecked);
-                        isChecked = !isChecked;
-                        if(isChecked) {
-                            item.addClass('selected');
-                        }
-                        else {
-                            item.removeClass('selected');
-                        }
-                        $('.note-template-children').hide();
-                        $(this).parents('.note-template-children').show();
-                        if(isChecked) {
-                            item.find('>.note-template-children')
-                                .show()
-                                .find('>textarea,>input[type="number"],>input[type="date"]')
-                                .first().focus();
-                        }
-
-                        generateTemplateOutput();
-
-                        return false;
-                    });
-
-                $(document)
-                    .off('mousedown.note-templates-apply', '.note-template-apply-trigger')
-                    .on('mousedown.note-templates-apply', '.note-template-apply-trigger', function() {
-                        let templateContainer = $('.note-template-container:visible').first();
-                        let result = $('.note-template-output-text:visible').first().html();
-                        $('.note-templates-underlay').hide();
-                        $('.note-template-container').hide();
-                        let editor = null;
-                        if($(this).closest('.assessment-detail-template').length) {
-                            editor  = $('.ql-editor[data-editor-id="' + templateContainer.attr('data-editor-id') + '"]:visible').first();
-                        }
-                        else {
-                            editor  = $('.ql-editor[contenteditable]:visible').first();
-                        }
-                        if(editor && editor.length) {
-                            result = $.trim(editor.text() !== '' ? editor.html() : '') + result;
-                            editor.html(result).focus();
-                        }
-                        return false;
-                    });
-
-                $(document)
-                    .off('input paste change', '.note-template-item textarea, .note-template-item input[type="number"], .note-template-item input[type="date"]')
-                    .on('input paste change', '.note-template-item textarea, .note-template-item input[type="number"], .note-template-item input[type="date"]', function() {
-                        generateTemplateOutput();
-                    });
-
-                $(document)
-                    .off('click.plus-trigger', '.note-template-item .plus-trigger')
-                    .on('click.plus-trigger', '.note-template-item .plus-trigger', function() {
-                        let item = $(this).closest('.note-template-item');
-                        if(item.attr('prefix') === '(+)') {
-                            item.removeAttr('prefix');
-                            item.find('>.note-template-text>.label>input[type="checkbox"]').prop('checked', false);
-                            item.removeClass('selected');
-                        }
-                        else {
-                            item.attr('prefix', '(+)');
-                            item.find('>.note-template-text>.label>input[type="checkbox"]').prop('checked', true);
-                            item.addClass('selected');
-                        }
-                        generateTemplateOutput();
-                        return false;
-                    });
-
-                $(document)
-                    .off('click.minus-trigger', '.note-template-item .minus-trigger')
-                    .on('click.minus-trigger', '.note-template-item .minus-trigger', function() {
-                        let item = $(this).closest('.note-template-item');
-                        if(item.attr('prefix') === '(-)') {
-                            item.removeAttr('prefix');
-                            item.find('>.note-template-text>.label>input[type="checkbox"]').prop('checked', false);
-                            item.removeClass('selected');
-                        }
-                        else {
-                            item.attr('prefix', '(-)');
-                            item.find('>.note-template-text>.label>input[type="checkbox"]').prop('checked', true);
-                            item.addClass('selected');
-                        }
-                        generateTemplateOutput();
-                        return false;
-                    });
-
-                $(document)
-                    .off('change.note-template-set-chooser', '.note-template-set-chooser')
-                    .on('change.note-template-set-chooser', '.note-template-set-chooser', function() {
-                        return loadTemplateSet($(this));
-                    });
-
-                $(document)
-                    .off('change.note-exam-template-set-chooser', '.note-exam-template-set-chooser')
-                    .on('change.note-exam-template-set-chooser', '.note-exam-template-set-chooser', function() {
-                        $(this).closest('.note-template-container')
-                            .find('.note-exam-exam-chooser')
-                                .val($(this).find('option:selected').attr('exam'));
-                        return loadExamTemplateSet($(this),
-                            $(this).closest('.note-template-container').find('.note-exam-exam-chooser').first().val(),
-                            $(this).val());
-                    });
-
-                $(document)
-                    .off('change.note-exam-exam-chooser', '.note-exam-exam-chooser')
-                    .on('change.note-exam-exam-chooser', '.note-exam-exam-chooser', function() {
-                        return loadExamTemplateSet($(this),
-                            $(this).val(),
-                            $(this).closest('.note-template-container').find('.note-exam-template-set-chooser').first().val());
-                    });
-
-                $('.remove-section-trigger').click(function() {
-                    $.post('/api/section/deactivate', {
-                        uid: $(this).attr('data-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');
-                    // $(this).closest('.note-section').removeClass('edit');
-                    return false;
-                });
-
-                @if(!$note->visitTemplate)
-                $(document)
-                    .off('mousedown.enable-edit', '.note-section:not(.edit):not(.page-driven)')
-                    .on('mousedown.enable-edit', '.note-section:not(.edit):not(.page-driven)', function(e) {
-                        if($(this).closest('.note-signed-by-hcp').length) return;
-                        e.stopPropagation();
-                        e.preventDefault();
-                        $(this).find('.edit-trigger').first().click();
-                        return false;
-                    });
-                @endif
-
-                $(document)
-                    .off('keydown.collapse-active-segment')
-                    .on('keydown.collapse-active-segment', function(e) {
-                        if(e.which === 27) {
-                            if(!isEventConsumed(e)) {
-                                if($('.visit-segment.edit').length) {
-                                    $('.visit-segment.edit').first().find('.edit-trigger').first().click();
-                                    markEventAsConsumed(e);
-                                    return false;
-                                }
-                            }
-                            else {
-                                // event already consumed!
-                            }
-                        }
-                    });
-
-                scrollToLatest();
-
-                function __moveSection(_uid, _direction) {
-                    $.post('/api/section/move' + _direction, {
-                        uid: _uid
-                    }, function(_data) {
-                        if(_data && _data.success) {
-                            fastReload();
-                        }
-                        else {
-                            if(_data) {
-                                toastr.error(_data.message);
-                            }
-                            else {
-                                toastr.error('Unknown error while moving section');
-                            }
-                        }
-                    }, 'json')
-                }
-
-                $('.move-up-trigger').click(function() {
-                    __moveSection($(this).attr('data-uid'), 'Up');
-                });
-
-                $('.move-down-trigger').click(function() {
-                    __moveSection($(this).attr('data-uid'), 'Down');
-                });
-
-                // refresh once ticket popup is closed
-                /*$('body').off('stag-popup-closed')
-                $('body').on('stag-popup-closed', function() {
-                    if($('#note-single-header').length) {
-                        fastReload();
-                    }
-                });*/
-                // ticket-popup
-                $(document)
-                    .off('click', '.ticket-popup-trigger.note-dashboard-action')
-                    .on('click', '.ticket-popup-trigger.note-dashboard-action', function() {
-                        showMask();
-                        window.noMc = true;
-                        $.get(this.href, (_data) => {
-
-                            if(!$('.ticket-popup').length) {
-                                $('main.stag-content').append('<div class="stag-popup stag-popup-lg ticket-popup mcp-theme-1" stag-popup-key="ticket-popup"></div>');
-                            }
-
-                            $('.ticket-popup').html(_data);
-                            showStagPopup('ticket-popup', true);
-                            $('.ticket-popup .stag-popup.stag-slide').attr('close-all-with-self', 1);
-                            runMCInitializer('patient-tickets'); // run specific mc initer
-                            hideMask();
-                        });
-                        return false;
-                    });
-
-            }
-
-            // scroll to latest created section
-            function scrollToLatest() {
-                window.setTimeout(function() {
-                    let latestSectionTS = $('.latest-section-ts');
-                    if(latestSectionTS.length) {
-                        let latestSection = $('.note-section[data-ts="' + latestSectionTS.text() + '"]');
-                        if(latestSection.length) {
-                            latestSection[0].scrollIntoView({behavior: "smooth", block: "center"});
-                            // latestSection.find('.edit-trigger').first().click();
-                            console.log('DONE!');
-                        }
-                    }
-                }, 100);
-            }
-
-            function loadTemplateSet(_chooser) {
-                if(!_chooser.length || !_chooser.val()) return false;
-                let container = _chooser.closest('.note-template-container');
-                container.find('>.note-template-item').remove();
-                container.find('.please-wait').remove();
-                container.append('<p class="please-wait my-2 text-secondary text-center">Please wait ...</p>');
-                $.get('/note-template-set/' + _chooser.attr('data-section') + '/' + _chooser.val(), function(_html) {
-                    container.find('.please-wait').remove();
-                    container.append(_html);
-                });
-                return false;
-            }
-
-            function loadExamTemplateSet(_chooser, _exam, _templateSet) {
-                if(!_chooser.length || !_chooser.val()) return false;
-                let container = _chooser.closest('.note-template-container');
-                container.find('>.note-template-item').remove();
-                container.find('.please-wait').remove();
-                container.append('<p class="please-wait my-2 text-secondary text-center">Please wait ...</p>');
-                $.get('/note-template-set/exam/' + _exam + '/' + _templateSet, function(_html) {
-                    container.find('.please-wait').remove();
-                    container.append(_html);
-                });
-                return false;
-            }
-
-            function generateOutputForNode(_node) {
-                let template = (_node.attr('prefix') ? _node.attr('prefix') : '') + _node.attr('template'),
-                    value = template;
-                let hasChildText = !!_node.find('>.note-template-children>textarea,>.note-template-children>input[type="number"],>.note-template-children>input[type="date"]').length;
-                let hasChildren = !!_node.find('>.note-template-children>.note-template-item').length;
-                if(hasChildText) {
-                    value = value.replace('{text}',
-                        _node
-                            .find('>.note-template-children')
-                                .find('>textarea,>input[type="number"],>input[type="date"]').first().val());
-                }
-                else if(hasChildren) {
-                    let values = [];
-                    _node.find('>.note-template-children>.note-template-item.selected').each(function() {
-                        values.push(generateOutputForNode($(this)));
-                    });
-                    let combined = '';
-                    for (let i = 0; i < values.length; i++) {
-                        combined += values[i];
-                        if(values.length > 1 && i <= values.length - 2) {
-                            if(i === values.length - 2) {
-                                combined += ' and ';
-                            }
-                            else {
-                                combined += ', ';
-                            }
-                        }
-                    }
-                    value = value.replace('{children}', ' ' + combined).replace('{text}', ' ' + combined);
-                }
-                return value;
-            }
-
-            function generateTemplateOutput() {
-                let container = $('.note-template-container:visible').first();
-                if(!container.length) return '';
-                let lines = [];
-                if(container.find('.note-template-set-chooser').length) {
-                    lines.push('<b>' + container.find('.note-template-set-chooser').first().find('option:selected').text() + '</b>');
-                }
-                else if(container.find('.note-exam-template-set-chooser').length && container.find('.note-exam-exam-chooser').length) {
-                    lines.push('<b>' +
-                        container.find('.note-exam-template-set-chooser').first().find('option:selected').text() +
-                        ': ' +
-                        container.find('.note-exam-exam-chooser').first().find('option:selected').text() +
-                        '</b>');
-                }
-                container.find('>.note-template-item.selected').each(function() {
-                    lines.push('<p class="note-template-output-line">' + generateOutputForNode($(this)) + '</p>');
-                });
-                $('.note-template-output-text:visible').first().html(lines.join(''));
-            }
-
-            addMCInitializer('note-single', init, '#note-single-header');
-        })();
-    </script>

resources/views/app/patient/note/dashboard_script-bu-b4-pure-soap.blade.php

@@ -1,609 +0,0 @@
-<script>
-        (function() {
-
-            let numSectionsPendingInitialization = 0;
-
-            function init() {
-
-                // on note-section hover, highlight the according left-tree node(s)
-                $(document)
-                    .off('mouseenter', '.note-section')
-                    .on('mouseenter', '.note-section', function(){
-                        $('.note-tree-node').removeClass('hovered');
-                        let target = $('.note-tree-node a[data-segment-uid="' + $(this).attr('data-segment-uid') + '"]');
-                        target.parent().addClass('hovered');
-                        target.parent().parents('.note-tree-node').addClass('hovered');
-                        return false;
-                    });
-
-                $(document)
-                    .off('mouseenter', '[data-non-segment-section]')
-                    .on('mouseenter', '[data-non-segment-section]', function(){
-                        $('.note-tree-node').removeClass('hovered');
-                        let target = $('.note-tree-node a[data-non-segment-target="' + $(this).attr('data-non-segment-section') + '"]');
-                        target.parent().addClass('hovered');
-                        target.parent().parents('.note-tree-node').addClass('hovered');
-                        return false;
-                    });
-
-                $(document)
-                    .off('mouseleave', '.note-section')
-                    .on('mouseleave', '.note-section', () => {
-                        $('.note-tree-node').removeClass('hovered');
-                        return false;
-                    });
-
-                // print note
-                $(document)
-                    .off('click.print', '.print-note')
-                    .on('click.print', '.print-note', () => {
-                        window.print();
-                        return false;
-                    });
-                $('.print-note').removeClass('invisible');
-
-                $('.note-method-select').change(function() {
-                    let form = $(this).closest('form');
-                    if(this.value === 'IN_CLINIC') {
-                        form.find('.if-in-clinic').show();
-                    }
-                    else {
-                        form.find('.if-in-clinic').hide();
-                    }
-                });
-
-                $('.note-method-select').each(function() {
-                    let form = $(this).closest('form');
-                    if(this.value === 'IN_CLINIC') {
-                        form.find('.if-in-clinic').show();
-                    }
-                    else {
-                        form.find('.if-in-clinic').hide();
-                    }
-                });
-
-                $('textarea[rte]').each(function() {
-
-                    $(this).wrap(
-                        $('<div class="border-left border-right rte-holder"/>')
-                            .attr('data-shortcuts', '')
-                    );
-
-                    // give a unique id to this editor instance
-                    var editorID = Math.ceil(Math.random() * 99999),
-                        fieldName = this.name;
-
-                    var ti = $('<input type="hidden" />')
-                        .val(this.value)
-                        .attr('name', this.name)
-                        .insertBefore(this);
-                    var ce = $('<div data-editor-id="' + editorID + '" data-field="' + this.name + '"/>')
-                        .html(this.value)
-                        .insertBefore(this);
-                    $(this).remove();
-
-                    var qe = new Quill('[data-editor-id="' + editorID + '"]', {
-                        theme: 'snow',
-                        modules: stagQuillConfig
-                    });
-                    var toolbar = $(qe.container).prev('.ql-toolbar');
-
-                    // add button for new shortcut
-                    var newSCButton = $('<button class="btn bg-white btn-sm btn-default text-primary w-auto px-2 border py-0 ' +
-                        'text-sm add-shortcut" data-editor-id="' + editorID + '">+ Shortcut</button>');
-                    toolbar.append(newSCButton);
-
-                    qe.on('text-change', function() {
-                        ti.val(qe.root.innerHTML);
-                    });
-
-                    $(qe.container)
-                        .find('.ql-editor[contenteditable]')
-                            .attr('data-field', fieldName)
-                            .attr('data-editor-id', editorID)
-                            .attr('with-shortcuts', 1);
-
-                });
-
-                $(document)
-                    .off('click.edit-trigger', '.edit-trigger:not(.edit)')
-                    .on('click.edit-trigger', '.edit-trigger:not(.edit)', function() {
-
-                        if($('.note-section>.stag-popup:visible').length) return;
-
-                        let editParent = $(this).closest('.note-section');
-
-                        // TEMP: disable edit mode for medrisk_vigilance
-                        // TODO: do this in the proper place
-                        if(editParent.is('[data-segment-template-name="medrisk_vigilence"]')) return false;
-
-                        // TEMP: show wizard for allergies, rx, dx, goals
-                        if(editParent.is('[data-segment-template-name="plan_allergies"]') ||
-                            editParent.is('[data-segment-template-name="intake_allergies"]')) {
-                            $('.note-bottom-toolbar .allergies-center-trigger').trigger('click');
-                            return false;
-                        }
-                        else if(editParent.is('[data-segment-template-name="plan_problems"]') ||
-                            editParent.is('[data-segment-template-name="intake_problems"]')) {
-                            $('.note-bottom-toolbar .problems-center-trigger').trigger('click');
-                            return false;
-                        }
-                        else if(editParent.is('[data-segment-template-name="plan_medications"]') ||
-                            editParent.is('[data-segment-template-name="intake_medications"]')) {
-                            $('.note-bottom-toolbar .medications-center-trigger').trigger('click');
-                            return false;
-                        }
-                        else if(editParent.is('[data-segment-template-name="plan_goals"]') ||
-                            editParent.is('[data-segment-template-name="intake_goals"]')) {
-                            $('.note-bottom-toolbar .goals-center-trigger').trigger('click');
-                            return false;
-                        }
-                        else if(editParent.is('[data-segment-template-name="plan_care_team"]') ||
-                            editParent.is('[data-segment-template-name="intake_care_team"]')) {
-                            $('.note-bottom-toolbar .careteam-center-trigger').trigger('click');
-                            return false;
-                        }
-                        else if(editParent.is('[data-segment-template-name="plan_supplements"]') ||
-                            editParent.is('[data-segment-template-name="intake_supplements"]')) {
-                            $('.note-bottom-toolbar .supplements-center-trigger').trigger('click');
-                            return false;
-                        }
-
-                        // TEMP: open in popup if LS segment
-                        if(editParent.is('[data-segment-template-name^="lifestyle_"]')) {
-                            showStagPopup('segment-popup-' + editParent.attr('data-segment-template-name'), true);
-                            return false;
-                        }
-
-                        if(editParent.is('[data-segment-template-name="plan_nutrition"]') ||
-                            editParent.is('[data-segment-template-name="intake_nutrition"]')) {
-                            openDynamicStagPopup('/nutrition-center/{{$note->client->uid}}/{{$note->uid}}',
-                                'nutrition-center-{{$note->id}}',
-                                '<img src="/img/nutrition-rx.png" class=""/> Nutrition Rx',
-                                false,
-                                "overflow-visible");
-                            return false;
-                        }
-
-                        if(editParent.is('[data-segment-template-name="plan_exercise"]') ||
-                            editParent.is('[data-segment-template-name="intake_exercise"]')) {
-                            openDynamicStagPopup('/exercise-center/{{$note->client->uid}}/{{$note->uid}}',
-                                'exercise-center-{{$note->id}}',
-                                '<img src="/img/exercise-rx.png" class=""/> Exercise Rx',
-                                false,
-                                "overflow-visible");
-                            return false;
-                        }
-
-                        if(editParent.is('[data-segment-template-name="plan_behavior"]') ||
-                            editParent.is('[data-segment-template-name="intake_behavior"]')) {
-                            openDynamicStagPopup('/behavior-center/{{$note->client->uid}}/{{$note->uid}}',
-                                'behavior-center-{{$note->id}}',
-                                '<img src="/img/behavior-rx.png" class=""/> Behavior Rx',
-                                false,
-                                "overflow-visible");
-                            return false;
-                        }
-
-                        <?php
-                        $rosSegment = $note->getSegmentByInternalName('ros');
-                        ?>
-                        @if($rosSegment)
-                        if(editParent.is('[data-segment-template-name="ros"]')) {
-                            openDynamicStagPopup('/note-segment-view/{{$note->client->uid}}/{{$note->uid}}/{{$rosSegment->uid}}/ros/edit',
-                                'init-ros-{{$note->id}}',
-                                'Review of Systems',
-                                false,
-                                "overflow-visible");
-                            return false;
-                        }
-                        @endif
-
-                        // OPEN popup for if note-segment-view exists
-                        if($('.' + editParent.attr('data-segment-template-name') + '-trigger').length) {
-                            $('.' + editParent.attr('data-segment-template-name') + '-trigger').trigger('click');
-                            return false;
-                        }
-
-                        if(editParent.is('.edit')) {
-                            editParent.removeClass('edit');
-                        }
-                        else {
-                            let docRoot = $('html');
-                            let prevEffectiveTop = editParent.offset().top - docRoot.scrollTop();
-                            $('.note-section.edit').removeClass('edit');
-                            editParent.addClass('edit');
-                            let newEffectiveTop = editParent.offset().top - docRoot.scrollTop();
-                            if(newEffectiveTop < prevEffectiveTop) {
-                                docRoot.scrollTop(docRoot.scrollTop() - (prevEffectiveTop - newEffectiveTop));
-                            }
-                        }
-
-                        let visitTreeLink = $('.note-tree-node a[data-segment-internal-name="' + editParent.attr('data-segment-template-name') + '"]');
-                        if(visitTreeLink.length) {
-                            $('.note-tree-node.active').removeClass('active');
-                            visitTreeLink.closest('.note-tree-node').addClass('active');
-                        }
-
-                        return false;
-                    });
-
-                $('.note-templates-trigger')
-                    .off('click.note-templates-trigger')
-                    .on('click.note-templates-trigger', function() {
-                        $('.note-templates-underlay').show();
-                        let container = $(this).closest('.note-section').find('.note-template-container');
-                        container.find('.note-template-children').hide();
-                        container.find('.note-template-item.selected').removeClass('selected');
-                        container.find('.note-template-item[prefix]').removeAttr('prefix');
-                        container.find('input[type="checkbox"]').prop('checked', false);
-                        container.find('.note-template-output-text').empty();
-                        container.show();
-                        loadTemplateSet(container.find('.note-template-set-chooser'));
-                        loadExamTemplateSet(container.find('.note-exam-template-set-chooser'),
-                            container.find('.note-exam-exam-chooser').val(),
-                            container.find('.note-exam-template-set-chooser').val());
-                        return false;
-                    });
-
-                $(document)
-                    .off('click.note-templates-trigger-assessment', '.note-templates-trigger-assessment')
-                    .on('click.note-templates-trigger-assessment', '.note-templates-trigger-assessment', function() {
-                        $('.note-templates-underlay').show();
-                        let container = $(this).closest('.note-section').find('.note-template-container');
-                        container.find('.note-template-children').hide();
-                        container.find('.note-template-item.selected').removeClass('selected');
-                        container.find('.note-template-item[prefix]').removeAttr('prefix');
-                        container.find('input[type="checkbox"]').prop('checked', false);
-                        container.find('.note-template-output-text').empty();
-                        container.attr('data-editor-id', $(this).attr('data-editor-id'));
-                        container.show();
-                        container.css({
-                            left: ($(this).position().left - 140) + 'px',
-                            top: ($(this).position().top + 22) + 'px',
-                        });
-                        loadTemplateSet(container.find('.note-template-set-chooser'));
-                        loadExamTemplateSet(container.find('.note-exam-template-set-chooser'),
-                            container.find('.note-exam-exam-chooser').val(),
-                            container.find('.note-exam-template-set-chooser').val());
-                        return false;
-                    });
-
-                $(document)
-                    .off('click.note-templates-underlay', '.note-templates-underlay, .note-template-close-trigger')
-                    .on('click.note-templates-underlay', '.note-templates-underlay, .note-template-close-trigger', function() {
-                        $('.note-templates-underlay').hide();
-                         $('.note-template-container').hide();
-                    });
-
-                $(document)
-                    .off('click.note-template-label', '.note-template-item .label')
-                    .on('click.note-template-label', '.note-template-item .label', function() {
-                        let item = $(this).closest('.note-template-item');
-                        let isChecked = $(this).find('>input[type="checkbox"]').prop('checked');
-                        let hasChildren = !!item.find('>.note-template-children').length,
-                            childrenShown = item.find('>.note-template-children:visible').length;
-
-                        if(isChecked && hasChildren && !childrenShown) { // just show
-                            $('.note-template-children').hide();
-                            $(this).parents('.note-template-children').show();
-                            item.find('>.note-template-children').show()
-                                .find('>textarea,>input[type="number"],>input[type="date"]').first().focus();
-                            return false;
-                        }
-
-                        $(this).find('>input[type="checkbox"]').prop('checked', !isChecked);
-                        isChecked = !isChecked;
-                        if(isChecked) {
-                            item.addClass('selected');
-                        }
-                        else {
-                            item.removeClass('selected');
-                        }
-                        $('.note-template-children').hide();
-                        $(this).parents('.note-template-children').show();
-                        if(isChecked) {
-                            item.find('>.note-template-children')
-                                .show()
-                                .find('>textarea,>input[type="number"],>input[type="date"]')
-                                .first().focus();
-                        }
-
-                        generateTemplateOutput();
-
-                        return false;
-                    });
-
-                $(document)
-                    .off('mousedown.note-templates-apply', '.note-template-apply-trigger')
-                    .on('mousedown.note-templates-apply', '.note-template-apply-trigger', function() {
-                        let templateContainer = $('.note-template-container:visible').first();
-                        let result = $('.note-template-output-text:visible').first().html();
-                        $('.note-templates-underlay').hide();
-                        $('.note-template-container').hide();
-                        let editor = null;
-                        if($(this).closest('.assessment-detail-template').length) {
-                            editor  = $('.ql-editor[data-editor-id="' + templateContainer.attr('data-editor-id') + '"]:visible').first();
-                        }
-                        else {
-                            editor  = $('.ql-editor[contenteditable]:visible').first();
-                        }
-                        if(editor && editor.length) {
-                            result = $.trim(editor.text() !== '' ? editor.html() : '') + result;
-                            editor.html(result).focus();
-                        }
-                        return false;
-                    });
-
-                $(document)
-                    .off('input paste change', '.note-template-item textarea, .note-template-item input[type="number"], .note-template-item input[type="date"]')
-                    .on('input paste change', '.note-template-item textarea, .note-template-item input[type="number"], .note-template-item input[type="date"]', function() {
-                        generateTemplateOutput();
-                    });
-
-                $(document)
-                    .off('click.plus-trigger', '.note-template-item .plus-trigger')
-                    .on('click.plus-trigger', '.note-template-item .plus-trigger', function() {
-                        let item = $(this).closest('.note-template-item');
-                        if(item.attr('prefix') === '(+)') {
-                            item.removeAttr('prefix');
-                            item.find('>.note-template-text>.label>input[type="checkbox"]').prop('checked', false);
-                            item.removeClass('selected');
-                        }
-                        else {
-                            item.attr('prefix', '(+)');
-                            item.find('>.note-template-text>.label>input[type="checkbox"]').prop('checked', true);
-                            item.addClass('selected');
-                        }
-                        generateTemplateOutput();
-                        return false;
-                    });
-
-                $(document)
-                    .off('click.minus-trigger', '.note-template-item .minus-trigger')
-                    .on('click.minus-trigger', '.note-template-item .minus-trigger', function() {
-                        let item = $(this).closest('.note-template-item');
-                        if(item.attr('prefix') === '(-)') {
-                            item.removeAttr('prefix');
-                            item.find('>.note-template-text>.label>input[type="checkbox"]').prop('checked', false);
-                            item.removeClass('selected');
-                        }
-                        else {
-                            item.attr('prefix', '(-)');
-                            item.find('>.note-template-text>.label>input[type="checkbox"]').prop('checked', true);
-                            item.addClass('selected');
-                        }
-                        generateTemplateOutput();
-                        return false;
-                    });
-
-                $(document)
-                    .off('change.note-template-set-chooser', '.note-template-set-chooser')
-                    .on('change.note-template-set-chooser', '.note-template-set-chooser', function() {
-                        return loadTemplateSet($(this));
-                    });
-
-                $(document)
-                    .off('change.note-exam-template-set-chooser', '.note-exam-template-set-chooser')
-                    .on('change.note-exam-template-set-chooser', '.note-exam-template-set-chooser', function() {
-                        $(this).closest('.note-template-container')
-                            .find('.note-exam-exam-chooser')
-                                .val($(this).find('option:selected').attr('exam'));
-                        return loadExamTemplateSet($(this),
-                            $(this).closest('.note-template-container').find('.note-exam-exam-chooser').first().val(),
-                            $(this).val());
-                    });
-
-                $(document)
-                    .off('change.note-exam-exam-chooser', '.note-exam-exam-chooser')
-                    .on('change.note-exam-exam-chooser', '.note-exam-exam-chooser', function() {
-                        return loadExamTemplateSet($(this),
-                            $(this).val(),
-                            $(this).closest('.note-template-container').find('.note-exam-template-set-chooser').first().val());
-                    });
-
-                $('.remove-section-trigger').click(function() {
-                    $.post('/api/section/deactivate', {
-                        uid: $(this).attr('data-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');
-                    // $(this).closest('.note-section').removeClass('edit');
-                    return false;
-                });
-
-                @if(!$note->visitTemplate)
-                $(document)
-                    .off('mousedown.enable-edit', '.note-section:not(.edit):not(.page-driven)')
-                    .on('mousedown.enable-edit', '.note-section:not(.edit):not(.page-driven)', function(e) {
-                        if($(this).closest('.note-signed-by-hcp').length) return;
-                        e.stopPropagation();
-                        e.preventDefault();
-                        $(this).find('.edit-trigger').first().click();
-                        return false;
-                    });
-                @endif
-
-                $(document)
-                    .off('keydown.collapse-active-segment')
-                    .on('keydown.collapse-active-segment', function(e) {
-                        if(e.which === 27) {
-                            if(!isEventConsumed(e)) {
-                                if($('.visit-segment.edit').length) {
-                                    $('.visit-segment.edit').first().find('.edit-trigger').first().click();
-                                    markEventAsConsumed(e);
-                                    return false;
-                                }
-                            }
-                            else {
-                                // event already consumed!
-                            }
-                        }
-                    });
-
-                scrollToLatest();
-
-                function __moveSection(_uid, _direction) {
-                    $.post('/api/section/move' + _direction, {
-                        uid: _uid
-                    }, function(_data) {
-                        if(_data && _data.success) {
-                            fastReload();
-                        }
-                        else {
-                            if(_data) {
-                                toastr.error(_data.message);
-                            }
-                            else {
-                                toastr.error('Unknown error while moving section');
-                            }
-                        }
-                    }, 'json')
-                }
-
-                $('.move-up-trigger').click(function() {
-                    __moveSection($(this).attr('data-uid'), 'Up');
-                });
-
-                $('.move-down-trigger').click(function() {
-                    __moveSection($(this).attr('data-uid'), 'Down');
-                });
-
-                // refresh once ticket popup is closed
-                /*$('body').off('stag-popup-closed')
-                $('body').on('stag-popup-closed', function() {
-                    if($('#note-single-header').length) {
-                        fastReload();
-                    }
-                });*/
-                // ticket-popup
-                $(document)
-                    .off('click', '.ticket-popup-trigger.note-dashboard-action')
-                    .on('click', '.ticket-popup-trigger.note-dashboard-action', function() {
-                        showMask();
-                        window.noMc = true;
-                        $.get(this.href, (_data) => {
-
-                            if(!$('.ticket-popup').length) {
-                                $('main.stag-content').append('<div class="stag-popup stag-popup-lg ticket-popup mcp-theme-1" stag-popup-key="ticket-popup"></div>');
-                            }
-
-                            $('.ticket-popup').html(_data);
-                            showStagPopup('ticket-popup', true);
-                            $('.ticket-popup .stag-popup.stag-slide').attr('close-all-with-self', 1);
-                            runMCInitializer('patient-tickets'); // run specific mc initer
-                            hideMask();
-                        });
-                        return false;
-                    });
-
-            }
-
-            // scroll to latest created section
-            function scrollToLatest() {
-                window.setTimeout(function() {
-                    let latestSectionTS = $('.latest-section-ts');
-                    if(latestSectionTS.length) {
-                        let latestSection = $('.note-section[data-ts="' + latestSectionTS.text() + '"]');
-                        if(latestSection.length) {
-                            latestSection[0].scrollIntoView({behavior: "smooth", block: "center"});
-                            // latestSection.find('.edit-trigger').first().click();
-                            console.log('DONE!');
-                        }
-                    }
-                }, 100);
-            }
-
-            function loadTemplateSet(_chooser) {
-                if(!_chooser.length || !_chooser.val()) return false;
-                let container = _chooser.closest('.note-template-container');
-                container.find('>.note-template-item').remove();
-                container.find('.please-wait').remove();
-                container.append('<p class="please-wait my-2 text-secondary text-center">Please wait ...</p>');
-                $.get('/note-template-set/' + _chooser.attr('data-section') + '/' + _chooser.val(), function(_html) {
-                    container.find('.please-wait').remove();
-                    container.append(_html);
-                });
-                return false;
-            }
-
-            function loadExamTemplateSet(_chooser, _exam, _templateSet) {
-                if(!_chooser.length || !_chooser.val()) return false;
-                let container = _chooser.closest('.note-template-container');
-                container.find('>.note-template-item').remove();
-                container.find('.please-wait').remove();
-                container.append('<p class="please-wait my-2 text-secondary text-center">Please wait ...</p>');
-                $.get('/note-template-set/exam/' + _exam + '/' + _templateSet, function(_html) {
-                    container.find('.please-wait').remove();
-                    container.append(_html);
-                });
-                return false;
-            }
-
-            function generateOutputForNode(_node) {
-                let template = (_node.attr('prefix') ? _node.attr('prefix') : '') + _node.attr('template'),
-                    value = template;
-                let hasChildText = !!_node.find('>.note-template-children>textarea,>.note-template-children>input[type="number"],>.note-template-children>input[type="date"]').length;
-                let hasChildren = !!_node.find('>.note-template-children>.note-template-item').length;
-                if(hasChildText) {
-                    value = value.replace('{text}',
-                        _node
-                            .find('>.note-template-children')
-                                .find('>textarea,>input[type="number"],>input[type="date"]').first().val());
-                }
-                else if(hasChildren) {
-                    let values = [];
-                    _node.find('>.note-template-children>.note-template-item.selected').each(function() {
-                        values.push(generateOutputForNode($(this)));
-                    });
-                    let combined = '';
-                    for (let i = 0; i < values.length; i++) {
-                        combined += values[i];
-                        if(values.length > 1 && i <= values.length - 2) {
-                            if(i === values.length - 2) {
-                                combined += ' and ';
-                            }
-                            else {
-                                combined += ', ';
-                            }
-                        }
-                    }
-                    value = value.replace('{children}', ' ' + combined).replace('{text}', ' ' + combined);
-                }
-                return value;
-            }
-
-            function generateTemplateOutput() {
-                let container = $('.note-template-container:visible').first();
-                if(!container.length) return '';
-                let lines = [];
-                if(container.find('.note-template-set-chooser').length) {
-                    lines.push('<b>' + container.find('.note-template-set-chooser').first().find('option:selected').text() + '</b>');
-                }
-                else if(container.find('.note-exam-template-set-chooser').length && container.find('.note-exam-exam-chooser').length) {
-                    lines.push('<b>' +
-                        container.find('.note-exam-template-set-chooser').first().find('option:selected').text() +
-                        ': ' +
-                        container.find('.note-exam-exam-chooser').first().find('option:selected').text() +
-                        '</b>');
-                }
-                container.find('>.note-template-item.selected').each(function() {
-                    lines.push('<p class="note-template-output-line">' + generateOutputForNode($(this)) + '</p>');
-                });
-                $('.note-template-output-text:visible').first().html(lines.join(''));
-            }
-
-            addMCInitializer('note-single', init, '#note-single-header');
-        })();
-    </script>

resources/views/app/patient/note/lhs-tree.blade.php

@@ -51,7 +51,7 @@
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Prescriptions" href="#">ERx &amp; Orders</a></div>
     @endif
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Incoming Reports" href="#">Incoming Reports</a></div>
-    <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="RM Setup" href="#">RM Setup</a></div>
+    <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Remote Monitoring" href="#">Remote Monitoring</a></div>
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Supply Orders Summary" href="#">Supply Orders Summary</a></div>
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="Vitals Settings" href="#">Vitals Settings</a></div>
     <div class="note-tree-node"><a native="" target="_top" data-non-segment-target="ICDs" href="#">ICDs</a></div>

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

@@ -1,3 +1,4 @@
+@if(@$note)
 <table class="table-sm table-bordered v-top">
     <tr>
         <td class="text-secondary">Care Plan:</td>
@@ -97,4 +98,5 @@
             </div>
         </td>
     </tr>
-</table>
+</table>
+@endif

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

@@ -3,60 +3,18 @@
     {{-- 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="">
 
-            <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>
-                                    @if($note->hcpPro)
-                                        @foreach($note->hcpPro->companyPros as $companyPro)
-                                            <option value="{{$companyPro->uid}}">{{$companyPro->pro->displayName() . ' / ' . $companyPro->company->name}}</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>
-
-            @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 class="d-flex align-items-baseline mb-1">
+                <div class="text-secondary mb-1">Company Pro:&nbsp;</div>
+                <div class="">
+                    <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/wipeHcpCompanyProPayer">
+                            <form url="/api/note/wipeHcpCompanyPro">
                                 <input type="hidden" name="uid" value="{{$note->uid}}">
-                                <p>Wipe payer from this note?</p>
+                                <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>
@@ -66,14 +24,16 @@
                     @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">
+                            <form url="/api/note/putHcpCompanyPro">
                                 <input type="hidden" name="uid" value="{{$note->uid}}">
                                 <div class="mb-2">
-                                    <select name="hcpCompanyProPayerUid" class="form-control form-control-sm">
+                                    <select name="hcpCompanyProUid" 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
+                                        @if($note->hcpPro)
+                                            @foreach($note->hcpPro->companyPros as $companyPro)
+                                                <option value="{{$companyPro->uid}}">{{$companyPro->pro->displayName() . ' / ' . $companyPro->company->name}}</option>
+                                            @endforeach
+                                        @endif
                                     </select>
                                 </div>
                                 <div class="mb-0">
@@ -84,55 +44,101 @@
                         </div>
                     @endif
                 </div>
+            </div>
 
-                <span class="mx-2 text-secondary">|</span>
-                <span>
-                    <span class="text-secondary font-weight-bold">Payer 2°: </span>
-                </span>
+            @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">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>
+                <div class="d-flex align-items-baseline mb-1">
+                    <div class="text-secondary mb-1">Payer 1°:&nbsp;</div>
+                    <div class="">
+                        <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
-                                        @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
+                                        </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="d-flex align-items-baseline mb-1">
+                    <div class="text-secondary mb-1">Payer 2°:&nbsp;</div>
+                    <div class="">
+                        <b>-</b>
+                    </div>
+                </div>
+
+                <div class="d-flex align-items-baseline mb-1">
+                    <div class="text-secondary mb-1">Location:&nbsp;</div>
+                    <div class="">
+                        <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>
                 </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 class="d-flex align-items-baseline">
+                <div class="text-secondary font-weight-normal">Primary Coverage:&nbsp;</div>
+                <b class="d-inline-flex">@include('app.patient.coverage_column_renderer', ['patient'=>$patient, 'truncateName' => true])</b>
             </div>
         </div>
     </div>
@@ -355,38 +361,45 @@
                         @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>
-                                <div class="text-muted">By: {{@$bill->markedVerifiedBySession && @$bill->markedVerifiedBySession->pro ? @$bill->markedVerifiedBySession->pro->displayName() : '-'}} on {{friendly_date_time(@$bill->marked_verified_at)}}</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>
+                        @if(!$bill->hcpCompanyPro)
+                            <div class="mb-1 text-danger">
+                                <i class="fa fa-exclamation-triangle"></i>
+                                Company Pro isn't set on the bill
+                            </div>
+                        @else
+                            @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>
+                                    <div class="text-muted">By: {{@$bill->markedVerifiedBySession && @$bill->markedVerifiedBySession->pro ? @$bill->markedVerifiedBySession->pro->displayName() : '-'}} on {{friendly_date_time(@$bill->marked_verified_at)}}</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
                         @endif
                     </td>

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

@@ -1,37 +1,116 @@
 <div class="row" id="rm-setup">
-    <div class="col-7">
-        @if($pro->pro_type === 'ADMIN')
-            <div class="mb-2">
-                <div class="d-flex flex-wrap">
-                    <div class="d-flex align-items-center">
-                        <span class="mr-2 text-secondary">Eligible for RM?</span>
-                        <span class="mr-1">{{ ucwords($patient->is_eligible_for_rm ? $patient->is_eligible_for_rm : '-') }}</span>
-                        <div moe class="">
+    <div class="col-12">
+        <div class="mb-2">
+            <div class="d-flex flex-wrap">
+                <div class="d-flex align-items-center">
+                    <span class="mr-2 text-secondary">Eligible for RM?</span>
+                    <span class="mr-1">{{ ucwords($patient->is_eligible_for_rm ? $patient->is_eligible_for_rm : '-') }}</span>
+                    <div moe class="">
+                        <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                        <form url="/api/client/updateRmEligibility" class="mcp-theme-1">
+                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                            <div class="mb-2">
+                                <label class="text-sm mb-1 text-secondary">Is Eligible?</label>
+                                <select name="isEligibleForRm"
+                                        class="form-control form-control-sm"
+                                        onchange="toggleDisabledAsNeeded(this, 'NO', 'not-eligible-for-rm')">
+                                    <option value="">-- Select Status --</option>
+                                    <option value="YES" {{ $patient->is_eligible_for_rm === 'YES' ? 'selected' : '' }}>YES</option>
+                                    <option value="NO" {{ $patient->is_eligible_for_rm === 'NO' ? 'selected' : '' }}>NO</option>
+                                    <option value="UNKNOWN" {{ $patient->is_eligible_for_rm === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+                                </select>
+                            </div>
+                            <div class="mb-2">
+                                <label class="text-sm mb-1 text-secondary">Why not eligible category</label>
+                                <input type="text" class="not-eligible-for-rm form-control form-control-sm"
+                                    {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
+                                    name="whyNotEligibleForRmCategory" value="{{$patient->why_not_eligible_for_rm_category}}">
+                            </div>
+                            <div class="mb-2">
+                                <label class="text-sm mb-1 text-secondary">Why not eligible memo</label>
+                                <input type="text" class="not-eligible-for-rm form-control form-control-sm"
+                                    {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
+                                    name="whyNotEligibleForRmMemo" value="{{$patient->why_not_eligible_for_rm_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>
+                    @if($patient->is_eligible_for_rm === 'NO')
+                    <span class="ml-1 on-hover-show d-inline-block on-hover-opaque">
+                        <i class="fa fa-info-circle"></i>
+                        <div class="on-hover-content py-2 pl-3 text-nowrap text-dark" style="left:0;right:auto;">
+                            <div>
+                                <small class="text-sm"><b>Category:</b> {{$patient->why_not_eligible_for_rm_category ?: '-'}}</small>
+                            </div>
+                            <div>
+                                <small class="text-sm"><b>Memo:</b> {{$patient->why_not_eligible_for_rm_memo ?: '-'}}</small>
+                            </div>
+                        </div>
+                    </span>
+                    @endif
+                </div>
+                <span class="text-secondary mx-2">|</span>
+                <?php $currentCareMonth = $patient->currentCareMonth(); ?>
+                @if($currentCareMonth && $pro->id === $currentCareMonth->mcp_pro_id)
+                <?php $spoken = $currentCareMonth->has_anyone_interacted_with_client_about_rm_outside_note; ?>
+                {{--
+                <div class="d-flex align-items-center">
+                    <span class="mr-1 text-secondary">Comm. this month:</span>
+                    <span class="{{$spoken ? 'text-success' : ''}}">
+                        {{$spoken ? 'Yes' : 'No'}}
+                        @if(!$spoken)
+                            <i class="fa fa-exclamation-triangle"></i>
+                        @else
+                            <i class="fa fa-check"></i>
+                        @endif
+                    </span>
+                    @if($currentCareMonth->mcp && $pro->id === $currentCareMonth->mcp->id)
+                        <div moe relative class="ml-1">
+                            <a href="#" start show class=""><i class="fa fa-edit on-hover-opaque"></i></a>
+                            <form url="/api/careMonth/setHasAnyoneInteractedWithClientAboutRmOutsideNoteTo{{$spoken ? 'False' : 'True'}}" right>
+                                <input type="hidden" name="uid" value="{{$currentCareMonth->uid}}">
+                                <p>Set to {{$spoken ? 'No' : 'Yes'}}?</p>
+                                <div class="d-flex align-items-center">
+                                    <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                    <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                </div>
+                            </form>
+                        </div>
+                    @endif
+                </div>
+                <span class="text-secondary mx-2 d-xlarge">|</span>--}}
+                @endif
+
+                <div class="d-flex align-items-center">
+                    <span class="mr-1 text-secondary">Enrollment:</span>
+                    <span>{{ ucwords($patient->is_enrolled_in_rm ? $patient->is_enrolled_in_rm : '-') }}</span>
+                    @if($patient->is_enrolled_in_rm === 'NO' && $patient->why_not_enrolled_in_rm_category)
+                        <span class="text-sm ml-2">({{$patient->why_not_enrolled_in_rm_category}})</span>
+                    @endif
+                    @if($patient->is_enrolled_in_rm === 'YES')
+                        <div moe class="ml-1">
                             <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
-                            <form url="/api/client/updateRmEligibility" class="mcp-theme-1">
+                            <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
                                 <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                <p class="mb-2">Un-enroll from RPM?</p>
                                 <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Is Eligible?</label>
-                                    <select name="isEligibleForRm"
-                                            class="form-control form-control-sm"
-                                            onchange="toggleDisabledAsNeeded(this, 'NO', 'not-eligible-for-rm')">
-                                        <option value="">-- Select Status --</option>
-                                        <option value="YES" {{ $patient->is_eligible_for_rm === 'YES' ? 'selected' : '' }}>YES</option>
-                                        <option value="NO" {{ $patient->is_eligible_for_rm === 'NO' ? 'selected' : '' }}>NO</option>
-                                        <option value="UNKNOWN" {{ $patient->is_eligible_for_rm === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+                                    <label class="text-secondary text-sm mb-1">Reason</label>
+                                    <select name="whyNotEnrolledInRmCategory" class="form-control" required>
+                                        <option value="">-- select --</option>
+                                        <option value="Withdrawn">Withdrawn</option>
+                                        <option value="Inactive">Inactive</option>
+                                        <option value="Entry Error">Entry Error</option>
+                                        <option value="Test Chart">Test Chart</option>
+                                        <option value="Deceased">Deceased</option>
+                                        <option value="No Longer Eligible">No Longer Eligible</option>
                                     </select>
                                 </div>
                                 <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Why not eligible category</label>
-                                    <input type="text" class="not-eligible-for-rm form-control form-control-sm"
-                                        {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
-                                        name="whyNotEligibleForRmCategory" value="{{$patient->why_not_eligible_for_rm_category}}">
-                                </div>
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Why not eligible memo</label>
-                                    <input type="text" class="not-eligible-for-rm form-control form-control-sm"
-                                        {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
-                                        name="whyNotEligibleForRmMemo" value="{{$patient->why_not_eligible_for_rm_memo}}">
+                                    <label class="text-secondary text-sm mb-1">Memo</label>
+                                    <textarea type="text" name="whyNotEnrolledInRmMemo" class="form-control"></textarea>
                                 </div>
                                 <div>
                                     <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
@@ -39,82 +118,43 @@
                                 </div>
                             </form>
                         </div>
-                        @if($patient->is_eligible_for_rm === 'NO')
-                        <span class="ml-1 on-hover-show d-inline-block on-hover-opaque">
-                            <i class="fa fa-info-circle"></i>
-                            <div class="on-hover-content py-2 pl-3 text-nowrap text-dark" style="left:0;right:auto;">
-                                <div>
-                                    <small class="text-sm"><b>Category:</b> {{$patient->why_not_eligible_for_rm_category ?: '-'}}</small>
-                                </div>
-                                <div>
-                                    <small class="text-sm"><b>Memo:</b> {{$patient->why_not_eligible_for_rm_memo ?: '-'}}</small>
+                    @else
+                        <div moe wide class="ml-2">
+                            <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                            <form url="/api/client/setIsEnrolledInRmToTrue" class="mcp-theme-1">
+                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                <h2>RPM Enrollment:</h2>
+                                <h3>Please confirm the following with patient:</h3>
+                                <p class="mb-2">I understand that:</p>
+                                <ul style="list-style:none;" class="pl-2">
+                                    <li class="d-flex mb-1">
+                                        <input type="checkbox" required="true" class="mt-1 mr-2" id="x" name="x">
+                                        <label class="c-pointer" for="x">I am the only person who should be using the remote monitoring equipment as instructed. I will
+                                            not use the device for reasons other than my own personal health monitoring. I understand that
+                                            I can only participate in this program with one Medical Provider at a time.</label>
+                                    </li>
+                                    <li class="d-flex mb-1">
+                                        <input type="checkbox" required="true" class="mt-1 mr-2" id="y" name="y">
+                                        <label class="c-pointer" for="y">I will not tamper with the equipment. I understand that I am responsible for any fees associated
+                                            with misuse of the equipment.</label>
+                                    </li>
+                                    <li class="d-flex mb-1">
+                                        <input type="checkbox" required="true" class="mt-1 mr-2" id="z" name="z">
+                                        <label class="c-pointer" for="z">I understand the devices are only designed for the RPM program.</label>
+                                    </li>
+                                </ul>
+
+                                <div class="mb-2">
+                                    <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
                                 </div>
-                            </div>
-                        </span>
-                        @endif
-                    </div>
-                    <span class="text-secondary mx-2">|</span>
-                    <?php $currentCareMonth = $patient->currentCareMonth(); ?>
-                    @if($currentCareMonth && $pro->id === $currentCareMonth->mcp_pro_id)
-                    <?php $spoken = $currentCareMonth->has_anyone_interacted_with_client_about_rm_outside_note; ?>
-                    <div class="d-flex align-items-center">
-                        <span class="mr-1 text-secondary">Comm. this month:</span>
-                        <span class="{{$spoken ? 'text-success' : ''}}">
-                            {{$spoken ? 'Yes' : 'No'}}
-                            @if(!$spoken)
-                                <i class="fa fa-exclamation-triangle"></i>
-                            @else
-                                <i class="fa fa-check"></i>
-                            @endif
-                        </span>
-                        @if($currentCareMonth->mcp && $pro->id === $currentCareMonth->mcp->id)
-                            <div moe relative class="ml-1">
-                                <a href="#" start show class=""><i class="fa fa-edit on-hover-opaque"></i></a>
-                                <form url="/api/careMonth/setHasAnyoneInteractedWithClientAboutRmOutsideNoteTo{{$spoken ? 'False' : 'True'}}" right>
-                                    <input type="hidden" name="uid" value="{{$currentCareMonth->uid}}">
-                                    <p>Set to {{$spoken ? 'No' : 'Yes'}}?</p>
-                                    <div class="d-flex align-items-center">
-                                        <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                                    </div>
-                                </form>
-                            </div>
-                        @endif
-                    </div>
-                    <span class="text-secondary mx-2 d-xlarge">|</span>
+                            </form>
+                        </div>
                     @endif
-
-                    <div class="d-flex align-items-center">
-                        <span class="mr-1 text-secondary">Enrollment:</span>
-                        <span>{{ ucwords($patient->is_enrolled_in_rm ? $patient->is_enrolled_in_rm : '-') }}</span>
-                        @if($patient->is_enrolled_in_rm === 'YES')
-                            <div moe class="ml-1">
-                                <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
-                                <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
-                                    <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                    <p>Un-enroll from RPM?</p>
-                                    <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>
-                        @else
-                            <a native target="_blank"
-                            class="screen-only ml-2"
-                            open-in-stag-popup
-                            popup-style="medium overflow-visible"
-                            mc-initer="rpm-agreement-{{$note->id}}"
-                            title="Leadership Health Remote Patient Monitoring Consent Form"
-                            href="/note/rpm-agreement/{{$note->uid}}?popupmode=1">
-                                Mark as enrolled
-                            </a>
-                        @endif
-                    </div>
                 </div>
-
             </div>
-        @endif
+
+        </div>
 
         <div class="d-flex align-items-baseline mb-1">
             <div class="flex-grow-1">
@@ -318,164 +358,12 @@
                 </table>
             </div>
         @endif
-        <div class="border-top mt-1 pt-2">
+        {{--<div class="border-top mt-1 pt-2">
             @include('app.patient.partials.client_bp_weight_phone_number_status')
-        </div>
+        </div>--}}
 
     </div>
-    <div class="col-5 border-left">
-        <?php
-        $bpDevice = null;
-        $weightScale = null;
-        if(count($patient->devices)) {
-            foreach($patient->devices as $device) {
-                if(!$bpDevice && $device->device->category === 'BP') {
-                    $bpDevice = $device;
-                }
-                elseif(!$weightScale && $device->device->category === 'WEIGHT') {
-                    $weightScale = $device;
-                }
-                if($bpDevice && $weightScale) break;
-            }
-        }
-        $bpMeasurements = [];
-        if($bpDevice) {
-            $bpMeasurements["first"] = \App\Models\Measurement
-                ::where('imei', $bpDevice->device->imei)
-                ->where('client_id', $patient->id)
-                ->where('is_cellular_zero', false)
-                ->orderBy('ts')
-                ->first();
-            $bpMeasurements["last"] = \App\Models\Measurement
-                ::where('imei', $bpDevice->device->imei)
-                ->where('client_id', $patient->id)
-                ->where('is_cellular_zero', false)
-                ->orderBy('ts', 'DESC')
-                ->first();
-        }
-        $weightMeasurements = [];
-        if($weightScale) {
-            $weightMeasurements["first"] = \App\Models\Measurement
-                ::where('imei', $weightScale->device->imei)
-                ->where('client_id', $patient->id)
-                ->where('is_cellular_zero', false)
-                ->orderBy('ts')
-                ->first();
-            $weightMeasurements["last"] = \App\Models\Measurement
-                ::where('imei', $weightScale->device->imei)
-                ->where('client_id', $patient->id)
-                ->where('is_cellular_zero', false)
-                ->orderBy('ts', 'DESC')
-                ->first();
-        }
-        $careMonth = $patient->currentCareMonth();
-        ?>
 
-        @if($bpDevice)
-            <div class="mb-2">
-                <table class="table table-sm table-bordered mb-0">
-                    <tr class="bg-light">
-                        <td class="text-secondary" style="width: 125px;">Cellular BP Device</td>
-                        <td colspan="2">Yes <i>({{$bpDevice->device->imei}})</i></td>
-                    </tr>
-                    <tr>
-                        <td class="text-secondary">Arrived</td>
-                        <td colspan="2">Yes</td>
-                    </tr>
-                    <tr>
-                        <td class="text-secondary">First Meas.</td>
-                        @if($bpMeasurements["first"])
-                        <td class="">{{ $bpMeasurements["first"]->sbp_mm_hg . '/' . $bpMeasurements["first"]->dbp_mm_hg . '' }}</td>
-                        <td class="">{{friendly_date_short(date("Y-m-d", $bpMeasurements["first"]->ts/1000))}} <i class="text-muted">- {{date_diff(date_create(date("Y-m-d", $bpMeasurements["first"]->ts/1000)), date_create('now'))->days}} <small class="text-sm">days ago</small></i></td>
-                        @else
-                            <td colspan="3">-</td>
-                        @endif
-                    </tr>
-                    <tr>
-                        <td class="text-secondary">Last Meas.</td>
-                        @if($bpMeasurements["last"])
-                            <td>{{ $bpMeasurements["last"]->sbp_mm_hg . '/' . $bpMeasurements["last"]->dbp_mm_hg . '' }}</td>
-                            <td>{{friendly_date_short(date("Y-m-d", $bpMeasurements["last"]->ts/1000))}} <i class="text-muted">- {{date_diff(date_create(date("Y-m-d", $bpMeasurements["last"]->ts/1000)), date_create('now'))->days}} <small class="text-sm">days ago</small></i></td>
-                        @else
-                           <td colspan="3">-</td>
-                        @endif
-                    </tr>
-                    {{--
-                    <tr>
-                        <td class="text-secondary">How often to measure</td>
-                        <td colspan="2">-</td>
-                    </tr>
-                    <tr>
-                        <td class="text-secondary">SMS reminders</td>
-                        <td colspan="2">-</td>
-                    </tr>
-                    --}}
-                </table>
-            </div>
-        @else
-            <div class="d-flex align-items-baseline mb-3">
-                <span class="min-width-200px">Cellular BP Device</span>
-                <b class="ml-3">No</b>
-            </div>
-        @endif
-
-        @if($weightScale)
-            <div class="mb-2">
-            <table class="table table-sm table-bordered mb-0">
-                <tr class="bg-light">
-                    <td class="text-secondary">Cellular Wt. Scale</td>
-                    <td colspan="3">Yes <i>({{$weightScale->device->imei}})</i></td>
-                </tr>
-                <tr>
-                    <td class="text-secondary">Arrived</td>
-                    <td colspan="3">Yes</td>
-                </tr>
-                <tr>
-                    <td class="text-secondary">First Meas.</td>
-                    @if($weightMeasurements["first"])
-                        <td>{{ round($weightMeasurements["first"]->value, 2) . ' lbs' }}</td>
-                        <td colspan="2">{{ friendly_date_short(date("Y-m-d", $weightMeasurements["first"]->ts/1000)) }} <i class="text-muted">- {{date_diff(date_create(date("Y-m-d", $weightMeasurements["first"]->ts/1000)), date_create('now'))->days}} <small class="text-asm">days ago</small></i></td>
-                    @else
-                        <td colspan="4"></td>
-                    @endif
-                </tr>
-                <tr>
-                        <td class="text-secondary">Last Meas.</td>
-                        @if($weightMeasurements["last"])
-                            <td>{{ round($weightMeasurements["last"]->value, 2) . ' lbs' }}</td>
-                            <td>{{ friendly_date_short(date("Y-m-d", $weightMeasurements["last"]->ts/1000)) }} <i class="text-muted">- {{date_diff(date_create(date("Y-m-d", $weightMeasurements["last"]->ts/1000)), date_create('now'))->days}} <small class="text-sm">days ago</small></i></td>
-                        @else
-                            <td colspan="4">-</td>
-                        @endif
-                    </tr>
-                    {{--
-                    <tr>
-                        <td class="text-secondary">How often to measure</td>
-                        <td colspan="3">-</td>
-                    </tr>
-                    <tr>
-                        <td class="text-secondary">SMS reminders:</td>
-                        <td colspan="3">-</td>
-                    </tr>
-                    --}}
-            </table>
-            </div>
-        @else
-            <div class="d-flex align-items-baseline mb-3">
-                <span class="min-width-200px">Cellular Weight Scale</span>
-                <b class="ml-3">No</b>
-            </div>
-        @endif
-
-        @if($careMonth && ($bpDevice || $weightScale))
-            <div class="d-flex align-items-baseline mb-1">
-                <span class="min-width-200px">Measurement days this month:</span>
-                <div class="ml-3">
-                    <b>{{$careMonth->number_of_days_with_remote_measurements}} days</b>
-                </div>
-            </div>
-        @endif
-    </div>
 </div>
 <script>
     (function () {

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

@@ -60,12 +60,31 @@
           <div class="d-flex align-items-center">
               <span class="mr-1 text-secondary">Enrollment:</span>
               <span>{{ ucwords($patient->is_enrolled_in_rm ? $patient->is_enrolled_in_rm : '-') }}</span>
+              @if($patient->is_enrolled_in_rm === 'NO' && $patient->why_not_enrolled_in_rm_category)
+                  <span class="text-sm ml-2">({{$patient->why_not_enrolled_in_rm_category}})</span>
+              @endif
               @if($patient->is_enrolled_in_rm === 'YES')
                   <div moe wide class="ml-2">
                       <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
                       <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
                           <input type="hidden" name="uid" value="{{$patient->uid}}">
                           <h2 class="alert alert-warning"><i class="fa fa-warning"></i> RPM Enrollment Cancellation</h2>
+                          <div class="mb-2">
+                              <label class="text-secondary text-sm mb-1">Reason</label>
+                              <select name="whyNotEnrolledInRmCategory" class="form-control" required>
+                                  <option value="">-- select --</option>
+                                  <option value="Withdrawn">Withdrawn</option>
+                                  <option value="Inactive">Inactive</option>
+                                  <option value="Entry Error">Entry Error</option>
+                                  <option value="Test Chart">Test Chart</option>
+                                  <option value="Deceased">Deceased</option>
+                                  <option value="No Longer Eligible">No Longer Eligible</option>
+                              </select>
+                          </div>
+                          <div class="mb-2">
+                              <label class="text-secondary text-sm mb-1">Memo</label>
+                              <textarea type="text" name="whyNotEnrolledInRmMemo" class="form-control"></textarea>
+                          </div>
                           <div>
                               <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
                               <button cancel class="btn btn-sm btn-default border">Cancel</button>
@@ -251,9 +270,9 @@
                 @endif
             </div>
         @endif
-        <div class="border-top mt-2 pt-2">
+        {{--<div class="border-top mt-2 pt-2">
             @include('app.patient.partials.client_bp_weight_phone_number_status')
-        </div>
+        </div>--}}
     </div>
     <div class="col-5 border-left">
         <?php

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

@@ -0,0 +1,75 @@
+<div class="screen-only">
+    <div class="d-flex align-items-center mb-3">
+        <p class="font-weight-bold text-secondary m-0 font-size-14">RM Setup</p>
+    </div>
+
+    <div class="mb-3 d-flex align-items-center">
+        <span class="min-width-140px">RM Setup Status:</span>
+        <div class="d-inline-flex align-items-center flex-grow-1">
+            @if($patient->has_rm_setup_been_performed)
+            <span class="text-nowrap text-success">
+                <i class="fa fa-check"></i>
+                <b>Performed</b>
+            </span>
+            <div moe class="ml-3">
+                <a href="" show start>Undo</a>
+                <form url="/api/careMonth/undoMarkRmSetupPerformed">
+                    <input type="hidden" name="uid" value="{{$careMonth->uid}}">
+                    <p>Mark RM Setup as not performed?</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
+            <span class="text-nowrap text-warning-mellow">
+                <i class="fa fa-times"></i>
+                <b>Not Performed</b>
+            </span>
+            <div moe class="ml-3">
+                <a href="" show start>Mark RM setup as performed?</a>
+                <form url="/api/careMonth/markRmSetupPerformed">
+                    <input type="hidden" name="uid" value="{{$careMonth->uid}}">
+                    <p>Mark RM setup as performed?</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
+        </div>
+    </div>
+
+    @if($pro->pro_type === 'ADMIN')
+    <div class="d-flex align-items-center">
+        <span class="min-width-140px">RM Setup Claim:</span>
+        <div class="d-inline-flex align-items-center flex-grow-1">
+            @if(!!$careMonth->rmSetupClaim)
+            <span class="text-nowrap text-success">
+                <i class="fa fa-check"></i>
+                <b>Created</b>
+            </span>
+            @else
+            <span class="text-nowrap text-warning-mellow">
+                <i class="fa fa-times"></i>
+                <b>Not Created</b>
+            </span>
+            <div moe class="ml-3">
+                <a href="" show start>Generate</a>
+                <form url="/api/careMonth/generateRmSetupClaim">
+                    <input type="hidden" name="uid" value="{{$careMonth->uid}}">
+                    <p>Generate RM setup 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>
+            </div>
+            @endif
+        </div>
+    </div>
+    @endif
+
+</div>

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

@@ -2,7 +2,173 @@
 
 @section('inner-content')
 
-    <h4 class="font-weight-bold mb-3" id="rm-setup">RM Setup</h4>
+    <h4 class="font-weight-bold mb-3" id="rm-setup">Remote Monitoring</h4>
 
-    @include('app.patient.partials.rm-setup')
+    @include('app.patient.note.rm-setup')
+
+    <hr>
+
+    <link href="/select2/select2.min.css" rel="stylesheet" />
+    <script src="/select2/select2.min.js"></script>
+    <div id="patient-devices">
+        <div class="d-flex align-items-center pb-2">
+            <h4 class="font-weight-bold mb-0">Devices</h4>
+            @if(count($devices) && $pro->pro_type === 'ADMIN')
+                <span class="mx-2 text-secondary">|</span>
+                <div moe>
+                    <a start show>Add</a>
+                    <form url="/api/clientBdtDevice/create" class="mcp-theme-1">
+                        <input type="hidden" name="clientUid" value="{{$patient->uid}}">
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Device</label>
+                            <select name="deviceUid" class="form-control form-control-sm">
+                                <option value=""> --select-- </option>
+                                @foreach($devices as $device)
+                                    <option value="{{$device->uid}}">
+                                        {{$device->imei}} ({{$device->category}})
+                                    </option>
+                                @endforeach
+                            </select>
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Instructions</label>
+                            <input type="text" name="instructions" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Internal Memo</label>
+                            <input type="text" name="internalMemo" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Status</label>
+                            <input type="text" name="status" class="form-control form-control-sm">
+                        </div>
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm">Status Memo</label>
+                            <input type="text" name="statusMemo" class="form-control form-control-sm">
+                        </div>
+                        <div>
+                            <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                            <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                        </div>
+                    </form>
+                </div>
+            @endif
+        </div>
+        <table class="table table-striped table-sm table-bordered mb-0">
+            @if($patient->devices && count($patient->devices))
+                <thead class="bg-light">
+                <tr>
+                    <th class="border-0 text-secondary">Created</th>
+                    <th class="border-0 text-secondary">Category</th>
+                    <th class="border-0 text-secondary">IMEI</th>
+                    <th class="border-0 text-secondary">Last Measurement</th>
+                    <th class="border-0 text-secondary"></th>
+                    <th class="border-0 text-secondary"></th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($patient->devices as $device)
+                    <tr>
+                        <td class="text-nowrap">{{ friendly_date_time($device->device->created_at) }}</td>
+                        <td>{{ $device->device->category }}</td>
+                        <td><pre class="m-0">{{ $device->device->imei }}</pre></td>
+                        <td>
+                            <?php $lastMeasurement = $device->lastDeviceMeasurement(); ?>
+                            @if($lastMeasurement)
+                                @if($lastMeasurement->is_cellular_zero)
+                                    <i class="font-size-11 fa fa-rss"></i>
+                                @elseif($lastMeasurement->label === 'BP')
+                                    {{ $lastMeasurement->sbp_mm_hg }} / {{ $lastMeasurement->dbp_mm_hg }}
+                                @elseif($lastMeasurement->label === 'Wt. (lbs.)')
+                                    {{ round($lastMeasurement->numeric_value, 2) }} lbs
+                                @else
+                                    {{ $lastMeasurement->value }}
+                                @endif
+                                <div>
+                                    <i class="far fa-calendar-check"></i> <span class="text-secondary">{{ friendly_date_time($lastMeasurement->created_at) }}</span>
+                                </div>
+                            @else
+                                <small class="text-muted">-</small>
+                            @endif
+                        </td>
+                        <td>
+                            <div moe relative>
+                                <a start show class="on-hover-opaque">Deactivate</a>
+                                <form url="/api/clientBdtDevice/deactivate" right>
+                                    <input type="hidden" name="uid" value="{{ $device->uid }}">
+                                    <p class="small">Are you sure you want to deactivate this device?</p>
+                                    <div class="d-flex align-items-center">
+                                        <button class="btn btn-sm btn-danger mr-2" submit>Deactivate</button>
+                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                        </td>
+                        <td class="text-nowrap">
+                            @include('app.generic-bills.modal', ['entityType' => 'ClientBDTDevice', 'entityUid' => $device->uid])
+                        </td>
+                    </tr>
+                @endforeach
+                </tbody>
+            @else
+                <tbody>
+                <tr>
+                    <td class="text-secondary p-3">No active devices for this patient</td>
+                </tr>
+                </tbody>
+            @endif
+        </table>
+        <hr>
+        <h2>Deactivated Devices</h2>
+        <table class="table table-striped table-sm table-bordered mb-0">
+            @if($patient->deactivatedDevices && count($patient->deactivatedDevices))
+                <thead class="bg-light">
+                <tr>
+                    <th class="border-0 text-secondary">Created</th>
+                    <th class="border-0 text-secondary w-25">Category</th>
+                    <th class="border-0 text-secondary w-50">IMEI</th>
+                    <th class="border-0 text-secondary"></th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($patient->deactivatedDevices as $deactivatedDevice)
+                    <tr>
+                        <td>{{ friendly_date_time($deactivatedDevice->device->created_at) }}</td>
+                        <td>{{ $deactivatedDevice->device->category }}</td>
+                        <td><pre class="m-0">{{ $deactivatedDevice->device->imei }}</pre></td>
+                        <td>
+                            <div moe relative>
+                                <a start show class="on-hover-opaque">Reactivate</a>
+                                <form url="/api/clientBdtDevice/reactivate" right>
+                                    <input type="hidden" name="uid" value="{{ $deactivatedDevice->uid }}">
+                                    <p class="small">Are you sure you want to reactivate this device?</p>
+                                    <div class="d-flex align-items-center">
+                                        <button class="btn btn-sm btn-danger mr-2" submit>Reactivate</button>
+                                        <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                    </div>
+                                </form>
+                            </div>
+                        </td>
+                    </tr>
+                @endforeach
+                </tbody>
+            @else
+                <tbody>
+                <tr>
+                    <td class="text-secondary p-3">No deactivated devices for this patient</td>
+                </tr>
+                </tbody>
+            @endif
+        </table>
+    </div>
+    <script>
+        (function() {
+            function init() {
+                $('select[name="deviceUid"]').select2({
+                    width: '100%'
+                });
+            }
+            addMCInitializer('patient-devices', init, '#patient-devices');
+        }).call(window);
+    </script>
 @endsection

resources/views/app/patient/settings.blade.php

@@ -616,13 +616,21 @@
                     <a start show><i class="fa fa-edit"></i> Set is enrolled to RM to false</a>
                     <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
                         <input type="hidden" name="uid" value="{{$patient->uid}}">
-                        <div class="form-group">
-                            <label class="control-label">Why Not Enrolled In Rm Category</label>
-                            <input type="text" name="whyNotEnrolledInRmCategory" class="form-control">
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm mb-1">Reason</label>
+                            <select name="whyNotEnrolledInRmCategory" class="form-control" required>
+                                <option value="">-- select --</option>
+                                <option value="Withdrawn">Withdrawn</option>
+                                <option value="Inactive">Inactive</option>
+                                <option value="Entry Error">Entry Error</option>
+                                <option value="Test Chart">Test Chart</option>
+                                <option value="Deceased">Deceased</option>
+                                <option value="No Longer Eligible">No Longer Eligible</option>
+                            </select>
                         </div>
-                        <div class="form-group">
-                            <label class="control-label">Why Not Enrolled In Rm Memo</label>
-                            <input type="text" name="whyNotEnrolledInRmMemo" class="form-control">
+                        <div class="mb-2">
+                            <label class="text-secondary text-sm mb-1">Memo</label>
+                            <textarea type="text" name="whyNotEnrolledInRmMemo" class="form-control"></textarea>
                         </div>
                         <div>
                             <button submit class="btn btn-sm btn-primary mr-1">Submit

resources/views/app/practice-management/_sort_header_multi.blade.php

@@ -0,0 +1,22 @@
+<?php
+// sort=key:order,key:order...
+$current = request()->input('sort_by');
+$current = $current ? json_decode($current, true) : [];
+$currentSortForKey = currentSortForKey($current, $key);
+$targetSortParamForInclusionOrReversal = json_encode(includeOrReverseInMultiSort($current, $key));
+$targetSortParamForRemoval = json_encode(removeFromMultiSort($current, $key));
+?>
+<div class="d-flex align-items-end flex-wrap">
+    <a href="{{ $route }}?{{queryLineExcept(['sort_by', 'page'])}}&sort_by={!! urlencode($targetSortParamForInclusionOrReversal) !!}" class="text-decoration-none">
+        <b class="{{$currentSortForKey ? 'text-primary' : 'text-secondary'}}">{!! $label !!}</b>
+        <span class="ml-1 d-inline-flex align-items-baseline position-relative sort-header-arrows" @if($currentSortForKey) sort-index="{{$currentSortForKey['index']}}" @endif>
+            <i class="text-sm fa fa-chevron-up {{$currentSortForKey && $currentSortForKey['order'] === 'DESC' ? '' : 'on-hover-opaque text-secondary'}}"></i>
+            <i class="ml-1 text-sm fa fa-chevron-down {{$currentSortForKey && $currentSortForKey['order'] === 'ASC' ? '' : 'on-hover-opaque text-secondary'}}"></i>
+        </span>
+    </a>
+    @if($currentSortForKey)
+        <a href="{{ $route }}?{{queryLineExcept(['sort_by', 'page'])}}&sort_by={!! $targetSortParamForRemoval !== '[]' ? urlencode($targetSortParamForRemoval) : '' !!}" class="text-sm on-hover-opaque text-secondary ml-1">
+            <i class="fa fa-times"></i>
+        </a>
+    @endif
+</div>

resources/views/app/practice-management/billing-report.blade.php

@@ -12,44 +12,58 @@
             </strong>
         </div>
         <div class="card-body p-0 border-0 table-responsive">
-            <div class="m-2">
+            <div class="mx-2 mt-3 mb-0 d-flex align-items-start">
                 <form action="/practice-management/billing-report"  method="GET" class="form-inline" id="admin-billing-report-form">
                     <div class="form-group mr-2">
-                        <div class="form-check">
-                            <input type="checkbox" name="no_claims" class="form-check-input" v-model="filters.no_claims">
-                            <label for="" class="form-check-label">No Claims</label>
-                        </div>
+                        <label class="form-check">
+                            <input type="checkbox" name="no_claims" class="form-check-input" {{request()->input('no_claims') ? 'checked' : ''}}>
+                            <span for="" class="form-check-label">No Claims</span>
+                        </label>
                     </div>
 
                     <div class="form-group mr-2">
-                        <div class="form-check">
-                            <input type="checkbox" name="zero_deductible" class="form-check-input" v-model="filters.zero_deductible">
-                            <label for="" class="form-check-label">Zero Deductible</label>
-                        </div>
+                        <label class="form-check">
+                            <input type="checkbox" name="zero_deductible" class="form-check-input" {{request()->input('zero_deductible') ? 'checked' : ''}}>
+                            <span for="" class="form-check-label">Zero Deduc.</span>
+                        </label>
                     </div>
 
                     <div class="form-group mr-2">
-                        <label class="control-label  mr-1" for="">Claim Status</label>
-                        <select name="claim_status" class="form-control" v-model="filters.claim_status">
+                        <label class="control-label  mr-1" for="">Claim</label>
+                        <select name="claim_status" class="form-control">
                             <option value="">All</option>
                             @foreach($claimStatuses as $claimStatus)
-                               <option value="{{$claimStatus->status}}">{{ucwords($claimStatus->status)}}</option>
+                               <option value="{{$claimStatus->status}}" {{request()->input('claim_status') === $claimStatus->status ? 'selected' : ''}}>{{ucwords($claimStatus->status)}}</option>
                             @endforeach
                         </select>
                     </div>
                     
                     <div class="form-group mr-2">
-                        <label class="control-label mr-1" for="">Bill Verification Status</label>
-                        <select name="verified" class="form-control" v-model="filters.verified">
+                        <label class="control-label mr-1" for="">Bill Verif.</label>
+                        <select name="verified" class="form-control">
                             <option value="">All</option>
-                            <option value="VERIFIED">Verified</option>
-                            <option value="UNVERIFIED">Unverified</option>
+                            <option {{request()->input('verified') === 'VERIFIED' ? 'selected' : ''}} value="VERIFIED">Verified</option>
+                            <option {{request()->input('verified') === 'UNVERIFIED' ? 'selected' : ''}} value="UNVERIFIED">Unverified</option>
                         </select>
                     </div>
                     <div class="form-group mr-2">
-                        <button v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm">Filter</button>
+                        <label class="control-label mr-1" for="">From</label>
+                        <input type="date" name="from" class="form-control" value="{{request()->input('from')}}">
+                        <label class="control-label ml-2 mr-1" for="">To</label>
+                        <input type="date" name="to" class="form-control" value="{{request()->input('to')}}">
+                    </div>
+                    <div class="form-group mr-2">
+                        <button onclick="return fastLoad('{{ route('practice-management.billing-report') }}?' + $('#admin-billing-report-form').serialize())" class="btn btn-primary btn-sm">Filter</button>
                     </div>
                 </form>
+                <div class="ml-auto">
+                    <div class="d-flex align-items-baseline">
+                        {!! $paginator->onEachSide(0)->withQueryString()->links() !!}
+                        <div class="">
+                            <div class="ml-4 mb-3">Showing <b>{{$paginator->firstItem()}}</b> to <b>{{$paginator->lastItem()}}</b> (page {{$paginator->currentPage()}}) of <b>{{$paginator->total()}}</b></div>
+                        </div>
+                    </div>
+                </div>
             </div>
             <table class="table table-sm table-striped border-0 p-0 m-0 text-nowrap">
                 <thead class="bg-light">
@@ -73,14 +87,14 @@
                     <tr class="{{false ? 'bg-light' : ''}}">
                         <td class="text-nowrap border-left-0">
                             <a native target="_blank" href="/patients/view/{{$row->client_uid}}/notes/view/{{$row->note_uid}}">
-                                {{$row->clientDisplayName()}}
+                                {{$row->client_first}} {{$row->client_last}}
                             </a>
-                            @if($row->client->getPrimaryCoverage() )
-                                <div>Plan Type: {{$row->client->getPrimaryCoverage()->plan_type}}</div>
-                                @if($row->client->getPrimaryCoverage()->plan_type == 'MEDICARE')
-                                    @if($row->client->getPrimaryCoverage()->auto_medicare_is_partbprimary == 'YES')
+                            @if($row->plan_type)
+                                <div>Plan Type: {{$row->plan_type}}</div>
+                                @if($row->plan_type == 'MEDICARE')
+                                    @if($row->auto_medicare_is_partbprimary == 'YES')
                                         <div>
-                                            Deductible: {{friendly_money($row->client->getPrimaryCoverage()->auto_medicare_mpb_remaining)}}
+                                            Deductible: {{friendly_money($row->medicare_deductible)}}
                                         </div>
                                     @else 
                                         <div>
@@ -89,10 +103,10 @@
                                     @endif
                                 @else 
                                     <div>
-                                        {{$row->client->getPrimaryCoverage()->commercialPayer?$row->client->getPrimaryCoverage()->commercialPayer->name:''}}
+                                        {{$row->payer_name ?: '-'}}
                                     </div>
                                     <div>
-                                        Deductible: {{friendly_money($row->client->getPrimaryCoverage()->deductible_amount)}}
+                                        Deductible: {{friendly_money($row->commercial_deductible)}}
                                     </div>
                                 @endif
                             @endif
@@ -103,7 +117,7 @@
                             </a>
                         </td>
                         <td class="text-nowrap border-left-0">
-                            {{$row->proDisplayName()}}
+                            {{$row->pro_first}} {{$row->pro_last}}
                         </td>
                         <td class="text-nowrap border-left-0">
                             {{$row->note_date}}
@@ -130,12 +144,7 @@
                             <pre>{{$row->icds}}</pre>
                         </td>
                         <td class="text-nowrap border-left-0">
-                            @foreach($row->note->claims as $claim)
-                            {{ $claim->status }}<br />
-                            <?php foreach ($claim->mbClaims as $mbClaim) : continue; ?>
-                                {{$mbClaim->status}} {{$mbClaim->status_memo}}
-                            <?php endforeach; ?>
-                            @endforeach
+                            <pre>{{$row->claim_statuses}}</pre>
                         </td>
                     </tr>
                     @endforeach
@@ -144,9 +153,6 @@
 
         </div>
     </div>
-    <div class="mt-3">
-        {{$rows->appends(request()->input())->links()}}
-    </div>
 
 
 </div>
@@ -164,34 +170,5 @@ for ($i=0; $i < count($allFilterKeys); $i++) {
 	}
 }
 ?>
-<script>
-	(function() {
-		function init() {
-			new Vue({
-				el: '#admin-billing-report',
-				delimiters: ['@{{', '}}'],
-				data: {
-					filters: <?= json_encode($loadedFilters) ?>
-				},
-				methods: {
-					init: function() {
-
-					},
-					doSubmit: function() {
-						fastLoad('{{ route('practice-management.billing-report') }}?' + $('#admin-billing-report-form').serialize());
-						return false;
-					}
-				},
-				mounted: function() {
-					console.log(this.filters);
-					this.init();
-				},
-			});
-
-
-		}
-		addMCInitializer('admin-billing-report', init, '#admin-billing-report');
-	})();
-</script>
 
 @endsection

resources/views/app/practice-management/bills.blade.php

@@ -23,6 +23,7 @@
                 <tr>
                     <th class="px-3 border-0">Created</th>
                     <th class="border-0">Patient</th>
+                    <th class="border-0">Pro</th>
                     <th class="border-0 w-50">Context</th>
                     <th class="border-0">Role</th>
                     <th class="border-0">Amount</th>
@@ -39,6 +40,13 @@
                             <a href="/patients/view/{{ $bill->client->uid }}">{{ $bill->client->displayName() }}</a>
                             @endif
                         </td>
+                        <td class="">
+                            @if($bill->hcp)
+                                {{ $bill->hcp->displayName() }}
+                            @elseif($bill->genericPro)
+                                {{ $bill->genericPro->displayName() }}
+                            @endif
+                        </td>
                         <td class="stag-no-wrap-td">
                             @if($bill->careMonth)
                                 <b>{{ $bill->code }}</b>
@@ -58,66 +66,36 @@
                             @endif
                         </td>
                         <td>
-                            <?php
-                            $roles = [];
-                            if($bill->hcp_pro_id === $pro->id) $roles[] = 'HCP';
-                            if($bill->cm_pro_id === $pro->id) $roles[] = 'CM';
-                            if($bill->rme_pro_id === $pro->id) $roles[] = 'RME';
-                            if($bill->rmm_pro_id === $pro->id) $roles[] = 'RMM';
-                            $roles = implode("<br>", $roles);
-                            ?>
-                            {!! $roles !!}
+                            @if($bill->hcp)
+                                HCP
+                            @elseif($bill->genericPro)
+                                GENERIC
+                            @endif
                         </td>
                         <td>
-                            @if($bill->hcp_pro_id === $pro->id)
+                            @if($bill->hcp_pro_id && ($pro->pro_type === 'ADMIN' || $bill->hcp_pro_id === $pro->id))
                                 @if($bill->has_hcp_been_paid)
                                     <div>
-                                        <span class="text-dark">HCP Received:</span>
-                                        <span class="font-weight-bold text-success ml-2">${{ $bill->hcp_payment_amount }}</span>
+                                        <span class="text-dark">Received:</span>
+                                        <span class="font-weight-bold text-success ml-2">${{ friendly_money($bill->hcp_payment_amount) }}</span>
                                     </div>
                                 @else
                                     <div>
-                                        <span class="text-dark">HCP Expected:</span>
-                                        <span class="font-weight-bold text-dark ml-2">{{ $bill->hcp_expected_payment_amount ? '$' . $bill->hcp_expected_payment_amount : '-' }}</span>
+                                        <span class="text-dark">Expected:</span>
+                                        <span class="font-weight-bold text-dark ml-2">{{ $bill->hcp_expected_payment_amount ? '$' . friendly_money($bill->hcp_expected_payment_amount) : '-' }}</span>
                                     </div>
                                 @endif
                             @endif
-                            @if($bill->cm_pro_id === $pro->id)
-                                @if($bill->has_cm_been_paid)
+                            @if($bill->generic_pro_id && ($pro->pro_type === 'ADMIN' || $bill->generic_pro_id === $pro->id))
+                                @if($bill->has_generic_pro_been_paid)
                                     <div>
-                                        <span class="text-dark">CM Received:</span>
-                                        <span class="font-weight-bold text-success ml-2">${{ $bill->cm_payment_amount }}</span>
+                                        <span class="text-dark">Received:</span>
+                                        <span class="font-weight-bold text-success ml-2">${{ friendly_money($bill->generic_pro_payment_amount) }}</span>
                                     </div>
                                 @else
                                     <div>
-                                        <span class="text-dark">CM Expected:</span>
-                                        <span class="font-weight-bold text-dark ml-2">{{ $bill->cm_expected_payment_amount ? '$' . $bill->cm_expected_payment_amount : '-' }}</span>
-                                    </div>
-                                @endif
-                            @endif
-                            @if($bill->rmm_pro_id === $pro->id)
-                                @if($bill->has_rmm_been_paid)
-                                    <div>
-                                        <span class="text-dark">RMM Received:</span>
-                                        <span class="font-weight-bold text-success ml-2">${{ $bill->rmm_payment_amount }}</span>
-                                    </div>
-                                @else
-                                    <div>
-                                        <span class="text-dark">RMM Expected:</span>
-                                        <span class="font-weight-bold text-dark ml-2">{{ $bill->rmm_expected_payment_amount ? '$' . $bill->rmm_expected_payment_amount : '-' }}</span>
-                                    </div>
-                                @endif
-                            @endif
-                            @if($bill->rme_pro_id === $pro->id)
-                                @if($bill->has_rme_been_paid)
-                                    <div>
-                                        <span class="text-dark">RME Received:</span>
-                                        <span class="font-weight-bold text-success ml-2">${{ $bill->rme_payment_amount }}</span>
-                                    </div>
-                                @else
-                                    <div>
-                                        <span class="text-dark">RME Expected:</span>
-                                        <span class="font-weight-bold text-dark ml-2">{{ $bill->rme_expected_payment_amount ? '$' . $bill->rme_expected_payment_amount : '-' }}</span>
+                                        <span class="text-dark">Expected:</span>
+                                        <span class="font-weight-bold text-dark ml-2">{{ $bill->generic_pro_expected_payment_amount ? '$' . friendly_money($bill->generic_pro_expected_payment_amount) : '-' }}</span>
                                     </div>
                                 @endif
                             @endif
@@ -126,6 +104,10 @@
                 @endforeach
                 </tbody>
             </table>
+
+            <div class="mx-3 mt-3">
+                {{$bills->withQueryString()->links()}}
+            </div>
         </div>
     </div>
     </div>

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

@@ -0,0 +1,123 @@
+@extends ('layouts/template')
+
+@section('content')
+<style>
+	#rm-action-report-filters label {
+		font-weight: bold;
+	}
+
+	#rm-action-report-filters .mw-100px {
+		min-width: 100px;
+	}
+	.filter-container{
+		display: flex;
+		align-items: flex-start;
+		flex-wrap: wrap;
+	}
+	.filter-container >div {
+		width: 165px;
+	}
+	.filter-container >div:not(:last-child) {
+		margin-right: 15px;
+	}
+	.sm-section {
+		width: 150px !important;
+	}
+    thead.border-bottom-0 tr th {
+        border-bottom: none;
+    }
+</style>
+<div id="rm-action-report" class="p-3 mcp-theme-1">
+    <div class="card">
+
+        <div class="card-header px-2 py-1 d-flex align-items-center">
+            <strong class="mr-4">
+                <i class="fas fa-user"></i>
+                Claims Report
+            </strong>
+        </div>
+        <div class="card-body p-0 border-0 table-responsive">
+            <div class="m-2">
+                <form method="GET" action="{{ route('practice-management.claims-report') }}">
+                    <div class="d-flex align-items-baseline">
+                        <div class="form-group my-0 mr-2">
+                            <label class="font-weight-normal mb-1">DOS From</label>
+                            <input name="f_start" type="date" class="form-control form-control-sm" value="{{request()->input('f_start')}}">
+                        </div>
+                        <div class="form-group my-0 mr-2">
+                            <label class="font-weight-normal mb-1">DOS To</label>
+                            <input name="f_end" type="date" class="form-control form-control-sm" value="{{request()->input('f_end')}}">
+                        </div>
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">&nbsp;</label>
+                            <div class=" d-flex">
+                                <button type="button" onclick="return fastLoad('{{  route('practice-management.claims-report') }}?' + $(this).closest('form').serialize())" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+                                <a href="#" onclick="return fastLoad('{{  route('practice-management.claims-report') }}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
+                            </div>
+                        </div>
+                    </div>
+                </form>
+            </div> 
+            <table class="table table-sm table-striped table-bordered border-0 p-0 m-0 text-nowrap">
+                <thead class="bg-light border-bottom-0">
+                    <tr>
+                        <th class="border-left-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.claims-report"), 'label' => 'Insurance', 'key' => 'payer_name'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.claims-report"), 'label' => 'State', 'key' => 'mailing_address_state'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.claims-report"), 'label' => 'Patient', 'key' => 'client_name'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.claims-report"), 'label' => 'DOB', 'key' => 'dob'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.claims-report"), 'label' => 'Provider', 'key' => 'pro_name'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.claims-report"), 'label' => 'Date of Service', 'key' => 'date_of_service'])</th>
+                        <th class="text-secondary">POS</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.claims-report"), 'label' => 'CPT', 'key' => 'cpt'])</th>
+                        <th class="text-secondary">A</th>
+                        <th class="text-secondary">Units</th>
+                        <th class="text-secondary">Charges</th>
+                    </tr>
+                </thead>
+                <tbody>
+                    @foreach ($rows as $row)
+                    <tr class="{{false ? 'bg-light' : ''}}">
+                        <td class="text-nowrap border-left-0">
+                            {{$row->payer_name}}
+                        </td>
+                        <td>
+                            {{$row->mailing_address_state}}
+                        </td>
+                        <td class="">
+                            <a href="/patients/view/{{$row->client_uid}}">
+                                {{$row->client_name}}
+                            </a>
+                        </td>
+                        <td>
+                            {{$row->dob}}
+                        </td>
+                        <td>
+                            {{$row->pro_name}}
+                        </td>
+                        <td>
+                            {{friendly_date($row->date_of_service)}}
+                        </td>
+                        <td>10</td>     <!-- dunno what these are!! -->
+                        <td>{{$row->cpt}}</td>
+                        <td>95</td>     <!-- dunno what these are!! -->
+                        <td>1</td>      <!-- dunno what these are!! -->
+                        <td>
+                            {{$row->cpt ? chargeForCPT($row->cpt) : '-'}}
+                        </td>
+                    </tr>
+                    @endforeach
+                </tbody>
+            </table>
+
+        </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> claims</div>
+        </div>
+    </div>
+
+</div>
+
+@endsection

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

@@ -30,7 +30,7 @@
                         <th class="px-3 border-0">Created</th>
                         <th class="border-0">Effective Date</th>
                         <th class="border-0">Patient</th>
-                        <th class="border-0 w-50">Content</th>
+                        <th class="border-0 w-50">Pro</th>
                     </tr>
                 </thead>
                 <tbody>
@@ -48,6 +48,9 @@
                         <td class="">
                             <a href="/patients/view/{{ $note->client->uid }}">{{ $note->client->displayName() }}</a>
                         </td>
+                        <td class="">
+                            {{ $note->hcpPro ? $note->hcpPro->displayName() : '-' }}
+                        </td>
                         <td class="">
                             <?php
                             $textContent = strip_tags($note->free_text_html);

resources/views/app/practice-management/processing-bill-matrix.blade.php

@@ -75,6 +75,7 @@
                                 </label>
                             </th>
                             <th class="border-bottom-0 border-top-0">Context</th>
+                            <th class="border-bottom-0 border-top-0">Company Pro</th>
                             <th class="border-bottom-0 border-top-0">Effective Date</th>
                             <th class="border-bottom-0 border-top-0">Bal Post Date</th>
                             @if(!request()->input('t') || request()->input('t') === 'hcp')
@@ -109,9 +110,12 @@
                                     Note
                                 </a>
                                 @elseif($row->careMonth)
-                                <a href="/patients/view/{{$row->client->uid}}/care-months/view/{{$row->careMonth->uid}}">
-                                    Care Month
-                                </a>
+                                    <div>
+                                        <a href="/patients/view/{{$row->client->uid}}/care-months/view/{{$row->careMonth->uid}}">
+                                            Care Month
+                                        </a>
+                                    </div>
+                                    
                                 @elseif($row->client)
                                 <a href="/patients/view/{{ $row->client->uid }}">
                                     Chart
@@ -133,23 +137,73 @@
                                     @endif
                                 @endif
                             </td>
+                            <td>
+                                    
+                                @if(!request()->input('t') || request()->input('t') === 'hcp')
+                                    <div class="mt-1 text-secondary">
+                                        @if($row->hcpCompanyPro)
+                                            {{$row->hcpCompanyPro ? $row->hcpCompanyPro->company->name : '-'}}
+                                        @else 
+                                            <i>[company pro is not set]</i>
+                                        @endif
+                                        <div moe class="ml-1">
+                                            <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
+                                            <form url="/api/bill/swapHcpCompanyPro">
+                                                <input type="hidden" name="uid" value="{{$row->uid}}">
+                                                <div class="mb-2">
+                                                    <select name="hcpCompanyProUid" class="form-control form-control-sm">
+                                                        <option value="">-- select --</option>
+                                                        @foreach($row->hcp->companyPros as $companyPro)
+                                                            <option value="{{$companyPro->uid}}">{{$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>
+                                    </div>
+                                @elseif(request()->input('t') === 'na')
+                                    
+                                    <div class="mt-1 text-secondary">
+                                        @if($row->genericCompanyPro && $row->genericCompanyPro->company)
+                                            {{$row->genericCompanyPro->company->name}}
+                                        @else 
+                                            <i>[company pro is not set]</i>
+                                        @endif
+                                        <div moe class="">
+                                            <a class="text-primary" href="" show start><i class="fa fa-edit"></i></a>
+                                            <form url="/api/bill/swapGenericCompanyPro">
+                                                <input type="hidden" name="uid" value="{{$row->uid}}">
+                                                <div class="mb-2">
+                                                    <select name="genericCompanyProUid" class="form-control form-control-sm">
+                                                        <option value="">-- select --</option>
+                                                        @foreach($row->genericPro->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>
+                                    </div>
+                                    
+                                @endif
+                                    
+                            </td>
                             <td>{{friendly_date($row->effective_date)}}</td>
                             <td>{{friendly_date($row->balance_post_date)}}</td>
                             <td>
+
                                 @if(!request()->input('t') || request()->input('t') === 'hcp')
-                                {{$row->hcp->name_last}}, {{$row->hcp->name_first}}
-                                <div class="mt-1 text-sm text-secondary">
-                                    <i class="fa fa-hospital mr-1"></i>
-                                    {{$row->hcpCompanyPro ? $row->hcpCompanyPro->company->name:''}}
-                                </div>
+                                    {{$row->hcp->name_last}}, {{$row->hcp->name_first}}
                                 @elseif(request()->input('t') === 'na')
-                                {{$row->genericPro->name_last}}, {{$row->genericPro->name_first}}
-                                <div class="mt-1 text-sm text-secondary">
-                                    <i class="fa fa-hospital mr-1"></i>
-                                    @if($row->genericCompanyPro && $row->genericCompanyPro->company)
-                                        {{$row->genericCompanyPro->company->name}}
-                                    @endif
-                                </div>
+                                    {{$row->genericPro->name_last}}, {{$row->genericPro->name_first}}
                                 @endif
 
                             </td>
@@ -164,7 +218,7 @@
                                 @endif
                             </td>
                             <td>{{str_contains($row->code, 'Treatment Services') || str_contains($row->code, 'Administrative Services') ? ceil((float) $row->number_of_units * 60) . ' mins' : $row->number_of_units}}</td>
-                            <td>{!! $row->is_verified ? 'Yes<br>' . friendly_date($row->marked_verified_at, true) : 'No' !!} </td>
+                            <td>{!! $row->is_verified ? '<i class="fa fa-check text-success"></i> ' . friendly_date($row->marked_verified_at, true) : 'No' !!} </td>
                             @if(!request()->input('t') || request()->input('t') === 'hcp')
                             <td>${{$row->hcp_expected_payment_amount}}</td>
                             @elseif(request()->input('t') === 'na')

resources/views/app/practice-management/remote-monitoring-row-markup-by-pro-type.blade.php

@@ -234,44 +234,51 @@
     <td>
         @if($mode === 'mcp')
             @if($lastVisitWithin90Days && $iPatient->has_mcp_interacted_with_client_about_rm && $iPatient->number_of_days_with_remote_measurements >= 16 && $iPatient->rm_total_time_in_seconds_by_mcp >= 1200)
-                <span class="text-success font-weight-bold">
-                    <i class="fa fa-check"></i>
-                    ${{friendly_money($pro->mcp_rpm_payment_amount, 0)}}
-                </span>
-                {{--
-                @if($iPatient->mcp_rm_generic_bill_uid)
-                    ${{friendly_money($iPatient->mcp_rm_generic_bill_expected_payment_amount)}}
-                    @if($iPatient->mcp_rm_generic_bill_signed)
-                        <div moe relative
-                             class="d-inline-block {{ $iPatient->mcp_rm_generic_bill_generic_pro_id !== $pro->id ? 'moe-disabled' : '' }}"
-                             title="{{ $iPatient->mcp_rm_generic_bill_generic_pro_id !== $pro->id ? 'Only the bill\'s pro can sign' : '' }}">
-                            <a class="font-weight-bold" href="" show start>Sign</a>
-                            <form url="/api/bill/signAsGenericPro" right>
-                                <input type="hidden" name="uid" value="{{$iPatient->mcp_rm_generic_bill_uid}}">
-                                <p>Sign this bill?</p>
+                @php
+                    $careMonth = \App\Models\CareMonth::where('uid', $iPatient->care_month_uid)->first();
+                @endphp
+                @if($careMonth->mcpRmGenericBill == null )
+
+                    @php
+                        $rpmBillability = $careMonth->calculateBillabilityForMcp();
+                    @endphp
+
+                    @if(!$rpmBillability['billable'])
+                        <div class="alert alert-info">{{$rpmBillability['reason']}}</div>
+                    @else
+                        <div moe relative class="d-inline-block">
+                            <a class="font-weight-normal" href="" show start>Bill ${{$rpmBillability['amount']}}</a>
+                            <form url="/api/careMonth/generateRmGenericBillForMcpAndAutoSign" right>
+                                <input type="hidden" name="uid" value="{{$careMonth->uid}}">
+                                <p>Bill ${{$rpmBillability['amount']}} for this care month?</p>
                                 <div class="mb-0">
-                                    <button class="btn btn-success btn-sm" submit>Sign</button>
+                                    <button class="btn btn-success btn-sm" submit>Bill &amp; Sign</button>
                                     <button class="btn btn-default border btn-sm" cancel>Cancel</button>
                                 </div>
                             </form>
                         </div>
-                    @else
-                        <span class="text-success">Signed</span>
                     @endif
                 @else
-                    <div moe relative class="d-inline-block">
-                        <a class="font-weight-bold" href="" show start>Bill</a>
-                        <form url="/api/careMonth/generateRmGenericBillForMcpAndAutoSign" right>
-                            <input type="hidden" name="uid" value="{{$iPatient->care_month_uid}}">
-                            <p>Bill for this care month and sign it?</p>
-                            <div class="mb-0">
-                                <button class="btn btn-success btn-sm" submit>Bill &amp; Sign</button>
-                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                    <div class="font-weight-bold">
+                        <span class="text-success font-weight-normal">
+                            Billed: ${{$careMonth->mcpRmGenericBill->generic_pro_expected_payment_amount}}
+                            <i class="fa fa-check"></i>
+                        </span>
+                        @if(!$careMonth->mcpRmGenericBill->is_signed_by_generic_pro)
+                            <div moe relative class="d-inline-block ml-1">
+                                <a class="font-weight-bold" href="" show start>Sign</a>
+                                <form url="/api/bill/signAsGenericPro" right>
+                                    <input type="hidden" name="uid" value="{{$careMonth->mcpRmGenericBill->uid}}">
+                                    <p>Sign this bill?</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>
-                        </form>
+                        @endif
                     </div>
                 @endif
-                --}}
             @else
                 <span class="text-danger font-weight-normal">
                     No

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

@@ -11,9 +11,9 @@
            class="text-nowrap d-block max-width-170px overflow-hidden text-ellipsis"
         ><span class="sort-data">{{ $iPatient->client_name }}</span></a>
     </td>
+    <td>{{$iPatient->payer_name}}</td>
+    <td>{{$iPatient->mailing_address_state}}</td>
     <td>{{$iPatient->mcp_name}}</td>
-    <td>{{$iPatient->age_in_years}}</td>
-    {{--<td>{!! $iPatient->is_enrolled_in_rm === 'YES' ? '<i class="fa fa-check text-success"></i>' : 'No' !!}</td>--}}
     <td>
         @if($iPatient->is_assigned_cellular_bp_device)
             <div class="d-flex align-items-baseline">
@@ -50,6 +50,9 @@
             <span class="text-secondary">No</span>
         @endif
     </td>
+    <td>
+        {{$iPatient->dslm}}
+    </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>
@@ -57,6 +60,10 @@
         </div>
     </td>
 
+    <td>
+        {{$iPatient->next_visit_date ?: '-'}}
+    </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>

resources/views/app/practice-management/rm-action-report.blade.php

@@ -21,7 +21,7 @@
 		margin-right: 15px;
 	}
 	.sm-section {
-		width: 250px !important;
+		width: 150px !important;
 	}
     thead.border-bottom-0 tr th {
         border-bottom: none;
@@ -38,70 +38,123 @@
         </div>
         <div class="card-body p-0 border-0 table-responsive">
             <div class="m-2">
-                <form id="rm-action-report-filters" method="GET" action="{{ route('practice-management.rmActionReport') }}" class="filter-container" v-cloak>
+                <form id="rm-action-report-filters" method="GET" action="{{ route('practice-management.rmActionReport') }}" class="filter-container">
                     <div class="sm-section">
-                        <div class="form-group">
-                            <label>Month/Year</label>
-                            <input name="care_month_year" type="month" class="form-control input-sm" v-model="filters.care_month_year">
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">Month/Year</label>
+                            <input name="care_month_year" type="month" class="form-control input-sm" value="{{request()->input('care_month_year')}}">
                         </div>
                     </div>
-                    <!-- <div class="sm-section">
-                        <div class="form-group">
-                            <label>Care Month Start Date:</label>
-                            <input name="care_month_start_date" type="date" class="form-control input-sm" v-model="filters.care_month_start_date">
+                    <div class="sm-section">
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">Claiming Closed:</label>
+                            <select name="claiming_closed" class="form-control input-sm">
+                                <option {{request()->input('claiming_closed') === '' ? 'selected' : ''}} value="">All</option>
+                                <option {{request()->input('claiming_closed') === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                                <option {{request()->input('claiming_closed') === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="sm-section">
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">Measurement Days:</label>
+                            <select name="num_of_measurements" class="form-control input-sm">
+                                <option {{request()->input('num_of_measurements') === '' ? 'selected' : ''}} value="">All</option>
+                                <option {{request()->input('num_of_measurements') === '16_or_more' ? 'selected' : ''}} value="16_or_more">16 or more</option>
+                                <option {{request()->input('num_of_measurements') === 'min_or_more' ? 'selected' : ''}} value="min_or_more">{{$minRequiredMeasurements}} or more</option>
+                                <option {{request()->input('num_of_measurements') === 'less_than_min' ? 'selected' : ''}} value="less_than_min">Less than {{$minRequiredMeasurements}}</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="sm-section">
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">Visit in 90 days:</label>
+                            <select name="has_recent_visit" class="form-control input-sm">
+                                <option {{request()->input('has_recent_visit') === '' ? 'selected' : ''}} value="">All</option>
+                                <option {{request()->input('has_recent_visit') === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                                <option {{request()->input('has_recent_visit') === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                            </select>
+                        </div>
+                    </div>
+
+                    <div class="sm-section">
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">Comm. this month:</label>
+                            <select name="has_been_spoken_to" class="form-control input-sm">
+                                <option {{request()->input('has_been_spoken_to') === '' ? 'selected' : ''}} value="">All</option>
+                                <option {{request()->input('has_been_spoken_to') === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                                <option {{request()->input('has_been_spoken_to') === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                            </select>
                         </div>
-                    </div> -->
+                    </div>
+
                     <div class="sm-section">
-                        <div class="form-group">
-                            <label>Claiming Closed:</label>
-                            <select name="claiming_closed" class="form-control input-sm" v-model="filters.claiming_closed">
-                                <option value="">All</option>
-                                <option value="YES">Yes</option>
-                                <option value="NO">No</option>
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">MCP:</label>
+                            <select name="mcp_uid" class="form-control input-sm" provider-search provider-type="hcp" data-pro-uid="{{request()->input('mcp_uid')}}"></select>
+                        </div>
+                    </div>
+
+                    <div class="sm-section">
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">Status:</label>
+                            <select name="status" class="form-control input-sm">
+                                <option value="ACTIVE">Active</option>
+                                <option {{request()->input('status') === 'INACTIVE' ? 'selected' : ''}} value="INACTIVE">Inactive</option>
+                                <option {{request()->input('status') === 'ENTRY_ERROR' ? 'selected' : ''}} value="ENTRY_ERROR">Entry Error</option>
+                                <option {{request()->input('status') === 'DUMMY' ? 'selected' : ''}} value="DUMMY">Test Chart</option>
+                                <option {{request()->input('status') === 'DECEASED' ? 'selected' : ''}} value="DECEASED">Deceased</option>
+                                <option {{request()->input('status') === 'DUPLICATE' ? 'selected' : ''}} value="DUPLICATE">Duplicate</option>
+                                <option {{request()->input('status') === 'NO_LONGER_INTERESTED' ? 'selected' : ''}} value="NO_LONGER_INTERESTED">No Longer Interested</option>
+                                <option {{request()->input('status') === 'BAD_RECORD' ? 'selected' : ''}} value="BAD_RECORD">Bad Record</option>
+                                <option {{request()->input('status') === 'NO_LONGER_ELIGIBLE' ? 'selected' : ''}} value="NO_LONGER_ELIGIBLE">No Longer Eligible</option>
                             </select>
                         </div>
                     </div>
 
                     <div class="sm-section">
-                        <div class="form-group">
-                            <label>Number Of Measurement Days:</label>
-                            <select name="num_of_measurements" class="form-control input-sm" v-model="filters.num_of_measurements">
-                                <option value="">All</option>
-                                <option value="16_or_more">16 or more</option>
-                                <option value="min_or_more">{{$minRequiredMeasurements}} or more</option>
-                                <option value="less_than_min">Less than {{$minRequiredMeasurements}}</option>
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">Eligible for RM:</label>
+                            <select name="rm_eligible" class="form-control input-sm">
+                                <option {{request()->input('rm_eligible') === '' ? 'selected' : ''}} value="">All</option>
+                                <option {{request()->input('rm_eligible') === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                                <option {{request()->input('rm_eligible') === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                                <option {{request()->input('rm_eligible') === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
                             </select>
                         </div>
                     </div>
 
                     <div class="sm-section">
-                        <div class="form-group">
-                            <label>Has had visit in the last 90 days:</label>
-                            <select name="has_recent_visit" class="form-control input-sm" v-model="filters.has_recent_visit">
-                                <option value="">All</option>
-                                <option value="YES">Yes</option>
-                                <option value="NO">No</option>
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">Eligible for RM:</label>
+                            <select name="rm_enrolled" class="form-control input-sm">
+                                <option {{request()->input('rm_enrolled') === '' ? 'selected' : ''}} value="">All</option>
+                                <option {{request()->input('rm_enrolled') === 'YES' ? 'selected' : ''}} value="YES">Yes</option>
+                                <option {{request()->input('rm_enrolled') === 'NO' ? 'selected' : ''}} value="NO">No</option>
+                                <option {{request()->input('rm_enrolled') === 'UNKNOWN' ? 'selected' : ''}} value="UNKNOWN">Unknown</option>
                             </select>
                         </div>
                     </div>
 
                     <div class="sm-section">
-                        <div class="form-group">
-                            <label>Has been spoken to this month:</label>
-                            <select name="has_been_spoken_to" class="form-control input-sm" v-model="filters.has_been_spoken_to">
-                                <option value="">All</option>
-                                <option value="YES">Yes</option>
-                                <option value="NO">No</option>
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">RM Setup:</label>
+                            <select name="rm_setup" class="form-control input-sm">
+                                <option {{request()->input('rm_setup') === '' ? 'selected' : ''}} value="">All</option>
+                                <option {{request()->input('rm_setup') === 'YES' ? 'selected' : ''}} value="YES">Performed</option>
+                                <option {{request()->input('rm_setup') === 'NO' ? 'selected' : ''}} value="NO">Not Performed</option>
                             </select>
                         </div>
                     </div>
 
                     <div>
-                        <div class="form-group">
-                            <label>&nbsp;</label>
+                        <div class="form-group m-0">
+                            <label class="font-weight-normal mb-1">&nbsp;</label>
                             <div class=" d-flex">
-                                <button type="button" v-on:click.prevent="doSubmit()" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
-                                <a href="#" v-on:click.prevent="fastLoad('{{ route('practice-management.rmActionReport') }}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
+                                <button type="button" onclick="return fastLoad('{{  route('practice-management.rmActionReport') }}?' + $('#rm-action-report-filters').serialize())" class="btn btn-primary btn-sm mr-2"><i class="fas fa-filter"></i> Filter</button>
+                                <a href="#" onclick="return fastLoad('{{  route('practice-management.rmActionReport') }}')" class="btn btn-link btn-sm text-danger">Clear Filters</a>
                             </div>
                         </div>
                     </div>
@@ -110,66 +163,64 @@
             <table class="table table-sm table-striped table-bordered border-0 p-0 m-0 text-nowrap">
                 <thead class="bg-light border-bottom-0">
                     <tr>
-                        <th>Care Month</th>
-                        <th>Patient</th>                        
-                        <th>MCP</th>
-                        <th>RMM</th>
-                        <th>Number of Measurement Days</th>
-                        <th>Most Recent Visit</th>
-                        <th>Most Recent Visit Days Before EOM</th>
-                        <th># Minutes Billed by MCP</th>
-                        <th># Minutes Billed by RMM</th>
-                        <th># Minutes Billed Total</th>
-                        <th>Has Admin interacted?</th>
-                        <th>Has MCP interacted?</th>
-                        <th>Is Payable to MCP?</th>
-                        <th>MCP Bill</th>
-                        <th>Is Payable to RMM?</th>
-                        <th>RMM Bill</th>
-                        <th>Guidance</th>
-                        <th>Claiming Closed?</th>
-                        <th>Claim</th>
-                        <th>Claim Status</th>
-
-                        <th>Has Been Spoken To This Month</th>
-                        <th>Days Since Last Visit</th>
-                        <th>Last Visit Date</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'Month', 'key' => 'start_date'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'Patient', 'key' => 'client_name'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'RM<br>Elig.', 'key' => 'is_eligible_for_rm'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'RM<br>Enrol', 'key' => 'is_enrolled_in_rm'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'RM<br>Setup', 'key' => 'has_rm_setup_been_performed'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'MCP', 'key' => 'mcp_name'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'RMM', 'key' => 'rmm_name'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'Meas.<br>Days', 'key' => 'number_of_days_with_remote_measurements'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'DSLM', 'key' => 'dslm'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'Last<br>Visit', 'key' => 'mr_note_date'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'DSLV', 'key' => 'days_between_most_recent_mcp_note_date_and_end_of_care_month'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'MCP<br>Mins.', 'key' => 'rm_total_time_in_seconds_by_mcp'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'RMM<br>Mins.', 'key' => 'rm_total_time_in_seconds_by_rmm_pro'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'Total<br>Mins.', 'key' => 'rm_total_time_in_seconds'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'Admin<br>Comm.', 'key' => 'has_admin_interacted_with_client_about_rm'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'MCP<br>Comm.', 'key' => 'has_mcp_interacted_with_client_about_rm'])</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'MCP<br>Payable', 'key' => 'mcp_payable'])</th>
+                        <th class="text-secondary">MCP Bill</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'RMM<br>Payable', 'key' => 'rmm_payable'])</th>
+                        <th class="text-secondary">RMM Bill</th>
+                        <th class="text-secondary">Guidance</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'Claiming<br>Closed?', 'key' => 'is_claim_closed'])</th>
+                        <th class="text-secondary">Claim</th>
+                        <th>@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rmActionReport"), 'label' => 'Claim<br>Status', 'key' => 'claim_status'])</th>
                     </tr>
                 </thead>
                 <tbody>
                     @foreach ($rows as $row)
                     <tr class="{{false ? 'bg-light' : ''}}">
                         <td class="text-nowrap border-left-0">
-                            <a href="/patients/view/{{$row->client->uid}}/care-months/view/{{$row->uid}}">
+                            <a href="/patients/view/{{$row->client_uid}}/care-months/view/{{$row->care_month_uid}}">
                                 {{friendly_date_month_year($row->start_date)}}
                             </a>
                         </td>
-                        <td class="text-nowrap border-left-0">
-                            <a href="/patients/view/{{$row->client->uid}}">
-                                {{$row->client->name_first}} {{$row->client->name_last}}
+                        <td class="">
+                            <a href="/patients/view/{{$row->client_uid}}">
+                                {{$row->client_name}}
                             </a>
-                        </td>                        
+                        </td>
+                        <td>{{ucwords(strtolower($row->is_eligible_for_rm))}}</td>
+                        <td>{{ucwords(strtolower($row->is_enrolled_in_rm))}}</td>
+                        <td>{{$row->has_rm_setup_been_performed ? 'Yes' : 'No'}}</td>
                         <td>
-                            @if($row->mcp)
-                                {{$row->mcp->name_first}} {{$row->mcp->name_last}}
-                            @else 
-                                --
-                            @endif
+                            {{$row->mcp_name}}
                         </td>
                         <td>
-                            @if($row->rmmPro)
-                                {{$row->rmmPro->name_first}} {{$row->rmmPro->name_last}}
-                            @else 
-                                --
-                            @endif
+                            {{$row->rmm_name}}
                         </td>
                         <td>
                             {{$row->number_of_days_with_remote_measurements}}
                         </td>
+                        <td>
+                            {{$row->dslm}}
+                        </td>
                         <td>
                             <!-- Most Recent Visit -->
-                            @if($row->client->mostRecentCompletedMcpNote)
-                            <a href="/patients/view/{{ $row->patient->uid }}/notes/view/{{ $row->client->mostRecentCompletedMcpNote->uid }}">{{ friendly_date($row->client->most_recent_completed_mcp_note_date) }}</a>
+                            @if($row->mr_note_uid)
+                                <a href="/patients/view/{{ $row->client_uid }}/notes/view/{{ $row->mr_note_uid }}">{{ friendly_date($row->mr_note_date) }}</a>
                             @else
                                 -
                             @endif
@@ -180,47 +231,39 @@
                         </td>
                         <td>
                             <!-- # Minutes Billed by MCP -->
-                            {{ $row->rm_total_time_in_seconds_by_mcp / 60 }}
+                            {{ round($row->rm_total_time_in_seconds_by_mcp / 60, 2) }}
                         </td>
                         <td>
                             <!-- # Minutes Billed by RMM -->
-                            {{ $row->rm_total_time_in_seconds_by_rmm / 60 }}
+                            {{ round($row->rm_total_time_in_seconds_by_rmm_pro / 60, 2) }}
                         </td>
                         <td>
                             <!-- # Minutes Billed Total -->
-                            {{ $row->rmTotalTimeInSeconds / 60 }}
+                            {{ round($row->rm_total_time_in_seconds / 60, 2) }}
                         </td>
                         <td>
                             <!-- Has Admin interacted? -->
-                            {{ $row->has_admin_interacted_with_client_about_rm }}
+                            {{ $row->has_admin_interacted_with_client_about_rm ? 'Yes' : 'No' }}
                         </td>
                         <td>
                             <!-- Has MCP interacted? -->
-                            {{ $row->has_mcp_interacted_with_client_about_rm }}
+                            {{ $row->has_mcp_interacted_with_client_about_rm ? 'Yes' : 'No' }}
                         </td>
                         <td>
                             <!-- Is Payable to MCP? -->
-                            {{ $row->mcpRmGenericBill ? 'YES':'NO' }}
+                            {{ $row->mcp_payable ? 'Yes' : 'No' }}
                         </td>
                         <td>
                             <!-- MCP Bill -->
-                            @if($row->mcpRmGenericBill)
-                                {{ $row->rmmRmGenericBill->code }}
-                            @else
-                                -
-                            @endif
+                            {{ $row->mcp_rm_bill_code }}
                         </td>
                         <td>
                             <!-- Is Payable to RMM? -->
-                            {{ $row->rmmRmGenericBill ? 'YES':'NO' }}
+                            {{ $row->rmm_payable ? 'Yes' : 'No' }}
                         </td>
                         <td>
                             <!-- RMM Bill -->
-                            @if($row->rmmRmGenericBill)
-                                {{ $row->rmmRmGenericBill->code }}
-                            @else
-                                -
-                            @endif
+                            {{ $row->rmm_rm_bill_code }}
                         </td>
                         <td>
                             <?php
@@ -238,50 +281,12 @@
                             {{ $row->is_claim_closed ? 'YES':'NO' }}
                         </td>
                         <td>
-                            <div class="d-flex justify-content-between">
-                                <div>
-                                    @foreach($row->claims as $claim)
-                                        <div class="d-flex flex-column">
-                                            @foreach($claim->lines as $claimLine)
-                                            <span><i class="fas fa-check-circle" style="color: #8bc34a;"></i> {{$claimLine->cpt}}</span>
-                                            @endforeach
-                                        </div>                                
-                                    @endforeach
-                                </div>
-                                
-                            </div>
+                            <div>{{@$row->cpts}}</div>
                             @include('app.patient.care-month._create-claim-table-action', ['careMonth' => $row])
                         </td>
                         <td>
-                            <?php $rowFirstClaim = $row->claims->first(); ?>
-                            @if($rowFirstClaim)
-                                <span class="mr-2"><b>{{$rowFirstClaim->status}}</b></span>
-                                @include('app.patient.care-month.update-claim-status', ['claim' => $rowFirstClaim])
-                            @endif
-                        </td>
-                        <td>
-                            {{$row->has_anyone_interacted_with_client_about_rm_outside_note? 'YES': 'NO'}}
-                        </td>
-                        <td>
-                            @if($row->client->most_recent_completed_mcp_note_date)
-                                @php 
-                                    $date1 = new DateTime(friendly_date($row->client->most_recent_completed_mcp_note_date));
-                                    $date2 = new DateTime(get_current_date());
-                                    $diff = $date1->diff($date2);
-                                @endphp 
-                                {{ $diff->days}}
-                            @else 
-                            --
-                            @endif
-                        </td>
-                        <td>
-                            @if($row->client->mostRecentCompletedMcpNote)
-                            <a href="/patients/view/{{$row->client->uid}}/notes/view/{{$row->client->mostRecentCompletedMcpNote->uid}}">
-                                {{friendly_date($row->client->most_recent_completed_mcp_note_date)}}
-                            </a>
-                            @else 
-                            --
-                            @endif
+                            {{$row->claim_status}}
+                            @include('app.patient.care-month.update-claim-status', ['uid' => $row->claim_uid, 'status' => $row->claim_status])
                         </td>
                     </tr>
                     @endforeach
@@ -290,55 +295,13 @@
 
         </div>
     </div>
-    <div class="mt-3">
-        {{$rows->appends(request()->input())->links()}}
+    <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> care months</div>
+        </div>
     </div>
 
 </div>
-<?php
-$loadedFilters = $filters;
-$allFilterKeys = [
-	'care_month_start_date',
-    'care_month_year',
-    'claiming_closed',
-    'num_of_measurements',
-    'has_recent_visit',
-    'has_been_spoken_to',
-];
-for ($i=0; $i < count($allFilterKeys); $i++) {
-	if (!isset($loadedFilters[$allFilterKeys[$i]]) || !$loadedFilters[$allFilterKeys[$i]]) {
-		$loadedFilters[$allFilterKeys[$i]] = '';
-	}
-}
-?>
-
-<script>
-	(function() {
-		function init() {
-			new Vue({
-				el: '#rm-action-report-filters',
-				delimiters: ['@{{', '}}'],
-				data: {
-					filters: <?= json_encode($loadedFilters) ?>
-				},
-				methods: {
-					init: function() {
-
-					},
-					doSubmit: function() {
-						fastLoad('{{  route('practice-management.rmActionReport') }}?' + $('#rm-action-report-filters').serialize());
-						return false;
-					}
-				},
-				mounted: function() {
-					console.log(this.filters);
-					this.init();
-				},
-			});
-
 
-		}
-		addMCInitializer('rm-action-report-filters', init, '#rm-action-report-filters');
-	})();
-</script>
 @endsection

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

@@ -1,5 +1,5 @@
 <div class="d-flex align-items-stretch m-0 h-100">
-    @if(!request()->input('not-enrolled'))
+    {{--@if(!request()->input('not-enrolled'))
         <div class="overflow-auto border-right h-100 rpm-matrix-left-column">
             @if(request()->input('f_mcp'))
                 @include('app.stat-tree.summary', ['slug' => 'rm-tree-mcp', 'showForPro' => $pro, 'noDropVisualize' => true, 'stParams' => ['start_date' => $rcmStartDate]])
@@ -7,7 +7,7 @@
                 @include('app.stat-tree.summary', ['slug' => 'rm-tree-admin', 'noDropVisualize' => true, 'stParams' => ['start_date' => $rcmStartDate]])
             @endif
         </div>
-    @endif
+    @endif--}}
     <div class="flex-grow-1 px-0 overflow-auto h-100 rpm-matrix-right-column">
         <?php $trIndex = 0; ?>
         @foreach ($patients as $iPatient)
@@ -24,21 +24,24 @@
         <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></th>
-                <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' => 'CM MCP', 'key' => 'mcp_name'])</th>
-                <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Age', 'key' => 'age_in_years'])</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"></th>
+                <th class="border-0 pl-2">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Name', 'key' => 'client_name'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Insurance', 'key' => 'payer_name'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'State', 'key' => 'mailing_address_state'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'CM MCP', 'key' => 'mcp_name'])</th>
+                {{--<th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'RPM?', 'key' => 'is_enrolled_in_rm'])</th>--}}
                 <th class="border-0 text-secondary">BP</th>
                 <th class="border-0 text-secondary">Scale</th>
-                <th class="border-0">@include('app.practice-management._sort_header', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'DSLV', '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' => '<i class="text-sm fa fa-phone rotateh"></i> MCP', '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' => '<i class="text-sm fa fa-phone rotateh"></i> Any', 'key' => 'has_anyone_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.<br>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<br>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<br>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<br>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<br>Mins.', 'key' => 'rm_total_time_in_seconds_by_rmm_pro'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'DSLM', 'key' => 'dslm'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'DSLV', 'key' => 'most_recent_completed_mcp_note_date'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => 'Next<br>Visit', 'key' => 'next_visit_date'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '<i class="text-sm fa fa-phone rotateh"></i> MCP', 'key' => 'has_mcp_interacted_with_client_about_rm'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '<i class="text-sm fa fa-phone rotateh"></i> Any', 'key' => 'has_anyone_interacted_with_client_about_rm'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '#Meas.<br>Days', 'key' => 'number_of_days_with_remote_measurements'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '#MCP<br>Unst.', 'key' => 'rm_num_measurements_not_stamped_by_mcp'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '#RMM<br>Unst.', 'key' => 'rm_num_measurements_not_stamped_by_rmm'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '#MCP<br>Mins.', 'key' => 'rm_total_time_in_seconds_by_mcp'])</th>
+                <th class="border-0">@include('app.practice-management._sort_header_multi', ['route' => route("practice-management.rpm-matrix-admin"), 'label' => '#RMM<br>Mins.', 'key' => 'rm_total_time_in_seconds_by_rmm_pro'])</th>
                 <th class="border-0 text-secondary">MCP</th>
                 <th class="border-0 text-secondary">RMM</th>
                 <th class="border-0 text-secondary">454</th>

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

@@ -87,14 +87,95 @@
                             </select>
                         </div>
 
-                        <div>
+                        <div class="max-width-110px mr-2">
                             <label class="mb-0 text-sm {{request()->input('f_name') ? 'font-weight-bold text-info' : 'text-secondary'}}">Name</label>
                             <input type="text"
-                                   class="mr-2 form-control form-control-sm min-width-unset max-width-110px"
+                                   class="form-control form-control-sm min-width-unset max-width-110px"
                                    name="f_name" value="{{request()->input('f_name')}}">
                         </div>
 
                         <div class="max-width-110px mr-2">
+                            <label class="mb-0 text-sm {{request()->input('f_payer_type') ? 'font-weight-bold text-info' : 'text-secondary'}}">Payer Type</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_payer_type"
+                                        class=" form-control form-control-sm min-width-unset width-140px pl-0">
+                                    <option value="">Any</option>
+                                    <option {{request()->input('f_payer_type') === 'Medicare' ? 'selected' : ''}} value="Medicare">Medicare</option>
+                                    <option {{request()->input('f_payer_type') === 'Non Medicare' ? 'selected' : ''}} value="Non Medicare">Non Medicare</option>
+                                    <option {{request()->input('f_payer_type') === 'Medicaid' ? 'selected' : ''}} value="Medicaid">Medicaid</option>
+                                    <option {{request()->input('f_payer_type') === 'Commercial' ? 'selected' : ''}} value="Commercial">Commercial</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="max-width-110px mr-2">
+                            <label class="mb-0 text-sm {{request()->input('f_payer') ? 'font-weight-bold text-info' : 'text-secondary'}}">Comm. Payer</label>
+                            <input name="f_payer" class="form-control form-control-sm min-width-unset" value="{{request()->input('f_payer')}}" autocomplete="off" stag-suggest stag-suggest-ep="/search-payer/json" />
+                        </div>
+
+                        <div class="max-width-110px mr-2">
+                            <label class="mb-0 text-sm {{request()->input('f_state') ? 'font-weight-bold text-info' : 'text-secondary'}}">State</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_state"
+                                        class=" form-control form-control-sm min-width-unset pl-0">
+                                    <option value="">Any</option>
+                                    <option {{request()->input('f_state') === 'NONE' ? 'selected' : ''}} value="NONE">Not Available</option>
+                                    <option {{request()->input('f_state') === 'NOT_MD' ? 'selected' : ''}} value="NOT_MD">Not MD</option>
+                                    <option {{request()->input('f_state') === 'AL' ? 'selected' : ''}} value="AL">Alabama</option>
+                                    <option {{request()->input('f_state') === 'AK' ? 'selected' : ''}} value="AK">Alaska</option>
+                                    <option {{request()->input('f_state') === 'AZ' ? 'selected' : ''}} value="AZ">Arizona</option>
+                                    <option {{request()->input('f_state') === 'AR' ? 'selected' : ''}} value="AR">Arkansas</option>
+                                    <option {{request()->input('f_state') === 'CA' ? 'selected' : ''}} value="CA">California</option>
+                                    <option {{request()->input('f_state') === 'CO' ? 'selected' : ''}} value="CO">Colorado</option>
+                                    <option {{request()->input('f_state') === 'CT' ? 'selected' : ''}} value="CT">Connecticut</option>
+                                    <option {{request()->input('f_state') === 'DE' ? 'selected' : ''}} value="DE">Delaware</option>
+                                    <option {{request()->input('f_state') === 'FL' ? 'selected' : ''}} value="FL">Florida</option>
+                                    <option {{request()->input('f_state') === 'GA' ? 'selected' : ''}} value="GA">Georgia</option>
+                                    <option {{request()->input('f_state') === 'HI' ? 'selected' : ''}} value="HI">Hawaii</option>
+                                    <option {{request()->input('f_state') === 'ID' ? 'selected' : ''}} value="ID">Idaho</option>
+                                    <option {{request()->input('f_state') === 'IL' ? 'selected' : ''}} value="IL">Illinois</option>
+                                    <option {{request()->input('f_state') === 'IN' ? 'selected' : ''}} value="IN">Indiana</option>
+                                    <option {{request()->input('f_state') === 'IA' ? 'selected' : ''}} value="IA">Iowa</option>
+                                    <option {{request()->input('f_state') === 'KS' ? 'selected' : ''}} value="KS">Kansas</option>
+                                    <option {{request()->input('f_state') === 'KY' ? 'selected' : ''}} value="KY">Kentucky</option>
+                                    <option {{request()->input('f_state') === 'LA' ? 'selected' : ''}} value="LA">Louisiana</option>
+                                    <option {{request()->input('f_state') === 'ME' ? 'selected' : ''}} value="ME">Maine</option>
+                                    <option {{request()->input('f_state') === 'MD' ? 'selected' : ''}} value="MD">Maryland</option>
+                                    <option {{request()->input('f_state') === 'MA' ? 'selected' : ''}} value="MA">Massachusetts</option>
+                                    <option {{request()->input('f_state') === 'MI' ? 'selected' : ''}} value="MI">Michigan</option>
+                                    <option {{request()->input('f_state') === 'MN' ? 'selected' : ''}} value="MN">Minnesota</option>
+                                    <option {{request()->input('f_state') === 'MS' ? 'selected' : ''}} value="MS">Mississippi</option>
+                                    <option {{request()->input('f_state') === 'MO' ? 'selected' : ''}} value="MO">Missouri</option>
+                                    <option {{request()->input('f_state') === 'MT' ? 'selected' : ''}} value="MT">Montana</option>
+                                    <option {{request()->input('f_state') === 'NE' ? 'selected' : ''}} value="NE">Nebraska</option>
+                                    <option {{request()->input('f_state') === 'NV' ? 'selected' : ''}} value="NV">Nevada</option>
+                                    <option {{request()->input('f_state') === 'NH' ? 'selected' : ''}} value="NH">New Hampshire</option>
+                                    <option {{request()->input('f_state') === 'NJ' ? 'selected' : ''}} value="NJ">New Jersey</option>
+                                    <option {{request()->input('f_state') === 'NM' ? 'selected' : ''}} value="NM">NewMexico</option>
+                                    <option {{request()->input('f_state') === 'NY' ? 'selected' : ''}} value="NY">New York</option>
+                                    <option {{request()->input('f_state') === 'NC' ? 'selected' : ''}} value="NC">North Carolina</option>
+                                    <option {{request()->input('f_state') === 'ND' ? 'selected' : ''}} value="ND">North Dakota</option>
+                                    <option {{request()->input('f_state') === 'OH' ? 'selected' : ''}} value="OH">Ohio</option>
+                                    <option {{request()->input('f_state') === 'OK' ? 'selected' : ''}} value="OK">Oklahoma</option>
+                                    <option {{request()->input('f_state') === 'OR' ? 'selected' : ''}} value="OR">Oregon</option>
+                                    <option {{request()->input('f_state') === 'PA' ? 'selected' : ''}} value="PA">Pennsylvania</option>
+                                    <option {{request()->input('f_state') === 'RI' ? 'selected' : ''}} value="RI">RhodeIsland</option>
+                                    <option {{request()->input('f_state') === 'SC' ? 'selected' : ''}} value="SC">South Carolina</option>
+                                    <option {{request()->input('f_state') === 'SD' ? 'selected' : ''}} value="SD">South Dakota</option>
+                                    <option {{request()->input('f_state') === 'TN' ? 'selected' : ''}} value="TN">Tennessee</option>
+                                    <option {{request()->input('f_state') === 'TX' ? 'selected' : ''}} value="TX">Texas</option>
+                                    <option {{request()->input('f_state') === 'UT' ? 'selected' : ''}} value="UT">Utah</option>
+                                    <option {{request()->input('f_state') === 'VT' ? 'selected' : ''}} value="VT">Vermont</option>
+                                    <option {{request()->input('f_state') === 'VA' ? 'selected' : ''}} value="VA">Virginia</option>
+                                    <option {{request()->input('f_state') === 'WA' ? 'selected' : ''}} value="WA">Washington</option>
+                                    <option {{request()->input('f_state') === 'WV' ? 'selected' : ''}} value="WV">West Virginia</option>
+                                    <option {{request()->input('f_state') === 'WI' ? 'selected' : ''}} value="WI">Wisconsin</option>
+                                    <option {{request()->input('f_state') === 'WY' ? 'selected' : ''}} value="WY">Wyoming</option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="max-width-110px mr-2 position-relative">
                             <label class="mb-0 text-sm {{request()->input('f_mcp') ? 'font-weight-bold text-info' : 'text-secondary'}}">MCP</label>
                             <select name="f_mcp" class="form-control form-control-sm min-width-unset" provider-search provider-type="hcp" data-pro-uid="{{request()->input('f_mcp')}}">
                                 <option value="">--select--</option>
@@ -118,16 +199,21 @@
                             </div>
                         </div>
 
-                        {{--<div>
-                            <label class="mb-0 text-sm {{request()->input('f_rpm') && request()->input('f_rpm') !== 'any' ? 'font-weight-bold 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 class="max-width-110px">
+                            <label class="mb-0 text-sm {{request()->input('f_claim_closed') ? 'font-weight-bold text-info' : 'text-secondary'}}">Claim Closed</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_claim_closed"
+                                        class="mr-1 form-control form-control-sm min-width-unset pl-0">
+                                    <option value="">All</option>
+                                    <option {{request()->input('f_claim_closed') === 'yes' ? 'selected' : ''}} value="yes">Closed</option>
+                                    <option {{request()->input('f_claim_closed') === 'no' ? 'selected' : ''}} value="no">Not Closed</option>
+                                </select>
+                            </div>
+                        </div>
+
+                    </div>
 
+                    <div class="d-flex align-items-start mt-2">
                         <div>
                             <label class="mb-0 text-sm {{request()->input('f_cell_bp') && request()->input('f_cell_bp') !== 'any' ? 'font-weight-bold text-info' : 'text-secondary'}}">Cell. BP</label>
                             <select name="f_cell_bp"
@@ -237,27 +323,34 @@
                             </div>
                         </div>
 
-                        {{--
                         <div>
-                            <label class="mb-0 text-sm {{request()->input('f_mcp_billable') && request()->input('f_mcp_billable') !== 'any' ? 'font-weight-bold 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>
+                            <label class="mb-0 text-sm {{request()->input('f_dslm') ? 'font-weight-bold text-info' : 'text-secondary'}}">DSLM</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_dslm_op"
+                                        class="mr-1 form-control form-control-sm min-width-unset width-40px pl-0">
+                                    <option {{request()->input('f_dslm_op') === '=' ? 'selected' : ''}} value="=">&equals;</option>
+                                    <option {{request()->input('f_dslm_op') === '>' ? 'selected' : ''}} value=">">&gt;</option>
+                                    <option {{request()->input('f_dslm_op') === '<' ? 'selected' : ''}} value="<">&lt;</option>
+                                    <option {{request()->input('f_dslm_op') === '>=' ? 'selected' : ''}} value=">=">&ge;</option>
+                                    <option {{request()->input('f_dslm_op') === '<=' ? 'selected' : ''}} value="<=">&le;</option>
+                                </select>
+                                <input type="number" name="f_dslm"
+                                       value="{{request()->input('f_dslm')}}"
+                                       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_billable') && request()->input('f_rmm_billable') !== 'any' ? 'font-weight-bold 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 class="max-width-110px">
+                            <label class="mb-0 text-sm {{request()->input('f_visit_90_days') ? 'font-weight-bold text-info' : 'text-secondary'}}">Visit 90 Days</label>
+                            <div class="d-flex align-items-start">
+                                <select name="f_visit_90_days"
+                                        class="mr-2 form-control form-control-sm min-width-unset pl-0">
+                                    <option value="">All</option>
+                                    <option {{request()->input('f_visit_90_days') === 'yes' ? 'selected' : ''}} value="yes">Closed</option>
+                                    <option {{request()->input('f_visit_90_days') === 'no' ? 'selected' : ''}} value="no">Not Closed</option>
+                                </select>
+                            </div>
+                        </div>-->
 
                         <div>
                             <label class="mb-0 text-sm text-secondary">&nbsp;</label>
@@ -285,16 +378,18 @@
                            onclick="$('[name=not-enrolled]').val('1'); return fastLoad('{{route('practice-management.rpm-matrix-admin')}}?' + $('#rpm-matrix-filter').serialize());"
                            tab-link="no-rpm">Not Enrolled in RPM</a>
                     </div>
-                    <div class="d-inline-flex align-items-baseline ml-auto mb-0-pagination">
-                        <div class="mr-2"><b>{{$paginator->firstItem()}}</b> to <b>{{$paginator->lastItem()}}</b> (page {{$paginator->currentPage()}}) of <b>{{$paginator->total()}}</b> care months</div>
-                        {!! $paginator->onEachSide(2)->withQueryString()->links() !!}
-                        <select class="form-control form-control-sm min-width-unset width-100px px-2 ml-2" onchange="fastLoad('{{ route('practice-management.rpm-matrix-admin') }}?{{queryLineExcept(['per_page', 'page'])}}&per_page=' + this.value)">
-                            <option {{$perPage == 25 ? 'selected' : ''}} value="25">25/page</option>
-                            <option {{$perPage == 50 ? 'selected' : ''}} value="50">50/page</option>
-                            <option {{$perPage == 75 ? 'selected' : ''}} value="75">75/page</option>
-                            <option {{$perPage == 100 ? 'selected' : ''}} value="100">100/page</option>
-                        </select>
-                    </div>
+                    @if($paginator->total())
+                        <div class="d-inline-flex align-items-baseline ml-auto mb-0-pagination">
+                            <div class="mr-2"><b>{{$paginator->firstItem()}}</b> to <b>{{$paginator->lastItem()}}</b> (page {{$paginator->currentPage()}}) of <b>{{$paginator->total()}}</b> care months</div>
+                            {!! $paginator->onEachSide(2)->withQueryString()->links() !!}
+                            <select class="form-control form-control-sm min-width-unset width-100px px-2 ml-2" onchange="fastLoad('{{ route('practice-management.rpm-matrix-admin') }}?{{queryLineExcept(['per_page', 'page'])}}&per_page=' + this.value)">
+                                <option {{$perPage == 25 ? 'selected' : ''}} value="25">25/page</option>
+                                <option {{$perPage == 50 ? 'selected' : ''}} value="50">50/page</option>
+                                <option {{$perPage == 75 ? 'selected' : ''}} value="75">75/page</option>
+                                <option {{$perPage == 100 ? 'selected' : ''}} value="100">100/page</option>
+                            </select>
+                        </div>
+                    @endif
                 </div>
                 <div class="cm-tab {{!request()->input('not-enrolled') ? '' : 'd-none'}}" tab-key="rpm">
                     @include('app.practice-management.rpm-matrix-for-admin-table')

resources/views/app/rpm-mcp-bills-without-company-pro.blade.php

@@ -0,0 +1,81 @@
+@extends ('layouts/empty')
+
+@section('content')
+    <div class="mcp-theme-1">
+        <div class="card-body">
+
+            <div class="mcp-theme-1">
+
+                <div class="card">
+                    <div class="card-body p-0">
+
+                        <table class="table table-sm table-striped p-0 m-0">
+                            <thead class="bg-light">
+                            <tr>
+                                <th class="border-0">Date</th>
+                                <th class="border-0">Patient</th>
+                                <th class="border-0">Insurance</th>
+                                <th class="border-0">State</th>
+                                <th class="border-0">Care Month</th>
+                                <th class="border-0">MCP</th>
+                                <th class="border-0">Company Pro</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            @foreach($rows as $row)
+                                <?php $careMonth = \App\Models\CareMonth::where('id', $row->care_month_id)->first(); ?>
+                                <tr>
+                                    <td>{{ friendly_date_time($row->created_at, true) }}</td>
+                                    <td>
+                                        <a native target="_blank" href="/patients/view/{{ $row->client->uid }}">{{ $row->client->displayName() }}</a>
+                                    </td>
+                                    <td>
+                                        <?php $_cpc = $row->client->getPrimaryCoverage();?>
+                                        @if($_cpc && $row->client->getPrimaryCoverageStatus() === 'YES')
+                                            {{$_cpc->insuranceDisplayPayerName()}}
+                                        @else
+                                            No
+                                        @endif
+                                    </td>
+                                    <td>
+                                        {{$row->client->mailing_address_state}}
+                                    </td>
+                                    <td>
+                                        <a native target="_blank" href="/patients/view/{{ $row->client->uid }}/care-months/view/{{$careMonth->uid}}">{{ friendly_month($careMonth->start_date) }}</a>
+                                    </td>
+                                    <td>{{ $careMonth->mcp ? $careMonth->mcp->displayName() : '-' }}</td>
+                                    <td>
+                                        <b>{{$row->genericCompanyPro ? $row->genericCompanyPro->company->name : '-'}}</b>
+                                        <div moe class="">
+                                            <a class="text-primary" href="" show start>Edit</a>
+                                            <form url="/api/bill/swapGenericCompanyPro">
+                                                <input type="hidden" name="uid" value="{{$row->uid}}">
+                                                <div class="mb-2">
+                                                    <select name="genericCompanyProUid" class="form-control form-control-sm">
+                                                        <option value="">-- select --</option>
+                                                        @foreach($row->genericPro->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>
+                                    </td>
+                                </tr>
+                            @endforeach
+                            </tbody>
+                        </table>
+                        <div class="pt-3 px-3">
+                            {{ $rows->links() }}
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+@endsection

resources/views/app/rpm-rmm-bills-without-company-pro.blade.php

@@ -0,0 +1,81 @@
+@extends ('layouts/empty')
+
+@section('content')
+    <div class="mcp-theme-1">
+        <div class="card-body">
+
+            <div class="mcp-theme-1">
+
+                <div class="card">
+                    <div class="card-body p-0">
+
+                        <table class="table table-sm table-striped p-0 m-0">
+                            <thead class="bg-light">
+                            <tr>
+                                <th class="border-0">Date</th>
+                                <th class="border-0">Patient</th>
+                                <th class="border-0">Insurance</th>
+                                <th class="border-0">State</th>
+                                <th class="border-0">Care Month</th>
+                                <th class="border-0">RMM</th>
+                                <th class="border-0">Company Pro</th>
+                            </tr>
+                            </thead>
+                            <tbody>
+                            @foreach($rows as $row)
+                                <?php $careMonth = \App\Models\CareMonth::where('id', $row->care_month_id)->first(); ?>
+                                <tr>
+                                    <td>{{ friendly_date_time($row->created_at, true) }}</td>
+                                    <td>
+                                        <a native target="_blank" href="/patients/view/{{ $row->client->uid }}">{{ $row->client->displayName() }}</a>
+                                    </td>
+                                    <td>
+                                        <?php $_cpc = $row->client->getPrimaryCoverage();?>
+                                        @if($_cpc && $row->client->getPrimaryCoverageStatus() === 'YES')
+                                            {{$_cpc->insuranceDisplayPayerName()}}
+                                        @else
+                                            No
+                                        @endif
+                                    </td>
+                                    <td>
+                                        {{$row->client->mailing_address_state}}
+                                    </td>
+                                    <td>
+                                        <a native target="_blank" href="/patients/view/{{ $row->client->uid }}/care-months/view/{{$careMonth->uid}}">{{ friendly_month($careMonth->start_date) }}</a>
+                                    </td>
+                                    <td>{{ $careMonth->rmm ? $careMonth->rmm->displayName() : '-' }}</td>
+                                    <td>
+                                        <b>{{$row->genericCompanyPro ? $row->genericCompanyPro->company->name : '-'}}</b>
+                                        <div moe class="">
+                                            <a class="text-primary" href="" show start>Edit</a>
+                                            <form url="/api/bill/swapGenericCompanyPro">
+                                                <input type="hidden" name="uid" value="{{$row->uid}}">
+                                                <div class="mb-2">
+                                                    <select name="genericCompanyProUid" class="form-control form-control-sm">
+                                                        <option value="">-- select --</option>
+                                                        @foreach($row->genericPro->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>
+                                    </td>
+                                </tr>
+                            @endforeach
+                            </tbody>
+                        </table>
+                        <div class="pt-3 px-3">
+                            {{ $rows->links() }}
+                        </div>
+                    </div>
+                </div>
+
+            </div>
+        </div>
+    </div>
+@endsection

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

@@ -43,7 +43,7 @@ $addressParts .= implode(", ", $addressPart2);
     }
   }
 </style>
-<div class="p-2 mcp-theme-1 patient-header">
+<div class="px-2 pb-2 mcp-theme-1 patient-header">
   @if($patient->is_duplicate)
   <div class="alert alert-warning p-1 mb-2 border-dark mcp-theme-1 screen-only">
     <span class="text-dark">This chart is a duplicate of&nbsp;</span>
@@ -52,7 +52,7 @@ $addressParts .= implode(", ", $addressPart2);
     </a>
   </div>
   @endif
-  <div class="d-flex justify-content-between">
+  <div class="d-flex justify-content-between pt-2 {{request()->route()->getName() === 'patients.view.notes.view.dashboard' ? 'sticky-note-header' : ''}}" id="patient-top-most-header">
     <div class="d-flex align-items-center header-info mb-2">
       <h6 class="font-weight-bold">{{$patientName}},</h6>
       <h6 class="ml-2">{{$patient->age_in_years}} Y, {{$patient->sex}}</h6>
@@ -75,7 +75,11 @@ $addressParts .= implode(", ", $addressPart2);
         </span>
       </h6>
       <div class="d-flex border-left pl-2 ml-2">
-        <div class="mr-2">RPM: <b>{{ucwords(strtolower($patient->is_enrolled_in_rm))}}</b></div>
+        <div class="mr-2">RPM: <b>{{ucwords(strtolower($patient->is_enrolled_in_rm))}}</b>
+          @if($patient->is_enrolled_in_rm === 'NO' && $patient->why_not_enrolled_in_rm_category)
+            <span class="text-sm">({{$patient->why_not_enrolled_in_rm_category}})</span>
+          @endif
+        </div>
         <div class="mr-1">Cell. BP: <b>{{$patient->hasBPDevice()?'Yes':'No'}}</b>
           @if($patient->most_recent_cellular_bp_sbp_mm_hg && $patient->most_recent_cellular_bp_dbp_mm_hg)
           (<b>{{$patient->most_recent_cellular_bp_sbp_mm_hg ?: '-'}}/{{$patient->most_recent_cellular_bp_dbp_mm_hg ?: '-'}}</b>@if($patient->most_recent_cellular_bp_measurement_at), {{friendly_date_short($patient->most_recent_cellular_bp_measurement_at)}}@endif)@endif
@@ -556,3 +560,22 @@ $addressParts .= implode(", ", $addressPart2);
 
   </div>
 </div>
+@if($pro->pro_type === 'ADMIN')
+  <?php
+  $missingDefaultMCPCPAndLocation = false;
+  if ($patient->is_active &&
+          (!$patient->client_engagement_status_category || $patient->client_engagement_status_category === 'ACTIVE') &&
+          (!$patient->default_mcp_company_pro_payer_id || !$patient->default_mcp_company_location_id)
+  ) {
+    $missingDefaultMCPCPAndLocation = true;
+  }
+  ?>
+  @if($missingDefaultMCPCPAndLocation)
+    <div class="mx-2 mb-2 alert alert-warning p-2 mcp-theme-1 d-flex align-items-baseline rounded-0 border-warning">
+      <i class="fa fa-exclamation-triangle"></i>
+      <span class="ml-2 font-weight-bold">This patient is missing the default MCP company pro and or location!</span>
+      <a href="{{route('patients.view.settings', ['patient' => $patient])}}" class="ml-2 font-weight-bold">Settings</a>
+    </div>
+  @endif
+@endif
+

resources/views/layouts/patient.blade.php

@@ -59,9 +59,6 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 					<li class="nav-item">
 						<a class="nav-link {{ strpos($routeName, 'patients.view.care-months') === 0 ? 'active' : '' }}" href="{{ route('patients.view.care-months', ['patient' => $patient]) }}">Care Months</a>
 					</li>
-					<li class="nav-item">
-						<a class="nav-link {{ strpos($routeName, 'patients.view.devices') === 0 ? 'active' : '' }}" href="{{ route('patients.view.devices', ['patient' => $patient]) }}">Devices</a>
-					</li>
 					<li class="nav-item">
 						<a class="nav-link {{ strpos($routeName, 'patients.view.measurements') === 0 ? 'active' : '' }}" href="{{ route('patients.view.measurements', ['patient' => $patient]) }}">Measurements</a>
 					</li>
@@ -75,7 +72,7 @@ $isOldClient = (date_diff(date_create(config('app.point_impl_date')), date_creat
 						<a class="nav-link {{ strpos($routeName, 'patients.view.handouts') === 0 ? 'active' : '' }}" href="{{ route('patients.view.handouts', ['patient' => $patient]) }}">Handouts</a>
 					</li>
 					<li class="nav-item">
-						<a class="nav-link {{ strpos($routeName, 'patients.view.rm-setup') === 0 ? 'active' : '' }}" href="{{ route('patients.view.rm-setup', ['patient' => $patient]) }}">RM Setup</a>
+						<a class="nav-link {{ strpos($routeName, 'patients.view.rm-setup') === 0 ? 'active' : '' }}" href="{{ route('patients.view.rm-setup', ['patient' => $patient]) }}">Remote Monitoring</a>
 					</li>
 					<?php /* <li class="nav-item">
 							<a class="nav-link d-flex align-items-center {{ strpos($routeName, 'patients.view.action-items') === 0 ? 'active' : '' }}"

resources/views/layouts/template.blade.php

@@ -194,6 +194,7 @@
                             <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.claims-report') }}">Claims Reports</a>
                             <a class="dropdown-item" href="{{ route('practice-management.coverages') }}">Coverage Center</a>
                             <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>

routes/web.php

@@ -256,6 +256,13 @@ Route::middleware('pro.auth')->group(function () {
         Route::get('my-flyers', 'PracticeManagementController@myFlyers')->name('my-flyers');
         Route::get('notes-pending-physician-supervisor-stamping', 'PracticeManagementController@notesPendingPhysicianSupervisorStamping')->name('notes-pending-physician-supervisor-stamping');
 
+        // new
+        Route::get('clients-without-default-company-pro-payer', 'PracticeManagementController@clientsWithoutDefaultCompanyProPayer')->name('clients-without-default-company-pro-payer');
+        Route::get('notes-without-hcp-company-pro-payer', 'PracticeManagementController@notesWithoutHcpCompanyProPayer')->name('notes-without-hcp-company-pro-payer');
+        Route::get('note-hcp-bills-without-company-pro', 'PracticeManagementController@noteHcpBillsWithoutCompanyPro')->name('note-hcp-bills-without-company-pro');
+        Route::get('rpm-mcp-bills-without-company-pro', 'PracticeManagementController@rpmMcpBillsWithoutCompanyPro')->name('rpm-mcp-bills-without-company-pro');
+        Route::get('rpm-rmm-bills-without-company-pro', 'PracticeManagementController@rpmRmmBillsWithoutCompanyPro')->name('rpm-rmm-bills-without-company-pro');
+
         Route::get('rpm-matrix', 'PracticeManagementController@rpmMatrix')->name('rpmMatrix');
         Route::get('client-review-requests', 'PracticeManagementController@clientReviewRequests')->name('client-review-requests');
 
@@ -373,6 +380,8 @@ Route::middleware('pro.auth')->group(function () {
             Route::get('remote-monitoring-admin-count', 'PracticeManagementController@remoteMonitoringAdminCount')->name('remote-monitoring-admin-count');
 
             Route::get('rpm-admin', 'PracticeManagementController@rpmMatrixForAdmin')->name('rpm-matrix-admin');
+
+            Route::get('claims-report', 'PracticeManagementController@claimsReport')->name('claims-report');
         });
 
         Route::get('supply-orders/cancelled-but-unacknowledged', 'PracticeManagementController@supplyOrdersCancelledButUnacknowledged')->name('supply-orders-cancelled-but-unacknowledged');