Skip to content

Commit

Permalink
feat: UI - presenter timing only use PartOrSegmentRemaining if type i…
Browse files Browse the repository at this point in the history
…s SEGMENT_BUDGET_DURATION
  • Loading branch information
olzzon committed Dec 17, 2024
1 parent fe1c159 commit e217db1
Showing 1 changed file with 19 additions and 16 deletions.
35 changes: 19 additions & 16 deletions packages/webui/src/client/ui/ClockView/PresenterScreen.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ import { PieceIconContainer } from '../PieceIcons/PieceIcon'
import { PieceNameContainer } from '../PieceIcons/PieceName'
import { Timediff } from './Timediff'
import { RundownUtils } from '../../lib/rundown'
import { PieceLifespan } from '@sofie-automation/blueprints-integration'
import { CountdownType, PieceLifespan } from '@sofie-automation/blueprints-integration'
import { DBPart } from '@sofie-automation/corelib/dist/dataModel/Part'
import { PieceCountdownContainer } from '../PieceIcons/PieceCountdown'
import { PlaylistTiming } from '@sofie-automation/corelib/dist/playout/rundownTiming'
Expand Down Expand Up @@ -461,21 +461,24 @@ function PresenterScreenContentDefaultLayout({
/>
</div>
<div className="presenter-screen__part__piece-countdown">
<CurrentPartOrSegmentRemaining
currentPartInstanceId={currentPartInstance.instance._id}
heavyClassName="overtime"
/>
{/* <PieceCountdownContainer
partInstanceId={currentPartInstance.instance._id}
showStyleBaseId={currentShowStyleBaseId}
rundownIds={rundownIds}
partAutoNext={currentPartInstance.instance.part.autoNext || false}
partExpectedDuration={calculatePartInstanceExpectedDurationWithTransition(
currentPartInstance.instance
)}
partStartedPlayback={currentPartInstance.instance.timings?.plannedStartedPlayback}
playlistActivationId={playlist?.activationId}
/> */}
{currentSegment?.segmentTiming?.countdownType === CountdownType.SEGMENT_BUDGET_DURATION ? (
<CurrentPartOrSegmentRemaining
currentPartInstanceId={currentPartInstance.instance._id}
heavyClassName="overtime"
/>
) : (
<PieceCountdownContainer
partInstanceId={currentPartInstance.instance._id}
showStyleBaseId={currentShowStyleBaseId}
rundownIds={rundownIds}
partAutoNext={currentPartInstance.instance.part.autoNext || false}
partExpectedDuration={calculatePartInstanceExpectedDurationWithTransition(
currentPartInstance.instance
)}
partStartedPlayback={currentPartInstance.instance.timings?.plannedStartedPlayback}
playlistActivationId={playlist?.activationId}
/>
)}
</div>
<div className="presenter-screen__part__part-countdown">
<Timediff time={currentPartOrSegmentCountdown} />
Expand Down

0 comments on commit e217db1

Please sign in to comment.