fix frontend calendar race states
Some checks failed
CI / build-and-test (pull_request) Has been cancelled
Some checks failed
CI / build-and-test (pull_request) Has been cancelled
This commit is contained in:
@@ -93,6 +93,17 @@ function validateForm(form: FormData): string[] {
|
||||
return errors;
|
||||
}
|
||||
|
||||
function isRaceDateTodayOrPast(date: string): boolean {
|
||||
if (!date.trim()) {
|
||||
return false;
|
||||
}
|
||||
const today = new Date();
|
||||
const y = today.getFullYear();
|
||||
const m = String(today.getMonth() + 1).padStart(2, "0");
|
||||
const d = String(today.getDate()).padStart(2, "0");
|
||||
return isRaceDateInPast(date) || date.slice(0, 10) === `${y}-${m}-${d}`;
|
||||
}
|
||||
|
||||
export function RaceFormPage(): JSX.Element {
|
||||
const { raceId } = useParams<{ raceId: string }>();
|
||||
const navigate = useNavigate();
|
||||
@@ -243,6 +254,7 @@ export function RaceFormPage(): JSX.Element {
|
||||
);
|
||||
|
||||
const hideOrgScheduleFields = isEditMode && isRaceDateInPast(form.date);
|
||||
const showResultFields = isRaceDateTodayOrPast(form.date);
|
||||
const pageTitle = isEditMode ? "Редактирование старта" : "Новый старт";
|
||||
|
||||
if (isLoading) {
|
||||
@@ -397,33 +409,35 @@ export function RaceFormPage(): JSX.Element {
|
||||
</label>
|
||||
</fieldset>
|
||||
|
||||
<fieldset className="race-form__group">
|
||||
<legend className="race-form__legend">Результаты</legend>
|
||||
{showResultFields ? (
|
||||
<fieldset className="race-form__group">
|
||||
<legend className="race-form__legend">Результаты</legend>
|
||||
|
||||
<label className="race-form__field">
|
||||
<span className="race-form__label">Финишное время</span>
|
||||
<input
|
||||
className="race-form__input"
|
||||
type="text"
|
||||
name="finishTime"
|
||||
value={form.finishTime}
|
||||
onChange={handleChange}
|
||||
placeholder="1:45:30"
|
||||
/>
|
||||
</label>
|
||||
<label className="race-form__field">
|
||||
<span className="race-form__label">Финишное время</span>
|
||||
<input
|
||||
className="race-form__input"
|
||||
type="text"
|
||||
name="finishTime"
|
||||
value={form.finishTime}
|
||||
onChange={handleChange}
|
||||
placeholder="1:45:30"
|
||||
/>
|
||||
</label>
|
||||
|
||||
<label className="race-form__field">
|
||||
<span className="race-form__label">Место на финише</span>
|
||||
<input
|
||||
className="race-form__input"
|
||||
type="text"
|
||||
name="finishPlace"
|
||||
value={form.finishPlace}
|
||||
onChange={handleChange}
|
||||
placeholder="12/340"
|
||||
/>
|
||||
</label>
|
||||
</fieldset>
|
||||
<label className="race-form__field">
|
||||
<span className="race-form__label">Место на финише</span>
|
||||
<input
|
||||
className="race-form__input"
|
||||
type="text"
|
||||
name="finishPlace"
|
||||
value={form.finishPlace}
|
||||
onChange={handleChange}
|
||||
placeholder="12/340"
|
||||
/>
|
||||
</label>
|
||||
</fieldset>
|
||||
) : null}
|
||||
|
||||
<fieldset className="race-form__group">
|
||||
<legend className="race-form__legend">Дополнительно</legend>
|
||||
|
||||
@@ -10,7 +10,8 @@ import {
|
||||
getRaceStatusClassName,
|
||||
getRaceStatusLabel,
|
||||
parseRaceDate,
|
||||
splitRacesByDate,
|
||||
sortByDateAsc,
|
||||
sortByDateDesc,
|
||||
} from "../lib";
|
||||
|
||||
const MONTH_OPTIONS: { value: string; label: string }[] = [
|
||||
@@ -220,7 +221,13 @@ export function RacesPage(): JSX.Element {
|
||||
};
|
||||
}, [listQuery]);
|
||||
|
||||
const { upcoming, past } = useMemo(() => splitRacesByDate(races), [races]);
|
||||
const { upcoming, completed } = useMemo(
|
||||
() => ({
|
||||
upcoming: sortByDateAsc(races.filter((race) => race.status !== "completed")),
|
||||
completed: sortByDateDesc(races.filter((race) => race.status === "completed")),
|
||||
}),
|
||||
[races],
|
||||
);
|
||||
|
||||
if (errorMessage && races.length === 0 && !isLoading) {
|
||||
return (
|
||||
@@ -313,7 +320,7 @@ export function RacesPage(): JSX.Element {
|
||||
{viewMode === "list" ? (
|
||||
<div className="race-lists">
|
||||
<RaceList title="Будущие" races={upcoming} />
|
||||
<RaceList title="Прошедшие" races={past} />
|
||||
<RaceList title="Завершенные" races={completed} />
|
||||
</div>
|
||||
) : (
|
||||
<div className="races-cal-wrap">
|
||||
|
||||
Reference in New Issue
Block a user