Songs & dates
This commit is contained in:
@@ -123,9 +123,26 @@ const todaysSermon = computed(() => {
|
||||
today.setHours(0, 0, 0, 0)
|
||||
|
||||
return activeSermons.value.find((s: any) => {
|
||||
// Check primary date
|
||||
const sermonDate = new Date(s.date + 'T00:00:00')
|
||||
sermonDate.setHours(0, 0, 0, 0)
|
||||
return sermonDate.getTime() === today.getTime()
|
||||
if (sermonDate.getTime() === today.getTime()) return true
|
||||
|
||||
// Check additional dates if they exist
|
||||
if (s.dates) {
|
||||
try {
|
||||
const additionalDates = JSON.parse(s.dates)
|
||||
return additionalDates.some((dateStr: string) => {
|
||||
const additionalDate = new Date(dateStr + 'T00:00:00')
|
||||
additionalDate.setHours(0, 0, 0, 0)
|
||||
return additionalDate.getTime() === today.getTime()
|
||||
})
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
}) || null
|
||||
})
|
||||
|
||||
@@ -137,9 +154,26 @@ const upcomingSermons = computed(() => {
|
||||
today.setHours(0, 0, 0, 0)
|
||||
|
||||
return activeSermons.value.filter((s: any) => {
|
||||
// Check primary date
|
||||
const sermonDate = new Date(s.date + 'T00:00:00')
|
||||
sermonDate.setHours(0, 0, 0, 0)
|
||||
return sermonDate.getTime() > today.getTime()
|
||||
if (sermonDate.getTime() > today.getTime()) return true
|
||||
|
||||
// Check additional dates if they exist
|
||||
if (s.dates) {
|
||||
try {
|
||||
const additionalDates = JSON.parse(s.dates)
|
||||
return additionalDates.some((dateStr: string) => {
|
||||
const additionalDate = new Date(dateStr + 'T00:00:00')
|
||||
additionalDate.setHours(0, 0, 0, 0)
|
||||
return additionalDate.getTime() > today.getTime()
|
||||
})
|
||||
} catch {
|
||||
return false
|
||||
}
|
||||
}
|
||||
|
||||
return false
|
||||
})
|
||||
})
|
||||
|
||||
|
||||
Reference in New Issue
Block a user