From 007f528bcf251c53436b48e415402b9262d16b72 Mon Sep 17 00:00:00 2001
From: John Cardinal <support@ayanova.com>
Date: Thu, 12 Dec 2019 00:16:54 +0000
Subject: [PATCH]

---
 ayanova/src/components/inventorywidgetlist.vue |  4 ++--
 ayanova/src/main.js                            | 12 ++++++++----
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ayanova/src/components/inventorywidgetlist.vue b/ayanova/src/components/inventorywidgetlist.vue
index 940da518..19914883 100644
--- a/ayanova/src/components/inventorywidgetlist.vue
+++ b/ayanova/src/components/inventorywidgetlist.vue
@@ -74,10 +74,10 @@
                   {{ props.item.roles }}
                 </td>
                 <td class="text-xs-left" @click="editItem(props.item)">
-                  {{ props.item.startDate | shortdate }}
+                  {{ props.item.startDate | shortdatelocalized }}
                 </td>
                 <td class="text-xs-left" @click="editItem(props.item)">
-                  {{ props.item.endDate | shortdate }}
+                  {{ props.item.endDate | shortdatelocalized }}
                 </td>
               </tr>
             </template>
diff --git a/ayanova/src/main.js b/ayanova/src/main.js
index 38fbfb55..7810bd27 100644
--- a/ayanova/src/main.js
+++ b/ayanova/src/main.js
@@ -10,7 +10,7 @@ import "./registerServiceWorker";
 import errorHandler from "./api/errorhandler";
 import NProgress from "nprogress";
 import "nprogress/nprogress.css";
-import dayjs from "dayjs";
+import dayjs, { Dayjs } from "dayjs";
 import UTC from "dayjs/plugin/utc"; // load on demand
 dayjs.extend(UTC); // use plugin
 import lodash from "./libs/lodash.min.js";
@@ -144,10 +144,14 @@ Vue.filter("capitalize", function vueFilterCapitalize(value) {
   return value.charAt(0).toUpperCase() + value.slice(1);
 });
 
-Vue.filter("shortdate", function vueFilterShortDate(value) {
+//Convert date to localized value and return as short date format chosen
+Vue.filter("shortdatelocalized", function vueFilterShortDateLocalized(value) {
   if (!value) return "";
-  var dj = dayjs(value);
-  return dj.format("YYYY-MM-DD hh:mm:ss A");
+
+  return dayjs
+    .utc(value)
+    .add(locale.format().timeZoneOffset, "hour")
+    .format(locale.format().shortDateAndTime);
 });
 
 Vue.filter("currency", function vueFilterCurrency(value) {