Peter Muturi 3 år sedan
förälder
incheckning
b7feda5f5d
1 ändrade filer med 30 tillägg och 32 borttagningar
  1. 30 32
      resources/views/layouts/patient.blade.php

+ 30 - 32
resources/views/layouts/patient.blade.php

@@ -339,10 +339,8 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 										</a>
 									</div>
 								@endif
-								<div class=hbox>
-									<div class="screen-only mr-1 patient-presence-indicator thumbnail {{$online}}"
-										 data-patient-uid="{{$patient->uid}}"
-										 style="background-image:<?=$thumbnail?>"><?=$initials?></div>
+								<div class="hbox justify-content-between">
+
 									{{--<div>
 										<div @if($patient->is_microphone_available)style="color:green" @else style="color:gray"  @endif>
 											<i class="fa fa-microphone"></i>
@@ -354,6 +352,9 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 									<section>
 										<div class=hbox>
 											<h4>{{$patientName}}</h4>
+											<div class="screen-only mr-1 patient-presence-indicator thumbnail {{$online}}"
+											data-patient-uid="{{$patient->uid}}"
+											style="background-image:<?=$thumbnail?>"><?=$initials?></div>
 											<i class=chart>[#{{$patient->chart_number}}]</i>
 										</div>
 										<div class=separators>
@@ -515,19 +516,19 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
 														<div class="mb-2">
 															<label class="text-secondary text-sm">Remove Physician Pro</label>
 
-                                                            </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>
-                                                @endif
-                                            @endif
-                                        </div>
+                                          </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>
+                              @endif
+                          @endif
+                      </div>
 											<div>
 												<label>Engagement Status:</label>
 												<b>{{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category))) : '-'}}</b>
@@ -621,7 +622,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
                                     <section class="hide-inside-popup screen-only vbox mt-2 align-self-start ml-4">
 
                                         <div moe>
-                                            <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;Note
+                                            <button class="col-2-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]"
@@ -672,7 +673,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
                                         </div>
                                         <div>
                                             <div moe relative>
-                                                <button start show><i class="fa fa-plus text-sm text-secondary"></i>&nbsp;SMS
+                                                <button class="col-2-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 }}">
@@ -699,7 +700,7 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
                                         </div>
                                         <div>
                                         <span moe relative class="">
-                                            <button start show title="SMS check-in link to the patient">Send&nbsp;<i
+                                            <button class="col-2-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">
@@ -725,24 +726,21 @@ $isVisitNote = ($routeName === 'patients.view.notes.view.dashboard' && @$note &&
                                             </form>
                                         </span>
                                         </div>
-                                    </section>
-									
-                                    <section class="hide-inside-popup screen-only vbox mt-2 align-self-start ml-1">
-                                        @if($performer->pro->pro_type == 'ADMIN')
-                                        <div>
-                                            <button class="col-2-button" onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')">Check Video</button>
-                                        </div>
-                                        @endif
-										<div>
-											<button class="col-2-button" onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')">Join Video</button>
-										</div>
+																				@if($performer->pro->pro_type == 'ADMIN')
+																				<div>
+																					<button class="col-2-button" onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')">Check Video</button>
+																				</div>
+																				@endif
+																				<div>
+																					<button class="col-2-button" onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')">Join Video</button>
+																				</div>
                                     </section>
 
 									<section class="hide-inside-popup screen-only vbox align-self-start mt-2 mx-2">
 										@include('app.patient.coverage-status')
 									</section>
 
-									<ul class="vbox ml-auto mt-2 align-self-start patient-header-address">
+									<ul class="vbox 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>