Complete NextSteps roadmap: planning engine UI, calendar cluster, flexible wishes
Works through every numbered item in NextSteps260913.md section 3, plus the three known verification issues in section 4.1. Surface what the backend already computed: - 3.1 render surplus_advice in PlanResults, mirroring the shortfall remedies - 3.2 surface VacationBalance.is_assumed so assumed statutory years are visible - 3.3 age-4 expiry given the proposed plan, via a new Age4Projection reusing the existing _age4_projections arithmetic (Dashboard stat verified, not rebuilt) Calendar cluster (one pass over the holiday data): - new GET /api/calendar/days exposing roda dagar, klamdagar and day overrides, paginated four years at a time - 3.4 shade roda dagar/klamdagar, with R/K badges so colour is not the only signal - 3.6 click-to-override behind an explicit mode toggle, leaving drag multi-select intact - 3.7 click month/year to advance - 3.8 per-year red-days list in Settings, statutory days plus overrides i18n: - 3.5 five backend-generated Swedish surfaces converted to message_key + data, following the tips_service pattern; old string fields replaced, not kept Flexible wishes (3.9): - PLANNING_ENGINE_SPEC section 10: window_mode, candidate search, cost function, deterministic tie-break, two-pass ordering, test matrix rows 15-24 - backend: entity, migration 006, _FULL_SCHEMA sync, repository, allocator - frontend: season-preset toggle in WishEditor, unplaced outcome rendering Fixes (4.1): - pin typecheck to the local tsc rather than npx resolving a newer TypeScript - ignore generated coverage/ and dist/ in the ESLint flat config - fix the flaky usePlanApply test properly, with waitFor rather than a retry Tests: backend 361 -> 404, frontend 540 -> 704. Coverage 89.47% -> 96.52% lines. Not yet verified in a browser. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RXMhc9nT6sNz1SL4j8dznL
This commit is contained in:
@@ -1,4 +1,7 @@
|
||||
import { ReactNode } from 'react'
|
||||
import { useTranslation } from '@/i18n'
|
||||
import { formatHolidayName } from '@/utils/dates'
|
||||
import type { CalendarDayType } from '@/types'
|
||||
|
||||
export interface CalendarDayProps {
|
||||
date: string
|
||||
@@ -10,6 +13,14 @@ export interface CalendarDayProps {
|
||||
onPointerDown?: ((date: string) => void) | undefined
|
||||
onPointerEnter?: ((date: string) => void) | undefined
|
||||
onActivate?: (() => void) | undefined
|
||||
/** §3.4 — statutory calendar classification for this date, from `GET /api/calendar/days`. */
|
||||
dayType?: CalendarDayType | undefined
|
||||
/** Exact holiday name (possibly the combined "X; Söndag" form); only meaningful when `dayType === 'red_day'`. */
|
||||
holidayName?: string | null | undefined
|
||||
/** §3.6 — true iff this date has a workspace day override. */
|
||||
isOverride?: boolean | undefined
|
||||
/** The override's value when `isOverride` is true (true = marked as a working day). */
|
||||
overrideIsWorkingDay?: boolean | null | undefined
|
||||
}
|
||||
|
||||
export function CalendarDay({
|
||||
@@ -22,7 +33,12 @@ export function CalendarDay({
|
||||
onPointerDown,
|
||||
onPointerEnter,
|
||||
onActivate,
|
||||
dayType,
|
||||
holidayName,
|
||||
isOverride = false,
|
||||
overrideIsWorkingDay = null,
|
||||
}: CalendarDayProps): ReactNode {
|
||||
const { t } = useTranslation()
|
||||
const dayNum = new Date(date + 'T00:00:00Z').getUTCDate()
|
||||
|
||||
const handleKeyDown = (e: React.KeyboardEvent<HTMLDivElement>) => {
|
||||
@@ -35,19 +51,64 @@ export function CalendarDay({
|
||||
}
|
||||
}
|
||||
|
||||
const cleanHolidayName = holidayName ? formatHolidayName(holidayName) : null
|
||||
|
||||
// Non-color signals describing the day's calendar status, appended to the
|
||||
// existing aria-label formula so unrelated call sites (no dayType/override
|
||||
// props supplied) keep their exact previous aria-label.
|
||||
const descriptors: string[] = []
|
||||
if (cleanHolidayName) {
|
||||
descriptors.push(cleanHolidayName)
|
||||
} else if (dayType === 'klamdag') {
|
||||
descriptors.push(t('calendarDay.klamdagAria'))
|
||||
}
|
||||
if (isOverride) {
|
||||
descriptors.push(
|
||||
overrideIsWorkingDay ? t('calendarDay.overrideWorkingAria') : t('calendarDay.overrideFreeAria'),
|
||||
)
|
||||
}
|
||||
|
||||
const baseLabel = events.length > 0 ? t('calendarDay.ariaWithEvents', { date, count: events.length }) : date
|
||||
const ariaLabel = descriptors.length > 0 ? `${baseLabel}, ${descriptors.join(', ')}` : baseLabel
|
||||
const title = descriptors.length > 0 ? descriptors.join(' · ') : undefined
|
||||
|
||||
const className = [
|
||||
'calendar-day',
|
||||
!isCurrentMonth ? 'calendar-day--disabled' : '',
|
||||
events.length > 0 ? 'calendar-day--has-events' : '',
|
||||
isToday ? 'calendar-day--today' : '',
|
||||
isSelected ? 'calendar-day--selected' : '',
|
||||
dayType === 'red_day' ? 'calendar-day--red-day' : '',
|
||||
dayType === 'klamdag' ? 'calendar-day--klamdag' : '',
|
||||
isOverride ? 'calendar-day--override' : '',
|
||||
]
|
||||
.filter(Boolean)
|
||||
.join(' ')
|
||||
|
||||
return (
|
||||
<div
|
||||
data-testid="calendar-day"
|
||||
onClick={onClick}
|
||||
role="button"
|
||||
tabIndex={0}
|
||||
aria-label={`${date}${events.length > 0 ? ` with ${events.length} event(s)` : ''}`}
|
||||
className={`calendar-day ${!isCurrentMonth ? 'calendar-day--disabled' : ''} ${events.length > 0 ? 'calendar-day--has-events' : ''} ${isToday ? 'calendar-day--today' : ''} ${isSelected ? 'calendar-day--selected' : ''}`}
|
||||
aria-label={ariaLabel}
|
||||
title={title}
|
||||
className={className}
|
||||
onKeyDown={handleKeyDown}
|
||||
onPointerDown={() => onPointerDown?.(date)}
|
||||
onPointerEnter={() => onPointerEnter?.(date)}
|
||||
>
|
||||
<div className="calendar-day__number">{dayNum}</div>
|
||||
{(dayType === 'red_day' || dayType === 'klamdag') && (
|
||||
<span className="calendar-day__type-badge" data-testid="calendar-day-type-badge" aria-hidden="true">
|
||||
{dayType === 'red_day' ? 'R' : 'K'}
|
||||
</span>
|
||||
)}
|
||||
{isOverride && (
|
||||
<span className="calendar-day__override-badge" data-testid="calendar-day-override-badge" aria-hidden="true">
|
||||
{overrideIsWorkingDay ? '⚒' : '✓'}
|
||||
</span>
|
||||
)}
|
||||
{events.length > 0 && (
|
||||
<div className="calendar-day__events" data-testid="calendar-day-events">
|
||||
{events.map((event, idx) => (
|
||||
|
||||
Reference in New Issue
Block a user