Merge branch 'master' into dev-vj

app/Models/Client.php

@@ -118,7 +118,7 @@ class Client extends Model
         return $this->hasMany(Measurement::class, 'client_id', 'id')
             /*->distinct('label')*/
             ->where('is_removed', false)
-            ->orderBy('effective_date', 'desc');
+            ->orderByRaw('ts DESC NULLS LAST');
     }
 
     public function nonZeroMeasurements()

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

@@ -43,7 +43,8 @@
                         @endif
                     </td>
                     <td>
-                        {{$measurement->ts}}
+                        {{ friendly_date_time_short_with_tz_from_timestamp_divide1000($measurement->ts, 'EASTERN') }}
+                        EST
                     </td>
                     <td class="px-2">
                         @if($measurement->careMonth)

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

@@ -34,7 +34,7 @@
                         <div class="mb-2">
                             <label for="" class="control-label">Process client bd measurements report?</label>
                         </div>
-                       
+
                         <div class="d-flex align-items-center">
                             <button class="btn btn-sm btn-primary mr-2" submit>Yes</button>
                             <button class="btn btn-sm btn-default mr-2 border" cancel>Cancel</button>
@@ -66,6 +66,7 @@
                                 @else
                                     {{ friendly_date_time_short_with_tz($measurement->effective_date, true, 'EASTERN') }}
                                 @endif
+                                EST
                             </td>
                             <td class="px-2">{{ $measurement->label }}</td>
                             <td class="px-2">