Header updates + client dashboard UI updates

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

@@ -293,7 +293,7 @@
                 {{-- dx --}}
                 @include('app/patient/partials/dx')
 
-                <div class="mt-2">
+                {{--<div class="mt-2">
                     <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
                         <h6 class="my-0 font-weight-bold text-secondary">History</h6>
                         <span class="mx-2 text-secondary">|</span>
@@ -302,12 +302,12 @@
                             View All
                         </a>
                     </div>
-                </div>
+                </div>--}}
 
                 {{-- history_medical --}}
-                <div class="pl-2 mt-2">
+                <div class="pt-2 mt-2 border-top">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="my-0 font-weight-bold">Medical History</h6>
+                        <h6 class="my-0 font-weight-bold text-secondary">Medical History</h6>
                         <span class="mx-2 text-secondary">|</span>
                         @include('app.patient.canvas-sections.canvas-editor-modal', ['key' => 'pmhx'])
                     </div>
@@ -317,9 +317,9 @@
                 </div>
 
                 {{-- history_surgical --}}
-                <div class="pl-2 mt-2">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="my-0 font-weight-bold">Surgical History</h6>
+                        <h6 class="my-0 font-weight-bold text-secondary">Surgical History</h6>
                         <span class="mx-2 text-secondary">|</span>
                         @include('app.patient.canvas-sections.canvas-editor-modal', ['key' => 'pshx'])
                     </div>
@@ -329,9 +329,9 @@
                 </div>
 
                 {{-- history_family --}}
-                <div class="pl-2 mt-2">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="my-0 font-weight-bold">Family History</h6>
+                        <h6 class="my-0 font-weight-bold text-secondary">Family History</h6>
                         <span class="mx-2 text-secondary">|</span>
                         @include('app.patient.canvas-sections.canvas-editor-modal', ['key' => 'fhx'])
                     </div>
@@ -341,9 +341,9 @@
                 </div>
 
                 {{-- history_social --}}
-                <div class="pl-2 mt-2">
+                <div class="mt-2">
                     <div class="d-flex align-items-center pb-2">
-                        <h6 class="my-0 font-weight-bold">Social History</h6>
+                        <h6 class="my-0 font-weight-bold text-secondary">Social History</h6>
                         <span class="mx-2 text-secondary">|</span>
                         @include('app.patient.canvas-sections.canvas-editor-modal', ['key' => 'sochx'])
                     </div>

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

@@ -1,5 +1,5 @@
 <div class="mt-0 pb-1">
-    <div class="d-flex align-items-center mb-2 pb-2 border-bottom">
+    <div class="d-flex align-items-center mb-2 py-2 border-top border-bottom">
         <h6 class="my-0 font-weight-bold text-secondary">Appointments</h6>
         {{--<span class="mx-2 text-secondary">|</span>
         <div moe center>
@@ -7,62 +7,7 @@
             @include('app/patient/partials/_appointment-form', ['appointment' => false])
         </div>--}}
         <span class="mx-2 text-secondary">|</span>
-        <a href="/patients/view/{{$patient->uid}}/manage-appointment">Add</a> <span class="mx-2 text-secondary">|</span>
-        <div class="py-2">
-            @if($pro->isWorkingOnClient($patient))
-                {{-- stop work on client --}}
-                <div moe>
-                    <form url="/api/proClientWork/KillRunningWorkForSelf" class="mcp-theme-1" show>
-                        <input type="hidden" name="uid" value="{{$patient->uid}}">
-                        <div>
-                            <button submit class="btn btn-sm btn-warning text-white font-weight-bold small"><i class="fa fa-stop"></i> Work: Stop</button>
-                        </div>
-                    </form>
-                </div>
-            @else
-                {{-- start work on client --}}
-                <div moe>
-                    <form url="/api/proClientWork/create" class="mcp-theme-1" show>
-                        <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                        <div>
-                            <button submit class="btn btn-sm btn-primary text-white font-weight-bold small"><i class="fa fa-play"></i> Work: Start</button>
-                        </div>
-                    </form>
-                </div>
-            @endif
-        </div>
-        <div class="px-2 mr-auto">
-            @if($pro->isWorkingOnClient($patient))
-                <div class="d-flex align-items-center">
-                    @if($patient->active_mcp_request_id)
-                        {{-- kill mcp request for client --}}
-                        <div moe relative class="ml-3">
-                            <a href="" start show class="btn btn-sm btn-danger text-white font-weight-bold small">Kill MCP Request</a>
-                            <form url="/api/mcpRequest/kill" class="mcp-theme-1" right>
-                                <input type="hidden" name="clientUid" value="{{$patient->uid}}">
-                                <p>Kill the MCP Request for this patient?</p>
-                                <div>
-                                    <button submit class="btn btn-sm btn-primary mr-2">Yes</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    @else
-                        {{-- create mcp request for client --}}
-                        <div moe relative class="ml-3">
-                            <a href="" start show class="btn btn-sm btn-primary text-white font-weight-bold small">Create MCP Request</a>
-                            <form url="/api/mcpRequest/createAsPro" class="mcp-theme-1" right>
-                                <p>Create an MCP Request for this patient?</p>
-                                <div>
-                                    <button submit class="btn btn-sm btn-primary mr-2">Yes</button>
-                                    <button cancel class="btn btn-sm btn-default border">Cancel</button>
-                                </div>
-                            </form>
-                        </div>
-                    @endif
-                </div>
-            @endif
-        </div>
+        <a href="/patients/view/{{$patient->uid}}/manage-appointment">Add</a>
     </div>
     <table class="table table-sm border-0 m-0">
         <tbody>

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

@@ -2,7 +2,7 @@
 <?php $infoLines = !$infoLines ? [] : $infoLines; ?>
 <div moe-parent
      url="/embed/{{ $patient->uid }}/dx/{{ @$selectable ? 1 : 0 }}"
-     class="<?= !@$selectable ? 'mt-2' : 'border-bottom' ?> pb-1">
+     class="<?= !@$selectable ? '' : 'border-bottom' ?> pb-1">
     <div class="d-flex align-items-center mb-2 py-2 <?= @$selectable ? 'px-2' : 'border-top' ?> border-bottom">
 
         @if(!@$selectable)

resources/views/layouts/patient.blade.php

@@ -375,9 +375,9 @@
                                         <label class="ml-2">RM:</label> {{ $patient->is_enrolled_in_rm === 'YES' ? 'Yes' : 'No' }}
                                     </div>
                                 </section>--}}
-                                <section class="vbox ml-4">
+                                <section class="vbox mt-2 align-self-start ml-4">
                                     <div moe>
-                                        <button start show>+ Note</button>
+                                        <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;Note</button>
                                         <form url="/api/note/createUsingTemplate"
                                               redir="/patients/view/{{$patient->uid}}/notes/view/[data]"
                                               class="mcp-theme-1">
@@ -404,7 +404,7 @@
                                     </div>
                                     <div>
                                         <div moe relative>
-                                            <button start show>+ SMS</button>
+                                            <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;SMS</button>
                                             <form url="/api/clientSms/createOutgoing" right class="mcp-theme-1">
                                                 <input type="hidden" name="uid" value="{{ $patient->uid }}">
                                                 <div class="mb-2">
@@ -423,9 +423,11 @@
                                         </div>
                                     </div>
                                     <div>
-                                        <button onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')">Video</button>
-                                        <span moe relative class="ml-1">
-                                            <a start show title="SMS check-in link to the patient"><i class="on-hover-opaque fa fa-paper-plane"></i></a>
+                                        <button onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')">Video&nbsp;<i class="fa fa-play text-secondary"></i></button>
+                                    </div>
+                                    <div>
+                                        <span moe relative class="">
+                                            <button start show title="SMS check-in link to the patient">Send&nbsp;<i class="on-hover-opaque fa fa-paper-plane text-secondary"></i></button>
                                             <form url="/api/client/sendCheckInTokenViaSmsOrEmail" right class="mcp-theme-1">
                                                 <input type="hidden" name="uid" value="{{ $patient->uid }}">
                                                 <p class="small min-width-200px mb-2">Send Check-In link to patient?</p>
@@ -445,6 +447,64 @@
                                         </span>
                                     </div>
                                 </section>
+                                <section class="vbox mt-2 align-self-start ml-2">
+                                    <div class="">
+                                        @if($pro->isWorkingOnClient($patient))
+                                            {{-- stop work on client --}}
+                                            <div moe>
+                                                <form url="/api/proClientWork/KillRunningWorkForSelf" class="mcp-theme-1" show>
+                                                    <input type="hidden" name="uid" value="{{$patient->uid}}">
+                                                    <div>
+                                                        <button submit><i class="fa fa-stop text-secondary"></i>&nbsp;Work: Stop</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        @else
+                                            {{-- start work on client --}}
+                                            <div moe>
+                                                <form url="/api/proClientWork/create" class="mcp-theme-1" show>
+                                                    <input type="hidden" name="clientUid" value="{{$patient->uid}}">
+                                                    <div>
+                                                        <button submit><i class="fa fa-play text-secondary"></i>&nbsp;Work: Start</button>
+                                                    </div>
+                                                </form>
+                                            </div>
+                                        @endif
+                                    </div>
+                                    <div class="mr-auto">
+                                        @if($pro->isWorkingOnClient($patient))
+                                            <div class="d-flex align-items-center">
+                                                @if($patient->active_mcp_request_id)
+                                                    {{-- kill mcp request for client --}}
+                                                    <div moe relative class="">
+                                                        <button href="" start show class="on-hover-opaque"><i class="fa fa-times text-danger"></i>&nbsp;MCP Req.</button>
+                                                        <form url="/api/mcpRequest/kill" class="mcp-theme-1" right>
+                                                            <input type="hidden" name="clientUid" value="{{$patient->uid}}">
+                                                            <p>Kill the MCP Request for this patient?</p>
+                                                            <div>
+                                                                <button submit class="btn btn-sm btn-primary mr-2">Yes</button>
+                                                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </div>
+                                                @else
+                                                    {{-- create mcp request for client --}}
+                                                    <div moe relative class="">
+                                                        <button href="" start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;MCP Req.</button>
+                                                        <form url="/api/mcpRequest/createAsPro" class="mcp-theme-1" right>
+                                                            <p>Create an MCP Request for this patient?</p>
+                                                            <div>
+                                                                <button submit class="btn btn-sm btn-primary mr-2">Yes</button>
+                                                                <button cancel class="btn btn-sm btn-default border">Cancel</button>
+                                                            </div>
+                                                        </form>
+                                                    </div>
+                                                @endif
+                                            </div>
+                                        @endif
+                                    </div>
+                                </section>
+
                                 <ul class="vbox ml-auto mt-2 align-self-start patient-header-address">
                                     <li class="d-flex align-items-start">
                                         <span class="aligned-icon"><i class="fa fa-map-marker-alt" aria-hidden="true"></i></span>
@@ -494,7 +554,7 @@
                     </div>
                     <div class="text-container border-bottom d-flex align-items-center mcp-theme-1 px-3">
 
-                       
+
                         @if($patient->mcp_pro_id !== $pro->id && $patient->active_mcp_request_id)
                             {{-- claim client --}}
                             <div moe relative class="ml-2">