Re-generate with corect schema

generatecv/tree.txt

@@ -226,7 +226,6 @@ 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

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

@@ -35,8 +35,6 @@
 <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>
@@ -67,8 +65,6 @@
 <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>

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

@@ -25,11 +25,9 @@
 <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>
@@ -48,11 +46,9 @@
 <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>

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

@@ -92,11 +92,9 @@
 <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>
@@ -182,11 +180,9 @@
 <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>

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>

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

@@ -21,6 +21,9 @@
 <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>
@@ -30,14 +33,10 @@
 <th>Starting Time</th>
 <th>Time In Seconds</th>
 <th>Created By Session Id</th>
-<th>Removed By Id</th>
+<th>Removed By Session 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>
@@ -51,6 +50,9 @@
 <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>
@@ -60,14 +62,10 @@
 <td><?= $record->starting_time ?></td>
 <td><?= $record->time_in_seconds ?></td>
 <td><?= $record->created_by_session_id ?></td>
-<td><?= $record->removed_by_id ?></td>
+<td><?= $record->removed_by_session_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>

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

@@ -19,6 +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 Mcp</th>
 <th>Is Client Enrolled In Cm</th>
 <th>Is Client Enrolled In Rm</th>
@@ -28,6 +29,8 @@
 <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>
@@ -41,9 +44,6 @@
 <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,6 +56,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_mcp ?></td>
 <td><?= $record->is_client_enrolled_in_cm ?></td>
 <td><?= $record->is_client_enrolled_in_rm ?></td>
@@ -65,6 +66,8 @@
 <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>
@@ -78,9 +81,6 @@
 <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>

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

@@ -85,15 +85,13 @@
 <th>Why Not Enrolled In Rm Memo</th>
 <th>Work Phone Number</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>
 <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,15 +170,13 @@
 <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_id ?></td>
-<td><?= $record->reactivated_by_id ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->reactivated_by_session_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>

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>

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

@@ -21,6 +21,9 @@
 <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>
@@ -30,14 +33,10 @@
 <th>Starting Time</th>
 <th>Time In Seconds</th>
 <th>Created By Session Id</th>
-<th>Removed By Id</th>
+<th>Removed By Session 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,6 +49,9 @@
 <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>
@@ -59,14 +61,10 @@
 <td><?= $subRecord->starting_time ?></td>
 <td><?= $subRecord->time_in_seconds ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->removed_by_id ?></td>
+<td><?= $subRecord->removed_by_session_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>

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

@@ -21,6 +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 Mcp</th>
 <th>Is Client Enrolled In Cm</th>
 <th>Is Client Enrolled In Rm</th>
@@ -30,6 +31,8 @@
 <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>
@@ -43,9 +46,6 @@
 <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,6 +58,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_mcp ?></td>
 <td><?= $subRecord->is_client_enrolled_in_cm ?></td>
 <td><?= $subRecord->is_client_enrolled_in_rm ?></td>
@@ -67,6 +68,8 @@
 <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>
@@ -80,9 +83,6 @@
 <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>

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

@@ -24,7 +24,6 @@
 <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>
@@ -39,16 +38,13 @@
 <th>Signed By Ally At</th>
 <th>Signed By Hcp At</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>
 <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>
@@ -64,7 +60,6 @@
 <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>
@@ -79,16 +74,13 @@
 <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_id ?></td>
-<td><?= $subRecord->reactivated_by_id ?></td>
+<td><?= $subRecord->deactivated_by_session_id ?></td>
+<td><?= $subRecord->reactivated_by_session_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>

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

@@ -26,12 +26,10 @@
 <th>Reason Category</th>
 <th>Reason Memo</th>
 <th>Created 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>
+<th>Client Id</th>
+<th>Pro Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -49,12 +47,10 @@
 <td><?= $subRecord->reason_category ?></td>
 <td><?= $subRecord->reason_memo ?></td>
 <td><?= $subRecord->created_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>
+<td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->pro_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -25,12 +25,10 @@
 <th>Client Count Refreshed At</th>
 <th>Team Number</th>
 <th>Created 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>
+<th>Ally Pro Id</th>
+<th>Hcp Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -49,12 +47,10 @@
 <td><?= $record->client_count_refreshed_at ?></td>
 <td><?= $record->team_number ?></td>
 <td><?= $record->created_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>
+<td><?= $record->ally_pro_id ?></td>
+<td><?= $record->hcp_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -87,15 +87,13 @@
 <th>Why Not Enrolled In Rm Memo</th>
 <th>Work Phone Number</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>
 <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>
@@ -174,15 +172,13 @@
 <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_id ?></td>
-<td><?= $subRecord->reactivated_by_id ?></td>
+<td><?= $subRecord->deactivated_by_session_id ?></td>
+<td><?= $subRecord->reactivated_by_session_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>

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

@@ -22,7 +22,6 @@
 <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>
@@ -37,16 +36,13 @@
 <th>Signed By Ally At</th>
 <th>Signed By Hcp At</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>
 <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>
@@ -62,7 +58,6 @@
 <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>
@@ -77,16 +72,13 @@
 <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_id ?></td>
-<td><?= $record->reactivated_by_id ?></td>
+<td><?= $record->deactivated_by_session_id ?></td>
+<td><?= $record->reactivated_by_session_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>

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

@@ -24,12 +24,10 @@
 <th>Reason Category</th>
 <th>Reason Memo</th>
 <th>Created 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>
+<th>Client Id</th>
+<th>Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -47,12 +45,10 @@
 <td><?= $record->reason_category ?></td>
 <td><?= $record->reason_memo ?></td>
 <td><?= $record->created_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>
+<td><?= $record->client_id ?></td>
+<td><?= $record->pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>