From 5780c736082900a41523c5e9ff80668f476edd9a Mon Sep 17 00:00:00 2001 From: Ferdinand Thiessen Date: Sun, 4 Apr 2021 21:35:42 +0200 Subject: [PATCH] [events] Create empty models from factory function (fresh objects) --- src/plugins/events/store/models.ts | 30 +++++++++++++++++++----------- 1 file changed, 19 insertions(+), 11 deletions(-) diff --git a/src/plugins/events/store/models.ts b/src/plugins/events/store/models.ts index 2a6f7d1..2819aa1 100644 --- a/src/plugins/events/store/models.ts +++ b/src/plugins/events/store/models.ts @@ -13,15 +13,23 @@ export type EditableJob = Omit, 'id'> & { id?: number; }; -export const emptyJob: EditableJob = { - start: new Date(), - end: date.addToDate(new Date(), { hours: 1 }), - services: [], - required_services: 2, -}; +export const emptyJob = (d: Date | number = new Date()): EditableJob => + Object.assign( + {}, + { + start: date.adjustDate(d, { minutes: 0, seconds: 0 }), + end: date.addToDate(date.adjustDate(d, { minutes: 0, seconds: 0 }), { hours: 1 }), + services: [], + required_services: 2, + } + ); -export const emptyEvent: EditableEvent = { - start: new Date(), - jobs: [Object.assign({}, emptyJob)], - is_template: false, -}; +export const emptyEvent = (d: Date | number = new Date()): EditableEvent => + Object.assign( + {}, + { + start: date.adjustDate(d, { hours: 0, minutes: 0, seconds: 0 }), + jobs: [], + is_template: false, + } + );