Feat/countdown style (#290)

* feat: Countdown Style

---------

Co-authored-by: Fabian Posenau <fabian@fphome.de>
Co-authored-by: cv <34649812+cpvalente@users.noreply.github.com>
Co-authored-by: Fabian Posenau <19673098+kellhogs@users.noreply.github.com>

apps/server/src/models/eventsDefinition.js

@@ -1,35 +0,0 @@
-export const event = {
-  title: '',
-  subtitle: '',
-  presenter: '',
-  note: '',
-  timeType: 'start-end',
-  timeStart: 0,
-  timeEnd: 0,
-  duration: 0,
-  isPublic: false,
-  skip: false,
-  colour: '',
-  user0: '',
-  user1: '',
-  user2: '',
-  user3: '',
-  user4: '',
-  user5: '',
-  user6: '',
-  user7: '',
-  user8: '',
-  user9: '',
-  type: 'event',
-  revision: 0,
-};
-
-export const delay = {
-  duration: 0,
-  type: 'delay',
-  revision: 0,
-};
-
-export const block = {
-  type: 'block',
-};

apps/server/src/models/eventsDefinition.ts

@@ -0,0 +1,38 @@
+import { OntimeBlock, OntimeDelay, OntimeEvent, SupportedEvent, TimerType } from 'ontime-types';
+
+export const event: Omit<OntimeEvent, 'id'> = {
+  title: '',
+  subtitle: '',
+  presenter: '',
+  note: '',
+  timerBehaviour: 'start-end',
+  timerType: TimerType.CountDown,
+  timeStart: 0,
+  timeEnd: 0,
+  duration: 0,
+  isPublic: false,
+  skip: false,
+  colour: '',
+  user0: '',
+  user1: '',
+  user2: '',
+  user3: '',
+  user4: '',
+  user5: '',
+  user6: '',
+  user7: '',
+  user8: '',
+  user9: '',
+  type: SupportedEvent.Event,
+  revision: 0,
+};
+
+export const delay: Omit<OntimeDelay, 'id'> = {
+  duration: 0,
+  type: SupportedEvent.Delay,
+  revision: 0,
+};
+
+export const block: Omit<OntimeBlock, 'id'> = {
+  type: SupportedEvent.Block,
+};

apps/server/src/services/TimerService.ts

@@ -1,4 +1,4 @@
-import { TimerLifeCycle } from 'ontime-types';
+import { TimerLifeCycle, TimerType } from 'ontime-types';
 
 import { eventStore } from '../stores/EventStore.js';
 import { PlaybackService } from './PlaybackService.js';
@@ -27,6 +27,7 @@ export class TimerService {
     secondaryTimer: number | null;
     selectedEventId: string | null;
     duration: number | null;
+    timerType: TimerType | null;
   };
 
   /**
@@ -91,6 +92,7 @@ export class TimerService {
       secondaryTimer: null,
       selectedEventId: null,
       duration: null,
+      timerType: null,
     };
     this.loadedTimerId = null;
     this._pausedInterval = 0;
@@ -121,6 +123,7 @@ export class TimerService {
 
     // update relevant information and force update
     this.timer.duration = timer.duration;
+    this.timer.timerType = timer.timerType;
 
     // this might not be ideal
     this.timer.finishedAt = null;
@@ -138,7 +141,8 @@ export class TimerService {
    * @param {number} timer.timeStart
    * @param {number} timer.timeEnd
    * @param {number} timer.duration
-   * @param {string} timer.timeType
+   * @param {string} timer.timerBehaviour
+   * @param {string} timer.timerType
    * @param {boolean} timer.skip
    */
   load(timer) {
@@ -152,6 +156,7 @@ export class TimerService {
     this.timer.duration = timer.duration;
     this.timer.current = timer.duration;
     this.playback = 'armed';
+    this.timer.timerType = timer.timerType;
     this._pausedInterval = 0;
     this._pausedAt = 0;
 

apps/server/src/utils/parser.js

@@ -310,7 +310,8 @@ export const validateEvent = (eventArgs) => {
       presenter: makeString(e.presenter, d.presenter),
       timeStart: start,
       timeEnd: end,
-      timeType: 'start-end',
+      timerBehaviour: makeString(e.timerBehaviour, d.timerBehaviour),
+      timerType: makeString(e.timerType, d.timerType),
       duration: validateDuration(start, end),
       isPublic: typeof e.isPublic === 'boolean' ? e.isPublic : d.isPublic,
       skip: typeof e.skip === 'boolean' ? e.skip : d.skip,