diff --git a/src/modules/main/partials/ColumnInfoPopover.vue b/src/modules/main/partials/ColumnInfoPopover.vue index 9e3bd229ec..2d04c6e6f4 100644 --- a/src/modules/main/partials/ColumnInfoPopover.vue +++ b/src/modules/main/partials/ColumnInfoPopover.vue @@ -72,7 +72,9 @@ export default { }, methods: { relativeDateTime(v) { - return moment(v).format('L') === moment().format('L') ? t('tables', 'Today') + ' ' + moment(v).format('LT') : moment(v).format('LLLL') + const value = moment.utc(v).local() + + return value.format('L') === moment().format('L') ? t('tables', 'Today') + ' ' + value.format('LT') : value.format('LLLL') }, }, } diff --git a/src/shared/components/ncTable/mixins/columnsTypes/datetime.js b/src/shared/components/ncTable/mixins/columnsTypes/datetime.js index e4d32af108..781fa5f54a 100644 --- a/src/shared/components/ncTable/mixins/columnsTypes/datetime.js +++ b/src/shared/components/ncTable/mixins/columnsTypes/datetime.js @@ -19,7 +19,7 @@ export default class DatetimeColumn extends AbstractDatetimeColumn { } formatValue(value) { - return Moment(value, 'YYYY-MM-DD HH:mm:ss').format('lll') + return Moment.utc(value, 'YYYY-MM-DD HH:mm:ss').local().format('lll') } sort(mode, nextSorts) { diff --git a/src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js b/src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js index db3d9cf6d6..45660a0293 100644 --- a/src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js +++ b/src/shared/components/ncTable/mixins/columnsTypes/datetimeDate.js @@ -15,7 +15,7 @@ export default class DatetimeDateColumn extends AbstractDatetimeColumn { } formatValue(value) { - return Moment(value, 'YYYY-MM-DD HH:mm:ss').format('ll') + return Moment.utc(value, 'YYYY-MM-DD HH:mm:ss').local().format('ll') } sort(mode, nextSorts) { diff --git a/src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js b/src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js index 04dc8a3a97..f04b261ec7 100644 --- a/src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js +++ b/src/shared/components/ncTable/mixins/columnsTypes/datetimeTime.js @@ -15,7 +15,7 @@ export default class DatetimeTimeColumn extends AbstractDatetimeColumn { } formatValue(value) { - return Moment(value, 'HH:mm:ss').format('LT') + return Moment.utc(value, 'HH:mm:ss').local().format('LT') } sort(mode, nextSorts) { diff --git a/src/shared/components/ncTable/partials/TableCellDateTime.vue b/src/shared/components/ncTable/partials/TableCellDateTime.vue index 3c69a8bd67..fb3fb7466b 100644 --- a/src/shared/components/ncTable/partials/TableCellDateTime.vue +++ b/src/shared/components/ncTable/partials/TableCellDateTime.vue @@ -171,7 +171,7 @@ export default { newValue = 'none' } else { const format = this.getDateFormat() - newValue = Moment(this.editDateTimeValue).format(format) + newValue = Moment(this.editDateTimeValue).utc().format(format) } if (newValue === this.value) { diff --git a/src/shared/components/ncTable/partials/rowTypePartials/DatetimeForm.vue b/src/shared/components/ncTable/partials/rowTypePartials/DatetimeForm.vue index 0e0fe07a3f..0bdd0735f7 100644 --- a/src/shared/components/ncTable/partials/rowTypePartials/DatetimeForm.vue +++ b/src/shared/components/ncTable/partials/rowTypePartials/DatetimeForm.vue @@ -59,7 +59,7 @@ export default { } else if (!v) { this.$emit('update:value', this.isMandatoryField ? null : 'none') } else { - this.$emit('update:value', Moment(v).format('YYYY-MM-DD HH:mm')) + this.$emit('update:value', Moment(v).utc().format('YYYY-MM-DD HH:mm')) } }, }, diff --git a/src/shared/components/ncTable/partials/rowTypePartials/DatetimeTimeForm.vue b/src/shared/components/ncTable/partials/rowTypePartials/DatetimeTimeForm.vue index 64face9d79..941b485b11 100644 --- a/src/shared/components/ncTable/partials/rowTypePartials/DatetimeTimeForm.vue +++ b/src/shared/components/ncTable/partials/rowTypePartials/DatetimeTimeForm.vue @@ -63,7 +63,7 @@ export default { if (v === 'none') { this.$emit('update:value', v) } else if (v) { - this.$emit('update:value', Moment(v).format('HH:mm')) + this.$emit('update:value', Moment(v).utc().format('HH:mm')) } }, },