feat: Upload du SEPA par les parents / Création d'un composant header

pour les titres de tableau

Front-End/src/components/FileUpload.js

@@ -1,9 +1,10 @@
-import React, { useState } from 'react';
+import React, { useState, useRef } from 'react';
 import { CloudUpload } from 'lucide-react';
 import logger from '@/utils/logger';
 
 export default function FileUpload({ selectionMessage, onFileSelect, uploadedFileName }) {
   const [localFileName, setLocalFileName] = useState(uploadedFileName || '');
+  const fileInputRef = useRef(null); // Utilisation de useRef pour cibler l'input
 
   const handleFileChange = (e) => {
     const file = e.target.files[0];
@@ -29,7 +30,7 @@ export default function FileUpload({ selectionMessage, onFileSelect, uploadedFil
       <h3 className="text-lg font-semibold mb-4">{`${selectionMessage}`}</h3>
       <div
         className="border-2 border-dashed border-gray-500 p-6 rounded-lg flex flex-col items-center justify-center cursor-pointer hover:border-emerald-500"
-        onClick={() => document.getElementById('fileInput').click()} // Ouvre l'explorateur de fichiers au clic
+        onClick={() => fileInputRef.current.click()} // Utilisation de la référence pour ouvrir l'explorateur
         onDragOver={(e) => e.preventDefault()}
         onDrop={handleFileDrop}
       >
@@ -39,7 +40,7 @@ export default function FileUpload({ selectionMessage, onFileSelect, uploadedFil
           accept=".pdf"
           onChange={handleFileChange}
           className="hidden"
-          id="fileInput"
+          ref={fileInputRef} // Attachement de la référence
         />
         <label htmlFor="fileInput" className="text-center text-gray-500">
           <p className="text-lg font-semibold text-gray-800">Déposez votre fichier ici</p>

Front-End/src/components/Inscription/FilesToUpload.js

@@ -1,17 +1,214 @@
-import React from 'react';
+import React, { useState } from 'react';
 import Table from '@/components/Table';
+import FileUpload from '@/components/FileUpload';
+import { Upload, Eye, Trash2, FileText } from 'lucide-react';
+import { BASE_URL } from '@/utils/Url';
+import Popup from '@/components/Popup';
+import logger from '@/utils/logger';
+
+export default function FilesToUpload({ parentFileTemplates, uploadedFiles, onFileUpload, onFileDelete }) {
+    const [selectedFile, setSelectedFile] = useState(null); // État pour le fichier sélectionné
+    const [actionType, setActionType] = useState(null);
+
+    const [popupVisible, setPopupVisible] = useState(false);
+    const [popupMessage, setPopupMessage] = useState("");
+    const [removePopupVisible, setRemovePopupVisible] = useState(false);
+    const [removePopupMessage, setRemovePopupMessage] = useState("");
+    const [removePopupOnConfirm, setRemovePopupOnConfirm] = useState(() => {});
+
+    // Vérification si un fichier est déjà uploadé
+    const isFileUploaded = (file) => {
+        return file && file.fileName; // Si `fileName` est défini, le fichier est considéré comme téléversé
+    };
+
+    // Récupération d'un fichier uploadé
+    const getUploadedFile = (templateId) => {
+        return uploadedFiles.find(file => parseInt(file.id) === templateId && file.fileName);
+    };
+
+    const handleUpload = (file, selectedFile) => {
+        if (!file || !selectedFile) {
+            logger.error('Données manquantes pour le téléversement.');
+            return;
+        }
+
+        // Appeler la fonction de téléversement passée en prop
+        onFileUpload(file, selectedFile)
+            .then((response) => {
+                // Mettre à jour uploadedFiles avec les nouvelles données
+                const updatedFiles = uploadedFiles.map(f =>
+                    f.id === selectedFile.id
+                        ? { ...f, fileName: response.data.fileName, file: response.data.file_url }
+                        : f
+                );
+
+                // Si le fichier n'existe pas encore, l'ajouter
+                if (!updatedFiles.find(f => f.id === selectedFile.id)) {
+                    updatedFiles.push({
+                        id: selectedFile.id,
+                        fileName: response.data.fileName,
+                        file: response.data.file_url,
+                    });
+                }
+            })
+            .catch((error) => {
+                logger.error('Erreur lors du téléversement du fichier :', error);
+            });
+
+        // Mettre à jour l'état local
+        setSelectedFile(null);
+        setActionType(null); // Réinitialiser l'action après l'upload
+    };
+
+    // Définition des colonnes
+    const columns = [
+        { name: 'Nom du fichier', transform: (row) => row.master_name },
+        { name: 'Description du fichier', transform: (row) => row.master_description },
+        { name: 'Statut', transform: (row) => {
+            const uploadedFile = getUploadedFile(row.id);
+            return (
+                <span className={`px-2 py-1 rounded-md text-sm font-medium ${
+                    isFileUploaded(uploadedFile) ? 'bg-green-50 text-green-600' : 'bg-orange-50 text-orange-600'
+                }`}>
+                    {isFileUploaded(uploadedFile) ? 'Chargé' : 'A ajouter'}
+                </span>
+            );
+        }},
+        { name: 'Actions', transform: (row) => {
+            const uploadedFile = getUploadedFile(row.id);
+
+            return (
+                <div className="flex items-center justify-center gap-4">
+                    {uploadedFile && (
+                        <>
+                            <button
+                                className={`flex items-center justify-center w-8 h-8 rounded-full ${
+                                    actionType === 'view' && selectedFile?.id === row.id
+                                        ? 'bg-blue-100 text-blue-600 ring-3 ring-blue-500'
+                                        : 'text-blue-500 hover:text-blue-700'
+                                }`}
+                                onClick={() => {
+                                    if (actionType === 'view' && selectedFile?.id === row.id) {
+                                        setSelectedFile(null);
+                                        setActionType(null);
+                                    } else {
+                                        const uploadedFile = getUploadedFile(row.id);
+                                        setSelectedFile(uploadedFile || row); // Utiliser les données mises à jour
+                                        setActionType('view');
+                                    }
+                                }}
+                                type="button"
+                            >
+                                <Eye className="w-5 h-5" />
+                            </button>
+                            <button
+                                className="flex items-center justify-center w-8 h-8 rounded-full text-red-500 hover:text-red-700"
+                                onClick={() => {
+                                    setRemovePopupVisible(true);
+                                    setRemovePopupMessage(
+                                        `Êtes-vous sûr(e) de vouloir supprimer le fichier "${row.master_name}" ?`
+                                    );
+                                    setRemovePopupOnConfirm(() => () => {
+                                        onFileDelete(row.id)
+                                            .then(() => {
+                                                setPopupMessage(`Le fichier "${row.master_name}" a été supprimé avec succès.`);
+                                                setPopupVisible(true);
+                                                setRemovePopupVisible(false);
+                                            })
+                                            .catch((error) => {
+                                                logger.error('Erreur lors de la suppression du fichier :', error);
+                                                setPopupMessage(`Erreur lors de la suppression du fichier "${row.master_name}".`);
+                                                setPopupVisible(true);
+                                                setRemovePopupVisible(false);
+                                            });
+                                        setActionType(null);
+                                        setSelectedFile(null);
+                                    });
+                                }}
+                                type="button"
+                            >
+                                <Trash2 className="w-5 h-5" />
+                            </button>
+                        </>
+                    )}
+                    {!uploadedFile && (
+                        <button
+                            className={`flex items-center justify-center w-8 h-8 rounded-full ${
+                                actionType === 'upload' && selectedFile?.id === row.id
+                                    ? 'bg-emerald-100 text-emerald-600 ring-3 ring-emerald-500'
+                                    : 'text-emerald-500 hover:text-emerald-700'
+                            }`}
+                            onClick={() => {
+                                if (actionType === 'upload' && selectedFile?.id === row.id) {
+                                    setSelectedFile(null);
+                                    setActionType(null);
+                                } else {
+                                    setSelectedFile(row);
+                                    setActionType('upload');
+                                }
+                            }}
+                            type="button"
+                        >
+                            <Upload className="w-5 h-5" />
+                        </button>
+                    )}
+                </div>
+            );
+        }},
+    ];
 
-export default function FilesToUpload({ parentFileTemplates, columns }) {
     return (
-        <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-            <h2 className="text-xl font-bold mb-4 text-gray-800">Fichiers à uploader</h2>
+        <div className="mt-8 mb-4 w-3/5">
+            <div className="flex items-center justify-between mb-6">
+                <div className="flex items-center space-x-4">
+                    <div className="bg-emerald-100 p-3 rounded-full shadow-md">
+                        <FileText className="w-8 h-8 text-emerald-600" />
+                    </div>
+                    <div>
+                        <h2 className="text-2xl font-bold text-gray-800">Pièces à fournir</h2>
+                        <p className="text-sm text-gray-500 italic">
+                        Ajoutez les documents pour compléter votre inscription
+                        </p>
+                    </div>
+                </div>
+            </div>
             <Table
                 data={parentFileTemplates}
                 columns={columns}
-                itemsPerPage={5}
-                currentPage={1}
-                totalPages={1}
-                onPageChange={() => {}}
+            />
+            {selectedFile && (
+                <div className="mt-4">
+                    {actionType === 'view' && selectedFile.fileName ? (
+                        <iframe
+                            src={`${BASE_URL}/${selectedFile.fileName}`}
+                            title="Document Viewer"
+                            className="w-full"
+                            style={{
+                                height: '75vh',
+                                border: 'none',
+                            }}
+                        />
+                    ) : actionType === 'upload' ? (
+                        <FileUpload
+                            selectionMessage={`Téléversez le fichier ${selectedFile.master_name}`}
+                            onFileSelect={(file) => handleUpload(file, selectedFile)}
+                            uploadedFileName={selectedFile.fileName || ''}
+                        />
+                    ) : null}
+                </div>
+            )}
+            <Popup
+                visible={popupVisible}
+                message={popupMessage}
+                onConfirm={() => setPopupVisible(false)}
+                onCancel={() => setPopupVisible(false)}
+                uniqueConfirmButton={true}
+            />
+            <Popup
+                visible={removePopupVisible}
+                message={removePopupMessage}
+                onConfirm={removePopupOnConfirm}
+                onCancel={() => setRemovePopupVisible(false)}
             />
         </div>
     );

Front-End/src/components/Inscription/InscriptionFormShared.js

@@ -4,24 +4,18 @@ import Loader from '@/components/Loader';
 import Button from '@/components/Button';
 import DjangoCSRFToken from '@/components/DjangoCSRFToken';
 import { fetchRegisterForm, fetchSchoolFileTemplatesFromRegistrationFiles, fetchParentFileTemplatesFromRegistrationFiles } from '@/app/actions/subscriptionAction';
-import { downloadTemplate, 
-        createRegistrationSchoolFileTemplate, 
-        editRegistrationSchoolFileTemplates, 
-        deleteRegistrationSchoolFileTemplates 
+import { downloadTemplate,
+        editRegistrationSchoolFileTemplates,
+        editRegistrationParentFileTemplates
 } from '@/app/actions/registerFileGroupAction';
 import {
     fetchRegistrationPaymentModes, 
     fetchTuitionPaymentModes } from '@/app/actions/schoolAction';
-import { Download, Upload, Trash2, Eye } from 'lucide-react';
 import { BASE_URL } from '@/utils/Url';
-import DraggableFileUpload from '@/components/DraggableFileUpload';
-import Modal from '@/components/Modal';
-import FileStatusLabel from '@/components/FileStatusLabel';
 import logger from '@/utils/logger';
 import StudentInfoForm, { validateStudentInfo } from '@/components/Inscription/StudentInfoForm';
 import FilesToUpload from '@/components/Inscription/FilesToUpload';
 import { DocusealForm } from '@docuseal/react';
-import FileUpload from '@/components/Inscription/FileUpload';
 
 /**
  * Composant de formulaire d'inscription partagé
@@ -36,7 +30,6 @@ export default function InscriptionFormShared({
     csrfToken,
     selectedEstablishmentId,
     onSubmit,
-    cancelUrl,
     errors = {} // Nouvelle prop pour les erreurs
 }) {
     // États pour gérer les données du formulaire
@@ -65,12 +58,6 @@ export default function InscriptionFormShared({
     const [uploadedFiles, setUploadedFiles] = useState([]);
     const [schoolFileTemplates, setSchoolFileTemplates] = useState([]);
     const [parentFileTemplates, setParentFileTemplates] = useState([]);
-    const [fileGroup, setFileGroup] = useState(null);
-    const [fileName, setFileName] = useState("");
-    const [file, setFile] = useState("");
-    const [showUploadModal, setShowUploadModal] = useState(false);
-    const [currentTemplateId, setCurrentTemplateId] = useState(null);
-
     const [currentPage, setCurrentPage] = useState(1);
 
     const isCurrentPageValid = () => {
@@ -105,7 +92,6 @@ export default function InscriptionFormShared({
                     totalTuitionFees: data?.totalTuitionFees,
                 });
                 setGuardians(data?.student?.guardians || []);
-                setUploadedFiles(data.registration_files || []);
             });
 
             setIsLoading(false);
@@ -119,6 +105,13 @@ export default function InscriptionFormShared({
 
         fetchParentFileTemplatesFromRegistrationFiles(studentId).then((data) => {
             setParentFileTemplates(data);
+
+            // Initialiser uploadedFiles avec uniquement les fichiers dont `file` n'est pas null
+            const filteredFiles = data.filter(item => item.file !== null).map(item => ({
+                id: item.id,
+                fileName: item.file                
+            }));
+            setUploadedFiles(filteredFiles);
         })
 
         if (selectedEstablishmentId) {
@@ -153,66 +146,74 @@ export default function InscriptionFormShared({
         setFormData(prev => ({...prev, [field]: value}));
     };
 
-    // Gestion du téléversement de fichiers
-    const handleFileUpload = async (file, fileName) => {
-        if (!file || !currentTemplateId || !formData.id) {
-            logger.error('Missing required data for upload');
+    const handleFileUpload = (file, selectedFile) => {
+        if (!file || !selectedFile) {
+            logger.error('Données manquantes pour le téléversement.');
+            return Promise.reject(new Error('Données manquantes pour le téléversement.'));
+        }
+
+        const updateData = new FormData();
+        updateData.append('file', file);
+    
+        return editRegistrationParentFileTemplates(selectedFile.id, updateData, csrfToken)
+            .then((response) => {
+                logger.debug('Template mis à jour avec succès :', response);
+    
+                setUploadedFiles((prev) => {
+                    const updatedFiles = prev.map((uploadedFile) =>
+                        uploadedFile.id === selectedFile.id
+                            ? { ...uploadedFile, fileName: response.data.file } // Met à jour le fichier téléversé
+                            : uploadedFile
+                    );
+    
+                    // Si le fichier n'existe pas encore, l'ajouter
+                    if (!updatedFiles.find(file => file.id === selectedFile.id)) {
+                        updatedFiles.push({
+                            id: selectedFile.id,
+                            fileName: response.data.file
+                        });
+                    }
+    
+                    return updatedFiles;
+                });
+    
+                return response; // Retourner la réponse pour signaler le succès
+            })
+            .catch((error) => {
+                logger.error('Erreur lors de la mise à jour du fichier :', error);
+                throw error; // Relancer l'erreur pour que l'appelant puisse la capturer
+            });
+    };
+
+    const handleDeleteFile = (templateId) => {
+        const fileToDelete = uploadedFiles.find(file => parseInt(file.id) === templateId && file.fileName);
+        if (!fileToDelete) {
+            logger.error('Aucun fichier trouvé pour suppression.');
             return;
         }
-
-        const data = new FormData();
-        data.append('file', file);
-        data.append('name', fileName);
-        data.append('template', currentTemplateId);
-        data.append('register_form', formData.id);
-
-        try {
-            const response = await createRegistrationSchoolFileTemplate(data, csrfToken);
-            if (response) {
-                setUploadedFiles(prev => {
-                    const newFiles = prev.filter(f => parseInt(f.template) !== currentTemplateId);
-                    return [...newFiles, {
-                        name: fileName,
-                        template: currentTemplateId,
-                        file: response.file
-                    }];
-                });
-
-                // Rafraîchir les données du formulaire pour avoir les fichiers à jour
-                if (studentId) {
-                    fetchRegisterForm(studentId).then((data) => {
-                        setUploadedFiles(data.registration_files || []);
-                    });
-                }
-            }
-        } catch (error) {
-            logger.error('Error uploading file:', error);
-        }
-    };
-
-    // Vérification si un fichier est déjà uploadé
-    const isFileUploaded = (templateId) => {
-        return uploadedFiles.find(template =>
-            template.template === templateId
-        );
-    };
-
-    // Récupération d'un fichier uploadé
-    const getUploadedFile = (templateId) => {
-        return uploadedFiles.find(file => parseInt(file.template) === templateId);
-    };
-
-    // Suppression d'un fichier
-    const handleDeleteFile = async (templateId) => {
-        const fileToDelete = getUploadedFile(templateId);
-        if (!fileToDelete) return;
-
-        try {
-            await deleteRegistrationSchoolFileTemplates(fileToDelete.id, csrfToken);
-            setUploadedFiles(prev => prev.filter(f => parseInt(f.template) !== templateId));
-        } catch (error) {
-            logger.error('Error deleting file:', error);
-        }
+    
+        // Créer un FormData avec un champ vide pour "file"
+        const updateData = new FormData();
+        updateData.append('file', ''); // Envoyer chaine vide pour indiquer qu'aucun fichier n'est uploadé
+    
+        return editRegistrationParentFileTemplates(templateId, updateData, csrfToken)
+            .then((response) => {
+                logger.debug('Fichier supprimé avec succès dans la base :', response);
+    
+                // Mettre à jour l'état local pour refléter la suppression
+                setUploadedFiles((prev) =>
+                    prev.map((uploadedFile) =>
+                        uploadedFile.id === templateId
+                            ? { ...uploadedFile, fileName: null, fileUrl: null } // Réinitialiser les champs liés au fichier
+                            : uploadedFile
+                    )
+                );
+                return response;
+            })
+            .catch((error) => {
+                logger.error('Erreur lors de la suppression du fichier dans la base :', error);
+                throw error;
+            });
     };
 
     // Soumission du formulaire
@@ -252,67 +253,12 @@ export default function InscriptionFormShared({
         setCurrentPage(currentPage - 1);
     };
 
-    // Configuration des colonnes pour le tableau des fichiers
-    const columns = [
-        { name: 'Nom du fichier', transform: (row) => row.master_name },
-        { name: 'Description du fichier', transform: (row) => row.master_description },
-        { name: 'Fichier de référence', transform: (row) =>  row.file && <div className="flex items-center justify-center gap-2"> <a href={`${BASE_URL}${row.file}`} target='_blank' className="text-blue-500 hover:text-blue-700">
-                    <Download size={16} />
-                </a> </div>},
-        { name: 'Statut', transform: (row) =>
-            row.is_required && (
-                <FileStatusLabel
-                    status={isFileUploaded(row.id) ? 'sent' : 'pending'}
-                />
-            )
-        },
-        { name: 'Actions', transform: (row) => {
-            if (!row.is_required) return null;
-
-            const uploadedFile = getUploadedFile(row.id);
-
-            if (uploadedFile) {
-                return (
-                    <div className="flex items-center justify-center gap-2">
-                        <a
-                            href={`${BASE_URL}${uploadedFile.file}`}
-                            target="_blank"
-                            className="text-blue-500 hover:text-blue-700"
-                        >
-                            <Eye size={16} />
-                        </a>
-                        <button
-                            className="text-red-500 hover:text-red-700"
-                            onClick={() => handleDeleteFile(row.id)}
-                            type="button"
-                        >
-                            <Trash2 size={16} />
-                        </button>
-                    </div>
-                );
-            }
-
-            return (
-                <button
-                    className="text-emerald-500 hover:text-emerald-700"
-                    type="button"
-                    onClick={() => {
-                        setCurrentTemplateId(row.id);
-                        setShowUploadModal(true);
-                    }}
-                >
-                    <Upload size={16} />
-                </button>
-            );
-        }},
-    ];
-
     // Affichage du loader pendant le chargement
     if (isLoading) return <Loader />;
 
     // Rendu du composant
     return (
-        <div className="max-w-4xl mx-auto p-6">
+        <div className="mx-auto p-6">
             <form onSubmit={handleSubmit} className="space-y-8">
                 <DjangoCSRFToken  csrfToken={csrfToken}/>
                 {/* Page 1 : Informations de l'élève et Responsables */}
@@ -330,76 +276,70 @@ export default function InscriptionFormShared({
 
                 {/* Pages suivantes : Section Fichiers d'inscription */}
                 {currentPage > 1 && currentPage <= schoolFileTemplates.length + 1 && (
-                    <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
-                        {/* Titre du document */}
-                        <div className="mb-4">
-                            <h2 className="text-lg font-semibold text-gray-800">
-                                {schoolFileTemplates[currentPage - 2].name || "Document sans nom"}
-                            </h2>
-                            <p className="text-sm text-gray-500">
-                                {schoolFileTemplates[currentPage - 2].description || "Aucune description disponible pour ce document."}
-                            </p>
+                    <div className="mt-8 mb-4 w-3/5">
+                        <div className="bg-white p-6 rounded-lg shadow-sm border border-gray-200">
+                            {/* Titre du document */}
+                            <div className="mb-4">
+                                <h2 className="text-lg font-semibold text-gray-800">
+                                    {schoolFileTemplates[currentPage - 2].name || "Document sans nom"}
+                                </h2>
+                                <p className="text-sm text-gray-500">
+                                    {schoolFileTemplates[currentPage - 2].description || "Aucune description disponible pour ce document."}
+                                </p>
+                            </div>
+
+                            {/* Affichage du formulaire ou du document */}
+                            {schoolFileTemplates[currentPage - 2].file === null ? (
+                                <DocusealForm
+                                    id="docusealForm"
+                                    src={"https://docuseal.com/s/" + schoolFileTemplates[currentPage - 2].slug}
+                                    withDownloadButton={false}
+                                    onComplete={() => {
+                                        downloadTemplate(schoolFileTemplates[currentPage - 2].slug)
+                                            .then((data) => fetch(data))
+                                            .then((response) => response.blob())
+                                            .then((blob) => {                                            
+                                                const file = new File([blob], `${schoolFileTemplates[currentPage - 2].name}.pdf`, { type: blob.type });
+                                                const updateData = new FormData();
+                                                updateData.append('file', file);
+
+                                                return editRegistrationSchoolFileTemplates(schoolFileTemplates[currentPage - 2].id, updateData, csrfToken);
+                                            })
+                                            .then((data) => {
+                                                logger.debug("EDIT TEMPLATE : ", data);
+                                            })
+                                            .catch((error) => {
+                                                logger.error("error editing template : ", error);
+                                            });
+                                    }}
+                                />
+                            ) : (
+                                <iframe
+                                    src={`${BASE_URL}/${schoolFileTemplates[currentPage - 2].file}`}
+                                    title="Document Viewer"
+                                    className="w-full"
+                                    style={{
+                                        height: '75vh', // Ajuster la hauteur à 75% de la fenêtre
+                                        border: 'none',
+                                    }}
+                                />
+                            )}
                         </div>
-
-                        {/* Affichage du formulaire ou du document */}
-                        {schoolFileTemplates[currentPage - 2].file === null ? (
-                            <DocusealForm
-                                id="docusealForm"
-                                src={"https://docuseal.com/s/" + schoolFileTemplates[currentPage - 2].slug}
-                                withDownloadButton={false}
-                                onComplete={() => {
-                                    downloadTemplate(schoolFileTemplates[currentPage - 2].slug)
-                                        .then((data) => fetch(data))
-                                        .then((response) => response.blob())
-                                        .then((blob) => {                                            
-                                            const file = new File([blob], `${schoolFileTemplates[currentPage - 2].name}.pdf`, { type: blob.type });
-                                            const updateData = new FormData();
-                                            updateData.append('file', file);
-
-                                            return editRegistrationSchoolFileTemplates(schoolFileTemplates[currentPage - 2].id, updateData, csrfToken);
-                                        })
-                                        .then((data) => {
-                                            logger.debug("EDIT TEMPLATE : ", data);
-                                        })
-                                        .catch((error) => {
-                                            logger.error("error editing template : ", error);
-                                        });
-                                }}
-                            />
-                        ) : (
-                            <iframe
-                                src={`${BASE_URL}/${schoolFileTemplates[currentPage - 2].file}`}
-                                title="Document Viewer"
-                                className="w-full"
-                                style={{
-                                    height: '75vh', // Ajuster la hauteur à 75% de la fenêtre
-                                    border: 'none',
-                                }}
-                            />
-                        )}
                     </div>
                 )}
 
                 {/* Dernière page : Section Fichiers parents */}
                 {currentPage === schoolFileTemplates.length + 2 && (
-                    <>
-                        <FilesToUpload
-                            parentFileTemplates={parentFileTemplates}
-                            columns={columns}
-                        />
-                        <FileUpload
-                            selectionMessage='Sélectionnez un fichier'
-                            onFileSelect={(file) => {
-                                setUploadedFiles(file.name); // Stocke uniquement le nom du fichier
-                                logger.debug('Fichier sélectionné:', file.name);
-                            }}
-                            uploadedFileName={uploadedFiles}
-                        />
-                    </>
+                    <FilesToUpload
+                        parentFileTemplates={parentFileTemplates}
+                        uploadedFiles={uploadedFiles}
+                        onFileUpload={handleFileUpload}
+                        onFileDelete={handleDeleteFile}
+                    />
                 )}
 
                 {/* Boutons de contrôle */}
-                <div className="flex justify-end space-x-4">
+                <div className="flex justify-center space-x-4">
                     <Button
                         text="Sauvegarder"
                         onClick={handleSave}
@@ -429,52 +369,6 @@ export default function InscriptionFormShared({
                     )}
                 </div>
             </form>
-            {schoolFileTemplates.length > 0 && (
-                <Modal
-                    isOpen={showUploadModal}
-                    setIsOpen={setShowUploadModal}
-                    title="Téléverser un fichier"
-                    ContentComponent={() => (
-                        <>
-                            <DraggableFileUpload
-                                className="w-full"
-                                fileName={fileName}
-                                onFileSelect={(selectedFile) => {
-                                    if (selectedFile) {
-                                        setFile(selectedFile);
-                                        setFileName(selectedFile.name);
-                                    }
-                                }}
-                            />
-                            <div className="mt-4 flex justify-center space-x-4">
-                                <Button
-                                    text="Annuler"
-                                    onClick={() => {
-                                        setShowUploadModal(false);
-                                        setCurrentTemplateId(null);
-                                        setFile(null);
-                                        setFileName("");
-                                    }}
-                                />
-                                <Button
-                                    text="Valider"
-                                    onClick={() => {
-                                        if (file && fileName) {
-                                            handleFileUpload(file, fileName);
-                                            setShowUploadModal(false);
-                                            setCurrentTemplateId(null);
-                                            setFile(null);
-                                            setFileName("");
-                                        }
-                                    }}
-                                    primary={true}
-                                    disabled={!file || !fileName}
-                                />
-                            </div>
-                        </>
-                    )}
-                />
-            )}
         </div>
     );
 }

Front-End/src/components/Inscription/ValidateSubscription.js

@@ -6,14 +6,16 @@ import { BASE_URL } from '@/utils/Url';
 import { generateToken } from '@/app/actions/registerFileGroupAction';
 import logger from '@/utils/logger';
 import { GraduationCap, CloudUpload } from 'lucide-react';
-import FileUpload from '@/components/Inscription/FileUpload';
+import FileUpload from '@/components/FileUpload';
+import SectionHeader from '@/components/SectionHeader';
 
-export default function ValidateSubscription({ studentId, firstName, lastName, paymentMode, file, onAccept }) {
+export default function ValidateSubscription({ studentId, firstName, lastName, paymentSepa, file, onAccept }) {
   const [token, setToken] = useState(null);
   const [uploadedFileName, setUploadedFileName] = useState('');
+  const [selectedFile, setSelectedFile] = useState(null); // Nouvel état pour le fichier sélectionné
   const [pdfUrl, setPdfUrl] = useState(`${BASE_URL}/${file}`);
-  const [isSepa, setIsSepa] = useState(paymentMode === '1'); // Vérifie si le mode de paiement est SEPA
-  const [currentPage, setCurrentPage] = useState(1); // Gestion des pages
+  const [isSepa, setIsSepa] = useState(paymentSepa); // Vérifie si le mode de paiement est SEPA
+  const [currentPage, setCurrentPage] = useState(1); // Gestion des étapes
 
   useEffect(() => {
     if (isSepa) {
@@ -25,34 +27,21 @@ export default function ValidateSubscription({ studentId, firstName, lastName, p
     }
   }, [isSepa]);
 
-  const handleUpload = (detail) => {
-    logger.debug('Uploaded file detail:', detail);
-    setUploadedFileName(detail.name);
-  };
-
   const handleAccept = () => {
-    const fileInput = document.getElementById('fileInput'); // Récupère l'élément input
-    const file = fileInput?.files[0]; // Récupère le fichier sélectionné
-  
-    if (!file) {
+    if (!selectedFile && isSepa) {
       logger.error('Aucun fichier sélectionné pour le champ SEPA.');
       return;
     }
-  
+
     const data = {
-      status: 7, 
-      sepa_file: file,
+      status: 7,
+      sepa_file: selectedFile, // Utilise le fichier sélectionné depuis l'état
     };
-  
+
     // Appeler la fonction passée par le parent pour mettre à jour le RF
     onAccept(data);
   };
 
-  const handleRefuse = () => {
-    logger.debug('Dossier refusé pour l\'étudiant:', studentId);
-    // Logique pour refuser l'inscription
-  };
-
   const isValidateButtonDisabled = isSepa && !uploadedFileName;
 
   const goToNextPage = () => {
@@ -68,25 +57,16 @@ export default function ValidateSubscription({ studentId, firstName, lastName, p
   };
 
   return (
-    <div className="p-8 space-y-6 bg-gray-50 rounded-lg shadow-lg">
-      {/* Titre */}
-      <div className="flex items-center space-x-4">
-        <div className="bg-emerald-100 p-3 rounded-full shadow-md">
-          <GraduationCap className="w-8 h-8 text-emerald-600" />
-        </div>
-        <div>
-          <h1 className="text-3xl font-bold text-gray-800">
-            Dossier scolaire de <span className="text-emerald-600">{firstName} {lastName}</span>
-          </h1>
-          <p className="text-sm text-gray-500 italic">
-            Année scolaire {new Date().getFullYear()}-{new Date().getFullYear() + 1}
-          </p>
-        </div>
-      </div>
+    <div className="space-y-6 p-6">
+      <SectionHeader
+        icon={GraduationCap}
+        title={`Dossier scolaire de ${firstName} ${lastName}`}
+        description={`Année scolaire ${new Date().getFullYear()}-${new Date().getFullYear() + 1}`}
+      />
 
       {/* Contenu principal */}
       {currentPage === 1 && (
-        <div className="border p-6 rounded-lg shadow-md bg-white flex justify-center items-center">
+        <div className="p-6 items-center">
           <iframe
             src={pdfUrl}
             title="Aperçu du PDF"
@@ -102,9 +82,10 @@ export default function ValidateSubscription({ studentId, firstName, lastName, p
 
       {currentPage === 2 && isSepa && (
         <FileUpload
-          selectionMessage='Sélectionnez un mandat de prélèvement SEPA'
+          selectionMessage="Sélectionnez un mandat de prélèvement SEPA"
           onFileSelect={(file) => {
             setUploadedFileName(file.name); // Stocke uniquement le nom du fichier
+            setSelectedFile(file); // Stocke le fichier dans l'état
             logger.debug('Fichier sélectionné:', file.name);
           }}
           uploadedFileName={uploadedFileName}
@@ -120,7 +101,7 @@ export default function ValidateSubscription({ studentId, firstName, lastName, p
             className="bg-gray-300 text-gray-700 hover:bg-gray-400 px-6 py-2"
           />
         )}
-        {currentPage < (isSepa ? 2 : 1) && (
+        {isSepa && currentPage === 1 && (
           <Button
             text="Suivant"
             onClick={goToNextPage}

Front-End/src/components/SectionHeader.js

@@ -0,0 +1,44 @@
+import React from 'react';
+import { Plus } from 'lucide-react';
+
+const SectionHeader = ({ 
+  icon: Icon, 
+  discountStyle = false,
+  title, 
+  description, 
+  button = false, 
+  buttonOpeningModal = false,
+  onClick = null 
+}) => {
+  return (
+    <div className="flex items-center justify-between mb-6">
+      <div className="flex items-center space-x-4">
+        <div className={`${discountStyle ? "bg-yellow-100" : "bg-emerald-100"} p-3 rounded-full shadow-md`}>
+          <Icon 
+          className={discountStyle ? 
+            "w-8 h-8 text-yellow-600" :
+            "w-8 h-8 text-emerald-600"
+          }
+          />
+        </div>
+        <div>
+          <h2 className="text-2xl font-bold text-gray-800">{title}</h2>
+          <p className="text-sm text-gray-500 italic">{description}</p>
+        </div>
+      </div>
+      {button && onClick && (
+        <button
+          onClick={onClick}
+          className={buttonOpeningModal ? 
+            "flex items-center bg-emerald-200 text-emerald-700 p-2 rounded-full shadow-sm hover:bg-emerald-300" :
+            "text-emerald-500 hover:bg-emerald-200 rounded-full p-2"
+          }
+        >
+          <Plus className="w-6 h-6" />
+        </button>
+      )}
+    </div>
+  );
+};
+
+export default SectionHeader;

Front-End/src/components/SidebarTabs.js

@@ -6,10 +6,14 @@ const SidebarTabs = ({ tabs }) => {
   return (
     <div className="w-full">
       <div className="flex border-b-2 border-gray-200">
-        {tabs.map(tab => (
+        {tabs.map((tab) => (
           <button
             key={tab.id}
-            className={`flex-1 p-4 ${activeTab === tab.id ? 'border-b-2 border-emerald-500 text-emerald-500' : 'text-gray-500 hover:text-emerald-500'}`}
+            className={`flex-1 p-4 ${
+              activeTab === tab.id
+                ? 'border-b-2 border-emerald-500 text-emerald-500'
+                : 'text-gray-500 hover:text-emerald-500'
+            }`}
             onClick={() => setActiveTab(tab.id)}
           >
             {tab.label}
@@ -17,7 +21,7 @@ const SidebarTabs = ({ tabs }) => {
         ))}
       </div>
       <div className="p-4">
-        {tabs.map(tab => (
+        {tabs.map((tab) => (
           <div key={tab.id} className={`${activeTab === tab.id ? 'block' : 'hidden'}`}>
             {tab.content}
           </div>

Front-End/src/components/Structure/Configuration/ClassesSection.js

@@ -12,6 +12,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import { ESTABLISHMENT_ID } from '@/utils/Url';
 import logger from '@/utils/logger';
 import ClasseDetails from '@/components/ClasseDetails';
+import SectionHeader from '@/components/SectionHeader';
 
 const ItemTypes = {
   TEACHER: 'teacher',
@@ -444,15 +445,13 @@ const ClassesSection = ({ classes, setClasses, teachers, handleCreate, handleEdi
   return (
     <DndProvider backend={HTML5Backend}>
       <div className="space-y-4">
-        <div className="flex justify-between items-center">
-          <div className="flex items-center mb-4">
-            <Users className="w-6 h-6 text-emerald-500 mr-2" />
-            <h2 className="text-xl font-semibold">Classes</h2>
-          </div>
-          <button type="button" onClick={handleAddClass} className="text-emerald-500 hover:text-emerald-700">
-            <Plus className="w-5 h-5" />
-          </button>
-        </div>
+        <SectionHeader
+          icon={Users}
+          title="Liste des classes"
+          description="Gérez les classes de votre école"
+          button={true}
+          onClick={handleAddClass}
+        />
         <Table
           data={newClass ? [newClass, ...classes] : classes}
           columns={columns}

Front-End/src/components/Structure/Configuration/SpecialitiesSection.js

@@ -8,6 +8,7 @@ import { HTML5Backend } from 'react-dnd-html5-backend';
 import SpecialityItem from '@/components/Structure/Configuration/SpecialityItem';
 import { useEstablishment } from '@/context/EstablishmentContext';
 import logger from '@/utils/logger';
+import SectionHeader from '@/components/SectionHeader';
 
 const SpecialitiesSection = ({ specialities, setSpecialities, handleCreate, handleEdit, handleDelete }) => {
 
@@ -214,15 +215,13 @@ const SpecialitiesSection = ({ specialities, setSpecialities, handleCreate, hand
   return (
     <DndProvider backend={HTML5Backend}>
       <div className="space-y-4">
-        <div className="flex justify-between items-center">
-          <div className="flex items-center mb-4">
-            <BookOpen className="w-6 h-6 text-emerald-500 mr-2" />
-            <h2 className="text-xl font-semibold">Spécialités</h2>
-          </div>
-          <button type="button" onClick={handleAddSpeciality} className="text-emerald-500 hover:text-emerald-700">
-            <Plus className="w-5 h-5" />
-          </button>
-        </div>
+        <SectionHeader
+          icon={BookOpen}
+          title="Liste des spécialités"
+          description="Gérez les spécialités de votre école"
+          button={true}
+          onClick={handleAddSpeciality}
+        />
         <Table
           data={newSpeciality ? [newSpeciality, ...specialities] : specialities}
           columns={columns}

Front-End/src/components/Structure/Configuration/StructureManagement.js

@@ -7,9 +7,9 @@ import { BE_SCHOOL_SPECIALITIES_URL, BE_SCHOOL_TEACHERS_URL, BE_SCHOOL_SCHOOLCLA
 
 const StructureManagement = ({ specialities, setSpecialities, teachers, setTeachers, classes, setClasses, profiles, handleCreate, handleEdit, handleDelete }) => {
   return (
-    <div className="max-w-8xl mx-auto p-4 mt-6 space-y-8">
+    <div className="w-full mx-auto mt-6">
       <ClassesProvider>
-        <div className="w-2/5 p-4 bg-white rounded-lg shadow-md">
+        <div className="mt-8 w-2/5">
           <SpecialitiesSection
             specialities={specialities}
             setSpecialities={setSpecialities}
@@ -18,7 +18,7 @@ const StructureManagement = ({ specialities, setSpecialities, teachers, setTeach
             handleDelete={(id) => handleDelete(`${BE_SCHOOL_SPECIALITIES_URL}`, id, setSpecialities)}
           />
         </div>
-        <div className="w-4/5 p-4 bg-white rounded-lg shadow-md">
+        <div className="w-4/5 mt-12">
           <TeachersSection
             teachers={teachers}
             setTeachers={setTeachers}
@@ -29,7 +29,7 @@ const StructureManagement = ({ specialities, setSpecialities, teachers, setTeach
             handleDelete={(id) => handleDelete(`${BE_SCHOOL_TEACHERS_URL}`, id, setTeachers)}
           />
         </div>
-        <div className="w-full p-4 bg-white rounded-lg shadow-md">
+        <div className="w-full mt-12">
           <ClassesSection
             classes={classes}
             setClasses={setClasses}

Front-End/src/components/Structure/Configuration/TeachersSection.js

@@ -3,7 +3,6 @@ import { Plus, Edit3, Trash2, GraduationCap, Check, X, Hand, Search } from 'luci
 import Table from '@/components/Table';
 import Popup from '@/components/Popup';
 import ToggleSwitch from '@/components/ToggleSwitch';
-import { createProfile, updateProfile } from '@/app/actions/authAction';
 import { useCsrfToken } from '@/context/CsrfContext';
 import { DndProvider, useDrag, useDrop } from 'react-dnd';
 import { HTML5Backend } from 'react-dnd-html5-backend';
@@ -11,8 +10,8 @@ import InputText from '@/components/InputText';
 import SpecialityItem from '@/components/Structure/Configuration/SpecialityItem';
 import TeacherItem from './TeacherItem';
 import logger from '@/utils/logger';
-import { fetchProfiles } from '@/app/actions/authAction';
 import { useEstablishment } from '@/context/EstablishmentContext';
+import SectionHeader from '@/components/SectionHeader';
 
 const ItemTypes = {
   SPECIALITY: 'speciality',
@@ -468,15 +467,13 @@ const TeachersSection = ({ teachers, setTeachers, specialities, profiles, handle
   return (
     <DndProvider backend={HTML5Backend}>
       <div className="space-y-4">
-        <div className="flex justify-between items-center">
-          <div className="flex items-center mb-4">
-            <GraduationCap className="w-6 h-6 text-emerald-500 mr-2" />
-            <h2 className="text-xl font-semibold">Enseignants</h2>
-          </div>
-          <button type="button" onClick={handleAddTeacher} className="text-emerald-500 hover:text-emerald-700">
-            <Plus className="w-5 h-5" />
-          </button>
-        </div>
+        <SectionHeader
+          icon={GraduationCap}
+          title="Liste des enseignants.es"
+          description="Gérez les enseignants.es de votre école"
+          button={true}
+          onClick={handleAddTeacher}
+        />
         <Table
           data={newTeacher ? [newTeacher, ...teachers] : teachers}
           columns={columns}

Front-End/src/components/Structure/Files/FilesGroupsManagement.js

@@ -3,6 +3,7 @@ import { Plus, Download, Edit3, Trash2, FolderPlus, Signature, FileText, Check,
 import Modal from '@/components/Modal';
 import Table from '@/components/Table';
 import FileUploadDocuSeal from '@/components/Structure/Files/FileUploadDocuSeal';
+import FileUpload from '@/components/FileUpload'
 import { BASE_URL } from '@/utils/Url';
 import {
   // GET
@@ -26,6 +27,7 @@ import {
 import RegistrationFileGroupForm from '@/components/Structure/Files/RegistrationFileGroupForm';
 import logger from '@/utils/logger';
 import ParentFilesSection from '@/components/Structure/Files/ParentFilesSection';
+import SectionHeader from '@/components/SectionHeader';
 
 export default function FilesGroupsManagement({ csrfToken, selectedEstablishmentId }) {
   const [schoolFileMasters, setSchoolFileMasters] = useState([]);
@@ -42,6 +44,8 @@ export default function FilesGroupsManagement({ csrfToken, selectedEstablishment
   const [editingDocumentId, setEditingDocumentId] = useState(null);
   const [formData, setFormData] = useState({});
 
+  const [uploadedFileName, setUploadedFileName] = useState('');
+
   const handleReloadTemplates = () => {
     setReloadTemplates(true);
   }
@@ -253,84 +257,6 @@ export default function FilesGroupsManagement({ csrfToken, selectedEstablishment
     }
   };
 
-  const renderRequiredDocumentCell = (document, column) => {
-    const isEditing = editingDocumentId === document.id;
-  
-    if (isEditing) {
-      switch (column) {
-        case 'Nom de la pièce':
-          return (
-            <InputText
-              name="name"
-              value={formData.name}
-              onChange={(e) => handleChange(e, 'name')}
-              placeholder="Nom de la pièce"
-              className="w-full"
-            />
-          );
-        case 'Description':
-          return (
-            <InputText
-              name="description"
-              value={formData.description}
-              onChange={(e) => handleChange(e, 'description')}
-              placeholder="Description"
-              className="w-full"
-            />
-          );
-        case 'Actions':
-          return (
-            <div className="flex justify-center space-x-2">
-              <button
-                type="button"
-                onClick={() => handleSaveDocument(document.id)}
-                className="text-green-500 hover:text-green-700"
-              >
-                <Check className="w-5 h-5" />
-              </button>
-              <button
-                type="button"
-                onClick={handleCancelEdit}
-                className="text-red-500 hover:text-red-700"
-              >
-                <X className="w-5 h-5" />
-              </button>
-            </div>
-          );
-        default:
-          return null;
-      }
-    } else {
-      switch (column) {
-        case 'Nom de la pièce':
-          return <span>{document.name}</span>;
-        case 'Description':
-          return <span>{document.description}</span>;
-        case 'Actions':
-          return (
-            <div className="flex justify-center space-x-2">
-              <button
-                type="button"
-                onClick={() => handleEditDocument(document)}
-                className="text-blue-500 hover:text-blue-700"
-              >
-                <Edit3 className="w-5 h-5" />
-              </button>
-              <button
-                type="button"
-                onClick={() => handleDeleteRequiredDocument(document.id)}
-                className="text-red-500 hover:text-red-700"
-              >
-                <Trash2 className="w-5 h-5" />
-              </button>
-            </div>
-          );
-        default:
-          return null;
-      }
-    }
-  };
-
   const handleCreate = (newParentFile) => {
     return createRegistrationParentFileMaster(newParentFile, csrfToken)
       .then((response) => {
@@ -417,14 +343,8 @@ export default function FilesGroupsManagement({ csrfToken, selectedEstablishment
     )}
   ];
 
-  const columnsRequiredDocuments = [
-    { name: 'Nom de la pièce', transform: (row) => renderRequiredDocumentCell(row, 'Nom de la pièce') },
-    { name: 'Description', transform: (row) => renderRequiredDocumentCell(row, 'Description') },
-    { name: 'Actions', transform: (row) => renderRequiredDocumentCell(row, 'Actions') },
-  ];
-
   return (
-    <div className="space-y-12">
+    <div className="w-full mx-auto mt-6">
       {/* Modal pour les fichiers */}
       <Modal
         isOpen={isModalOpen}
@@ -460,26 +380,15 @@ export default function FilesGroupsManagement({ csrfToken, selectedEstablishment
       />
   
       {/* Section Groupes de fichiers */}
-      <div className="mt-8 mb-4 w-3/5">
-        <div className="flex items-center justify-between mb-6">
-          <div className="flex items-center space-x-4">
-            <div className="bg-emerald-100 p-3 rounded-full shadow-md">
-              <FolderPlus className="w-8 h-8 text-emerald-600" />
-            </div>
-            <div>
-              <h2 className="text-2xl font-bold text-gray-800">Dossiers d'inscriptions</h2>
-              <p className="text-sm text-gray-500 italic">
-                Gérez les dossiers d'inscription pour organiser vos documents.
-              </p>
-            </div>
-          </div>
-          <button
-            onClick={() => setIsGroupModalOpen(true)}
-            className="flex items-center bg-emerald-600 text-white p-2 rounded-full shadow hover:bg-emerald-700 transition duration-200"
-          >
-            <Plus className="w-6 h-6" />
-          </button>
-        </div>
+      <div className="mt-8 w-3/5">
+        <SectionHeader
+          icon={FolderPlus}
+          title="Dossiers d'inscriptions"
+          description="Gérez les dossiers d'inscription pour organiser vos documents."
+          button={true}
+          buttonOpeningModal={true}
+          onClick={() => setIsGroupModalOpen(true)}
+        />
         <Table
           data={groups}
           columns={columnsGroups}
@@ -487,29 +396,18 @@ export default function FilesGroupsManagement({ csrfToken, selectedEstablishment
       </div>
   
       {/* Section Fichiers */}
-      <div className="mt-8 mb-4 w-3/5">
-        <div className="flex items-center justify-between mb-6">
-          <div className="flex items-center space-x-4">
-            <div className="bg-emerald-100 p-3 rounded-full shadow-md">
-              <Signature className="w-8 h-8 text-emerald-600" />
-            </div>
-            <div>
-              <h2 className="text-2xl font-bold text-gray-800">Formulaires à remplir</h2>
-              <p className="text-sm text-gray-500 italic">
-                Gérez les formulaires nécessitant une signature électronique.
-              </p>
-            </div>
-          </div>
-          <button
-            onClick={() => {
-              setIsModalOpen(true);
-              setIsEditing(false);
-            }}
-            className="flex items-center bg-emerald-600 text-white p-2 rounded-full shadow hover:bg-emerald-700 transition duration-200"
-          >
-            <Plus className="w-6 h-6" />
-          </button>
-        </div>
+      <div className="mt-12 mb-4 w-3/5">
+        <SectionHeader
+          icon={Signature}
+          title="Formulaires à remplir"
+          description="Gérez les formulaires nécessitant une signature électronique."
+          button={true}
+          buttonOpeningModal={true}
+          onClick={() => {
+            setIsModalOpen(true);
+            setIsEditing(false);
+          }}
+        />
         <Table
           data={filteredFiles}
           columns={columnsFiles}

Front-End/src/components/Structure/Files/ParentFilesSection.js

@@ -7,6 +7,7 @@ import Popup from '@/components/Popup';
 import logger from '@/utils/logger';
 import { createRegistrationParentFileTemplate } from '@/app/actions/registerFileGroupAction';
 import { useCsrfToken } from '@/context/CsrfContext';
+import SectionHeader from '@/components/SectionHeader';
 
 export default function ParentFilesSection({ parentFiles, groups, handleCreate, handleEdit, handleDelete }) {
   const [editingDocumentId, setEditingDocumentId] = useState(null);
@@ -65,7 +66,6 @@ export default function ParentFilesSection({ parentFiles, groups, handleCreate,
           createRegistrationParentFileTemplate(data, csrfToken)
             .then(response => {
               logger.debug('Template enregistré avec succès:', response);
-              onSuccess();
             })
             .catch(error => {
               logger.error('Erreur lors de l\'enregistrement du template:', error);
@@ -243,26 +243,14 @@ export default function ParentFilesSection({ parentFiles, groups, handleCreate,
   ];
 
   return (
-    <div className="mt-8 mb-4 w-4/5">
-      <div className="flex items-center justify-between mb-6">
-        <div className="flex items-center space-x-4">
-          <div className="bg-emerald-100 p-3 rounded-full shadow-md">
-            <FileText className="w-8 h-8 text-emerald-600" />
-          </div>
-          <div>
-            <h2 className="text-2xl font-bold text-gray-800">Pièces à fournir</h2>
-            <p className="text-sm text-gray-500 italic">
-              Configurez la liste des documents que les parents doivent fournir.
-            </p>
-          </div>
-        </div>
-        <button
-          onClick={handleAddEmptyRequiredDocument}
-          className="text-emerald-500 hover:text-emerald-700"
-        >
-          <Plus className="w-6 h-6" />
-        </button>
-      </div>
+    <div className="mt-12 w-4/5">
+      <SectionHeader
+        icon={FileText}
+        title="Pièces à fournir"
+        description="Configurez la liste des documents que les parents doivent fournir."
+        button={true}
+        onClick={handleAddEmptyRequiredDocument}
+      />
       <Table
         data={editingDocumentId === 'new' ? [formData, ...parentFiles] : parentFiles}
         columns={columnsRequiredDocuments}

Front-End/src/components/Structure/Tarification/DiscountsSection.js

@@ -6,8 +6,9 @@ import CheckBox from '@/components/CheckBox';
 import InputText from '@/components/InputText';
 import logger from '@/utils/logger';
 import { ESTABLISHMENT_ID } from '@/utils/Url';
+import SectionHeader from '@/components/SectionHeader';
 
-const DiscountsSection = ({ discounts, setDiscounts, handleCreate, handleEdit, handleDelete, type, subscriptionMode = false, selectedDiscounts, handleDiscountSelection }) => {
+const DiscountsSection = ({ discounts, setDiscounts, handleCreate, handleEdit, handleDelete, type, selectedDiscounts, handleDiscountSelection }) => {
   const [editingDiscount, setEditingDiscount] = useState(null);
   const [newDiscount, setNewDiscount] = useState(null);
   const [formData, setFormData] = useState({});
@@ -253,14 +254,7 @@ const DiscountsSection = ({ discounts, setDiscounts, handleCreate, handleEdit, h
     }
   };
 
-  const columns = subscriptionMode
-  ? [
-      { name: 'LIBELLE', label: 'Libellé' },
-      { name: 'DESCRIPTION', label: 'Description' },
-      { name: 'REMISE', label: 'Remise' },
-      { name: '', label: 'Sélection' }
-    ]
-  : [
+  const columns = [
       { name: 'LIBELLE', label: 'Libellé' },
       { name: 'REMISE', label: 'Remise' },
       { name: 'DESCRIPTION', label: 'Description' },
@@ -269,18 +263,15 @@ const DiscountsSection = ({ discounts, setDiscounts, handleCreate, handleEdit, h
     ];
 
   return (
-    <div className="space-y-4">
-      {!subscriptionMode && (
-        <div className="flex justify-between items-center">
-          <div className="flex items-center mb-4">
-            <Tag className="w-6 h-6 text-emerald-500 mr-2" />
-            <h2 className="text-xl font-semibold">Liste des réductions</h2>
-          </div>
-          <button type="button" onClick={handleAddDiscount} className="text-emerald-500 hover:text-emerald-700">
-            <Plus className="w-5 h-5" />
-          </button>
-        </div>
-      )}
+    <div className="space-y-4 mt-8">
+      <SectionHeader
+        icon={Tag}
+        discountStyle = {true}
+        title={`${type == 0 ? "Liste des réductions sur les frais d'inscription" : "Liste des réductions sur les frais de scolarité"}`}
+        description={`${type == 0 ? "Gérez vos réductions sur les frais d'inscription" : "Gérez vos réductions sur les frais de scolarité"}`}
+        button={true}
+        onClick={handleAddDiscount}
+      />
       <Table
         data={newDiscount ? [newDiscount, ...discounts] : discounts}
         columns={columns}

Front-End/src/components/Structure/Tarification/FeesManagement.js

@@ -44,91 +44,100 @@ const FeesManagement = ({ registrationDiscounts,
   };
 
   return (
-    <div className="w-full mx-auto p-2 mt-6 space-y-6">
-      <div className="bg-white p-2 rounded-lg shadow-md">
-        <h2 className="text-2xl font-semibold mb-4">Frais d&apos;inscription</h2>
-        <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-          <div className="col-span-1 p-6 rounded-lg shadow-inner mt-4">
-            <FeesSection
-              fees={registrationFees}
-              setFees={setRegistrationFees}
-              discounts={registrationDiscounts}
-              handleCreate={(newData) => handleCreate(`${BE_SCHOOL_FEES_URL}`, newData, setRegistrationFees)}
-              handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_FEES_URL}`, id, updatedData, setRegistrationFees)}
-              handleDelete={(id) => handleDelete(`${BE_SCHOOL_FEES_URL}`, id, setRegistrationFees)}
-              type={0}
-            />
-          </div>
-          <div className="col-span-1 p-6 rounded-lg shadow-inner mt-4">
-            <DiscountsSection
-              discounts={registrationDiscounts}
-              setDiscounts={setRegistrationDiscounts}
-              handleCreate={(newData) => handleCreate(`${BE_SCHOOL_DISCOUNTS_URL}`, newData, setRegistrationDiscounts)}
-              handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_DISCOUNTS_URL}`, id, updatedData, setRegistrationDiscounts)}
-              handleDelete={(id) => handleDelete(`${BE_SCHOOL_DISCOUNTS_URL}`, id, setRegistrationDiscounts)}
-              onDiscountDelete={(id) => handleDiscountDelete(id, 0)}
-              type={0}
-            />
-          </div>
-          <div className="col-span-1 p-6 rounded-lg shadow-inner mt-4">
-            <PaymentPlanSelector
-              paymentPlans={registrationPaymentPlans}
-              setPaymentPlans={setRegistrationPaymentPlans}
-              handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_PAYMENT_PLANS_URL}`, id, updatedData, setRegistrationPaymentPlans)}
-              type={0}
-            />
-          </div>
-          <div className="col-span-1 p-6 rounded-lg shadow-inner mt-4">
-            <PaymentModeSelector
-              paymentModes={registrationPaymentModes}
-              setPaymentModes={setRegistrationPaymentModes}
-              handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_PAYMENT_MODES_URL}`, id, updatedData, setRegistrationPaymentModes)}
-              type={0}
-            />
-          </div>
+    <div className="w-full mx-auto mt-6">
+
+      <div className="w-4/5 mx-auto flex items-center mt-8">
+        <hr className="flex-grow border-t-2 border-gray-300" />
+        <span className="mx-4 text-gray-600 font-semibold">Frais d'inscription</span>
+        <hr className="flex-grow border-t-2 border-gray-300" />
+      </div>
+
+      <div className="mt-8 w-4/5">
+        <FeesSection
+          fees={registrationFees}
+          setFees={setRegistrationFees}
+          discounts={registrationDiscounts}
+          handleCreate={(newData) => handleCreate(`${BE_SCHOOL_FEES_URL}`, newData, setRegistrationFees)}
+          handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_FEES_URL}`, id, updatedData, setRegistrationFees)}
+          handleDelete={(id) => handleDelete(`${BE_SCHOOL_FEES_URL}`, id, setRegistrationFees)}
+          type={0}
+        />
+      </div>
+      <div className="mt-12 w-4/5">
+        <DiscountsSection
+          discounts={registrationDiscounts}
+          setDiscounts={setRegistrationDiscounts}
+          handleCreate={(newData) => handleCreate(`${BE_SCHOOL_DISCOUNTS_URL}`, newData, setRegistrationDiscounts)}
+          handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_DISCOUNTS_URL}`, id, updatedData, setRegistrationDiscounts)}
+          handleDelete={(id) => handleDelete(`${BE_SCHOOL_DISCOUNTS_URL}`, id, setRegistrationDiscounts)}
+          onDiscountDelete={(id) => handleDiscountDelete(id, 0)}
+          type={0}
+        />
+      </div>
+      <div className="mt-12 grid grid-cols-1 md:grid-cols-2 gap-6">
+        <div className="col-span-1 mt-4">
+          <PaymentPlanSelector
+            paymentPlans={registrationPaymentPlans}
+            setPaymentPlans={setRegistrationPaymentPlans}
+            handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_PAYMENT_PLANS_URL}`, id, updatedData, setRegistrationPaymentPlans)}
+            type={0}
+          />
+        </div>
+        <div className="col-span-1 mt-4">
+          <PaymentModeSelector
+            paymentModes={registrationPaymentModes}
+            setPaymentModes={setRegistrationPaymentModes}
+            handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_PAYMENT_MODES_URL}`, id, updatedData, setRegistrationPaymentModes)}
+            type={0}
+          />
         </div>
       </div>
-      <div className="bg-white p-2 rounded-lg shadow-md">
-      <h2 className="text-2xl font-semibold mb-4">Frais de scolarité</h2>
-        <div className="grid grid-cols-1 md:grid-cols-2 gap-6">
-          <div className="col-span-1 p-6 rounded-lg shadow-inner mt-4">
-            <FeesSection
-              fees={tuitionFees}
-              setFees={setTuitionFees}
-              discounts={tuitionDiscounts}
-              handleCreate={(newData) => handleCreate(`${BE_SCHOOL_FEES_URL}`, newData, setTuitionFees)}
-              handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_FEES_URL}`, id, updatedData, setTuitionFees)}
-              handleDelete={(id) => handleDelete(`${BE_SCHOOL_FEES_URL}`, id, setTuitionFees)}
-              type={1}
-            />
-          </div>
-          <div className="col-span-1 p-6 rounded-lg shadow-inner mt-4">
-            <DiscountsSection
-              discounts={tuitionDiscounts}
-              setDiscounts={setTuitionDiscounts}
-              handleCreate={(newData) => handleCreate(`${BE_SCHOOL_DISCOUNTS_URL}`, newData, setTuitionDiscounts)}
-              handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_DISCOUNTS_URL}`, id, updatedData, setTuitionDiscounts)}
-              handleDelete={(id) => handleDelete(`${BE_SCHOOL_DISCOUNTS_URL}`, id, setTuitionDiscounts)}
-              onDiscountDelete={(id) => handleDiscountDelete(id, 1)}
-              type={1}
-            />
-          </div>
-          <div className="col-span-1 p-6 rounded-lg shadow-inner mt-4">
-            <PaymentPlanSelector
-              paymentPlans={tuitionPaymentPlans}
-              setPaymentPlans={setTuitionPaymentPlans}
-              handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_PAYMENT_PLANS_URL}`, id, updatedData, setRegistrationPaymentPlans)}
-              type={1}
-            />
-          </div>
-          <div className="col-span-1 p-6 rounded-lg shadow-inner mt-4">
-            <PaymentModeSelector
-              paymentModes={tuitionPaymentModes}
-              setPaymentModes={setTuitionPaymentModes}
-              handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_PAYMENT_MODES_URL}`, id, updatedData, setTuitionPaymentModes)}
-              type={1}
-            />
-          </div>
+
+
+      <div className="w-4/5 mx-auto flex items-center mt-16">
+        <hr className="flex-grow border-t-2 border-gray-300" />
+        <span className="mx-4 text-gray-600 font-semibold">Frais de scolarité</span>
+        <hr className="flex-grow border-t-2 border-gray-300" />
+      </div>
+
+      <div className="mt-8 w-4/5">
+        <FeesSection
+          fees={tuitionFees}
+          setFees={setTuitionFees}
+          discounts={tuitionDiscounts}
+          handleCreate={(newData) => handleCreate(`${BE_SCHOOL_FEES_URL}`, newData, setTuitionFees)}
+          handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_FEES_URL}`, id, updatedData, setTuitionFees)}
+          handleDelete={(id) => handleDelete(`${BE_SCHOOL_FEES_URL}`, id, setTuitionFees)}
+          type={1}
+        />
+      </div>
+      <div className="mt-12 w-4/5">
+        <DiscountsSection
+          discounts={tuitionDiscounts}
+          setDiscounts={setTuitionDiscounts}
+          handleCreate={(newData) => handleCreate(`${BE_SCHOOL_DISCOUNTS_URL}`, newData, setTuitionDiscounts)}
+          handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_DISCOUNTS_URL}`, id, updatedData, setTuitionDiscounts)}
+          handleDelete={(id) => handleDelete(`${BE_SCHOOL_DISCOUNTS_URL}`, id, setTuitionDiscounts)}
+          onDiscountDelete={(id) => handleDiscountDelete(id, 1)}
+          type={1}
+        />
+      </div>
+      <div className="mt-12 grid grid-cols-1 md:grid-cols-2 gap-6">
+        <div className="col-span-1 mt-4">
+          <PaymentPlanSelector
+            paymentPlans={tuitionPaymentPlans}
+            setPaymentPlans={setTuitionPaymentPlans}
+            handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_PAYMENT_PLANS_URL}`, id, updatedData, setRegistrationPaymentPlans)}
+            type={1}
+          />
+        </div>
+        <div className="col-span-1 mt-4">
+          <PaymentModeSelector
+            paymentModes={tuitionPaymentModes}
+            setPaymentModes={setTuitionPaymentModes}
+            handleEdit={(id, updatedData) => handleEdit(`${BE_SCHOOL_PAYMENT_MODES_URL}`, id, updatedData, setTuitionPaymentModes)}
+            type={1}
+          />
         </div>
       </div>
     </div>

Front-End/src/components/Structure/Tarification/FeesSection.js

@@ -5,10 +5,11 @@ import Popup from '@/components/Popup';
 import CheckBox from '@/components/CheckBox';
 import InputText from '@/components/InputText';
 import logger from '@/utils/logger';
+import SectionHeader from '@/components/SectionHeader';
 
 import { ESTABLISHMENT_ID } from '@/utils/Url';
 
-const FeesSection = ({ fees, setFees, discounts, handleCreate, handleEdit, handleDelete, type, subscriptionMode = false, selectedFees, handleFeeSelection }) => {
+const FeesSection = ({ fees, setFees, discounts, handleCreate, handleEdit, handleDelete, type, selectedFees, handleFeeSelection }) => {
   const [editingFee, setEditingFee] = useState(null);
   const [newFee, setNewFee] = useState(null);
   const [formData, setFormData] = useState({});
@@ -243,14 +244,7 @@ const FeesSection = ({ fees, setFees, discounts, handleCreate, handleEdit, handl
     }
   };
 
-  const columns = subscriptionMode
-    ? [
-        { name: 'NOM', label: 'Nom' },
-        { name: 'DESCRIPTION', label: 'Description' },
-        { name: 'MONTANT', label: 'Montant de base' },
-        { name: '', label: 'Sélection' }
-      ]
-    : [
+  const columns = [
         { name: 'NOM', label: 'Nom' },
         { name: 'MONTANT', label: 'Montant de base' },
         { name: 'DESCRIPTION', label: 'Description' },
@@ -259,18 +253,14 @@ const FeesSection = ({ fees, setFees, discounts, handleCreate, handleEdit, handl
       ];
 
   return (
-    <div className="space-y-4">
-      {!subscriptionMode && (
-      <div className="flex justify-between items-center">
-        <div className="flex items-center mb-4">
-          <CreditCard className="w-6 h-6 text-emerald-500 mr-2" />
-          <h2 className="text-xl font-semibold">Liste des frais</h2>
-        </div>
-        <button type="button" onClick={handleAddFee} className="text-emerald-500 hover:text-emerald-700">
-          <Plus className="w-5 h-5" />
-        </button>
-      </div>
-        )}
+    <div className="space-y-4">      
+      <SectionHeader
+        icon={CreditCard}
+        title={`${type == 0 ? "Liste des frais d'inscription" : "Liste des frais de scolarité"}`}
+        description={`${type == 0 ? "Gérez vos frais d'inscription" : "Gérez vos frais de scolarité"}`}
+        button={true}
+        onClick={handleAddFee}
+      />
       <Table
         data={newFee ? [newFee, ...fees] : fees}
         columns={columns}

Front-End/src/components/Table.js

@@ -1,8 +1,8 @@
 import React from 'react';
 import PropTypes from 'prop-types';
-import Pagination from '@/components/Pagination'; // Correction du chemin d'importatio,
+import Pagination from '@/components/Pagination'; // Correction du chemin d'importation
 
-const Table = ({ data, columns, renderCell, itemsPerPage = 0, currentPage, totalPages, onPageChange, onRowClick, selectedRows, isSelectable = false, defaultTheme='bg-emerald-50' }) => {
+const Table = ({ data, columns, renderCell, itemsPerPage = 0, currentPage, totalPages, onPageChange, onRowClick, selectedRows, isSelectable = false, defaultTheme = 'bg-emerald-50' }) => {
   const handlePageChange = (newPage) => {
     onPageChange(newPage);
   };
@@ -21,17 +21,26 @@ const Table = ({ data, columns, renderCell, itemsPerPage = 0, currentPage, total
         </thead>
         <tbody>
           {data?.map((row, rowIndex) => (
-            <tr 
-              key={rowIndex} 
+            <tr
+              key={rowIndex}
               className={`
                 ${isSelectable ? 'cursor-pointer' : ''} 
                 ${selectedRows?.includes(row.id) ? 'bg-emerald-300 text-white' : rowIndex % 2 === 0 ? `${defaultTheme}` : ''} 
                 ${isSelectable ? 'hover:bg-emerald-200' : ''} 
               `}
-              onClick={() => isSelectable && onRowClick && onRowClick(row)}
+              onClick={() => {
+                if (isSelectable && onRowClick) {
+                  // Si la ligne est déjà sélectionnée, transmettre une indication explicite de désélection
+                  if (selectedRows?.includes(row.id)) {
+                    onRowClick({ deselected: true, row }); // Désélectionner
+                  } else {
+                    onRowClick(row); // Sélectionner
+                  }
+                }
+              }}
             >
               {columns.map((column, colIndex) => (
-                <td key={colIndex} className={`py-2 px-4 border-b border-gray-200 text-center text-sm ${selectedRows?.includes(row.id) ? 'text-white' : 'text-gray-700'}`} >
+                <td key={colIndex} className={`py-2 px-4 border-b border-gray-200 text-center text-sm ${selectedRows?.includes(row.id) ? 'text-white' : 'text-gray-700'}`}>
                   {renderCell ? renderCell(row, column.name) : column.transform(row)}
                 </td>
               ))}
@@ -61,6 +70,10 @@ Table.propTypes = {
   currentPage: PropTypes.number.isRequired,
   totalPages: PropTypes.number.isRequired,
   onPageChange: PropTypes.func.isRequired,
+  onRowClick: PropTypes.func,
+  selectedRows: PropTypes.arrayOf(PropTypes.any),
+  isSelectable: PropTypes.bool,
+  defaultTheme: PropTypes.string,
 };
 
 export default Table;