Skip to content

timetable import dialog #187

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nemvince merged 6 commits into from
May 20, 2026
Merged

timetable import dialog #187

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
4828b30
timetable import dialog
KoZsombat May 20, 2026
9dca9e7
lint fixes
KoZsombat May 20, 2026
de0f6e6
Merge remote-tracking branch 'origin/main' into timetable-import
nemvince May 20, 2026
c4d4c0d
fix: associate Label/Input in edit dialog, initialize validStartDate …
nemvince May 20, 2026
27a3d2d
feat(ui): integrate form handling for timetable import
nemvince May 20, 2026
e302913
fix(schema): make file field in timetableImportSchema required
nemvince May 20, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/chronos/src/routes/timetable/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ export const getAllValidTimetables = timetableFactory.createHandlers(
);

const updateTimetableSchema = z.object({
name: z.string().optional(),
validFrom: z.string().optional(),
validTo: z.string().nullable().optional(),
});
Expand Down Expand Up @@ -218,6 +219,7 @@ export const updateTimetable = timetableFactory.createHandlers(
const [updated] = await db
.update(timetable)
.set({
...(body.name !== undefined && { name: body.name }),
...(body.validFrom !== undefined && { validFrom: body.validFrom }),
...(body.validTo !== undefined && { validTo: body.validTo }),
})
Expand Down
9 changes: 1 addition & 8 deletions apps/iris/src/components/admin/sidebar.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import { Link } from '@tanstack/react-router';
import {
ArrowRightLeft,
Bell,
Calendar,
DoorOpen,
GraduationCap,
IdCard,
Expand All @@ -28,7 +27,7 @@ import {
} from '@/components/ui/sidebar';
import { authClient } from '@/utils/authentication';

type MenuIcon = typeof Calendar;
type MenuIcon = typeof List;

type MenuItem = {
title: string;
Expand All @@ -50,12 +49,6 @@ export function AdminSidebar() {
() => [
{
items: [
{
icon: Calendar,
permission: 'import:timetable',
title: t('timetable.import'),
url: '/admin/timetable/import',
},
{
icon: List,
permission: 'import:timetable',
Expand Down
15 changes: 15 additions & 0 deletions apps/iris/src/components/admin/timetable-edit-dialog.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import {
DialogHeader,
DialogTitle,
} from '@/components/ui/dialog';
import { Input } from '@/components/ui/input';
import { Label } from '@/components/ui/label';

type TimetableEditDialogProps = {
Expand All @@ -19,6 +20,7 @@ type TimetableEditDialogProps = {
open: boolean;
onOpenChange: (open: boolean) => void;
onSubmit: (payload: {
name?: string;
validFrom?: string;
validTo?: string | null;
}) => Promise<void>;
Expand All @@ -33,6 +35,7 @@ export function TimetableEditDialog({
}: TimetableEditDialogProps) {
const { t } = useTranslation();

const [name, setName] = useState(item?.name ?? '');
const [validFrom, setValidFrom] = useState<Date | undefined>(
item?.validFrom ? new Date(item.validFrom) : undefined
);
Expand All @@ -42,6 +45,7 @@ export function TimetableEditDialog({

useEffect(() => {
if (open) {
setName(item?.name ?? '');
setValidFrom(item?.validFrom ? new Date(item.validFrom) : undefined);
setValidTo(item?.validTo ? new Date(item.validTo) : undefined);
}
Expand All @@ -50,6 +54,7 @@ export function TimetableEditDialog({
const handleSubmit = async (e: React.FormEvent) => {
e.preventDefault();
await onSubmit({
name: name.trim() || undefined,
validFrom: validFrom?.toISOString().slice(0, 10),
validTo: validTo ? validTo.toISOString().slice(0, 10) : null,
});
Expand All @@ -64,6 +69,16 @@ export function TimetableEditDialog({
</DialogTitle>
</DialogHeader>
<form className="space-y-4" onSubmit={handleSubmit}>
<div className="space-y-2">
<Label htmlFor="timetable-name">{t('timetable.nameLabel')}</Label>
<Input
autoComplete="off"
id="timetable-name"
onChange={(e) => setName(e.target.value)}
placeholder={t('timetable.importNamePlaceholder')}
value={name}
/>
</div>
<div className="space-y-2">
<Label>{t('timetable.validFromLabel')}</Label>
<DatePicker
Expand Down
Loading