Visual - `--radius: 8px` in @theme collapsed Tailwind v4's whole radius scale onto a single value: `rounded` and `rounded-lg` both measured 8px, so a chip, an input and a card could not be told apart. Named steps restore the gradation (6 / 8 / 12px, measured in the browser). - Cards were a 1px border and nothing else. Added warm, brand-tinted elevation tokens — a neutral black shadow over the pink surface reads as dirt — in three steps for cards, dropdowns and overlays, collected behind components/ui/Card.tsx so the 26 hand-copied card class chains have one definition. - KPI tiles lead with the number and carry a tone accent; tables got denser rows, subtle row rules (the full border strength made 800 rows read as a grid), tabular figures in numeric columns and a brand-tinted hover. KPI tiles now link to the view that shows what they count. Making those links honest surfaced two reasons the numbers did not agree with their destinations: - The dashboard read `employees.status`, while every report derives status from entry/exit/karenz dates. A hire whose start date had passed before the cron ran was counted differently on the two pages. The dashboard now uses the same derivation — and one query instead of five. - Eintritte/Austritte counted `entry_date`/`exit_date` while the linked report counts `employee_history`; rehire_employee sets entry_date but logs the event as 'Wiedereintritt', so rehires were missing from the target. Both now count history events. - The employee list filtered on the status column, so it disagreed too. It now filters on derived status in SQL (lib/employee-status-filter.ts). That restates deriveStatusAsOf a second time, in a second language, so an integration test runs both over the full roster and requires identical id sets — drift here is otherwise invisible. Status semantics, per the domain correction: "aktiv" means status Aktiv alone. Karenz is employed but not active, and has its own tile. The active headcount, FTE (Karenz contributes no capacity) and the division bars all follow that; the bars are labelled "Aktive nach Bereich" rather than "Headcount" to say so. The employee filter still offers the combination, named after the two statuses it selects instead of calling the pair active. DEFAULT_STATUSES in lib/reports.ts is deliberately left at Aktiv + Karenz: it governs what the Berichte page shows without an explicit status filter, and therefore what already-saved reports and exports mean.
99 lines
3.4 KiB
TypeScript
99 lines
3.4 KiB
TypeScript
"use client";
|
|
|
|
import { usePathname, useRouter, useSearchParams } from "next/navigation";
|
|
import { useEffect, useState } from "react";
|
|
import { FILTER_SELECT_CLASS } from "@/components/ui/Field";
|
|
import { SearchInput } from "@/components/ui/SearchInput";
|
|
|
|
type EmployeeFiltersProps = {
|
|
divisions: { id: string; name: string }[];
|
|
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".
|
|
const STATUS_OPTIONS = [
|
|
{ value: "Aktiv", label: "Aktiv" },
|
|
{ value: "Karenz", label: "Karenz" },
|
|
{ value: "Aktiv,Karenz", label: "Aktiv + Karenz (beschäftigt)" },
|
|
{ value: "Geplant", label: "Geplant" },
|
|
{ value: "Ausgetreten", label: "Ausgetreten" },
|
|
] as const;
|
|
|
|
export function EmployeeFilters({ divisions, locations }: EmployeeFiltersProps) {
|
|
const router = useRouter();
|
|
const pathname = usePathname();
|
|
const searchParams = useSearchParams();
|
|
const [q, setQ] = useState(searchParams.get("q") ?? "");
|
|
|
|
useEffect(() => {
|
|
const handle = setTimeout(() => {
|
|
const current = new URLSearchParams(searchParams.toString());
|
|
if (q) current.set("q", q);
|
|
else current.delete("q");
|
|
current.delete("page");
|
|
const next = current.toString();
|
|
if (next !== searchParams.toString()) router.push(`${pathname}?${next}`);
|
|
}, 300);
|
|
return () => clearTimeout(handle);
|
|
// eslint-disable-next-line react-hooks/exhaustive-deps
|
|
}, [q]);
|
|
|
|
function updateParam(key: string, value: string) {
|
|
const params = new URLSearchParams(searchParams.toString());
|
|
if (value) params.set(key, value);
|
|
else params.delete(key);
|
|
params.delete("page");
|
|
router.push(`${pathname}?${params.toString()}`);
|
|
}
|
|
|
|
return (
|
|
<div className="flex flex-wrap items-center gap-3">
|
|
<SearchInput label="Mitarbeiter:innen durchsuchen" placeholder="Name, Pers.-Nr., Titel…" value={q} onChange={setQ} />
|
|
{/* aria-label rather than a visible label: the filter bar is a single
|
|
horizontal row, and each select's first option already names it on
|
|
screen. */}
|
|
<select
|
|
aria-label="Nach Bereich filtern"
|
|
defaultValue={searchParams.get("division") ?? ""}
|
|
onChange={(e) => updateParam("division", e.target.value)}
|
|
className={FILTER_SELECT_CLASS}
|
|
>
|
|
<option value="">Alle Bereiche</option>
|
|
{divisions.map((d) => (
|
|
<option key={d.id} value={d.id}>
|
|
{d.name}
|
|
</option>
|
|
))}
|
|
</select>
|
|
<select
|
|
aria-label="Nach Status filtern"
|
|
defaultValue={searchParams.get("status") ?? ""}
|
|
onChange={(e) => updateParam("status", e.target.value)}
|
|
className={FILTER_SELECT_CLASS}
|
|
>
|
|
<option value="">Alle Status</option>
|
|
{STATUS_OPTIONS.map((s) => (
|
|
<option key={s.value} value={s.value}>
|
|
{s.label}
|
|
</option>
|
|
))}
|
|
</select>
|
|
<select
|
|
aria-label="Nach Standort filtern"
|
|
defaultValue={searchParams.get("location") ?? ""}
|
|
onChange={(e) => updateParam("location", e.target.value)}
|
|
className={FILTER_SELECT_CLASS}
|
|
>
|
|
<option value="">Alle Standorte</option>
|
|
{locations.map((l) => (
|
|
<option key={l.id} value={l.id}>
|
|
{l.name}
|
|
</option>
|
|
))}
|
|
</select>
|
|
</div>
|
|
);
|
|
}
|