(null);
+
+ const cancelClose = useCallback(() => {
+ if (leaveTimerRef.current !== null) {
+ window.clearTimeout(leaveTimerRef.current);
+ leaveTimerRef.current = null;
+ }
+ }, []);
+
+ const scheduleClose = useCallback(() => {
+ cancelClose();
+ leaveTimerRef.current = window.setTimeout(() => {
+ setOpenYmd(null);
+ leaveTimerRef.current = null;
+ }, POPOVER_LEAVE_MS);
+ }, [cancelClose]);
+
+ const racesByYmd = useMemo(() => groupRacesByYmd(races), [races]);
+
+ const focusedMonthIndex = monthFilter === "" ? null : parseInt(monthFilter, 10) - 1;
+
+ return (
+
+
Наведите на дату — краткая информация. Клик — страница дня.
+ {focusedMonthIndex === null || Number.isNaN(focusedMonthIndex) ? (
+
+ {MONTH_NAMES_RU_SHORT.map((_, mi) => (
+
+ ))}
+
+ ) : (
+
+
+
+
+ )}
+
+
+
+ :
+
+
+
+ :
+
+
+
+ );
+}
diff --git a/frontend/src/components/index.ts b/frontend/src/components/index.ts
index 07eecb3..7de53f0 100644
--- a/frontend/src/components/index.ts
+++ b/frontend/src/components/index.ts
@@ -1 +1,3 @@
export { PaceTrendChart } from "./PaceTrendChart";
+export { RacesCalendar } from "./RacesCalendar";
+export { StartTimeSelects } from "./StartTimeSelects";
diff --git a/frontend/src/lib/calendarUtils.ts b/frontend/src/lib/calendarUtils.ts
new file mode 100644
index 0000000..2eb0aa7
--- /dev/null
+++ b/frontend/src/lib/calendarUtils.ts
@@ -0,0 +1,49 @@
+import type { Race } from "../api";
+
+export const WEEKDAY_LABELS_SHORT_RU: string[] = ["Пн", "Вт", "Ср", "Чт", "Пт", "Сб", "Вс"];
+
+/** Monday-based week: Mon=0 … Sun=6 */
+export function mondayIndexFromDate(d: Date): number {
+ return (d.getDay() + 6) % 7;
+}
+
+/** Grid cells for one month: `null` = empty, `1..31` = day of month. Padded to full weeks, at least 6 rows. */
+export function buildMonthCells(year: number, monthIndex: number): (number | null)[] {
+ const first = new Date(year, monthIndex, 1);
+ const lead = mondayIndexFromDate(first);
+ const dim = new Date(year, monthIndex + 1, 0).getDate();
+ const cells: (number | null)[] = [];
+ for (let i = 0; i < lead; i += 1) {
+ cells.push(null);
+ }
+ for (let day = 1; day <= dim; day += 1) {
+ cells.push(day);
+ }
+ while (cells.length % 7 !== 0) {
+ cells.push(null);
+ }
+ while (cells.length < 42) {
+ cells.push(null);
+ }
+ return cells;
+}
+
+export function toYmd(year: number, monthIndex: number, day: number): string {
+ const m = String(monthIndex + 1).padStart(2, "0");
+ const d = String(day).padStart(2, "0");
+ return `${year}-${m}-${d}`;
+}
+
+export function groupRacesByYmd(races: Race[]): Map {
+ const map = new Map();
+ for (const race of races) {
+ const ymd = race.date.slice(0, 10);
+ if (!/^\d{4}-\d{2}-\d{2}$/.test(ymd)) {
+ continue;
+ }
+ const list = map.get(ymd) ?? [];
+ list.push(race);
+ map.set(ymd, list);
+ }
+ return map;
+}
diff --git a/frontend/src/lib/index.ts b/frontend/src/lib/index.ts
index 9ed3e2e..c8c1359 100644
--- a/frontend/src/lib/index.ts
+++ b/frontend/src/lib/index.ts
@@ -6,6 +6,7 @@ export {
getRaceStatusClassName,
getRaceStatusLabel,
isCloseDistance,
+ isRaceDateInPast,
parseFinishTimeToSeconds,
parseRaceDate,
raceNeedsResultEntry,
@@ -13,3 +14,5 @@ export {
sortByDateDesc,
splitRacesByDate,
} from "./raceMetrics";
+
+export { buildMonthCells, groupRacesByYmd, toYmd, WEEKDAY_LABELS_SHORT_RU } from "./calendarUtils";
diff --git a/frontend/src/lib/raceMetrics.ts b/frontend/src/lib/raceMetrics.ts
index 1bdba62..0e988c6 100644
--- a/frontend/src/lib/raceMetrics.ts
+++ b/frontend/src/lib/raceMetrics.ts
@@ -12,6 +12,13 @@ export function parseRaceDate(date: string): Date {
return parsed;
}
+/** Дата старта (календарный день) строго раньше сегодняшней полуночи по локали. */
+export function isRaceDateInPast(raceDate: string, now: Date = new Date()): boolean {
+ const today = new Date(now);
+ today.setHours(0, 0, 0, 0);
+ return parseRaceDate(raceDate).getTime() < today.getTime();
+}
+
export function parseFinishTimeToSeconds(value: string | null): number | null {
if (!value) {
return null;
diff --git a/frontend/src/pages/RaceDayPage.tsx b/frontend/src/pages/RaceDayPage.tsx
new file mode 100644
index 0000000..fbc1738
--- /dev/null
+++ b/frontend/src/pages/RaceDayPage.tsx
@@ -0,0 +1,133 @@
+import { useEffect, useMemo, useState } from "react";
+import { Link, useParams } from "react-router-dom";
+import type { Race } from "../api";
+import { ApiError, getRaces } from "../api";
+import { formatDistance, formatRaceDate, getRaceStatusClassName, getRaceStatusLabel, sortByDateAsc } from "../lib";
+
+function getErrorMessage(error: unknown): string {
+ if (error instanceof ApiError) {
+ return error.message;
+ }
+ return "Не удалось загрузить старты.";
+}
+
+export function RaceDayPage(): JSX.Element {
+ const { ymd } = useParams<{ ymd: string }>();
+ const [races, setRaces] = useState([]);
+ const [isLoading, setIsLoading] = useState(true);
+ const [errorMessage, setErrorMessage] = useState(null);
+
+ const validYmd = ymd && /^\d{4}-\d{2}-\d{2}$/.test(ymd) ? ymd : null;
+ const year = validYmd ? parseInt(validYmd.slice(0, 4), 10) : NaN;
+
+ useEffect(() => {
+ if (!validYmd || Number.isNaN(year)) {
+ setIsLoading(false);
+ setRaces([]);
+ return;
+ }
+
+ const ac = new AbortController();
+ let mounted = true;
+
+ async function load(): Promise {
+ setIsLoading(true);
+ try {
+ const items = await getRaces({ year }, { signal: ac.signal });
+ if (!mounted || ac.signal.aborted) {
+ return;
+ }
+ const forDay = items.filter((r) => r.date.slice(0, 10) === validYmd);
+ setRaces(sortByDateAsc(forDay));
+ setErrorMessage(null);
+ } catch (e) {
+ if (ac.signal.aborted || !mounted) {
+ return;
+ }
+ setErrorMessage(getErrorMessage(e));
+ setRaces([]);
+ } finally {
+ if (mounted && !ac.signal.aborted) {
+ setIsLoading(false);
+ }
+ }
+ }
+
+ void load();
+ return () => {
+ mounted = false;
+ ac.abort();
+ };
+ }, [validYmd, year]);
+
+ const heading = useMemo(() => {
+ if (!validYmd) {
+ return "Дата не указана";
+ }
+ return formatRaceDate(validYmd);
+ }, [validYmd]);
+
+ if (!validYmd) {
+ return (
+
+ Некорректная дата
+
+
+ Вернуться к календарю стартов
+
+
+
+ );
+ }
+
+ return (
+
+
+
+ ← Календарь стартов
+
+
+ {heading}
+
+ {errorMessage ? (
+
+ {errorMessage}
+
+ ) : null}
+
+ {isLoading ? (
+
+ Загружаем…
+
+ ) : null}
+
+ {!isLoading && !errorMessage && races.length === 0 ? (
+ На эту дату стартов нет.
+ ) : null}
+
+ {!isLoading && races.length > 0 ? (
+
+ {races.map((race) => (
+ -
+
+ {race.title}
+
+
+ {formatDistance(race.distanceKm)} ·{" "}
+
+ {getRaceStatusLabel(race.status, race.date)}
+
+
+
+ ))}
+
+ ) : null}
+
+
+
+ Добавить
+
+
+
+ );
+}
diff --git a/frontend/src/pages/RaceFormPage.tsx b/frontend/src/pages/RaceFormPage.tsx
index 56e3482..05c7bf4 100644
--- a/frontend/src/pages/RaceFormPage.tsx
+++ b/frontend/src/pages/RaceFormPage.tsx
@@ -1,7 +1,9 @@
import { useCallback, useEffect, useState } from "react";
-import { Link, useNavigate, useParams } from "react-router-dom";
+import { Link, useNavigate, useParams, useSearchParams } from "react-router-dom";
import { ApiError, createRace, getRaceById, updateRace } from "../api";
import type { CreateRacePayload, Race, RaceStatus, UpdateRacePayload } from "../api";
+import { StartTimeSelects } from "../components/StartTimeSelects";
+import { isRaceDateInPast } from "../lib";
function slugify(text: string): string {
return text
@@ -94,6 +96,7 @@ function validateForm(form: FormData): string[] {
export function RaceFormPage(): JSX.Element {
const { raceId } = useParams<{ raceId: string }>();
const navigate = useNavigate();
+ const [searchParams] = useSearchParams();
const isEditMode = Boolean(raceId);
const [form, setForm] = useState(EMPTY_FORM);
@@ -135,6 +138,16 @@ export function RaceFormPage(): JSX.Element {
};
}, [raceId]);
+ useEffect(() => {
+ if (isEditMode) {
+ return;
+ }
+ const d = searchParams.get("date");
+ if (d && /^\d{4}-\d{2}-\d{2}$/.test(d)) {
+ setForm((prev) => (prev.date === d ? prev : { ...prev, date: d }));
+ }
+ }, [isEditMode, searchParams]);
+
const handleChange = useCallback(
(event: React.ChangeEvent) => {
const { name, value } = event.target;
@@ -214,6 +227,7 @@ export function RaceFormPage(): JSX.Element {
[form, isEditMode, raceId, navigate],
);
+ const hideOrgScheduleFields = isEditMode && isRaceDateInPast(form.date);
const pageTitle = isEditMode ? "Редактирование старта" : "Новый старт";
if (isLoading) {
@@ -303,51 +317,57 @@ export function RaceFormPage(): JSX.Element {