renaud/espace-paie-odentas
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correction problème esign staff/contrats/id

Browse source
This commit is contained in:
Renaud 2025-10-16 13:20:20 +02:00
parent ecc8488541
commit a22dde4424
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/(app)/staff/contrats/[id]/page.tsx
View file

@ -32,7 +32,7 @@ export default async function Page({ params }: { params: { id: string } }) {
// Charge le contrat et ses payslips avec la session utilisateur (RLS doit autoriser le staff)
const { data: contract, error: cErr } = await sb
.from("cddu_contracts")
.select("*, salaries!employee_id(salarie, nom, prenom)")
.select("*, salaries!employee_id(salarie, nom, prenom, adresse_mail, code_salarie)")
.eq("id", params.id)
.single();

16
components/staff/contracts/ContractEditor.tsx
View file

@ -215,7 +215,10 @@ export default function ContractEditor({
|| (contract.salaries?.nom
? `${contract.salaries.nom.toUpperCase()}${contract.salaries.prenom ? ' ' + contract.salaries.prenom.charAt(0).toUpperCase() + contract.salaries.prenom.slice(1) : ''}`
: contract.employee_name || "");
const salarie_matricule = contract.employee_matricule || contract.matricule || "";
const salarie_matricule = contract.employee_matricule || contract.matricule || contract.salaries?.code_salarie || "";
const salarie_email = contract.salaries?.adresse_mail || null;
const salarie_prenom = contract.salaries?.prenom || null;
const salarie_code = contract.salaries?.code_salarie || null;
const categorie = contract.categorie_pro || contract.categorie_professionnelle || "";
const profession = contract.profession || "";
const date_debut = (contract.start_date || contract.debut_contrat || "").slice?.(0, 10) || "";
@ -234,6 +237,9 @@ export default function ContractEditor({
numero_objet,
salarie_nom,
salarie_matricule,
salarie_email,
salarie_prenom,
salarie_code,
categorie,
profession,
date_debut,
@ -258,7 +264,13 @@ export default function ContractEditor({
const [salarieQuery, setSalarieQuery] = useState("");
const [salarie, setSalarie] = useState<SalarieOption | null>(
prefill.salarie_nom && prefill.salarie_matricule ?
{ nom: prefill.salarie_nom, matricule: prefill.salarie_matricule } : null
{
nom: prefill.salarie_nom,
matricule: prefill.salarie_matricule,
email: prefill.salarie_email,
prenom: prefill.salarie_prenom,
code_salarie: prefill.salarie_code
} : null
);
const [categoriePro, setCategoriePro] = useState<"Artiste" | "Technicien">(
(prefill.categorie as "Artiste" | "Technicien") || "Artiste"