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

locale-aware calendar grid

Browse Source
This commit is contained in:
bbedward
2025-09-20 12:45:40 -04:00
parent 50bc3db048
commit 3cac6e5eea
1 changed files with 36 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
Modules/DankDash/Overview/CalendarOverviewCard.qml
View File

@@ -13,6 +13,26 @@ Rectangle {
property var selectedDateEvents: [] property var selectedDateEvents: []
property bool hasEvents: selectedDateEvents && selectedDateEvents.length > 0 property bool hasEvents: selectedDateEvents && selectedDateEvents.length > 0
function weekStartJs() {
return Qt.locale().firstDayOfWeek % 7
}
function startOfWeek(dateObj) {
const d = new Date(dateObj)
const jsDow = d.getDay()
const diff = (jsDow - weekStartJs() + 7) % 7
d.setDate(d.getDate() - diff)
return d
}
function endOfWeek(dateObj) {
const d = new Date(dateObj)
const jsDow = d.getDay()
const add = (weekStartJs() + 6 - jsDow + 7) % 7
d.setDate(d.getDate() + add)
return d
}
function updateSelectedDateEvents() { function updateSelectedDateEvents() {
if (CalendarService && CalendarService.khalAvailable) { if (CalendarService && CalendarService.khalAvailable) {
const events = CalendarService.getEventsForDate(selectedDate) const events = CalendarService.getEventsForDate(selectedDate)
@@ -27,14 +47,16 @@ Rectangle {
return return
} }
const firstDay = new Date(calendarGrid.displayDate.getFullYear(), calendarGrid.displayDate.getMonth(), 1) const firstOfMonth = new Date(calendarGrid.displayDate.getFullYear(),
const dayOfWeek = firstDay.getDay() calendarGrid.displayDate.getMonth(), 1)
const startDate = new Date(firstDay) const lastOfMonth = new Date(calendarGrid.displayDate.getFullYear(),
startDate.setDate(startDate.getDate() - dayOfWeek - 7) calendarGrid.displayDate.getMonth() + 1, 0)
const lastDay = new Date(calendarGrid.displayDate.getFullYear(), calendarGrid.displayDate.getMonth() + 1, 0) const startDate = startOfWeek(firstOfMonth)
const endDate = new Date(lastDay) startDate.setDate(startDate.getDate() - 7)
endDate.setDate(endDate.getDate() + (6 - lastDay.getDay()) + 7)
const endDate = endOfWeek(lastOfMonth)
endDate.setDate(endDate.getDate() + 7)
CalendarService.loadEvents(startDate, endDate) CalendarService.loadEvents(startDate, endDate)
} }
@@ -195,10 +217,11 @@ Rectangle {
Repeater { Repeater {
model: { model: {
const days = [] const days = []
const locale = Qt.locale() const loc = Qt.locale()
for (var i = 0; i < 7; i++) { const qtFirst = loc.firstDayOfWeek
const date = new Date(2024, 0, 7 + i) for (let i = 0; i < 7; ++i) {
days.push(locale.dayName(i, Locale.ShortFormat)) const qtDay = ((qtFirst - 1 + i) % 7) + 1
days.push(loc.dayName(qtDay, Locale.ShortFormat))
} }
return days return days
} }
@@ -227,10 +250,8 @@ Rectangle {
property date selectedDate: systemClock.date property date selectedDate: systemClock.date
readonly property date firstDay: { readonly property date firstDay: {
const date = new Date(displayDate.getFullYear(), displayDate.getMonth(), 1) const firstOfMonth = new Date(displayDate.getFullYear(), displayDate.getMonth(), 1)
const dayOfWeek = date.getDay() return startOfWeek(firstOfMonth)
date.setDate(date.getDate() - dayOfWeek)
return date
} }
width: parent.width width: parent.width