Forráskód Böngészése

updated measurements

logicpowerhouse 4 éve
szülő
commit
49b193252c

+ 19 - 0
app/Helpers/helpers.php

@@ -80,6 +80,25 @@ if(!function_exists('friendly_date_time_short_with_tz_from_timestamp')) {
     }
 }
 
+if(!function_exists('friendly_date_time_short_with_tz_from_timestamp_divide1000')) {
+    function friendly_date_time_short_with_tz_from_timestamp_divide1000($value, $tz='UTC', $default = '-') {
+
+        if(!$value || empty($value)) return $default;
+        try {
+            $value = (floor($value / 1000));
+            $realTimezone = resolve_timezone($tz);
+            $date = new DateTime("@$value");
+            $date->setTimezone(new DateTimeZone($realTimezone));
+
+            return $date->format("m/d/y, h:iA");
+
+        }
+        catch (Exception $e) {
+            return $e->getMessage();
+        }
+    }
+}
+
 if(!function_exists('friendly_date')) {
     function friendly_date($value) {
         if(!$value || empty($value)) return '';

+ 1 - 1
resources/views/app/patient/partials/measurements.blade.php

@@ -91,7 +91,7 @@
                                     {{ $measurement->value }}
                                 @endif
                             </span>
-                            <span class="font-weight-normal text-secondary ml-2 text-sm">({{ $measurement->ts ? friendly_date_time_short_with_tz_from_timestamp(floor($measurement->ts / 1000), 'EASTERN') : friendly_date_time($measurement->effective_date, false) }})</span>
+                            <span class="font-weight-normal text-secondary ml-2 text-sm">({{ $measurement->ts ? friendly_date_time_short_with_tz_from_timestamp_divide1000($measurement->ts, 'EASTERN') : friendly_date_time($measurement->effective_date, false) }})</span>
                         </div>
                     </td>
                 </tr>