Merge branch 'dev' of rav.triplestart.com:jmudaka/stagfe2

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

@@ -955,9 +955,6 @@ use App\Models\Handout;
                                 <p class="font-weight-bold text-secondary m-0 font-size-14">Remote Monitoring</p>
                             </div>
                             @include('app.patient.note.rm-setup')
-                            <div class="p-2">
-                                @include('app.patient.partials.client_bp_weight_phone_number_status')
-                            </div>
                         </div>
                        
                     </div>

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

@@ -420,6 +420,10 @@
                 </table>
             </div>
         @endif
+        <div class="border-top mt-2 pt-2">
+            @include('app.patient.partials.client_bp_weight_phone_number_status')
+        </div>
+        
     </div>
     <div class="col-6 border-left">
         <?php

resources/views/app/patient/partials/client_bp_weight_phone_number_status.blade.php

@@ -1,44 +1,59 @@
-<div class="mb-1">
-    <div class="border-bottom mb-2">
-        <div>
-            Please ask the client to save the following numbers for receiving measurement SMS messages.
+<div class="">
+    <div class="mb-1">
+        <span class="mb-0 mr-2"><b>Please ask the client to save the following numbers for receiving measurement SMS messages.</b>
+        <div moe>
+            <a start show><i class="fa fa-edit"></i></a>
+            <form url="/api/client/updateClientBpWeightPhoneNumberStatus" class="mcp-theme-1">
+                <input type="hidden" name="uid" value="{{$patient->uid}}">
+                <div class="mb-2 checkbox">
+                    <input type="checkbox" name="hasClientSavedBpPhoneNumber">
+                    <label class="mb-1 text-secondary text-sm">Has client saved bp phone number?</label>
+                </div>
+                <div class="mb-2">
+                    <label class="mb-1 text-secondary text-sm">Saved BP phone number</label>
+                    <input type="text" name="savedBpPhoneNumber" class="form-control form-control-sm" value="{{config('app.bpSmsNumber')}}">
+                </div>
+                <div class="mb-2 checkbox">
+                    <input type="checkbox" name="hasClientSavedWeightPhoneNumber">
+                    <label class="mb-1 text-secondary text-sm">Has client saved weight phone number?</label>
+                </div>
+                <div class="mb-2">
+                    <label class="mb-1 text-secondary text-sm">Saved weight phone number</label>
+                    <input type="text" name="savedWeightPhoneNumber" class="form-control form-control-sm" value="{{config('app.weightSmsNumber')}}">
+                </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>
-            Cardio1st BP sms number: {{config('app.bpSmsNumber')}}   
-        </div>
-        <div>
-            Cardio1st Weight sms number: {{config('app.weightSmsNumber')}}   
-        </div>
-    </div>
-    
-    <div>Has client saved BP phone number: <b>{{ $patient->clientBpWeightPhoneNumberStatus && $patient->clientBpWeightPhoneNumberStatus->has_client_saved_bp_phone_number ? 'Yes': 'No' }}</b></div>
-    <div>Saved BP Phone number: <b>{{ $patient->clientBpWeightPhoneNumberStatus ?  $patient->clientBpWeightPhoneNumberStatus->saved_bp_phone_number: '-'}}</b></div>
-    <div>Has client saved Weight phone number: <b>{{ $patient->clientBpWeightPhoneNumberStatus && $patient->clientBpWeightPhoneNumberStatus->has_client_saved_weight_phone_number ? 'Yes': 'No' }}</b></div>
-    <div>Saved Weight Phone number: <b>{{ $patient->clientBpWeightPhoneNumberStatus ? $patient->clientBpWeightPhoneNumberStatus->saved_weight_phone_number : '-' }}</b></div>
-    <div moe>
-        <a start show><i class="fa fa-edit"></i></a>
-        <form url="/api/client/updateClientBpWeightPhoneNumberStatus" class="mcp-theme-1">
-            <input type="hidden" name="uid" value="{{$patient->uid}}">
-            <div class="mb-2 checkbox">
-                <input type="checkbox" name="hasClientSavedBpPhoneNumber">
-                <label class="mb-1 text-secondary text-sm">Has client saved bp phone number?</label>
-            </div>
-            <div class="mb-2">
-                <label class="mb-1 text-secondary text-sm">Saved BP phone number</label>
-                <input type="text" name="savedBpPhoneNumber" class="form-control form-control-sm" value="{{config('app.bpSmsNumber')}}">
-            </div>
-            <div class="mb-2 checkbox">
-                <input type="checkbox" name="hasClientSavedWeightPhoneNumber">
-                <label class="mb-1 text-secondary text-sm">Has client saved weight phone number?</label>
-            </div>
-            <div class="mb-2">
-                <label class="mb-1 text-secondary text-sm">Saved weight phone number</label>
-                <input type="text" name="savedWeightPhoneNumber" class="form-control form-control-sm" value="{{config('app.weightSmsNumber')}}">
-            </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>
+        </span>
+        
     </div>
+    <table class="table table-sm table-striped table-bordered">
+        <tr>
+            <td>Cardio1st BP sms number:</td>
+            <td>{{config('app.bpSmsNumber')}}</td>
+        </tr>
+        <tr>
+            <td>Cardio1st Weight sms number:</td>
+            <td>{{config('app.weightSmsNumber')}}</td>
+        </tr>
+        <tr>
+            <td>Has client saved BP phone number:</td>
+            <td>{{ $patient->clientBpWeightPhoneNumberStatus && $patient->clientBpWeightPhoneNumberStatus->has_client_saved_bp_phone_number ? 'Yes': 'No' }}</td>
+        </tr>
+        <tr>
+            <td>Saved BP Phone number:</td>
+            <td>{{ $patient->clientBpWeightPhoneNumberStatus ?  $patient->clientBpWeightPhoneNumberStatus->saved_bp_phone_number: '-'}}</td>
+        </tr>
+        <tr>
+            <td>Has client saved Weight phone number:</td>
+            <td>{{ $patient->clientBpWeightPhoneNumberStatus && $patient->clientBpWeightPhoneNumberStatus->has_client_saved_weight_phone_number ? 'Yes': 'No' }}</td>
+        </tr>
+        <tr>
+            <td>Saved Weight Phone number:</td>
+            <td>{{ $patient->clientBpWeightPhoneNumberStatus ? $patient->clientBpWeightPhoneNumberStatus->saved_weight_phone_number : '-' }}</td>
+        </tr>
+    </table>
 </div>

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

@@ -256,6 +256,9 @@
                 </div>
             </div>
         @endif
+        <div class="border-top mt-2 pt-2">
+            @include('app.patient.partials.client_bp_weight_phone_number_status')
+        </div>
     </div>
     <div class="col-6 border-left">
         <?php

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

@@ -5,6 +5,4 @@
     <h4 class="font-weight-bold mb-3" id="rm-setup">RM Setup</h4>
 
     @include('app.patient.partials.rm-setup')
-
-    @include('app.patient.partials.client_bp_weight_phone_number_status')
 @endsection