Org assignment history, mobile support, and a correctness pass
Data model - employee_assignments records org placement over time (valid_from/valid_to), written by a trigger on `employees` rather than inside each RPC: ~70 `update employees` statements spread over fifteen migrations mean per-call bookkeeping would miss paths today and again with every future RPC. A partial unique index enforces the one-open-interval invariant the trigger relies on when closing the current row. - The Organigramm gains a Stichtag (default today). Membership comes from entry/exit/karenz, past placement from the new history, future placement projected from pending_org_changes. Placements predating the migration are backfilled with today's values and flagged as such in the UI, since employee_history only ever stored free text and cannot be reconstructed. Correctness - Reports and exports silently truncated at PostgREST's 1000-row cap (db.max_rows); employee_history is already past it at ~800 staff. Every whole-table read now pages explicitly. - XLSX date cells were a day early: ExcelJS converts a Date to an Excel serial straight off getTime(), so a Date built at local midnight lands on the previous day's serial in any positive-offset zone. - Date handling is pinned to Europe/Vienna throughout, and date-only strings are formatted without a Date round-trip. The dashboard's YTD window was built by round-tripping a local Date through toISOString(), which shifted it a day early and dropped 31 December entirely. - Export routes parsed measure/group/split/eventType with unchecked `as` casts, so an unknown value reached column headers as `undefined` and the Content-Disposition filename. Parsed against the label maps now, with the filename slugged as a backstop. - toXlsx keyed columns by header text, silently dropping the second of any two columns sharing a name — split columns take their header from data. - The org chart tree walks had no cycle guard; nothing in the schema forbids a manager_id cycle, and one would hang the tab rather than misreport. - The login page reflected ?error= verbatim, letting anyone put arbitrary text on the real sign-in screen; messages are looked up by code now. - React Flow needs elementsSelectable on, or it sets pointer-events:none on the whole node and the expand control stops responding. UI - Mobile: the shell was unusable below lg — a fixed 236px margin pushed content off-screen with no mobile navigation at all. The sidebar is now a drawer, dvh replaces vh, safe-area insets are honoured, inputs are 16px so iOS stops zooming on focus, and form grids stack. - Org chart nodes redesigned: per-kind accent stripes and icons, vacant roles called out, expand control moved to the bottom edge carrying the child count. - Pagination is windowed; it previously rendered one link per page (54 for the employee list, unbounded for the audit log). - Positions page reduced to open positions with a single "Besetzen" action. - The employee Organisation tab links into the org chart focused on that person, reusing the chart's existing search-match highlighting. Also included, uncommitted until now - Dependants, HR notes, academic titles, split address fields, position validity and role/employment fields, with their migrations and UI. - Docker/compose deployment setup, data-model and security-review docs.
This commit is contained in:
@@ -1,73 +1,21 @@
|
||||
import { PositionsPageClient } from "@/components/positions/PositionsPageClient";
|
||||
import { daysBetween } from "@/lib/format";
|
||||
import { daysBetweenIso, toIsoDate } from "@/lib/format";
|
||||
import { loadOpenPositions } from "@/lib/positions";
|
||||
import { createClient } from "@/lib/supabase/server";
|
||||
|
||||
export default async function PositionsPage() {
|
||||
const supabase = await createClient();
|
||||
|
||||
const [openPositions, { data: divisions }, { data: departments }, { data: teams }, { data: activeEmployees }, { data: leads }] =
|
||||
await Promise.all([
|
||||
loadOpenPositions(supabase),
|
||||
supabase.from("divisions").select("*").order("name"),
|
||||
supabase.from("departments").select("*"),
|
||||
supabase.from("teams").select("*"),
|
||||
supabase.from("employees").select("team_id, division_id, weekly_hours").in("status", ["Aktiv", "Karenz"]),
|
||||
supabase
|
||||
.from("employees")
|
||||
.select("id, first_name, last_name, team_id, division_id, org_level, is_lead")
|
||||
.eq("status", "Aktiv")
|
||||
.or("is_lead.eq.true,org_level.eq.0"),
|
||||
]);
|
||||
// Teams are only needed for the "Position ausschreiben" dialog's team
|
||||
// select. The division/department/team headcount overview this page used
|
||||
// to render was dropped, and with it the two employee-wide aggregation
|
||||
// queries that fed it.
|
||||
const [openPositions, { data: teams }] = await Promise.all([
|
||||
loadOpenPositions(supabase),
|
||||
supabase.from("teams").select("*").order("name"),
|
||||
]);
|
||||
|
||||
const teamStats = new Map<string, { headcount: number; fte: number }>();
|
||||
const divisionHeadcount = new Map<string, number>();
|
||||
for (const e of activeEmployees ?? []) {
|
||||
if (e.team_id) {
|
||||
const s = teamStats.get(e.team_id) ?? { headcount: 0, fte: 0 };
|
||||
s.headcount += 1;
|
||||
s.fte += Number(e.weekly_hours) / 38.5;
|
||||
teamStats.set(e.team_id, s);
|
||||
}
|
||||
if (e.division_id) {
|
||||
divisionHeadcount.set(e.division_id, (divisionHeadcount.get(e.division_id) ?? 0) + 1);
|
||||
}
|
||||
}
|
||||
const openPositionsWithDays = openPositions.map((p) => ({ ...p, daysOpen: daysBetweenIso(toIsoDate(p.created_at)) }));
|
||||
|
||||
const divisionHeadByDivision = new Map<string, { id: string; name: string }>();
|
||||
const teamLeadByTeam = new Map<string, { id: string; name: string }>();
|
||||
for (const p of leads ?? []) {
|
||||
const name = `${p.first_name} ${p.last_name}`;
|
||||
if (p.org_level === 1 && p.division_id) divisionHeadByDivision.set(p.division_id, { id: p.id, name });
|
||||
if (p.is_lead && p.team_id) teamLeadByTeam.set(p.team_id, { id: p.id, name });
|
||||
}
|
||||
|
||||
const openPositionCountByTeam = new Map<string, number>();
|
||||
for (const pos of openPositions) {
|
||||
openPositionCountByTeam.set(pos.team_id, (openPositionCountByTeam.get(pos.team_id) ?? 0) + 1);
|
||||
}
|
||||
|
||||
const divisionCards = (divisions ?? []).map((div) => ({
|
||||
...div,
|
||||
head: divisionHeadByDivision.get(div.id) ?? null,
|
||||
headcount: divisionHeadcount.get(div.id) ?? 0,
|
||||
departments: (departments ?? [])
|
||||
.filter((d) => d.division_id === div.id)
|
||||
.map((dept) => ({
|
||||
...dept,
|
||||
teams: (teams ?? [])
|
||||
.filter((t) => t.department_id === dept.id)
|
||||
.map((t) => ({
|
||||
...t,
|
||||
lead: teamLeadByTeam.get(t.id) ?? null,
|
||||
headcount: teamStats.get(t.id)?.headcount ?? 0,
|
||||
fte: teamStats.get(t.id)?.fte ?? 0,
|
||||
openCount: openPositionCountByTeam.get(t.id) ?? 0,
|
||||
})),
|
||||
})),
|
||||
}));
|
||||
|
||||
const openPositionsWithDays = openPositions.map((p) => ({ ...p, daysOpen: daysBetween(p.created_at) }));
|
||||
|
||||
return <PositionsPageClient openPositions={openPositionsWithDays} divisionCards={divisionCards} teams={teams ?? []} />;
|
||||
return <PositionsPageClient openPositions={openPositionsWithDays} teams={teams ?? []} />;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user