admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in feature/IO-3352-Arrived-Color-on-Schedule (pull request #2532)

Browse Source 
IO-3352 Arrived Color on Schedule

Approved-by: Dave Richer
This commit is contained in:
Allan Carr
2025-09-03 14:48:10 +00:00
committed by Dave Richer
parent bbccdb0650 0fbf63dec8
commit 5cfefd5afd
1 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
client/src/components/schedule-calendar-wrapper/scheduler-calendar-wrapper.component.jsx
View File

@@ -40,27 +40,26 @@ export function ScheduleCalendarWrapperComponent({
const currentView = search.view || defaultView || "week"; const currentView = search.view || defaultView || "week";
const handleEventPropStyles = (event) => { const handleEventPropStyles = (event) => {
const hasColor = Boolean(event?.color?.hex || event?.color); const { color, block, arrived } = event ?? {};
const hasColor = Boolean(color?.hex || color);
const useBg = currentView !== "agenda"; const useBg = currentView !== "agenda";
// Prioritize explicit blocked-day background to ensure red in all themes // Prioritize explicit blocked-day background to ensure red in all themes
let bg; let bg;
if (useBg) { if (useBg) {
if (event?.block) { bg = block
bg = "var(--event-block-bg)"; ? "var(--event-block-bg)"
} else if (hasColor) { : arrived
bg = event?.color?.hex ?? event?.color; ? "var(--event-arrived-bg)"
} else { : (color?.hex ?? color ?? "var(--event-bg-fallback)");
bg = "var(--event-bg-fallback)";
}
} }
const usedFallback = !hasColor && !event?.block; // only mark as fallback when not blocked const usedFallback = !hasColor && !block && !arrived; // only mark as fallback when not blocked or arrived
const classes = [ const classes = [
"imex-event", "imex-event",
event.arrived && "imex-event-arrived", arrived && "imex-event-arrived",
event.block && "imex-event-block", block && "imex-event-block",
usedFallback && "imex-event-fallback" usedFallback && "imex-event-fallback"
] ]
.filter(Boolean) .filter(Boolean)