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

feat: Ajouter colonne Type de salaire dans staff/contrats

Browse source
This commit is contained in:
odentas 2025-12-04 17:59:03 +01:00
parent e694129fb2
commit 839190fa8f
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -37,7 +37,7 @@ export default async function StaffContractsPage() {
const { data: contracts, error } = await sb
.from("cddu_contracts")
.select(
`id, contract_number, employee_name, employee_id, structure, type_de_contrat, profession, production_name, start_date, end_date, created_at, etat_de_la_demande, etat_de_la_paie, dpae, gross_pay, org_id, contrat_signe_par_employeur, contrat_signe, last_employer_notification_at, last_employee_notification_at, analytique, nombre_d_heures, n_objet, objet_spectacle,
`id, contract_number, employee_name, employee_id, structure, type_de_contrat, profession, production_name, start_date, end_date, created_at, etat_de_la_demande, etat_de_la_paie, dpae, gross_pay, org_id, contrat_signe_par_employeur, contrat_signe, last_employer_notification_at, last_employee_notification_at, analytique, nombre_d_heures, n_objet, objet_spectacle, type_salaire,
salaries!employee_id(salarie, nom, prenom, adresse_mail, code_salarie),
organizations!org_id(organization_details(code_employeur))`
)

12
components/staff/ContractsGrid.tsx
View file

@ -181,6 +181,7 @@ type Contract = {
nombre_d_heures?: number | null;
n_objet?: string | null;
objet_spectacle?: string | null;
type_salaire?: string | null;
salaries?: {
salarie?: string | null;
nom?: string | null;
@ -2392,6 +2393,7 @@ function ContractsGridImpl({ initialData, activeOrgId }: { initialData: Contract
</th>
<th className="text-left px-3 py-2">Type</th>
<th className="text-left px-3 py-2">Profession</th>
<th className="text-left px-3 py-2" title="Type de salaire demandé">Type salaire</th>
<th className="text-left px-3 py-2 cursor-pointer" onClick={() => { setSortField('start_date'); setSortOrder((o) => o === 'asc' ? 'desc' : 'asc'); }}>
Date début {sortField === 'start_date' ? (sortOrder === 'asc' ? '▲' : '▼') : ''}
</th>
@ -2469,6 +2471,16 @@ function ContractsGridImpl({ initialData, activeOrgId }: { initialData: Contract
r.type_de_contrat === "CDD d'usage" ? "CDDU" : (r.type_de_contrat || "—")
}</td>
<td className="px-3 py-2">{r.profession || "—"}</td>
<td className="px-3 py-2" title={r.type_salaire || "—"}>{
(() => {
const type = r.type_salaire || "—";
if (type.includes("Brut")) return "Brut";
if (type.includes("Net")) return "Net";
if (type.includes("Coût") || type.includes("CTE")) return "CTE";
if (type.includes("Minimum") || type.includes("Min")) return "Min";
return type;
})()
}</td>
<td className="px-3 py-2">{formatDate(r.start_date)}</td>
<td className="px-3 py-2">{formatDate(r.end_date)}</td>
<td className="px-3 py-2">