Merge branch 'master' into dev-vj

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

@@ -25,7 +25,7 @@
                         <div class="d-flex align-items-center">
                             <button class="btn btn-sm btn-primary mr-2" submit>Save</button>
                             <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
-                        </div>
+                        </div>Me
                     </form>
                 </div>
                 <span class="mx-2 text-secondary">|</span>
@@ -95,7 +95,7 @@
                                 @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
+                                    {{ $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':'' }}
                                 @elseif($measurement->label === 'Wt. (lbs.)')
                                     {{ $measurement->numeric_value }} lbs
                                 @else

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

@@ -106,7 +106,7 @@
                             </span>
                             <span class="font-weight-bold ml-1">
                                 @if($measurement->label == 'BP')
-                                    {{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }} mm Hg
+                                    {{ $measurement->sbp_mm_hg }}/{{ $measurement->dbp_mm_hg }} mm Hg <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':'' }}
                                 @elseif($measurement->label == 'Wt. (lbs.)')
                                     {{round($measurement->numeric_value, 1)}} lbs.
                                 @elseif($measurement->numeric_value)