Merge pull request #291 from ymaheshwari1/#284

Improved: dateTime method to honor the timeZone selected for the current user(#284)
hotwax · Apr 26, 2024 · d1ad543 · d1ad543
2 parents b05740c + 9069bed
commit d1ad543
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/src/components/DxpAppVersionInfo.vue b/src/components/DxpAppVersionInfo.vue
@@ -14,11 +14,13 @@
 <script setup lang="ts">
 import { IonButton } from '@ionic/vue';
 import { DateTime } from 'luxon';
-import { appContext, translate } from 'src';
+import { appContext, translate, useUserStore } from 'src';
 import { computed } from 'vue';
 
 declare var process: any;
 
+const userStore = useUserStore();
+
 const appState = appContext.config.globalProperties.$store
 const pwaState = computed(() => appState.getters['user/getPwaState'])
 
@@ -30,5 +32,5 @@ const refreshApp = () => {
 
 const appInfo = (process.env.VUE_APP_VERSION_INFO ? JSON.parse(process.env.VUE_APP_VERSION_INFO) : {}) as any;
 const appVersion = appInfo.branch ? (appInfo.branch + "-" + appInfo.revision) : appInfo.tag;
-const getDateTime = (time: any) => DateTime.fromMillis(time).toLocaleString(DateTime.DATETIME_MED);
+const getDateTime = (time: any) => DateTime.fromMillis(time).setZone(userStore.currentTimeZoneId).toLocaleString(DateTime.DATETIME_MED);
 </script>