wieerwill/platform
1
0
Fork 0
mirror of https://github.com/hcengineering/platform.git synced 2025-05-29 11:31:32 +00:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

UBERF-4238: Fix calendar utils (#4092)

Browse Source 
Signed-off-by: Andrey Sobolev <haiodo@gmail.com>
This commit is contained in:
Andrey Sobolev 2023-11-29 14:34:00 +07:00 committed by GitHub
parent 32b48d516b
commit 77c2b029b3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/src/classes.ts
View File

@ -229,7 +229,8 @@ export type DocData<T extends Doc> = T extends AttachedDoc ? AttachedData<T> : D
export enum DateRangeMode {
DATE = 'date',
TIME = 'time',
DATETIME = 'datetime'
DATETIME = 'datetime',
TIMEONLY = 'timeonly'
}
/**

14
packages/ui/src/components/calendar/DatePresenter.svelte
View File

@ -104,13 +104,17 @@
{/if}
{#if value !== null && value !== undefined}
{#if shouldShowLabel}
{new Date(value).getDate()}
{getMonthName(new Date(value), 'short')}
{#if new Date(value).getFullYear() !== today.getFullYear()}
{new Date(value).getFullYear()}
{#if mode !== DateRangeMode.TIMEONLY}
{new Date(value).getDate()}
{getMonthName(new Date(value), 'short')}
{#if new Date(value).getFullYear() !== today.getFullYear()}
{new Date(value).getFullYear()}
{/if}
{/if}
{#if withTime}
<div class="time-divider" />
{#if mode !== DateRangeMode.TIMEONLY}
<div class="time-divider" />
{/if}
{new Date(value).getHours().toString().padStart(2, '0')}
<span class="separator">:</span>
{new Date(value).getMinutes().toString().padStart(2, '0')}

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

@ -57,7 +57,7 @@ function generateDailyValues (
while (true) {
if (bySetPos == null || bySetPos.includes(getSetPos(currentDate))) {
const res = currentDate.getTime()
if (res > from && res < to) {
if (res >= from && res <= to) {
values.push(res)
}
i++
@ -66,7 +66,7 @@ function generateDailyValues (
currentDate.setDate(currentDate.getDate() + (interval ?? 1))
if (count !== undefined && i === count) break
if (endDate != null && currentDate.getTime() > endDate) break
if (currentDate.getTime() > to) break
if (currentDate.getTime() >= to) break
}
}
@ -92,7 +92,7 @@ function generateWeeklyValues (
while (date < end) {
if ((byDay == null || matchesByDay(date, byDay)) && (bySetPos == null || bySetPos.includes(getSetPos(date)))) {
const res = date.getTime()
if (res > from && res < to) {
if (res >= from && res <= to) {
values.push(res)
}
i++
@ -100,7 +100,7 @@ function generateWeeklyValues (
date = new Date(date.setDate(date.getDate() + 1))
if (count !== undefined && i === count) return
if (endDate != null && date.getTime() > endDate) return
if (date.getTime() > to) return
if (date.getTime() >= to) return
}
currentDate = new Date(next)
@ -172,7 +172,7 @@ function generateMonthlyValues (
(bySetPos == null || bySetPos.includes(getSetPos(currentDate)))
) {
const res = currentDate.getTime()
if (res > from && res < to) {
if (res >= from && res <= to) {
values.push(res)
}
i++
@ -181,7 +181,7 @@ function generateMonthlyValues (
if (count !== undefined && i === count) return
if (endDate != null && date.getTime() > endDate) return
if (date.getTime() > to) return
if (date.getTime() >= to) return
}
currentDate = new Date(next)
}
@ -212,7 +212,7 @@ function generateYearlyValues (
(bySetPos == null || bySetPos.includes(getSetPos(currentDate)))
) {
const res = currentDate.getTime()
if (res > from && res < to) {
if (res >= from && res <= to) {
values.push(res)
}
i++
@ -220,7 +220,7 @@ function generateYearlyValues (
date = new Date(date.setDate(date.getDate() + 1))
if (count !== undefined && i === count) return
if (endDate != null && date.getTime() > endDate) return
if (date.getTime() > to) return
if (date.getTime() >= to) return
}
currentDate = new Date(next)
}
@ -310,8 +310,9 @@ export function getAllEvents (events: Event[], from: Timestamp, to: Timestamp):
arr.push(instance)
instancesMap.set(instance.recurringEventId, arr)
} else {
if (from > event.dueDate) continue
if (event.date > to) continue
if (from >= event.dueDate) continue
if (event.date >= to) continue
base.push(event)
}
}
@ -325,7 +326,7 @@ export function getAllEvents (events: Event[], from: Timestamp, to: Timestamp):
...instances.filter((p) => {
return from <= p.dueDate && p.date <= to && p.isCancelled !== true
})
]
].map((it) => ({ ...it, date: Math.max(from, it.date), dueDate: Math.min(to, it.dueDate) }))
res.sort((a, b) => a.date - b.date)
return res
}