@@ -243,28 +339,20 @@ export default function FacturationPage() {
)}
- {/* Pagination */}
+ {/* Pagination inférieure */}
{data && (
-
- (null);
const [selectedNom, setSelectedNom] = useState(null);
- const headerRight = useMemo(
- () => (
-
+ {/* Pagination supérieure */}
+ {rows.length > 0 && (
+
- Page {data.factures.page} — {items.length} élément{items.length > 1 ? "s" : ""}
-
-
-
-
-
+
+ setPage(newPage)}
+ onLimitChange={(newLimit) => { setLimit(newLimit); setPage(1); }}
+ isFetching={isFetching}
+ itemsCount={items.length}
+ position="bottom"
+ />
)}
diff --git a/app/(app)/page.tsx b/app/(app)/page.tsx
index 3d1a35c..569edf0 100644
--- a/app/(app)/page.tsx
+++ b/app/(app)/page.tsx
@@ -35,6 +35,7 @@ export default function Dashboard() {
const items = data?.items ?? [];
const hasMore = data?.hasMore ?? false;
+ const total = data?.total ?? 0;
// Récupérer les infos utilisateur pour personnaliser l'accueil
const { data: clientInfo } = useQuery({
@@ -68,11 +69,13 @@ export default function Dashboard() {
: null;
const count = items.length;
- const countLabel = count === 0
+ const countLabel = total === 0
? "Vous n'avez aucun contrat en cours"
- : count === 1
- ? `Vous avez 1 contrat en cours (page ${currentPage})`
- : `Vous avez ${count} contrats en cours (page ${currentPage})`;
+ : total === 1
+ ? "Vous avez 1 contrat en cours"
+ : count === total
+ ? `Vous avez ${total} contrat${total > 1 ? 's' : ''} en cours`
+ : `Vous avez ${total} contrats en cours • ${count} affiché${count > 1 ? 's' : ''} sur cette page`;
const handlePrevPage = () => {
if (currentPage > 1) {
diff --git a/app/(app)/salaries/page.tsx b/app/(app)/salaries/page.tsx
index 8079bbc..24a99a7 100644
--- a/app/(app)/salaries/page.tsx
+++ b/app/(app)/salaries/page.tsx
@@ -29,6 +29,7 @@ type SalariesResponse = {
page: number;
limit: number;
total?: number;
+ totalPages?: number;
hasMore: boolean;
};
@@ -56,6 +57,81 @@ function lastContractHref(c?: SalarieRow["dernier_contrat"]) {
return isMulti ? `/contrats-multi/${c.id}` : `/contrats/${c.id}`;
}
+/* ===== Composant de pagination ===== */
+type PaginationProps = {
+ page: number;
+ totalPages: number;
+ total: number;
+ limit: number;
+ onPageChange: (page: number) => void;
+ onLimitChange: (limit: number) => void;
+ isFetching?: boolean;
+ itemsCount: number;
+ position?: 'top' | 'bottom';
+};
+
+function Pagination({ page, totalPages, total, limit, onPageChange, onLimitChange, isFetching, itemsCount, position = 'bottom' }: PaginationProps) {
+ return (
+
+ {/* Navigation */}
+
+ );
+}
+
/* ===== Data hook ===== */
function useSalaries(page: number, limit: number, search: string, org?: string | null) {
// 🎭 Détection directe du mode démo
@@ -166,6 +242,7 @@ function useSalaries(page: number, limit: number, search: string, org?: string |
page,
limit,
total: filteredSalaries.length,
+ totalPages: Math.ceil(filteredSalaries.length / limit),
hasMore: endIndex < filteredSalaries.length,
},
isLoading: false,
@@ -232,7 +309,7 @@ export default function SalariesPage() {
const initialPage = Number(searchParams.get("page") || 1);
const initialSearch = searchParams.get("q") || "";
const [page, setPage] = useState(initialPage);
- const [limit] = useState(25);
+ const [limit, setLimit] = useState(10);
const [query, setQuery] = useState(initialSearch);
const debouncedSearch = useDebouncedCallback((v: string) => {
@@ -263,6 +340,8 @@ export default function SalariesPage() {
const { data, isLoading, isFetching } = useSalaries(page, limit, query, selectedOrg);
const rows: SalarieRow[] = data?.items ?? [];
const hasMore: boolean = data?.hasMore ?? false;
+ const total = data?.total ?? 0;
+ const totalPages = data?.totalPages ?? 0;
useEffect(() => {
let mounted = true;
@@ -284,50 +363,6 @@ export default function SalariesPage() {
const [selectedMatricule, setSelectedMatricule] = useState
+
+
+
+ {/* Sélecteur de limite */}
+
+ Page {page} sur {totalPages || 1}
+
+
+
+ Afficher :
+
+
+
+ {/* Informations */}
+
+ {isFetching ? (
+
+
+
-
-
- ),
- [page, hasMore, isFetching, query, router, searchParams]
- );
-
return (
Page {page}
-
-
{/* Barre de titre + actions */}
@@ -375,20 +410,40 @@ export default function SalariesPage() {
>
+ Liste
+
{isLoading ? (
-
+
-
+ <>
+ setPage(newPage)}
+ onLimitChange={(newLimit) => { setLimit(newLimit); setPage(1); }}
+ isFetching={isFetching}
+ itemsCount={rows.length}
+ position="bottom"
+ />
+
)}
-
+
- {/* Pagination bas de page */}
-
| Salarié | @@ -459,46 +514,23 @@ export default function SalariesPage() {
|---|
-
-
{newContratOpen && (
Page {page}
-
-
{/* Backdrop */}
diff --git a/app/(app)/signatures-electroniques/page.tsx b/app/(app)/signatures-electroniques/page.tsx
index 0a6c366..a7f6354 100644
--- a/app/(app)/signatures-electroniques/page.tsx
+++ b/app/(app)/signatures-electroniques/page.tsx
@@ -4,6 +4,7 @@ import { useEffect, useMemo, useRef, useState } from 'react';
import { FileSignature, BellRing, XCircle } from 'lucide-react';
import Script from 'next/script';
import { usePageTitle } from '@/hooks/usePageTitle';
+import { useQuery } from '@tanstack/react-query';
type AirtableRecord = {
id: string;
@@ -27,6 +28,58 @@ function classNames(...arr: Array) {
return arr.filter(Boolean).join(' ');
}
+// Hook pour récupérer les infos utilisateur
+function useUserInfo() {
+ return useQuery({
+ queryKey: ["user-info"],
+ queryFn: async () => {
+ try {
+ const res = await fetch("/api/me", {
+ cache: "no-store",
+ headers: { Accept: "application/json" },
+ credentials: "include"
+ });
+ if (!res.ok) return null;
+ const me = await res.json();
+
+ return {
+ isStaff: Boolean(me.is_staff || me.isStaff),
+ orgId: me.orgId || me.active_org_id || null,
+ orgName: me.orgName || me.active_org_name || "Organisation",
+ };
+ } catch {
+ return null;
+ }
+ },
+ staleTime: 30_000,
+ });
+}
+
+// Hook pour récupérer les organisations (staff uniquement)
+function useOrganizations() {
+ const { data: userInfo, isSuccess: userInfoLoaded } = useUserInfo();
+
+ return useQuery({
+ queryKey: ["organizations"],
+ queryFn: async () => {
+ try {
+ const res = await fetch("/api/staff/organizations", {
+ cache: "no-store",
+ headers: { Accept: "application/json" },
+ credentials: "include"
+ });
+ if (!res.ok) return [];
+ const data = await res.json();
+ return data.organizations || [];
+ } catch {
+ return [];
+ }
+ },
+ enabled: userInfoLoaded && !!userInfo?.isStaff,
+ staleTime: 60_000,
+ });
+}
+
export default function SignaturesElectroniques() {
usePageTitle("Signatures électroniques");
@@ -50,15 +103,26 @@ export default function SignaturesElectroniques() {
// État pour les relances
const [loadingRelance, setLoadingRelance] = useState>({});
+ // État pour le sélecteur d'organisation (staff uniquement)
+ const [selectedOrgId, setSelectedOrgId] = useState("");
+
+ // Charger les infos utilisateur et organisations
+ const { data: userInfo } = useUserInfo();
+ const { data: organizations } = useOrganizations();
+
// Suppression de pollActive et pollTimer car le polling a été retiré
// Load current contracts to sign (server-side API fetches Airtable)
async function load() {
try {
setError(null);
+
+ // Ajouter le paramètre org_id si sélectionné (staff uniquement)
+ const orgParam = selectedOrgId ? `&org_id=${selectedOrgId}` : '';
+
const [rEmp, rSal] = await Promise.all([
- fetch('/api/signatures-electroniques/contrats?scope=employeur', { cache: 'no-store' }),
- fetch('/api/signatures-electroniques/contrats?scope=salarie', { cache: 'no-store' }),
+ fetch(`/api/signatures-electroniques/contrats?scope=employeur${orgParam}`, { cache: 'no-store' }),
+ fetch(`/api/signatures-electroniques/contrats?scope=salarie${orgParam}`, { cache: 'no-store' }),
]);
if (!rEmp.ok) throw new Error(`HTTP employeur ${rEmp.status}`);
if (!rSal.ok) throw new Error(`HTTP salarie ${rSal.status}`);
@@ -76,7 +140,7 @@ export default function SignaturesElectroniques() {
useEffect(() => {
load();
- }, []);
+ }, [selectedOrgId]); // Recharger quand l'organisation change
// Ajouter des écouteurs pour recharger les données quand un modal se ferme
useEffect(() => {
@@ -287,9 +351,36 @@ export default function SignaturesElectroniques() {
{/* DocuSeal web component script */}
-
Signatures électroniques
+
+
- Signatures électroniques
+ + {/* Sélecteur d'organisation (visible uniquement par le staff) */} + {userInfo?.isStaff && ( +
+
+
+ {organizations && organizations.length > 0 && (
+ ({organizations.length})
+ )}
+
+ )}
+
+
(null);
+ const [deletingProduction, setDeletingProduction] = useState(null);
+ const [isCreateModalOpen, setIsCreateModalOpen] = useState(false);
+
+ const { data: staffCheck, isLoading: isLoadingStaff } = useStaffCheck();
+ const { data: organizations = [], isLoading: isLoadingOrgs } = useOrganizations();
+ const { data: productions = [], isLoading: isLoadingProductions, error } = useProductions(
+ selectedOrgId,
+ searchQuery
+ );
+
+ // Filtrage local supplémentaire si nécessaire
+ const filteredProductions = useMemo(() => {
+ let result = productions;
+
+ if (searchQuery.trim()) {
+ const query = searchQuery.toLowerCase();
+ result = result.filter(
+ (p) =>
+ p.name.toLowerCase().includes(query) ||
+ (p.reference && p.reference.toLowerCase().includes(query))
+ );
+ }
+
+ return result;
+ }, [productions, searchQuery]);
+
+ // Vérification staff
+ if (isLoadingStaff) {
+ return (
+
+
+ );
+ }
+
+ const hasActiveFilters = selectedOrgId || searchQuery;
+
+ return (
+ {
+ try {
+ const { data: staffRow } = await supabase
+ .from("staff_users")
+ .select("is_staff")
+ .eq("user_id", userId)
+ .maybeSingle();
+ return !!staffRow?.is_staff;
+ } catch {
+ return false;
+ }
+}
+
+// GET - Récupérer une production spécifique
+export async function GET(
+ req: NextRequest,
+ { params }: { params: { id: string } }
+) {
+ try {
+ const supabase = createRouteHandlerClient({ cookies });
+ const { data: { session } } = await supabase.auth.getSession();
+
+ if (!session) {
+ return NextResponse.json({ error: "unauthorized" }, { status: 401 });
+ }
+
+ // Vérifier que l'utilisateur est staff
+ const isStaff = await isStaffUser(supabase, session.user.id);
+ if (!isStaff) {
+ return NextResponse.json(
+ { error: "forbidden", message: "Staff access required" },
+ { status: 403 }
+ );
+ }
+
+ const { data: production, error } = await supabase
+ .from("productions")
+ .select("*")
+ .eq("id", params.id)
+ .single();
+
+ if (error || !production) {
+ return NextResponse.json(
+ { error: "Production introuvable" },
+ { status: 404 }
+ );
+ }
+
+ return NextResponse.json({ production });
+ } catch (error) {
+ const message = error instanceof Error ? error.message : String(error);
+ return NextResponse.json(
+ { error: "internal_server_error", message },
+ { status: 500 }
+ );
+ }
+}
+
+// PATCH - Mettre à jour une production
+export async function PATCH(
+ req: NextRequest,
+ { params }: { params: { id: string } }
+) {
+ try {
+ const supabase = createRouteHandlerClient({ cookies });
+ const { data: { session } } = await supabase.auth.getSession();
+
+ if (!session) {
+ return NextResponse.json({ error: "unauthorized" }, { status: 401 });
+ }
+
+ // Vérifier que l'utilisateur est staff
+ const isStaff = await isStaffUser(supabase, session.user.id);
+ if (!isStaff) {
+ return NextResponse.json(
+ { error: "forbidden", message: "Staff access required" },
+ { status: 403 }
+ );
+ }
+
+ // Vérifier que la production existe
+ const { data: existing, error: existingError } = await supabase
+ .from("productions")
+ .select("id")
+ .eq("id", params.id)
+ .single();
+
+ if (existingError || !existing) {
+ return NextResponse.json(
+ { error: "Production introuvable" },
+ { status: 404 }
+ );
+ }
+
+ // Récupérer les données du body
+ const body = await req.json();
+ const { name, reference, declaration_date, org_id } = body;
+
+ // Validation
+ if (name !== undefined && (!name || !name.trim())) {
+ return NextResponse.json(
+ { error: "Le nom ne peut pas être vide" },
+ { status: 400 }
+ );
+ }
+
+ if (org_id !== undefined && !org_id) {
+ return NextResponse.json(
+ { error: "L'organisation est requise" },
+ { status: 400 }
+ );
+ }
+
+ // Si org_id est modifié, vérifier qu'il existe
+ if (org_id !== undefined) {
+ const { data: orgExists, error: orgError } = await supabase
+ .from("organizations")
+ .select("id")
+ .eq("id", org_id)
+ .single();
+
+ if (orgError || !orgExists) {
+ return NextResponse.json(
+ { error: "Organisation introuvable" },
+ { status: 400 }
+ );
+ }
+ }
+
+ // Préparer les données à mettre à jour
+ const updateData: any = {};
+ if (name !== undefined) updateData.name = name.trim();
+ if (reference !== undefined) updateData.reference = reference?.trim() || null;
+ if (declaration_date !== undefined) updateData.declaration_date = declaration_date || null;
+ if (org_id !== undefined) updateData.org_id = org_id;
+
+ // Mettre à jour la production
+ const { data: production, error } = await supabase
+ .from("productions")
+ .update(updateData)
+ .eq("id", params.id)
+ .select()
+ .single();
+
+ if (error) {
+ console.error("[api/staff/productions] Update error:", error.message);
+ return NextResponse.json(
+ { error: "Erreur lors de la mise à jour", detail: error.message },
+ { status: 500 }
+ );
+ }
+
+ return NextResponse.json({ production });
+ } catch (error) {
+ const message = error instanceof Error ? error.message : String(error);
+ return NextResponse.json(
+ { error: "internal_server_error", message },
+ { status: 500 }
+ );
+ }
+}
+
+// DELETE - Supprimer une production
+export async function DELETE(
+ req: NextRequest,
+ { params }: { params: { id: string } }
+) {
+ try {
+ const supabase = createRouteHandlerClient({ cookies });
+ const { data: { session } } = await supabase.auth.getSession();
+
+ if (!session) {
+ return NextResponse.json({ error: "unauthorized" }, { status: 401 });
+ }
+
+ // Vérifier que l'utilisateur est staff
+ const isStaff = await isStaffUser(supabase, session.user.id);
+ if (!isStaff) {
+ return NextResponse.json(
+ { error: "forbidden", message: "Staff access required" },
+ { status: 403 }
+ );
+ }
+
+ // Vérifier que la production existe
+ const { data: existing, error: existingError } = await supabase
+ .from("productions")
+ .select("id, name")
+ .eq("id", params.id)
+ .single();
+
+ if (existingError || !existing) {
+ return NextResponse.json(
+ { error: "Production introuvable" },
+ { status: 404 }
+ );
+ }
+
+ // Vérifier si la production est utilisée dans des contrats
+ const { data: contractsUsing, error: contractsError } = await supabase
+ .from("cddu_contracts")
+ .select("id")
+ .eq("production_id", params.id)
+ .limit(1);
+
+ if (contractsError) {
+ console.error("[api/staff/productions] Check contracts error:", contractsError.message);
+ }
+
+ if (contractsUsing && contractsUsing.length > 0) {
+ return NextResponse.json(
+ { error: "Cette production est utilisée dans des contrats et ne peut pas être supprimée" },
+ { status: 400 }
+ );
+ }
+
+ // Supprimer la production
+ const { error } = await supabase
+ .from("productions")
+ .delete()
+ .eq("id", params.id);
+
+ if (error) {
+ console.error("[api/staff/productions] Delete error:", error.message);
+ return NextResponse.json(
+ { error: "Erreur lors de la suppression", detail: error.message },
+ { status: 500 }
+ );
+ }
+
+ return NextResponse.json({
+ message: "Production supprimée avec succès",
+ deleted_id: params.id
+ });
+ } catch (error) {
+ const message = error instanceof Error ? error.message : String(error);
+ return NextResponse.json(
+ { error: "internal_server_error", message },
+ { status: 500 }
+ );
+ }
+}
diff --git a/app/api/staff/productions/route.ts b/app/api/staff/productions/route.ts
new file mode 100644
index 0000000..39ed8cc
--- /dev/null
+++ b/app/api/staff/productions/route.ts
@@ -0,0 +1,166 @@
+// app/api/staff/productions/route.ts
+import { NextResponse, NextRequest } from "next/server";
+import { createRouteHandlerClient } from "@supabase/auth-helpers-nextjs";
+import { cookies } from "next/headers";
+
+export const dynamic = "force-dynamic";
+export const revalidate = 0;
+export const runtime = "nodejs";
+
+// Fonction helper pour vérifier si l'utilisateur est staff
+async function isStaffUser(supabase: any, userId: string): Promise {
+ try {
+ const { data: staffRow } = await supabase
+ .from("staff_users")
+ .select("is_staff")
+ .eq("user_id", userId)
+ .maybeSingle();
+ return !!staffRow?.is_staff;
+ } catch {
+ return false;
+ }
+}
+
+// GET - Lister toutes les productions (avec filtres optionnels)
+export async function GET(req: NextRequest) {
+ try {
+ const supabase = createRouteHandlerClient({ cookies });
+ const { data: { session } } = await supabase.auth.getSession();
+
+ if (!session) {
+ return NextResponse.json({ error: "unauthorized" }, { status: 401 });
+ }
+
+ // Vérifier que l'utilisateur est staff
+ const isStaff = await isStaffUser(supabase, session.user.id);
+ if (!isStaff) {
+ return NextResponse.json(
+ { error: "forbidden", message: "Staff access required" },
+ { status: 403 }
+ );
+ }
+
+ // Paramètres de filtrage
+ const url = new URL(req.url);
+ const orgId = url.searchParams.get("org_id");
+ const searchQuery = url.searchParams.get("q");
+
+ // Construire la requête
+ let query = supabase
+ .from("productions")
+ .select("*")
+ .order("name", { ascending: true });
+
+ // Filtrer par organisation si spécifié
+ if (orgId) {
+ query = query.eq("org_id", orgId);
+ }
+
+ // Filtrer par recherche si spécifié
+ if (searchQuery) {
+ query = query.or(
+ `name.ilike.%${searchQuery}%,reference.ilike.%${searchQuery}%`
+ );
+ }
+
+ const { data: productions, error } = await query;
+
+ if (error) {
+ console.error("[api/staff/productions] Supabase error:", error.message);
+ return NextResponse.json(
+ { error: "supabase_error", detail: error.message },
+ { status: 500 }
+ );
+ }
+
+ return NextResponse.json({ productions: productions || [] });
+ } catch (error) {
+ const message = error instanceof Error ? error.message : String(error);
+ return NextResponse.json(
+ { error: "internal_server_error", message },
+ { status: 500 }
+ );
+ }
+}
+
+// POST - Créer une nouvelle production
+export async function POST(req: NextRequest) {
+ try {
+ const supabase = createRouteHandlerClient({ cookies });
+ const { data: { session } } = await supabase.auth.getSession();
+
+ if (!session) {
+ return NextResponse.json({ error: "unauthorized" }, { status: 401 });
+ }
+
+ // Vérifier que l'utilisateur est staff
+ const isStaff = await isStaffUser(supabase, session.user.id);
+ if (!isStaff) {
+ return NextResponse.json(
+ { error: "forbidden", message: "Staff access required" },
+ { status: 403 }
+ );
+ }
+
+ // Récupérer les données du body
+ const body = await req.json();
+ const { name, reference, declaration_date, org_id } = body;
+
+ // Validation
+ if (!name || !name.trim()) {
+ return NextResponse.json(
+ { error: "Le nom est requis" },
+ { status: 400 }
+ );
+ }
+
+ if (!org_id) {
+ return NextResponse.json(
+ { error: "L'organisation est requise" },
+ { status: 400 }
+ );
+ }
+
+ // Vérifier que l'organisation existe
+ const { data: orgExists, error: orgError } = await supabase
+ .from("organizations")
+ .select("id")
+ .eq("id", org_id)
+ .single();
+
+ if (orgError || !orgExists) {
+ return NextResponse.json(
+ { error: "Organisation introuvable" },
+ { status: 400 }
+ );
+ }
+
+ // Créer la production
+ const { data: production, error } = await supabase
+ .from("productions")
+ .insert({
+ name: name.trim(),
+ reference: reference?.trim() || null,
+ declaration_date: declaration_date || null,
+ org_id,
+ })
+ .select()
+ .single();
+
+ if (error) {
+ console.error("[api/staff/productions] Insert error:", error.message);
+ return NextResponse.json(
+ { error: "Erreur lors de la création", detail: error.message },
+ { status: 500 }
+ );
+ }
+
+ return NextResponse.json({ production }, { status: 201 });
+ } catch (error) {
+ const message = error instanceof Error ? error.message : String(error);
+ return NextResponse.json(
+ { error: "internal_server_error", message },
+ { status: 500 }
+ );
+ }
+}
diff --git a/components/Header.tsx b/components/Header.tsx
index 3fe4339..e5b5915 100644
--- a/components/Header.tsx
+++ b/components/Header.tsx
@@ -149,7 +149,7 @@ export default function Header({ clientInfo, isStaff }: {
}, []);
return (
-
Contrats dans la liste
{stats.total}
diff --git a/app/(app)/staff/gestion-productions/page.tsx b/app/(app)/staff/gestion-productions/page.tsx
new file mode 100644
index 0000000..4cdcd2a
--- /dev/null
+++ b/app/(app)/staff/gestion-productions/page.tsx
@@ -0,0 +1,719 @@
+// app/(app)/staff/gestion-productions/page.tsx
+"use client";
+
+import React, { useState, useMemo } from "react";
+import { useQuery, useMutation, useQueryClient } from "@tanstack/react-query";
+import {
+ Loader2,
+ Search,
+ Filter,
+ X,
+ Plus,
+ Edit2,
+ Trash2,
+ Calendar,
+ Building2,
+ Hash,
+ FileText
+} from "lucide-react";
+import { usePageTitle } from "@/hooks/usePageTitle";
+
+// Types
+type Production = {
+ id: string;
+ name: string;
+ reference: string | null;
+ declaration_date: string | null;
+ org_id: string;
+ created_at?: string;
+ updated_at?: string;
+};
+
+type Organization = {
+ id: string;
+ name: string;
+ structure_api: string;
+};
+
+// Hook pour vérifier si l'utilisateur est staff
+function useStaffCheck() {
+ return useQuery({
+ queryKey: ["staff-check"],
+ queryFn: async () => {
+ const res = await fetch("/api/me");
+ if (!res.ok) return { isStaff: false };
+ const data = await res.json();
+ return { isStaff: Boolean(data.is_staff || data.isStaff) };
+ },
+ staleTime: 30_000,
+ });
+}
+
+// Hook pour récupérer les organisations
+function useOrganizations() {
+ return useQuery({
+ queryKey: ["organizations"],
+ queryFn: async () => {
+ const res = await fetch("/api/staff/organizations");
+ if (!res.ok) throw new Error("Erreur chargement organisations");
+ const data = await res.json();
+ return data.organizations as Organization[];
+ },
+ staleTime: 60_000,
+ });
+}
+
+// Hook pour récupérer les productions
+function useProductions(orgId?: string, searchQuery?: string) {
+ return useQuery({
+ queryKey: ["staff-productions", orgId, searchQuery],
+ queryFn: async () => {
+ const params = new URLSearchParams();
+ if (orgId) params.set("org_id", orgId);
+ if (searchQuery) params.set("q", searchQuery);
+
+ const res = await fetch(`/api/staff/productions?${params.toString()}`);
+ if (!res.ok) throw new Error("Erreur chargement productions");
+ const data = await res.json();
+ return data.productions as Production[];
+ },
+ enabled: true,
+ staleTime: 15_000,
+ });
+}
+
+// Composant Modal pour Créer/Éditer
+function ProductionModal({
+ isOpen,
+ onClose,
+ production,
+ organizations,
+}: {
+ isOpen: boolean;
+ onClose: () => void;
+ production?: Production | null;
+ organizations: Organization[];
+}) {
+ const queryClient = useQueryClient();
+ const [name, setName] = useState(production?.name || "");
+ const [reference, setReference] = useState(production?.reference || "");
+ const [declarationDate, setDeclarationDate] = useState(production?.declaration_date || "");
+ const [orgId, setOrgId] = useState(production?.org_id || "");
+ const [error, setError] = useState("");
+
+ React.useEffect(() => {
+ if (isOpen) {
+ setName(production?.name || "");
+ setReference(production?.reference || "");
+ setDeclarationDate(production?.declaration_date || "");
+ setOrgId(production?.org_id || "");
+ setError("");
+ }
+ }, [isOpen, production]);
+
+ const mutation = useMutation({
+ mutationFn: async (data: any) => {
+ const url = production
+ ? `/api/staff/productions/${production.id}`
+ : "/api/staff/productions";
+ const method = production ? "PATCH" : "POST";
+
+ const res = await fetch(url, {
+ method,
+ headers: { "Content-Type": "application/json" },
+ body: JSON.stringify(data),
+ });
+
+ if (!res.ok) {
+ const errorData = await res.json();
+ throw new Error(errorData.error || "Erreur lors de l'opération");
+ }
+
+ return res.json();
+ },
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ["staff-productions"] });
+ onClose();
+ },
+ onError: (err: any) => {
+ setError(err.message || "Une erreur est survenue");
+ },
+ });
+
+ const handleSubmit = (e: React.FormEvent) => {
+ e.preventDefault();
+ setError("");
+
+ if (!name.trim()) {
+ setError("Le nom est requis");
+ return;
+ }
+
+ if (!orgId) {
+ setError("L'organisation est requise");
+ return;
+ }
+
+ mutation.mutate({
+ name: name.trim(),
+ reference: reference.trim() || null,
+ declaration_date: declarationDate || null,
+ org_id: orgId,
+ });
+ };
+
+ if (!isOpen) return null;
+
+ return (
+
+ {/* Backdrop */}
+
+
+ {/* Modal */}
+
+ );
+}
+
+// Composant Modal de suppression
+function DeleteConfirmModal({
+ isOpen,
+ onClose,
+ production,
+}: {
+ isOpen: boolean;
+ onClose: () => void;
+ production: Production | null;
+}) {
+ const queryClient = useQueryClient();
+
+ const deleteMutation = useMutation({
+ mutationFn: async () => {
+ if (!production) return;
+ const res = await fetch(`/api/staff/productions/${production.id}`, {
+ method: "DELETE",
+ });
+ if (!res.ok) {
+ const data = await res.json();
+ throw new Error(data.error || "Erreur lors de la suppression");
+ }
+ return res.json();
+ },
+ onSuccess: () => {
+ queryClient.invalidateQueries({ queryKey: ["staff-productions"] });
+ onClose();
+ },
+ });
+
+ if (!isOpen || !production) return null;
+
+ return (
+
+ {/* Header */}
+
+
+
+
+ {/* Body */}
+
+
+
+
+
+
+
+
+
+
+ + {production ? "Modifier la production" : "Nouvelle production"} +
++ {production ? "Modifiez les informations ci-dessous" : "Remplissez les informations ci-dessous"} +
+
+
+
+ );
+}
+
+// Page principale
+export default function GestionProductionsPage() {
+ usePageTitle("Gestion des productions");
+
+ const [searchQuery, setSearchQuery] = useState("");
+ const [selectedOrgId, setSelectedOrgId] = useState("");
+ const [showFilters, setShowFilters] = useState(false);
+ const [editingProduction, setEditingProduction] = useState
+
+
+
+
+
+
+
+
+
+
+ + Confirmer la suppression +
++ Cette action est irréversible +
+
+
+
+ + Voulez-vous vraiment supprimer la production{" "} + {production.name} ? +
+ {production.reference && ( ++ Référence : {production.reference} +
+ )} +
+
+
+
+
+
+ );
+ }
+
+ if (!staffCheck?.isStaff) {
+ return (
+ Accès refusé
+Cette page est réservée au Staff.
+
+ {/* Header */}
+
+
+
+ {/* Modals */}
+ {
+ setIsCreateModalOpen(false);
+ setEditingProduction(null);
+ }}
+ production={editingProduction}
+ organizations={organizations}
+ />
+
+ setDeletingProduction(null)}
+ production={deletingProduction}
+ />
+
+ );
+}
diff --git a/app/api/contrats/route.ts b/app/api/contrats/route.ts
index e75c79b..6ed071c 100644
--- a/app/api/contrats/route.ts
+++ b/app/api/contrats/route.ts
@@ -66,11 +66,12 @@ export async function GET(req: Request) {
const paginatedContracts = filteredContracts.slice(startIndex, endIndex);
return NextResponse.json({
- contrats: paginatedContracts,
+ items: paginatedContracts,
total: filteredContracts.length,
page,
limit,
- totalPages: Math.ceil(filteredContracts.length / limit)
+ totalPages: Math.ceil(filteredContracts.length / limit),
+ hasMore: endIndex < filteredContracts.length
});
}
@@ -289,6 +290,8 @@ export async function GET(req: Request) {
page,
limit,
hasMore: filtered.length > offset + limit,
+ total: filtered.length,
+ totalPages: Math.ceil(filtered.length / limit),
debug: {
orgId,
isStaff,
diff --git a/app/api/facturation/route.ts b/app/api/facturation/route.ts
index e210594..89500a3 100644
--- a/app/api/facturation/route.ts
+++ b/app/api/facturation/route.ts
@@ -171,10 +171,11 @@ export async function GET(req: Request) {
const total = typeof count === 'number' ? count : items.length;
const hasMore = from + items.length < total;
+ const totalPages = Math.ceil(total / limit);
return NextResponse.json({
sepa,
- factures: { items, page, limit, hasMore },
+ factures: { items, page, limit, hasMore, total, totalPages },
});
} catch (error) {
const message = error instanceof Error ? error.message : String(error);
diff --git a/app/api/salaries/route.ts b/app/api/salaries/route.ts
index 70b6e3b..a6f9f41 100644
--- a/app/api/salaries/route.ts
+++ b/app/api/salaries/route.ts
@@ -25,6 +25,7 @@ type SalariesResponse = {
page: number;
limit: number;
total?: number | null;
+ totalPages?: number;
hasMore: boolean;
};
@@ -131,12 +132,14 @@ export async function GET(req: NextRequest) {
const total = count ?? null;
const hasMore = typeof total === "number" ? offset + items.length < total : items.length === limit;
+ const totalPages = typeof total === "number" ? Math.ceil(total / limit) : 0;
const payload: SalariesResponse = {
items,
page,
limit,
total,
+ totalPages,
hasMore,
};
diff --git a/app/api/signatures-electroniques/contrats/route.ts b/app/api/signatures-electroniques/contrats/route.ts
index 0dc6a5f..cf0e8f0 100644
--- a/app/api/signatures-electroniques/contrats/route.ts
+++ b/app/api/signatures-electroniques/contrats/route.ts
@@ -7,6 +7,7 @@ import { cookies } from 'next/headers';
export async function GET(req: NextRequest) {
const reqUrl = new URL(req.url);
const scope = (reqUrl.searchParams.get('scope') || 'employeur').toLowerCase();
+ const orgIdParam = reqUrl.searchParams.get('org_id'); // Paramètre org_id pour les staff
// Récupération de l'organisation active
const sb = createRouteHandlerClient({ cookies });
@@ -15,7 +16,7 @@ export async function GET(req: NextRequest) {
return NextResponse.json({ error: 'unauthorized' }, { status: 401 });
}
- // Vérifier staff pour lire la cible via cookie active_org_id
+ // Vérifier staff pour lire la cible via cookie active_org_id ou paramètre org_id
let isStaff = false;
try {
const { data } = await sb.from('staff_users').select('is_staff').eq('user_id', user.id).maybeSingle();
@@ -25,8 +26,14 @@ export async function GET(req: NextRequest) {
let orgId: string | null = null;
try {
if (isStaff) {
- const c = cookies();
- orgId = c.get('active_org_id')?.value || null;
+ // Si un org_id est fourni en paramètre, l'utiliser (priorité pour les staff)
+ if (orgIdParam) {
+ orgId = orgIdParam;
+ } else {
+ // Sinon utiliser le cookie active_org_id
+ const c = cookies();
+ orgId = c.get('active_org_id')?.value || null;
+ }
} else {
const { data, error } = await sb
.from('organization_members')
@@ -58,6 +65,8 @@ export async function GET(req: NextRequest) {
employee_name,
employee_matricule,
production_name,
+ role,
+ start_date,
etat_de_la_demande,
contrat_signe_par_employeur,
contrat_signe,
@@ -114,14 +123,27 @@ export async function GET(req: NextRequest) {
id: contract.id,
fields: {
'Reference': contract.reference || contract.contract_number,
+ 'reference': contract.reference || contract.contract_number,
'Nom salarié': contract.employee_name,
+ 'employee_name': contract.employee_name,
+ 'Prénom Salarié': contract.employee_name, // Full name (pas de séparation prénom/nom)
+ 'Nom Salarié': contract.employee_name,
'Matricule API': contract.employee_matricule,
'Production': contract.production_name,
+ 'role': contract.role,
+ 'Profession': contract.role,
+ 'start_date': contract.start_date,
+ 'Date de début': contract.start_date,
'État de la demande': contract.etat_de_la_demande || 'Traitée',
'Contrat signé par employeur': ['oui', 'Oui', 'OUI', 'true', true].includes(contract.contrat_signe_par_employeur) ? 'Oui' : 'Non',
'Contrat signé': ['oui', 'Oui', 'OUI', 'true', true].includes(contract.contrat_signe) ? 'Oui' : 'Non',
+ 'signature_employeur': ['oui', 'Oui', 'OUI', 'true', true].includes(contract.contrat_signe_par_employeur),
+ 'employer_signed': ['oui', 'Oui', 'OUI', 'true', true].includes(contract.contrat_signe_par_employeur),
+ 'signature_salarie': ['oui', 'Oui', 'OUI', 'true', true].includes(contract.contrat_signe),
+ 'employee_signed': ['oui', 'Oui', 'OUI', 'true', true].includes(contract.contrat_signe),
'docuseal_template_id': contract.docuseal_template_id,
'docuseal_submission_id': contract.docuseal_submission_id,
+ 'signature_link': contract.signature_link,
'embed_src_employeur': contract.signature_link
}
}));
diff --git a/app/api/staff/productions/[id]/route.ts b/app/api/staff/productions/[id]/route.ts
new file mode 100644
index 0000000..fb864e0
--- /dev/null
+++ b/app/api/staff/productions/[id]/route.ts
@@ -0,0 +1,252 @@
+// app/api/staff/productions/[id]/route.ts
+import { NextResponse, NextRequest } from "next/server";
+import { createRouteHandlerClient } from "@supabase/auth-helpers-nextjs";
+import { cookies } from "next/headers";
+
+export const dynamic = "force-dynamic";
+export const revalidate = 0;
+export const runtime = "nodejs";
+
+// Fonction helper pour vérifier si l'utilisateur est staff
+async function isStaffUser(supabase: any, userId: string): Promise
+
+
+ {/* Filtres et recherche */}
+
+
+
+ Gestion des productions
++ Gérez les productions et spectacles de toutes les organisations +
+
+
+
+ {/* Stats */}
+
+
+
+ {showFilters && (
+
+
+
+ {hasActiveFilters && (
+
+ )}
+
+
+
+
+
+ )}
+
+
+
+
+
+
+
+
+
+ {/* Tableau */}
+
+
+ {isLoadingProductions ? (
+
+
+
+
+
+
+
+ | + Nom + | ++ Référence + | ++ Date déclaration + | ++ Organisation + | ++ Actions + | +
|---|---|---|---|---|
|
+ + Chargement des productions... + + |
+ ||||
|
+ + Erreur lors du chargement des productions + + |
+ ||||
|
+ + Aucune production trouvée + ++ {hasActiveFilters + ? "Essayez de modifier vos filtres" + : "Créez votre première production"} + + |
+ ||||
|
+
+ {production.name}
+
+ |
+
+ {production.reference ? (
+
+ |
+
+ {production.declaration_date ? (
+
+
+ ) : (
+ —
+ )}
+ |
+ + + {org?.name || "—"} + + | +
+
+
+
+
+ |
+
+
{/* Bouton hamburger mobile */}
Espace Paie Odentas
diff --git a/components/Sidebar.tsx b/components/Sidebar.tsx
index 5dfa21b..5d19438 100644
--- a/components/Sidebar.tsx
+++ b/components/Sidebar.tsx
@@ -2,7 +2,7 @@
import Link from "next/link";
import { usePathname } from "next/navigation";
import { useState, useEffect, useRef } from "react";
-import { Shield, KeyRound, Home, FileSignature, Banknote, Users, Percent, FolderOpen, Receipt, Building2, UserCog, Edit3, LifeBuoy, CreditCard, Calculator, Euro, Mail, Database } from "lucide-react";
+import { Shield, KeyRound, Home, FileSignature, Banknote, Users, Percent, FolderOpen, Receipt, Building2, UserCog, Edit3, LifeBuoy, CreditCard, Calculator, Euro, Mail, Database, Clapperboard } from "lucide-react";
// import { api } from "@/lib/fetcher";
import { createPortal } from "react-dom";
import LogoutButton from "@/components/LogoutButton";
@@ -445,6 +445,14 @@ export default function Sidebar({ clientInfo, isStaff = false, mobile = false, o
Virements salaires
+ onNavigate && onNavigate()} className={`block px-3 py-2 rounded-xl text-sm transition truncate ${
+ isActivePath(pathname, "/staff/gestion-productions") ? "bg-gradient-to-r from-indigo-200 via-purple-200 to-pink-200 text-slate-700 font-semibold" : "hover:bg-slate-50"
+ }`} title="Gestion des productions">
+
+
Espace Paie Odentas
diff --git a/components/Sidebar.tsx b/components/Sidebar.tsx
index 5dfa21b..5d19438 100644
--- a/components/Sidebar.tsx
+++ b/components/Sidebar.tsx
@@ -2,7 +2,7 @@
import Link from "next/link";
import { usePathname } from "next/navigation";
import { useState, useEffect, useRef } from "react";
-import { Shield, KeyRound, Home, FileSignature, Banknote, Users, Percent, FolderOpen, Receipt, Building2, UserCog, Edit3, LifeBuoy, CreditCard, Calculator, Euro, Mail, Database } from "lucide-react";
+import { Shield, KeyRound, Home, FileSignature, Banknote, Users, Percent, FolderOpen, Receipt, Building2, UserCog, Edit3, LifeBuoy, CreditCard, Calculator, Euro, Mail, Database, Clapperboard } from "lucide-react";
// import { api } from "@/lib/fetcher";
import { createPortal } from "react-dom";
import LogoutButton from "@/components/LogoutButton";
@@ -445,6 +445,14 @@ export default function Sidebar({ clientInfo, isStaff = false, mobile = false, o
Virements salaires
+ onNavigate && onNavigate()} className={`block px-3 py-2 rounded-xl text-sm transition truncate ${
+ isActivePath(pathname, "/staff/gestion-productions") ? "bg-gradient-to-r from-indigo-200 via-purple-200 to-pink-200 text-slate-700 font-semibold" : "hover:bg-slate-50"
+ }`} title="Gestion des productions">
+
+