Salastil/DankMaterialShell
1
0
Fork 0
mirror of https://github.com/AvengeMedia/DankMaterialShell.git synced 2026-01-30 00:12:50 -05:00
Code Packages Releases Activity

calendar: detect and parse 12-hour event start/end times (#464)

Browse Source
This commit is contained in:
Jaren Glenn
2025-10-16 20:10:05 +00:00
committed by GitHub
parent 0e215d69cb
commit 5758d7274e
1 changed files with 33 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
Services/CalendarService.qml
View File

@@ -174,17 +174,42 @@ Singleton {
// Parse time if available and not all-day // Parse time if available and not all-day
let timeStr = event['start-time'] let timeStr = event['start-time']
if (timeStr) { if (timeStr) {
let timeParts = timeStr.match(/(\d+):(\d+)/) // Match time with optional seconds and AM/PM
let timeParts = timeStr.match(/(\d+):(\d+)(?::\d+)?\s*(AM|PM)?/i)
if (timeParts) { if (timeParts) {
startTime.setHours(parseInt(timeParts[1]), let hours = parseInt(timeParts[1])
parseInt(timeParts[2])) let minutes = parseInt(timeParts[2])
// Handle AM/PM conversion if present
if (timeParts[3]) {
let period = timeParts[3].toUpperCase()
if (period === 'PM' && hours !== 12) {
hours += 12
} else if (period === 'AM' && hours === 12) {
hours = 0
}
}
startTime.setHours(hours, minutes)
if (event['end-time']) { if (event['end-time']) {
let endTimeParts = event['end-time'].match( let endTimeParts = event['end-time'].match(
/(\d+):(\d+)/) /(\d+):(\d+)(?::\d+)?\s*(AM|PM)?/i)
if (endTimeParts) if (endTimeParts) {
endTime.setHours( let endHours = parseInt(endTimeParts[1])
parseInt(endTimeParts[1]), let endMinutes = parseInt(endTimeParts[2])
parseInt(endTimeParts[2]))
// Handle AM/PM conversion if present
if (endTimeParts[3]) {
let endPeriod = endTimeParts[3].toUpperCase()
if (endPeriod === 'PM' && endHours !== 12) {
endHours += 12
} else if (endPeriod === 'AM' && endHours === 12) {
endHours = 0
}
}
endTime.setHours(endHours, endMinutes)
}
} else { } else {
// Default to 1 hour duration on same day // Default to 1 hour duration on same day
endTime = new Date(startTime) endTime = new Date(startTime)