Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions src/modules/main/partials/ColumnInfoPopover.vue
Original file line number Diff line number Diff line change
Expand Up @@ -72,8 +72,7 @@ export default {
},
methods: {
relativeDateTime(v) {
const value = moment.utc(v).local()
return value.format('L') === moment().format('L') ? t('tables', 'Today') + ' ' + value.format('LT') : value.format('LLLL')
return moment(v).format('L') === moment().format('L') ? t('tables', 'Today') + ' ' + moment(v).format('LT') : moment(v).format('LLLL')
},
},
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ export default class DatetimeColumn extends AbstractDatetimeColumn {
}

formatValue(value) {
return Moment.utc(value, 'YYYY-MM-DD HH:mm:ss').local().format('lll')
return Moment(value, 'YYYY-MM-DD HH:mm:ss').format('lll')
}

sort(mode, nextSorts) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default class DatetimeDateColumn extends AbstractDatetimeColumn {
}

formatValue(value) {
return Moment.utc(value, 'YYYY-MM-DD HH:mm:ss').local().format('ll')
return Moment(value, 'YYYY-MM-DD HH:mm:ss').format('ll')
}

sort(mode, nextSorts) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ export default class DatetimeTimeColumn extends AbstractDatetimeColumn {
}

formatValue(value) {
return Moment.utc(value, 'HH:mm:ss').local().format('LT')
return Moment(value, 'HH:mm:ss').format('LT')
}

sort(mode, nextSorts) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -171,10 +171,7 @@ export default {
newValue = 'none'
} else {
const format = this.getDateFormat()
const editDateTimeMoment = Moment(this.editDateTimeValue)
newValue = this.column.type === 'datetime-date'
? editDateTimeMoment.format(format)
: editDateTimeMoment.utc().format(format)
newValue = Moment(this.editDateTimeValue).format(format)
}

if (newValue === this.value) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export default {
} else if (!v) {
this.$emit('update:value', this.isMandatoryField ? null : 'none')
} else {
this.$emit('update:value', Moment(v).utc().format('YYYY-MM-DD HH:mm'))
this.$emit('update:value', Moment(v).format('YYYY-MM-DD HH:mm'))
}
},
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ export default {
if (v === 'none') {
this.$emit('update:value', v)
} else if (v) {
this.$emit('update:value', Moment(v).utc().format('HH:mm'))
this.$emit('update:value', Moment(v).format('HH:mm'))
}
},
},
Expand Down