Employee names now read "Winkler, Hannah" wherever a person appears in a list, a table, a heading or a tree node. That is the order a personnel list is kept in, it is the order people are looked up in, and it finally matches the sorting — the employee list has always been ordered by surname, which made an alphabetical page look unsorted. The name was being assembled inline in about twenty places. A rename that catches half of them is worse than none, so it now goes through fmtName in lib/format.ts and every display site calls it. Sentences keep the natural order: "Hannah Winkler wurde versetzt" reads like German, "Winkler, Hannah wurde versetzt" reads like a form. So the toasts are unchanged and only labels moved. Two things the change would have quietly broken: The org chart's own filter matched against "first last". It now matches either order, with or without the comma, so typing what you see works and so does typing what you remember. The print model sorted by the last word of the composed name, which happened to be the surname and is now the first name — every printed unit would have come out sorted by first name. It sorts on the surname field itself now, which is what it meant all along. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
148 lines
5.4 KiB
TypeScript
148 lines
5.4 KiB
TypeScript
"use client";
|
|
|
|
import { useRouter } from "next/navigation";
|
|
import { useMemo, useState } from "react";
|
|
import { rehireEmployee } from "@/actions/employees";
|
|
import { Button } from "@/components/ui/Button";
|
|
import { SelectField, TextField } from "@/components/ui/Field";
|
|
import { SlideOver } from "@/components/ui/SlideOver";
|
|
import { useToast } from "@/components/ui/Toast";
|
|
import { fmtDate, fmtName } from "@/lib/format";
|
|
import type { OpenPositionResolved } from "@/lib/positions";
|
|
import type { Database } from "@/lib/supabase/types";
|
|
|
|
type EmployeeRow = Database["public"]["Tables"]["employees"]["Row"];
|
|
|
|
// Eine Wiedereinstellung braucht eine Planstelle — genau wie eine
|
|
// Neueinstellung.
|
|
//
|
|
// Die alte Stelle ist dafür kein Ersatz: sie kann inzwischen besetzt,
|
|
// ausgelaufen oder ganz entfallen sein. `rehire_employee` verlangte die
|
|
// Angabe deshalb schon immer und wies den Aufruf sonst ab; nur schickte das
|
|
// Formular sie nie mit, sodass jede Wiedereinstellung an einer Meldung
|
|
// scheiterte, die sich im Dialog gar nicht beheben liess.
|
|
export function RehirePanel({
|
|
open,
|
|
onClose,
|
|
employee,
|
|
openPositions,
|
|
}: {
|
|
open: boolean;
|
|
onClose: () => void;
|
|
employee: EmployeeRow;
|
|
openPositions: OpenPositionResolved[];
|
|
}) {
|
|
const { showToast } = useToast();
|
|
const router = useRouter();
|
|
const [rehireDate, setRehireDate] = useState("");
|
|
const [positionId, setPositionId] = useState("");
|
|
const [pending, setPending] = useState(false);
|
|
|
|
const options = useMemo(
|
|
() =>
|
|
openPositions
|
|
.slice()
|
|
.sort((a, b) => a.orgLabel.localeCompare(b.orgLabel, "de") || a.title.localeCompare(b.title, "de"))
|
|
.map((p) => ({ value: p.id, label: `${p.orgLabel} · ${p.title} (${p.position_number})` })),
|
|
[openPositions]
|
|
);
|
|
|
|
const selected = openPositions.find((p) => p.id === positionId);
|
|
|
|
// Die Datenbank weist eine Besetzung ausserhalb der Gültigkeit ab. Das hier
|
|
// nimmt die Meldung vorweg, solange sie noch etwas nützt — im Dialog, mit
|
|
// beiden Daten sichtbar.
|
|
const ausserhalb =
|
|
selected && rehireDate
|
|
? rehireDate < selected.valid_from
|
|
? `Diese Planstelle gilt erst ab ${fmtDate(selected.valid_from)}.`
|
|
: selected.valid_to && rehireDate >= selected.valid_to
|
|
? `Diese Planstelle gilt nur bis ${fmtDate(selected.valid_to)}.`
|
|
: null
|
|
: null;
|
|
|
|
async function handleSubmit() {
|
|
if (!rehireDate || !positionId) {
|
|
showToast("Wiedereintrittsdatum und Planstelle sind Pflicht.", "error");
|
|
return;
|
|
}
|
|
setPending(true);
|
|
const result = await rehireEmployee({
|
|
employee_id: employee.id,
|
|
rehire_date: rehireDate,
|
|
position_id: positionId,
|
|
});
|
|
setPending(false);
|
|
if (result.success) {
|
|
showToast(`${employee.first_name} ${employee.last_name} wurde wiedereingestellt.`);
|
|
router.refresh();
|
|
onClose();
|
|
} else {
|
|
showToast(result.error ?? "Fehler beim Speichern.", "error");
|
|
}
|
|
}
|
|
|
|
return (
|
|
<SlideOver
|
|
open={open}
|
|
onClose={onClose}
|
|
title="Wiedereinstellung"
|
|
subtitle={fmtName(employee.first_name, employee.last_name)}
|
|
footer={
|
|
<>
|
|
<Button variant="ghost" onClick={onClose}>
|
|
Abbrechen
|
|
</Button>
|
|
<Button onClick={handleSubmit} pending={pending} disabled={Boolean(ausserhalb)}>
|
|
Wiedereinstellen
|
|
</Button>
|
|
</>
|
|
}
|
|
>
|
|
<div className="flex flex-col gap-4">
|
|
<div className="rounded border border-border bg-surface p-3 text-sm">
|
|
<p className="text-xs font-semibold uppercase tracking-wide text-ink-muted">Letzte Position</p>
|
|
<p className="mt-1 text-ink">{employee.job_title}</p>
|
|
<p className="text-xs text-ink-muted">Ausgetreten am {fmtDate(employee.exit_date)}</p>
|
|
</div>
|
|
|
|
<TextField label="Wiedereintritt am" required type="date" value={rehireDate} onChange={setRehireDate} />
|
|
|
|
{options.length === 0 ? (
|
|
<p className="rounded border border-danger-text/20 bg-danger-bg px-3 py-2 text-sm text-danger-text">
|
|
Es ist derzeit keine Planstelle frei. Ohne eine solche ist keine Wiedereinstellung möglich — zuerst eine
|
|
Planstelle anlegen oder eine bestehende freimachen.
|
|
</p>
|
|
) : (
|
|
<>
|
|
<SelectField
|
|
label="Planstelle"
|
|
required
|
|
value={positionId}
|
|
onChange={setPositionId}
|
|
placeholder="Bitte wählen…"
|
|
options={options}
|
|
/>
|
|
{selected && (
|
|
<div className="rounded border border-border bg-surface p-3 text-sm text-ink-body">
|
|
<div className="font-semibold text-ink">{selected.title}</div>
|
|
<div className="text-xs text-ink-muted">{selected.orgLabel}</div>
|
|
<div className="mt-1 text-xs text-ink-muted">
|
|
{selected.is_chief ? "Leitungsplanstelle" : "Mitarbeiterplanstelle"}
|
|
{selected.future ? ` · gültig ab ${fmtDate(selected.valid_from)}` : ""}
|
|
{selected.valid_to ? ` · endet am ${fmtDate(selected.valid_to)}` : ""}
|
|
</div>
|
|
</div>
|
|
)}
|
|
{ausserhalb && (
|
|
<p role="alert" className="rounded border border-danger-text/20 bg-danger-bg px-3 py-2 text-sm text-danger-text">
|
|
{ausserhalb} Wiedereintritt und Gültigkeit müssen zusammenpassen.
|
|
</p>
|
|
)}
|
|
</>
|
|
)}
|
|
</div>
|
|
</SlideOver>
|
|
);
|
|
}
|