wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-04-21 07:46:24 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

UBER-1204 (#4654)

Browse Source 
Signed-off-by: Denis Bykhov <bykhov.denis@gmail.com>
This commit is contained in:
Denis Bykhov 2024-02-15 21:21:26 +06:00 committed by GitHub
parent 42afb67525
commit e8dd69dcef
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -57,6 +57,8 @@ function generateDailyValues (
while (true) { while (true) {
if (bySetPos == null || bySetPos.includes(getSetPos(currentDate))) { if (bySetPos == null || bySetPos.includes(getSetPos(currentDate))) {
const res = currentDate.getTime() const res = currentDate.getTime()
if (currentDate.getTime() > to) break
if (endDate != null && currentDate.getTime() > endDate) break
if (res >= from && res <= to) { if (res >= from && res <= to) {
values.push(res) values.push(res)
} }
@ -65,8 +67,6 @@ function generateDailyValues (
currentDate.setDate(currentDate.getDate() + (interval ?? 1)) currentDate.setDate(currentDate.getDate() + (interval ?? 1))
if (count !== undefined && i === count) break if (count !== undefined && i === count) break
if (endDate != null && currentDate.getTime() > endDate) break
if (currentDate.getTime() >= to) break
} }
} }
@ -90,6 +90,8 @@ function generateWeeklyValues (
const end = new Date(new Date(currentDate).setDate(currentDate.getDate() + 7)) const end = new Date(new Date(currentDate).setDate(currentDate.getDate() + 7))
let date = currentDate let date = currentDate
while (date < end) { while (date < end) {
if (endDate != null && date.getTime() > endDate) return
if (date.getTime() > to) return
if ((byDay == null || matchesByDay(date, byDay)) && (bySetPos == null || bySetPos.includes(getSetPos(date)))) { if ((byDay == null || matchesByDay(date, byDay)) && (bySetPos == null || bySetPos.includes(getSetPos(date)))) {
const res = date.getTime() const res = date.getTime()
if (res >= from && res <= to) { if (res >= from && res <= to) {
@ -99,8 +101,6 @@ function generateWeeklyValues (
} }
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
if (endDate != null && date.getTime() > endDate) return
if (date.getTime() >= to) return
} }
currentDate = new Date(next) currentDate = new Date(next)
@ -166,6 +166,8 @@ function generateMonthlyValues (
const end = new Date(new Date(currentDate).setMonth(currentDate.getMonth() + 1)) const end = new Date(new Date(currentDate).setMonth(currentDate.getMonth() + 1))
let date = currentDate let date = currentDate
while (date < end) { while (date < end) {
if (endDate != null && date.getTime() > endDate) return
if (date.getTime() >= to) return
if ( if (
(byDay == null || matchesByDay(date, byDay)) && (byDay == null || matchesByDay(date, byDay)) &&
(byMonthDay == null || byMonthDay.includes(new Date(currentDate).getDate())) && (byMonthDay == null || byMonthDay.includes(new Date(currentDate).getDate())) &&
@ -180,8 +182,6 @@ function generateMonthlyValues (
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
if (endDate != null && date.getTime() > endDate) return
if (date.getTime() >= to) return
} }
currentDate = new Date(next) currentDate = new Date(next)
} }
@ -203,6 +203,8 @@ function generateYearlyValues (
const end = new Date(new Date(currentDate).setFullYear(currentDate.getFullYear() + 1)) const end = new Date(new Date(currentDate).setFullYear(currentDate.getFullYear() + 1))
let date = currentDate let date = currentDate
while (date < end) { while (date < end) {
if (endDate != null && date.getTime() > endDate) return
if (date.getTime() > to) return
if ( if (
(byDay == null || matchesByDay(date, byDay)) && (byDay == null || matchesByDay(date, byDay)) &&
(byMonthDay == null || byMonthDay.includes(currentDate.getDate())) && (byMonthDay == null || byMonthDay.includes(currentDate.getDate())) &&
@ -219,8 +221,6 @@ function generateYearlyValues (
} }
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
if (endDate != null && date.getTime() > endDate) return
if (date.getTime() >= to) return
} }
currentDate = new Date(next) currentDate = new Date(next)
} }