Remove all references to "team"

app/Console/Commands/GenerateTreeCommand.php

@@ -230,6 +230,9 @@ class GenerateTreeCommand extends Command
                             $currentMethod->type = 'sub';
                             $currentMethod->show = $show;
                             $currentMethod->data = [];
+                            if($line === 'dashboard') {
+                                $currentMethod->dashboard = true;
+                            }
                         }
                         break;
 

app/Http/Controllers/my_clients_SINGLE_Controller.php

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

app/Http/Controllers/pros_SINGLE_Controller.php

@@ -209,12 +209,6 @@ class pros_SINGLE_Controller extends Controller
 		return response()->view('admin/pros_SINGLE/SUB_payment_schedule', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /pros/view/{uid}/SUB_teams
-	public function SUB_teams(Request $request, $uid) {
-		$record = DB::table('pro')->where('uid', $uid)->first();
-		return response()->view('admin/pros_SINGLE/SUB_teams', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
-	}
-
 	// GET /pros/view/{uid}/SUB_clients
 	public function SUB_clients(Request $request, $uid) {
 		$record = DB::table('pro')->where('uid', $uid)->first();

generatecv/tree.txt

@@ -6,66 +6,6 @@ PRO
         !col:as_hcp_or_ally:Description (HCP/Ally)
         !col:amount:Amount
         !col:earnings:Earnings:select '- TODO -' as result
-    my_teams|team|add|view|icon:user-friends
-        !inc:@team_number,hcp_pro_id,ally_pro_id,client_count
-        !qry:pros:select id, name_display from pro
-        !col:hcp_pro_id:HCP:~pros:name_display:id,=,$hcp_pro_id:all
-        !col:ally_pro_id:Ally Pro:~pros:name_display:id,=,$ally_pro_id:all
-        !col:client_count:Clients:select COUNT(*) as result FROM client WHERE team_id = $id
-    my_teams/add_new:create
-        !qry:pros:select uid, name_display from pro
-        hcpProUid*:record:~pros:uid,name_display
-        allyProUid*:record:~pros:uid,name_display
-        teamNumber
-    my_teams/view/{uid}
-        ACTIONS
-            updateTeamNumber
-                teamNumber=team_number
-            deactivate
-                memo
-            updateDeactivationMemo
-                memo=deactivation_memo
-            reactivate
-                memo
-            updateReactivationMemo
-                memo=reactivation_memo
-        SUB
-            dashboard
-                !grp:Basic Details:team_number,created_at,client_count,is_active:Update Team Number:pencil-alt=>/my_teams/view/$uid/ACTION_updateTeamNumber
-                !grp:Associated Pros:hcp_pro_id,ally_pro_id
-                !qry:pros:select id, name_display from pro
-                !col:hcp_pro_id:HCP Pro:~pros:name_display:id,=,$hcp_pro_id:all
-                !col:ally_pro_id:Ally Pro:~pros:name_display:id,=,$ally_pro_id:all
-                !col:client_count:Clients:select '- TODO -' as result
-                !col:is_active:Active:SELECT d as result FROM (VALUES ('1','Yes'),('','No')) T(v,d) WHERE v = '$is_active' limit 1
-                !act:team_number:Update Team Number:pencil-alt=>/my_teams/view/$uid/ACTION_updateTeamNumber
-                !act:is_active:Deactivate:pencil-alt:if:is_active=>/my_teams/view/$uid/ACTION_deactivate
-                !act:is_active:Reactivate:pencil-alt:if-not:is_active=>/my_teams/view/$uid/ACTION_reactivate
-            edit_demographics
-                !grp:Basic Details:team_number,created_at,client_count,is_active
-                !act:is_active:Deactivate:pencil-alt:if:is_active=>/my_teams/view/$uid/ACTION_deactivate
-                !act:is_active:Reactivate:pencil-alt:if-not:is_active=>/my_teams/view/$uid/ACTION_reactivate
-                !nal:
-            clients
-                id=client.team_id=>/my_clients/view/UID
-                !exc:id,uid
-                !lnk:created_at
-                !col:team_id:Team:select team_number as result from team where id = $team_id limit 1
-                add_new:client
-                    teamUid:hidden=uid
-                    nameDisplay*
-                    namePrefix
-                    nameFirst*
-                    nameMiddle
-                    nameLast*
-                    nameSuffix
-                    nameCredential
-                    gender*:select:M,F
-                    dateOfBirth*:date
-                    cellNumber*:tel
-                    emailAddress*:email
-                    medicareNumber
-            audit_log
     my_clients|client|add|view|icon:user-injured
         !inc:@name_display,date_of_birth,gender,is_client_enrolled_in_cm,is_client_enrolled_in_rm,mcp_pro_id,ally_pro_id
         !col:name_display:Name
@@ -76,7 +16,6 @@ PRO
         !col:mcp_pro_id:MCP:SELECT name_display AS result FROM pro WHERE id = $mcp_pro_id
         !col:ally_pro_id:Ally:SELECT name_display AS result FROM pro WHERE id = $ally_pro_id
     my_clients/add_new:create
-        teamUid:record:team:uid,team_number
         mcpProUid:record:pro:uid,name_display
         allyProUid:record:pro:uid,name_display
         nameDisplay
@@ -109,9 +48,6 @@ PRO
                 gender:select:M,F=gender
             putDateOfBirth
                 dateOfBirth:date=date_of_birth
-            putTeam
-                teamUid:record:team:uid,team_number
-            removeTeam:if:team_id
             assignMcp
                 mcpProUid:record:pro:uid,name_display
             changeMcp
@@ -391,7 +327,7 @@ PRO
             setIsTmThisMonthToFalse
         SUB
             dashboard
-                !grp:Care Month Details:id,created_at,type,uid,cm_reason1,cm_reason2,cm_total_time_in_seconds,cm_total_time_in_seconds_by_ally,cm_total_time_in_seconds_by_mcp,has_mcp_done_em_visit,is_client_enrolled_in_cm,is_client_enrolled_in_rm,is_cm_canceled_this_month,is_rm_canceled_this_month,is_tm_this_month,rm_reason1,rm_reason2,rm_total_time_in_seconds,rm_total_time_in_seconds_by_ally,rm_total_time_in_seconds_by_mcp,start_date,why_is_cm_canceled_this_month,why_is_rm_canceled_this_month,why_not_enrolled_in_cm_category,why_not_enrolled_in_cm_memo,why_not_enrolled_in_rm_category,why_not_enrolled_in_rm_memo,created_by_session_id,ally_pro_id,client_id,cm_bill_id,mcp_pro_id,rm_bill_id,team_id,cm_total_time_in_seconds_by_cm_pro,rm_total_time_in_seconds_by_rme_pro,rm_total_time_in_seconds_by_rmm_pro,cm_pro_id,rme_pro_id,rmm_pro_id
+                !grp:Care Month Details:id,created_at,type,uid,cm_reason1,cm_reason2,cm_total_time_in_seconds,cm_total_time_in_seconds_by_ally,cm_total_time_in_seconds_by_mcp,has_mcp_done_em_visit,is_client_enrolled_in_cm,is_client_enrolled_in_rm,is_cm_canceled_this_month,is_rm_canceled_this_month,is_tm_this_month,rm_reason1,rm_reason2,rm_total_time_in_seconds,rm_total_time_in_seconds_by_ally,rm_total_time_in_seconds_by_mcp,start_date,why_is_cm_canceled_this_month,why_is_rm_canceled_this_month,why_not_enrolled_in_cm_category,why_not_enrolled_in_cm_memo,why_not_enrolled_in_rm_category,why_not_enrolled_in_rm_memo,created_by_session_id,ally_pro_id,client_id,cm_bill_id,mcp_pro_id,rm_bill_id,cm_total_time_in_seconds_by_cm_pro,rm_total_time_in_seconds_by_rme_pro,rm_total_time_in_seconds_by_rmm_pro,cm_pro_id,rme_pro_id,rmm_pro_id
 # :: need remove
             cm_time_entries
                 id=care_month_entry.care_month_id,cm_or_rm='CM'
@@ -616,7 +552,6 @@ ADMIN
                     asHcpOrAlly:select:HCP,ALLY
                     code
                     amount:number
-            teams
             clients
             pro_access
             mcp_updates

resources/views/admin/facilities_SINGLE/SUB_dashboard.blade.php

@@ -1,6 +1,34 @@
 @extends('admin.facilities.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>facilities_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>admin/facilities_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/facilities/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

resources/views/admin/lobbies_SINGLE/SUB_dashboard.blade.php

@@ -1,6 +1,34 @@
 @extends('admin.lobbies.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>lobbies_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>admin/lobbies_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/lobbies/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

resources/views/admin/meeting_invitations_SINGLE/SUB_dashboard.blade.php

@@ -1,6 +1,34 @@
 @extends('admin.meeting_invitations.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>meeting_invitations_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>admin/meeting_invitations_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/meeting_invitations/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

resources/views/admin/meeting_knocks_SINGLE/SUB_dashboard.blade.php

@@ -1,6 +1,34 @@
 @extends('admin.meeting_knocks.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>meeting_knocks_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>admin/meeting_knocks_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/meeting_knocks/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

resources/views/admin/meeting_messages_SINGLE/SUB_dashboard.blade.php

@@ -1,6 +1,34 @@
 @extends('admin.meeting_messages.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>meeting_messages_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>admin/meeting_messages_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/meeting_messages/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

resources/views/admin/meeting_participants_SINGLE/SUB_dashboard.blade.php

@@ -1,6 +1,34 @@
 @extends('admin.meeting_participants.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>meeting_participants_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>admin/meeting_participants_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/meeting_participants/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

resources/views/admin/meeting_rings_SINGLE/SUB_dashboard.blade.php

@@ -1,6 +1,34 @@
 @extends('admin.meeting_rings.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>meeting_rings_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>admin/meeting_rings_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/meeting_rings/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

resources/views/admin/meetings_SINGLE/SUB_dashboard.blade.php

@@ -1,6 +1,34 @@
 @extends('admin.meetings.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>meetings_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>admin/meetings_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/meetings/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

resources/views/admin/pro_rates/index.blade.php

@@ -22,14 +22,12 @@
 <th>Reactivated At</th>
 <th>Reactivation Memo</th>
 <th>Amount</th>
-<th>As Hcp Or Ally</th>
 <th>Code</th>
+<th>Responsibility</th>
 <th>Created By Session Id</th>
 <th>Deactivated By Session Id</th>
 <th>Reactivated By Session Id</th>
 <th>Pro Id</th>
-<th>As Hcp Or Cm Or Rme Or Rmm</th>
-<th>Responsibility</th>
             </tr>
             </thead>
             <tbody>
@@ -45,14 +43,12 @@
 <td><?= $record->reactivated_at ?></td>
 <td><?= $record->reactivation_memo ?></td>
 <td><?= $record->amount ?></td>
-<td><?= $record->as_hcp_or_ally ?></td>
 <td><?= $record->code ?></td>
+<td><?= $record->responsibility ?></td>
 <td><?= $record->created_by_session_id ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
 <td><?= $record->pro_id ?></td>
-<td><?= $record->as_hcp_or_cm_or_rme_or_rmm ?></td>
-<td><?= $record->responsibility ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/admin/pro_rates_SINGLE/SUB_dashboard.blade.php

@@ -1,6 +1,34 @@
 @extends('admin.pro_rates.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>pro_rates_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>admin/pro_rates_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/pro_rates/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

resources/views/admin/pros/subs.blade.php

@@ -1,6 +1,5 @@
 <a href='/pros/view/<?= $record->uid ?>/SUB_dashboard' class='d-block px-3 py-2 border-bottom {{ 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='/pros/view/<?= $record->uid ?>/SUB_payment_schedule' class='d-block px-3 py-2 border-bottom {{ request()->route()->getActionMethod() === 'SUB_payment_schedule' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Payment Schedule</a>
-<a href='/pros/view/<?= $record->uid ?>/SUB_teams' class='d-block px-3 py-2 border-bottom {{ request()->route()->getActionMethod() === 'SUB_teams' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Teams</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_clients' class='d-block px-3 py-2 border-bottom {{ request()->route()->getActionMethod() === 'SUB_clients' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Clients</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_pro_access' class='d-block px-3 py-2 border-bottom {{ request()->route()->getActionMethod() === 'SUB_pro_access' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Pro Access</a>
 <a href='/pros/view/<?= $record->uid ?>/SUB_mcp_updates' class='d-block px-3 py-2 border-bottom {{ request()->route()->getActionMethod() === 'SUB_mcp_updates' ? 'bg-secondary text-white font-weight-bold' : '' }}'>Mcp Updates</a>

resources/views/admin/pros_SINGLE/SUB_dashboard.blade.php

@@ -1,6 +1,34 @@
 @extends('admin.pros.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>pros_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>admin/pros_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('admin/pros/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

resources/views/admin/pros_SINGLE/SUB_payment_schedule.blade.php

@@ -24,14 +24,12 @@
 <th>Reactivated At</th>
 <th>Reactivation Memo</th>
 <th>Amount</th>
-<th>As Hcp Or Ally</th>
 <th>Code</th>
+<th>Responsibility</th>
 <th>Created By Session Id</th>
 <th>Deactivated By Session Id</th>
 <th>Reactivated By Session Id</th>
 <th>Pro Id</th>
-<th>As Hcp Or Cm Or Rme Or Rmm</th>
-<th>Responsibility</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -47,14 +45,12 @@
 <td><?= $subRecord->reactivated_at ?></td>
 <td><?= $subRecord->reactivation_memo ?></td>
 <td><?= $subRecord->amount ?></td>
-<td><?= $subRecord->as_hcp_or_ally ?></td>
 <td><?= $subRecord->code ?></td>
+<td><?= $subRecord->responsibility ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
 <td><?= $subRecord->deactivated_by_session_id ?></td>
 <td><?= $subRecord->reactivated_by_session_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
-<td><?= $subRecord->as_hcp_or_cm_or_rme_or_rmm ?></td>
-<td><?= $subRecord->responsibility ?></td>
                     </tr>
                 @endforeach
                 </tbody>

resources/views/layouts/generated-links.blade.php

@@ -1,5 +1,4 @@
 <li class='nav-item'><a href='/my_payment_schedule' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'my_payment_schedule') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-dollar-sign'></i><p>My Payment Schedule</p></a></li>
-<li class='nav-item'><a href='/my_teams' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'my_teams') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-user-friends'></i><p>My Teams</p></a></li>
 <li class='nav-item'><a href='/my_clients' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'my_clients') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-user-injured'></i><p>My Clients</p></a></li>
 <li class='nav-item'><a href='/notes' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'notes') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-file-alt'></i><p>Notes</p></a></li>
 <li class='nav-item'><a href='/erx' class='nav-link {{ (isset(request()->route()->getController()->selfName) && strpos(request()->route()->getController()->selfName, 'erx') === 0 ? 'active' : '') }} '><i class='nav-icon fa fa-file-signature'></i><p>Erx</p></a></li>

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

@@ -1,6 +1,34 @@
 @extends('pro.action_items.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>action_items_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>pro/action_items_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('pro/action_items/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

resources/views/pro/bills/index.blade.php

@@ -16,20 +16,24 @@
 <th>Created At</th>
 <th>Type</th>
 <th>Uid</th>
-<th>Ally Expected Payment Amount</th>
-<th>Ally Payment Amount</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 Ally Been Paid</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 Ally</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>
@@ -39,44 +43,32 @@
 <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 Ally At</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>Ally Payment Pro Transaction Id</th>
-<th>Ally Pro 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>Signed By Ally Session Id</th>
-<th>Signed By Hcp Session Id</th>
-<th>Cm Expected Payment Amount</th>
-<th>Cm Payment Amount</th>
-<th>Has Cm Been Paid</th>
-<th>Has Rme Been Paid</th>
-<th>Has Rmm Been Paid</th>
-<th>Is Signed By Cm</th>
-<th>Is Signed By Rme</th>
-<th>Is Signed By Rmm</th>
-<th>Rme Expected Payment Amount</th>
-<th>Rme Payment Amount</th>
-<th>Rmm Expected Payment Amount</th>
-<th>Rmm Payment Amount</th>
-<th>Signed By Cm At</th>
-<th>Signed By Rme At</th>
-<th>Signed By Rmm At</th>
-<th>Cm Payment Pro Transaction Id</th>
-<th>Cm Pro 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>
@@ -88,20 +80,24 @@
 <td><?= $record->created_at ?></td>
 <td><?= $record->type ?></td>
 <td><a href="/bills/view/<?= $record->uid ?>"><?= $record->uid ?></a></td>
-<td><?= $record->ally_expected_payment_amount ?></td>
-<td><?= $record->ally_payment_amount ?></td>
 <td><?= $record->bill_service_type ?></td>
+<td><?= $record->cm_expected_payment_amount ?></td>
 <td><?= $record->cm_or_rm ?></td>
+<td><?= $record->cm_payment_amount ?></td>
 <td><?= $record->code ?></td>
 <td><?= $record->collected_amount ?></td>
 <td><?= $record->effective_date ?></td>
-<td><?= $record->has_ally_been_paid ?></td>
+<td><?= $record->has_cm_been_paid ?></td>
 <td><?= $record->has_hcp_been_paid ?></td>
+<td><?= $record->has_rme_been_paid ?></td>
+<td><?= $record->has_rmm_been_paid ?></td>
 <td><?= $record->hcp_expected_payment_amount ?></td>
 <td><?= $record->hcp_payment_amount ?></td>
 <td><?= $record->is_cancelled ?></td>
-<td><?= $record->is_signed_by_ally ?></td>
+<td><?= $record->is_signed_by_cm ?></td>
 <td><?= $record->is_signed_by_hcp ?></td>
+<td><?= $record->is_signed_by_rme ?></td>
+<td><?= $record->is_signed_by_rmm ?></td>
 <td><?= $record->is_submitted ?></td>
 <td><?= $record->marked_cancelled_at ?></td>
 <td><?= $record->marked_submitted_at ?></td>
@@ -111,44 +107,32 @@
 <td><?= $record->reason2 ?></td>
 <td><?= $record->reason3 ?></td>
 <td><?= $record->reason3plus ?></td>
+<td><?= $record->rme_expected_payment_amount ?></td>
+<td><?= $record->rme_payment_amount ?></td>
+<td><?= $record->rmm_expected_payment_amount ?></td>
+<td><?= $record->rmm_payment_amount ?></td>
 <td><?= $record->service_location ?></td>
-<td><?= $record->signed_by_ally_at ?></td>
+<td><?= $record->signed_by_cm_at ?></td>
 <td><?= $record->signed_by_hcp_at ?></td>
+<td><?= $record->signed_by_rme_at ?></td>
+<td><?= $record->signed_by_rmm_at ?></td>
 <td><?= $record->created_by_session_id ?></td>
-<td><?= $record->ally_payment_pro_transaction_id ?></td>
-<td><?= $record->ally_pro_id ?></td>
 <td><?= $record->care_month_id ?></td>
 <td><?= $record->client_id ?></td>
+<td><?= $record->cm_payment_pro_transaction_id ?></td>
+<td><?= $record->cm_pro_id ?></td>
 <td><?= $record->hcp_payment_pro_transaction_id ?></td>
 <td><?= $record->hcp_pro_id ?></td>
 <td><?= $record->marked_cancelled_by_session_id ?></td>
 <td><?= $record->marked_submitted_by_session_id ?></td>
 <td><?= $record->note_id ?></td>
-<td><?= $record->signed_by_ally_session_id ?></td>
-<td><?= $record->signed_by_hcp_session_id ?></td>
-<td><?= $record->cm_expected_payment_amount ?></td>
-<td><?= $record->cm_payment_amount ?></td>
-<td><?= $record->has_cm_been_paid ?></td>
-<td><?= $record->has_rme_been_paid ?></td>
-<td><?= $record->has_rmm_been_paid ?></td>
-<td><?= $record->is_signed_by_cm ?></td>
-<td><?= $record->is_signed_by_rme ?></td>
-<td><?= $record->is_signed_by_rmm ?></td>
-<td><?= $record->rme_expected_payment_amount ?></td>
-<td><?= $record->rme_payment_amount ?></td>
-<td><?= $record->rmm_expected_payment_amount ?></td>
-<td><?= $record->rmm_payment_amount ?></td>
-<td><?= $record->signed_by_cm_at ?></td>
-<td><?= $record->signed_by_rme_at ?></td>
-<td><?= $record->signed_by_rmm_at ?></td>
-<td><?= $record->cm_payment_pro_transaction_id ?></td>
-<td><?= $record->cm_pro_id ?></td>
 <td><?= $record->note_ally_id ?></td>
 <td><?= $record->rme_payment_pro_transaction_id ?></td>
 <td><?= $record->rme_pro_id ?></td>
 <td><?= $record->rmm_payment_pro_transaction_id ?></td>
 <td><?= $record->rmm_pro_id ?></td>
 <td><?= $record->signed_by_cm_session_id ?></td>
+<td><?= $record->signed_by_hcp_session_id ?></td>
 <td><?= $record->signed_by_rme_session_id ?></td>
 <td><?= $record->signed_by_rmm_session_id ?></td>
                 </tr>

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

@@ -1,6 +1,34 @@
 @extends('pro.bills.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>bills_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>pro/bills_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('pro/bills/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

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

@@ -19,8 +19,10 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Ally Time In Seconds</th>
+<th>Achieved Cm Pro Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
+<th>Achieved Rme Pro Time In Seconds</th>
+<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -35,9 +37,6 @@
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro</th>
-<th>Achieved Cm Pro Time In Seconds</th>
-<th>Achieved Rme Pro Time In Seconds</th>
-<th>Achieved Rmm Pro Time In Seconds</th>
             </tr>
             </thead>
             <tbody>
@@ -50,8 +49,10 @@
 <td><?= $record->is_removed ?></td>
 <td><?= $record->removal_memo ?></td>
 <td><?= $record->removed_at ?></td>
-<td><?= $record->achieved_ally_time_in_seconds ?></td>
+<td><?= $record->achieved_cm_pro_time_in_seconds ?></td>
 <td><?= $record->achieved_mcp_time_in_seconds ?></td>
+<td><?= $record->achieved_rme_pro_time_in_seconds ?></td>
+<td><?= $record->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $record->achieved_total_time_in_seconds ?></td>
 <td><?= $record->cm_or_rm ?></td>
 <td><?= $record->content_detail ?></td>
@@ -67,9 +68,6 @@
 <td><?= $record->client_id ?></td>
 <td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = " . ($record->pro_id ? $record->pro_id : -1) . "");
 echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
-<td><?= $record->achieved_cm_pro_time_in_seconds ?></td>
-<td><?= $record->achieved_rme_pro_time_in_seconds ?></td>
-<td><?= $record->achieved_rmm_pro_time_in_seconds ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -1,6 +1,34 @@
 @extends('pro.care_month_entries.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>care_month_entries_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>pro/care_month_entries_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </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>
+
 
 @endsection

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

@@ -19,7 +19,7 @@
 <th>Cm Reason1</th>
 <th>Cm Reason2</th>
 <th>Cm Total Time In Seconds</th>
-<th>Cm Total Time In Seconds By Ally</th>
+<th>Cm Total Time In Seconds By Cm Pro</th>
 <th>Cm Total Time In Seconds By Mcp</th>
 <th>Has Mcp Done Em Visit</th>
 <th>Is Client Enrolled In Cm</th>
@@ -30,8 +30,9 @@
 <th>Rm Reason1</th>
 <th>Rm Reason2</th>
 <th>Rm Total Time In Seconds</th>
-<th>Rm Total Time In Seconds By Ally</th>
 <th>Rm Total Time In Seconds By Mcp</th>
+<th>Rm Total Time In Seconds By Rme Pro</th>
+<th>Rm Total Time In Seconds By Rmm Pro</th>
 <th>Start Date</th>
 <th>Why Is Cm Canceled This Month</th>
 <th>Why Is Rm Canceled This Month</th>
@@ -40,16 +41,11 @@
 <th>Why Not Enrolled In Rm Category</th>
 <th>Why Not Enrolled In Rm Memo</th>
 <th>Created By Session Id</th>
-<th>Ally Pro Id</th>
 <th>Client Id</th>
 <th>Cm Bill Id</th>
+<th>Cm Pro Id</th>
 <th>Mcp Pro Id</th>
 <th>Rm Bill Id</th>
-<th>Team Id</th>
-<th>Cm Total Time In Seconds By Cm Pro</th>
-<th>Rm Total Time In Seconds By Rme Pro</th>
-<th>Rm Total Time In Seconds By Rmm Pro</th>
-<th>Cm Pro Id</th>
 <th>Rme Pro Id</th>
 <th>Rmm Pro Id</th>
             </tr>
@@ -64,7 +60,7 @@
 <td><?= $record->cm_reason1 ?></td>
 <td><?= $record->cm_reason2 ?></td>
 <td><?= $record->cm_total_time_in_seconds ?></td>
-<td><?= $record->cm_total_time_in_seconds_by_ally ?></td>
+<td><?= $record->cm_total_time_in_seconds_by_cm_pro ?></td>
 <td><?= $record->cm_total_time_in_seconds_by_mcp ?></td>
 <td><?= $record->has_mcp_done_em_visit ?></td>
 <td><?= $record->is_client_enrolled_in_cm ?></td>
@@ -75,8 +71,9 @@
 <td><?= $record->rm_reason1 ?></td>
 <td><?= $record->rm_reason2 ?></td>
 <td><?= $record->rm_total_time_in_seconds ?></td>
-<td><?= $record->rm_total_time_in_seconds_by_ally ?></td>
 <td><?= $record->rm_total_time_in_seconds_by_mcp ?></td>
+<td><?= $record->rm_total_time_in_seconds_by_rme_pro ?></td>
+<td><?= $record->rm_total_time_in_seconds_by_rmm_pro ?></td>
 <td><?= $record->start_date ?></td>
 <td><?= $record->why_is_cm_canceled_this_month ?></td>
 <td><?= $record->why_is_rm_canceled_this_month ?></td>
@@ -85,16 +82,11 @@
 <td><?= $record->why_not_enrolled_in_rm_category ?></td>
 <td><?= $record->why_not_enrolled_in_rm_memo ?></td>
 <td><?= $record->created_by_session_id ?></td>
-<td><?= $record->ally_pro_id ?></td>
 <td><?= $record->client_id ?></td>
 <td><?= $record->cm_bill_id ?></td>
+<td><?= $record->cm_pro_id ?></td>
 <td><?= $record->mcp_pro_id ?></td>
 <td><?= $record->rm_bill_id ?></td>
-<td><?= $record->team_id ?></td>
-<td><?= $record->cm_total_time_in_seconds_by_cm_pro ?></td>
-<td><?= $record->rm_total_time_in_seconds_by_rme_pro ?></td>
-<td><?= $record->rm_total_time_in_seconds_by_rmm_pro ?></td>
-<td><?= $record->cm_pro_id ?></td>
 <td><?= $record->rme_pro_id ?></td>
 <td><?= $record->rmm_pro_id ?></td>
                 </tr>

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

@@ -21,8 +21,10 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Ally Time In Seconds</th>
+<th>Achieved Cm Pro Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
+<th>Achieved Rme Pro Time In Seconds</th>
+<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -37,9 +39,6 @@
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro Id</th>
-<th>Achieved Cm Pro Time In Seconds</th>
-<th>Achieved Rme Pro Time In Seconds</th>
-<th>Achieved Rmm Pro Time In Seconds</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -52,8 +51,10 @@
 <td><?= $subRecord->is_removed ?></td>
 <td><?= $subRecord->removal_memo ?></td>
 <td><?= $subRecord->removed_at ?></td>
-<td><?= $subRecord->achieved_ally_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_mcp_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_total_time_in_seconds ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
 <td><?= $subRecord->content_detail ?></td>
@@ -68,9 +69,6 @@
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
-<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -47,7 +47,6 @@
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Bill Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_bill_id ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Mcp Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcp_pro_id ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Rm Bill Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_bill_id ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Team Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->team_id ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds By Cm Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds_by_cm_pro ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Rme Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_rme_pro ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Rmm Pro</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_rmm_pro ?></td></tr>

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

@@ -21,8 +21,10 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Ally Time In Seconds</th>
+<th>Achieved Cm Pro Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
+<th>Achieved Rme Pro Time In Seconds</th>
+<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -37,9 +39,6 @@
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro Id</th>
-<th>Achieved Cm Pro Time In Seconds</th>
-<th>Achieved Rme Pro Time In Seconds</th>
-<th>Achieved Rmm Pro Time In Seconds</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -52,8 +51,10 @@
 <td><?= $subRecord->is_removed ?></td>
 <td><?= $subRecord->removal_memo ?></td>
 <td><?= $subRecord->removed_at ?></td>
-<td><?= $subRecord->achieved_ally_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_mcp_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_total_time_in_seconds ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
 <td><?= $subRecord->content_detail ?></td>
@@ -68,9 +69,6 @@
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
-<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -1,6 +1,34 @@
 @extends('pro.erx.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>erx_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>pro/erx_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('pro/erx/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

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

@@ -4,8 +4,6 @@
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_putName' class='d-block btn btn-sm btn-default mb-3'>Put Name</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_putGender' class='d-block btn btn-sm btn-default mb-3'>Put Gender</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_putDateOfBirth' class='d-block btn btn-sm btn-default mb-3'>Put Date Of Birth</a>
-<a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_putTeam' class='d-block btn btn-sm btn-default mb-3'>Put Team</a>
-@if($record->team_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_removeTeam' class='d-block btn btn-sm btn-default mb-3'>Remove Team</a> @endif
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_assignMcp' class='d-block btn btn-sm btn-default mb-3'>Assign Mcp</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_changeMcp' class='d-block btn btn-sm btn-default mb-3'>Change Mcp</a>
 @if($record->mcp_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_removeMcp' class='d-block btn btn-sm btn-default mb-3'>Remove Mcp</a> @endif

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

@@ -26,16 +26,6 @@
         <input type="hidden" name="_success" value="{{route('my_clients-index')}}">
         <input type="hidden" name="_return" value="{{route('my_clients-add_new')}}">
         <div class='form-group mb-3'>
-<label class='control-label'>Team </label>
-<select class='form-control' name='teamUid' value='{{ old('teamUid') ? old('teamUid') : '' }}' >
-<option value=''>-- Select --</option>
-<?php $dbOptions = \Illuminate\Support\Facades\DB::table('team')->get(); ?>
-<?php foreach($dbOptions as $o): ?>
-<option <?= $o->uid === (old('teamUid') ? old('teamUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->team_number ?> (<?= $o->uid ?>)</option>
-<?php endforeach; ?>
-</select>
-</div>
-<div class='form-group mb-3'>
 <label class='control-label'>Mcp Pro </label>
 <select class='form-control' name='mcpProUid' value='{{ old('mcpProUid') ? old('mcpProUid') : '' }}' >
 <option value=''>-- Select --</option>

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

@@ -18,20 +18,24 @@
 <th>Created At</th>
 <th>Type</th>
 <th>Uid</th>
-<th>Ally Expected Payment Amount</th>
-<th>Ally Payment Amount</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 Ally Been Paid</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 Ally</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>
@@ -41,44 +45,32 @@
 <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 Ally At</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>Ally Payment Pro Transaction Id</th>
-<th>Ally Pro 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>Signed By Ally Session Id</th>
-<th>Signed By Hcp Session Id</th>
-<th>Cm Expected Payment Amount</th>
-<th>Cm Payment Amount</th>
-<th>Has Cm Been Paid</th>
-<th>Has Rme Been Paid</th>
-<th>Has Rmm Been Paid</th>
-<th>Is Signed By Cm</th>
-<th>Is Signed By Rme</th>
-<th>Is Signed By Rmm</th>
-<th>Rme Expected Payment Amount</th>
-<th>Rme Payment Amount</th>
-<th>Rmm Expected Payment Amount</th>
-<th>Rmm Payment Amount</th>
-<th>Signed By Cm At</th>
-<th>Signed By Rme At</th>
-<th>Signed By Rmm At</th>
-<th>Cm Payment Pro Transaction Id</th>
-<th>Cm Pro 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>
@@ -90,20 +82,24 @@
 <td><?= $subRecord->created_at ?></td>
 <td><?= $subRecord->type ?></td>
 <td><a href="/bills/view/{{ $subRecord->uid }}"><?= $subRecord->uid ?></a></td>
-<td><?= $subRecord->ally_expected_payment_amount ?></td>
-<td><?= $subRecord->ally_payment_amount ?></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_ally_been_paid ?></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_ally ?></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><?= $subRecord->marked_cancelled_at ?></td>
 <td><?= $subRecord->marked_submitted_at ?></td>
@@ -113,44 +109,32 @@
 <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><?= $subRecord->signed_by_ally_at ?></td>
+<td><?= $subRecord->signed_by_cm_at ?></td>
 <td><?= $subRecord->signed_by_hcp_at ?></td>
+<td><?= $subRecord->signed_by_rme_at ?></td>
+<td><?= $subRecord->signed_by_rmm_at ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->ally_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->ally_pro_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->signed_by_ally_session_id ?></td>
-<td><?= $subRecord->signed_by_hcp_session_id ?></td>
-<td><?= $subRecord->cm_expected_payment_amount ?></td>
-<td><?= $subRecord->cm_payment_amount ?></td>
-<td><?= $subRecord->has_cm_been_paid ?></td>
-<td><?= $subRecord->has_rme_been_paid ?></td>
-<td><?= $subRecord->has_rmm_been_paid ?></td>
-<td><?= $subRecord->is_signed_by_cm ?></td>
-<td><?= $subRecord->is_signed_by_rme ?></td>
-<td><?= $subRecord->is_signed_by_rmm ?></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->signed_by_cm_at ?></td>
-<td><?= $subRecord->signed_by_rme_at ?></td>
-<td><?= $subRecord->signed_by_rmm_at ?></td>
-<td><?= $subRecord->cm_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->cm_pro_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>

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

@@ -21,8 +21,10 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Ally Time In Seconds</th>
+<th>Achieved Cm Pro Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
+<th>Achieved Rme Pro Time In Seconds</th>
+<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -37,9 +39,6 @@
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro</th>
-<th>Achieved Cm Pro Time In Seconds</th>
-<th>Achieved Rme Pro Time In Seconds</th>
-<th>Achieved Rmm Pro Time In Seconds</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -52,8 +51,10 @@
 <td><?= $subRecord->is_removed ?></td>
 <td><?= $subRecord->removal_memo ?></td>
 <td><?= $subRecord->removed_at ?></td>
-<td><?= $subRecord->achieved_ally_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_mcp_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_total_time_in_seconds ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
 <td><?= $subRecord->content_detail ?></td>
@@ -69,9 +70,6 @@
 <td><?= $subRecord->client_id ?></td>
 <td><?php $_r = \Illuminate\Support\Facades\DB::select("select name_display as result from pro where id = " . ($subRecord->pro_id ? $subRecord->pro_id : -1) . "");
 echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
-<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -21,7 +21,7 @@
 <th>Cm Reason1</th>
 <th>Cm Reason2</th>
 <th>Cm Total Time In Seconds</th>
-<th>Cm Total Time In Seconds By Ally</th>
+<th>Cm Total Time In Seconds By Cm Pro</th>
 <th>Cm Total Time In Seconds By Mcp</th>
 <th>Has Mcp Done Em Visit</th>
 <th>Is Client Enrolled In Cm</th>
@@ -32,8 +32,9 @@
 <th>Rm Reason1</th>
 <th>Rm Reason2</th>
 <th>Rm Total Time In Seconds</th>
-<th>Rm Total Time In Seconds By Ally</th>
 <th>Rm Total Time In Seconds By Mcp</th>
+<th>Rm Total Time In Seconds By Rme Pro</th>
+<th>Rm Total Time In Seconds By Rmm Pro</th>
 <th>Start Date</th>
 <th>Why Is Cm Canceled This Month</th>
 <th>Why Is Rm Canceled This Month</th>
@@ -42,16 +43,11 @@
 <th>Why Not Enrolled In Rm Category</th>
 <th>Why Not Enrolled In Rm Memo</th>
 <th>Created By Session Id</th>
-<th>Ally Pro Id</th>
 <th>Client Id</th>
 <th>Cm Bill Id</th>
+<th>Cm Pro Id</th>
 <th>Mcp Pro Id</th>
 <th>Rm Bill Id</th>
-<th>Team Id</th>
-<th>Cm Total Time In Seconds By Cm Pro</th>
-<th>Rm Total Time In Seconds By Rme Pro</th>
-<th>Rm Total Time In Seconds By Rmm Pro</th>
-<th>Cm Pro Id</th>
 <th>Rme Pro Id</th>
 <th>Rmm Pro Id</th>
                 </tr>
@@ -66,7 +62,7 @@
 <td><?= $subRecord->cm_reason1 ?></td>
 <td><?= $subRecord->cm_reason2 ?></td>
 <td><?= $subRecord->cm_total_time_in_seconds ?></td>
-<td><?= $subRecord->cm_total_time_in_seconds_by_ally ?></td>
+<td><?= $subRecord->cm_total_time_in_seconds_by_cm_pro ?></td>
 <td><?= $subRecord->cm_total_time_in_seconds_by_mcp ?></td>
 <td><?= $subRecord->has_mcp_done_em_visit ?></td>
 <td><?= $subRecord->is_client_enrolled_in_cm ?></td>
@@ -77,8 +73,9 @@
 <td><?= $subRecord->rm_reason1 ?></td>
 <td><?= $subRecord->rm_reason2 ?></td>
 <td><?= $subRecord->rm_total_time_in_seconds ?></td>
-<td><?= $subRecord->rm_total_time_in_seconds_by_ally ?></td>
 <td><?= $subRecord->rm_total_time_in_seconds_by_mcp ?></td>
+<td><?= $subRecord->rm_total_time_in_seconds_by_rme_pro ?></td>
+<td><?= $subRecord->rm_total_time_in_seconds_by_rmm_pro ?></td>
 <td><?= $subRecord->start_date ?></td>
 <td><?= $subRecord->why_is_cm_canceled_this_month ?></td>
 <td><?= $subRecord->why_is_rm_canceled_this_month ?></td>
@@ -87,16 +84,11 @@
 <td><?= $subRecord->why_not_enrolled_in_rm_category ?></td>
 <td><?= $subRecord->why_not_enrolled_in_rm_memo ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->ally_pro_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->cm_bill_id ?></td>
+<td><?= $subRecord->cm_pro_id ?></td>
 <td><?= $subRecord->mcp_pro_id ?></td>
 <td><?= $subRecord->rm_bill_id ?></td>
-<td><?= $subRecord->team_id ?></td>
-<td><?= $subRecord->cm_total_time_in_seconds_by_cm_pro ?></td>
-<td><?= $subRecord->rm_total_time_in_seconds_by_rme_pro ?></td>
-<td><?= $subRecord->rm_total_time_in_seconds_by_rmm_pro ?></td>
-<td><?= $subRecord->cm_pro_id ?></td>
 <td><?= $subRecord->rme_pro_id ?></td>
 <td><?= $subRecord->rmm_pro_id ?></td>
                     </tr>

resources/views/pro/my_teams_SINGLE/SUB_clients.blade.php

@@ -89,17 +89,12 @@
 <th>Created By Session Id</th>
 <th>Deactivated By Session Id</th>
 <th>Reactivated By Session Id</th>
-<th>Ally Pro Id</th>
+<th>Cm Pro Id</th>
 <th>Current Meeting Participant Id</th>
 <th>Mcp Em Visit Note Id</th>
 <th>Mcp Pro Id</th>
-<th>Team</th>
-<th>Cm Pro Id</th>
 <th>Rme Pro Id</th>
 <th>Rmm Pro Id</th>
-<th>Is Sms Auth Pending</th>
-<th>Sms Auth Token</th>
-<th>Sms Auth Token Sent At</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -180,18 +175,12 @@
 <td><?= $subRecord->created_by_session_id ?></td>
 <td><?= $subRecord->deactivated_by_session_id ?></td>
 <td><?= $subRecord->reactivated_by_session_id ?></td>
-<td><?= $subRecord->ally_pro_id ?></td>
+<td><?= $subRecord->cm_pro_id ?></td>
 <td><?= $subRecord->current_meeting_participant_id ?></td>
 <td><?= $subRecord->mcp_em_visit_note_id ?></td>
 <td><?= $subRecord->mcp_pro_id ?></td>
-<td><?php $_r = \Illuminate\Support\Facades\DB::select("select team_number as result from team where id = " . ($subRecord->team_id ? $subRecord->team_id : -1) . " limit 1");
-echo ($_r && count($_r)) ? $_r[0]->result : '-'; ?></td>
-<td><?= $subRecord->cm_pro_id ?></td>
 <td><?= $subRecord->rme_pro_id ?></td>
 <td><?= $subRecord->rmm_pro_id ?></td>
-<td><?= $subRecord->is_sms_auth_pending ?></td>
-<td><?= $subRecord->sms_auth_token ?></td>
-<td><?= $subRecord->sms_auth_token_sent_at ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -18,20 +18,24 @@
 <th>Created At</th>
 <th>Type</th>
 <th>Uid</th>
-<th>Ally Expected Payment Amount</th>
-<th>Ally Payment Amount</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 Ally Been Paid</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 Ally</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>
@@ -41,44 +45,32 @@
 <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 Ally At</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>Ally Payment Pro Transaction Id</th>
-<th>Ally Pro 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>Signed By Ally Session Id</th>
-<th>Signed By Hcp Session Id</th>
-<th>Cm Expected Payment Amount</th>
-<th>Cm Payment Amount</th>
-<th>Has Cm Been Paid</th>
-<th>Has Rme Been Paid</th>
-<th>Has Rmm Been Paid</th>
-<th>Is Signed By Cm</th>
-<th>Is Signed By Rme</th>
-<th>Is Signed By Rmm</th>
-<th>Rme Expected Payment Amount</th>
-<th>Rme Payment Amount</th>
-<th>Rmm Expected Payment Amount</th>
-<th>Rmm Payment Amount</th>
-<th>Signed By Cm At</th>
-<th>Signed By Rme At</th>
-<th>Signed By Rmm At</th>
-<th>Cm Payment Pro Transaction Id</th>
-<th>Cm Pro 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>
@@ -90,20 +82,24 @@
 <td><?= $subRecord->created_at ?></td>
 <td><?= $subRecord->type ?></td>
 <td><a href="/bills/view/{{ $subRecord->uid }}"><?= $subRecord->uid ?></a></td>
-<td><?= $subRecord->ally_expected_payment_amount ?></td>
-<td><?= $subRecord->ally_payment_amount ?></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_ally_been_paid ?></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_ally ?></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><?= $subRecord->marked_cancelled_at ?></td>
 <td><?= $subRecord->marked_submitted_at ?></td>
@@ -113,44 +109,32 @@
 <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><?= $subRecord->signed_by_ally_at ?></td>
+<td><?= $subRecord->signed_by_cm_at ?></td>
 <td><?= $subRecord->signed_by_hcp_at ?></td>
+<td><?= $subRecord->signed_by_rme_at ?></td>
+<td><?= $subRecord->signed_by_rmm_at ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->ally_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->ally_pro_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->signed_by_ally_session_id ?></td>
-<td><?= $subRecord->signed_by_hcp_session_id ?></td>
-<td><?= $subRecord->cm_expected_payment_amount ?></td>
-<td><?= $subRecord->cm_payment_amount ?></td>
-<td><?= $subRecord->has_cm_been_paid ?></td>
-<td><?= $subRecord->has_rme_been_paid ?></td>
-<td><?= $subRecord->has_rmm_been_paid ?></td>
-<td><?= $subRecord->is_signed_by_cm ?></td>
-<td><?= $subRecord->is_signed_by_rme ?></td>
-<td><?= $subRecord->is_signed_by_rmm ?></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->signed_by_cm_at ?></td>
-<td><?= $subRecord->signed_by_rme_at ?></td>
-<td><?= $subRecord->signed_by_rmm_at ?></td>
-<td><?= $subRecord->cm_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->cm_pro_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>

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

@@ -1,6 +1,34 @@
 @extends('pro.notes.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>notes_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>pro/notes_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('pro/notes/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

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

@@ -1,6 +1,34 @@
 @extends('pro.pro_access.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>pro_access_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>pro/pro_access_SINGLE/SUB_dashboard.blade.php</b><br><br>
+    <div class="row mt-3">
+    <div class="col-8">
+
+        <div class="table-responsive p-0 bg-white table-sm">
+            <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>
+                @foreach($record as $k => $v)
+                    <tr>
+                        <td class="px-2 text-secondary border-right">{{ ucwords(str_replace("_", " ", $k)) }}</td>
+                        <td class="px-2 font-weight-bold">{{ $record->$k }}</td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('pro/pro_access/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

routes/generated.php

@@ -5,23 +5,6 @@ use Illuminate\Support\Facades\Route;
 // --- pro: my_payment_schedule --- //
 Route::get('/my_payment_schedule', 'my_payment_schedule_Controller@index')->name('my_payment_schedule-index');
 
-// --- pro: my_teams --- //
-Route::get('/my_teams', 'my_teams_Controller@index')->name('my_teams-index');
-Route::get('/my_teams/add_new', 'my_teams_Controller@add_new')->name('my_teams-add_new');
-Route::get('/my_teams/view/{uid}', 'my_teams_Controller@view')->name('my_teams-view');
-
-// --- pro: my_teams_SINGLE --- //
-Route::get('/my_teams/view/{uid}/ACTION_updateTeamNumber', 'my_teams_SINGLE_Controller@ACTION_updateTeamNumber')->name('my_teams_SINGLE-ACTION_updateTeamNumber');
-Route::get('/my_teams/view/{uid}/ACTION_deactivate', 'my_teams_SINGLE_Controller@ACTION_deactivate')->name('my_teams_SINGLE-ACTION_deactivate');
-Route::get('/my_teams/view/{uid}/ACTION_updateDeactivationMemo', 'my_teams_SINGLE_Controller@ACTION_updateDeactivationMemo')->name('my_teams_SINGLE-ACTION_updateDeactivationMemo');
-Route::get('/my_teams/view/{uid}/ACTION_reactivate', 'my_teams_SINGLE_Controller@ACTION_reactivate')->name('my_teams_SINGLE-ACTION_reactivate');
-Route::get('/my_teams/view/{uid}/ACTION_updateReactivationMemo', 'my_teams_SINGLE_Controller@ACTION_updateReactivationMemo')->name('my_teams_SINGLE-ACTION_updateReactivationMemo');
-Route::get('/my_teams/view/{uid}/SUB_dashboard', 'my_teams_SINGLE_Controller@SUB_dashboard')->name('my_teams_SINGLE-SUB_dashboard');
-Route::get('/my_teams/view/{uid}/SUB_edit_demographics', 'my_teams_SINGLE_Controller@SUB_edit_demographics')->name('my_teams_SINGLE-SUB_edit_demographics');
-Route::get('/my_teams/view/{uid}/SUB_clients', 'my_teams_SINGLE_Controller@SUB_clients')->name('my_teams_SINGLE-SUB_clients');
-Route::get('/my_teams/view/{uid}/SUB_audit_log', 'my_teams_SINGLE_Controller@SUB_audit_log')->name('my_teams_SINGLE-SUB_audit_log');
-Route::get('/my_teams/view/{uid}/ACTION_clientsAddNew', 'my_teams_SINGLE_Controller@ACTION_clientsAddNew')->name('my_teams_SINGLE-ACTION_clientsAddNew');
-
 // --- pro: my_clients --- //
 Route::get('/my_clients', 'my_clients_Controller@index')->name('my_clients-index');
 Route::get('/my_clients/add_new', 'my_clients_Controller@add_new')->name('my_clients-add_new');
@@ -34,8 +17,6 @@ Route::get('/my_clients/view/{uid}/ACTION_sendEmailAddressConfirmationMessage',
 Route::get('/my_clients/view/{uid}/ACTION_putName', 'my_clients_SINGLE_Controller@ACTION_putName')->name('my_clients_SINGLE-ACTION_putName');
 Route::get('/my_clients/view/{uid}/ACTION_putGender', 'my_clients_SINGLE_Controller@ACTION_putGender')->name('my_clients_SINGLE-ACTION_putGender');
 Route::get('/my_clients/view/{uid}/ACTION_putDateOfBirth', 'my_clients_SINGLE_Controller@ACTION_putDateOfBirth')->name('my_clients_SINGLE-ACTION_putDateOfBirth');
-Route::get('/my_clients/view/{uid}/ACTION_putTeam', 'my_clients_SINGLE_Controller@ACTION_putTeam')->name('my_clients_SINGLE-ACTION_putTeam');
-Route::get('/my_clients/view/{uid}/ACTION_removeTeam', 'my_clients_SINGLE_Controller@ACTION_removeTeam')->name('my_clients_SINGLE-ACTION_removeTeam');
 Route::get('/my_clients/view/{uid}/ACTION_assignMcp', 'my_clients_SINGLE_Controller@ACTION_assignMcp')->name('my_clients_SINGLE-ACTION_assignMcp');
 Route::get('/my_clients/view/{uid}/ACTION_changeMcp', 'my_clients_SINGLE_Controller@ACTION_changeMcp')->name('my_clients_SINGLE-ACTION_changeMcp');
 Route::get('/my_clients/view/{uid}/ACTION_removeMcp', 'my_clients_SINGLE_Controller@ACTION_removeMcp')->name('my_clients_SINGLE-ACTION_removeMcp');
@@ -274,7 +255,6 @@ Route::get('/pros/view/{uid}/ACTION_setIsSsnCompleteToTrue', 'pros_SINGLE_Contro
 Route::get('/pros/view/{uid}/ACTION_setIsSsnCompleteToFalse', 'pros_SINGLE_Controller@ACTION_setIsSsnCompleteToFalse')->name('pros_SINGLE-ACTION_setIsSsnCompleteToFalse');
 Route::get('/pros/view/{uid}/SUB_dashboard', 'pros_SINGLE_Controller@SUB_dashboard')->name('pros_SINGLE-SUB_dashboard');
 Route::get('/pros/view/{uid}/SUB_payment_schedule', 'pros_SINGLE_Controller@SUB_payment_schedule')->name('pros_SINGLE-SUB_payment_schedule');
-Route::get('/pros/view/{uid}/SUB_teams', 'pros_SINGLE_Controller@SUB_teams')->name('pros_SINGLE-SUB_teams');
 Route::get('/pros/view/{uid}/SUB_clients', 'pros_SINGLE_Controller@SUB_clients')->name('pros_SINGLE-SUB_clients');
 Route::get('/pros/view/{uid}/SUB_pro_access', 'pros_SINGLE_Controller@SUB_pro_access')->name('pros_SINGLE-SUB_pro_access');
 Route::get('/pros/view/{uid}/SUB_mcp_updates', 'pros_SINGLE_Controller@SUB_mcp_updates')->name('pros_SINGLE-SUB_mcp_updates');