wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-01-23 20:13:20 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Fix calendar yearly events duplicates (#5874)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2024-06-20 21:09:56 +05:00 committed by GitHub
parent 30753b4a7a
commit 7ea0a05f59
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 23 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
plugins/calendar/src/utils.ts
View File

@ -206,20 +206,36 @@ function generateYearlyValues (
if (endDate != null && date.getTime() > endDate) return if (endDate != null && date.getTime() > endDate) return
if (date.getTime() > to) return if (date.getTime() > to) return
if ( if (
(byDay == null || matchesByDay(date, byDay)) && byDay == null &&
(byMonthDay == null || byMonthDay.includes(currentDate.getDate())) && byMonthDay == null &&
(byYearDay == null || byYearDay.includes(getYearDay(currentDate))) && byYearDay == null &&
(byWeekNo == null || byWeekNo.includes(getWeekNumber(currentDate))) && byWeekNo == null &&
(byMonth == null || byMonth.includes(currentDate.getMonth())) && byMonth == null &&
(bySetPos == null || bySetPos.includes(getSetPos(currentDate))) bySetPos == null
) { ) {
date = new Date(next)
const res = currentDate.getTime() const res = currentDate.getTime()
if (res >= from && res <= to) { if (res >= from && res <= to) {
values.push(res) values.push(res)
} }
i++ i++
} else {
if (
(byDay == null || matchesByDay(date, byDay)) &&
(byMonthDay == null || byMonthDay.includes(currentDate.getDate())) &&
(byYearDay == null || byYearDay.includes(getYearDay(currentDate))) &&
(byWeekNo == null || byWeekNo.includes(getWeekNumber(currentDate))) &&
(byMonth == null || byMonth.includes(currentDate.getMonth())) &&
(bySetPos == null || bySetPos.includes(getSetPos(currentDate)))
) {
const res = currentDate.getTime()
if (res >= from && res <= to) {
values.push(res)
}
i++
}
date = new Date(date.setDate(date.getDate() + 1))
} }
date = new Date(date.setDate(date.getDate() + 1))
if (count !== undefined && i === count) return if (count !== undefined && i === count) return
} }
currentDate = new Date(next) currentDate = new Date(next)