Bladeren bron

updated spec

logicpowerhouse 5 jaren geleden
bovenliggende
commit
1cb2e4d47f

+ 6 - 0
app/Http/Controllers/my_clients_SINGLE_Controller.php

@@ -335,4 +335,10 @@ class my_clients_SINGLE_Controller extends Controller
 		$record = DB::table('client')->where('uid', $uid)->first();
 		return view('pro/my_clients_SINGLE/ACTION_notesAddNew', compact('record'));
 	}
+
+	// GET /my_clients/view/{uid}/ACTION_care_monthsAddNew
+	public function ACTION_care_monthsAddNew(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return view('pro/my_clients_SINGLE/ACTION_care_monthsAddNew', compact('record'));
+	}
 }

+ 4 - 0
generatecv/tree.txt

@@ -160,6 +160,9 @@ PRO
                     contentDetail
             care_months
                 id=care_month.client_id
+                add_new:care_month
+                    clientUid:hidden=uid
+                    startDate:date
 #           care_months/add_new:create
             care_month_entries
                 id=care_month_entry.client_id
@@ -223,6 +226,7 @@ PRO
         SUB
             dashboard
             time_entries
+			    id=care_month_entry.care_month_id				
             audit_log
     care_month_entries|care_month_entry|add|view|remove
     care_month_entries/add_new_for_cm:createForCm

+ 4 - 0
resources/views/admin/facilities/index.blade.php

@@ -35,6 +35,8 @@
 <th>Name</th>
 <th>Phone</th>
 <th>Created By Session Id</th>
+<th>Deactivated By Id</th>
+<th>Reactivated By Id</th>
 <th>Deactivated By Session Id</th>
 <th>Reactivated By Session Id</th>
             </tr>
@@ -65,6 +67,8 @@
 <td><?= $record->name ?></td>
 <td><?= $record->phone ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->deactivated_by_id ?></td>
+<td><?= $record->reactivated_by_id ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
                 </tr>

+ 6 - 2
resources/views/admin/pro_rates/index.blade.php

@@ -25,9 +25,11 @@
 <th>As Hcp Or Ally</th>
 <th>Code</th>
 <th>Created By Session Id</th>
+<th>Deactivated By Id</th>
+<th>Reactivated By Id</th>
+<th>Pro Id</th>
 <th>Deactivated By Session Id</th>
 <th>Reactivated By Session Id</th>
-<th>Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -46,9 +48,11 @@
 <td><?= $record->as_hcp_or_ally ?></td>
 <td><?= $record->code ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->deactivated_by_id ?></td>
+<td><?= $record->reactivated_by_id ?></td>
+<td><?= $record->pro_id ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
-<td><?= $record->pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 6 - 2
resources/views/admin/pros/index.blade.php

@@ -92,9 +92,11 @@
 <th>Web Socket Uid</th>
 <th>Work Phone Number</th>
 <th>Created By Session Id</th>
+<th>Deactivated By Id</th>
+<th>Reactivated By Id</th>
+<th>Currently In Meeting Id</th>
 <th>Deactivated By Session Id</th>
 <th>Reactivated By Session Id</th>
-<th>Currently In Meeting Id</th>
             </tr>
             </thead>
             <tbody>
@@ -180,9 +182,11 @@
 <td><?= $record->web_socket_uid ?></td>
 <td><?= $record->work_phone_number ?></td>
 <td><?= $record->created_by_session_id ?></td>
+<td><?= $record->deactivated_by_id ?></td>
+<td><?= $record->reactivated_by_id ?></td>
+<td><?= $record->currently_in_meeting_id ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>
-<td><?= $record->currently_in_meeting_id ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 8 - 8
resources/views/pro/action_items/index.blade.php

@@ -19,21 +19,21 @@
 <th>Action Item Category</th>
 <th>Content Detail</th>
 <th>Content Text</th>
-<th>Is Signed By Ally</th>
 <th>Is Signed By Prescriber</th>
-<th>Signed By Ally At</th>
 <th>Signed By Prescriber At</th>
 <th>Status Category</th>
 <th>Status Memo</th>
 <th>Created By Session Id</th>
-<th>Ally Pro Id</th>
 <th>Client Id</th>
 <th>Current Content Update Id</th>
 <th>Current Status Update Id</th>
 <th>Prescriber Pro Id</th>
-<th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Is Signed By Ally</th>
+<th>Signed By Ally At</th>
+<th>Ally Pro Id</th>
+<th>Signed By Ally Session Id</th>
             </tr>
             </thead>
             <tbody>
@@ -46,21 +46,21 @@
 <td><?= $record->action_item_category ?></td>
 <td><?= $record->content_detail ?></td>
 <td><?= $record->content_text ?></td>
-<td><?= $record->is_signed_by_ally ?></td>
 <td><?= $record->is_signed_by_prescriber ?></td>
-<td><?= $record->signed_by_ally_at ?></td>
 <td><?= $record->signed_by_prescriber_at ?></td>
 <td><?= $record->status_category ?></td>
 <td><?= $record->status_memo ?></td>
 <td><?= $record->created_by_session_id ?></td>
-<td><?= $record->ally_pro_id ?></td>
 <td><?= $record->client_id ?></td>
 <td><?= $record->current_content_update_id ?></td>
 <td><?= $record->current_status_update_id ?></td>
 <td><?= $record->prescriber_pro_id ?></td>
-<td><?= $record->signed_by_ally_session_id ?></td>
 <td><?= $record->signed_by_prescriber_session_id ?></td>
 <td><?= $record->to_facility_id ?></td>
+<td><?= $record->is_signed_by_ally ?></td>
+<td><?= $record->signed_by_ally_at ?></td>
+<td><?= $record->ally_pro_id ?></td>
+<td><?= $record->signed_by_ally_session_id ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 10 - 8
resources/views/pro/care_month_entries/index.blade.php

@@ -21,9 +21,6 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Ally Time In Seconds</th>
-<th>Achieved Mcp Time In Seconds</th>
-<th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
 <th>Content Text</th>
@@ -33,10 +30,14 @@
 <th>Starting Time</th>
 <th>Time In Seconds</th>
 <th>Created By Session Id</th>
-<th>Removed By Session Id</th>
+<th>Removed By Id</th>
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro Id</th>
+<th>Achieved Ally Time In Seconds</th>
+<th>Achieved Mcp Time In Seconds</th>
+<th>Achieved Total Time In Seconds</th>
+<th>Removed By Session Id</th>
             </tr>
             </thead>
             <tbody>
@@ -50,9 +51,6 @@
 <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_mcp_time_in_seconds ?></td>
-<td><?= $record->achieved_total_time_in_seconds ?></td>
 <td><?= $record->cm_or_rm ?></td>
 <td><?= $record->content_detail ?></td>
 <td><?= $record->content_text ?></td>
@@ -62,10 +60,14 @@
 <td><?= $record->starting_time ?></td>
 <td><?= $record->time_in_seconds ?></td>
 <td><?= $record->created_by_session_id ?></td>
-<td><?= $record->removed_by_session_id ?></td>
+<td><?= $record->removed_by_id ?></td>
 <td><?= $record->care_month_id ?></td>
 <td><?= $record->client_id ?></td>
 <td><?= $record->pro_id ?></td>
+<td><?= $record->achieved_ally_time_in_seconds ?></td>
+<td><?= $record->achieved_mcp_time_in_seconds ?></td>
+<td><?= $record->achieved_total_time_in_seconds ?></td>
+<td><?= $record->removed_by_session_id ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 6 - 6
resources/views/pro/care_months/index.blade.php

@@ -19,7 +19,6 @@
 <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 Mcp</th>
 <th>Is Client Enrolled In Cm</th>
 <th>Is Client Enrolled In Rm</th>
@@ -29,8 +28,6 @@
 <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>Start Date</th>
 <th>Why Is Cm Canceled This Month</th>
 <th>Why Is Rm Canceled This Month</th>
@@ -44,6 +41,9 @@
 <th>Cm Bill Id</th>
 <th>Mcp Pro Id</th>
 <th>Rm Bill Id</th>
+<th>Cm Total Time In Seconds By Ally</th>
+<th>Rm Total Time In Seconds By Ally</th>
+<th>Rm Total Time In Seconds By Mcp</th>
             </tr>
             </thead>
             <tbody>
@@ -56,7 +56,6 @@
 <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_mcp ?></td>
 <td><?= $record->is_client_enrolled_in_cm ?></td>
 <td><?= $record->is_client_enrolled_in_rm ?></td>
@@ -66,8 +65,6 @@
 <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->start_date ?></td>
 <td><?= $record->why_is_cm_canceled_this_month ?></td>
 <td><?= $record->why_is_rm_canceled_this_month ?></td>
@@ -81,6 +78,9 @@
 <td><?= $record->cm_bill_id ?></td>
 <td><?= $record->mcp_pro_id ?></td>
 <td><?= $record->rm_bill_id ?></td>
+<td><?= $record->cm_total_time_in_seconds_by_ally ?></td>
+<td><?= $record->rm_total_time_in_seconds_by_ally ?></td>
+<td><?= $record->rm_total_time_in_seconds_by_mcp ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 2 - 1
resources/views/pro/my_clients/actions.blade.php

@@ -36,4 +36,5 @@
 <a href='/my_clients/view/<?= $record->uid ?>/ACTION_updateDeactivationMemo' class='d-block btn btn-sm btn-default mb-3'>Update Deactivation Memo</a>
 <a href='/my_clients/view/<?= $record->uid ?>/ACTION_reactivate' class='d-block btn btn-sm btn-default mb-3'>Reactivate</a>
 <a href='/my_clients/view/<?= $record->uid ?>/ACTION_updateReactivationMemo' class='d-block btn btn-sm btn-default mb-3'>Update Reactivation Memo</a>
-<a href='/my_clients/view/<?= $record->uid ?>/ACTION_notesAddNew' class='d-block btn btn-sm btn-default mb-3'>Notes Add New</a>
+<a href='/my_clients/view/<?= $record->uid ?>/ACTION_notesAddNew' class='d-block btn btn-sm btn-default mb-3'>Notes Add New</a>
+<a href='/my_clients/view/<?= $record->uid ?>/ACTION_care_monthsAddNew' class='d-block btn btn-sm btn-default mb-3'>Care_months Add New</a>

+ 8 - 4
resources/views/pro/my_clients/index.blade.php

@@ -85,13 +85,15 @@
 <th>Why Not Enrolled In Rm Memo</th>
 <th>Work Phone Number</th>
 <th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
+<th>Deactivated By Id</th>
+<th>Reactivated By Id</th>
 <th>Ally Pro Id</th>
 <th>Mcp Em Visit Note Id</th>
 <th>Mcp Pro Id</th>
 <th>Team Id</th>
 <th>Cm Target</th>
+<th>Deactivated By Session Id</th>
+<th>Reactivated By Session Id</th>
             </tr>
             </thead>
             <tbody>
@@ -170,13 +172,15 @@
 <td><?= $record->why_not_enrolled_in_rm_memo ?></td>
 <td><?= $record->work_phone_number ?></td>
 <td><?= $record->created_by_session_id ?></td>
-<td><?= $record->deactivated_by_session_id ?></td>
-<td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->deactivated_by_id ?></td>
+<td><?= $record->reactivated_by_id ?></td>
 <td><?= $record->ally_pro_id ?></td>
 <td><?= $record->mcp_em_visit_note_id ?></td>
 <td><?= $record->mcp_pro_id ?></td>
 <td><?= $record->team_id ?></td>
 <td><?= $record->cm_target ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 32 - 0
resources/views/pro/my_clients_SINGLE/ACTION_care_monthsAddNew.blade.php

@@ -0,0 +1,32 @@
+@extends('pro.my_clients.view')
+@section('content-inner')
+
+    <h4 class='my-3'>
+        <div>Care Months Add New</div>
+    </h4>
+
+    <form action="/post-to-api"
+          method="post" enctype="multipart/form-data"
+          class="bg-light rounded border px-3 pt-3 mr-3 mb-3">
+        @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/careMonth/create">
+        <input type="hidden" name="_success" value="{{route('my_clients_SINGLE-SUB_care_months', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_care_monthsAddNew', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Start Date</label>
+<input class='form-control' type='date' name='startDate' value='{{ old('startDate') ? old('startDate') : '' }}' >
+</div>
+        <div class="form-group mb-3">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_clients_SINGLE-SUB_care_months', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5">Cancel</a>
+        </div>
+    </form>
+
+@endsection

+ 8 - 8
resources/views/pro/my_clients_SINGLE/SUB_action_items.blade.php

@@ -21,21 +21,21 @@
 <th>Action Item Category</th>
 <th>Content Detail</th>
 <th>Content Text</th>
-<th>Is Signed By Ally</th>
 <th>Is Signed By Prescriber</th>
-<th>Signed By Ally At</th>
 <th>Signed By Prescriber At</th>
 <th>Status Category</th>
 <th>Status Memo</th>
 <th>Created By Session Id</th>
-<th>Ally Pro Id</th>
 <th>Client Id</th>
 <th>Current Content Update Id</th>
 <th>Current Status Update Id</th>
 <th>Prescriber Pro Id</th>
-<th>Signed By Ally Session Id</th>
 <th>Signed By Prescriber Session Id</th>
 <th>To Facility Id</th>
+<th>Is Signed By Ally</th>
+<th>Signed By Ally At</th>
+<th>Ally Pro Id</th>
+<th>Signed By Ally Session Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -48,21 +48,21 @@
 <td><?= $subRecord->action_item_category ?></td>
 <td><?= $subRecord->content_detail ?></td>
 <td><?= $subRecord->content_text ?></td>
-<td><?= $subRecord->is_signed_by_ally ?></td>
 <td><?= $subRecord->is_signed_by_prescriber ?></td>
-<td><?= $subRecord->signed_by_ally_at ?></td>
 <td><?= $subRecord->signed_by_prescriber_at ?></td>
 <td><?= $subRecord->status_category ?></td>
 <td><?= $subRecord->status_memo ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->ally_pro_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->current_content_update_id ?></td>
 <td><?= $subRecord->current_status_update_id ?></td>
 <td><?= $subRecord->prescriber_pro_id ?></td>
-<td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_prescriber_session_id ?></td>
 <td><?= $subRecord->to_facility_id ?></td>
+<td><?= $subRecord->is_signed_by_ally ?></td>
+<td><?= $subRecord->signed_by_ally_at ?></td>
+<td><?= $subRecord->ally_pro_id ?></td>
+<td><?= $subRecord->signed_by_ally_session_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 10 - 8
resources/views/pro/my_clients_SINGLE/SUB_care_month_entries.blade.php

@@ -21,9 +21,6 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Ally Time In Seconds</th>
-<th>Achieved Mcp Time In Seconds</th>
-<th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
 <th>Content Text</th>
@@ -33,10 +30,14 @@
 <th>Starting Time</th>
 <th>Time In Seconds</th>
 <th>Created By Session Id</th>
-<th>Removed By Session Id</th>
+<th>Removed By Id</th>
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro Id</th>
+<th>Achieved Ally Time In Seconds</th>
+<th>Achieved Mcp Time In Seconds</th>
+<th>Achieved Total Time In Seconds</th>
+<th>Removed By Session Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -49,9 +50,6 @@
 <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_mcp_time_in_seconds ?></td>
-<td><?= $subRecord->achieved_total_time_in_seconds ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
 <td><?= $subRecord->content_detail ?></td>
 <td><?= $subRecord->content_text ?></td>
@@ -61,10 +59,14 @@
 <td><?= $subRecord->starting_time ?></td>
 <td><?= $subRecord->time_in_seconds ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->removed_by_session_id ?></td>
+<td><?= $subRecord->removed_by_id ?></td>
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
+<td><?= $subRecord->achieved_ally_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_mcp_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_total_time_in_seconds ?></td>
+<td><?= $subRecord->removed_by_session_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 7 - 7
resources/views/pro/my_clients_SINGLE/SUB_care_months.blade.php

@@ -6,7 +6,7 @@
         <h4 class='my-3 d-flex'>
             <div>Care Months</div>
             <div class="ml-auto">
-                <!-- _ADD_NEW_LINK_ -->
+                <a class="btn btn-primary btn-sm" href="{{route('my_clients_SINGLE-ACTION_care_monthsAddNew', ['uid' => $record->uid])}}"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
             </div>
         </h4>
 
@@ -21,7 +21,6 @@
 <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 Mcp</th>
 <th>Is Client Enrolled In Cm</th>
 <th>Is Client Enrolled In Rm</th>
@@ -31,8 +30,6 @@
 <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>Start Date</th>
 <th>Why Is Cm Canceled This Month</th>
 <th>Why Is Rm Canceled This Month</th>
@@ -46,6 +43,9 @@
 <th>Cm Bill Id</th>
 <th>Mcp Pro Id</th>
 <th>Rm Bill Id</th>
+<th>Cm Total Time In Seconds By Ally</th>
+<th>Rm Total Time In Seconds By Ally</th>
+<th>Rm Total Time In Seconds By Mcp</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -58,7 +58,6 @@
 <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_mcp ?></td>
 <td><?= $subRecord->is_client_enrolled_in_cm ?></td>
 <td><?= $subRecord->is_client_enrolled_in_rm ?></td>
@@ -68,8 +67,6 @@
 <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->start_date ?></td>
 <td><?= $subRecord->why_is_cm_canceled_this_month ?></td>
 <td><?= $subRecord->why_is_rm_canceled_this_month ?></td>
@@ -83,6 +80,9 @@
 <td><?= $subRecord->cm_bill_id ?></td>
 <td><?= $subRecord->mcp_pro_id ?></td>
 <td><?= $subRecord->rm_bill_id ?></td>
+<td><?= $subRecord->cm_total_time_in_seconds_by_ally ?></td>
+<td><?= $subRecord->rm_total_time_in_seconds_by_ally ?></td>
+<td><?= $subRecord->rm_total_time_in_seconds_by_mcp ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 12 - 4
resources/views/pro/my_clients_SINGLE/SUB_notes.blade.php

@@ -24,6 +24,7 @@
 <th>Reactivated At</th>
 <th>Reactivation Memo</th>
 <th>Category</th>
+<th>Cm Or Rm</th>
 <th>Content Detail</th>
 <th>Content Text</th>
 <th>Effective Dateest</th>
@@ -38,13 +39,16 @@
 <th>Signed By Ally At</th>
 <th>Signed By Hcp At</th>
 <th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
+<th>Deactivated By Id</th>
+<th>Reactivated By Id</th>
 <th>Ally Pro Id</th>
+<th>Care Month Id</th>
 <th>Client Id</th>
 <th>Hcp Pro Id</th>
 <th>Signed By Ally Session Id</th>
 <th>Signed By Hcp Session Id</th>
+<th>Deactivated By Session Id</th>
+<th>Reactivated By Session Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -60,6 +64,7 @@
 <td><?= $subRecord->reactivated_at ?></td>
 <td><?= $subRecord->reactivation_memo ?></td>
 <td><?= $subRecord->category ?></td>
+<td><?= $subRecord->cm_or_rm ?></td>
 <td><?= $subRecord->content_detail ?></td>
 <td><?= $subRecord->content_text ?></td>
 <td><?= $subRecord->effective_dateest ?></td>
@@ -74,13 +79,16 @@
 <td><?= $subRecord->signed_by_ally_at ?></td>
 <td><?= $subRecord->signed_by_hcp_at ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->deactivated_by_session_id ?></td>
-<td><?= $subRecord->reactivated_by_session_id ?></td>
+<td><?= $subRecord->deactivated_by_id ?></td>
+<td><?= $subRecord->reactivated_by_id ?></td>
 <td><?= $subRecord->ally_pro_id ?></td>
+<td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->hcp_pro_id ?></td>
 <td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
+<td><?= $subRecord->deactivated_by_session_id ?></td>
+<td><?= $subRecord->reactivated_by_session_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 8 - 4
resources/views/pro/my_clients_SINGLE/SUB_pro_access.blade.php

@@ -26,10 +26,12 @@
 <th>Reason Category</th>
 <th>Reason Memo</th>
 <th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
+<th>Deactivated By Id</th>
+<th>Reactivated By Id</th>
 <th>Client Id</th>
 <th>Pro Id</th>
+<th>Deactivated By Session Id</th>
+<th>Reactivated By Session Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -47,10 +49,12 @@
 <td><?= $subRecord->reason_category ?></td>
 <td><?= $subRecord->reason_memo ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->deactivated_by_session_id ?></td>
-<td><?= $subRecord->reactivated_by_session_id ?></td>
+<td><?= $subRecord->deactivated_by_id ?></td>
+<td><?= $subRecord->reactivated_by_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
+<td><?= $subRecord->deactivated_by_session_id ?></td>
+<td><?= $subRecord->reactivated_by_session_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 8 - 4
resources/views/pro/my_teams/index.blade.php

@@ -25,10 +25,12 @@
 <th>Client Count Refreshed At</th>
 <th>Team Number</th>
 <th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
+<th>Deactivated By Id</th>
+<th>Reactivated By Id</th>
 <th>Ally Pro Id</th>
 <th>Hcp Pro Id</th>
+<th>Deactivated By Session Id</th>
+<th>Reactivated By Session Id</th>
             </tr>
             </thead>
             <tbody>
@@ -47,10 +49,12 @@
 <td><?= $record->client_count_refreshed_at ?></td>
 <td><?= $record->team_number ?></td>
 <td><?= $record->created_by_session_id ?></td>
-<td><?= $record->deactivated_by_session_id ?></td>
-<td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->deactivated_by_id ?></td>
+<td><?= $record->reactivated_by_id ?></td>
 <td><?= $record->ally_pro_id ?></td>
 <td><?= $record->hcp_pro_id ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 8 - 4
resources/views/pro/my_teams_SINGLE/SUB_clients.blade.php

@@ -87,13 +87,15 @@
 <th>Why Not Enrolled In Rm Memo</th>
 <th>Work Phone Number</th>
 <th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
+<th>Deactivated By Id</th>
+<th>Reactivated By Id</th>
 <th>Ally Pro Id</th>
 <th>Mcp Em Visit Note Id</th>
 <th>Mcp Pro Id</th>
 <th>Team Id</th>
 <th>Cm Target</th>
+<th>Deactivated By Session Id</th>
+<th>Reactivated By Session Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -172,13 +174,15 @@
 <td><?= $subRecord->why_not_enrolled_in_rm_memo ?></td>
 <td><?= $subRecord->work_phone_number ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->deactivated_by_session_id ?></td>
-<td><?= $subRecord->reactivated_by_session_id ?></td>
+<td><?= $subRecord->deactivated_by_id ?></td>
+<td><?= $subRecord->reactivated_by_id ?></td>
 <td><?= $subRecord->ally_pro_id ?></td>
 <td><?= $subRecord->mcp_em_visit_note_id ?></td>
 <td><?= $subRecord->mcp_pro_id ?></td>
 <td><?= $subRecord->team_id ?></td>
 <td><?= $subRecord->cm_target ?></td>
+<td><?= $subRecord->deactivated_by_session_id ?></td>
+<td><?= $subRecord->reactivated_by_session_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 12 - 4
resources/views/pro/notes/index.blade.php

@@ -22,6 +22,7 @@
 <th>Reactivated At</th>
 <th>Reactivation Memo</th>
 <th>Category</th>
+<th>Cm Or Rm</th>
 <th>Content Detail</th>
 <th>Content Text</th>
 <th>Effective Dateest</th>
@@ -36,13 +37,16 @@
 <th>Signed By Ally At</th>
 <th>Signed By Hcp At</th>
 <th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
+<th>Deactivated By Id</th>
+<th>Reactivated By Id</th>
 <th>Ally Pro Id</th>
+<th>Care Month Id</th>
 <th>Client Id</th>
 <th>Hcp Pro Id</th>
 <th>Signed By Ally Session Id</th>
 <th>Signed By Hcp Session Id</th>
+<th>Deactivated By Session Id</th>
+<th>Reactivated By Session Id</th>
             </tr>
             </thead>
             <tbody>
@@ -58,6 +62,7 @@
 <td><?= $record->reactivated_at ?></td>
 <td><?= $record->reactivation_memo ?></td>
 <td><?= $record->category ?></td>
+<td><?= $record->cm_or_rm ?></td>
 <td><?= $record->content_detail ?></td>
 <td><?= $record->content_text ?></td>
 <td><?= $record->effective_dateest ?></td>
@@ -72,13 +77,16 @@
 <td><?= $record->signed_by_ally_at ?></td>
 <td><?= $record->signed_by_hcp_at ?></td>
 <td><?= $record->created_by_session_id ?></td>
-<td><?= $record->deactivated_by_session_id ?></td>
-<td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->deactivated_by_id ?></td>
+<td><?= $record->reactivated_by_id ?></td>
 <td><?= $record->ally_pro_id ?></td>
+<td><?= $record->care_month_id ?></td>
 <td><?= $record->client_id ?></td>
 <td><?= $record->hcp_pro_id ?></td>
 <td><?= $record->signed_by_ally_session_id ?></td>
 <td><?= $record->signed_by_hcp_session_id ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 8 - 4
resources/views/pro/pro_access/index.blade.php

@@ -24,10 +24,12 @@
 <th>Reason Category</th>
 <th>Reason Memo</th>
 <th>Created By Session Id</th>
-<th>Deactivated By Session Id</th>
-<th>Reactivated By Session Id</th>
+<th>Deactivated By Id</th>
+<th>Reactivated By Id</th>
 <th>Client Id</th>
 <th>Pro Id</th>
+<th>Deactivated By Session Id</th>
+<th>Reactivated By Session Id</th>
             </tr>
             </thead>
             <tbody>
@@ -45,10 +47,12 @@
 <td><?= $record->reason_category ?></td>
 <td><?= $record->reason_memo ?></td>
 <td><?= $record->created_by_session_id ?></td>
-<td><?= $record->deactivated_by_session_id ?></td>
-<td><?= $record->reactivated_by_session_id ?></td>
+<td><?= $record->deactivated_by_id ?></td>
+<td><?= $record->reactivated_by_id ?></td>
 <td><?= $record->client_id ?></td>
 <td><?= $record->pro_id ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->reactivated_by_session_id ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 1 - 0
routes/generated.php

@@ -72,6 +72,7 @@ Route::get('/my_clients/view/{uid}/SUB_mcp_updates', 'my_clients_SINGLE_Controll
 Route::get('/my_clients/view/{uid}/SUB_ally_updates', 'my_clients_SINGLE_Controller@SUB_ally_updates')->name('my_clients_SINGLE-SUB_ally_updates');
 Route::get('/my_clients/view/{uid}/SUB_audit_log', 'my_clients_SINGLE_Controller@SUB_audit_log')->name('my_clients_SINGLE-SUB_audit_log');
 Route::get('/my_clients/view/{uid}/ACTION_notesAddNew', 'my_clients_SINGLE_Controller@ACTION_notesAddNew')->name('my_clients_SINGLE-ACTION_notesAddNew');
+Route::get('/my_clients/view/{uid}/ACTION_care_monthsAddNew', 'my_clients_SINGLE_Controller@ACTION_care_monthsAddNew')->name('my_clients_SINGLE-ACTION_care_monthsAddNew');
 
 // --- pro: notes --- //
 Route::get('/notes', 'notes_Controller@index')->name('notes-index');