Skip to content

Commit bb1bedc

Browse files
committed
Merge branch 'feat/presenter-timing-part-segment-remaining' into bbc-release53
2 parents 88bf4fc + 9a54b88 commit bb1bedc

File tree

2 files changed

+24
-12
lines changed

2 files changed

+24
-12
lines changed

packages/webui/src/client/styles/countdown/presenter.scss

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,10 @@ $hold-status-color: $liveline-timecode-color;
118118
padding: 0 0.2em;
119119
line-height: 1em;
120120

121+
> .overtime {
122+
color: $general-late-color;
123+
}
124+
121125
> img.freeze-icon {
122126
width: 0.9em;
123127
height: 0.9em;

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

Lines changed: 20 additions & 12 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'
@@ -41,6 +41,7 @@ import { CorelibPubSub } from '@sofie-automation/corelib/dist/pubsub'
4141
import { useSetDocumentClass } from '../util/useSetDocumentClass'
4242
import { useRundownAndShowStyleIdsForPlaylist } from '../util/useRundownAndShowStyleIdsForPlaylist'
4343
import { RundownPlaylistClientUtil } from '../../lib/rundownPlaylistUtil'
44+
import { CurrentPartOrSegmentRemaining } from '../RundownView/RundownTiming/CurrentPartOrSegmentRemaining'
4445

4546
interface SegmentUi extends DBSegment {
4647
items: Array<PartUi>
@@ -460,17 +461,24 @@ function PresenterScreenContentDefaultLayout({
460461
/>
461462
</div>
462463
<div className="presenter-screen__part__piece-countdown">
463-
<PieceCountdownContainer
464-
partInstanceId={currentPartInstance.instance._id}
465-
showStyleBaseId={currentShowStyleBaseId}
466-
rundownIds={rundownIds}
467-
partAutoNext={currentPartInstance.instance.part.autoNext || false}
468-
partExpectedDuration={calculatePartInstanceExpectedDurationWithTransition(
469-
currentPartInstance.instance
470-
)}
471-
partStartedPlayback={currentPartInstance.instance.timings?.plannedStartedPlayback}
472-
playlistActivationId={playlist?.activationId}
473-
/>
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+
)}
474482
</div>
475483
<div className="presenter-screen__part__part-countdown">
476484
<Timediff time={currentPartOrSegmentCountdown} />

0 commit comments

Comments
 (0)