hcengineering/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2024-12-23 03:22:19 +03:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix recurring rules parse (#3753)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2023-09-28 14:05:50 +06:00 committed by GitHub
parent 1ca9de297a
commit 95cc0bb32a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,11 +78,11 @@ function generateWeeklyValues (
to: Timestamp
): void {
const { count, endDate, interval } = rule
let { byDay, wkst, bySetPos } = rule
let { byDay, bySetPos } = rule
let i = 0
if (byDay === undefined) {
byDay = [getWeekday(currentDate, wkst)]
byDay = [getWeekday(currentDate)]
}
while (true) {
@ -90,10 +90,7 @@ function generateWeeklyValues (
const end = new Date(new Date(currentDate).setDate(currentDate.getDate() + 7))
let date = currentDate
while (date < end) {
if (
(byDay == null || matchesByDay(date, byDay, wkst)) &&
(bySetPos == null || bySetPos.includes(getSetPos(date)))
) {
if ((byDay == null || matchesByDay(date, byDay)) && (bySetPos == null || bySetPos.includes(getSetPos(date)))) {
const res = date.getTime()
if (res > from) {
values.push(res)
@ -110,8 +107,8 @@ function generateWeeklyValues (
}
}
function matchesByDay (date: Date, byDay: string[], wkst: string | undefined): boolean {
const weekday = getWeekday(date, wkst)
function matchesByDay (date: Date, byDay: string[]): boolean {
const weekday = getWeekday(date)
const dayOfMonth = Math.floor((date.getDate() - 1) / 7) + 1
for (const byDayItem of byDay) {
@ -157,7 +154,7 @@ function generateMonthlyValues (
to: Timestamp
): void {
const { count, endDate, interval } = rule
let { byDay, byMonthDay, bySetPos, wkst } = rule
let { byDay, byMonthDay, bySetPos } = rule
let i = 0
if (byDay == null && byMonthDay == null) {
@ -170,7 +167,7 @@ function generateMonthlyValues (
let date = currentDate
while (date < end) {
if (
(byDay == null || matchesByDay(date, byDay, wkst)) &&
(byDay == null || matchesByDay(date, byDay)) &&
(byMonthDay == null || byMonthDay.includes(new Date(currentDate).getDate())) &&
(bySetPos == null || bySetPos.includes(getSetPos(currentDate)))
) {
@ -198,7 +195,7 @@ function generateYearlyValues (
to: Timestamp
): void {
const { count, endDate, interval } = rule
const { byDay, byMonthDay, byYearDay, byWeekNo, byMonth, bySetPos, wkst } = rule
const { byDay, byMonthDay, byYearDay, byWeekNo, byMonth, bySetPos } = rule
let i = 0
while (true) {
@ -207,7 +204,7 @@ function generateYearlyValues (
let date = currentDate
while (date < end) {
if (
(byDay == null || matchesByDay(date, byDay, wkst)) &&
(byDay == null || matchesByDay(date, byDay)) &&
(byMonthDay == null || byMonthDay.includes(currentDate.getDate())) &&
(byYearDay == null || byYearDay.includes(getYearDay(currentDate))) &&
(byWeekNo == null || byWeekNo.includes(getWeekNumber(currentDate))) &&
@ -242,17 +239,10 @@ function getSetPos (date: Date): number {
/**
* @public
*/
export function getWeekday (date: Date, wkst?: string): string {
export function getWeekday (date: Date): string {
const weekdays = ['SU', 'MO', 'TU', 'WE', 'TH', 'FR', 'SA']
const weekday = weekdays[date.getDay()]
if (wkst !== undefined && wkst !== 'MO') {
const wkstIndex = weekdays.indexOf(wkst)
const offset = wkstIndex > 0 ? wkstIndex - 1 : 6
return weekdays[(date.getDay() + offset) % 7]
}
return weekday
}