Jelajahi Sumber

updated tree

Josh Kamau 5 tahun lalu
induk
melakukan
3eca21b1e1
28 mengubah file dengan 646 tambahan dan 79 penghapusan
  1. 5 0
      app/Http/Controllers/med_profile_lines_Controller.php
  2. 30 0
      app/Http/Controllers/med_profile_lines_SINGLE_Controller.php
  3. 10 2
      app/Http/Controllers/my_clients_SINGLE_Controller.php
  4. 20 1
      generatecv/tree.txt
  5. 2 2
      resources/views/admin/pro_rates/index.blade.php
  6. 50 16
      resources/views/pro/bills/index.blade.php
  7. 6 2
      resources/views/pro/care_month_entries/index.blade.php
  8. 12 8
      resources/views/pro/care_months/index.blade.php
  9. 6 2
      resources/views/pro/care_months_SINGLE/SUB_cm_time_entries.blade.php
  10. 6 2
      resources/views/pro/care_months_SINGLE/SUB_rm_time_entries.blade.php
  11. 2 0
      resources/views/pro/med_profile_lines/actions.blade.php
  12. 3 0
      resources/views/pro/med_profile_lines/info.blade.php
  13. 1 0
      resources/views/pro/med_profile_lines/subs.blade.php
  14. 20 0
      resources/views/pro/med_profile_lines/view.blade.php
  15. 41 0
      resources/views/pro/med_profile_lines_SINGLE/ACTION_remove.blade.php
  16. 45 0
      resources/views/pro/med_profile_lines_SINGLE/ACTION_updateContent.blade.php
  17. 34 0
      resources/views/pro/med_profile_lines_SINGLE/SUB_dashboard.blade.php
  18. 50 0
      resources/views/pro/my_clients_SINGLE/ACTION_client_info_lineAddNew.blade.php
  19. 50 0
      resources/views/pro/my_clients_SINGLE/ACTION_med_profileAddNew.blade.php
  20. 50 16
      resources/views/pro/my_clients_SINGLE/SUB_bills.blade.php
  21. 6 2
      resources/views/pro/my_clients_SINGLE/SUB_care_month_entries.blade.php
  22. 12 8
      resources/views/pro/my_clients_SINGLE/SUB_care_months.blade.php
  23. 54 0
      resources/views/pro/my_clients_SINGLE/SUB_client_info_line.blade.php
  24. 33 1
      resources/views/pro/my_clients_SINGLE/SUB_med_profile.blade.php
  25. 33 1
      resources/views/pro/my_clients_SINGLE/SUB_med_profile_log.blade.php
  26. 8 0
      resources/views/pro/my_clients_SINGLE/SUB_notes.blade.php
  27. 50 16
      resources/views/pro/notes_SINGLE/SUB_bills.blade.php
  28. 7 0
      routes/generated.php

+ 5 - 0
app/Http/Controllers/med_profile_lines_Controller.php

@@ -15,4 +15,9 @@ class med_profile_lines_Controller extends Controller
 		$records = DB::table('client_info_line')->get();
 		return response()->view('pro/med_profile_lines/index', compact('records'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
+
+	// GET /med_profile_lines/view/{uid}
+	public function view(Request $request, $uid) {
+		return redirect("/med_profile_lines/view/$uid/SUB_dashboard");
+	}
 }

+ 30 - 0
app/Http/Controllers/med_profile_lines_SINGLE_Controller.php

@@ -0,0 +1,30 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use Illuminate\Support\Facades\Auth;
+
+class med_profile_lines_SINGLE_Controller extends Controller
+{
+    public $selfName = 'med_profile_lines_SINGLE_Controller';
+
+	// GET /med_profile_lines/view/{uid}/ACTION_remove
+	public function ACTION_remove(Request $request, $uid) {
+		$record = DB::table('client_info_line')->where('uid', $uid)->first();
+		return response()->view('pro/med_profile_lines_SINGLE/ACTION_remove', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /med_profile_lines/view/{uid}/ACTION_updateContent
+	public function ACTION_updateContent(Request $request, $uid) {
+		$record = DB::table('client_info_line')->where('uid', $uid)->first();
+		return response()->view('pro/med_profile_lines_SINGLE/ACTION_updateContent', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /med_profile_lines/view/{uid}/SUB_dashboard
+	public function SUB_dashboard(Request $request, $uid) {
+		$record = DB::table('client_info_line')->where('uid', $uid)->first();
+		return response()->view('pro/med_profile_lines_SINGLE/SUB_dashboard', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+}

+ 10 - 2
app/Http/Controllers/my_clients_SINGLE_Controller.php

@@ -265,13 +265,15 @@ class my_clients_SINGLE_Controller extends Controller
 	// GET /my_clients/view/{uid}/SUB_med_profile
 	public function SUB_med_profile(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();
-		return response()->view('pro/my_clients_SINGLE/SUB_med_profile', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$subRecords = DB::table('client_info_line')->where('client_id', $record->id)->get();
+		return response()->view('pro/my_clients_SINGLE/SUB_med_profile', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /my_clients/view/{uid}/SUB_med_profile_log
 	public function SUB_med_profile_log(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();
-		return response()->view('pro/my_clients_SINGLE/SUB_med_profile_log', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		$subRecords = DB::table('client_info_line_update')->where('client_id', $record->id)->get();
+		return response()->view('pro/my_clients_SINGLE/SUB_med_profile_log', compact('record', 'subRecords'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /my_clients/view/{uid}/SUB_pro_access
@@ -350,6 +352,12 @@ class my_clients_SINGLE_Controller extends Controller
 		return response()->view('pro/my_clients_SINGLE/SUB_audit_log', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /my_clients/view/{uid}/ACTION_med_profileAddNew
+	public function ACTION_med_profileAddNew(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return response()->view('pro/my_clients_SINGLE/ACTION_med_profileAddNew', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /my_clients/view/{uid}/ACTION_pro_accessAddNew
 	public function ACTION_pro_accessAddNew(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();

+ 20 - 1
generatecv/tree.txt

@@ -154,7 +154,16 @@ PRO
                 !act:date_of_birth:putDateOfBirth:pencil-alt=>/my_clients/view/$uid/ACTION_putDateOfBirth
                 !act:mailing_address_zip:updateAddress:pencil-alt=>/my_clients/view/$uid/ACTION_updateAddress
             med_profile
+                id=client_info_line.client_id=>/med_profiles/view/UID
+                !inc:id,category,content_text,content_detail
+                add_new:client_info_line=>/med_profile_lines/view/UID
+                    clientUid:hidden=uid
+                    category
+                    contentText
+                    contentDetail
             med_profile_log
+                id=client_info_line_update.client_id=>/med_profiles/view/UID
+                !inc:id,category,content_text,content_detail
             pro_access
                 id=client_pro_access.client_id=>/pro_access/view/UID
                 add_new:client_pro_access=>/pro_access/view/UID
@@ -398,7 +407,17 @@ PRO
                 id=pro_transaction.bill_id
             audit_log
     transactions|pro_transaction|icon:exchange-alt
-    med_profile_lines|client_info_line|icon:window-restore
+    med_profile_lines|client_info_line|view|icon:window-restore
+    med_profile_lines/view/{uid}
+        ACTIONS
+            remove
+                removalMemo=removal_memo
+            updateContent
+                contentText=content_text
+                contentDetail=content_detail
+        SUB
+            dashboard
+                !grp:Med Profile Details:id,category,content_text,content_detail
     med_profile_line_updates|client_info_line_update|icon:window-restore
     pro_access|client_pro_access|view|icon:arrow-alt-circle-right
     pro_access/view/{uid}

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

@@ -21,8 +21,8 @@
 <th>Reactivated At</th>
 <th>Reactivation Memo</th>
 <th>Amount</th>
-<th>As Hcp Or Ally</th>
 <th>Code</th>
+<th>Responsibility</th>
 <th>Created By Session Id</th>
 <th>Deactivated By Session Id</th>
 <th>Reactivated By Session Id</th>
@@ -41,8 +41,8 @@
 <td><?= friendly_date_time($record->reactivated_at) ?></td>
 <td><?= $record->reactivation_memo ?></td>
 <td><?= $record->amount ?></td>
-<td><?= $record->as_hcp_or_ally ?></td>
 <td><?= $record->code ?></td>
+<td><?= $record->responsibility ?></td>
 <td><?= $record->created_by_session_id ?></td>
 <td><?= $record->deactivated_by_session_id ?></td>
 <td><?= $record->reactivated_by_session_id ?></td>

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

@@ -15,20 +15,24 @@
 <th>&nbsp;</th>
 <th>Created At</th>
 <th>Type</th>
-<th>Ally Expected Payment Amount</th>
-<th>Ally Payment Amount</th>
 <th>Bill Service Type</th>
+<th>Cm Expected Payment Amount</th>
 <th>Cm Or Rm</th>
+<th>Cm Payment Amount</th>
 <th>Code</th>
 <th>Collected Amount</th>
 <th>Effective Date</th>
-<th>Has Ally Been Paid</th>
+<th>Has Cm Been Paid</th>
 <th>Has Hcp Been Paid</th>
+<th>Has Rme Been Paid</th>
+<th>Has Rmm Been Paid</th>
 <th>Hcp Expected Payment Amount</th>
 <th>Hcp Payment Amount</th>
 <th>Is Cancelled</th>
-<th>Is Signed By Ally</th>
+<th>Is Signed By Cm</th>
 <th>Is Signed By Hcp</th>
+<th>Is Signed By Rme</th>
+<th>Is Signed By Rmm</th>
 <th>Is Submitted</th>
 <th>Marked Cancelled At</th>
 <th>Marked Submitted At</th>
@@ -38,21 +42,34 @@
 <th>Reason2</th>
 <th>Reason3</th>
 <th>Reason3plus</th>
+<th>Rme Expected Payment Amount</th>
+<th>Rme Payment Amount</th>
+<th>Rmm Expected Payment Amount</th>
+<th>Rmm Payment Amount</th>
 <th>Service Location</th>
-<th>Signed By Ally At</th>
+<th>Signed By Cm At</th>
 <th>Signed By Hcp At</th>
+<th>Signed By Rme At</th>
+<th>Signed By Rmm At</th>
 <th>Created By Session Id</th>
-<th>Ally Payment Pro Transaction Id</th>
-<th>Ally Pro Id</th>
 <th>Care Month Id</th>
 <th>Client Id</th>
+<th>Cm Payment Pro Transaction Id</th>
+<th>Cm Pro Id</th>
 <th>Hcp Payment Pro Transaction Id</th>
 <th>Hcp Pro Id</th>
 <th>Marked Cancelled By Session Id</th>
 <th>Marked Submitted By Session Id</th>
 <th>Note Id</th>
-<th>Signed By Ally Session Id</th>
+<th>Note Ally Id</th>
+<th>Rme Payment Pro Transaction Id</th>
+<th>Rme Pro Id</th>
+<th>Rmm Payment Pro Transaction Id</th>
+<th>Rmm Pro Id</th>
+<th>Signed By Cm Session Id</th>
 <th>Signed By Hcp Session Id</th>
+<th>Signed By Rme Session Id</th>
+<th>Signed By Rmm Session Id</th>
             </tr>
             </thead>
             <tbody>
@@ -61,20 +78,24 @@
 <td><a href="/bills/view/<?= $record->uid ?>"><i class="fas fa-share-square"></i></a></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $record->type ?></td>
-<td><?= $record->ally_expected_payment_amount ?></td>
-<td><?= $record->ally_payment_amount ?></td>
 <td><?= $record->bill_service_type ?></td>
+<td><?= $record->cm_expected_payment_amount ?></td>
 <td><?= $record->cm_or_rm ?></td>
+<td><?= $record->cm_payment_amount ?></td>
 <td><?= $record->code ?></td>
 <td><?= $record->collected_amount ?></td>
 <td><?= $record->effective_date ?></td>
-<td><?= $record->has_ally_been_paid ?></td>
+<td><?= $record->has_cm_been_paid ?></td>
 <td><?= $record->has_hcp_been_paid ?></td>
+<td><?= $record->has_rme_been_paid ?></td>
+<td><?= $record->has_rmm_been_paid ?></td>
 <td><?= $record->hcp_expected_payment_amount ?></td>
 <td><?= $record->hcp_payment_amount ?></td>
 <td><?= $record->is_cancelled ?></td>
-<td><?= $record->is_signed_by_ally ?></td>
+<td><?= $record->is_signed_by_cm ?></td>
 <td><?= $record->is_signed_by_hcp ?></td>
+<td><?= $record->is_signed_by_rme ?></td>
+<td><?= $record->is_signed_by_rmm ?></td>
 <td><?= $record->is_submitted ?></td>
 <td><?= friendly_date_time($record->marked_cancelled_at) ?></td>
 <td><?= friendly_date_time($record->marked_submitted_at) ?></td>
@@ -84,21 +105,34 @@
 <td><?= $record->reason2 ?></td>
 <td><?= $record->reason3 ?></td>
 <td><?= $record->reason3plus ?></td>
+<td><?= $record->rme_expected_payment_amount ?></td>
+<td><?= $record->rme_payment_amount ?></td>
+<td><?= $record->rmm_expected_payment_amount ?></td>
+<td><?= $record->rmm_payment_amount ?></td>
 <td><?= $record->service_location ?></td>
-<td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_cm_at) ?></td>
 <td><?= friendly_date_time($record->signed_by_hcp_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_rme_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_rmm_at) ?></td>
 <td><?= $record->created_by_session_id ?></td>
-<td><?= $record->ally_payment_pro_transaction_id ?></td>
-<td><?= $record->ally_pro_id ?></td>
 <td><?= $record->care_month_id ?></td>
 <td><?= $record->client_id ?></td>
+<td><?= $record->cm_payment_pro_transaction_id ?></td>
+<td><?= $record->cm_pro_id ?></td>
 <td><?= $record->hcp_payment_pro_transaction_id ?></td>
 <td><?= $record->hcp_pro_id ?></td>
 <td><?= $record->marked_cancelled_by_session_id ?></td>
 <td><?= $record->marked_submitted_by_session_id ?></td>
 <td><?= $record->note_id ?></td>
-<td><?= $record->signed_by_ally_session_id ?></td>
+<td><?= $record->note_ally_id ?></td>
+<td><?= $record->rme_payment_pro_transaction_id ?></td>
+<td><?= $record->rme_pro_id ?></td>
+<td><?= $record->rmm_payment_pro_transaction_id ?></td>
+<td><?= $record->rmm_pro_id ?></td>
+<td><?= $record->signed_by_cm_session_id ?></td>
 <td><?= $record->signed_by_hcp_session_id ?></td>
+<td><?= $record->signed_by_rme_session_id ?></td>
+<td><?= $record->signed_by_rmm_session_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -18,8 +18,10 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Ally Time In Seconds</th>
+<th>Achieved Cm Pro Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
+<th>Achieved Rme Pro Time In Seconds</th>
+<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -45,8 +47,10 @@
 <td><?= $record->is_removed ?></td>
 <td><?= $record->removal_memo ?></td>
 <td><?= friendly_date_time($record->removed_at) ?></td>
-<td><?= $record->achieved_ally_time_in_seconds ?></td>
+<td><?= $record->achieved_cm_pro_time_in_seconds ?></td>
 <td><?= $record->achieved_mcp_time_in_seconds ?></td>
+<td><?= $record->achieved_rme_pro_time_in_seconds ?></td>
+<td><?= $record->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $record->achieved_total_time_in_seconds ?></td>
 <td><?= $record->cm_or_rm ?></td>
 <td><?= $record->content_detail ?></td>

+ 12 - 8
resources/views/pro/care_months/index.blade.php

@@ -18,7 +18,7 @@
 <th>Cm Reason1</th>
 <th>Cm Reason2</th>
 <th>Cm Total Time In Seconds</th>
-<th>Cm Total Time In Seconds By Ally</th>
+<th>Cm Total Time In Seconds By Cm Pro</th>
 <th>Cm Total Time In Seconds By Mcp</th>
 <th>Has Mcp Done Em Visit</th>
 <th>Is Client Enrolled In Cm</th>
@@ -29,8 +29,9 @@
 <th>Rm Reason1</th>
 <th>Rm Reason2</th>
 <th>Rm Total Time In Seconds</th>
-<th>Rm Total Time In Seconds By Ally</th>
 <th>Rm Total Time In Seconds By Mcp</th>
+<th>Rm Total Time In Seconds By Rme Pro</th>
+<th>Rm Total Time In Seconds By Rmm Pro</th>
 <th>Start Date</th>
 <th>Why Is Cm Canceled This Month</th>
 <th>Why Is Rm Canceled This Month</th>
@@ -39,12 +40,13 @@
 <th>Why Not Enrolled In Rm Category</th>
 <th>Why Not Enrolled In Rm Memo</th>
 <th>Created By Session Id</th>
-<th>Ally Pro Id</th>
 <th>Client Id</th>
 <th>Cm Bill Id</th>
+<th>Cm Pro Id</th>
 <th>Mcp Pro Id</th>
 <th>Rm Bill Id</th>
-<th>Team Id</th>
+<th>Rme Pro Id</th>
+<th>Rmm Pro Id</th>
             </tr>
             </thead>
             <tbody>
@@ -56,7 +58,7 @@
 <td><?= $record->cm_reason1 ?></td>
 <td><?= $record->cm_reason2 ?></td>
 <td><?= $record->cm_total_time_in_seconds ?></td>
-<td><?= $record->cm_total_time_in_seconds_by_ally ?></td>
+<td><?= $record->cm_total_time_in_seconds_by_cm_pro ?></td>
 <td><?= $record->cm_total_time_in_seconds_by_mcp ?></td>
 <td><?= $record->has_mcp_done_em_visit ?></td>
 <td><?= $record->is_client_enrolled_in_cm ?></td>
@@ -67,8 +69,9 @@
 <td><?= $record->rm_reason1 ?></td>
 <td><?= $record->rm_reason2 ?></td>
 <td><?= $record->rm_total_time_in_seconds ?></td>
-<td><?= $record->rm_total_time_in_seconds_by_ally ?></td>
 <td><?= $record->rm_total_time_in_seconds_by_mcp ?></td>
+<td><?= $record->rm_total_time_in_seconds_by_rme_pro ?></td>
+<td><?= $record->rm_total_time_in_seconds_by_rmm_pro ?></td>
 <td><?= $record->start_date ?></td>
 <td><?= $record->why_is_cm_canceled_this_month ?></td>
 <td><?= $record->why_is_rm_canceled_this_month ?></td>
@@ -77,12 +80,13 @@
 <td><?= $record->why_not_enrolled_in_rm_category ?></td>
 <td><?= $record->why_not_enrolled_in_rm_memo ?></td>
 <td><?= $record->created_by_session_id ?></td>
-<td><?= $record->ally_pro_id ?></td>
 <td><?= $record->client_id ?></td>
 <td><?= $record->cm_bill_id ?></td>
+<td><?= $record->cm_pro_id ?></td>
 <td><?= $record->mcp_pro_id ?></td>
 <td><?= $record->rm_bill_id ?></td>
-<td><?= $record->team_id ?></td>
+<td><?= $record->rme_pro_id ?></td>
+<td><?= $record->rmm_pro_id ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -20,8 +20,10 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Ally Time In Seconds</th>
+<th>Achieved Cm Pro Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
+<th>Achieved Rme Pro Time In Seconds</th>
+<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -47,8 +49,10 @@
 <td><?= $subRecord->is_removed ?></td>
 <td><?= $subRecord->removal_memo ?></td>
 <td><?= friendly_date_time($record->removed_at) ?></td>
-<td><?= $subRecord->achieved_ally_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_mcp_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_total_time_in_seconds ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
 <td><?= $subRecord->content_detail ?></td>

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

@@ -20,8 +20,10 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Ally Time In Seconds</th>
+<th>Achieved Cm Pro Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
+<th>Achieved Rme Pro Time In Seconds</th>
+<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -47,8 +49,10 @@
 <td><?= $subRecord->is_removed ?></td>
 <td><?= $subRecord->removal_memo ?></td>
 <td><?= friendly_date_time($record->removed_at) ?></td>
-<td><?= $subRecord->achieved_ally_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_mcp_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_total_time_in_seconds ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
 <td><?= $subRecord->content_detail ?></td>

+ 2 - 0
resources/views/pro/med_profile_lines/actions.blade.php

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

+ 3 - 0
resources/views/pro/med_profile_lines/info.blade.php

@@ -0,0 +1,3 @@
+<h4 class="d-flex my-3 px-3 stag-heading stag-heading-info">
+    <div>Med Profile Lines: Single [<?= $record->uid ?>]</div>
+</h4>

+ 1 - 0
resources/views/pro/med_profile_lines/subs.blade.php

@@ -0,0 +1 @@
+<a href='/med_profile_lines/view/<?= $record->uid ?>/SUB_dashboard' class='d-block px-3 py-2 border-bottom stag-sublink {{ request()->route()->getActionMethod() === 'SUB_dashboard' ? 'bg-secondary text-white font-weight-bold' : '' }}{{ strpos(request()->route()->getActionMethod(), 'ACTION_') === 0 ? 'bg-secondary text-white font-weight-bold' : '' }}'>Dashboard</a>

+ 20 - 0
resources/views/pro/med_profile_lines/view.blade.php

@@ -0,0 +1,20 @@
+@extends('layouts.pro-logged-in')
+@section('content')
+
+    <div class="card rounded-0">
+        <div class="border-bottom bg-light">@include('pro/med_profile_lines/info')</div>
+        <div class="d-flex align-items-stretch">
+            <div class="inner-side-nav">
+                <div class="border-right h-100">
+                    @include('pro/med_profile_lines/subs')
+                </div>
+            </div>
+            <div class="flex-grow-1 px-3 pb-3 mb-3 inner-content">
+                <div>
+                    @yield('content-inner')
+                </div>
+            </div>
+        </div>
+    </div>
+
+@endsection

+ 41 - 0
resources/views/pro/med_profile_lines_SINGLE/ACTION_remove.blade.php

@@ -0,0 +1,41 @@
+@extends('pro.med_profile_lines.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Remove</div>
+        <div class="ml-auto">
+            <a class="text-secondary" href="#" up-close>
+                <i class="fa fa-times"></i>
+            </a>
+        </div>
+    </h4>
+
+    <form action="/post-to-api"
+          up-target="#main-content" up-history="false" up-fail-target=".failed-form-contents" up-reveal="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/clientInfoLine/remove">
+        <input type="hidden" name="_success" value="{{route('med_profile_lines-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('med_profile_lines_SINGLE-ACTION_remove', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Removal Memo </label>
+<input class='form-control' type='text' name='removalMemo' value='{{ old('removalMemo') ? old('removalMemo') : $record->removal_memo }}' >
+</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('med_profile_lines-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 45 - 0
resources/views/pro/med_profile_lines_SINGLE/ACTION_updateContent.blade.php

@@ -0,0 +1,45 @@
+@extends('pro.med_profile_lines.view')
+@section('content-inner')
+
+    <div class="form-contents"><div class="failed-form-contents">
+
+    <h4 class="d-flex m-0 p-3 stag-heading stag-heading-modal">
+        <div>Update Content</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/clientInfoLine/updateContent">
+        <input type="hidden" name="_success" value="{{route('med_profile_lines-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('med_profile_lines_SINGLE-ACTION_updateContent', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Content Text </label>
+<input class='form-control' type='text' name='contentText' value='{{ old('contentText') ? old('contentText') : $record->content_text }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Detail </label>
+<input class='form-control' type='text' name='contentDetail' value='{{ old('contentDetail') ? old('contentDetail') : $record->content_detail }}' >
+</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('med_profile_lines-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

+ 34 - 0
resources/views/pro/med_profile_lines_SINGLE/SUB_dashboard.blade.php

@@ -0,0 +1,34 @@
+@extends('pro.med_profile_lines.view')
+@section('content-inner')
+
+    <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">Med Profile Details
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
+            </th>
+        </tr>
+        </thead>
+        <tbody>
+            <tr><td class="w-25 px-2 text-secondary border-right">Category</td><td class="w-75 px-2 font-weight-bold"><?= $record->category ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Content Text</td><td class="w-75 px-2 font-weight-bold"><?= $record->content_text ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Content Detail</td><td class="w-75 px-2 font-weight-bold"><?= $record->content_detail ?></td></tr>
+        </tbody>
+    </table>
+</div>
+
+
+    </div>
+    <div class="col-4">
+        <div class="border-left h-100 pl-3">
+            @include('pro/med_profile_lines/actions')
+        </div>
+    </div>
+</div>
+
+
+@endsection

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

@@ -0,0 +1,50 @@
+@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 stag-heading stag-heading-modal">
+        <div>Client Info Line Add New</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/clientInfoLine/create">
+        <input type="hidden" name="_success" value="{{route('my_clients_SINGLE-SUB_client_info_line', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_client_info_lineAddNew', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Category </label>
+<input class='form-control' type='text' name='category' value='{{ old('category') ? old('category') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Text </label>
+<input class='form-control' type='text' name='contentText' value='{{ old('contentText') ? old('contentText') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Detail </label>
+<input class='form-control' type='text' name='contentDetail' value='{{ old('contentDetail') ? old('contentDetail') : '' }}' >
+</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_SINGLE-SUB_client_info_line', ['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/ACTION_med_profileAddNew.blade.php

@@ -0,0 +1,50 @@
+@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 stag-heading stag-heading-modal">
+        <div>Med Profile Add New</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/clientInfoLine/create">
+        <input type="hidden" name="_success" value="{{route('my_clients_SINGLE-SUB_med_profile', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('my_clients_SINGLE-ACTION_med_profileAddNew', ['uid' => $record->uid])}}">
+        <input class='form-control' type='hidden' name='clientUid' value='{{ old('clientUid') ? old('clientUid') : $record->uid }}' >
+<div class='form-group mb-3'>
+<label class='control-label'>Category </label>
+<input class='form-control' type='text' name='category' value='{{ old('category') ? old('category') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Text </label>
+<input class='form-control' type='text' name='contentText' value='{{ old('contentText') ? old('contentText') : '' }}' >
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Content Detail </label>
+<input class='form-control' type='text' name='contentDetail' value='{{ old('contentDetail') ? old('contentDetail') : '' }}' >
+</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_SINGLE-SUB_med_profile', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -17,20 +17,24 @@
                     <th>&nbsp;</th>
 <th>Created At</th>
 <th>Type</th>
-<th>Ally Expected Payment Amount</th>
-<th>Ally Payment Amount</th>
 <th>Bill Service Type</th>
+<th>Cm Expected Payment Amount</th>
 <th>Cm Or Rm</th>
+<th>Cm Payment Amount</th>
 <th>Code</th>
 <th>Collected Amount</th>
 <th>Effective Date</th>
-<th>Has Ally Been Paid</th>
+<th>Has Cm Been Paid</th>
 <th>Has Hcp Been Paid</th>
+<th>Has Rme Been Paid</th>
+<th>Has Rmm Been Paid</th>
 <th>Hcp Expected Payment Amount</th>
 <th>Hcp Payment Amount</th>
 <th>Is Cancelled</th>
-<th>Is Signed By Ally</th>
+<th>Is Signed By Cm</th>
 <th>Is Signed By Hcp</th>
+<th>Is Signed By Rme</th>
+<th>Is Signed By Rmm</th>
 <th>Is Submitted</th>
 <th>Marked Cancelled At</th>
 <th>Marked Submitted At</th>
@@ -40,21 +44,34 @@
 <th>Reason2</th>
 <th>Reason3</th>
 <th>Reason3plus</th>
+<th>Rme Expected Payment Amount</th>
+<th>Rme Payment Amount</th>
+<th>Rmm Expected Payment Amount</th>
+<th>Rmm Payment Amount</th>
 <th>Service Location</th>
-<th>Signed By Ally At</th>
+<th>Signed By Cm At</th>
 <th>Signed By Hcp At</th>
+<th>Signed By Rme At</th>
+<th>Signed By Rmm At</th>
 <th>Created By Session Id</th>
-<th>Ally Payment Pro Transaction Id</th>
-<th>Ally Pro Id</th>
 <th>Care Month Id</th>
 <th>Client Id</th>
+<th>Cm Payment Pro Transaction Id</th>
+<th>Cm Pro Id</th>
 <th>Hcp Payment Pro Transaction Id</th>
 <th>Hcp Pro Id</th>
 <th>Marked Cancelled By Session Id</th>
 <th>Marked Submitted By Session Id</th>
 <th>Note Id</th>
-<th>Signed By Ally Session Id</th>
+<th>Note Ally Id</th>
+<th>Rme Payment Pro Transaction Id</th>
+<th>Rme Pro Id</th>
+<th>Rmm Payment Pro Transaction Id</th>
+<th>Rmm Pro Id</th>
+<th>Signed By Cm Session Id</th>
 <th>Signed By Hcp Session Id</th>
+<th>Signed By Rme Session Id</th>
+<th>Signed By Rmm Session Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -63,20 +80,24 @@
                         <td><a href="/bills/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $subRecord->type ?></td>
-<td><?= $subRecord->ally_expected_payment_amount ?></td>
-<td><?= $subRecord->ally_payment_amount ?></td>
 <td><?= $subRecord->bill_service_type ?></td>
+<td><?= $subRecord->cm_expected_payment_amount ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
+<td><?= $subRecord->cm_payment_amount ?></td>
 <td><?= $subRecord->code ?></td>
 <td><?= $subRecord->collected_amount ?></td>
 <td><?= $subRecord->effective_date ?></td>
-<td><?= $subRecord->has_ally_been_paid ?></td>
+<td><?= $subRecord->has_cm_been_paid ?></td>
 <td><?= $subRecord->has_hcp_been_paid ?></td>
+<td><?= $subRecord->has_rme_been_paid ?></td>
+<td><?= $subRecord->has_rmm_been_paid ?></td>
 <td><?= $subRecord->hcp_expected_payment_amount ?></td>
 <td><?= $subRecord->hcp_payment_amount ?></td>
 <td><?= $subRecord->is_cancelled ?></td>
-<td><?= $subRecord->is_signed_by_ally ?></td>
+<td><?= $subRecord->is_signed_by_cm ?></td>
 <td><?= $subRecord->is_signed_by_hcp ?></td>
+<td><?= $subRecord->is_signed_by_rme ?></td>
+<td><?= $subRecord->is_signed_by_rmm ?></td>
 <td><?= $subRecord->is_submitted ?></td>
 <td><?= friendly_date_time($record->marked_cancelled_at) ?></td>
 <td><?= friendly_date_time($record->marked_submitted_at) ?></td>
@@ -86,21 +107,34 @@
 <td><?= $subRecord->reason2 ?></td>
 <td><?= $subRecord->reason3 ?></td>
 <td><?= $subRecord->reason3plus ?></td>
+<td><?= $subRecord->rme_expected_payment_amount ?></td>
+<td><?= $subRecord->rme_payment_amount ?></td>
+<td><?= $subRecord->rmm_expected_payment_amount ?></td>
+<td><?= $subRecord->rmm_payment_amount ?></td>
 <td><?= $subRecord->service_location ?></td>
-<td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_cm_at) ?></td>
 <td><?= friendly_date_time($record->signed_by_hcp_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_rme_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_rmm_at) ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->ally_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->ally_pro_id ?></td>
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->cm_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->cm_pro_id ?></td>
 <td><?= $subRecord->hcp_payment_pro_transaction_id ?></td>
 <td><?= $subRecord->hcp_pro_id ?></td>
 <td><?= $subRecord->marked_cancelled_by_session_id ?></td>
 <td><?= $subRecord->marked_submitted_by_session_id ?></td>
 <td><?= $subRecord->note_id ?></td>
-<td><?= $subRecord->signed_by_ally_session_id ?></td>
+<td><?= $subRecord->note_ally_id ?></td>
+<td><?= $subRecord->rme_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rme_pro_id ?></td>
+<td><?= $subRecord->rmm_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rmm_pro_id ?></td>
+<td><?= $subRecord->signed_by_cm_session_id ?></td>
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
+<td><?= $subRecord->signed_by_rme_session_id ?></td>
+<td><?= $subRecord->signed_by_rmm_session_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -20,8 +20,10 @@
 <th>Is Removed</th>
 <th>Removal Memo</th>
 <th>Removed At</th>
-<th>Achieved Ally Time In Seconds</th>
+<th>Achieved Cm Pro Time In Seconds</th>
 <th>Achieved Mcp Time In Seconds</th>
+<th>Achieved Rme Pro Time In Seconds</th>
+<th>Achieved Rmm Pro Time In Seconds</th>
 <th>Achieved Total Time In Seconds</th>
 <th>Cm Or Rm</th>
 <th>Content Detail</th>
@@ -47,8 +49,10 @@
 <td><?= $subRecord->is_removed ?></td>
 <td><?= $subRecord->removal_memo ?></td>
 <td><?= friendly_date_time($record->removed_at) ?></td>
-<td><?= $subRecord->achieved_ally_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_cm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_mcp_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rme_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rmm_pro_time_in_seconds ?></td>
 <td><?= $subRecord->achieved_total_time_in_seconds ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
 <td><?= $subRecord->content_detail ?></td>

+ 12 - 8
resources/views/pro/my_clients_SINGLE/SUB_care_months.blade.php

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

+ 54 - 0
resources/views/pro/my_clients_SINGLE/SUB_client_info_line.blade.php

@@ -0,0 +1,54 @@
+@extends('pro.my_clients.view')
+@section('content-inner')
+
+    <div class="pb-3">
+
+        <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
+            <div>Client Info Line</div>
+            <div class="ml-auto">
+                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-width="800" up-history="false" href="{{route('my_clients_SINGLE-ACTION_client_info_lineAddNew', ['uid' => $record->uid])}}"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+            </div>
+        </h5>
+
+        <div class="table-responsive p-0 bg-white border stag-table stag-table-sub">
+            <table class="table table-hover text-nowrap">
+                <thead>
+                <tr>
+                    <th>&nbsp;</th>
+<th>Created At</th>
+<th>Type</th>
+<th>Is Removed</th>
+<th>Removal Memo</th>
+<th>Removed At</th>
+<th>Category</th>
+<th>Content Detail</th>
+<th>Content Text</th>
+<th>Created By Session Id</th>
+<th>Removed By Session Id</th>
+<th>Client Id</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($subRecords as $subRecord)
+                    <tr>
+                        <td><a href="/med_profile_lines/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+<td><?= friendly_date_time($record->created_at) ?></td>
+<td><?= $subRecord->type ?></td>
+<td><?= $subRecord->is_removed ?></td>
+<td><?= $subRecord->removal_memo ?></td>
+<td><?= friendly_date_time($record->removed_at) ?></td>
+<td><?= $subRecord->category ?></td>
+<td><?= $subRecord->content_detail ?></td>
+<td><?= $subRecord->content_text ?></td>
+<td><?= $subRecord->created_by_session_id ?></td>
+<td><?= $subRecord->removed_by_session_id ?></td>
+<td><?= $subRecord->client_id ?></td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
+
+@endsection

+ 33 - 1
resources/views/pro/my_clients_SINGLE/SUB_med_profile.blade.php

@@ -1,6 +1,38 @@
 @extends('pro.my_clients.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Med Profile</h5>Controller: <b>my_clients_SINGLE</b><br>Action: <b>SUB_med_profile()</b><br>View: <b>pro/my_clients_SINGLE/SUB_med_profile.blade.php</b><br><br>
+    <div class="pb-3">
+
+        <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
+            <div>Med Profile</div>
+            <div class="ml-auto">
+                <a class="btn btn-primary btn-sm" up-modal=".form-contents" up-width="800" up-history="false" href="{{route('my_clients_SINGLE-ACTION_med_profileAddNew', ['uid' => $record->uid])}}"><i class='fa fa-plus-circle' aria-hidden='true'></i> Add New</a>
+            </div>
+        </h5>
+
+        <div class="table-responsive p-0 bg-white border stag-table stag-table-sub">
+            <table class="table table-hover text-nowrap">
+                <thead>
+                <tr>
+                    <th>&nbsp;</th>
+<th>Category</th>
+<th>Content Text</th>
+<th>Content Detail</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($subRecords as $subRecord)
+                    <tr>
+                        <td><a href="/med_profile_lines/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+<td><?= $subRecord->category ?></td>
+<td><?= $subRecord->content_text ?></td>
+<td><?= $subRecord->content_detail ?></td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
 
 @endsection

+ 33 - 1
resources/views/pro/my_clients_SINGLE/SUB_med_profile_log.blade.php

@@ -1,6 +1,38 @@
 @extends('pro.my_clients.view')
 @section('content-inner')
 
-    <h5 class='py-3 border-bottom'>Med Profile Log</h5>Controller: <b>my_clients_SINGLE</b><br>Action: <b>SUB_med_profile_log()</b><br>View: <b>pro/my_clients_SINGLE/SUB_med_profile_log.blade.php</b><br><br>
+    <div class="pb-3">
+
+        <h5 class='my-3 d-flex stag-heading stag-heading-sub'>
+            <div>Med Profile Log</div>
+            <div class="ml-auto">
+                <!-- _ADD_NEW_LINK_ -->
+            </div>
+        </h5>
+
+        <div class="table-responsive p-0 bg-white border stag-table stag-table-sub">
+            <table class="table table-hover text-nowrap">
+                <thead>
+                <tr>
+                    <th>&nbsp;</th>
+<th>Category</th>
+<th>Content Text</th>
+<th>Content Detail</th>
+                </tr>
+                </thead>
+                <tbody>
+                @foreach($subRecords as $subRecord)
+                    <tr>
+                        <td><a href="/med_profiles/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
+<td><?= $subRecord->category ?></td>
+<td><?= $subRecord->content_text ?></td>
+<td><?= $subRecord->content_detail ?></td>
+                    </tr>
+                @endforeach
+                </tbody>
+            </table>
+        </div>
+
+    </div>
 
 @endsection

+ 8 - 0
resources/views/pro/my_clients_SINGLE/SUB_notes.blade.php

@@ -41,6 +41,10 @@
 <th>Hcp Pro Id</th>
 <th>Signed By Ally Session Id</th>
 <th>Signed By Hcp Session Id</th>
+<th>Content Html</th>
+<th>Free Text Html</th>
+<th>Title</th>
+<th>Note Template Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -73,6 +77,10 @@
 <td><?= $subRecord->hcp_pro_id ?></td>
 <td><?= $subRecord->signed_by_ally_session_id ?></td>
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
+<td><?= $subRecord->content_html ?></td>
+<td><?= $subRecord->free_text_html ?></td>
+<td><?= $subRecord->title ?></td>
+<td><?= $subRecord->note_template_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -17,20 +17,24 @@
                     <th>&nbsp;</th>
 <th>Created At</th>
 <th>Type</th>
-<th>Ally Expected Payment Amount</th>
-<th>Ally Payment Amount</th>
 <th>Bill Service Type</th>
+<th>Cm Expected Payment Amount</th>
 <th>Cm Or Rm</th>
+<th>Cm Payment Amount</th>
 <th>Code</th>
 <th>Collected Amount</th>
 <th>Effective Date</th>
-<th>Has Ally Been Paid</th>
+<th>Has Cm Been Paid</th>
 <th>Has Hcp Been Paid</th>
+<th>Has Rme Been Paid</th>
+<th>Has Rmm Been Paid</th>
 <th>Hcp Expected Payment Amount</th>
 <th>Hcp Payment Amount</th>
 <th>Is Cancelled</th>
-<th>Is Signed By Ally</th>
+<th>Is Signed By Cm</th>
 <th>Is Signed By Hcp</th>
+<th>Is Signed By Rme</th>
+<th>Is Signed By Rmm</th>
 <th>Is Submitted</th>
 <th>Marked Cancelled At</th>
 <th>Marked Submitted At</th>
@@ -40,21 +44,34 @@
 <th>Reason2</th>
 <th>Reason3</th>
 <th>Reason3plus</th>
+<th>Rme Expected Payment Amount</th>
+<th>Rme Payment Amount</th>
+<th>Rmm Expected Payment Amount</th>
+<th>Rmm Payment Amount</th>
 <th>Service Location</th>
-<th>Signed By Ally At</th>
+<th>Signed By Cm At</th>
 <th>Signed By Hcp At</th>
+<th>Signed By Rme At</th>
+<th>Signed By Rmm At</th>
 <th>Created By Session Id</th>
-<th>Ally Payment Pro Transaction Id</th>
-<th>Ally Pro Id</th>
 <th>Care Month Id</th>
 <th>Client Id</th>
+<th>Cm Payment Pro Transaction Id</th>
+<th>Cm Pro Id</th>
 <th>Hcp Payment Pro Transaction Id</th>
 <th>Hcp Pro Id</th>
 <th>Marked Cancelled By Session Id</th>
 <th>Marked Submitted By Session Id</th>
 <th>Note Id</th>
-<th>Signed By Ally Session Id</th>
+<th>Note Ally Id</th>
+<th>Rme Payment Pro Transaction Id</th>
+<th>Rme Pro Id</th>
+<th>Rmm Payment Pro Transaction Id</th>
+<th>Rmm Pro Id</th>
+<th>Signed By Cm Session Id</th>
 <th>Signed By Hcp Session Id</th>
+<th>Signed By Rme Session Id</th>
+<th>Signed By Rmm Session Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -63,20 +80,24 @@
                         <td><a href="/bills/view/{{ $subRecord->uid }}"><i class="fas fa-share-square"></i></a></td>
 <td><?= friendly_date_time($record->created_at) ?></td>
 <td><?= $subRecord->type ?></td>
-<td><?= $subRecord->ally_expected_payment_amount ?></td>
-<td><?= $subRecord->ally_payment_amount ?></td>
 <td><?= $subRecord->bill_service_type ?></td>
+<td><?= $subRecord->cm_expected_payment_amount ?></td>
 <td><?= $subRecord->cm_or_rm ?></td>
+<td><?= $subRecord->cm_payment_amount ?></td>
 <td><?= $subRecord->code ?></td>
 <td><?= $subRecord->collected_amount ?></td>
 <td><?= $subRecord->effective_date ?></td>
-<td><?= $subRecord->has_ally_been_paid ?></td>
+<td><?= $subRecord->has_cm_been_paid ?></td>
 <td><?= $subRecord->has_hcp_been_paid ?></td>
+<td><?= $subRecord->has_rme_been_paid ?></td>
+<td><?= $subRecord->has_rmm_been_paid ?></td>
 <td><?= $subRecord->hcp_expected_payment_amount ?></td>
 <td><?= $subRecord->hcp_payment_amount ?></td>
 <td><?= $subRecord->is_cancelled ?></td>
-<td><?= $subRecord->is_signed_by_ally ?></td>
+<td><?= $subRecord->is_signed_by_cm ?></td>
 <td><?= $subRecord->is_signed_by_hcp ?></td>
+<td><?= $subRecord->is_signed_by_rme ?></td>
+<td><?= $subRecord->is_signed_by_rmm ?></td>
 <td><?= $subRecord->is_submitted ?></td>
 <td><?= friendly_date_time($record->marked_cancelled_at) ?></td>
 <td><?= friendly_date_time($record->marked_submitted_at) ?></td>
@@ -86,21 +107,34 @@
 <td><?= $subRecord->reason2 ?></td>
 <td><?= $subRecord->reason3 ?></td>
 <td><?= $subRecord->reason3plus ?></td>
+<td><?= $subRecord->rme_expected_payment_amount ?></td>
+<td><?= $subRecord->rme_payment_amount ?></td>
+<td><?= $subRecord->rmm_expected_payment_amount ?></td>
+<td><?= $subRecord->rmm_payment_amount ?></td>
 <td><?= $subRecord->service_location ?></td>
-<td><?= friendly_date_time($record->signed_by_ally_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_cm_at) ?></td>
 <td><?= friendly_date_time($record->signed_by_hcp_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_rme_at) ?></td>
+<td><?= friendly_date_time($record->signed_by_rmm_at) ?></td>
 <td><?= $subRecord->created_by_session_id ?></td>
-<td><?= $subRecord->ally_payment_pro_transaction_id ?></td>
-<td><?= $subRecord->ally_pro_id ?></td>
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
+<td><?= $subRecord->cm_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->cm_pro_id ?></td>
 <td><?= $subRecord->hcp_payment_pro_transaction_id ?></td>
 <td><?= $subRecord->hcp_pro_id ?></td>
 <td><?= $subRecord->marked_cancelled_by_session_id ?></td>
 <td><?= $subRecord->marked_submitted_by_session_id ?></td>
 <td><?= $subRecord->note_id ?></td>
-<td><?= $subRecord->signed_by_ally_session_id ?></td>
+<td><?= $subRecord->note_ally_id ?></td>
+<td><?= $subRecord->rme_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rme_pro_id ?></td>
+<td><?= $subRecord->rmm_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rmm_pro_id ?></td>
+<td><?= $subRecord->signed_by_cm_session_id ?></td>
 <td><?= $subRecord->signed_by_hcp_session_id ?></td>
+<td><?= $subRecord->signed_by_rme_session_id ?></td>
+<td><?= $subRecord->signed_by_rmm_session_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

+ 7 - 0
routes/generated.php

@@ -66,6 +66,7 @@ Route::get('/my_clients/view/{uid}/SUB_erx', 'my_clients_SINGLE_Controller@SUB_e
 Route::get('/my_clients/view/{uid}/SUB_mcp_updates', 'my_clients_SINGLE_Controller@SUB_mcp_updates')->name('my_clients_SINGLE-SUB_mcp_updates');
 Route::get('/my_clients/view/{uid}/SUB_ally_updates', 'my_clients_SINGLE_Controller@SUB_ally_updates')->name('my_clients_SINGLE-SUB_ally_updates');
 Route::get('/my_clients/view/{uid}/SUB_audit_log', 'my_clients_SINGLE_Controller@SUB_audit_log')->name('my_clients_SINGLE-SUB_audit_log');
+Route::get('/my_clients/view/{uid}/ACTION_med_profileAddNew', 'my_clients_SINGLE_Controller@ACTION_med_profileAddNew')->name('my_clients_SINGLE-ACTION_med_profileAddNew');
 Route::get('/my_clients/view/{uid}/ACTION_pro_accessAddNew', 'my_clients_SINGLE_Controller@ACTION_pro_accessAddNew')->name('my_clients_SINGLE-ACTION_pro_accessAddNew');
 Route::get('/my_clients/view/{uid}/ACTION_notesAddNew', 'my_clients_SINGLE_Controller@ACTION_notesAddNew')->name('my_clients_SINGLE-ACTION_notesAddNew');
 Route::get('/my_clients/view/{uid}/ACTION_care_monthsAddNew', 'my_clients_SINGLE_Controller@ACTION_care_monthsAddNew')->name('my_clients_SINGLE-ACTION_care_monthsAddNew');
@@ -182,6 +183,12 @@ Route::get('/transactions', 'transactions_Controller@index')->name('transactions
 
 // --- pro: med_profile_lines --- //
 Route::get('/med_profile_lines', 'med_profile_lines_Controller@index')->name('med_profile_lines-index');
+Route::get('/med_profile_lines/view/{uid}', 'med_profile_lines_Controller@view')->name('med_profile_lines-view');
+
+// --- pro: med_profile_lines_SINGLE --- //
+Route::get('/med_profile_lines/view/{uid}/ACTION_remove', 'med_profile_lines_SINGLE_Controller@ACTION_remove')->name('med_profile_lines_SINGLE-ACTION_remove');
+Route::get('/med_profile_lines/view/{uid}/ACTION_updateContent', 'med_profile_lines_SINGLE_Controller@ACTION_updateContent')->name('med_profile_lines_SINGLE-ACTION_updateContent');
+Route::get('/med_profile_lines/view/{uid}/SUB_dashboard', 'med_profile_lines_SINGLE_Controller@SUB_dashboard')->name('med_profile_lines_SINGLE-SUB_dashboard');
 
 // --- pro: med_profile_line_updates --- //
 Route::get('/med_profile_line_updates', 'med_profile_line_updates_Controller@index')->name('med_profile_line_updates-index');