Samson Mutunga 3 лет назад
Родитель
Сommit
65c50622a0

+ 4 - 0
public/css/style.css

@@ -3418,3 +3418,7 @@ body.forced-masking #mask {
 .mcp-theme-1 .point-table [if-read-mode] .inline-html-container {
     cursor: pointer;
 }
+table.v-top td, 
+table.v-top th {
+    vertical-align:top;
+}

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

@@ -1,166 +1,188 @@
 <div class="row" id="rm-setup">
     <div class="col-6">
         @if($pro->pro_type === 'ADMIN')
-            <div class="d-flex align-items-baseline mb-3">
-                <span class="min-width-140px">Is Eligible for RM?</span>
-                <div class="">
-                    <div class="d-inline-flex align-items-start">
-                        <b>{{ ucwords($patient->is_eligible_for_rm ? $patient->is_eligible_for_rm : '-') }}</b>
-                        <div moe class="ml-2">
-                            <a start show><i class="fa fa-edit"></i></a>
-                            <form url="/api/client/updateRmEligibility" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Is Eligible?</label>
-                                    <select name="isEligibleForRm"
-                                            class="form-control form-control-sm"
-                                            onchange="toggleDisabledAsNeeded(this, 'NO', 'not-eligible-for-rm')">
-                                        <option value="">-- Select Status --</option>
-                                        <option value="YES" {{ $patient->is_eligible_for_rm === 'YES' ? 'selected' : '' }}>YES</option>
-                                        <option value="NO" {{ $patient->is_eligible_for_rm === 'NO' ? 'selected' : '' }}>NO</option>
-                                        <option value="UNKNOWN" {{ $patient->is_eligible_for_rm === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
-                                    </select>
-                                </div>
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Why not eligible category</label>
-                                    <input type="text" class="not-eligible-for-rm form-control form-control-sm"
-                                           {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
-                                           name="whyNotEligibleForRmCategory" value="{{$patient->why_not_eligible_for_rm_category}}">
-                                </div>
-                                <div class="mb-2">
-                                    <label class="text-sm mb-1 text-secondary">Why not eligible memo</label>
-                                    <input type="text" class="not-eligible-for-rm form-control form-control-sm"
-                                           {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
-                                           name="whyNotEligibleForRmMemo" value="{{$patient->why_not_eligible_for_rm_memo}}">
-                                </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>
+                <table class="table table-sm table-striped table-bordered mb-1">
+                    <tr>
+                        <td>Is Eligible for RM?</td>
+                        <td>
+                            <div class="">
+                                <div class="d-inline-flex align-items-start">
+                                    <b>{{ ucwords($patient->is_eligible_for_rm ? $patient->is_eligible_for_rm : '-') }}</b>
+                                    <div moe class="ml-2">
+                                        <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                                        <form url="/api/client/updateRmEligibility" class="mcp-theme-1">
+                                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                            <div class="mb-2">
+                                                <label class="text-sm mb-1 text-secondary">Is Eligible?</label>
+                                                <select name="isEligibleForRm"
+                                                        class="form-control form-control-sm"
+                                                        onchange="toggleDisabledAsNeeded(this, 'NO', 'not-eligible-for-rm')">
+                                                    <option value="">-- Select Status --</option>
+                                                    <option value="YES" {{ $patient->is_eligible_for_rm === 'YES' ? 'selected' : '' }}>YES</option>
+                                                    <option value="NO" {{ $patient->is_eligible_for_rm === 'NO' ? 'selected' : '' }}>NO</option>
+                                                    <option value="UNKNOWN" {{ $patient->is_eligible_for_rm === 'UNKNOWN' ? 'selected' : '' }}>UNKNOWN</option>
+                                                </select>
+                                            </div>
+                                            <div class="mb-2">
+                                                <label class="text-sm mb-1 text-secondary">Why not eligible category</label>
+                                                <input type="text" class="not-eligible-for-rm form-control form-control-sm"
+                                                    {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
+                                                    name="whyNotEligibleForRmCategory" value="{{$patient->why_not_eligible_for_rm_category}}">
+                                            </div>
+                                            <div class="mb-2">
+                                                <label class="text-sm mb-1 text-secondary">Why not eligible memo</label>
+                                                <input type="text" class="not-eligible-for-rm form-control form-control-sm"
+                                                    {{$patient->is_eligible_for_rm === 'NO' ? '' : 'disabled' }}
+                                                    name="whyNotEligibleForRmMemo" value="{{$patient->why_not_eligible_for_rm_memo}}">
+                                            </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>
-                            </form>
-                        </div>
-                    </div>
-                    @if($patient->is_eligible_for_rm === 'NO')
-                        <div class="mt-1">
-                            <span>{{$patient->why_not_eligible_for_rm_category ?: '-'}}</span>
-                            /
-                            <span class="text-secondary">{{$patient->why_not_eligible_for_rm_memo ?: '-'}}</span>
-                        </div>
-                    @endif
-                </div>
-            </div>
-        @endif
-
-        <?php $currentCareMonth = $patient->currentCareMonth(); ?>
-        @if($currentCareMonth && $pro->id === $currentCareMonth->mcp_pro_id)
-            <div class="d-flex align-items-baseline mb-3">
-                <?php $spoken = $currentCareMonth->has_anyone_interacted_with_client_about_rm_outside_note; ?>
-                <span class="min-width-140px">Comm. this month:</span>
-                <b class="{{$spoken ? 'text-success' : ''}}">
-                    {{$spoken ? 'Yes' : 'No'}}
-                    @if(!$spoken)
-                        <i class="fa fa-exclamation-triangle"></i>
-                    @else
-                        <i class="fa fa-check"></i>
+                                @if($patient->is_eligible_for_rm === 'NO')
+                                    <div class="mt-1">
+                                        <span>{{$patient->why_not_eligible_for_rm_category ?: '-'}}</span>
+                                        /
+                                        <span class="text-secondary">{{$patient->why_not_eligible_for_rm_memo ?: '-'}}</span>
+                                    </div>
+                                @endif
+                            </div>
+                        </td>
+                    </tr>
+                    <?php $currentCareMonth = $patient->currentCareMonth(); ?>
+                    @if($currentCareMonth && $pro->id === $currentCareMonth->mcp_pro_id)
+                    <?php $spoken = $currentCareMonth->has_anyone_interacted_with_client_about_rm_outside_note; ?>
+                        <tr>
+                            <td>
+                            Comm. this month:
+                            </td>
+                            <td>
+                                <b class="{{$spoken ? 'text-success' : ''}}">
+                                    {{$spoken ? 'Yes' : 'No'}}
+                                    @if(!$spoken)
+                                        <i class="fa fa-exclamation-triangle"></i>
+                                    @else
+                                        <i class="fa fa-check"></i>
+                                    @endif
+                                </b>
+                                @if($currentCareMonth->mcp && $pro->id === $currentCareMonth->mcp->id)
+                                    <div moe relative class="ml-2">
+                                        <a href="#" start show class="">Toggle</a>
+                                        <form url="/api/careMonth/setHasAnyoneInteractedWithClientAboutRmOutsideNoteTo{{$spoken ? 'False' : 'True'}}" right>
+                                            <input type="hidden" name="uid" value="{{$currentCareMonth->uid}}">
+                                            <p>Set to {{$spoken ? 'No' : 'Yes'}}?</p>
+                                            <div class="d-flex align-items-center">
+                                                <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
+                                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                @endif
+                            </td>
+                        </tr>
                     @endif
-                </b>
-                @if($currentCareMonth->mcp && $pro->id === $currentCareMonth->mcp->id)
-                    <div moe relative class="ml-2">
-                        <a href="#" start show class="">Toggle</a>
-                        <form url="/api/careMonth/setHasAnyoneInteractedWithClientAboutRmOutsideNoteTo{{$spoken ? 'False' : 'True'}}" right>
-                            <input type="hidden" name="uid" value="{{$currentCareMonth->uid}}">
-                            <p>Set to {{$spoken ? 'No' : 'Yes'}}?</p>
-                            <div class="d-flex align-items-center">
-                                <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
-                                <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+                    <tr>
+                        <td>Enrollment:</td>
+                        <td>
+                            <div class="">
+                                <div class="d-inline-flex align-items-start">
+                                    <b>{{ ucwords($patient->is_enrolled_in_rm ? $patient->is_enrolled_in_rm : '-') }}</b>
+                                    @if($patient->is_enrolled_in_rm === 'YES')
+                                        <div moe class="ml-2">
+                                            <a start show>Toggle</a>
+                                            <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
+                                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                <p>Un-enroll from RPM?</p>
+                                                <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>
+                                    @else
+                                        <a native target="_blank"
+                                        class="screen-only ml-2"
+                                        open-in-stag-popup
+                                        popup-style="medium overflow-visible"
+                                        mc-initer="rpm-agreement-{{$note->id}}"
+                                        title="Leadership Health Remote Patient Monitoring Consent Form"
+                                        href="/note/rpm-agreement/{{$note->uid}}?popupmode=1">
+                                            Mark as enrolled
+                                        </a>
+                                    @endif
+                                </div>
                             </div>
-                        </form>
-                    </div>
-                @endif
-            </div>
+                        </td>
+                    </tr>
+                </table>
+            </div> 
         @endif
+        
 
         <div class="d-flex align-items-baseline mb-3">
-            <span class="min-width-140px">Enrollment:</span>
-            <div class="">
-                <div class="d-inline-flex align-items-start">
-                    <b>{{ ucwords($patient->is_enrolled_in_rm ? $patient->is_enrolled_in_rm : '-') }}</b>
-                    @if($patient->is_enrolled_in_rm === 'YES')
-                        <div moe class="ml-2">
-                            <a start show>Toggle</a>
-                            <form url="/api/client/setIsEnrolledInRmToFalse" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                <p>Un-enroll from RPM?</p>
-                                <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 class="flex-grow-1">
+                <div>
+                    <div class="d-flex align-items-center mb-1">
+                        <span class="mr-2">RM Reasons:</span>
+                        @include('app.patient.partials.put-rm-reasons')
+                    </div>
+                    <div class="">
+                        @include('app.patient.partials.rm-reasons-display')
+                    </div>
+                </div>
+                {{--<div>
+                    @if(!$patient->rmReasons || !count($patient->rmReasons))
+                        <span class="text-secondary">None</span>
+                    @else
+                        <div>
+                            @foreach($patient->rmReasons as $reason)
+                                <div class="border-bottom pb-1 mb-1 d-flex align-items-start">
+                                    <b class="min-width-70px">{{$reason->code}}</b>
+                                    <span class="max-width-200px mr-3">{{$reason->description}}</span>
+                                    <div moe relative class="ml-auto">
+                                        <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                                        <form url="/api/clientCmRmReason/updateBasic" class="mcp-theme-1" right target='[data-non-segment-section="RM Setup"]'>
+                                            <input type="hidden" name="uid" value="{{$reason->uid}}">
+                                            <div class="mb-2">
+                                                <label class="text-sm mb-1 text-secondary">Code *</label>
+                                                <input type="text" class="form-control form-control-sm"
+                                                    icd-autocomplete-code
+                                                    name="code" value="{{$reason->code}}" required>
+                                            </div>
+                                            <div class="mb-2">
+                                                <label class="text-sm mb-1 text-secondary">Description</label>
+                                                <input type="text" class="form-control form-control-sm"
+                                                    icd-autocomplete-description
+                                                    name="description" value="{{$reason->description}}">
+                                            </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 moe relative class="ml-2">
+                                        <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
+                                        <form url="/api/clientCmRmReason/remove" class="mcp-theme-1" right target='[data-non-segment-section="RM Setup"]'>
+                                            <input type="hidden" name="uid" value="{{$reason->uid}}">
+                                            <p>Remove this RM reason?</p>
+                                            <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>
-                            </form>
+                            @endforeach
                         </div>
-                    @else
-                        <a native target="_blank"
-                           class="screen-only ml-2"
-                           open-in-stag-popup
-                           popup-style="medium overflow-visible"
-                           mc-initer="rpm-agreement-{{$note->id}}"
-                           title="Leadership Health Remote Patient Monitoring Consent Form"
-                           href="/note/rpm-agreement/{{$note->uid}}?popupmode=1">
-                            Mark as enrolled
-                        </a>
                     @endif
-                </div>
-            </div>
-        </div>
+                </div>--}}
 
-        <div class="d-flex align-items-baseline mb-3">
-            <span class="min-width-140px">Reasons:</span>
-            <div class="flex-grow-1">
-                @if(!$patient->rmReasons || !count($patient->rmReasons))
-                    <span class="text-secondary">None</span>
-                @else
-                    <div>
-                        @foreach($patient->rmReasons as $reason)
-                            <div class="border-bottom pb-1 mb-1 d-flex align-items-start">
-                                <b class="min-width-70px">{{$reason->code}}</b>
-                                <span class="max-width-200px mr-3">{{$reason->description}}</span>
-                                <div moe relative class="ml-auto">
-                                    <a start show><i class="fa fa-edit"></i></a>
-                                    <form url="/api/clientCmRmReason/updateBasic" class="mcp-theme-1" right target='[data-non-segment-section="RM Setup"]'>
-                                        <input type="hidden" name="uid" value="{{$reason->uid}}">
-                                        <div class="mb-2">
-                                            <label class="text-sm mb-1 text-secondary">Code *</label>
-                                            <input type="text" class="form-control form-control-sm"
-                                                   icd-autocomplete-code
-                                                   name="code" value="{{$reason->code}}" required>
-                                        </div>
-                                        <div class="mb-2">
-                                            <label class="text-sm mb-1 text-secondary">Description</label>
-                                            <input type="text" class="form-control form-control-sm"
-                                                   icd-autocomplete-description
-                                                   name="description" value="{{$reason->description}}">
-                                        </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 moe relative class="ml-2">
-                                    <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
-                                    <form url="/api/clientCmRmReason/remove" class="mcp-theme-1" right target='[data-non-segment-section="RM Setup"]'>
-                                        <input type="hidden" name="uid" value="{{$reason->uid}}">
-                                        <p>Remove this RM reason?</p>
-                                        <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>
-                        @endforeach
-                    </div>
-                @endif
-                <div class="d-flex align-items-baseline">
+                {{--<div class="d-flex align-items-baseline">
                     <div moe>
                         <a start show>+ Add From Dx</a>
                         <form url="/api/clientCmRmReason/create" class="mcp-theme-1" target='[data-non-segment-section="RM Setup"]'>
@@ -210,180 +232,193 @@
                             </div>
                         </form>
                     </div>
-                </div>
+                </div>--}}
             </div>
         </div>
-
-        <div class="mb-3 d-flex align-items-baseline">
-            <span class="min-width-140px">Care Plan:</span>
-            <div class="width-300px d-inline-flex align-items-center">
-                @if($patient->has_cm_setup_been_performed)
-                    <div class="text-nowrap text-success">
-                        @if($patient->cm_setup_note_id === $note->id)
-                            <i class="fa fa-check"></i>
-                            <b>Created on this note</b>
-                        @elseif($patient->cmSetupNote)
-                            <i class="fa fa-check"></i>
-                            <b>Created on</b>
-                            <div class="d-inline position-relative on-click-menu">
-                                <span class="text-primary c-pointer">{{friendly_date($patient->cmSetupNote->effective_dateest)}}</span>
-                                <div menu right class="bg-white border">
-                                    <a native target="_blank"
-                                       href="<?= route('patients.view.notes.view.dashboard', ['patient' => $patient, 'note' => $patient->cmSetupNote]) ?>"
-                                       class="px-2 py-1 d-block text-nowrap text-sm">Go to note</a>
-                                </div>
-                            </div>
-                        @else
-                            <i class="fa fa-exclamation-triangle text-warning-mellow"></i>
-                            <b class="text-warning-mellow">Performed, but CM setup note missing!</b> <!-- will never reach this point -->
-                        @endif
-                    </div>
-                    @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
-                        <div moe class="ml-3">
-                            <a href="" show start>Undo</a>
-                            <form url="/api/note/undoMarkCmSetupPerformed" >
-                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                <p>Mark Comprehensive Care Plan as not created?</p>
-                                <div class="mb-0">
-                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+        <div class="mb-3">
+            <table class="table-sm table-striped table-bordered w-100 v-top">
+                <tr>
+                    <td>Care Plan:</td>
+                    <td>
+                        <div class="d-inline-flex align-items-center">
+                            @if($patient->has_cm_setup_been_performed)
+                                <div class="text-nowrap text-success">
+                                    @if($patient->cm_setup_note_id === $note->id)
+                                        <i class="fa fa-check"></i>
+                                        <b>Created on this note</b>
+                                    @elseif($patient->cmSetupNote)
+                                        <i class="fa fa-check"></i>
+                                        <b>Created on</b>
+                                        <div class="d-inline position-relative on-click-menu">
+                                            <span class="text-primary c-pointer">{{friendly_date($patient->cmSetupNote->effective_dateest)}}</span>
+                                            <div menu right class="bg-white border">
+                                                <a native target="_blank"
+                                                href="<?= route('patients.view.notes.view.dashboard', ['patient' => $patient, 'note' => $patient->cmSetupNote]) ?>"
+                                                class="px-2 py-1 d-block text-nowrap text-sm">Go to note</a>
+                                            </div>
+                                        </div>
+                                    @else
+                                        <i class="fa fa-exclamation-triangle text-warning-mellow"></i>
+                                        <b class="text-warning-mellow">Performed, but CM setup note missing!</b> <!-- will never reach this point -->
+                                    @endif
                                 </div>
-                            </form>
+                                @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
+                                    <div moe class="ml-3">
+                                        <a href="" show start>Undo</a>
+                                        <form url="/api/note/undoMarkCmSetupPerformed" >
+                                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                                            <p>Mark Comprehensive Care Plan as not created?</p>
+                                            <div class="mb-0">
+                                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                @endif
+                            @else
+                                <span class="text-nowrap text-warning-mellow">
+                                    <i class="fa fa-times"></i>
+                                    <b>Not Created</b>
+                                </span>
+                                @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
+                                    <div moe class="ml-3">
+                                        <a href="#" show start>Mark as created</a>
+                                        <form url="/api/note/markCmSetupPerformed" >
+                                            <input type="hidden" name="uid" value="{{$note->uid}}">
+                                            <p>Mark Comprehensive Care Plan as created?</p>
+                                            <div class="mb-0">
+                                                <button class="btn btn-primary btn-sm" submit>Submit</button>
+                                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                            </div>
+                                        </form>
+                                    </div>
+                                @endif
+                            @endif
                         </div>
-                    @endif
-                @else
-                    <span class="text-nowrap text-warning-mellow">
-                        <i class="fa fa-times"></i>
-                        <b>Not Created</b>
-                    </span>
-                    @if($patient->mcp_pro_id === $pro->id || $pro->pro_type === 'ADMIN')
-                        <div moe class="ml-3">
-                            <a href="#" show start>Mark as created</a>
-                            <form url="/api/note/markCmSetupPerformed" >
-                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                <p>Mark Comprehensive Care Plan as created?</p>
-                                <div class="mb-0">
-                                    <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                        @if($pro->pro_type === 'ADMIN' && $note->was_cm_setup_performed)
+                            <div class="d-flex align-items-baseline">
+                                <div class="d-inline-flex align-items-center flex-grow-1">
+                                    <span class="pr-2">Manager Signature:</span>
+                                    @if($note->cm_setup_manager_signature_status !== 'SIGNED')
+                                        <div moe class="">
+                                            <a start show>Sign</a>
+                                            <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
+                                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                                <input type="hidden" name="managerSignatureStatus" value="SIGNED">
+                                                <p>Sign Off Care Plan Creation as Manager?</p>
+                                                <div>
+                                                    <button submit class="btn btn-sm btn-success mr-1">Sign</button>
+                                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    @else
+                                        <b>SIGNED</b>
+                                        <div moe class="ml-3">
+                                            <a start show>Undo</a>
+                                            <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
+                                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                                <input type="hidden" name="managerSignatureStatus" value="">
+                                                <p>Undo sign as manager for Care Plan Creation?</p>
+                                                <div>
+                                                    <button submit class="btn btn-sm btn-primary mr-1">Undo</button>
+                                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    @endif
                                 </div>
-                            </form>
-                        </div>
-                    @endif
-                @endif
-            </div>
+                            </div>
+                        @endif
+                    </td>
+                </tr>
+            </table>
         </div>
 
-        @if($pro->pro_type === 'ADMIN' && $note->was_cm_setup_performed)
-            <div class="d-flex align-items-baseline mb-3">
-                <span class="min-width-140px"></span>
-                <div class="d-inline-flex align-items-center flex-grow-1">
-                    <span class="pr-2">Manager Signature:</span>
-                    @if($note->cm_setup_manager_signature_status !== 'SIGNED')
-                        <div moe class="">
-                            <a start show>Sign</a>
-                            <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                <input type="hidden" name="managerSignatureStatus" value="SIGNED">
-                                <p>Sign Off Care Plan Creation as Manager?</p>
-                                <div>
-                                    <button submit class="btn btn-sm btn-success mr-1">Sign</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    @else
-                        <b>SIGNED</b>
-                        <div moe class="ml-3">
-                            <a start show>Undo</a>
-                            <form url="/api/note/updateCmSetupManagerSignatureStatus" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$note->uid}}">
-                                <input type="hidden" name="managerSignatureStatus" value="">
-                                <p>Undo sign as manager for Care Plan Creation?</p>
-                                <div>
-                                    <button submit class="btn btn-sm btn-primary mr-1">Undo</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    @endif
-                </div>
-            </div>
-        @endif
+
 
         @if($pro->pro_type === 'ADMIN')
-            <div class="d-flex align-items-baseline mb-3">
-                <span class="min-width-140px">RME Pro:</span>
-                <div class="">
-                    <div class="d-inline-flex align-items-start">
-                        <b>{{ $patient->rme ? $patient->rme->displayName() : '-' }}</b>
-                        <div moe class="ml-2">
-                            <a start show><i class="fa fa-edit"></i></a>
-                            <form url="/api/client/putRmePro" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                <div class="mb-2">
-                                    <label class="text-secondary text-sm">RME Pro</label>
-                                    <select provider-search data-pro-uid="{{ @$patient->rme->uid }}" name="rmeProUid" class="form-control form-control-sm">
-                                        <option value=""> --select--</option>
-                                    </select>
-                                </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->rme)
-                            <div moe class="ml-2">
-                                <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
-                                <form url="/api/client/removeRmePro" class="mcp-theme-1">
-                                    <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                    <p>Remove RME Pro?</p>
-                                    <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>
+                <table class="table table-sm table-bordered table-striped">
+                    <tr>
+                        <td>RME Pro:</td>
+                        <td>
+                            <div class="">
+                                <div class="d-inline-flex align-items-start">
+                                    <b>{{ $patient->rme ? $patient->rme->displayName() : '-' }}</b>
+                                    <div moe class="ml-2">
+                                        <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                                        <form url="/api/client/putRmePro" class="mcp-theme-1">
+                                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                            <div class="mb-2">
+                                                <label class="text-secondary text-sm">RME Pro</label>
+                                                <select provider-search data-pro-uid="{{ @$patient->rme->uid }}" name="rmeProUid" class="form-control form-control-sm">
+                                                    <option value=""> --select--</option>
+                                                </select>
+                                            </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>
-                                </form>
-                            </div>
-                        @endif
-                    </div>
-                </div>
-            </div>
-            <div class="d-flex align-items-baseline mb-3">
-                <span class="min-width-140px">RMM Pro:</span>
-                <div class="">
-                    <div class="d-inline-flex align-items-start">
-                        <b>{{ $patient->rmm ? $patient->rmm->displayName() : '-' }}</b>
-                        <div moe class="ml-2">
-                            <a start show><i class="fa fa-edit"></i></a>
-                            <form url="/api/client/putRmmPro" class="mcp-theme-1">
-                                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                <div class="mb-2">
-                                    <label class="text-secondary text-sm">RMM Pro</label>
-                                    <select provider-search data-pro-uid="{{ @$patient->rmm->uid }}" name="rmmProUid" class="form-control form-control-sm">
-                                        <option value=""> --select--</option>
-                                    </select>
-                                </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>
+                                    @if($patient->rme)
+                                        <div moe class="ml-2">
+                                            <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
+                                            <form url="/api/client/removeRmePro" class="mcp-theme-1">
+                                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                <p>Remove RME Pro?</p>
+                                                <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>
+                                    @endif
                                 </div>
-                            </form>
-                        </div>
-                        @if($patient->rmm)
-                            <div moe class="ml-2">
-                                <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
-                                <form url="/api/client/removeRmmPro" class="mcp-theme-1">
-                                    <input type="hidden" name="uid" value="{{$patient->uid}}">
-                                    <p>Remove RMM Pro?</p>
-                                    <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>
+                        </td>
+                    </tr>
+                    <tr>
+                        <td>RMM Pro:</td>
+                        <td>
+                            <div class="">
+                                <div class="d-inline-flex align-items-start">
+                                    <b>{{ $patient->rmm ? $patient->rmm->displayName() : '-' }}</b>
+                                    <div moe class="ml-2">
+                                        <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                                        <form url="/api/client/putRmmPro" class="mcp-theme-1">
+                                            <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                            <div class="mb-2">
+                                                <label class="text-secondary text-sm">RMM Pro</label>
+                                                <select provider-search data-pro-uid="{{ @$patient->rmm->uid }}" name="rmmProUid" class="form-control form-control-sm">
+                                                    <option value=""> --select--</option>
+                                                </select>
+                                            </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>
-                                </form>
+                                    @if($patient->rmm)
+                                        <div moe class="ml-2">
+                                            <a start show><i class="fa fa-trash-alt text-danger on-hover-opaque"></i></a>
+                                            <form url="/api/client/removeRmmPro" class="mcp-theme-1">
+                                                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                <p>Remove RMM Pro?</p>
+                                                <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>
+                                    @endif
+                                </div>
                             </div>
-                        @endif
-                    </div>
-                </div>
+                        </td>
+                    </tr>
+                </table>
             </div>
         @endif
     </div>
@@ -445,7 +480,7 @@
                 <div class="">
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="width-200px pl-3">Arrived:</span>
-                        <span class="ml-3">Yes</span>*
+                        <span class="ml-3">Yes</span>
                     </div>
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="width-200px pl-3">First Measurement:</span>
@@ -494,7 +529,7 @@
                 <div class="">
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="width-200px pl-3">Arrived:</span>
-                        <span class="ml-3">Yes</span>*
+                        <span class="ml-3">Yes</span>
                     </div>
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="width-200px pl-3">First Measurement:</span>

+ 1 - 1
resources/views/app/patient/partials/put-rm-reasons.blade.php

@@ -1,5 +1,5 @@
 <div moe>
-	<a start show><i class="fas fa-edit"></i></a>
+	<a start show><i class="fas fa-edit on-hover-opaque"></i></a>
 	<form url="/api/client/putRmReasons" class="mcp-theme-1">
 		<input type="hidden" name="uid" value="{{$patient->uid}}">
 		<div>

+ 44 - 0
resources/views/app/patient/partials/rm-reasons-display.blade.php

@@ -0,0 +1,44 @@
+<table class="table table-sm table-striped table-bordered mb-0">
+	<tbody>
+		<tr>
+			<td class="text-nowrap">RM Reason Icd 1</td>
+			<td>
+				<div class="d-flex">
+					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd1 ? $patient->rm_reason_icd1. ':':'' }}</span>
+					<small class="text-muted text-sm">{{ $patient->rm_reason_icd1description }}</small>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td class="text-nowrap">RM Reason Icd 2</td>
+			<td>
+				<div class="d-flex">
+					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd2 ? $patient->rm_reason_icd2 . ':':'' }}</span>
+					<small class="text-muted text-sm">{{ $patient->rm_reason_icd2description }}</small>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td class="text-nowrap">RM Reason Icd 3</td>
+			<td>
+				<div class="d-flex">
+					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd3 ? $patient->rm_reason_icd3 . ':':'' }}</span>
+					<small class="text-muted text-sm">{{ $patient->rm_reason_icd3description }}</small>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td class="text-nowrap">RM Reason Icd 4</td>
+			<td>
+				<div class="d-flex">
+					<span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd4 ? $patient->rm_reason_icd4. ':' : '' }}</span>
+					<small class="text-muted text-sm">{{ $patient->rm_reason_icd4description }}</small>
+				</div>
+			</td>
+		</tr>
+		<tr>
+			<td class="text-nowrap">RM Reason Memo</td>
+			<td class="text-muted text-sm">{{ $patient->rm_reason_memo }}</td>
+		</tr>
+	</tbody>
+</table>

+ 3 - 46
resources/views/app/patient/partials/rm-setup.blade.php

@@ -109,50 +109,7 @@
             @include('app.patient.partials.put-rm-reasons')
         </div>
         <div class="pl-3" style="max-width: 570px;">
-            <table class="table table-sm table-striped table-bordered">
-                <tbody>
-                    <tr>
-                        <td class="text-nowrap">RM Reason Icd 1</td>
-                        <td>
-                            <div class="d-flex">
-                                <span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd1 ? $patient->rm_reason_icd1. ':':'' }}</span>
-                                <small class="text-muted text-sm">{{ $patient->rm_reason_icd1description }}</small>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="text-nowrap">RM Reason Icd 2</td>
-                        <td>
-                        <div class="d-flex">
-                                <span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd2 ? $patient->rm_reason_icd2 . ':':'' }}</span>
-                                <small class="text-muted text-sm">{{ $patient->rm_reason_icd2description }}</small>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="text-nowrap">RM Reason Icd 3</td>
-                        <td>
-                        <div class="d-flex">
-                                <span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd3 ? $patient->rm_reason_icd3 . ':':'' }}</span>
-                                <small class="text-muted text-sm">{{ $patient->rm_reason_icd3description }}</small>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="text-nowrap">RM Reason Icd 4</td>
-                        <td>
-                        <div class="d-flex">
-                                <span class="font-weight-bold text-sm mr-2" style="min-width: 60px;">{{ $patient->rm_reason_icd4 ? $patient->rm_reason_icd4. ':' : '' }}</span>
-                                <small class="text-muted text-sm">{{ $patient->rm_reason_icd4description }}</small>
-                            </div>
-                        </td>
-                    </tr>
-                    <tr>
-                        <td class="text-nowrap">RM Reason Memo</td>
-                        <td class="text-muted text-sm">{{ $patient->rm_reason_memo }}</td>
-                    </tr>
-                </tbody>
-            </table>
+            @include('app.patient.partials.rm-reasons-display')
         </div>
         {{--<div class="d-flex align-items-baseline mb-3">
             <span class="width-200px">RM Reasons:</span>
@@ -354,7 +311,7 @@
                 <div class="">
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="width-200px pl-3">Arrived:</span>
-                        <span class="ml-3">Yes</span>*
+                        <span class="ml-3">Yes</span>
                     </div>
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="width-200px pl-3">First Measurement:</span>
@@ -403,7 +360,7 @@
                 <div class="">
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="width-200px pl-3">Arrived:</span>
-                        <span class="ml-3">Yes</span>*
+                        <span class="ml-3">Yes</span>
                     </div>
                     <div class="d-flex align-items-baseline mb-1">
                         <span class="width-200px pl-3">First Measurement:</span>