Skip to content

Commit e217db1

Browse files
committed
feat: UI - presenter timing only use PartOrSegmentRemaining if type is SEGMENT_BUDGET_DURATION
1 parent fe1c159 commit e217db1

File tree

1 file changed

+19
-16
lines changed

1 file changed

+19
-16
lines changed

packages/webui/src/client/ui/ClockView/PresenterScreen.tsx

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { PieceIconContainer } from '../PieceIcons/PieceIcon'
1313
import { PieceNameContainer } from '../PieceIcons/PieceName'
1414
import { Timediff } from './Timediff'
1515
import { RundownUtils } from '../../lib/rundown'
16-
import { PieceLifespan } from '@sofie-automation/blueprints-integration'
16+
import { CountdownType, PieceLifespan } from '@sofie-automation/blueprints-integration'
1717
import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
1818
import { PieceCountdownContainer } from '../PieceIcons/PieceCountdown'
1919
import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
@@ -461,21 +461,24 @@ function PresenterScreenContentDefaultLayout({
461461
/>
462462
</div>
463463
<div className="presenter-screen__part__piece-countdown">
464-
<CurrentPartOrSegmentRemaining
465-
currentPartInstanceId={currentPartInstance.instance._id}
466-
heavyClassName="overtime"
467-
/>
468-
{/* <PieceCountdownContainer
469-
partInstanceId={currentPartInstance.instance._id}
470-
showStyleBaseId={currentShowStyleBaseId}
471-
rundownIds={rundownIds}
472-
partAutoNext={currentPartInstance.instance.part.autoNext || false}
473-
partExpectedDuration={calculatePartInstanceExpectedDurationWithTransition(
474-
currentPartInstance.instance
475-
)}
476-
partStartedPlayback={currentPartInstance.instance.timings?.plannedStartedPlayback}
477-
playlistActivationId={playlist?.activationId}
478-
/> */}
464+
{currentSegment?.segmentTiming?.countdownType === CountdownType.SEGMENT_BUDGET_DURATION ? (
465+
<CurrentPartOrSegmentRemaining
466+
currentPartInstanceId={currentPartInstance.instance._id}
467+
heavyClassName="overtime"
468+
/>
469+
) : (
470+
<PieceCountdownContainer
471+
partInstanceId={currentPartInstance.instance._id}
472+
showStyleBaseId={currentShowStyleBaseId}
473+
rundownIds={rundownIds}
474+
partAutoNext={currentPartInstance.instance.part.autoNext || false}
475+
partExpectedDuration={calculatePartInstanceExpectedDurationWithTransition(
476+
currentPartInstance.instance
477+
)}
478+
partStartedPlayback={currentPartInstance.instance.timings?.plannedStartedPlayback}
479+
playlistActivationId={playlist?.activationId}
480+
/>
481+
)}
479482
</div>
480483
<div className="presenter-screen__part__part-countdown">
481484
<Timediff time={currentPartOrSegmentCountdown} />

0 commit comments

Comments
 (0)