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

fix #984 Expected End of timeline is not calculated correctly (#985)

Browse Source
This commit is contained in:
Leon Eckardt
2024-05-20 22:28:23 +02:00
committed by GitHub
parent 036d4051fc
commit 97b8e6a290
4 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/stores/__tests__/runtimeState.test.ts
+4 -4
View File
@@ -162,7 +162,7 @@ describe('mutation on runtimeState', () => {
const firstStart = newState.clock;
expect(newState.runtime.actualStart).toBe(newState.clock);
expect(newState.runtime.offset).toBe(event1.timeStart - newState.clock);
expect(newState.runtime.expectedEnd).toBe(newState.runtime.offset + event2.timeEnd);
expect(newState.runtime.expectedEnd).toBe(event2.timeEnd - newState.runtime.offset);
// 3. Next event
load(event2, [event1, event2]);
@@ -177,13 +177,13 @@ describe('mutation on runtimeState', () => {
const delayBefore = event2.timeStart - newState.clock;
expect(newState.runtime.offset).toBe(delayBefore);
// finish is the difference between the runtime and the schedule
expect(newState.runtime.expectedEnd).toBe(event2.timeEnd + newState.runtime.offset);
expect(newState.runtime.expectedEnd).toBe(event2.timeEnd - newState.runtime.offset);
// 4. Add time
addTime(10);
newState = getState();
expect(newState.runtime.offset).toBe(delayBefore + 10);
expect(newState.runtime.expectedEnd).toBe(event2.timeEnd + newState.runtime.offset);
expect(newState.runtime.offset).toBe(delayBefore - 10);
expect(newState.runtime.expectedEnd).toBe(event2.timeEnd - newState.runtime.offset);
// 5. Stop event
stop();
apps/server/src/stores/runtimeState.ts
+2 -1
View File
@@ -301,7 +301,7 @@ export function start(state: RuntimeState = runtimeState): boolean {
}
state.runtime.offset = getRuntimeOffset(state);
state.runtime.expectedEnd = state.runtime.plannedEnd + state.runtime.offset;
state.runtime.expectedEnd = state.runtime.plannedEnd - state.runtime.offset;
return true;
}
@@ -389,6 +389,7 @@ export function update(): UpdateResult {
// update offset
runtimeState.runtime.offset = getRuntimeOffset(runtimeState);
runtimeState.runtime.expectedEnd = getExpectedEnd(runtimeState);
return {
hasTimerFinished,