Merge branch 'master' into dev-vj

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

@@ -557,7 +557,22 @@
                                     <i class="fa fa-check"></i>
                                     Note Signed
                                 </div>
-                                @if($pro->pro_type === 'ADMIN' || ($note->hcpPro && $pro->id === $note->hcpPro->id))
+                                @if($pro->pro_type === 'ADMIN')
+                                    <div class="ml-3">
+                                        <div moe>
+                                            <a class="" href="" show start>Undo Sign As Hcp</a>
+                                            <form url="/api/note/adminUndoSignAsHcp" right>
+                                                <input type="hidden" name="uid" value="{{$note->uid}}">
+                                                <p>Undo HCP signature?</p>
+                                                <div class="mb-0">
+                                                    <button class="btn btn-success btn-sm" submit>Sign</button>
+                                                    <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                                                </div>
+                                            </form>
+                                        </div>
+                                    </div>
+                                @endif
+                                @if($pro->pro_type === 'ADMIN' || ($note->hcpPro && $pro->id === $note->hcpPro->id)) 
                                     <div class="ml-3 screen-only">
                                         @include('app/patient/note/_create-bill-only')
                                     </div>

resources/views/app/patient/note/rhs-sidebar.blade.php

@@ -15,6 +15,7 @@
          @if($careMonth)
          href="/patients/view/{{ $note->client->uid }}/care-months/view/{{$careMonth->uid}}?fromNoteUid={{$note->uid}}"
          @endif
+         >
         <div class="font-weight-bold">
             Recent Measurements
         </div>

resources/views/app/patient/vitals-settings/bp-management-summary.blade.php

@@ -1,6 +1,6 @@
 
 <div class="row">
-    <div class="col-5 border-right">
+    <div class="col-6 border-right">
         <h6 class="text-secondary font-weight-bold mb-3">Usual:</h6>
         <div class="d-flex mb-3">
             <div class="pl-3">
@@ -126,12 +126,12 @@
                         <span><b><?= vsValue('yellow_alert_when_pulse_below', $patient) ?></b></span>
                         <span class="ml-2">BPM</span>
                     </div>
-                </div>   
-            </div>         
+                </div>
+            </div>
         </div>
 
     </div>
-    <div class="col-6 offset-1">
+    <div class="col-6">
         <div class="table-responsive">
             <table class="table table-sm table-striped table-bordered">
                 <tbody>
@@ -171,4 +171,4 @@
             </table>
         </div>
     </div>
-</div>
+</div>