Merge branch 'dev' of rav.triplestart.com:Josh/stagfe into master

generatecv/tree.txt

@@ -221,8 +221,8 @@ PRO
             updateMcpOnboardingStrategy
                 mcpOnboardingStrategy:select:PHONE,IN_PERSON=mcp_onboarding_strategy
             updateNextMcpOnboardingAttempt
-                nextMcpOnboardingAttemptDateEst*:date=next_mcp_onboarding_attempt_date_est
-                nextMcpOnboardingAttemptTimeEst*:time=next_mcp_onboarding_attempt_time_est
+                nextMcpOnboardingAttemptDateEst*:date=next_mcp_onboarding_attempt_date
+                nextMcpOnboardingAttemptTimeEst*:time=next_mcp_onboarding_attempt_time
             putCmPro
                 cmProUid*:record:pro:uid,name_display
             removeCmPro
@@ -304,13 +304,12 @@ PRO
                 !grp:Deceased:is_deceased,date_and_time_of_death,cause_of_death
                 !grp:Pharmacy:pharmacy,pharmacy_facility_id:Edit pharmancy:circle=>/clients/view/$uid/ACTION_editPharmacy
                 !grp:SSN:ssn:Edit SSN:circle=>/clients/view/$uid/ACTION_editSsn
-                !grp:MCN:mcn,was_medicare_validation_successful,is_mcn_valid_number,mcn_address_street_line1,mcn_address_street_line2,mcn_address_city,mcn_address_state,mcn_address_zip,is_part_b_primary,is_hospice,mcn_response_detail,billing_addressreason_not_partb,reason_not_partbmemo,is_medicare_advantage,medicare_advantage_plan,mcn_reject_reason_code,mcn_reject_reason_description,mcn_follow_up_action_code,mcn_follow_up_action_description,mcn_error_details:Put MSN:circle=>/clients/view/$uid/ACTION_putMedicareInfo
+                !grp:MCN:mcn,was_medicare_validation_successful,is_mcn_valid_number,mcn_address_street_line1,mcn_address_street_line2,mcn_address_city,mcn_address_state,mcn_address_zip,is_part_b_primary,is_hospice,mcn_response_detail,reason_not_partb,reason_not_partbmemo,is_medicare_advantage,medicare_advantage_plan,mcn_reject_reason_code,mcn_reject_reason_description,mcn_follow_up_action_code,mcn_follow_up_action_description,mcn_error_details:Put MSN:circle=>/clients/view/$uid/ACTION_putMedicareInfo
                 !grp:Webcam:has_webcam_device,webcam_device:Update webcam info:circle=>/clients/view/$uid/ACTION_updateWebcamInfo
                 !grp:MCP:mcp_pro_id:Put MCP:circle=>/clients/view/$uid/ACTION_putMcp
                 !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:MCP Onboarding Pro:mcp_onboarding_pro_id,has_mcp_onboarding_pro_accepted_assignment,mcp_onboarding_pro_decision_to_accept_assignment_at,mcp_onboarding_pro_decision_memo
-                !grp:Onboarding Strategy:mcp_onboarding_strategy,next_mcp_onboarding_attempt_date_est,next_mcp_onboarding_attempt_time_est,number_of_mcp_onboarding_phone_calls,number_of_mcp_onboarding_in_person_visits
+                !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: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
@@ -331,8 +330,6 @@ PRO
                 !act:physician_pro_id:removePhysicianPro:circle=>/clients/view/$uid/ACTION_removePhysicianPro
                 !act:mcp_onboarding_pro_id:putMcpOnboardingPro:circle=>/clients/view/$uid/ACTION_putMcpOnboardingPro
                 !act:mcp_onboarding_pro_id:removeMcpOnboardingPro:circle=>/clients/view/$uid/ACTION_removeMcpOnboardingPro
-                !act:has_mcp_onboarding_pro_accepted_assignment:acceptAssignmentAsMcpOnboardingPro:circle=>/clients/view/$uid/ACTION_acceptAssignmentAsMcpOnboardingPro
-                !act:has_mcp_onboarding_pro_accepted_assignment:rejectAssignmentAsMcpOnboardingPro:circle=>/clients/view/$uid/ACTION_rejectAssignmentAsMcpOnboardingPro
                 !act:mcp_onboarding_pro_decision_memo:updateMcpOnboardingProDecisionMemo:circle=>/clients/view/$uid/ACTION_updateMcpOnboardingProDecisionMemo
                 !act:cm_pro_id:putCmPro:circle=>/clients/view/$uid/ACTION_putCmPro
                 !act:cm_pro_id:removeCmPro:circle=>/clients/view/$uid/ACTION_removeCmPro
@@ -356,7 +353,7 @@ PRO
                 !act:why_not_enrolled_in_rm_category:updateWhyNotEnrolledInRm:circle=>/clients/view/$uid/ACTION_updateWhyNotEnrolledInRm
                 !act:is_mcp_onboarding_active:updateMcpOnboardingActiveInfo:circle=>/clients/view/$uid/ACTION_updateMcpOnboardingActiveInfo
                 !act:is_mcp_onboarding_strategy:updateMcpOnboardingActiveInfo:circle=>/clients/view/$uid/ACTION_updateMcpOnboardingStrategy
-                !act:next_mcp_onboarding_attempt_date_est:updateNextMcpOnboardingAttempt:circle=>/clients/view/$uid/ACTION_updateNextMcpOnboardingAttempt
+                !act:next_mcp_onboarding_attempt_date:updateNextMcpOnboardingAttempt:circle=>/clients/view/$uid/ACTION_updateNextMcpOnboardingAttempt
                 !qry:clients:select id, concat(name_first, ' ', name_last) as name_display from client
                 !qry:pros:select id, name_display from pro
                 !qry:facilities:select id, name from facility

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

@@ -28,11 +28,11 @@
         <input type="hidden" name="_return" value="{{route('clients_SINGLE-ACTION_updateNextMcpOnboardingAttempt', ['uid' => $record->uid])}}">
         <div class='form-group mb-3'>
 <label class='control-label'>Next Mcp Onboarding Attempt Date Est *</label>
-<input class='form-control' type='date' name='nextMcpOnboardingAttemptDateEst' value='{{ old('nextMcpOnboardingAttemptDateEst') ? old('nextMcpOnboardingAttemptDateEst') : $record->next_mcp_onboarding_attempt_date_est }}' required>
+<input class='form-control' type='date' name='nextMcpOnboardingAttemptDateEst' value='{{ old('nextMcpOnboardingAttemptDateEst') ? old('nextMcpOnboardingAttemptDateEst') : $record->next_mcp_onboarding_attempt_date }}' required>
 </div>
 <div class='form-group mb-3'>
 <label class='control-label'>Next Mcp Onboarding Attempt Time Est *</label>
-<input class='form-control' type='time' name='nextMcpOnboardingAttemptTimeEst' value='{{ old('nextMcpOnboardingAttemptTimeEst') ? old('nextMcpOnboardingAttemptTimeEst') : $record->next_mcp_onboarding_attempt_time_est }}' required>
+<input class='form-control' type='time' name='nextMcpOnboardingAttemptTimeEst' value='{{ old('nextMcpOnboardingAttemptTimeEst') ? old('nextMcpOnboardingAttemptTimeEst') : $record->next_mcp_onboarding_attempt_time }}' required>
 </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>

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

@@ -413,7 +413,7 @@
 <tr><td class="w-25 px-2 text-secondary border-right">Is Part B Primary</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_part_b_primary ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Is Hospice</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_hospice ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Mcn Response Detail</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcn_response_detail ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Billing Addressreason Not Partb</td><td class="w-75 px-2 font-weight-bold"><?= $record->billing_addressreason_not_partb ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Reason Not Partb</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason_not_partb ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Reason Not Partbmemo</td><td class="w-75 px-2 font-weight-bold"><?= $record->reason_not_partbmemo ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Is Medicare Advantage</td><td class="w-75 px-2 font-weight-bold"><?= $record->is_medicare_advantage ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Medicare Advantage Plan</td><td class="w-75 px-2 font-weight-bold"><?= $record->medicare_advantage_plan ?></td></tr>
@@ -495,26 +495,6 @@
     </table>
 </div>
 
-<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">MCP Onboarding Pro
-                <span class="ml-auto"><!-- __GROUP_ACTION__ --></span>
-            </th>
-        </tr>
-        </thead>
-        <tbody>
-            <tr><td class="w-25 px-2 text-secondary border-right">MCP Pro</td><td class="w-75 px-2 font-weight-bold"><?= value_from_rs($result_pros, 'name_display', [['id', '=', $record->mcp_onboarding_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_putMcpOnboardingPro?optimised=1' title='putMcpOnboardingPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Put Mcp Onboarding 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_removeMcpOnboardingPro?optimised=1' title='removeMcpOnboardingPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Remove Mcp Onboarding Pro</span></a></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Has Mcp Onboarding Pro Accepted Assignment</td><td class="w-75 px-2 font-weight-bold"><?= $record->has_mcp_onboarding_pro_accepted_assignment ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_acceptAssignmentAsMcpOnboardingPro?optimised=1' title='acceptAssignmentAsMcpOnboardingPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Accept Assignment As Mcp Onboarding 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_rejectAssignmentAsMcpOnboardingPro?optimised=1' title='rejectAssignmentAsMcpOnboardingPro' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Reject Assignment As Mcp Onboarding Pro</span></a></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Mcp Onboarding Pro Decision To Accept Assignment At</td><td class="w-75 px-2 font-weight-bold"><?= friendly_date_time($record->mcp_onboarding_pro_decision_to_accept_assignment_at) ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Mcp Onboarding Pro Decision Memo</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcp_onboarding_pro_decision_memo ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateMcpOnboardingProDecisionMemo?optimised=1' title='updateMcpOnboardingProDecisionMemo' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Mcp Onboarding Pro Decision Memo</span></a></td></tr>
-        </tbody>
-    </table>
-</div>
-
 <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>
@@ -526,8 +506,8 @@
         </thead>
         <tbody>
             <tr><td class="w-25 px-2 text-secondary border-right">Mcp Onboarding Strategy</td><td class="w-75 px-2 font-weight-bold"><?= $record->mcp_onboarding_strategy ?></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Next Mcp Onboarding Attempt Date Est</td><td class="w-75 px-2 font-weight-bold"><?= $record->next_mcp_onboarding_attempt_date_est ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateNextMcpOnboardingAttempt?optimised=1' title='updateNextMcpOnboardingAttempt' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Next Mcp Onboarding Attempt</span></a></td></tr>
-<tr><td class="w-25 px-2 text-secondary border-right">Next Mcp Onboarding Attempt Time Est</td><td class="w-75 px-2 font-weight-bold"><?= $record->next_mcp_onboarding_attempt_time_est ?></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Next Mcp Onboarding Attempt Date</td><td class="w-75 px-2 font-weight-bold"><?= $record->next_mcp_onboarding_attempt_date ?><a up-modal=".form-contents" up-preload up-delay="25" up-width="800" up-history="false" href='/clients/view/<?= $record->uid ?>/ACTION_updateNextMcpOnboardingAttempt?optimised=1' title='updateNextMcpOnboardingAttempt' class='mx-2 font-weight-normal text-primary text-xs'><i class='fa fa-circle'></i>&nbsp;<span>Update Next Mcp Onboarding Attempt</span></a></td></tr>
+<tr><td class="w-25 px-2 text-secondary border-right">Next Mcp Onboarding Attempt Time</td><td class="w-75 px-2 font-weight-bold"><?= $record->next_mcp_onboarding_attempt_time ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Number Of Mcp Onboarding Phone Calls</td><td class="w-75 px-2 font-weight-bold"><?= $record->number_of_mcp_onboarding_phone_calls ?></td></tr>
 <tr><td class="w-25 px-2 text-secondary border-right">Number Of Mcp Onboarding In Person Visits</td><td class="w-75 px-2 font-weight-bold"><?= $record->number_of_mcp_onboarding_in_person_visits ?></td></tr>
         </tbody>