Hide 'manager' UI if care plan not created

resources/views/app/patient/note/partials/care-plan-details.blade.php

@@ -59,7 +59,7 @@
                         @endif
                     @endif
                 </div>
-                @if($pro->pro_type === 'ADMIN' && $note->was_cm_setup_performed)
+                @if($pro->pro_type === 'ADMIN' && $patient->has_cm_setup_been_performed && $note->was_cm_setup_performed)
                     <div class="d-flex align-items-baseline">
                         <div class="d-inline-flex align-items-center flex-grow-1 ml-3">
                             <span class="pr-1">Manager Signature:</span>
@@ -93,8 +93,8 @@
                             @endif
                         </div>
                     </div>
+                    @include('app.patient.note.flag-care-plan')
                 @endif
-                @include('app.patient.note.flag-care-plan')
             </div>
         </td>
     </tr>

resources/views/app/patient/note/rm-setup.blade.php

@@ -61,6 +61,37 @@
                         <span class="text-sm ml-2">({{$patient->why_not_enrolled_in_rm_category}})</span>
                     @endif
 
+                    <span class="ml-2 text-secondary">|</span>
+                    <div moe class="ml-2">
+                        <a start show>{{$patient->is_enrolled_in_rm === 'YES' ? 'Un-enroll' : ($patient->is_enrolled_in_rm === 'NO' ? 'Edit Reason' : 'Not interested/other')}}</a> {{-- correct --}}
+                        <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
+                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                            <p class="mb-2 text-nowrap">
+                                {{$patient->is_enrolled_in_rm === 'YES' ? 'Mark as not enrolled' : ($patient->is_enrolled_in_rm === 'NO' ? 'Edit Reason' : 'Not interested/other')}} {{-- correct --}}
+                            </p>
+                            <div class="mb-2">
+                                <label class="text-secondary text-sm mb-1">Reason</label>
+                                <select name="whyNotEnrolledInRmCategory" class="form-control" required>
+                                    <option value="">-- select --</option>
+                                    <option {{$patient->why_not_enrolled_in_rm_category === 'Withdrawn' ? 'selected' : ''}} value="Withdrawn">Withdrawn</option>
+                                    <option {{$patient->why_not_enrolled_in_rm_category === 'Inactive' ? 'selected' : ''}} value="Inactive">Inactive</option>
+                                    <option {{$patient->why_not_enrolled_in_rm_category === 'Entry Error' ? 'selected' : ''}} value="Entry Error">Entry Error</option>
+                                    <option {{$patient->why_not_enrolled_in_rm_category === 'Test Chart' ? 'selected' : ''}} value="Test Chart">Test Chart</option>
+                                    <option {{$patient->why_not_enrolled_in_rm_category === 'Deceased' ? 'selected' : ''}} value="Deceased">Deceased</option>
+                                    <option {{$patient->why_not_enrolled_in_rm_category === 'No Longer Eligible' ? 'selected' : ''}} value="No Longer Eligible">No Longer Eligible</option>
+                                </select>
+                            </div>
+                            <div class="mb-2">
+                                <label class="text-secondary text-sm mb-1">Memo</label>
+                                <textarea type="text" name="whyNotEnrolledInRmMemo" class="form-control">{{$patient->why_not_enrolled_in_rm_memo}}</textarea>
+                            </div>
+                            <div>
+                                <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
+                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                            </div>
+                        </form>
+                    </div>
+
                     @if(!$patient->is_enrolled_in_rm || $patient->is_enrolled_in_rm === 'NO' || $patient->is_enrolled_in_rm === 'UNKNOWN') {{-- correct --}}
                         <span class="ml-2 text-secondary">|</span>
                         <div moe wide class="ml-2">
@@ -96,36 +127,6 @@
                         </div>
                     @endif
 
-                    <span class="ml-2 text-secondary">|</span>
-                    <div moe class="ml-2">
-                        <a start show>{{$patient->is_enrolled_in_rm === 'YES' ? 'Un-enroll' : ($patient->is_enrolled_in_rm === 'NO' ? 'Edit Reason' : 'Not interested/other')}}</a> {{-- correct --}}
-                        <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
-                            <input type="hidden" name="uid" value="{{$patient->uid}}">
-                            <p class="mb-2 text-nowrap">
-                                {{$patient->is_enrolled_in_rm === 'YES' ? 'Mark as not enrolled' : ($patient->is_enrolled_in_rm === 'NO' ? 'Edit Reason' : 'Not interested/other')}} {{-- correct --}}
-                            </p>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm mb-1">Reason</label>
-                                <select name="whyNotEnrolledInRmCategory" class="form-control" required>
-                                    <option value="">-- select --</option>
-                                    <option {{$patient->why_not_enrolled_in_rm_category === 'Withdrawn' ? 'selected' : ''}} value="Withdrawn">Withdrawn</option>
-                                    <option {{$patient->why_not_enrolled_in_rm_category === 'Inactive' ? 'selected' : ''}} value="Inactive">Inactive</option>
-                                    <option {{$patient->why_not_enrolled_in_rm_category === 'Entry Error' ? 'selected' : ''}} value="Entry Error">Entry Error</option>
-                                    <option {{$patient->why_not_enrolled_in_rm_category === 'Test Chart' ? 'selected' : ''}} value="Test Chart">Test Chart</option>
-                                    <option {{$patient->why_not_enrolled_in_rm_category === 'Deceased' ? 'selected' : ''}} value="Deceased">Deceased</option>
-                                    <option {{$patient->why_not_enrolled_in_rm_category === 'No Longer Eligible' ? 'selected' : ''}} value="No Longer Eligible">No Longer Eligible</option>
-                                </select>
-                            </div>
-                            <div class="mb-2">
-                                <label class="text-secondary text-sm mb-1">Memo</label>
-                                <textarea type="text" name="whyNotEnrolledInRmMemo" class="form-control">{{$patient->why_not_enrolled_in_rm_memo}}</textarea>
-                            </div>
-                            <div>
-                                <button submit class="btn btn-sm btn-primary mr-1">Submit</button>
-                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                            </div>
-                        </form>
-                    </div>
                 </div>
             </div>