mirror of
https://github.com/cpvalente/ontime.git
synced 2026-09-10 00:29:41 +00:00
refactor(rundown): improve visibility of count to end
This commit is contained in:
committed by
Carlos Valente
parent
f598e8dab1
commit
64082ceac0
@@ -88,7 +88,6 @@ function EventEditorTimes({
|
|||||||
timeStrategy={timeStrategy}
|
timeStrategy={timeStrategy}
|
||||||
linkStart={linkStart}
|
linkStart={linkStart}
|
||||||
delay={delay}
|
delay={delay}
|
||||||
countToEnd={countToEnd}
|
|
||||||
showLabels
|
showLabels
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -7,6 +7,7 @@ $skip-opacity: 0.2;
|
|||||||
background-color: $block-bg;
|
background-color: $block-bg;
|
||||||
margin-block: 0.25rem;
|
margin-block: 0.25rem;
|
||||||
overflow: initial;
|
overflow: initial;
|
||||||
|
position: relative;
|
||||||
|
|
||||||
display: grid;
|
display: grid;
|
||||||
grid-template-areas:
|
grid-template-areas:
|
||||||
@@ -155,7 +156,7 @@ $skip-opacity: 0.2;
|
|||||||
align-items: center;
|
align-items: center;
|
||||||
justify-content: space-between;
|
justify-content: space-between;
|
||||||
|
|
||||||
.nextTag {
|
.warningMeta {
|
||||||
font-size: 1rem;
|
font-size: 1rem;
|
||||||
color: $orange-500;
|
color: $orange-500;
|
||||||
letter-spacing: 0.03px;
|
letter-spacing: 0.03px;
|
||||||
@@ -231,6 +232,10 @@ $skip-opacity: 0.2;
|
|||||||
color: var(--status-color-active-override, $active-indicator);
|
color: var(--status-color-active-override, $active-indicator);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.statusIcon.countToEndStatus {
|
||||||
|
color: $orange-400;
|
||||||
|
}
|
||||||
|
|
||||||
.statusIcon.warning {
|
.statusIcon.warning {
|
||||||
color: $orange-500;
|
color: $orange-500;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -115,12 +115,12 @@ function RundownEventInner({
|
|||||||
delay={delay}
|
delay={delay}
|
||||||
timeStrategy={timeStrategy}
|
timeStrategy={timeStrategy}
|
||||||
linkStart={linkStart}
|
linkStart={linkStart}
|
||||||
countToEnd={countToEnd}
|
|
||||||
/>
|
/>
|
||||||
</div>
|
</div>
|
||||||
<div className={style.titleSection}>
|
<div className={style.titleSection}>
|
||||||
<TitleEditor title={title} entryId={eventId} placeholder='Event title' className={style.eventTitle} />
|
<TitleEditor title={title} entryId={eventId} placeholder='Event title' className={style.eventTitle} />
|
||||||
{isNext && <span className={style.nextTag}>UP NEXT</span>}
|
{isNext && <span className={style.warningMeta}>UP NEXT</span>}
|
||||||
|
{!isNext && countToEnd && <span className={style.warningMeta}>COUNT TO END</span>}
|
||||||
</div>
|
</div>
|
||||||
<EventBlockPlayback
|
<EventBlockPlayback
|
||||||
eventId={eventId}
|
eventId={eventId}
|
||||||
@@ -157,7 +157,13 @@ function RundownEventInner({
|
|||||||
<EndActionIcon action={endAction} className={style.statusIcon} />
|
<EndActionIcon action={endAction} className={style.statusIcon} />
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Tooltip text={`${countToEnd ? 'Count to End' : 'Count duration'}`} render={<span />}>
|
<Tooltip text={`${countToEnd ? 'Count to End' : 'Count duration'}`} render={<span />}>
|
||||||
<LuArrowDownToLine className={`${style.statusIcon} ${countToEnd ? style.active : style.disabled}`} />
|
<LuArrowDownToLine
|
||||||
|
className={cx([
|
||||||
|
style.statusIcon,
|
||||||
|
countToEnd ? style.active : style.disabled,
|
||||||
|
countToEnd && style.countToEndStatus,
|
||||||
|
])}
|
||||||
|
/>
|
||||||
</Tooltip>
|
</Tooltip>
|
||||||
<Tooltip text={automationTooltip} render={<span />}>
|
<Tooltip text={automationTooltip} render={<span />}>
|
||||||
<IoFlash className={automationIconClasses} />
|
<IoFlash className={automationIconClasses} />
|
||||||
|
|||||||
@@ -14,7 +14,6 @@ import style from './TimeInputFlow.module.scss';
|
|||||||
|
|
||||||
interface TimeInputFlowProps {
|
interface TimeInputFlowProps {
|
||||||
eventId: string;
|
eventId: string;
|
||||||
countToEnd: boolean;
|
|
||||||
timeStart: number;
|
timeStart: number;
|
||||||
timeEnd: number;
|
timeEnd: number;
|
||||||
duration: number;
|
duration: number;
|
||||||
@@ -27,7 +26,6 @@ interface TimeInputFlowProps {
|
|||||||
export default memo(TimeInputFlow);
|
export default memo(TimeInputFlow);
|
||||||
function TimeInputFlow({
|
function TimeInputFlow({
|
||||||
eventId,
|
eventId,
|
||||||
countToEnd,
|
|
||||||
timeStart,
|
timeStart,
|
||||||
timeEnd,
|
timeEnd,
|
||||||
duration,
|
duration,
|
||||||
@@ -56,10 +54,6 @@ function TimeInputFlow({
|
|||||||
warnings.push('Over midnight');
|
warnings.push('Over midnight');
|
||||||
}
|
}
|
||||||
|
|
||||||
if (countToEnd) {
|
|
||||||
warnings.push('Count to End');
|
|
||||||
}
|
|
||||||
|
|
||||||
const hasDelay = delay !== 0;
|
const hasDelay = delay !== 0;
|
||||||
const isLockedEnd = timeStrategy === TimeStrategy.LockEnd;
|
const isLockedEnd = timeStrategy === TimeStrategy.LockEnd;
|
||||||
const isLockedDuration = timeStrategy === TimeStrategy.LockDuration;
|
const isLockedDuration = timeStrategy === TimeStrategy.LockDuration;
|
||||||
|
|||||||
Reference in New Issue
Block a user