From bb13e1efc4839da6424573b3dc57e1e67b30eb6f Mon Sep 17 00:00:00 2001 From: Julian Waller Date: Tue, 8 Oct 2024 13:36:10 +0100 Subject: [PATCH] fix: floor number --- .../RundownTiming/CurrentPartOrSegmentRemaining.tsx | 2 +- .../client/ui/RundownView/RundownTiming/SegmentDuration.tsx | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/packages/webui/src/client/ui/RundownView/RundownTiming/CurrentPartOrSegmentRemaining.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/CurrentPartOrSegmentRemaining.tsx index a62ca02759..9ea7e27c7d 100644 --- a/packages/webui/src/client/ui/RundownView/RundownTiming/CurrentPartOrSegmentRemaining.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownTiming/CurrentPartOrSegmentRemaining.tsx @@ -30,7 +30,7 @@ export const CurrentPartOrSegmentRemaining = withTiming tickResolution: TimingTickResolution.Synced, dataResolution: TimingDataResolution.Synced, })( - class CurrentPartRemaining extends React.Component> { + class CurrentPartOrSegmentRemaining extends React.Component> { render(): JSX.Element | null { if (!this.props.timingDurations || !this.props.timingDurations.currentTime) return null if (this.props.timingDurations.currentPartInstanceId !== this.props.currentPartInstanceId) return null diff --git a/packages/webui/src/client/ui/RundownView/RundownTiming/SegmentDuration.tsx b/packages/webui/src/client/ui/RundownView/RundownTiming/SegmentDuration.tsx index 9bc9df75c1..b521e39fd0 100644 --- a/packages/webui/src/client/ui/RundownView/RundownTiming/SegmentDuration.tsx +++ b/packages/webui/src/client/ui/RundownView/RundownTiming/SegmentDuration.tsx @@ -35,8 +35,11 @@ export const SegmentDuration = withTiming()(function const segmentTimingType = props.segment.segmentTiming?.countdownType ?? CountdownType.PART_EXPECTED_DURATION let budget = segmentBudgetDuration ?? 0 + let hardFloor = false if (segmentTimingType === CountdownType.SEGMENT_BUDGET_DURATION) { + hardFloor = true + if (props.timingDurations.currentSegmentId === props.segment._id) { duration = props.timingDurations.remainingBudgetOnCurrentSegment ?? segmentBudgetDuration ?? 0 } else { @@ -80,7 +83,7 @@ export const SegmentDuration = withTiming()(function })} role="timer" > - {RundownUtils.formatDiffToTimecode(value, false, false, true, false, true, '+')} + {RundownUtils.formatDiffToTimecode(value, false, false, true, false, true, '+', false, hardFloor)} )