Merge branch 'dev-vj' into dev-vj-opentok

app/Http/Controllers/care_month_entries_SINGLE_Controller.php

@@ -22,6 +22,12 @@ class care_month_entries_SINGLE_Controller extends Controller
 		return response()->view('pro/care_month_entries_SINGLE/ACTION_updateTiming', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /care_month_entries/view/{uid}/ACTION_remove
+	public function ACTION_remove(Request $request, $uid) {
+		$record = DB::table('care_month_entry')->where('uid', $uid)->first();
+		return response()->view('pro/care_month_entries_SINGLE/ACTION_remove', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /care_month_entries/view/{uid}/SUB_dashboard
 	public function SUB_dashboard(Request $request, $uid) {
 		$record = DB::table('care_month_entry')->where('uid', $uid)->first();

app/Http/Controllers/care_months_SINGLE_Controller.php

@@ -212,6 +212,13 @@ class care_months_SINGLE_Controller extends Controller
 		return response()->view('pro/care_months_SINGLE/SUB_rm_time_entries', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /care_months/view/{uid}/SUB_bills
+	public function SUB_bills(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		$subRecords = DB::table('bill')->where('care_month_id', $record->id)->get();
+		return response()->view('pro/care_months_SINGLE/SUB_bills', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /care_months/view/{uid}/SUB_audit_log
 	public function SUB_audit_log(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();

app/Http/Controllers/my_clients_SINGLE_Controller.php

@@ -370,12 +370,6 @@ class my_clients_SINGLE_Controller extends Controller
 		return response()->view('pro/my_clients_SINGLE/ACTION_setIsEnrolledInRmToTrue', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /my_clients/view/{uid}/ACTION_updateRmReasons
-	public function ACTION_updateRmReasons(Request $request, $uid) {
-		$record = DB::table('client')->where('uid', $uid)->first();
-		return response()->view('pro/my_clients_SINGLE/ACTION_updateRmReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
 	// GET /my_clients/view/{uid}/ACTION_updateWhyNotEnrolledInRm
 	public function ACTION_updateWhyNotEnrolledInRm(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();

generatecv/tree.txt

@@ -182,10 +182,6 @@ PRO
                 ssn=ssn
             putMcn
                 mcn*=mcn
-                mcnNameFirst*=mcn_name_first
-                mcnNameLast*=mcn_name_last
-                mcnDob*:date=mcn_dob
-                mcnSsn*=mcn_ssn
             removeMcn
             updateWebcamInfo
                 hasWebcamDevice*:select:YES,NO,UNKNOWN=has_webcam_device
@@ -265,9 +261,6 @@ PRO
             setIsEnrolledInRmToTrue
                 rmReason1*=rm_reason1
                 rmReason2=rm_reason2
-            updateRmReasons
-                rmReason1*=rm_reason1
-                rmReason2=rm_reason2
             updateWhyNotEnrolledInRm
                 whyNotEnrolledInRmCategory=why_not_enrolled_in_rm_category
                 whyNotEnrolledInRmMemo=why_not_enrolled_in_rm_memo
@@ -298,7 +291,7 @@ PRO
                 !grp:Deceased:is_deceased,date_and_time_of_death,cause_of_death
                 !grp:Pharmacy:pharmacy,pharmacy_facility_id:Edit pharmancy:circle=>/my_clients/view/$uid/ACTION_editPharmacy
                 !grp:SSN:ssn:Edit SSN:circle=>/my_clients/view/$uid/ACTION_editSsn
-                #!grp:MCN:mcn,mcn_name_first,mcn_name_last,mcn_dob,mcn_ssn,mcn_address,is_partbprimary,is_hospice,mcn_response_detail,billing_address,reason_not_partb,reason_not_partbmemo,is_medicare_advantage,medicare_advantage_plan:Put MSN:circle=>/my_clients/view/$uid/ACTION_putMcn
+                !grp:MCN:mcn:Put MSN:circle=>/my_clients/view/$uid/ACTION_putMcn
                 !grp:Webcam:has_webcam_device,webcam_device:Update webcam info:circle=>/my_clients/view/$uid/ACTION_updateWebcamInfo
                 !grp:MCP:mcp_pro_id:Put MCP:circle=>/my_clients/view/$uid/ACTION_putMcp
                 !grp:MCP Visit:has_mcp_done_onboarding_visit,mcp_onboarding_visit_date,mcp_onboarding_visit_note_id,reason_onboarding_visit_note_outside_system,is_mcp_onboarding_active,why_is_mcp_onboarding_not_active_category,why_is_mcp_onboarding_not_active_memo:Update source:circle=>/my_clients/view/$uid/ACTION_updateMcpOnboardingVisitInfo
@@ -678,7 +671,7 @@ PRO
                 !nal:
 # :: need remove
             cm_time_entries
-                id=care_month_entry.care_month_id,cm_or_rm='CM'
+                id=care_month_entry.care_month_id,cm_or_rm='CM'=>/care_month_entries/view/UID
                 !inc:content_text,content_detail,time_in_seconds
                 add_new:care_month_entry:createForCm
                     careMonthUid:hidden=uid
@@ -692,7 +685,7 @@ PRO
                     contentDetail
 # :: need remove
             rm_time_entries
-                id=care_month_entry.care_month_id,cm_or_rm='RM'
+                id=care_month_entry.care_month_id,cm_or_rm='RM'=>/care_month_entries/view/UID
                 add_new:care_month_entry:createForRm
                     careMonthUid:hidden=uid
                     proUid:record:pro:uid,name_display
@@ -703,6 +696,8 @@ PRO
                     endingTime:time
                     contentText
                     contentDetail
+            bills
+                id=bill.care_month_id=>/bills/view/UID
             audit_log
     care_month_entries|care_month_entry|view|icon:calendar-alt
         !qry:pros:SELECT id, name_display FROM pro
@@ -713,13 +708,20 @@ PRO
                 contentText
                 contentDetail
             updateTiming
-                effectiveDate
-                timeInSeconds
+                effectiveDate:date
+                timeInSeconds:number
                 isTimeSpecific:bool
-                startingTime
-                endingTime
+                startingTime:time
+                endingTime:time
+            remove
         SUB
             dashboard
+                !grp:Info:cm_or_rm,client_id ,pro_id
+                !grp:Time:effective_date,time_in_seconds ,is_time_specific,starting_time,ending_time:Update timing:circle=>/care_month_entries/view/$uid/ACTION_updateTiming    
+                !grp:Achieved time(s):achieved_cm_pro_time_in_seconds,achieved_mcp_time_in_seconds,achieved_rme_pro_time_in_seconds,achieved_rmm_pro_time_in_seconds,achieved_total_time_in_seconds
+                !grp:Content:content_detail,content_text:Update content:circle=>/care_month_entries/view/$uid/ACTION_updateContent
+                !grp:Removed:is_removed,removal_memo,removed_at:Remove:circle=>/care_month_entries/view/$uid/ACTION_remove
+                !nal:
     bills|bill|view|icon:file-invoice-dollar
     bills/view/{uid}
         ACTIONS

resources/views/pro/care_month_entries/actions.blade.php

@@ -1,2 +1,3 @@
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_month_entries/view/<?= $record->uid ?>/ACTION_updateContent' class='d-block btn btn-sm btn-default mb-3'>Update Content</a>
-<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_month_entries/view/<?= $record->uid ?>/ACTION_updateTiming' class='d-block btn btn-sm btn-default mb-3'>Update Timing</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_month_entries/view/<?= $record->uid ?>/ACTION_updateTiming' class='d-block btn btn-sm btn-default mb-3'>Update Timing</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_month_entries/view/<?= $record->uid ?>/ACTION_remove' class='d-block btn btn-sm btn-default mb-3'>Remove</a>

resources/views/pro/care_month_entries_SINGLE/ACTION_remove.blade.php

@@ -0,0 +1,38 @@
+@extends('pro.care_month_entries.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Remove</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="false"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/careMonthEntry/remove">
+        <input type="hidden" name="_success" value="{{route('care_month_entries-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_month_entries_SINGLE-ACTION_remove', ['uid' => $record->uid])}}">
+        
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_month_entries-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/pro/care_month_entries_SINGLE/ACTION_updateTiming.blade.php

@@ -28,11 +28,11 @@
         <input type="hidden" name="_return" value="{{route('care_month_entries_SINGLE-ACTION_updateTiming', ['uid' => $record->uid])}}">
         <div class='form-group mb-3'>
 <label class='control-label'>Effective Date </label>
-<input class='form-control' type='text' name='effectiveDate' value='{{ old('effectiveDate') ? old('effectiveDate') : '' }}' >
+<input class='form-control' type='date' name='effectiveDate' value='{{ old('effectiveDate') ? old('effectiveDate') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Time In Seconds </label>
-<input class='form-control' type='text' name='timeInSeconds' value='{{ old('timeInSeconds') ? old('timeInSeconds') : '' }}' >
+<input class='form-control' type='number' name='timeInSeconds' value='{{ old('timeInSeconds') ? old('timeInSeconds') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Is Time Specific 
@@ -41,11 +41,11 @@
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Starting Time </label>
-<input class='form-control' type='text' name='startingTime' value='{{ old('startingTime') ? old('startingTime') : '' }}' >
+<input class='form-control' type='time' name='startingTime' value='{{ old('startingTime') ? old('startingTime') : '' }}' >
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Ending Time </label>
-<input class='form-control' type='text' name='endingTime' value='{{ old('endingTime') ? old('endingTime') : '' }}' >
+<input class='form-control' type='time' name='endingTime' value='{{ old('endingTime') ? old('endingTime') : '' }}' >
 </div>
         <div class="form-group mb-3 d-flex justify-content-center">
             <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>

resources/views/pro/care_month_entries_SINGLE/SUB_dashboard.blade.php

@@ -2,38 +2,97 @@
 @section('content-inner')
 
     <div class="row mt-3">
-    <div class="col-8">
-
-        <div class="table-responsive p-0 bg-white table-sm stag-table border-top">
-            <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
-                <thead>
-                <tr>
-                    <th colspan="2" class="px-2">Record Details</th>
-                </tr>
-                </thead>
-                <tbody>
-                <?php foreach($record as $k => $v): ?>
-                    <?php
-                    if($k === 'id' || $k === 'uid') continue;
-                    $displayValue = $record->$k;
-                    if(substr($k, -3) === '_at') {
-                        $displayValue = friendly_date_time($record->$k);
-                    }
-                    ?>
-                    <tr>
-                        <td class="px-2 text-secondary border-right w-50">{{ ucwords(str_replace("_", " ", $k)) }}</td>
-                        <td class="px-2 font-weight-bold w-50">{{ $displayValue }}</td>
-                    </tr>
-                <?php endforeach; ?>
-                </tbody>
-            </table>
-        </div>
+    <div class="col-12">
+
+        <div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Info
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Cm Or Rm</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_or_rm ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Client Id </td><td class="w-75 px-2 font-weight-bold"><?= $record->client_id  ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->pro_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Time
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_month_entries/view/<?= $record->uid ?>/ACTION_updateTiming' title='Update timing'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Timing</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Effective Date</td><td class="w-75 px-2 font-weight-bold"><?= $record->effective_date ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Time In Seconds </td><td class="w-75 px-2 font-weight-bold"><?= $record->time_in_seconds  ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Time Specific</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_time_specific ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Starting Time</td><td class="w-75 px-2 font-weight-bold"><?= $record->starting_time ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Ending Time</td><td class="w-75 px-2 font-weight-bold"><?= $record->ending_time ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Achieved time(s)
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Achieved Cm Pro Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->achieved_cm_pro_time_in_seconds ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Achieved Mcp Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->achieved_mcp_time_in_seconds ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Achieved Rme Pro Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->achieved_rme_pro_time_in_seconds ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Achieved Rmm Pro Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->achieved_rmm_pro_time_in_seconds ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Achieved Total Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->achieved_total_time_in_seconds ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Content
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_month_entries/view/<?= $record->uid ?>/ACTION_updateContent' title='Update content'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Content</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Content Detail</td><td class="w-75 px-2 font-weight-bold"><?= $record->content_detail ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Content Text</td><td class="w-75 px-2 font-weight-bold"><?= $record->content_text ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Removed
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_month_entries/view/<?= $record->uid ?>/ACTION_remove' title='Remove'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Is Removed</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_removed ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Removal Memo</td><td class="w-75 px-2 font-weight-bold"><?= $record->removal_memo ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Removed At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->removed_at) ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
 
-    </div>
-    <div class="col-4">
-        <div class="border-left h-100 pl-3">
-            @include('pro/care_month_entries/actions')
-        </div>
     </div>
 </div>
 

resources/views/pro/care_months/subs.blade.php

@@ -1,4 +1,5 @@
 <a href='/care_months/view/<?= $record->uid ?>/SUB_dashboard' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_dashboard' ? 'bg-secondary text-white font-weight-bold' : '' }}{{ strpos(request()->route()->getActionMethod(), 'ACTION_') === 0 ? 'bg-secondary text-white font-weight-bold' : '' }}'>Dashboard</a>
 <a href='/care_months/view/<?= $record->uid ?>/SUB_cm_time_entries' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_cm_time_entries' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Cm Time Entries</a>
 <a href='/care_months/view/<?= $record->uid ?>/SUB_rm_time_entries' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_rm_time_entries' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Rm Time Entries</a>
+<a href='/care_months/view/<?= $record->uid ?>/SUB_bills' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_bills' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Bills</a>
 <a href='/care_months/view/<?= $record->uid ?>/SUB_audit_log' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_audit_log' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Audit Log</a>

resources/views/pro/care_months_SINGLE/SUB_bills.blade.php

@@ -0,0 +1,146 @@
+@extends('pro.care_months.view')
+@section('content-inner')
+
+    <div class="pb-3">
+
+        <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
+            <div>Bills</div>
+            <div class="ml-auto">
+                <!-- _ADD_NEW_LINK_ -->
+            </div>
+        </h5>
+
+        <div class="table-responsive p-0 bg-white border stag-table stag-table-sub">
+            <table class="table table-hover text-nowrap">
+                <thead>
+                <tr>
+                    <th>&nbsp;</th>
+<th>Created At</th>
+<th>Type</th>
+<th>Bill Service Type</th>
+<th>Cm Expected Payment Amount</th>
+<th>Cm Or Rm</th>
+<th>Cm Payment Amount</th>
+<th>Code</th>
+<th>Collected Amount</th>
+<th>Effective Date</th>
+<th>Has Cm Been Paid</th>
+<th>Has Hcp Been Paid</th>
+<th>Has Rme Been Paid</th>
+<th>Has Rmm Been Paid</th>
+<th>Hcp Expected Payment Amount</th>
+<th>Hcp Payment Amount</th>
+<th>Is Cancelled</th>
+<th>Is Signed By Cm</th>
+<th>Is Signed By Hcp</th>
+<th>Is Signed By Rme</th>
+<th>Is Signed By Rmm</th>
+<th>Is Submitted</th>
+<th>Marked Cancelled At</th>
+<th>Marked Submitted At</th>
+<th>Modifier</th>
+<th>Number Of Units</th>
+<th>Reason1</th>
+<th>Reason2</th>
+<th>Reason3</th>
+<th>Reason3plus</th>
+<th>Rme Expected Payment Amount</th>
+<th>Rme Payment Amount</th>
+<th>Rmm Expected Payment Amount</th>
+<th>Rmm Payment Amount</th>
+<th>Service Location</th>
+<th>Signed By Cm At</th>
+<th>Signed By Hcp At</th>
+<th>Signed By Rme At</th>
+<th>Signed By Rmm At</th>
+<th>Created By Session Id</th>
+<th>Care Month Id</th>
+<th>Client Id</th>
+<th>Cm Payment Pro Transaction Id</th>
+<th>Cm Pro Id</th>
+<th>Hcp Payment Pro Transaction Id</th>
+<th>Hcp Pro Id</th>
+<th>Marked Cancelled By Session Id</th>
+<th>Marked Submitted By Session Id</th>
+<th>Note Id</th>
+<th>Note Ally Id</th>
+<th>Rme Payment Pro Transaction Id</th>
+<th>Rme Pro Id</th>
+<th>Rmm Payment Pro Transaction Id</th>
+<th>Rmm Pro Id</th>
+<th>Signed By Cm Session Id</th>
+<th>Signed By Hcp Session Id</th>
+<th>Signed By Rme Session Id</th>
+<th>Signed By Rmm Session Id</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($subRecords as $subRecord)
+                    <tr>
+                        <td><a href="/bills/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+<td><?= friendly_date_time($subRecord->created_at) ?></td>
+<td><?= $subRecord->type ?></td>
+<td><?= $subRecord->bill_service_type ?></td>
+<td><?= $subRecord->cm_expected_payment_amount ?></td>
+<td><?= $subRecord->cm_or_rm ?></td>
+<td><?= $subRecord->cm_payment_amount ?></td>
+<td><?= $subRecord->code ?></td>
+<td><?= $subRecord->collected_amount ?></td>
+<td><?= $subRecord->effective_date ?></td>
+<td><?= $subRecord->has_cm_been_paid ?></td>
+<td><?= $subRecord->has_hcp_been_paid ?></td>
+<td><?= $subRecord->has_rme_been_paid ?></td>
+<td><?= $subRecord->has_rmm_been_paid ?></td>
+<td><?= $subRecord->hcp_expected_payment_amount ?></td>
+<td><?= $subRecord->hcp_payment_amount ?></td>
+<td><?= $subRecord->is_cancelled ?></td>
+<td><?= $subRecord->is_signed_by_cm ?></td>
+<td><?= $subRecord->is_signed_by_hcp ?></td>
+<td><?= $subRecord->is_signed_by_rme ?></td>
+<td><?= $subRecord->is_signed_by_rmm ?></td>
+<td><?= $subRecord->is_submitted ?></td>
+<td><?= friendly_date_time($subRecord->marked_cancelled_at) ?></td>
+<td><?= friendly_date_time($subRecord->marked_submitted_at) ?></td>
+<td><?= $subRecord->modifier ?></td>
+<td><?= $subRecord->number_of_units ?></td>
+<td><?= $subRecord->reason1 ?></td>
+<td><?= $subRecord->reason2 ?></td>
+<td><?= $subRecord->reason3 ?></td>
+<td><?= $subRecord->reason3plus ?></td>
+<td><?= $subRecord->rme_expected_payment_amount ?></td>
+<td><?= $subRecord->rme_payment_amount ?></td>
+<td><?= $subRecord->rmm_expected_payment_amount ?></td>
+<td><?= $subRecord->rmm_payment_amount ?></td>
+<td><?= $subRecord->service_location ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_cm_at) ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_hcp_at) ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rme_at) ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rmm_at) ?></td>
+<td><?= $subRecord->created_by_session_id ?></td>
+<td><?= $subRecord->care_month_id ?></td>
+<td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->cm_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->cm_pro_id ?></td>
+<td><?= $subRecord->hcp_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->hcp_pro_id ?></td>
+<td><?= $subRecord->marked_cancelled_by_session_id ?></td>
+<td><?= $subRecord->marked_submitted_by_session_id ?></td>
+<td><?= $subRecord->note_id ?></td>
+<td><?= $subRecord->note_ally_id ?></td>
+<td><?= $subRecord->rme_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rme_pro_id ?></td>
+<td><?= $subRecord->rmm_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rmm_pro_id ?></td>
+<td><?= $subRecord->signed_by_cm_session_id ?></td>
+<td><?= $subRecord->signed_by_hcp_session_id ?></td>
+<td><?= $subRecord->signed_by_rme_session_id ?></td>
+<td><?= $subRecord->signed_by_rmm_session_id ?></td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+
+@endsection

resources/views/pro/care_months_SINGLE/SUB_cm_time_entries.blade.php

@@ -23,7 +23,7 @@
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
-                        <td><a href=""><i class="fas fa-share-square"></i></a></td>
+                        <td><a href="/care_month_entries/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
 <td><?= $subRecord->content_text ?></td>
 <td><?= $subRecord->content_detail ?></td>
 <td><?= $subRecord->time_in_seconds ?></td>

resources/views/pro/care_months_SINGLE/SUB_rm_time_entries.blade.php

@@ -43,7 +43,7 @@
                 <tbody>
                 @foreach($subRecords as $subRecord)
                     <tr>
-                        <td><a href=""><i class="fas fa-share-square"></i></a></td>
+                        <td><a href="/care_month_entries/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
 <td><?= friendly_date_time($subRecord->created_at) ?></td>
 <td><?= $subRecord->type ?></td>
 <td><?= $subRecord->is_removed ?></td>

resources/views/pro/my_clients/actions.blade.php

@@ -58,6 +58,5 @@
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateRmEligibility' class='d-block btn btn-sm btn-default mb-3'>Update Rm Eligibility</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInRmToFalse' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled In Rm To False</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInRmToTrue' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled In Rm To True</a>
-<a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateRmReasons' class='d-block btn btn-sm btn-default mb-3'>Update Rm Reasons</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateWhyNotEnrolledInRm' class='d-block btn btn-sm btn-default mb-3'>Update Why Not Enrolled In Rm</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateEquipmentInfo' class='d-block btn btn-sm btn-default mb-3'>Update Equipment Info</a>

resources/views/pro/my_clients_SINGLE/ACTION_putMcn.blade.php

@@ -29,22 +29,6 @@
         <div class='form-group mb-3'>
 <label class='control-label'>Mcn *</label>
 <input class='form-control' type='text' name='mcn' value='{{ old('mcn') ? old('mcn') : $record->mcn }}' required>
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Mcn Name First *</label>
-<input class='form-control' type='text' name='mcnNameFirst' value='{{ old('mcnNameFirst') ? old('mcnNameFirst') : $record->mcn_name_first }}' required>
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Mcn Name Last *</label>
-<input class='form-control' type='text' name='mcnNameLast' value='{{ old('mcnNameLast') ? old('mcnNameLast') : $record->mcn_name_last }}' required>
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Mcn Dob *</label>
-<input class='form-control' type='date' name='mcnDob' value='{{ old('mcnDob') ? old('mcnDob') : $record->mcn_dob }}' required>
-</div>
-<div class='form-group mb-3'>
-<label class='control-label'>Mcn Ssn *</label>
-<input class='form-control' type='text' name='mcnSsn' value='{{ old('mcnSsn') ? old('mcnSsn') : $record->mcn_ssn }}' required>
 </div>
         <div class="form-group mb-3 d-flex justify-content-center">
             <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>

resources/views/pro/my_clients_SINGLE/SUB_dashboard.blade.php

@@ -379,6 +379,21 @@
     </table>
 </div>
 
+<div class="table-responsive p-0 bg-white table-sm mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">MCN
+                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_putMcn' title='Put MSN'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put MSN</span></a></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Mcn</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_removeMcn' title='removeMcn' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Mcn</span></a></td></tr>
+        </tbody>
+    </table>
+</div>
+
 <div class="table-responsive p-0 bg-white table-sm mb-3">
     <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
         <thead>

routes/generated.php

@@ -76,7 +76,6 @@ Route::prefix('/my_clients/view/{uid}')->group(function () {
 	Route::get('ACTION_updateRmEligibility', 'my_clients_SINGLE_Controller@ACTION_updateRmEligibility')->name('my_clients_SINGLE-ACTION_updateRmEligibility');
 	Route::get('ACTION_setIsEnrolledInRmToFalse', 'my_clients_SINGLE_Controller@ACTION_setIsEnrolledInRmToFalse')->name('my_clients_SINGLE-ACTION_setIsEnrolledInRmToFalse');
 	Route::get('ACTION_setIsEnrolledInRmToTrue', 'my_clients_SINGLE_Controller@ACTION_setIsEnrolledInRmToTrue')->name('my_clients_SINGLE-ACTION_setIsEnrolledInRmToTrue');
-	Route::get('ACTION_updateRmReasons', 'my_clients_SINGLE_Controller@ACTION_updateRmReasons')->name('my_clients_SINGLE-ACTION_updateRmReasons');
 	Route::get('ACTION_updateWhyNotEnrolledInRm', 'my_clients_SINGLE_Controller@ACTION_updateWhyNotEnrolledInRm')->name('my_clients_SINGLE-ACTION_updateWhyNotEnrolledInRm');
 	Route::get('ACTION_updateEquipmentInfo', 'my_clients_SINGLE_Controller@ACTION_updateEquipmentInfo')->name('my_clients_SINGLE-ACTION_updateEquipmentInfo');
 	Route::get('SUB_dashboard', 'my_clients_SINGLE_Controller@SUB_dashboard')->name('my_clients_SINGLE-SUB_dashboard');
@@ -205,6 +204,7 @@ Route::prefix('/care_months/view/{uid}')->group(function () {
 	Route::get('SUB_dashboard', 'care_months_SINGLE_Controller@SUB_dashboard')->name('care_months_SINGLE-SUB_dashboard');
 	Route::get('SUB_cm_time_entries', 'care_months_SINGLE_Controller@SUB_cm_time_entries')->name('care_months_SINGLE-SUB_cm_time_entries');
 	Route::get('SUB_rm_time_entries', 'care_months_SINGLE_Controller@SUB_rm_time_entries')->name('care_months_SINGLE-SUB_rm_time_entries');
+	Route::get('SUB_bills', 'care_months_SINGLE_Controller@SUB_bills')->name('care_months_SINGLE-SUB_bills');
 	Route::get('SUB_audit_log', 'care_months_SINGLE_Controller@SUB_audit_log')->name('care_months_SINGLE-SUB_audit_log');
 	Route::get('ACTION_cm_time_entriesAddNew', 'care_months_SINGLE_Controller@ACTION_cm_time_entriesAddNew')->name('care_months_SINGLE-ACTION_cm_time_entriesAddNew');
 	Route::get('ACTION_rm_time_entriesAddNew', 'care_months_SINGLE_Controller@ACTION_rm_time_entriesAddNew')->name('care_months_SINGLE-ACTION_rm_time_entriesAddNew');
@@ -220,6 +220,7 @@ Route::prefix('/care_month_entries')->group(function () {
 Route::prefix('/care_month_entries/view/{uid}')->group(function () {
 	Route::get('ACTION_updateContent', 'care_month_entries_SINGLE_Controller@ACTION_updateContent')->name('care_month_entries_SINGLE-ACTION_updateContent');
 	Route::get('ACTION_updateTiming', 'care_month_entries_SINGLE_Controller@ACTION_updateTiming')->name('care_month_entries_SINGLE-ACTION_updateTiming');
+	Route::get('ACTION_remove', 'care_month_entries_SINGLE_Controller@ACTION_remove')->name('care_month_entries_SINGLE-ACTION_remove');
 	Route::get('SUB_dashboard', 'care_month_entries_SINGLE_Controller@SUB_dashboard')->name('care_month_entries_SINGLE-SUB_dashboard');
 });