changes

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

@@ -41,7 +41,7 @@ use App\Models\Handout;
     foreach($note->segments as $segment):
         if($segment->segmentTemplate){
             $segmentMap[$segment->segmentTemplate->internal_name] = $segment;
-        }       
+        }
     endforeach;
 
     $hasRightSegments = $isVisitTemplateBased && !!count($note->segmentsRight);
@@ -148,7 +148,7 @@ use App\Models\Handout;
 
     <div class="card mb-0 {{ $note->is_cancelled ? 'cancelled-item' : '' }} border-0 rounded-0">
         <div class="card-header d-flex align-items-start px-3 py-2 border-bottom rounded-0" id="note-card-header">
-            <div class="pr-2">
+            <div class="pr-3">
                 {{$note->title}}
                 @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
                     <div moe class="d-inline" relative id="note-edit-title">
@@ -207,28 +207,28 @@ use App\Models\Handout;
                         </form>
                     </div>
                 @endif
-            </div>
-            <div class="pl-2 pr-3">
-                <div class="d-flex">
+                <div class="mt-1">
+                  <div class="d-flex">
                     <span>{{friendly_date_time($note->effective_dateest, false, '')}}</span>
+                  </div>
+                  @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
+                  <div moe relative class="d-block ml-auto" id="note-edit-date">
+                    <a href="" show start></a>
+                    <form url="/api/note/putEffectiveDateEST">
+                      <input type="hidden" name="uid" value="{{$note->uid}}">
+                      <div class="mb-2">
+                        <label for="" class="text-secondary text-sm">Effective date EST</label>
+                        <input type="date" name="effectiveDateEST" value="{{$note->effective_dateest}}"
+                        class="form-control form-control-sm">
+                      </div>
+                      <div class="mb-0">
+                        <button class="btn btn-primary btn-sm" submit>Submit</button>
+                        <button class="btn btn-default border btn-sm" cancel>Cancel</button>
+                      </div>
+                    </form>
+                  </div>
+                  @endif
                 </div>
-                @if(!$note->is_signed_by_hcp || $pro->pro_type === 'ADMIN')
-                    <div moe relative class="d-block ml-auto" id="note-edit-date">
-                        <a href="" show start></a>
-                        <form url="/api/note/putEffectiveDateEST">
-                            <input type="hidden" name="uid" value="{{$note->uid}}">
-                            <div class="mb-2">
-                                <label for="" class="text-secondary text-sm">Effective date EST</label>
-                                <input type="date" name="effectiveDateEST" value="{{$note->effective_dateest}}"
-                                       class="form-control form-control-sm">
-                            </div>
-                            <div class="mb-0">
-                                <button class="btn btn-primary btn-sm" submit>Submit</button>
-                                <button class="btn btn-default border btn-sm" cancel>Cancel</button>
-                            </div>
-                        </form>
-                    </div>
-                @endif
             </div>
 
             <div class="pr-3">
@@ -264,9 +264,7 @@ use App\Models\Handout;
                         </form>
                     </div>
                 @endif
-            </div>
-
-            <div class="pr-3">
+                <div class="mt-1">
                 <div class="d-flex">
                     <span><span class="text-secondary">NA:</span> @if($note->allyPro) {{$note->allyPro->name_first}} {{$note->allyPro->name_last}} @endif</span>
                 </div>
@@ -300,6 +298,8 @@ use App\Models\Handout;
                     </div>
                 @endif
             </div>
+            </div>
+
 
             <div class="pr-3">
                 <div class="d-flex">
@@ -449,8 +449,8 @@ use App\Models\Handout;
                 {{-- v1. print-note --}}
                 {{-- v2. print-note-v2 --}}
                 {{-- v3. print-note-v3 --}}
-                <a href="{{route('print-note', ['patient' => $patient, 'note' => $note])}}" native target="_blank" class=""><i class="fa fa-print"></i></a>
-                <a href="{{route('print-note-v3', ['patient' => $patient, 'note' => $note])}}" native target="_blank" class="ml-2"><i class="fa fa-print"></i><sup class="text-danger" style="font-weight:bold;font-size: 10px;">NEW</sup></a>
+                <!-- <a href="{{route('print-note', ['patient' => $patient, 'note' => $note])}}" native target="_blank" class=""><i class="fa fa-print"></i></a> -->
+                <a href="{{route('print-note-v3', ['patient' => $patient, 'note' => $note])}}" native target="_blank"><i class="fa fa-print"></i></a>
                 @if($performer->pro->is_admin)
                     <a href="{{'/practice-management/notes-resolution-center-v2?uid='.$note->uid}}" target="_blank">NRC</a>
                 @endif

resources/views/app/patient/partials/measurement-value.blade.php

@@ -2,9 +2,9 @@
     @if($measurement->is_cellular_zero)
         <i class="font-size-11 fa fa-rss"></i>
     @elseif($measurement->label === 'BP')
-        {{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }} mmHg  <span class="font-weight-normal d-inline-block pl-2">Pulse:</span> {{ $measurement->value_pulse }} {{ $measurement->value_irregular === 0?'Irregular':'' }} {{ $measurement->value_irregular === 1?'Regular':'' }}
+        {{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }}  <span class="font-weight-normal d-inline-block pl-2">Pulse:</span> {{ $measurement->value_pulse }} @if($measurement->value_irregular === 0)<i class="ml-2 fas fa-heartbeat" title="Irregular"></i>@endif @if($measurement->value_irregular === 1)<i class="ml-2 far fa-heart" title="Regular"></i>@endif
     @elseif($measurement->label === 'Wt. (lbs.)')
-        {{ round($measurement->numeric_value) }} lbs
+        {{ round($measurement->numeric_value) }}
     @else
         {{ $measurement->value }}
     @endif
@@ -30,7 +30,7 @@
                                 @if($measurement->label === 'BP')
                                     {{ round($measurement->sbp_mm_hg, 2) }}/{{ round($measurement->dbp_mm_hg, 2) }} mmHg
                                     <span class="font-weight-normal d-inline-block pl-2">Pulse:</span>
-                                    {{ $measurement->value_pulse }} {{ $measurement->value_irregular === 0?'Irregular':'' }} {{ $measurement->value_irregular === 1?'Regular':'' }}
+                                    {{ $measurement->value_pulse }} @if($measurement->value_irregular === 0)<i class="ml-2 fas fa-heartbeat" title="Irregular"></i>@endif @if($measurement->value_irregular === 1)<i class="ml-2 far fa-heart" title="Regular"></i>@endif
                                 @elseif($measurement->label === 'Wt. (lbs.)')
                                     {{ round($measurement->numeric_value, 2) }} lbs
                                 @else
@@ -58,4 +58,4 @@
             @endif
         @endif
     @endif
-</div>
+</div>

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

@@ -28,7 +28,7 @@
                             </span>
                             <span class="font-weight-normal ml-1">
                                 @if($measurement->label == 'BP')
-                                    {{ $measurement->sbp_mm_hg }} / {{ $measurement->dbp_mm_hg }} <span class="font-weight-normal d-inline-block text-secondary pl-2">Pulse:</span> {{ $measurement->value_pulse }} {{ $measurement->value_irregular === 0?'Irregular':'' }} {{ $measurement->value_irregular === 1?'Regular':'' }}
+                                    {{ $measurement->sbp_mm_hg }} / {{ $measurement->dbp_mm_hg }} <span class="font-weight-normal d-inline-block text-secondary pl-2">Pulse:</span> {{ $measurement->value_pulse }} @if($measurement->value_irregular === 0)<i class="fas fa-heartbeat" title="Irregular"></i>@endif @if($measurement->value_irregular === 1)<i class="far fa-heart" title="Regular"></i>@endif
                                 @elseif($measurement->label == 'Wt. (lbs.)')
                                     {{round($measurement->numeric_value, 1)}} lbs.
                                 @elseif($measurement->numeric_value)