nextcloud
/
calendar
mirror of https://github.com/nextcloud/calendar
0
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5759 from nextcloud/fix/editor/sub-line-user-tz 

fix(editor): convert start date to user's tz for the sub line
This commit is contained in:
Richard Steinmetz 2024-02-14 12:48:40 +01:00 committed by GitHub
parent 8d21f8cd8f 0716226f34
commit 1fa97de18c
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/views/EditSidebar.vue
View File

@ -324,8 +324,9 @@ import InformationOutline from 'vue-material-design-icons/InformationOutline.vue
import MapMarker from 'vue-material-design-icons/MapMarker.vue'
import { shareFile } from '../services/attachmentService.js'
import { DateTimeValue, Parameter } from '@nextcloud/calendar-js'
import { Parameter } from '@nextcloud/calendar-js'
import getTimezoneManager from '../services/timezoneDataProviderService.js'
import logger from '../utils/logger.js'
export default {
name: 'EditSidebar',
@ -399,14 +400,16 @@ export default {
return ''
}
const timezone = getTimezoneManager()
.getTimezoneForId(this.calendarObjectInstance.startTimezoneId)
const startDateInTz = DateTimeValue
.fromJSDate(this.calendarObjectInstance.startDate)
.getInTimezone(timezone)
.jsDate
const userTimezone = getTimezoneManager().getTimezoneForId(this.currentUserTimezone)
if (!userTimezone) {
logger.warn(`User timezone not found: ${this.currentUserTimezone}`)
return ''
}
return moment(startDateInTz).locale(this.locale).fromNow()
const startDateInUserTz = this.calendarObjectInstance.eventComponent.startDate
.getInTimezone(userTimezone)
.jsDate
return moment(startDateInUserTz).locale(this.locale).fromNow()
},
attachments() {
return this.calendarObjectInstance?.attachments || null