From c69d6e8a54a068d6cf735dde68e798b9bc14a9cf Mon Sep 17 00:00:00 2001 From: Alexander <45934058+GrefriT@users.noreply.github.com> Date: Sat, 16 Oct 2021 01:26:13 +0300 Subject: [PATCH] Update calendar fix with _between (#8843) * fix 8824 * changed calendarFilter type Co-authored-by: Rijk van Zanten --- app/src/layouts/calendar/index.ts | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) diff --git a/app/src/layouts/calendar/index.ts b/app/src/layouts/calendar/index.ts index ada6c3ab23..4e68ebe417 100644 --- a/app/src/layouts/calendar/index.ts +++ b/app/src/layouts/calendar/index.ts @@ -62,20 +62,13 @@ export default defineLayout({ _and: [ { [startDateField.value]: { - _gte: formatISO(calendar.value.view.currentStart), - }, - }, - { - [startDateField.value]: { - _lte: formatISO(calendar.value.view.currentEnd), + _between: [formatISO(calendar.value.view.currentStart), formatISO(calendar.value.view.currentEnd)], }, }, ], }; - if (filter.value) { - calendarFilter._and.push(filter.value); - } + if (filter.value) calendarFilter._and.push(filter.value); return calendarFilter; });