Răsfoiți Sursa

added clients columns

Josh Kamau 5 ani în urmă
părinte
comite
56cb754c84
42 a modificat fișierele cu 1513 adăugiri și 33 ștergeri
  1. 66 6
      app/Http/Controllers/care_months_SINGLE_Controller.php
  2. 57 9
      app/Http/Controllers/my_clients_SINGLE_Controller.php
  3. 38 7
      generatecv/tree.txt
  4. 4 0
      resources/views/admin/pro_rates/index.blade.php
  5. 4 0
      resources/views/admin/pros_SINGLE/SUB_payment_schedule.blade.php
  6. 50 0
      resources/views/pro/bills/index.blade.php
  7. 6 0
      resources/views/pro/care_month_entries/index.blade.php
  8. 12 2
      resources/views/pro/care_months/actions.blade.php
  9. 14 0
      resources/views/pro/care_months/index.blade.php
  10. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_assignCmPro.blade.php
  11. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_assignMcpPro.blade.php
  12. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_assignRmePro.blade.php
  13. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_assignRmmPro.blade.php
  14. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_changeCmPro.blade.php
  15. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_changeMcpPro.blade.php
  16. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_changeRmePro.blade.php
  17. 47 0
      resources/views/pro/care_months_SINGLE/ACTION_changeRmmPro.blade.php
  18. 38 0
      resources/views/pro/care_months_SINGLE/ACTION_removeCmPro.blade.php
  19. 38 0
      resources/views/pro/care_months_SINGLE/ACTION_removeMcpPro.blade.php
  20. 38 0
      resources/views/pro/care_months_SINGLE/ACTION_removeRmePro.blade.php
  21. 38 0
      resources/views/pro/care_months_SINGLE/ACTION_removeRmmPro.blade.php
  22. 6 0
      resources/views/pro/care_months_SINGLE/SUB_cm_time_entries.blade.php
  23. 66 1
      resources/views/pro/care_months_SINGLE/SUB_dashboard.blade.php
  24. 6 0
      resources/views/pro/care_months_SINGLE/SUB_rm_time_entries.blade.php
  25. 11 3
      resources/views/pro/my_clients/actions.blade.php
  26. 47 0
      resources/views/pro/my_clients_SINGLE/ACTION_assignCm.blade.php
  27. 47 0
      resources/views/pro/my_clients_SINGLE/ACTION_assignMcp.blade.php
  28. 47 0
      resources/views/pro/my_clients_SINGLE/ACTION_assignRme.blade.php
  29. 47 0
      resources/views/pro/my_clients_SINGLE/ACTION_assignRmm.blade.php
  30. 47 0
      resources/views/pro/my_clients_SINGLE/ACTION_changeCm.blade.php
  31. 47 0
      resources/views/pro/my_clients_SINGLE/ACTION_changeMcp.blade.php
  32. 47 0
      resources/views/pro/my_clients_SINGLE/ACTION_changeRme.blade.php
  33. 47 0
      resources/views/pro/my_clients_SINGLE/ACTION_changeRmm.blade.php
  34. 38 0
      resources/views/pro/my_clients_SINGLE/ACTION_removeCm.blade.php
  35. 38 0
      resources/views/pro/my_clients_SINGLE/ACTION_removeRme.blade.php
  36. 38 0
      resources/views/pro/my_clients_SINGLE/ACTION_removeRmm.blade.php
  37. 50 0
      resources/views/pro/my_clients_SINGLE/SUB_bills.blade.php
  38. 6 0
      resources/views/pro/my_clients_SINGLE/SUB_care_month_entries.blade.php
  39. 14 0
      resources/views/pro/my_clients_SINGLE/SUB_care_months.blade.php
  40. 12 0
      resources/views/pro/my_teams_SINGLE/SUB_clients.blade.php
  41. 50 0
      resources/views/pro/notes_SINGLE/SUB_bills.blade.php
  42. 23 5
      routes/generated.php

+ 66 - 6
app/Http/Controllers/care_months_SINGLE_Controller.php

@@ -10,16 +10,76 @@ class care_months_SINGLE_Controller extends Controller
 {
     public $selfName = 'care_months_SINGLE_Controller';
 
-	// GET /care_months/view/{uid}/ACTION_putMcpPro
-	public function ACTION_putMcpPro(Request $request, $uid) {
+	// GET /care_months/view/{uid}/ACTION_assignMcpPro
+	public function ACTION_assignMcpPro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
-		return response()->view('pro/care_months_SINGLE/ACTION_putMcpPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('pro/care_months_SINGLE/ACTION_assignMcpPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /care_months/view/{uid}/ACTION_putAllyPro
-	public function ACTION_putAllyPro(Request $request, $uid) {
+	// GET /care_months/view/{uid}/ACTION_changeMcpPro
+	public function ACTION_changeMcpPro(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
-		return response()->view('pro/care_months_SINGLE/ACTION_putAllyPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('pro/care_months_SINGLE/ACTION_changeMcpPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_removeMcpPro
+	public function ACTION_removeMcpPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		return response()->view('pro/care_months_SINGLE/ACTION_removeMcpPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_assignCmPro
+	public function ACTION_assignCmPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		return response()->view('pro/care_months_SINGLE/ACTION_assignCmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_changeCmPro
+	public function ACTION_changeCmPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		return response()->view('pro/care_months_SINGLE/ACTION_changeCmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_removeCmPro
+	public function ACTION_removeCmPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		return response()->view('pro/care_months_SINGLE/ACTION_removeCmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_assignRmePro
+	public function ACTION_assignRmePro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		return response()->view('pro/care_months_SINGLE/ACTION_assignRmePro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_changeRmePro
+	public function ACTION_changeRmePro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		return response()->view('pro/care_months_SINGLE/ACTION_changeRmePro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_removeRmePro
+	public function ACTION_removeRmePro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		return response()->view('pro/care_months_SINGLE/ACTION_removeRmePro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_assignRmmPro
+	public function ACTION_assignRmmPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		return response()->view('pro/care_months_SINGLE/ACTION_assignRmmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_changeRmmPro
+	public function ACTION_changeRmmPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		return response()->view('pro/care_months_SINGLE/ACTION_changeRmmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_removeRmmPro
+	public function ACTION_removeRmmPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		return response()->view('pro/care_months_SINGLE/ACTION_removeRmmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_putReasons

+ 57 - 9
app/Http/Controllers/my_clients_SINGLE_Controller.php

@@ -58,10 +58,16 @@ class my_clients_SINGLE_Controller extends Controller
 		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_putMcp
-	public function ACTION_putMcp(Request $request, $uid) {
+	// GET /my_clients/view/{uid}/ACTION_assignMcp
+	public function ACTION_assignMcp(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();
-		return response()->view('pro/my_clients_SINGLE/ACTION_putMcp', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('pro/my_clients_SINGLE/ACTION_assignMcp', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /my_clients/view/{uid}/ACTION_changeMcp
+	public function ACTION_changeMcp(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return response()->view('pro/my_clients_SINGLE/ACTION_changeMcp', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /my_clients/view/{uid}/ACTION_removeMcp
@@ -70,16 +76,58 @@ class my_clients_SINGLE_Controller extends Controller
 		return response()->view('pro/my_clients_SINGLE/ACTION_removeMcp', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /my_clients/view/{uid}/ACTION_putAlly
-	public function ACTION_putAlly(Request $request, $uid) {
+	// GET /my_clients/view/{uid}/ACTION_assignCm
+	public function ACTION_assignCm(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return response()->view('pro/my_clients_SINGLE/ACTION_assignCm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /my_clients/view/{uid}/ACTION_changeCm
+	public function ACTION_changeCm(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return response()->view('pro/my_clients_SINGLE/ACTION_changeCm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /my_clients/view/{uid}/ACTION_removeCm
+	public function ACTION_removeCm(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return response()->view('pro/my_clients_SINGLE/ACTION_removeCm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /my_clients/view/{uid}/ACTION_assignRme
+	public function ACTION_assignRme(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return response()->view('pro/my_clients_SINGLE/ACTION_assignRme', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /my_clients/view/{uid}/ACTION_changeRme
+	public function ACTION_changeRme(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return response()->view('pro/my_clients_SINGLE/ACTION_changeRme', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /my_clients/view/{uid}/ACTION_removeRme
+	public function ACTION_removeRme(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return response()->view('pro/my_clients_SINGLE/ACTION_removeRme', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /my_clients/view/{uid}/ACTION_assignRmm
+	public function ACTION_assignRmm(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return response()->view('pro/my_clients_SINGLE/ACTION_assignRmm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /my_clients/view/{uid}/ACTION_changeRmm
+	public function ACTION_changeRmm(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();
-		return response()->view('pro/my_clients_SINGLE/ACTION_putAlly', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('pro/my_clients_SINGLE/ACTION_changeRmm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
-	// GET /my_clients/view/{uid}/ACTION_removeAlly
-	public function ACTION_removeAlly(Request $request, $uid) {
+	// GET /my_clients/view/{uid}/ACTION_removeRmm
+	public function ACTION_removeRmm(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();
-		return response()->view('pro/my_clients_SINGLE/ACTION_removeAlly', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('pro/my_clients_SINGLE/ACTION_removeRmm', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /my_clients/view/{uid}/ACTION_putProfilePicture

+ 38 - 7
generatecv/tree.txt

@@ -112,12 +112,26 @@ PRO
             putTeam
                 teamUid:record:team:uid,team_number
             removeTeam:if:team_id
-            putMcp
+            assignMcp
+                mcpProUid:record:pro:uid,name_display
+            changeMcp
                 mcpProUid:record:pro:uid,name_display
             removeMcp:if:mcp_pro_id
-            putAlly
-                allyProUid:record:pro:uid,name_display
-            removeAlly:if:ally_pro_id
+            assignCm
+                cmProUid:record:pro:uid,name_display
+            changeCm
+                cmProUid:record:pro:uid,name_display
+            removeCm:if:cm_pro_id
+            assignRme
+                rmeProUid:record:pro:uid,name_display
+            changeRme
+                rmeProUid:record:pro:uid,name_display
+            removeRme:if:rme_pro_id
+            assignRmm
+                rmmProUid:record:pro:uid,name_display
+            changeRmm
+                rmmProUid:record:pro:uid,name_display
+            removeRmm:if:rmm_pro_id
             putProfilePicture
                 profilePictureBase64
             removeProfilePicture:if:profile_picture_base64
@@ -328,10 +342,26 @@ PRO
     care_months|care_month|view|icon:calendar-plus
     care_months/view/{uid}
         ACTIONS
-            putMcpPro
+            assignMcpPro
+                mcpProUid:record:pro:uid,name_display
+            changeMcpPro
                 mcpProUid:record:pro:uid,name_display
-            putAllyPro
-                allyProUid:record:pro:uid,name_display
+            removeMcpPro:if:mcp_pro_id
+            assignCmPro
+                cmProUid:record:pro:uid,name_display
+            changeCmPro
+                cmProUid:record:pro:uid,name_display
+            removeCmPro:if:cm_pro_id
+            assignRmePro
+                rmeProUid:record:pro:uid,name_display
+            changeRmePro
+                rmeProUid:record:pro:uid,name_display
+            removeRmePro:if:rme_pro_id
+            assignRmmPro
+                rmmProUid:record:pro:uid,name_display
+            changeRmmPro
+                rmmProUid:record:pro:uid,name_display
+            removeRmmPro:if:rmm_pro_id
             putReasons
                 reason1
                 reason2
@@ -361,6 +391,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
 # :: need remove
             cm_time_entries
                 id=care_month_entry.care_month_id,cm_or_rm='CM'

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

@@ -28,6 +28,8 @@
 <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>
@@ -49,6 +51,8 @@
 <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>

+ 4 - 0
resources/views/admin/pros_SINGLE/SUB_payment_schedule.blade.php

@@ -30,6 +30,8 @@
 <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>
@@ -51,6 +53,8 @@
 <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>

+ 50 - 0
resources/views/pro/bills/index.blade.php

@@ -54,6 +54,31 @@
 <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 Rme Session Id</th>
+<th>Signed By Rmm Session Id</th>
             </tr>
             </thead>
             <tbody>
@@ -101,6 +126,31 @@
 <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_rme_session_id ?></td>
+<td><?= $record->signed_by_rmm_session_id ?></td>
                 </tr>
             @endforeach
             </tbody>

+ 6 - 0
resources/views/pro/care_month_entries/index.blade.php

@@ -35,6 +35,9 @@
 <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>
@@ -64,6 +67,9 @@
 <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>

+ 12 - 2
resources/views/pro/care_months/actions.blade.php

@@ -1,5 +1,15 @@
-<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_putMcpPro' class='d-block btn btn-sm btn-default mb-3'>Put Mcp Pro</a>
-<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_putAllyPro' class='d-block btn btn-sm btn-default mb-3'>Put Ally Pro</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignMcpPro' class='d-block btn btn-sm btn-default mb-3'>Assign Mcp Pro</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeMcpPro' class='d-block btn btn-sm btn-default mb-3'>Change Mcp Pro</a>
+@if($record->mcp_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeMcpPro' class='d-block btn btn-sm btn-default mb-3'>Remove Mcp Pro</a> @endif
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignCmPro' class='d-block btn btn-sm btn-default mb-3'>Assign Cm Pro</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeCmPro' class='d-block btn btn-sm btn-default mb-3'>Change Cm Pro</a>
+@if($record->cm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeCmPro' class='d-block btn btn-sm btn-default mb-3'>Remove Cm Pro</a> @endif
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmePro' class='d-block btn btn-sm btn-default mb-3'>Assign Rme Pro</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmePro' class='d-block btn btn-sm btn-default mb-3'>Change Rme Pro</a>
+@if($record->rme_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmePro' class='d-block btn btn-sm btn-default mb-3'>Remove Rme Pro</a> @endif
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmmPro' class='d-block btn btn-sm btn-default mb-3'>Assign Rmm Pro</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmmPro' class='d-block btn btn-sm btn-default mb-3'>Change Rmm Pro</a>
+@if($record->rmm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmmPro' class='d-block btn btn-sm btn-default mb-3'>Remove Rmm Pro</a> @endif
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_putReasons' class='d-block btn btn-sm btn-default mb-3'>Put Reasons</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInCmToTrue' class='d-block btn btn-sm btn-default mb-3'>Set Is Client Enrolled In Cm To True</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInCmToFalse' class='d-block btn btn-sm btn-default mb-3'>Set Is Client Enrolled In Cm To False</a>

+ 14 - 0
resources/views/pro/care_months/index.blade.php

@@ -45,6 +45,13 @@
 <th>Cm Bill 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>
             </thead>
             <tbody>
@@ -83,6 +90,13 @@
 <td><?= $record->cm_bill_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>
             @endforeach
             </tbody>

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_assignCmPro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.care_months.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Assign Cm Pro</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/careMonth/assignCmPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_assignCmPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Cm Pro </label>
+<select class='form-control' name='cmProUid' value='{{ old('cmProUid') ? old('cmProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('cmProUid') ? old('cmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_assignMcpPro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.care_months.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Assign Mcp Pro</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/careMonth/assignMcpPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_assignMcpPro', ['uid' => $record->uid])}}">
+        <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>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('mcpProUid') ? old('mcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_assignRmePro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.care_months.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Assign Rme Pro</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/careMonth/assignRmePro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_assignRmePro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rme Pro </label>
+<select class='form-control' name='rmeProUid' value='{{ old('rmeProUid') ? old('rmeProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmeProUid') ? old('rmeProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_assignRmmPro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.care_months.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Assign Rmm Pro</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/careMonth/assignRmmPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_assignRmmPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rmm Pro </label>
+<select class='form-control' name='rmmProUid' value='{{ old('rmmProUid') ? old('rmmProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmmProUid') ? old('rmmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_changeCmPro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.care_months.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Change Cm Pro</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/careMonth/changeCmPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_changeCmPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Cm Pro </label>
+<select class='form-control' name='cmProUid' value='{{ old('cmProUid') ? old('cmProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('cmProUid') ? old('cmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_changeMcpPro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.care_months.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Change Mcp Pro</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/careMonth/changeMcpPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_changeMcpPro', ['uid' => $record->uid])}}">
+        <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>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('mcpProUid') ? old('mcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_changeRmePro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.care_months.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Change Rme Pro</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/careMonth/changeRmePro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_changeRmePro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rme Pro </label>
+<select class='form-control' name='rmeProUid' value='{{ old('rmeProUid') ? old('rmeProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmeProUid') ? old('rmeProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/care_months_SINGLE/ACTION_changeRmmPro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.care_months.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Change Rmm Pro</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/careMonth/changeRmmPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_changeRmmPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rmm Pro </label>
+<select class='form-control' name='rmmProUid' value='{{ old('rmmProUid') ? old('rmmProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmmProUid') ? old('rmmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('care_months-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 38 - 0
resources/views/pro/care_months_SINGLE/ACTION_removeCmPro.blade.php

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

+ 38 - 0
resources/views/pro/care_months_SINGLE/ACTION_removeMcpPro.blade.php

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

+ 38 - 0
resources/views/pro/care_months_SINGLE/ACTION_removeRmePro.blade.php

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

+ 38 - 0
resources/views/pro/care_months_SINGLE/ACTION_removeRmmPro.blade.php

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

+ 6 - 0
resources/views/pro/care_months_SINGLE/SUB_cm_time_entries.blade.php

@@ -37,6 +37,9 @@
 <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>
@@ -65,6 +68,9 @@
 <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>

+ 66 - 1
resources/views/pro/care_months_SINGLE/SUB_dashboard.blade.php

@@ -1,6 +1,71 @@
 @extends('pro.care_months.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Dashboard</h5>Controller: <b>care_months_SINGLE</b><br>Action: <b>SUB_dashboard()</b><br>View: <b>pro/care_months_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 mb-3">
+    <table class="table table-hover text-nowrap table-striped border-left border-right border-bottom">
+        <thead>
+        <tr>
+            <th colspan="2" class="px-2">Care Month Details
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Created At</td><td class="w-75 px-2 font-weight-bold"><?= $record->created_at ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Type</td><td class="w-75 px-2 font-weight-bold"><?= $record->type ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Uid</td><td class="w-75 px-2 font-weight-bold"><?= $record->uid ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason1 ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason2 ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds By Ally</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds_by_ally ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Total Time In Seconds By Mcp</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_total_time_in_seconds_by_mcp ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Has Mcp Done Em Visit</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_mcp_done_em_visit ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Client Enrolled In Cm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_client_enrolled_in_cm ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Client Enrolled In Rm</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_client_enrolled_in_rm ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Cm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_cm_canceled_this_month ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Rm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_rm_canceled_this_month ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Is Tm This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_tm_this_month ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_reason1 ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_reason2 ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Ally</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_ally ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Total Time In Seconds By Mcp</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_total_time_in_seconds_by_mcp ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Start Date</td><td class="w-75 px-2 font-weight-bold"><?= $record->start_date ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Why Is Cm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_is_cm_canceled_this_month ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Why Is Rm Canceled This Month</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_is_rm_canceled_this_month ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Why Not Enrolled In Cm Category</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_enrolled_in_cm_category ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Why Not Enrolled In Cm Memo</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_enrolled_in_cm_memo ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Why Not Enrolled In Rm Category</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_enrolled_in_rm_category ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Why Not Enrolled In Rm Memo</td><td class="w-75 px-2 font-weight-bold"><?= $record->why_not_enrolled_in_rm_memo ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Created By Session Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->created_by_session_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Ally Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->ally_pro_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Client Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->client_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">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>
+<tr><td class="w-25 px-2 text-secondary border-right">Cm Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_pro_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rme Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rme_pro_id ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rmm Pro Id</td><td class="w-75 px-2 font-weight-bold"><?= $record->rmm_pro_id ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('pro/care_months/actions')
+        </div>
+    </div>
+</div>
+
 
 @endsection

+ 6 - 0
resources/views/pro/care_months_SINGLE/SUB_rm_time_entries.blade.php

@@ -37,6 +37,9 @@
 <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>
@@ -65,6 +68,9 @@
 <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>

+ 11 - 3
resources/views/pro/my_clients/actions.blade.php

@@ -6,10 +6,18 @@
 <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_putMcp' class='d-block btn btn-sm btn-default mb-3'>Put Mcp</a>
+<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
-<a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_putAlly' class='d-block btn btn-sm btn-default mb-3'>Put Ally</a>
-@if($record->ally_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_removeAlly' class='d-block btn btn-sm btn-default mb-3'>Remove Ally</a> @endif
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_assignCm' class='d-block btn btn-sm btn-default mb-3'>Assign Cm</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_changeCm' class='d-block btn btn-sm btn-default mb-3'>Change Cm</a>
+@if($record->cm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_removeCm' class='d-block btn btn-sm btn-default mb-3'>Remove Cm</a> @endif
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_assignRme' class='d-block btn btn-sm btn-default mb-3'>Assign Rme</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_changeRme' class='d-block btn btn-sm btn-default mb-3'>Change Rme</a>
+@if($record->rme_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_removeRme' class='d-block btn btn-sm btn-default mb-3'>Remove Rme</a> @endif
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_assignRmm' class='d-block btn btn-sm btn-default mb-3'>Assign Rmm</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_changeRmm' class='d-block btn btn-sm btn-default mb-3'>Change Rmm</a>
+@if($record->rmm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_removeRmm' class='d-block btn btn-sm btn-default mb-3'>Remove Rmm</a> @endif
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_putProfilePicture' class='d-block btn btn-sm btn-default mb-3'>Put Profile Picture</a>
 @if($record->profile_picture_base64) <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_removeProfilePicture' class='d-block btn btn-sm btn-default mb-3'>Remove Profile Picture</a> @endif
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updatePhoneInfo' class='d-block btn btn-sm btn-default mb-3'>Update Phone Info</a>

+ 47 - 0
resources/views/pro/my_clients_SINGLE/ACTION_assignCm.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.my_clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Assign Cm</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/client/assignCm">
+        <input type="hidden" name="_success" value="{{route('my_clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_assignCm', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Cm Pro </label>
+<select class='form-control' name='cmProUid' value='{{ old('cmProUid') ? old('cmProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('cmProUid') ? old('cmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/my_clients_SINGLE/ACTION_assignMcp.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.my_clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Assign Mcp</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/client/assignMcp">
+        <input type="hidden" name="_success" value="{{route('my_clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_assignMcp', ['uid' => $record->uid])}}">
+        <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>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('mcpProUid') ? old('mcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/my_clients_SINGLE/ACTION_assignRme.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.my_clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Assign Rme</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/client/assignRme">
+        <input type="hidden" name="_success" value="{{route('my_clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_assignRme', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rme Pro </label>
+<select class='form-control' name='rmeProUid' value='{{ old('rmeProUid') ? old('rmeProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmeProUid') ? old('rmeProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/my_clients_SINGLE/ACTION_assignRmm.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.my_clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Assign Rmm</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/client/assignRmm">
+        <input type="hidden" name="_success" value="{{route('my_clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_assignRmm', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rmm Pro </label>
+<select class='form-control' name='rmmProUid' value='{{ old('rmmProUid') ? old('rmmProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmmProUid') ? old('rmmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/my_clients_SINGLE/ACTION_changeCm.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.my_clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Change Cm</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/client/changeCm">
+        <input type="hidden" name="_success" value="{{route('my_clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_changeCm', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Cm Pro </label>
+<select class='form-control' name='cmProUid' value='{{ old('cmProUid') ? old('cmProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('cmProUid') ? old('cmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/my_clients_SINGLE/ACTION_changeMcp.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.my_clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Change Mcp</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/client/changeMcp">
+        <input type="hidden" name="_success" value="{{route('my_clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_changeMcp', ['uid' => $record->uid])}}">
+        <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>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('mcpProUid') ? old('mcpProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/my_clients_SINGLE/ACTION_changeRme.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.my_clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Change Rme</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/client/changeRme">
+        <input type="hidden" name="_success" value="{{route('my_clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_changeRme', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rme Pro </label>
+<select class='form-control' name='rmeProUid' value='{{ old('rmeProUid') ? old('rmeProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmeProUid') ? old('rmeProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 47 - 0
resources/views/pro/my_clients_SINGLE/ACTION_changeRmm.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.my_clients.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3">
+        <div>Change Rmm</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="true"
+          method="post" enctype="multipart/form-data"
+          class="border-top px-3 pt-3 pb-1 custom-submit">
+        @csrf
+
+        @if (session('message'))
+            <div class="alert alert-danger">{{ session('message') }}</div>
+        @endif
+
+        <input type="hidden" name="_uid" value="{{ $record->uid }}">
+        <input type="hidden" name="_api" value="/api/client/changeRmm">
+        <input type="hidden" name="_success" value="{{route('my_clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_changeRmm', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rmm Pro </label>
+<select class='form-control' name='rmmProUid' value='{{ old('rmmProUid') ? old('rmmProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmmProUid') ? old('rmmProUid') : '') ? 'selected' : '' ?> value='<?= $o->uid ?>'><?= $o->name_display ?> (<?= $o->uid ?>)</option>
+<?php endforeach; ?>
+</select>
+</div>
+        <div class="form-group mb-3 d-flex justify-content-center">
+            <button class="btn btn-sm btn-primary mr-3 px-5">Submit</button>
+            <a href="{{route('my_clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 38 - 0
resources/views/pro/my_clients_SINGLE/ACTION_removeCm.blade.php

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

+ 38 - 0
resources/views/pro/my_clients_SINGLE/ACTION_removeRme.blade.php

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

+ 38 - 0
resources/views/pro/my_clients_SINGLE/ACTION_removeRmm.blade.php

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

+ 50 - 0
resources/views/pro/my_clients_SINGLE/SUB_bills.blade.php

@@ -56,6 +56,31 @@
 <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 Rme Session Id</th>
+<th>Signed By Rmm Session Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -103,6 +128,31 @@
 <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_rme_session_id ?></td>
+<td><?= $subRecord->signed_by_rmm_session_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 6 - 0
resources/views/pro/my_clients_SINGLE/SUB_care_month_entries.blade.php

@@ -37,6 +37,9 @@
 <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>
@@ -66,6 +69,9 @@
 <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>

+ 14 - 0
resources/views/pro/my_clients_SINGLE/SUB_care_months.blade.php

@@ -47,6 +47,13 @@
 <th>Cm Bill 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>
                 </thead>
                 <tbody>
@@ -85,6 +92,13 @@
 <td><?= $subRecord->cm_bill_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>
                 @endforeach
                 </tbody>

+ 12 - 0
resources/views/pro/my_teams_SINGLE/SUB_clients.blade.php

@@ -94,6 +94,12 @@
 <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,6 +186,12 @@
 <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>

+ 50 - 0
resources/views/pro/notes_SINGLE/SUB_bills.blade.php

@@ -56,6 +56,31 @@
 <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 Rme Session Id</th>
+<th>Signed By Rmm Session Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -103,6 +128,31 @@
 <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_rme_session_id ?></td>
+<td><?= $subRecord->signed_by_rmm_session_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 23 - 5
routes/generated.php

@@ -36,10 +36,18 @@ Route::get('/my_clients/view/{uid}/ACTION_putGender', 'my_clients_SINGLE_Control
 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_putMcp', 'my_clients_SINGLE_Controller@ACTION_putMcp')->name('my_clients_SINGLE-ACTION_putMcp');
+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');
-Route::get('/my_clients/view/{uid}/ACTION_putAlly', 'my_clients_SINGLE_Controller@ACTION_putAlly')->name('my_clients_SINGLE-ACTION_putAlly');
-Route::get('/my_clients/view/{uid}/ACTION_removeAlly', 'my_clients_SINGLE_Controller@ACTION_removeAlly')->name('my_clients_SINGLE-ACTION_removeAlly');
+Route::get('/my_clients/view/{uid}/ACTION_assignCm', 'my_clients_SINGLE_Controller@ACTION_assignCm')->name('my_clients_SINGLE-ACTION_assignCm');
+Route::get('/my_clients/view/{uid}/ACTION_changeCm', 'my_clients_SINGLE_Controller@ACTION_changeCm')->name('my_clients_SINGLE-ACTION_changeCm');
+Route::get('/my_clients/view/{uid}/ACTION_removeCm', 'my_clients_SINGLE_Controller@ACTION_removeCm')->name('my_clients_SINGLE-ACTION_removeCm');
+Route::get('/my_clients/view/{uid}/ACTION_assignRme', 'my_clients_SINGLE_Controller@ACTION_assignRme')->name('my_clients_SINGLE-ACTION_assignRme');
+Route::get('/my_clients/view/{uid}/ACTION_changeRme', 'my_clients_SINGLE_Controller@ACTION_changeRme')->name('my_clients_SINGLE-ACTION_changeRme');
+Route::get('/my_clients/view/{uid}/ACTION_removeRme', 'my_clients_SINGLE_Controller@ACTION_removeRme')->name('my_clients_SINGLE-ACTION_removeRme');
+Route::get('/my_clients/view/{uid}/ACTION_assignRmm', 'my_clients_SINGLE_Controller@ACTION_assignRmm')->name('my_clients_SINGLE-ACTION_assignRmm');
+Route::get('/my_clients/view/{uid}/ACTION_changeRmm', 'my_clients_SINGLE_Controller@ACTION_changeRmm')->name('my_clients_SINGLE-ACTION_changeRmm');
+Route::get('/my_clients/view/{uid}/ACTION_removeRmm', 'my_clients_SINGLE_Controller@ACTION_removeRmm')->name('my_clients_SINGLE-ACTION_removeRmm');
 Route::get('/my_clients/view/{uid}/ACTION_putProfilePicture', 'my_clients_SINGLE_Controller@ACTION_putProfilePicture')->name('my_clients_SINGLE-ACTION_putProfilePicture');
 Route::get('/my_clients/view/{uid}/ACTION_removeProfilePicture', 'my_clients_SINGLE_Controller@ACTION_removeProfilePicture')->name('my_clients_SINGLE-ACTION_removeProfilePicture');
 Route::get('/my_clients/view/{uid}/ACTION_updatePhoneInfo', 'my_clients_SINGLE_Controller@ACTION_updatePhoneInfo')->name('my_clients_SINGLE-ACTION_updatePhoneInfo');
@@ -125,8 +133,18 @@ Route::get('/care_months', 'care_months_Controller@index')->name('care_months-in
 Route::get('/care_months/view/{uid}', 'care_months_Controller@view')->name('care_months-view');
 
 // --- pro: care_months_SINGLE --- //
-Route::get('/care_months/view/{uid}/ACTION_putMcpPro', 'care_months_SINGLE_Controller@ACTION_putMcpPro')->name('care_months_SINGLE-ACTION_putMcpPro');
-Route::get('/care_months/view/{uid}/ACTION_putAllyPro', 'care_months_SINGLE_Controller@ACTION_putAllyPro')->name('care_months_SINGLE-ACTION_putAllyPro');
+Route::get('/care_months/view/{uid}/ACTION_assignMcpPro', 'care_months_SINGLE_Controller@ACTION_assignMcpPro')->name('care_months_SINGLE-ACTION_assignMcpPro');
+Route::get('/care_months/view/{uid}/ACTION_changeMcpPro', 'care_months_SINGLE_Controller@ACTION_changeMcpPro')->name('care_months_SINGLE-ACTION_changeMcpPro');
+Route::get('/care_months/view/{uid}/ACTION_removeMcpPro', 'care_months_SINGLE_Controller@ACTION_removeMcpPro')->name('care_months_SINGLE-ACTION_removeMcpPro');
+Route::get('/care_months/view/{uid}/ACTION_assignCmPro', 'care_months_SINGLE_Controller@ACTION_assignCmPro')->name('care_months_SINGLE-ACTION_assignCmPro');
+Route::get('/care_months/view/{uid}/ACTION_changeCmPro', 'care_months_SINGLE_Controller@ACTION_changeCmPro')->name('care_months_SINGLE-ACTION_changeCmPro');
+Route::get('/care_months/view/{uid}/ACTION_removeCmPro', 'care_months_SINGLE_Controller@ACTION_removeCmPro')->name('care_months_SINGLE-ACTION_removeCmPro');
+Route::get('/care_months/view/{uid}/ACTION_assignRmePro', 'care_months_SINGLE_Controller@ACTION_assignRmePro')->name('care_months_SINGLE-ACTION_assignRmePro');
+Route::get('/care_months/view/{uid}/ACTION_changeRmePro', 'care_months_SINGLE_Controller@ACTION_changeRmePro')->name('care_months_SINGLE-ACTION_changeRmePro');
+Route::get('/care_months/view/{uid}/ACTION_removeRmePro', 'care_months_SINGLE_Controller@ACTION_removeRmePro')->name('care_months_SINGLE-ACTION_removeRmePro');
+Route::get('/care_months/view/{uid}/ACTION_assignRmmPro', 'care_months_SINGLE_Controller@ACTION_assignRmmPro')->name('care_months_SINGLE-ACTION_assignRmmPro');
+Route::get('/care_months/view/{uid}/ACTION_changeRmmPro', 'care_months_SINGLE_Controller@ACTION_changeRmmPro')->name('care_months_SINGLE-ACTION_changeRmmPro');
+Route::get('/care_months/view/{uid}/ACTION_removeRmmPro', 'care_months_SINGLE_Controller@ACTION_removeRmmPro')->name('care_months_SINGLE-ACTION_removeRmmPro');
 Route::get('/care_months/view/{uid}/ACTION_putReasons', 'care_months_SINGLE_Controller@ACTION_putReasons')->name('care_months_SINGLE-ACTION_putReasons');
 Route::get('/care_months/view/{uid}/ACTION_setIsClientEnrolledInCmToTrue', 'care_months_SINGLE_Controller@ACTION_setIsClientEnrolledInCmToTrue')->name('care_months_SINGLE-ACTION_setIsClientEnrolledInCmToTrue');
 Route::get('/care_months/view/{uid}/ACTION_setIsClientEnrolledInCmToFalse', 'care_months_SINGLE_Controller@ACTION_setIsClientEnrolledInCmToFalse')->name('care_months_SINGLE-ACTION_setIsClientEnrolledInCmToFalse');