Ask for the optional things separately, and stop claiming numbers are issued
A round of interface corrections from use, plus one schema change behind them. The private email address is now optional. It was NOT NULL — the wrong default for a private detail: someone without one had to invent one, and invented data in a personnel file is worse than missing data. Both fields are relabelled to say whose they are, "Private E-Mail" and "Private Telefonnummer", because the company address does not exist until the person starts. Uniqueness stays; several NULLs coexist in a Postgres unique index, which is exactly what is wanted. The summary step still promised that "Personalnummer und Firmen-E-Mail-Adresse werden automatisch vergeben". Neither is true any more. Removed rather than reworded — the step lists what was entered, and a banner claiming otherwise is worse than no banner. Dependents move into the wizard as step three, optional. They can only be attached after the hire, because add_employee_dependent needs an id that does not exist while the form is open, so they are collected in the draft and written afterwards. That puts them outside the transaction the person is created in: if one fails the person still exists, so the message names who is missing instead of failing silently, and the SV number is checked in the step rather than after. The emergency contact gets its own step, second to last, and its relationship is a dropdown of the common ones rather than free text — otherwise "Gattin", "Ehefrau" and "Frau" end up side by side and nothing can be counted. "Sonstige" is there because a closed list would otherwise be presumptuous. On the master-data tab it now sits below the dependents rather than above: both are people around the employee, and this is the one you reach for in a hurry. Returning from a long absence: the choice read "unverändert", which made you open the file to find out what you were agreeing to. It now reads "Wie vor Abwesenheit (38,5 h)" with the hours actually worked, and the alternative is "Reduziert" — whose hours field starts empty on purpose. A number already filled in gets confirmed rather than read off the agreement it comes from. Co-Authored-By: Claude Opus 5 <noreply@anthropic.com>
This commit is contained in:
@@ -15,7 +15,7 @@ import { useToast } from "@/components/ui/Toast";
|
||||
import { UN_COUNTRIES } from "@/lib/countries";
|
||||
import { fmtFullName, todayIso } from "@/lib/format";
|
||||
import { isValidSvnr, requiresAustrianSvnr } from "@/lib/svnr";
|
||||
import type { ContractType, Database, EmploymentType, GenderType } from "@/lib/supabase/types";
|
||||
import { EMERGENCY_RELATIONS, type ContractType, type Database, type EmploymentType, type GenderType } from "@/lib/supabase/types";
|
||||
|
||||
type EmployeeRow = Database["public"]["Tables"]["employees"]["Row"];
|
||||
type Dependent = Database["public"]["Tables"]["employee_dependents"]["Row"];
|
||||
@@ -56,7 +56,7 @@ export function DatenAendernPanel({
|
||||
const [postalCode, setPostalCode] = useState(employee.postal_code ?? "");
|
||||
const [city, setCity] = useState(employee.city ?? "");
|
||||
const [addressCountry, setAddressCountry] = useState(employee.address_country ?? "Österreich");
|
||||
const [email, setEmail] = useState(employee.email);
|
||||
const [email, setEmail] = useState(employee.email ?? "");
|
||||
const [phone, setPhone] = useState(employee.phone ?? "");
|
||||
const [notfallName, setNotfallName] = useState(employee.emergency_contact_name ?? "");
|
||||
const [notfallTelefon, setNotfallTelefon] = useState(employee.emergency_contact_phone ?? "");
|
||||
@@ -230,12 +230,13 @@ export function DatenAendernPanel({
|
||||
<div className="grid grid-cols-1 gap-3 sm:grid-cols-2">
|
||||
<TextField label="Name" dense value={notfallName} onChange={setNotfallName} />
|
||||
<TextField label="Telefon" dense type="tel" value={notfallTelefon} onChange={setNotfallTelefon} />
|
||||
<TextField
|
||||
<SelectField
|
||||
label="Verhältnis"
|
||||
dense
|
||||
value={notfallVerhaeltnis}
|
||||
onChange={setNotfallVerhaeltnis}
|
||||
hint="Zum Beispiel Gattin, Bruder, Freundin."
|
||||
placeholder="Bitte wählen…"
|
||||
options={EMERGENCY_RELATIONS.map((r) => ({ value: r, label: r }))}
|
||||
/>
|
||||
</div>
|
||||
</fieldset>
|
||||
|
||||
@@ -33,7 +33,13 @@ export function KarenzPanel({ open, onClose, employee }: { open: boolean; onClos
|
||||
|
||||
const [returnDate, setReturnDate] = useState("");
|
||||
const [employmentMode, setEmploymentMode] = useState<EmploymentMode>("unverändert");
|
||||
const [weeklyHours, setWeeklyHours] = useState("20");
|
||||
// Die Stunden, die vor der Abwesenheit galten — mit Komma, wie man sie
|
||||
// hierzulande schreibt.
|
||||
const stundenText = String(employee.weekly_hours).replace(".", ",");
|
||||
// Absichtlich leer statt vorbelegt: eine Zahl, die schon dasteht, wird
|
||||
// bestätigt statt erfasst. Die reduzierten Stunden stehen in einer
|
||||
// Vereinbarung, und die muss jemand ablesen.
|
||||
const [weeklyHours, setWeeklyHours] = useState("");
|
||||
|
||||
const diffDays =
|
||||
isOnKarenz && employee.karenz_return_date && newReturnDate
|
||||
@@ -89,9 +95,15 @@ export function KarenzPanel({ open, onClose, employee }: { open: boolean; onClos
|
||||
showToast("Bitte Rückkehrdatum angeben.", "error");
|
||||
return;
|
||||
}
|
||||
if (employmentMode === "Teilzeit" && (Number(weeklyHours) <= 0 || Number(weeklyHours) >= 38.5)) {
|
||||
showToast("Wochenstunden müssen zwischen 0 und 38,5 liegen.", "error");
|
||||
return;
|
||||
if (employmentMode === "Teilzeit") {
|
||||
if (!weeklyHours.trim()) {
|
||||
showToast("Bitte die reduzierten Wochenstunden erfassen.", "error");
|
||||
return;
|
||||
}
|
||||
if (Number(weeklyHours) <= 0 || Number(weeklyHours) >= 38.5) {
|
||||
showToast("Wochenstunden müssen zwischen 0 und 38,5 liegen.", "error");
|
||||
return;
|
||||
}
|
||||
}
|
||||
setPending(true);
|
||||
const result = await recordKarenzReturn({
|
||||
@@ -191,20 +203,23 @@ export function KarenzPanel({ open, onClose, employee }: { open: boolean; onClos
|
||||
value={employmentMode}
|
||||
onChange={(v) => setEmploymentMode(v as EmploymentMode)}
|
||||
options={[
|
||||
{ value: "unverändert", label: "unverändert" },
|
||||
{ value: "Vollzeit", label: "Vollzeit (38,5h)" },
|
||||
{ value: "Teilzeit", label: "Teilzeit-Elternteilzeit" },
|
||||
// Die Stunden, die zuletzt gearbeitet wurden, stehen in der
|
||||
// Beschriftung. „unverändert" allein zwang dazu, in der
|
||||
// Akte nachzusehen, worauf man sich da einlässt.
|
||||
{ value: "unverändert", label: `Wie vor Abwesenheit (${stundenText} h)` },
|
||||
{ value: "Teilzeit", label: "Reduziert" },
|
||||
]}
|
||||
/>
|
||||
{employmentMode === "Teilzeit" && (
|
||||
<TextField
|
||||
label="Wochenstunden"
|
||||
label="Reduzierte Wochenstunden"
|
||||
required
|
||||
type="number"
|
||||
step="0.5"
|
||||
max="38"
|
||||
value={weeklyHours}
|
||||
onChange={setWeeklyHours}
|
||||
placeholder={`weniger als ${stundenText}`}
|
||||
hint="Muss unter 38,5 liegen."
|
||||
/>
|
||||
)}
|
||||
|
||||
Reference in New Issue
Block a user