This commit is contained in:
2020-02-06 20:20:56 +00:00
parent 0f44d03c64
commit c3ead923d9
2 changed files with 12 additions and 2 deletions

View File

@@ -253,7 +253,7 @@ export default {
timeZone: timeZoneName,
dateStyle: "short",
timeStyle: "short",
hour12: locale.format().hour12
hour12: hour12
});
},
////////////////////////////////////////////////////////

View File

@@ -432,6 +432,11 @@ function buildRecords(listData, columndefinitions, filters) {
}
var ret = [];
//cache display format stuff
var timeZoneName = window.$gz.locale.getTimeZoneName();
var languageName = window.$gz.locale.getBrowserLanguages();
var hour12 = window.$gz.store.state.locale.hour12;
//comes as an array of arrays, needs to leave as an array of objects representing each row
for (var iRow = 0; iRow < listData.length; iRow++) {
var row = listData[iRow];
@@ -445,7 +450,12 @@ function buildRecords(listData, columndefinitions, filters) {
var display = column.v;
switch (dataType) {
case 1: //datetime format to shortdatetime
display = filters.shortdateandtimelocalized(display);
display = window.$gz.locale.utcDateToShortDateAndTimeLocalized(
display,
timeZoneName,
languageName,
hour12
);
break;
case 2: //date only
display = filters.shortdateonlylocalized(display);