diff --git a/ayanova/src/api/locale.js b/ayanova/src/api/locale.js index b01eee23..c9d76a98 100644 --- a/ayanova/src/api/locale.js +++ b/ayanova/src/api/locale.js @@ -209,25 +209,6 @@ export default { let ret = window.$gz.DateTime.local() .setZone(timeZoneName) .toString(); - console.log("clientlocatimeblahblah", ret); - // let l = new Date(); - - // //DateTime.fromISO("2017-05-15T09:10:23", { zone: "Europe/Paris" }); - // let ret = window.$gz.DateTime.fromObject({ - // zone: timeZoneName, - // year: l.getFullYear(), - // month: l.getMonth() + 1, - // day: l.getDate(), - // hour: l.getHours(), - // minute: l.getMinutes(), - // second: l.getSeconds(), - // millisecond: l.getMilliseconds() - // }); - - // console.log("clientLocalZoneTimeStamp", { - // zoneName: timeZoneName, - // ret: ret - // }); return ret; }, /////////////////////////////////////////////// diff --git a/ayanova/src/components/data-table.vue b/ayanova/src/components/data-table.vue index 8677bb4d..57e4a4a9 100644 --- a/ayanova/src/components/data-table.vue +++ b/ayanova/src/components/data-table.vue @@ -389,6 +389,7 @@ export default { records: [], rowsPerPageItems: [5, 10, 25, 50, 100], selected: [], + timeZoneName: null, formState: { ready: false, dirty: false, @@ -724,7 +725,9 @@ export default { dataListKey: vm.dataListKey, listView: untokenizedListView, clientCriteria: vm.clientCriteria, - clientTimeStamp: window.$gz.locale.clientLocalZoneTimeStamp() + clientTimeStamp: window.$gz.locale.clientLocalZoneTimeStamp( + vm.timeZoneName + ) }); if (res.error) { @@ -1051,6 +1054,7 @@ async function fetchEnums(columnData) { // // async function initForm(vm) { + vm.timeZoneName = window.$gz.locale.getResolvedTimeZoneName(); await populateSelectionLists(vm); await loadFormSettings(vm); }