added rms/rmg edits

app/Http/Controllers/care_months_SINGLE_Controller.php

@@ -131,6 +131,66 @@ class care_months_SINGLE_Controller extends Controller
 		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_assignRmsPro
+	public function ACTION_assignRmsPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_assignRmsPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_assignRmsPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_changeRmsPro
+	public function ACTION_changeRmsPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_changeRmsPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_changeRmsPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_removeRmsPro
+	public function ACTION_removeRmsPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_removeRmsPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_removeRmsPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_assignRmgPro
+	public function ACTION_assignRmgPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_assignRmgPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_assignRmgPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_changeRmgPro
+	public function ACTION_changeRmgPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_changeRmgPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_changeRmgPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_removeRmgPro
+	public function ACTION_removeRmgPro(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('care_month')->where('id', $uid)->first();
+			if($record) return redirect('/care_months/view/' . $record->uid . '/ACTION_removeRmgPro');
+		}
+		return response()->view('pro/care_months_SINGLE/ACTION_removeRmgPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /care_months/view/{uid}/ACTION_updateCmReasons
 	public function ACTION_updateCmReasons(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();

app/Http/Controllers/clients_SINGLE_Controller.php

@@ -511,6 +511,46 @@ class clients_SINGLE_Controller extends Controller
 		return response()->view('pro/clients_SINGLE/ACTION_removeRmmPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /clients/view/{uid}/ACTION_putRmsPro
+	public function ACTION_putRmsPro(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client')->where('id', $uid)->first();
+			if($record) return redirect('/clients/view/' . $record->uid . '/ACTION_putRmsPro');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_putRmsPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_removeRmsPro
+	public function ACTION_removeRmsPro(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client')->where('id', $uid)->first();
+			if($record) return redirect('/clients/view/' . $record->uid . '/ACTION_removeRmsPro');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_removeRmsPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_putRmgPro
+	public function ACTION_putRmgPro(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client')->where('id', $uid)->first();
+			if($record) return redirect('/clients/view/' . $record->uid . '/ACTION_putRmgPro');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_putRmgPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /clients/view/{uid}/ACTION_removeRmgPro
+	public function ACTION_removeRmgPro(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		if(!$record) {
+			$record = DB::table('client')->where('id', $uid)->first();
+			if($record) return redirect('/clients/view/' . $record->uid . '/ACTION_removeRmgPro');
+		}
+		return response()->view('pro/clients_SINGLE/ACTION_removeRmgPro', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /clients/view/{uid}/ACTION_putRdPro
 	public function ACTION_putRdPro(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();

generatecv/tree.txt

@@ -232,6 +232,12 @@ PRO
             putRmmPro
                 rmmProUid*:record:pro:uid,name_display
             removeRmmPro
+            putRmsPro
+                rmsProUid*:record:pro:uid,name_display
+            removeRmsPro
+            putRmgPro
+                rmgProUid*:record:pro:uid,name_display
+            removeRmgPro
             putRdPro
                 rdProUid*:record:pro:uid,name_display
             removeRdPro
@@ -310,7 +316,7 @@ PRO
                 !grp:Physician:physician_pro_id:Put Physician:circle=>/clients/view/$uid/ACTION_putPhysicianPro
                 !grp:MCP Visit:has_mcp_done_onboarding_visit,mcp_onboarding_visit_date,mcp_onboarding_visit_note_id,reason_onboarding_visit_note_outside_system,is_mcp_onboarding_active,why_is_mcp_onboarding_not_active_category,why_is_mcp_onboarding_not_active_memo:Update source:circle=>/clients/view/$uid/ACTION_updateMcpOnboardingVisitInfo
                 !grp:Onboarding Strategy:mcp_onboarding_strategy,next_mcp_onboarding_attempt_date,next_mcp_onboarding_attempt_time,number_of_mcp_onboarding_phone_calls,number_of_mcp_onboarding_in_person_visits
-                !grp:Other Key Pros:cm_pro_id,rme_pro_id,rmm_pro_id,rd_pro_id
+                !grp:Other Key Pros:cm_pro_id,rme_pro_id,rmm_pro_id,rms_pro_id,rmg_pro_id,rd_pro_id
                 !grp:MNT Eligibility:eligible_for_mnt,number_of_mnt_hours_left_this_year:Update MNT Eligibility:circle=>/clients/view/$uid/ACTION_updateMntEligibility
                 !grp:CM Enrollment:is_eligible_for_cm,why_not_eligible_for_cm_category,why_not_eligible_for_cm_memo,is_enrolled_in_cm,cm_reason1,cm_reason2,cm_enrollment_consent_method,cm_enrollment_consent_method_memo,why_not_enrolled_in_cm_category,why_not_enrolled_in_cm_memo:Update CM Eligibility:circle=>/clients/view/$uid/ACTION_updateCmEligibility
                 !grp:RM Enrollment:is_eligible_for_rm,why_not_eligible_for_rm_category,why_not_eligible_for_rm_memo,is_enrolled_in_rm,rm_reason1,rm_reason2,why_not_enrolled_in_rm_category,why_not_enrolled_in_rm_memo:Update why not enrolled in RM:circle=>/clients/view/$uid/ACTION_updateRmEligibility
@@ -337,6 +343,10 @@ PRO
                 !act:rme_pro_id:removeRmePro:circle=>/clients/view/$uid/ACTION_removeRmePro
                 !act:rmm_pro_id:putRmmPro:circle=>/clients/view/$uid/ACTION_putRmmPro
                 !act:rmm_pro_id:removeRmmPro:circle=>/clients/view/$uid/ACTION_removeRmmPro
+                !act:rms_pro_id:putRmsPro:circle=>/clients/view/$uid/ACTION_putRmsPro
+                !act:rms_pro_id:removeRmsPro:circle=>/clients/view/$uid/ACTION_removeRmsPro
+                !act:rmg_pro_id:putRmgPro:circle=>/clients/view/$uid/ACTION_putRmgPro
+                !act:rmg_pro_id:removeRmgPro:circle=>/clients/view/$uid/ACTION_removeRmgPro
                 !act:rd_pro_id:putRdPro:circle=>/clients/view/$uid/ACTION_putRdPro
                 !act:rd_pro_id:removeRdPro:circle=>/clients/view/$uid/ACTION_removeRdPro
                 !act:eligible_for_mnt:updateMntEligibility:circle=>/clients/view/$uid/ACTION_updateMntEligibility
@@ -374,6 +384,8 @@ PRO
                 !col:cm_pro_id:CM Pro:~pros:name_display:id,=,$cm_pro_id:all
                 !col:rme_pro_id:RME Pro:~pros:name_display:id,=,$rme_pro_id:all
                 !col:rmm_pro_id:RMM Pro:~pros:name_display:id,=,$rmm_pro_id:all
+                !col:rms_pro_id:RMS Pro:~pros:name_display:id,=,$rms_pro_id:all
+                !col:rmg_pro_id:RMG Pro:~pros:name_display:id,=,$rmg_pro_id:all
                 !col:rd_pro_id:RD Pro:~pros:name_display:id,=,$rd_pro_id:all
                 !nal:
             measurements
@@ -661,6 +673,16 @@ PRO
             changeRmmPro
                 rmmProUid:record:pro:uid,name_display
             removeRmmPro:if:rmm_pro_id
+            assignRmsPro
+                rmsProUid:record:pro:uid,name_display
+            changeRmsPro
+                rmsProUid:record:pro:uid,name_display
+            removeRmsPro:if:rms_pro_id
+            assignRmgPro
+                rmgProUid:record:pro:uid,name_display
+            changeRmgPro
+                rmgProUid:record:pro:uid,name_display
+            removeRmgPro:if:rms_pro_id
             updateCmReasons
                 cmReason1*
                 cmReason2

resources/views/layouts/pro-logged-in.blade.php

@@ -86,7 +86,7 @@
                 </li>
                 <li class="nav-item">
                     <a class="nav-link small d-flex align-items-center" href="{{config('stag.authUrl')}}/pro_log_in_with_session_key/{{$performer->session_key}}" title="">
-                        My Apps
+                        Exit
                     </a>
                 </li>
             </ul>

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

@@ -36,6 +36,8 @@
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro</th>
+<th>Achieved Rms Pro Time In Seconds</th>
+<th>Achieved Rmg Pro Time In Seconds</th>
             </tr>
             </thead>
             <tbody>
@@ -65,6 +67,8 @@
 <td><?= $record->care_month_id ?></td>
 <td><?= $record->client_id ?></td>
 <td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->pro_id], ], 'all'); ?></td>
+<td><?= $record->achieved_rms_pro_time_in_seconds ?></td>
+<td><?= $record->achieved_rmg_pro_time_in_seconds ?></td>
                 </tr>
             @endforeach
             </tbody>

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

@@ -10,6 +10,12 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmmPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Assign Rmm Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmmPro?optimised=1' 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-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmmPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rmm Pro</a> @endif
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmsPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Assign Rms Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmsPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Change Rms Pro</a>
+@if($record->rms_pro_id) <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmsPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rms Pro</a> @endif
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmgPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Assign Rmg Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmgPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Change Rmg Pro</a>
+@if($record->rms_pro_id) <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmgPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rmg Pro</a> @endif
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateCmReasons?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Cm Reasons</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateRmReasons?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Rm Reasons</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInCmToTrue?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Set Is Client Enrolled In Cm To True</a>

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

@@ -47,6 +47,10 @@
 <th>Rm Bill Id</th>
 <th>Rme Pro Id</th>
 <th>Rmm Pro Id</th>
+<th>Rms Pro Id</th>
+<th>Rmg Pro Id</th>
+<th>Rm Total Time In Seconds By Rms Pro</th>
+<th>Rm Total Time In Seconds By Rmg Pro</th>
             </tr>
             </thead>
             <tbody>
@@ -87,6 +91,10 @@
 <td><?= $record->rm_bill_id ?></td>
 <td><?= $record->rme_pro_id ?></td>
 <td><?= $record->rmm_pro_id ?></td>
+<td><?= $record->rms_pro_id ?></td>
+<td><?= $record->rmg_pro_id ?></td>
+<td><?= $record->rm_total_time_in_seconds_by_rms_pro ?></td>
+<td><?= $record->rm_total_time_in_seconds_by_rmg_pro ?></td>
                 </tr>
             @endforeach
             </tbody>

resources/views/pro/care_months_SINGLE/ACTION_assignRmgPro.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 stag-heading stag-heading-modal">
+        <div>Assign Rmg 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="false"
+          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/assignRmgPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_assignRmgPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rmg Pro </label>
+<select class='form-control' name='rmgProUid' value='{{ old('rmgProUid') ? old('rmgProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmgProUid') ? old('rmgProUid') : '') ? '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

resources/views/pro/care_months_SINGLE/ACTION_assignRmsPro.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 stag-heading stag-heading-modal">
+        <div>Assign Rms 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="false"
+          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/assignRmsPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_assignRmsPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rms Pro </label>
+<select class='form-control' name='rmsProUid' value='{{ old('rmsProUid') ? old('rmsProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmsProUid') ? old('rmsProUid') : '') ? '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

resources/views/pro/care_months_SINGLE/ACTION_changeRmgPro.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 stag-heading stag-heading-modal">
+        <div>Change Rmg 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="false"
+          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/changeRmgPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_changeRmgPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rmg Pro </label>
+<select class='form-control' name='rmgProUid' value='{{ old('rmgProUid') ? old('rmgProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmgProUid') ? old('rmgProUid') : '') ? '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

resources/views/pro/care_months_SINGLE/ACTION_changeRmsPro.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 stag-heading stag-heading-modal">
+        <div>Change Rms 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="false"
+          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/changeRmsPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_changeRmsPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rms Pro </label>
+<select class='form-control' name='rmsProUid' value='{{ old('rmsProUid') ? old('rmsProUid') : '' }}' >
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmsProUid') ? old('rmsProUid') : '') ? '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

resources/views/pro/care_months_SINGLE/ACTION_removeRmgPro.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 stag-heading stag-heading-modal">
+        <div>Remove Rmg 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="false"
+          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/removeRmgPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_removeRmgPro', ['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

resources/views/pro/care_months_SINGLE/ACTION_removeRmsPro.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 stag-heading stag-heading-modal">
+        <div>Remove Rms 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="false"
+          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/removeRmsPro">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_removeRmsPro', ['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

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

@@ -79,6 +79,22 @@
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
 <th>Claim Id</th>
+<th>Rms Pro Id</th>
+<th>Rmg Pro Id</th>
+<th>Is Signed By Rms</th>
+<th>Signed By Rms At</th>
+<th>Signed By Rms Session Id</th>
+<th>Is Signed By Rmg</th>
+<th>Signed By Rmg At</th>
+<th>Signed By Rmg Session Id</th>
+<th>Rms Expected Payment Amount</th>
+<th>Has Rms Been Paid</th>
+<th>Rms Payment Amount</th>
+<th>Rmg Expected Payment Amount</th>
+<th>Has Rmg Been Paid</th>
+<th>Rmg Payment Amount</th>
+<th>Rms Payment Pro Transaction Id</th>
+<th>Rmg Payment Pro Transaction Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -149,6 +165,22 @@
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
 <td><?= $subRecord->claim_id ?></td>
+<td><?= $subRecord->rms_pro_id ?></td>
+<td><?= $subRecord->rmg_pro_id ?></td>
+<td><?= $subRecord->is_signed_by_rms ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rms_at) ?></td>
+<td><?= $subRecord->signed_by_rms_session_id ?></td>
+<td><?= $subRecord->is_signed_by_rmg ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rmg_at) ?></td>
+<td><?= $subRecord->signed_by_rmg_session_id ?></td>
+<td><?= $subRecord->rms_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rms_been_paid ?></td>
+<td><?= $subRecord->rms_payment_amount ?></td>
+<td><?= $subRecord->rmg_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rmg_been_paid ?></td>
+<td><?= $subRecord->rmg_payment_amount ?></td>
+<td><?= $subRecord->rms_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rmg_payment_pro_transaction_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -38,6 +38,8 @@
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro Id</th>
+<th>Achieved Rms Pro Time In Seconds</th>
+<th>Achieved Rmg Pro Time In Seconds</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -67,6 +69,8 @@
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= $subRecord->pro_id ?></td>
+<td><?= $subRecord->achieved_rms_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rmg_pro_time_in_seconds ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -48,6 +48,10 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmePro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rme Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmmPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Rmm Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmmPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rmm Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmsPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Rms Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmsPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rms Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmgPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Rmg Pro</a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmgPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rmg Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRdPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Put Rd Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRdPro?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Remove Rd Pro</a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateMntEligibility?optimised=1' class='d-block btn btn-sm btn-default mb-3'>Update Mnt Eligibility</a>

resources/views/pro/clients_SINGLE/ACTION_putRmgPro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.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>Put Rmg 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="false"
+          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/putRmgPro">
+        <input type="hidden" name="_success" value="{{route('clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_putRmgPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rmg Pro *</label>
+<select class='form-control' name='rmgProUid' value='{{ old('rmgProUid') ? old('rmgProUid') : '' }}' required>
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmgProUid') ? old('rmgProUid') : '') ? '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('clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/pro/clients_SINGLE/ACTION_putRmsPro.blade.php

@@ -0,0 +1,47 @@
+@extends('pro.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>Put Rms 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="false"
+          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/putRmsPro">
+        <input type="hidden" name="_success" value="{{route('clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_putRmsPro', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rms Pro *</label>
+<select class='form-control' name='rmsProUid' value='{{ old('rmsProUid') ? old('rmsProUid') : '' }}' required>
+<option value=''>-- Select --</option>
+<?php $dbOptions = \Illuminate\Support\Facades\DB::table('pro')->get(); ?>
+<?php foreach($dbOptions as $o): ?>
+<option <?= $o->uid === (old('rmsProUid') ? old('rmsProUid') : '') ? '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('clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/pro/clients_SINGLE/ACTION_removeRmgPro.blade.php

@@ -0,0 +1,38 @@
+@extends('pro.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>Remove Rmg 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="false"
+          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/removeRmgPro">
+        <input type="hidden" name="_success" value="{{route('clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_removeRmgPro', ['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('clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

resources/views/pro/clients_SINGLE/ACTION_removeRmsPro.blade.php

@@ -0,0 +1,38 @@
+@extends('pro.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>Remove Rms 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="false"
+          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/removeRmsPro">
+        <input type="hidden" name="_success" value="{{route('clients-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_removeRmsPro', ['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('clients-view', ['uid' => $record->uid])}}" class="btn btn-sm btn-default px-5" up-close>Cancel</a>
+        </div>
+    </form>
+
+    </div></div>
+
+@endsection

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

@@ -79,6 +79,22 @@
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
 <th>Claim Id</th>
+<th>Rms Pro Id</th>
+<th>Rmg Pro Id</th>
+<th>Is Signed By Rms</th>
+<th>Signed By Rms At</th>
+<th>Signed By Rms Session Id</th>
+<th>Is Signed By Rmg</th>
+<th>Signed By Rmg At</th>
+<th>Signed By Rmg Session Id</th>
+<th>Rms Expected Payment Amount</th>
+<th>Has Rms Been Paid</th>
+<th>Rms Payment Amount</th>
+<th>Rmg Expected Payment Amount</th>
+<th>Has Rmg Been Paid</th>
+<th>Rmg Payment Amount</th>
+<th>Rms Payment Pro Transaction Id</th>
+<th>Rmg Payment Pro Transaction Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -149,6 +165,22 @@
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
 <td><?= $subRecord->claim_id ?></td>
+<td><?= $subRecord->rms_pro_id ?></td>
+<td><?= $subRecord->rmg_pro_id ?></td>
+<td><?= $subRecord->is_signed_by_rms ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rms_at) ?></td>
+<td><?= $subRecord->signed_by_rms_session_id ?></td>
+<td><?= $subRecord->is_signed_by_rmg ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rmg_at) ?></td>
+<td><?= $subRecord->signed_by_rmg_session_id ?></td>
+<td><?= $subRecord->rms_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rms_been_paid ?></td>
+<td><?= $subRecord->rms_payment_amount ?></td>
+<td><?= $subRecord->rmg_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rmg_been_paid ?></td>
+<td><?= $subRecord->rmg_payment_amount ?></td>
+<td><?= $subRecord->rms_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rmg_payment_pro_transaction_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -38,6 +38,8 @@
 <th>Care Month Id</th>
 <th>Client Id</th>
 <th>Pro</th>
+<th>Achieved Rms Pro Time In Seconds</th>
+<th>Achieved Rmg Pro Time In Seconds</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -67,6 +69,8 @@
 <td><?= $subRecord->care_month_id ?></td>
 <td><?= $subRecord->client_id ?></td>
 <td><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->pro_id], ], 'all'); ?></td>
+<td><?= $subRecord->achieved_rms_pro_time_in_seconds ?></td>
+<td><?= $subRecord->achieved_rmg_pro_time_in_seconds ?></td>
                     </tr>
                 @endforeach
                 </tbody>

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

@@ -49,6 +49,10 @@
 <th>Rm Bill Id</th>
 <th>Rme Pro Id</th>
 <th>Rmm Pro Id</th>
+<th>Rms Pro Id</th>
+<th>Rmg Pro Id</th>
+<th>Rm Total Time In Seconds By Rms Pro</th>
+<th>Rm Total Time In Seconds By Rmg Pro</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -89,6 +93,10 @@
 <td><?= $subRecord->rm_bill_id ?></td>
 <td><?= $subRecord->rme_pro_id ?></td>
 <td><?= $subRecord->rmm_pro_id ?></td>
+<td><?= $subRecord->rms_pro_id ?></td>
+<td><?= $subRecord->rmg_pro_id ?></td>
+<td><?= $subRecord->rm_total_time_in_seconds_by_rms_pro ?></td>
+<td><?= $subRecord->rm_total_time_in_seconds_by_rmg_pro ?></td>
                     </tr>
                 @endforeach
                 </tbody>

resources/views/pro/clients_SINGLE/SUB_detail.blade.php

@@ -530,6 +530,10 @@
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmePro?optimised=1' title='removeRmePro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Rme Pro</span></a></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">RMM Pro</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rmm_pro_id], ], 'all'); ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmmPro?optimised=1' title='putRmmPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put Rmm Pro</span></a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmmPro?optimised=1' title='removeRmmPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Rmm Pro</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">RMS Pro</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rms_pro_id], ], 'all'); ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmsPro?optimised=1' title='putRmsPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put Rms Pro</span></a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmsPro?optimised=1' title='removeRmsPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Rms Pro</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">RMG Pro</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rmg_pro_id], ], 'all'); ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRmgPro?optimised=1' title='putRmgPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put Rmg Pro</span></a>
+<a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRmgPro?optimised=1' title='removeRmgPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Rmg Pro</span></a></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">RD Pro</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->rd_pro_id], ], 'all'); ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_putRdPro?optimised=1' title='putRdPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put Rd Pro</span></a>
 <a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_removeRdPro?optimised=1' title='removeRdPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Rd Pro</span></a></td></tr>
         </tbody>

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

@@ -79,6 +79,22 @@
 <th>Signed By Rme Session Id</th>
 <th>Signed By Rmm Session Id</th>
 <th>Claim Id</th>
+<th>Rms Pro Id</th>
+<th>Rmg Pro Id</th>
+<th>Is Signed By Rms</th>
+<th>Signed By Rms At</th>
+<th>Signed By Rms Session Id</th>
+<th>Is Signed By Rmg</th>
+<th>Signed By Rmg At</th>
+<th>Signed By Rmg Session Id</th>
+<th>Rms Expected Payment Amount</th>
+<th>Has Rms Been Paid</th>
+<th>Rms Payment Amount</th>
+<th>Rmg Expected Payment Amount</th>
+<th>Has Rmg Been Paid</th>
+<th>Rmg Payment Amount</th>
+<th>Rms Payment Pro Transaction Id</th>
+<th>Rmg Payment Pro Transaction Id</th>
                 </tr>
                 </thead>
                 <tbody>
@@ -149,6 +165,22 @@
 <td><?= $subRecord->signed_by_rme_session_id ?></td>
 <td><?= $subRecord->signed_by_rmm_session_id ?></td>
 <td><?= $subRecord->claim_id ?></td>
+<td><?= $subRecord->rms_pro_id ?></td>
+<td><?= $subRecord->rmg_pro_id ?></td>
+<td><?= $subRecord->is_signed_by_rms ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rms_at) ?></td>
+<td><?= $subRecord->signed_by_rms_session_id ?></td>
+<td><?= $subRecord->is_signed_by_rmg ?></td>
+<td><?= friendly_date_time($subRecord->signed_by_rmg_at) ?></td>
+<td><?= $subRecord->signed_by_rmg_session_id ?></td>
+<td><?= $subRecord->rms_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rms_been_paid ?></td>
+<td><?= $subRecord->rms_payment_amount ?></td>
+<td><?= $subRecord->rmg_expected_payment_amount ?></td>
+<td><?= $subRecord->has_rmg_been_paid ?></td>
+<td><?= $subRecord->rmg_payment_amount ?></td>
+<td><?= $subRecord->rms_payment_pro_transaction_id ?></td>
+<td><?= $subRecord->rmg_payment_pro_transaction_id ?></td>
                     </tr>
                 @endforeach
                 </tbody>

routes/generated.php

@@ -66,6 +66,10 @@ Route::prefix('/clients/view/{uid}')->group(function () {
 	Route::get('ACTION_removeRmePro', 'clients_SINGLE_Controller@ACTION_removeRmePro')->name('clients_SINGLE-ACTION_removeRmePro');
 	Route::get('ACTION_putRmmPro', 'clients_SINGLE_Controller@ACTION_putRmmPro')->name('clients_SINGLE-ACTION_putRmmPro');
 	Route::get('ACTION_removeRmmPro', 'clients_SINGLE_Controller@ACTION_removeRmmPro')->name('clients_SINGLE-ACTION_removeRmmPro');
+	Route::get('ACTION_putRmsPro', 'clients_SINGLE_Controller@ACTION_putRmsPro')->name('clients_SINGLE-ACTION_putRmsPro');
+	Route::get('ACTION_removeRmsPro', 'clients_SINGLE_Controller@ACTION_removeRmsPro')->name('clients_SINGLE-ACTION_removeRmsPro');
+	Route::get('ACTION_putRmgPro', 'clients_SINGLE_Controller@ACTION_putRmgPro')->name('clients_SINGLE-ACTION_putRmgPro');
+	Route::get('ACTION_removeRmgPro', 'clients_SINGLE_Controller@ACTION_removeRmgPro')->name('clients_SINGLE-ACTION_removeRmgPro');
 	Route::get('ACTION_putRdPro', 'clients_SINGLE_Controller@ACTION_putRdPro')->name('clients_SINGLE-ACTION_putRdPro');
 	Route::get('ACTION_removeRdPro', 'clients_SINGLE_Controller@ACTION_removeRdPro')->name('clients_SINGLE-ACTION_removeRdPro');
 	Route::get('ACTION_updateMntEligibility', 'clients_SINGLE_Controller@ACTION_updateMntEligibility')->name('clients_SINGLE-ACTION_updateMntEligibility');
@@ -220,6 +224,12 @@ Route::prefix('/care_months/view/{uid}')->group(function () {
 	Route::get('ACTION_assignRmmPro', 'care_months_SINGLE_Controller@ACTION_assignRmmPro')->name('care_months_SINGLE-ACTION_assignRmmPro');
 	Route::get('ACTION_changeRmmPro', 'care_months_SINGLE_Controller@ACTION_changeRmmPro')->name('care_months_SINGLE-ACTION_changeRmmPro');
 	Route::get('ACTION_removeRmmPro', 'care_months_SINGLE_Controller@ACTION_removeRmmPro')->name('care_months_SINGLE-ACTION_removeRmmPro');
+	Route::get('ACTION_assignRmsPro', 'care_months_SINGLE_Controller@ACTION_assignRmsPro')->name('care_months_SINGLE-ACTION_assignRmsPro');
+	Route::get('ACTION_changeRmsPro', 'care_months_SINGLE_Controller@ACTION_changeRmsPro')->name('care_months_SINGLE-ACTION_changeRmsPro');
+	Route::get('ACTION_removeRmsPro', 'care_months_SINGLE_Controller@ACTION_removeRmsPro')->name('care_months_SINGLE-ACTION_removeRmsPro');
+	Route::get('ACTION_assignRmgPro', 'care_months_SINGLE_Controller@ACTION_assignRmgPro')->name('care_months_SINGLE-ACTION_assignRmgPro');
+	Route::get('ACTION_changeRmgPro', 'care_months_SINGLE_Controller@ACTION_changeRmgPro')->name('care_months_SINGLE-ACTION_changeRmgPro');
+	Route::get('ACTION_removeRmgPro', 'care_months_SINGLE_Controller@ACTION_removeRmgPro')->name('care_months_SINGLE-ACTION_removeRmgPro');
 	Route::get('ACTION_updateCmReasons', 'care_months_SINGLE_Controller@ACTION_updateCmReasons')->name('care_months_SINGLE-ACTION_updateCmReasons');
 	Route::get('ACTION_updateRmReasons', 'care_months_SINGLE_Controller@ACTION_updateRmReasons')->name('care_months_SINGLE-ACTION_updateRmReasons');
 	Route::get('ACTION_setIsClientEnrolledInCmToTrue', 'care_months_SINGLE_Controller@ACTION_setIsClientEnrolledInCmToTrue')->name('care_months_SINGLE-ACTION_setIsClientEnrolledInCmToTrue');