Let the export select on everything the data model holds

The export offered four criteria — unit, location, status, employment
type — while the employee record carries around twenty selectable
attributes. Anything else had to be filtered by hand in Excel afterwards,
which is how a payroll hand-off stops matching the application it came
from.

All of them are now filters: contract type, blue/white collar,
collective agreement, paygrade, internal/external, gender, company car
and its drivetrain, works council, lateral leadership, C-level, type of
long-term absence, weekday worked, dependents on file, and open ranges
for entry, exit, birth date and weekly hours. The unit filter covers
every level rather than only divisions, so a single department can be
selected without going the long way round.

They live in one table in lib/report-criteria.ts, which the filter panel
builds itself from, the parser validates against, and the query turns
into conditions. A new criterion is one entry there and nothing else —
and it cannot end up working in the report while being silently ignored
by the export.

The two export links and the saved-report config now carry the query
string through as it stands instead of listing the parameters they know
about. That enumeration was the actual defect: adding a filter meant
remembering three separate places, and forgetting one produced an export
that quietly disagreed with the figure on screen.

Validation is not housekeeping here. These values reach SQL comparisons
and the download filename, i.e. a Content-Disposition header; what is not
in the list does not get through.

The company car dropdown leaves the employee list. It is one of twenty
equals under Berichte now, where the selection can also be exported —
which was the point of asking in the first place.

Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>

app/api/export/employees/route.ts

@@ -4,11 +4,12 @@ import { exportFilename, exportResponseHeaders, toCsv, toXlsx, type ExportColumn
 import { todayIso } from "@/lib/format";
 import { subtreeOf } from "@/lib/org";
 import { loadPlacements, loadReportingLineMap } from "@/lib/placement";
+import { LEERE_CRITERIA, parseCriteria, passtImSpeicher } from "@/lib/report-criteria";
 import { deriveStatusAsOf, parseIsoDateParam, parseStatuses, type OrgLookups } from "@/lib/reports";
-import { loadDependentsCounts, loadOrgLookups, type ReportFilters } from "@/lib/reports-data";
+import { applyCriteria, loadDependentsCounts, loadOrgLookups, type ReportFilters } from "@/lib/reports-data";
 import { requireHrUser } from "@/lib/auth/require-hr";
 import { withUser } from "@/lib/db";
-import type { Database, EmploymentType, Weekday } from "@/lib/supabase/types";
+import type { Database, Weekday } from "@/lib/supabase/types";
 
 // Die Rohzeile plus die Einordnung, die nicht mehr auf ihr steht: sie kommt
 // über die Planstelle und die abgeleitete Berichtslinie.
@@ -35,7 +36,7 @@ export async function GET(request: NextRequest) {
     division: params.get("division") ?? undefined,
     location: params.get("location") ?? undefined,
     status: params.get("status") ?? undefined,
-    employment: params.get("employment") ?? undefined,
+    criteria: parseCriteria((k) => params.get(k)),
   };
 
   const statuses = parseStatuses(filters.status);
@@ -48,9 +49,10 @@ export async function GET(request: NextRequest) {
       function employeeQuery() {
         let q = tx.selectFrom("employees").selectAll().orderBy("last_name").orderBy("id");
         if (filters.location) q = q.where("location_id", "=", filters.location);
-        if (filters.employment) q = q.where("employment_type", "=", filters.employment as EmploymentType);
         if (!asOf) q = q.where("status", "in", statuses);
-        return q;
+        // Dieselben Bedingungen wie im Bericht daneben — sonst stimmt die
+        // Zahl auf dem Bildschirm nicht mit der Zeilenzahl im Export überein.
+        return applyCriteria(q, filters.criteria ?? LEERE_CRITERIA);
       }
 
       const [employees, lookupResult, allEmployees, dependentsCounts, placements, lines] = await Promise.all([
@@ -79,10 +81,12 @@ export async function GET(request: NextRequest) {
   // Export für "Produktion" nur die Bereichsleitung.
   const allowedUnits = filters.division ? new Set(subtreeOf(orgMaps, filters.division)) : null;
 
+  const criteria = filters.criteria ?? LEERE_CRITERIA;
   const enriched: EmployeeRow[] = employees.flatMap((e) => {
     const placement = placements.get(e.id);
     const orgUnitId = placement?.current ? placement.orgUnitId : null;
     if (allowedUnits && (!orgUnitId || !allowedUnits.has(orgUnitId))) return [];
+    if (!passtImSpeicher({ work_days: e.work_days, dependentsCount: dependentsCounts.get(e.id) ?? 0 }, criteria)) return [];
     return [{
       ...e,
       org_unit_id: orgUnitId,

app/api/export/report/route.ts

@@ -1,5 +1,6 @@
 import { NextResponse, type NextRequest } from "next/server";
 import { exportFilename, exportResponseHeaders, toCsv, toXlsx, type ExportColumn } from "@/lib/export";
+import { parseCriteria } from "@/lib/report-criteria";
 import {
   aggregateEvents,
   aggregateReport,
@@ -69,7 +70,7 @@ export async function GET(request: NextRequest) {
         division: params.get("division") ?? undefined,
         location: params.get("location") ?? undefined,
         status: params.get("status") ?? undefined,
-        employment: params.get("employment") ?? undefined,
+        criteria: parseCriteria((k) => params.get(k)),
         asOf,
       });
       rows = aggregateReport(employees, measure, group, split, lookups, asOf);