Fixed EC-398

resources/views/app/patient/partials/quick-actions-buttons.blade.php

@@ -0,0 +1,54 @@
+<div class="d-flex justify-content-around">
+	<div>
+		<div moe relative>
+			<a href="#" start show class="ml-3 d-flex align-items-baseline"><i class="fa fa-comment mr-1"></i></a>
+			<form right url="/api/clientSms/createOutgoing" class="mcp-theme-1" noreload>
+				<input type="hidden" name="uid" value="{{ $patient->uid }}">
+				<div class="mb-2">
+					<label for="" class="text-sm text-secondary mb-1">Cell
+						Number</label>
+					<input type="text" class="form-control form-control-sm" name="cellNumber" value="{{$patient->cell_number}}">
+				</div>
+				<div class="mb-2">
+					<label for="" class="text-sm text-secondary mb-1">Message</label>
+					<textarea type="text" class="form-control form-control-sm" name="message"></textarea>
+				</div>
+				<div class="d-flex align-items-center">
+					<button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+					<button class="btn btn-sm btn-default mr-2 border" cancel>
+						Cancel
+					</button>
+				</div>
+			</form>
+		</div>
+	</div>
+	<div>
+		<span moe relative class="">
+			<a href="#" start show class="ml-2 d-flex align-items-baseline" title="SMS check-in link to the patient"><i class="fa fa-paper-plane mr-1"></i></a>
+			<form right url="/api/client/sendCheckInTokenViaSmsOrEmail" 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>
+				<div class="mb-2">
+					<label for="" class="text-sm text-secondary mb-1">Cell Number</label>
+					<input type="text" class="form-control input-sm" name="cellNumber" value="{{$patient->cell_number}}">
+				</div>
+				<div class="mb-2">
+					<label for="" class="text-sm text-secondary mb-1">Email address</label>
+					<input type="text" class="form-control input-sm" name="emailAddress" value="{{$patient->email_address}}">
+				</div>
+				<div class="d-flex align-items-center">
+					<button class="btn btn-sm btn-primary mr-2" submit>Send</button>
+					<button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
+				</div>
+			</form>
+		</span>
+	</div>
+	@if($performer->pro->pro_type == 'ADMIN')
+	<div>
+		<a href="#" start class="ml-2 d-block" show onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i class="fa fa-eye mr-1"></i></a>
+	</div>
+	@endif
+	<div>
+		<a href="#" start class="ml-2 d-block" show onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')"><i class="fa fa-video mr-1"></i></a>
+	</div>
+</div>

resources/views/layouts/patient-header.blade.php

@@ -103,60 +103,28 @@ $addressParts .= implode(", ", $addressPart2);
         @endif
       </div>
     </div>
-    <div class="d-flex justify-content-around">
-      <div>
-        <div moe relative>
-          <a href="#" start show class="ml-3 d-flex align-items-baseline"><i class="fa fa-comment mr-1"></i></a>
-          <form right url="/api/clientSms/createOutgoing" class="mcp-theme-1" noreload>
-            <input type="hidden" name="uid" value="{{ $patient->uid }}">
-            <div class="mb-2">
-              <label for="" class="text-sm text-secondary mb-1">Cell
-                Number</label>
-              <input type="text" class="form-control form-control-sm" name="cellNumber" value="{{$patient->cell_number}}">
-            </div>
-            <div class="mb-2">
-              <label for="" class="text-sm text-secondary mb-1">Message</label>
-              <textarea type="text" class="form-control form-control-sm" name="message"></textarea>
-            </div>
-            <div class="d-flex align-items-center">
-              <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
-              <button class="btn btn-sm btn-default mr-2 border" cancel>
-                Cancel
-              </button>
-            </div>
-          </form>
+      <div class="d-flex align-items-start">
+        <div class="d-flex align-items-center flex-wrap">
+          <span class="ml-1 mr-2"><i class="fa fa-envelope"></i>
+            @if($hasConfirmedEmail)
+            {{$confirmedEmail}}
+            @else
+            <i>(No email address)</i>
+            @endif
+          </span>
         </div>
+
+        <div class="d-inline-flex screen-only">
+            <span class="aligned-icon text-primary">
+              <i class="fa fa-link" aria-hidden="true"></i>
+            </span>
+            <?php $numLinkedAccounts = $patient->linkedAccounts ? count($patient->linkedAccounts) : 0; ?>
+            <a href="{{route('patients.view.accounts', ['patient' => $patient])}}">
+              Accounts ({{$numLinkedAccounts}})
+            </a>
+          </div>
+
       </div>
-      <div>
-        <span moe relative class="">
-          <a href="#" start show class="ml-3 d-flex align-items-baseline" title="SMS check-in link to the patient"><i class="fa fa-paper-plane mr-1"></i></a>
-          <form right url="/api/client/sendCheckInTokenViaSmsOrEmail" 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>
-            <div class="mb-2">
-              <label for="" class="text-sm text-secondary mb-1">Cell Number</label>
-              <input type="text" class="form-control input-sm" name="cellNumber" value="{{$patient->cell_number}}">
-            </div>
-            <div class="mb-2">
-              <label for="" class="text-sm text-secondary mb-1">Email address</label>
-              <input type="text" class="form-control input-sm" name="emailAddress" value="{{$patient->email_address}}">
-            </div>
-            <div class="d-flex align-items-center">
-              <button class="btn btn-sm btn-primary mr-2" submit>Send</button>
-              <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-            </div>
-          </form>
-        </span>
-      </div>
-      @if($performer->pro->pro_type == 'ADMIN')
-      <div>
-        <a href="#" start class="ml-3 d-block" show onclick="return openInRHS('/pro/check-video/{{ $patient->uid }}')"><i class="fa fa-eye mr-1"></i></a>
-      </div>
-      @endif
-      <div>
-        <a href="#" start class="ml-3 d-block" show onclick="return openInRHS('/pro/meet/{{ $patient->uid }}')"><i class="fa fa-video mr-1"></i></a>
-      </div>
-    </div>
   </div>
 
   <div class="flex-header text-dark">
@@ -273,41 +241,44 @@ $addressParts .= implode(", ", $addressPart2);
             </form>
             @endif
           </div>
-          <div class="">
-            <span>Status:</small>
-            {{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}
+          <div class="d-flex">
+              <div>
+                <span>Status:</small>
+                {{$patient->client_engagement_status_category ? ucwords(strtolower(str_replace('_', ' ', $patient->client_engagement_status_category == 'DUMMY' ? 'Test Chart' : $patient->client_engagement_status_category))) : '-'}}
 
-            @if($pro->pro_type == 'ADMIN')
-            <div moe class="ml-2 hide-inside-popup">
-              <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
-              <form url="/api/client/updateClientEngagementAssessmentStatus" class="mcp-theme-1" target="#patient-header-content">
-                <input type="hidden" name="uid" value="{{$patient->uid}}">
-                <div class="mb-2">
-                  <label class="mb-1 text-secondary text-sm">Status</label>
-                  <select name="category" class="form-control form-control-sm">
-                    <option value=""> --select--</option>
-                    <option {{ $patient->client_engagement_status_category === 'ACTIVE' ? 'selected' : '' }} value="ACTIVE">Active</option>
-                    <option {{ $patient->client_engagement_status_category === 'INACTIVE' ? 'selected' : '' }} value="INACTIVE">Inactive</option>
-                    <option {{ $patient->client_engagement_status_category === 'ENTRY_ERROR' ? 'selected' : '' }} value="ENTRY_ERROR">Entry Error</option>
-                    <option {{ $patient->client_engagement_status_category === 'DUMMY' ? 'selected' : '' }} value="DUMMY">Test Chart</option>
-                    <option {{ $patient->client_engagement_status_category === 'DECEASED' ? 'selected' : '' }} value="DECEASED">Deceased</option>
-                    <option {{ $patient->client_engagement_status_category === 'DUPLICATE' ? 'selected' : '' }} value="DUPLICATE">Duplicate</option>
-                    <option {{ $patient->client_engagement_status_category === 'NO_LONGER_INTERESTED' ? 'selected' : '' }} value="NO_LONGER_INTERESTED">No Longer Interested</option>
-                    <option {{ $patient->client_engagement_status_category === 'BAD_RECORD' ? 'selected' : '' }} value="BAD_RECORD">Bad Record</option>
-                    <option {{ $patient->client_engagement_status_category === 'NO_LONGER_ELIGIBLE' ? 'selected' : '' }} value="NO_LONGER_ELIGIBLE">No Longer Eligible</option>
-                  </select>
-                </div>
-                <div class="mb-2">
-                  <label class="mb-1 text-secondary text-sm">Memo</label>
-                  <textarea class="form-control form-control-sm" name="memo"></textarea>
-                </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>
+                @if($pro->pro_type == 'ADMIN')
+                <div moe class="ml-2 hide-inside-popup">
+                  <a start show><i class="fa fa-edit on-hover-opaque"></i></a>
+                  <form url="/api/client/updateClientEngagementAssessmentStatus" class="mcp-theme-1" target="#patient-header-content">
+                    <input type="hidden" name="uid" value="{{$patient->uid}}">
+                    <div class="mb-2">
+                      <label class="mb-1 text-secondary text-sm">Status</label>
+                      <select name="category" class="form-control form-control-sm">
+                        <option value=""> --select--</option>
+                        <option {{ $patient->client_engagement_status_category === 'ACTIVE' ? 'selected' : '' }} value="ACTIVE">Active</option>
+                        <option {{ $patient->client_engagement_status_category === 'INACTIVE' ? 'selected' : '' }} value="INACTIVE">Inactive</option>
+                        <option {{ $patient->client_engagement_status_category === 'ENTRY_ERROR' ? 'selected' : '' }} value="ENTRY_ERROR">Entry Error</option>
+                        <option {{ $patient->client_engagement_status_category === 'DUMMY' ? 'selected' : '' }} value="DUMMY">Test Chart</option>
+                        <option {{ $patient->client_engagement_status_category === 'DECEASED' ? 'selected' : '' }} value="DECEASED">Deceased</option>
+                        <option {{ $patient->client_engagement_status_category === 'DUPLICATE' ? 'selected' : '' }} value="DUPLICATE">Duplicate</option>
+                        <option {{ $patient->client_engagement_status_category === 'NO_LONGER_INTERESTED' ? 'selected' : '' }} value="NO_LONGER_INTERESTED">No Longer Interested</option>
+                        <option {{ $patient->client_engagement_status_category === 'BAD_RECORD' ? 'selected' : '' }} value="BAD_RECORD">Bad Record</option>
+                        <option {{ $patient->client_engagement_status_category === 'NO_LONGER_ELIGIBLE' ? 'selected' : '' }} value="NO_LONGER_ELIGIBLE">No Longer Eligible</option>
+                      </select>
+                    </div>
+                    <div class="mb-2">
+                      <label class="mb-1 text-secondary text-sm">Memo</label>
+                      <textarea class="form-control form-control-sm" name="memo"></textarea>
+                    </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>
-              </form>
-            </div>
-            @endif
+                @endif
+              </div>
+            @include('app.patient.partials.quick-actions-buttons')
           </div>
 
           <div class="">
@@ -533,32 +504,6 @@ $addressParts .= implode(", ", $addressPart2);
           {{$patient->phone_home}}
         </li>
         @endif
-        <li class="d-flex align-items-start">
-          <div class="d-flex align-items-center flex-wrap">
-            <span class="ml-1 mr-2"><i class="fa fa-envelope"></i>
-              @if($hasConfirmedEmail)
-              {{$confirmedEmail}}
-              @else
-              <i>(No email address)</i>
-              @endif
-            </span>
-            {{--<div>
-                @include('app.patient.send_email')
-              </div>--}}
-          </div>
-        </li>
-
-        <li class="mb-1 d-flex align-items-start">
-          <div class="d-inline-flex screen-only">
-            <span class="aligned-icon text-primary">
-              <i class="fa fa-link" aria-hidden="true"></i>
-            </span>
-            <?php $numLinkedAccounts = $patient->linkedAccounts ? count($patient->linkedAccounts) : 0; ?>
-            <a href="{{route('patients.view.accounts', ['patient' => $patient])}}">
-              Accounts ({{$numLinkedAccounts}})
-            </a>
-          </div>
-        </li>
       </ul>
 
     </div>