Ver código fonte

care-month fixes

Josh Kamau 5 anos atrás
pai
commit
f1777962f9

+ 9 - 3
app/Http/Controllers/care_months_SINGLE_Controller.php

@@ -82,10 +82,16 @@ 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_putReasons
-	public function ACTION_putReasons(Request $request, $uid) {
+	// GET /care_months/view/{uid}/ACTION_updateCmReasons
+	public function ACTION_updateCmReasons(Request $request, $uid) {
 		$record = DB::table('care_month')->where('uid', $uid)->first();
-		return response()->view('pro/care_months_SINGLE/ACTION_putReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+		return response()->view('pro/care_months_SINGLE/ACTION_updateCmReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
+	// GET /care_months/view/{uid}/ACTION_updateRmReasons
+	public function ACTION_updateRmReasons(Request $request, $uid) {
+		$record = DB::table('care_month')->where('uid', $uid)->first();
+		return response()->view('pro/care_months_SINGLE/ACTION_updateRmReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
 	// GET /care_months/view/{uid}/ACTION_setIsClientEnrolledInCmToTrue

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

@@ -334,6 +334,12 @@ class my_clients_SINGLE_Controller extends Controller
 		return response()->view('pro/my_clients_SINGLE/ACTION_updateCmReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
 	}
 
+	// GET /my_clients/view/{uid}/ACTION_updateRmReasons
+	public function ACTION_updateRmReasons(Request $request, $uid) {
+		$record = DB::table('client')->where('uid', $uid)->first();
+		return response()->view('pro/my_clients_SINGLE/ACTION_updateRmReasons', compact('record'), session('message') ? 500 : 200)->header('Content-Type', 'text/html');
+	}
+
 	// GET /my_clients/view/{uid}/ACTION_updateCmEnrollmentConsentInfo
 	public function ACTION_updateCmEnrollmentConsentInfo(Request $request, $uid) {
 		$record = DB::table('client')->where('uid', $uid)->first();

+ 14 - 8
generatecv/tree.txt

@@ -246,6 +246,9 @@ PRO
             updateCmReasons
                 cmReason1*=cm_reason1
                 cmReason2=cm_reason2
+            updateRmReasons
+                rmReason1*=rm_reason1
+                rmReason2=rm_reason2
             updateCmEnrollmentConsentInfo
                 cmEnrollmentConsentMethod=cm_enrollment_consent_method
                 cmEnrollmentConsentMethodMemo=cm_enrollment_consent_method_memo
@@ -598,11 +601,12 @@ PRO
             changeRmmPro
                 rmmProUid:record:pro:uid,name_display
             removeRmmPro:if:rmm_pro_id
-            putReasons
-                reason1
-                reason2
-                reason3
-                reason3Plus
+            updateCmReasons
+                cmReason1*
+                cmReason2
+            updateRmReasons
+                rmReason1*
+                rmReason2
             setIsClientEnrolledInCmToTrue
             setIsClientEnrolledInCmToFalse
             updateWhyNotEnrolledInCm
@@ -631,7 +635,7 @@ PRO
                 !qry:pros:SELECT id, name_display FROM pro
                 !grp:Info:client_id,start_date
                 !grp:Pros:mcp_pro_id,cm_pro_id,rme_pro_id,rmm_pro_id,has_mcp_done_em_visit
-                !grp:Reasons:cm_reason1,cm_reason2,rm_reason1,rm_reason2:Put reasons:circle=>/care_months/view/$uid/ACTION_putReasons
+                !grp:Reasons:cm_reason1,cm_reason2,rm_reason1,rm_reason2
                 !grp:CM Enrollment:is_client_enrolled_in_cm,why_not_enrolled_in_cm_category,why_not_enrolled_in_cm_memo:Update why not enrolled in CM:circle=>/care_months/view/$uid/ACTION_updateWhyNotEnrolledInCm
                 !grp:RM Enrollment:is_client_enrolled_in_rm,why_not_enrolled_in_rm_category,why_not_enrolled_in_rm_memo:Update why not enrolled in RM:circle=>/care_months/view/$uid/ACTION_updateWhyNotEnrolledInRm
                 !grp:CM Total Time:cm_total_time_in_seconds,cm_total_time_in_seconds_by_mcp,cm_total_time_in_seconds_by_cm_pro
@@ -658,9 +662,9 @@ PRO
                 !act:rme_pro_id:changeRmePro:circle:if:rmm_pro_id=>/care_months/view/$uid/ACTION_changeRmePro
                 !act:rme_pro_id:removeRmePro:circle:if:rmm_pro_id=>/care_months/view/$uid/ACTION_removeRmePro
                 !act:is_client_enrolled_in_cm:setIsClientEnrolledInCmToFalse:circle=>/care_months/view/$uid/ACTION_setIsClientEnrolledInCmToFalse
-                !act:is_client_enrolled_in_cm:setIsClientEnrolledInCmToFalse:circle=>/care_months/view/$uid/ACTION_setIsClientEnrolledInCmToTrue
+                !act:is_client_enrolled_in_cm:setIsClientEnrolledInCmToTrue:circle=>/care_months/view/$uid/ACTION_setIsClientEnrolledInCmToTrue
                 !act:is_client_enrolled_in_rm:setIsClientEnrolledInRmToFalse:circle=>/care_months/view/$uid/ACTION_setIsClientEnrolledInRmToFalse
-                !act:is_client_enrolled_in_rm:setIsClientEnrolledInRmToFalse:circle=>/care_months/view/$uid/ACTION_setIsClientEnrolledInRmToTrue
+                !act:is_client_enrolled_in_rm:setIsClientEnrolledInRmToTrue:circle=>/care_months/view/$uid/ACTION_setIsClientEnrolledInRmToTrue
                 !act:cm_bill_id:generateBillForCm:circle=>/care_months/view/$uid/ACTION_generateBillForCm
                 !act:rm_bill_id:generateBillForRm:circle=>/care_months/view/$uid/ACTION_generateBillForRm
                 !act:is_cm_canceled_this_month:setCmCancelledThisMonthToTrue:circle=>/care_months/view/$uid/ACTION_setIsCmCanceledThisMonthToTrue
@@ -669,6 +673,8 @@ PRO
                 !act:is_rm_canceled_this_month:setRmCancelledThisMonthToFalse:circle=>/care_months/view/$uid/ACTION_setIsRmCanceledThisMonthToFalse
                 !act:is_tm_this_month:setIsTmThisMonthToTrue:circle=>/care_months/view/$uid/ACTION_setIsTmThisMonthToTrue
                 !act:is_tm_this_month:setIsTmThisMonthToFalse:circle=>/care_months/view/$uid/ACTION_setIsTmThisMonthToFalse
+                !act:cm_reason1:updateCmReasons:circle=>/care_months/view/$uid/ACTION_updateCmReasons
+                !act:rm_reason1:updateRmReasons:circle=>/care_months/view/$uid/ACTION_updateRmReasons
                 !nal:
 # :: need remove
             cm_time_entries

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

@@ -10,7 +10,8 @@
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_assignRmmPro' class='d-block btn btn-sm btn-default mb-3'>Assign Rmm Pro</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_changeRmmPro' class='d-block btn btn-sm btn-default mb-3'>Change Rmm Pro</a>
 @if($record->rmm_pro_id) <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_removeRmmPro' class='d-block btn btn-sm btn-default mb-3'>Remove Rmm Pro</a> @endif
-<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_putReasons' class='d-block btn btn-sm btn-default mb-3'>Put Reasons</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateCmReasons' class='d-block btn btn-sm btn-default mb-3'>Update Cm Reasons</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateRmReasons' class='d-block btn btn-sm btn-default mb-3'>Update Rm Reasons</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInCmToTrue' class='d-block btn btn-sm btn-default mb-3'>Set Is Client Enrolled In Cm To True</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_setIsClientEnrolledInCmToFalse' class='d-block btn btn-sm btn-default mb-3'>Set Is Client Enrolled In Cm To False</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateWhyNotEnrolledInCm' class='d-block btn btn-sm btn-default mb-3'>Update Why Not Enrolled In Cm</a>

+ 45 - 0
resources/views/pro/care_months_SINGLE/ACTION_updateCmReasons.blade.php

@@ -0,0 +1,45 @@
+@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>Update Cm Reasons</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/updateCmReasons">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_updateCmReasons', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Cm Reason 1 *</label>
+<input class='form-control' type='text' name='cmReason1' value='{{ old('cmReason1') ? old('cmReason1') : '' }}' required>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Cm Reason 2 </label>
+<input class='form-control' type='text' name='cmReason2' value='{{ old('cmReason2') ? old('cmReason2') : '' }}' >
+</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

+ 45 - 0
resources/views/pro/care_months_SINGLE/ACTION_updateRmReasons.blade.php

@@ -0,0 +1,45 @@
+@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>Update Rm Reasons</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/updateRmReasons">
+        <input type="hidden" name="_success" value="{{route('care_months-view', ['uid' => $record->uid])}}">
+        <input type="hidden" name="_return" value="{{route('care_months_SINGLE-ACTION_updateRmReasons', ['uid' => $record->uid])}}">
+        <div class='form-group mb-3'>
+<label class='control-label'>Rm Reason 1 *</label>
+<input class='form-control' type='text' name='rmReason1' value='{{ old('rmReason1') ? old('rmReason1') : '' }}' required>
+</div>
+<div class='form-group mb-3'>
+<label class='control-label'>Rm Reason 2 </label>
+<input class='form-control' type='text' name='rmReason2' value='{{ old('rmReason2') ? old('rmReason2') : '' }}' >
+</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

+ 3 - 3
resources/views/pro/care_months_SINGLE/SUB_dashboard.blade.php

@@ -52,14 +52,14 @@
         <thead>
         <tr>
             <th colspan="2" class="px-2">Reasons
-                <span class="ml-auto"><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_putReasons' title='Put reasons'class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put Reasons</span></a></span>
+                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
             </th>
         </tr>
         </thead>
         <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">Cm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason1 ?></td></tr>
+            <tr><td class="w-25 px-2 text-secondary border-right">Cm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason1 ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateCmReasons' title='updateCmReasons' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Cm Reasons</span></a></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Cm Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->cm_reason2 ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Rm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_reason1 ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Rm Reason1</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_reason1 ?><a up-modal=".form-contents" up-width="800" up-history="false" href='/care_months/view/<?= $record->uid ?>/ACTION_updateRmReasons' title='updateRmReasons' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Rm Reasons</span></a></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Rm Reason2</td><td class="w-75 px-2 font-weight-bold"><?= $record->rm_reason2 ?></td></tr>
         </tbody>
     </table>

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

@@ -52,6 +52,7 @@
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInCmToFalse' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled In Cm To False</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_setIsEnrolledInCmToTrue' class='d-block btn btn-sm btn-default mb-3'>Set Is Enrolled In Cm To True</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateCmReasons' class='d-block btn btn-sm btn-default mb-3'>Update Cm Reasons</a>
+<a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateRmReasons' class='d-block btn btn-sm btn-default mb-3'>Update Rm Reasons</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateCmEnrollmentConsentInfo' class='d-block btn btn-sm btn-default mb-3'>Update Cm Enrollment Consent Info</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateWhyNotEnrolledInCm' class='d-block btn btn-sm btn-default mb-3'>Update Why Not Enrolled In Cm</a>
 <a up-modal=".form-contents" up-width="800" up-history="false" href='/my_clients/view/<?= $record->uid ?>/ACTION_updateRmEligibility' class='d-block btn btn-sm btn-default mb-3'>Update Rm Eligibility</a>

+ 3 - 1
routes/generated.php

@@ -70,6 +70,7 @@ Route::prefix('/my_clients/view/{uid}')->group(function () {
 	Route::get('ACTION_setIsEnrolledInCmToFalse', 'my_clients_SINGLE_Controller@ACTION_setIsEnrolledInCmToFalse')->name('my_clients_SINGLE-ACTION_setIsEnrolledInCmToFalse');
 	Route::get('ACTION_setIsEnrolledInCmToTrue', 'my_clients_SINGLE_Controller@ACTION_setIsEnrolledInCmToTrue')->name('my_clients_SINGLE-ACTION_setIsEnrolledInCmToTrue');
 	Route::get('ACTION_updateCmReasons', 'my_clients_SINGLE_Controller@ACTION_updateCmReasons')->name('my_clients_SINGLE-ACTION_updateCmReasons');
+	Route::get('ACTION_updateRmReasons', 'my_clients_SINGLE_Controller@ACTION_updateRmReasons')->name('my_clients_SINGLE-ACTION_updateRmReasons');
 	Route::get('ACTION_updateCmEnrollmentConsentInfo', 'my_clients_SINGLE_Controller@ACTION_updateCmEnrollmentConsentInfo')->name('my_clients_SINGLE-ACTION_updateCmEnrollmentConsentInfo');
 	Route::get('ACTION_updateWhyNotEnrolledInCm', 'my_clients_SINGLE_Controller@ACTION_updateWhyNotEnrolledInCm')->name('my_clients_SINGLE-ACTION_updateWhyNotEnrolledInCm');
 	Route::get('ACTION_updateRmEligibility', 'my_clients_SINGLE_Controller@ACTION_updateRmEligibility')->name('my_clients_SINGLE-ACTION_updateRmEligibility');
@@ -183,7 +184,8 @@ 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_putReasons', 'care_months_SINGLE_Controller@ACTION_putReasons')->name('care_months_SINGLE-ACTION_putReasons');
+	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');
 	Route::get('ACTION_setIsClientEnrolledInCmToFalse', 'care_months_SINGLE_Controller@ACTION_setIsClientEnrolledInCmToFalse')->name('care_months_SINGLE-ACTION_setIsClientEnrolledInCmToFalse');
 	Route::get('ACTION_updateWhyNotEnrolledInCm', 'care_months_SINGLE_Controller@ACTION_updateWhyNotEnrolledInCm')->name('care_months_SINGLE-ACTION_updateWhyNotEnrolledInCm');