Merge branch 'master' into dev-vj

app/Http/Controllers/PracticeManagementController.php

@@ -200,7 +200,7 @@ SELECT effective_date, count(*), sum(number_of_units) as units FROM bill WHERE c
         }
        
 
-        $rows = $rows->paginate(20);
+        $rows = $rows->paginate(50);
 
         $claimStatuses = DB::select('SELECT distinct status FROM claim ORDER BY status DESC');
 

resources/views/app/patient/care-month/dashboard.blade.php

@@ -581,81 +581,7 @@
         </div> --}}
 
         <hr class="m-negator mt-4 mb-3">
-        <div class="screen-only">
-            <div class="d-flex align-items-center mb-3">
-                <p class="font-weight-bold text-secondary m-0 font-size-14">RM Setup</p>
-            </div>
-
-            <div class="mb-3 d-flex align-items-center">
-                <span class="min-width-140px">RM Setup Status:</span>
-                <div class="d-inline-flex align-items-center flex-grow-1">
-                    @if($patient->has_rm_setup_been_performed)
-                        <span class="text-nowrap text-success">
-                            <i class="fa fa-check"></i>
-                            <b>Performed</b>
-                        </span>
-                        <div moe class="ml-3">
-                            <a href="" show start>Undo</a>
-                            <form url="/api/careMonth/undoMarkRmSetupPerformed">
-                                <input type="hidden" name="uid" value="{{$careMonth->uid}}">
-                                <p>Mark RM Setup as not performed?</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>
-                    @else
-                        <span class="text-nowrap text-warning-mellow">
-                            <i class="fa fa-times"></i>
-                            <b>Not Performed</b>
-                        </span>
-                        <div moe class="ml-3">
-                            <a href="" show start>Mark RM setup as performed?</a>
-                            <form url="/api/careMonth/markRmSetupPerformed">
-                                <input type="hidden" name="uid" value="{{$careMonth->uid}}">
-                                <p>Mark as enrolled into RM?</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
-                </div>
-            </div>
-
-            @if($pro->pro_type === 'ADMIN')
-                <div class="d-flex align-items-center">
-                    <span class="min-width-140px">RM Setup Claim:</span>
-                    <div class="d-inline-flex align-items-center flex-grow-1">
-                        @if(!!$careMonth->rmSetupClaim)
-                            <span class="text-nowrap text-success">
-                                <i class="fa fa-check"></i>
-                                <b>Created</b>
-                            </span>
-                        @else
-                            <span class="text-nowrap text-warning-mellow">
-                                <i class="fa fa-times"></i>
-                                <b>Not Created</b>
-                            </span>
-                            <div moe class="ml-3">
-                                <a href="" show start>Generate</a>
-                                <form url="/api/careMonth/generateRmSetupClaim">
-                                    <input type="hidden" name="uid" value="{{$careMonth->uid}}">
-                                    <p>Generate RM setup claim?</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
-                    </div>
-                </div>
-            @endif
-
-        </div>
+        @include('app.patient.rm-setup-form')
 
         @if($pro->pro_type === 'ADMIN')
 

resources/views/app/patient/note/dashboard.blade.php

@@ -1072,6 +1072,12 @@ use App\Models\Handout;
                     </div>
                 </div>
 
+                @if($patient->currentCareMonth())
+                <div class="row border-bottom mx-3 mt-2">
+                    @include('app.patient.rm-setup-form', ['careMonth' => $patient->currentCareMonth()])
+                </div>
+                @endif
+
                 <div class="row border-bottom mx-0">
                     <div class="col-12 px-0">
                         <div class="p-3 screen-only h-100" data-non-segment-section="Remote Monitoring">
@@ -1080,7 +1086,6 @@ use App\Models\Handout;
                             </div>
                             @include('app.patient.note.rm-setup')
                         </div>
-
                     </div>
                 </div>
 

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

@@ -0,0 +1,75 @@
+<div class="screen-only">
+    <div class="d-flex align-items-center mb-3">
+        <p class="font-weight-bold text-secondary m-0 font-size-14">RM Setup</p>
+    </div>
+
+    <div class="mb-3 d-flex align-items-center">
+        <span class="min-width-140px">RM Setup Status:</span>
+        <div class="d-inline-flex align-items-center flex-grow-1">
+            @if($patient->has_rm_setup_been_performed)
+            <span class="text-nowrap text-success">
+                <i class="fa fa-check"></i>
+                <b>Performed</b>
+            </span>
+            <div moe class="ml-3">
+                <a href="" show start>Undo</a>
+                <form url="/api/careMonth/undoMarkRmSetupPerformed">
+                    <input type="hidden" name="uid" value="{{$careMonth->uid}}">
+                    <p>Mark RM Setup as not performed?</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>
+            @else
+            <span class="text-nowrap text-warning-mellow">
+                <i class="fa fa-times"></i>
+                <b>Not Performed</b>
+            </span>
+            <div moe class="ml-3">
+                <a href="" show start>Mark RM setup as performed?</a>
+                <form url="/api/careMonth/markRmSetupPerformed">
+                    <input type="hidden" name="uid" value="{{$careMonth->uid}}">
+                    <p>Mark as enrolled into RM?</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
+        </div>
+    </div>
+
+    @if($pro->pro_type === 'ADMIN')
+    <div class="d-flex align-items-center">
+        <span class="min-width-140px">RM Setup Claim:</span>
+        <div class="d-inline-flex align-items-center flex-grow-1">
+            @if(!!$careMonth->rmSetupClaim)
+            <span class="text-nowrap text-success">
+                <i class="fa fa-check"></i>
+                <b>Created</b>
+            </span>
+            @else
+            <span class="text-nowrap text-warning-mellow">
+                <i class="fa fa-times"></i>
+                <b>Not Created</b>
+            </span>
+            <div moe class="ml-3">
+                <a href="" show start>Generate</a>
+                <form url="/api/careMonth/generateRmSetupClaim">
+                    <input type="hidden" name="uid" value="{{$careMonth->uid}}">
+                    <p>Generate RM setup claim?</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
+        </div>
+    </div>
+    @endif
+
+</div>