Rename Karenz to Langzeitabwesenheit and record its type
Karenz was doing duty as the name for every kind of extended absence, but the cases behave differently in payroll and reporting — Wochenhilfe, a Präsenzdienst, a long sick leave and a sabbatical are not the same thing. The concept is now called Langzeitabwesenheit and carries which kind it is. - employees.absence_type, constrained to the thirteen kinds. start_karenz stores it on both paths (written straight away, or parked in the pending_org_changes payload when the absence starts later); record_karenz_return and the karenz_return branch of apply_due_pending_changes clear it, so a returned employee does not keep looking like they are still away. It also reaches employee_history, the audit log and the employee export. - The status enum value stays 'Karenz'. Postgres can rename an enum value in place, but every stored function body that spells it would then reference a value that no longer exists — a dozen functions across fifteen migrations, rewritten for a label. The mapping lives in lib/absence.ts instead, which is the single place the UI reads the display name from. - Where a kind is recorded the chip shows it — "Bildungskarenz" says more than "Langzeitabwesenheit". Absences predating the field have none and fall back to the generic name rather than to a guess, and a value outside the list is dropped rather than echoed into the UI. - The export prints the display name, not the raw enum: a payroll hand-off reading "Karenz" for what the app calls Langzeitabwesenheit only causes questions. Audit filter options keep their stored values and change only their labels. - The seed spreads the twelve absences across the kinds; all of them being Karenz would leave any breakdown by kind invisible.
This commit is contained in:
@@ -77,7 +77,7 @@ export function EmployeeDetail(props: EmployeeDetailProps) {
|
||||
<h2 className="text-xl font-extrabold text-ink">
|
||||
{fmtFullName(employee.first_name, employee.last_name, employee.title_prefix, employee.title_suffix)}
|
||||
</h2>
|
||||
<StatusChip status={employee.status} entryDate={employee.entry_date} />
|
||||
<StatusChip status={employee.status} entryDate={employee.entry_date} absenceType={employee.absence_type} />
|
||||
</div>
|
||||
<p className="text-sm text-ink-body">{employee.job_title}</p>
|
||||
<p className="text-xs text-ink-muted">{breadcrumb}</p>
|
||||
@@ -93,7 +93,11 @@ export function EmployeeDetail(props: EmployeeDetailProps) {
|
||||
<>
|
||||
<ActionButton icon={ArrowRightLeft} label="Versetzen" onClick={() => setPanel("transfer")} />
|
||||
<ActionButton icon={TrendingUp} label="Befördern" onClick={() => setPanel("promote")} />
|
||||
<ActionButton icon={Clock} label={employee.status === "Karenz" ? "Karenz verwalten" : "Karenz"} onClick={() => setPanel("karenz")} />
|
||||
<ActionButton
|
||||
icon={Clock}
|
||||
label={employee.status === "Karenz" ? "Abwesenheit verwalten" : "Langzeitabwesenheit"}
|
||||
onClick={() => setPanel("karenz")}
|
||||
/>
|
||||
</>
|
||||
)}
|
||||
{canEditData && <ActionButton icon={Pencil} label="Daten ändern" onClick={() => setPanel("daten")} />}
|
||||
|
||||
@@ -10,13 +10,14 @@ type EmployeeFiltersProps = {
|
||||
locations: { id: string; name: string }[];
|
||||
};
|
||||
|
||||
// Aktiv and Karenz are separate statuses — somebody on Karenz is employed
|
||||
// but not active. The combined entry is offered explicitly, and named after
|
||||
// the two statuses it selects rather than calling the pair "aktiv".
|
||||
// Aktiv and Langzeitabwesenheit are separate statuses — somebody on a
|
||||
// long-term absence is employed but not active. The combined entry is
|
||||
// offered explicitly, named after the two it selects rather than calling
|
||||
// the pair "aktiv". The stored value is still 'Karenz' (see lib/absence.ts).
|
||||
const STATUS_OPTIONS = [
|
||||
{ value: "Aktiv", label: "Aktiv" },
|
||||
{ value: "Karenz", label: "Karenz" },
|
||||
{ value: "Aktiv,Karenz", label: "Aktiv + Karenz (beschäftigt)" },
|
||||
{ value: "Karenz", label: "Langzeitabwesenheit" },
|
||||
{ value: "Aktiv,Karenz", label: "Aktiv + Langzeitabwesenheit (beschäftigt)" },
|
||||
{ value: "Geplant", label: "Geplant" },
|
||||
{ value: "Ausgetreten", label: "Ausgetreten" },
|
||||
] as const;
|
||||
|
||||
@@ -8,6 +8,7 @@ import { SelectField, TextField, TextareaField } from "@/components/ui/Field";
|
||||
import { SegmentedControl } from "@/components/ui/SegmentedControl";
|
||||
import { SlideOver } from "@/components/ui/SlideOver";
|
||||
import { useToast } from "@/components/ui/Toast";
|
||||
import { ABSENCE_TYPES, absenceLabel } from "@/lib/absence";
|
||||
import { fmtDate } from "@/lib/format";
|
||||
import type { Database } from "@/lib/supabase/types";
|
||||
|
||||
@@ -24,6 +25,7 @@ export function KarenzPanel({ open, onClose, employee }: { open: boolean; onClos
|
||||
|
||||
const [karenzStart, setKarenzStart] = useState("");
|
||||
const [plannedReturn, setPlannedReturn] = useState("");
|
||||
const [absenceType, setAbsenceType] = useState<string>(ABSENCE_TYPES[0]);
|
||||
const [startNote, setStartNote] = useState("");
|
||||
|
||||
const [newReturnDate, setNewReturnDate] = useState(employee.karenz_return_date ?? "");
|
||||
@@ -44,10 +46,16 @@ export function KarenzPanel({ open, onClose, employee }: { open: boolean; onClos
|
||||
return;
|
||||
}
|
||||
setPending(true);
|
||||
const result = await startKarenz({ employee_id: employee.id, karenz_start_date: karenzStart, planned_return_date: plannedReturn, note: startNote });
|
||||
const result = await startKarenz({
|
||||
employee_id: employee.id,
|
||||
karenz_start_date: karenzStart,
|
||||
planned_return_date: plannedReturn,
|
||||
absence_type: absenceType,
|
||||
note: startNote,
|
||||
});
|
||||
setPending(false);
|
||||
if (result.success) {
|
||||
showToast("Karenz erfasst.");
|
||||
showToast("Langzeitabwesenheit erfasst.");
|
||||
router.refresh();
|
||||
onClose();
|
||||
} else {
|
||||
@@ -106,17 +114,17 @@ export function KarenzPanel({ open, onClose, employee }: { open: boolean; onClos
|
||||
<SlideOver
|
||||
open={open}
|
||||
onClose={onClose}
|
||||
title={isOnKarenz ? "Karenz verwalten" : "Karenz"}
|
||||
title={isOnKarenz ? "Langzeitabwesenheit verwalten" : "Langzeitabwesenheit erfassen"}
|
||||
subtitle={`${employee.first_name} ${employee.last_name} · ${employee.job_title}`}
|
||||
footer={
|
||||
<>
|
||||
<Button variant="ghost" onClick={onClose}>
|
||||
Abbrechen
|
||||
</Button>
|
||||
{/* Karenz keeps the warning tone it uses everywhere else. */}
|
||||
{/* Long-term absence keeps the warning tone it uses elsewhere. */}
|
||||
{!isOnKarenz && (
|
||||
<Button onClick={handleStart} pending={pending} className="!bg-warning-text text-white hover:brightness-110">
|
||||
Karenz erfassen
|
||||
Abwesenheit erfassen
|
||||
</Button>
|
||||
)}
|
||||
{isOnKarenz && mode === "adjust" && (
|
||||
@@ -134,7 +142,14 @@ export function KarenzPanel({ open, onClose, employee }: { open: boolean; onClos
|
||||
>
|
||||
{!isOnKarenz && (
|
||||
<div className="flex flex-col gap-4">
|
||||
<TextField label="Karenzbeginn" required type="date" value={karenzStart} onChange={setKarenzStart} />
|
||||
<SelectField
|
||||
label="Art der Langzeitabwesenheit"
|
||||
required
|
||||
value={absenceType}
|
||||
onChange={setAbsenceType}
|
||||
options={ABSENCE_TYPES.map((t) => ({ value: t, label: t }))}
|
||||
/>
|
||||
<TextField label="Beginn" required type="date" value={karenzStart} onChange={setKarenzStart} />
|
||||
<TextField label="Geplante Rückkehr" required type="date" value={plannedReturn} onChange={setPlannedReturn} />
|
||||
<TextareaField label="Anmerkung" rows={3} value={startNote} onChange={setStartNote} />
|
||||
</div>
|
||||
@@ -153,7 +168,11 @@ export function KarenzPanel({ open, onClose, employee }: { open: boolean; onClos
|
||||
|
||||
{mode === "adjust" && (
|
||||
<>
|
||||
<p className="text-sm text-ink-muted">Aktuelles Rückkehrdatum: {fmtDate(employee.karenz_return_date)}</p>
|
||||
<p className="rounded bg-surface px-3 py-2 text-sm text-ink-body">
|
||||
<span className="font-semibold">{absenceLabel(employee.status, employee.absence_type)}</span>
|
||||
{" · Rückkehr "}
|
||||
{fmtDate(employee.karenz_return_date)}
|
||||
</p>
|
||||
<TextField label="Neues Rückkehrdatum" required type="date" value={newReturnDate} onChange={setNewReturnDate} />
|
||||
{diffDays !== 0 && (
|
||||
<div className={`rounded px-3 py-2 text-sm ${diffDays > 0 ? "bg-warning-bg text-warning-text" : "bg-success-bg text-success-text"}`}>
|
||||
|
||||
Reference in New Issue
Block a user