Clicking "Wiedereinstellen" could never succeed. rehire_employee has always
demanded a position and refuses without one, but the panel offered only a
date and sent only a date — so every rehire ended on an error the dialog
gave no way to fix.
The panel now picks from the open positions, the same list and layout the
transfer panel uses, and warns before submitting when the date falls outside
the chosen position's validity. The old position is deliberately not a
silent default: it may since have been filled, ended, or gone.
Behind that sat a second fault, hidden by the first: the status assignment
status = case when v_date <= current_date then 'Aktiv' else 'Geplant' end
is text, and the column is employment_status. Postgres refuses that outright,
so the function would have failed even with a position. It surfaced only once
the earlier check stopped firing — the same pattern as hire_employee this
morning, where three faults sat in a queue.
rehire_employee also placed people without checking anything. It now applies
the rule from 20260810100000: the date must lie in the position's validity,
and no assignment may still stand. A rehire could otherwise land on an
occupied position and be caught by the partial index, with a message that
explains nothing.
My first verification of the cast was wrong and passed a broken state:
plpgsql converts silently when assigning to a variable, so the probe proved
nothing. Redone as an UPDATE against a column, which is the case that fails.
Verified end to end against the live database, rolled back: Stefan Egger
returns as Aktiv on a free position, with the assignment and the
Wiedereintritt entry. Without a position, on an occupied one, and on one not
yet valid, it is refused — each with its own message.
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 } 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={`${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>
|
|
);
|
|
}
|