From f38823e07755a42e8eed24e300088184e64e3971 Mon Sep 17 00:00:00 2001
From: cv <34649812+cpvalente@users.noreply.github.com>
Date: Sat, 15 May 2021 23:36:06 +0200
Subject: [PATCH] bugfixes: delay

- mismatch of event definition caused duration not to apply when event was delayed
- delays now have revision
---
 .../components/eventTimes/EventTimesVertical.jsx     | 12 +++---------
 server/data/eventsDefinition.js                      |  1 +
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/client/src/common/components/eventTimes/EventTimesVertical.jsx b/client/src/common/components/eventTimes/EventTimesVertical.jsx
index 2944de8aa..244054503 100644
--- a/client/src/common/components/eventTimes/EventTimesVertical.jsx
+++ b/client/src/common/components/eventTimes/EventTimesVertical.jsx
@@ -8,14 +8,8 @@ const label = {
 };
 
 const TimesDelayed = (props) => {
-  const {
-    handleValidate,
-    actionHandler,
-    delay,
-    timeStart,
-    timeEnd,
-    duration,
-  } = props;
+  const { handleValidate, actionHandler, delay, timeStart, timeEnd, duration } =
+    props;
 
   const scheduledStart = stringFromMillis(timeStart, false);
   const scheduledEnd = stringFromMillis(timeEnd, false);
@@ -44,7 +38,7 @@ const TimesDelayed = (props) => {
       />
       <span style={label}>Duration</span>
       <EditableTimer
-        name='duration'
+        name='durationOverride'
         validate={handleValidate}
         actionHandler={actionHandler}
         time={duration}
diff --git a/server/data/eventsDefinition.js b/server/data/eventsDefinition.js
index 0765f5b60..d98f968f8 100644
--- a/server/data/eventsDefinition.js
+++ b/server/data/eventsDefinition.js
@@ -13,6 +13,7 @@ const event = {
 const delay = {
   duration: 0,
   type: 'delay',
+  revision: 0,
 };
 
 const block = {