github/directus
1
1
Fork 0
mirror of https://github.com/directus/directus.git synced 2026-04-25 03:00:53 -04:00
Code Issues Packages Projects Releases Wiki Activity

Calendar view one day added (end date) when an event is moved (#20010)

Browse Source
This commit is contained in:
Brainslug
2023-10-12 15:03:02 +02:00
committed by GitHub
parent 0494c20f5c
commit b99eeb90e2
2 changed files with 19 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
.changeset/nine-bikes-wonder.md Normal file
View File

@@ -0,0 +1,5 @@
---
"@directus/app": patch
---
Fixed date type fields adding an extra day in the calendar layout

17
app/src/layouts/calendar/index.ts
View File

@@ -24,6 +24,7 @@ import CalendarActions from './actions.vue';
import CalendarLayout from './calendar.vue';
import CalendarOptions from './options.vue';
import { LayoutOptions } from './types';
import { EventImpl } from '@fullcalendar/core/internal';
export default defineLayout<LayoutOptions>({
id: 'calendar',
@@ -185,11 +186,12 @@ export default defineLayout<LayoutOptions>({
if (!collection.value || !startDateField.value || !startDateFieldInfo.value) return;
const itemChanges: Partial<Item> = {
[startDateField.value]: adjustForType(info.event.startStr, startDateFieldInfo.value.type),
[startDateField.value]: adjustDateTimeType(info.event.startStr, startDateFieldInfo.value.type),
};
if (endDateField.value && endDateFieldInfo.value && info.event.endStr) {
itemChanges[endDateField.value] = adjustForType(info.event.endStr, endDateFieldInfo.value.type);
const endDateStr = info.event.allDay ? adjustDateType(info.event) : info.event.endStr;
itemChanges[endDateField.value] = adjustDateTimeType(endDateStr, endDateFieldInfo.value.type);
}
const endpoint = getEndpoint(collection.value);
@@ -332,12 +334,21 @@ export default defineLayout<LayoutOptions>({
};
}
function adjustForType(dateString: string, type: string) {
function adjustDateTimeType(dateString: string, type: string) {
if (type === 'dateTime') {
return dateString.substring(0, 19);
}
return dateString;
}
function adjustDateType(event: EventImpl) {
if (!event.end) return event.endStr;
// because we add a day for the "Date" type rendering we need to
// remove that extra day here before saving the updated value
const date = event.end;
date.setDate(date.getDate() - 1);
return format(date, 'yyyy-MM-dd');
}
},
});