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

chore: rename currentBlock > parent

Browse Source
This commit is contained in:
Carlos Valente
2025-04-13 20:57:54 +02:00
parent 6c8ddeec23
commit 0cae37d6c8
15 changed files with 90 additions and 90 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/server/src/services/rundown-service/__tests__/rundownCache.test.ts
+7 -7
View File
@@ -536,9 +536,9 @@ describe('generate() v4', () => {
isFirstLinked: false,
numEvents: 3,
},
'100': { type: SupportedEvent.Event, currentBlock: '1' },
'200': { type: SupportedEvent.Event, currentBlock: '1' },
'300': { type: SupportedEvent.Event, currentBlock: '1' },
'100': { type: SupportedEvent.Event, parent: '1' },
'200': { type: SupportedEvent.Event, parent: '1' },
'300': { type: SupportedEvent.Event, parent: '1' },
});
});
@@ -567,7 +567,7 @@ describe('generate() v4', () => {
expect(generatedRundown.totalDuration).toBe(1200);
expect(generatedRundown.totalDelay).toBe(0);
expect(generatedRundown.entries).toMatchObject({
'0': { type: SupportedEvent.Event, currentBlock: null },
'0': { type: SupportedEvent.Event, parent: null },
'1': {
type: SupportedEvent.Block,
events: ['101', '102', '103'],
@@ -577,9 +577,9 @@ describe('generate() v4', () => {
isFirstLinked: false,
numEvents: 3,
},
'101': { currentBlock: '1', gap: 90, linkStart: false },
'102': { currentBlock: '1' },
'103': { currentBlock: '1' },
'101': { parent: '1', gap: 90, linkStart: false },
'102': { parent: '1' },
'103': { parent: '1' },
'2': {
type: SupportedEvent.Block,
events: ['201', '202', '203'],
apps/server/src/services/rundown-service/rundownCache.utils.ts
+1 -1
View File
@@ -223,7 +223,7 @@ function processEntry<T extends OntimeEntry>(
currentEntry.dayOffset = processedData.totalDays;
currentEntry.delay = 0; // this means we dont calculate delays or gaps for skipped events
currentEntry.gap = 0; // this means we dont calculate delays or gaps for skipped events
currentEntry.currentBlock = childOfBlock;
currentEntry.parent = childOfBlock;
// update rundown metadata, it only concerns playable events
if (isPlayableEvent(currentEntry)) {
apps/server/src/services/sheet-service/__tests__/sheetUtils.test.ts
+6 -6
View File
@@ -39,7 +39,7 @@ describe('cellRequestFromEvent()', () => {
delay: 0,
gap: 0,
dayOffset: 0,
currentBlock: null,
parent: null,
revision: 0,
id: '1358',
timeWarning: 0,
@@ -85,7 +85,7 @@ describe('cellRequestFromEvent()', () => {
isPublic: false,
skip: false,
colour: 'red',
currentBlock: null,
parent: null,
revision: 0,
delay: 0,
gap: 0,
@@ -136,7 +136,7 @@ describe('cellRequestFromEvent()', () => {
isPublic: true,
skip: false,
colour: 'red',
currentBlock: null,
parent: null,
revision: 0,
delay: 0,
gap: 0,
@@ -189,7 +189,7 @@ describe('cellRequestFromEvent()', () => {
delay: 0,
gap: 0,
dayOffset: 0,
currentBlock: null,
parent: null,
revision: 0,
id: '1358',
timeWarning: 0,
@@ -222,7 +222,7 @@ describe('cellRequestFromEvent()', () => {
isPublic: true,
skip: false,
colour: 'red',
currentBlock: null,
parent: null,
revision: 0,
delay: 0,
gap: 0,
@@ -259,7 +259,7 @@ describe('cellRequestFromEvent()', () => {
isPublic: true,
skip: false,
colour: 'red',
currentBlock: null,
parent: null,
revision: 0,
delay: 0,
gap: 0,