cpvalente/ontime
1
0
Fork 0
mirror of https://github.com/cpvalente/ontime.git synced 2026-08-28 10:29:11 +00:00
Code Issues Packages Projects Releases 10 Wiki Activity

fix: handle midnight

Browse Source 
fixed issue where roll mode wouldnt recognise a end time lower than start time (go through midnight)
This commit is contained in:
cv
2021-10-31 13:38:28 +01:00
parent 93580554bd
commit 9bc2923586
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
server/src/classes/EventTimer.js
+11 -4
View File
@@ -973,7 +973,14 @@ export class EventTimer extends Timer {
// loop through events, look for where we should be // loop through events, look for where we should be
for (const [index, e] of this._eventlist.entries()) { for (const [index, e] of this._eventlist.entries()) {
if (!foundNow) { if (!foundNow) {
if (e.timeStart <= now && now < e.timeEnd) { let normalEnd = e.timeEnd;
// handle midnight
if (normalEnd < e.timeStart) {
normalEnd += this.DAYMS;
}
if (e.timeStart <= now && now < normalEnd) {
// set flag // set flag
foundNow = true; foundNow = true;
@@ -982,9 +989,9 @@ export class EventTimer extends Timer {
this._secondaryTarget = null; this._secondaryTarget = null;
this._startedAt = e.timeStart; this._startedAt = e.timeStart;
this._finishAt = e.timeEnd; this._finishAt = normalEnd;
this.duration = e.timeEnd - e.timeStart; this.duration = normalEnd - e.timeStart;
this.current = e.timeEnd - now; this.current = normalEnd - now;
// set selection // set selection
this.selectedEventId = e.id; this.selectedEventId = e.id;