Merge remote-tracking branch 'origin/WIP_Inscriptions' into develop

Front-End/src/app/[locale]/admin/structure/page.js

@@ -23,10 +23,10 @@ import {
   fetchRegistrationPaymentModes,
   fetchTuitionPaymentModes,
 } from '@/app/actions/schoolAction';
-import { fetchProfileRoles, fetchProfiles } from '@/app/actions/authAction';
+import { fetchProfiles } from '@/app/actions/authAction';
 import SidebarTabs from '@/components/SidebarTabs';
 import FilesGroupsManagement from '@/components/Structure/Files/FilesGroupsManagement';
-import { fetchRegistrationTemplateMaster } from '@/app/actions/registerFileGroupAction';
+import { fetchRegistrationSchoolFileMasters } from '@/app/actions/registerFileGroupAction';
 import logger from '@/utils/logger';
 import { useEstablishment } from '@/context/EstablishmentContext';
 
@@ -75,8 +75,8 @@ export default function Page() {
       // Fetch data for tuition fees
       handleTuitionFees();
 
-      // Fetch data for registration file templates
-      fetchRegistrationTemplateMaster()
+      // Fetch data for registration file schoolFileTemplates
+      fetchRegistrationSchoolFileMasters()
         .then((data) => {
           setFichiers(data);
         })
@@ -275,7 +275,7 @@ export default function Page() {
   const tabs = [
     {
       id: 'Configuration',
-      label: "Configuration de l'école",
+      label: 'Classes',
       content: (
         <StructureManagement
           specialities={specialities}
@@ -293,7 +293,7 @@ export default function Page() {
     },
     {
       id: 'Schedule',
-      label: "Gestion de l'emploi du temps",
+      label: 'Emploi du temps',
       content: (
         <ClassesProvider>
           <ScheduleManagement
@@ -305,7 +305,7 @@ export default function Page() {
     },
     {
       id: 'Fees',
-      label: 'Tarifications',
+      label: 'Tarifs',
       content: (
         <FeesManagement
           registrationDiscounts={registrationDiscounts}
@@ -332,7 +332,7 @@ export default function Page() {
     },
     {
       id: 'Files',
-      label: "Documents d'inscription",
+      label: 'Documents',
       content: (
         <FilesGroupsManagement
           csrfToken={csrfToken}
@@ -343,7 +343,7 @@ export default function Page() {
   ];
 
   return (
-    <div className="p-8">
+    <div className="p-4">
       <DjangoCSRFToken csrfToken={csrfToken} />
 
       <div className="w-full p-4">

Front-End/src/app/[locale]/admin/subscriptions/page.js

@@ -16,7 +16,7 @@ import {
   Edit,
   Archive,
   FileText,
-  CircleCheck,
+  CheckCircle,
   Plus,
   XCircle,
 } from 'lucide-react';
@@ -39,8 +39,10 @@ import {
 } from '@/app/actions/subscriptionAction';
 
 import {
-  fetchRegistrationTemplateMaster,
-  createRegistrationTemplates,
+  fetchRegistrationSchoolFileMasters,
+  fetchRegistrationParentFileMasters,
+  createRegistrationSchoolFileTemplate,
+  createRegistrationParentFileTemplate,
   fetchRegistrationFileGroups,
   cloneTemplate,
 } from '@/app/actions/registerFileGroupAction';
@@ -96,7 +98,8 @@ export default function Page({ params: { locale } }) {
   const [totalArchives, setTotalArchives] = useState(0);
   const [itemsPerPage, setItemsPerPage] = useState(10); // Définir le nombre d'éléments par page
 
-  const [templateMasters, setTemplateMasters] = useState([]);
+  const [schoolFileMasters, setSchoolFileMasters] = useState([]);
+  const [parentFileMasters, setParentFileMasters] = useState([]);
   const [isOpen, setIsOpen] = useState(false);
   const [isOpenAffectationClasse, setIsOpenAffectationClasse] = useState(false);
   const [student, setStudent] = useState('');
@@ -239,9 +242,16 @@ export default function Page({ params: { locale } }) {
           fetchRegisterForms(selectedEstablishmentId, ARCHIVED)
             .then(registerFormArchivedDataHandler)
             .catch(requestErrorHandler),
-          fetchRegistrationTemplateMaster()
+          fetchRegistrationSchoolFileMasters()
             .then((data) => {
-              setTemplateMasters(data);
+              setSchoolFileMasters(data);
+            })
+            .catch((err) => {
+              logger.debug(err.message);
+            }),
+          fetchRegistrationParentFileMasters()
+            .then((data) => {
+              setParentFileMasters(data);
             })
             .catch((err) => {
               logger.debug(err.message);
@@ -315,9 +325,9 @@ export default function Page({ params: { locale } }) {
         fetchRegisterForms(selectedEstablishmentId, ARCHIVED)
           .then(registerFormArchivedDataHandler)
           .catch(requestErrorHandler);
-        fetchRegistrationTemplateMaster()
+        fetchRegistrationSchoolFileMasters()
           .then((data) => {
-            setTemplateMasters(data);
+            setSchoolFileMasters(data);
           })
           .catch((err) => {
             err = err.message;
@@ -521,41 +531,78 @@ export default function Page({ params: { locale } }) {
 
     createRegisterForm(data, csrfToken)
       .then((data) => {
-        // Cloner les templates pour chaque templateMaster du fileGroup
-        const masters = templateMasters.filter((file) =>
+        // Cloner les schoolFileTemplates pour chaque templateMaster du fileGroup
+        const masters = schoolFileMasters.filter((file) =>
           file.groups.includes(selectedFileGroup)
         );
-        const clonePromises = masters.map((templateMaster, index) => {
-          return cloneTemplate(
-            templateMaster.id,
-            updatedData.guardianEmail,
-            templateMaster.is_required
-          )
-            .then((clonedDocument) => {
-              // Sauvegarde des templates clonés dans la base de données
-              const cloneData = {
-                name: `${templateMaster.name}_${updatedData.guardianFirstName}_${updatedData.guardianLastName}`,
-                slug: clonedDocument.slug,
-                id: clonedDocument.id,
-                master: templateMaster.id,
-                registration_form: data.student.id,
-              };
+        const parent_masters = parentFileMasters.filter((file) =>
+          file.groups.includes(selectedFileGroup)
+        );
+        const clonePromises = masters
+          .map((templateMaster, index) => {
+            return cloneTemplate(
+              templateMaster.id,
+              updatedData.guardianEmail,
+              templateMaster.is_required
+            )
+              .then((clonedDocument) => {
+                // Sauvegarde des schoolFileTemplates clonés dans la base de données
+                const cloneData = {
+                  name: `${templateMaster.name}_${updatedData.guardianFirstName}_${updatedData.guardianLastName}`,
+                  slug: clonedDocument.slug,
+                  id: clonedDocument.id,
+                  master: templateMaster.id,
+                  registration_form: data.student.id,
+                };
 
-              return createRegistrationTemplates(cloneData, csrfToken)
-                .then((response) => {
-                  logger.debug('Template enregistré avec succès:', response);
-                })
-                .catch((error) => {
-                  logger.error(
-                    "Erreur lors de l'enregistrement du template:",
-                    error
-                  );
-                });
-            })
-            .catch((error) => {
-              logger.error('Error during cloning or sending:', error);
-            });
-        });
+                return createRegistrationSchoolFileTemplate(
+                  cloneData,
+                  csrfToken
+                )
+                  .then((response) => {
+                    logger.debug('Template enregistré avec succès:', response);
+                  })
+                  .catch((error) => {
+                    logger.error(
+                      "Erreur lors de l'enregistrement du template:",
+                      error
+                    );
+                  });
+              })
+              .catch((error) => {
+                logger.error('Error during cloning or sending:', error);
+              });
+          })
+          .catch((error) => {
+            logger.error('Error:', error);
+          });
+
+        // Créer les parentFileTemplates pour chaque parentMaster
+        const parentClonePromises = parent_masters.map(
+          (parentMaster, index) => {
+            const parentTemplateData = {
+              master: parentMaster.id,
+              registration_form: data.student.id,
+            };
+
+            return createRegistrationParentFileTemplate(
+              parentTemplateData,
+              csrfToken
+            )
+              .then((response) => {
+                logger.debug(
+                  'Parent template enregistré avec succès:',
+                  response
+                );
+              })
+              .catch((error) => {
+                logger.error(
+                  "Erreur lors de l'enregistrement du parent template:",
+                  error
+                );
+              });
+          }
+        );
 
         // Attendre que tous les clones soient créés
         Promise.all(clonePromises)
@@ -670,7 +717,11 @@ export default function Page({ params: { locale } }) {
     const actions = {
       1: [
         {
-          icon: <Edit className="w-5 h-5 text-blue-500 hover:text-blue-700" />,
+          icon: (
+            <span title="Editer le dossier">
+              <Edit className="w-5 h-5 text-blue-500 hover:text-blue-700" />
+            </span>
+          ),
           onClick: () =>
             router.push(
               `${FE_ADMIN_SUBSCRIPTIONS_EDIT_URL}?studentId=${row.student.id}`
@@ -678,7 +729,9 @@ export default function Page({ params: { locale } }) {
         },
         {
           icon: (
-            <Send className="w-5 h-5 text-green-500 hover:text-green-700" />
+            <span title="Envoyer le dossier">
+              <Send className="w-5 h-5 text-green-500 hover:text-green-700" />
+            </span>
           ),
           onClick: () =>
             sendConfirmRegisterForm(
@@ -690,7 +743,11 @@ export default function Page({ params: { locale } }) {
       ],
       2: [
         {
-          icon: <Edit className="w-5 h-5 text-blue-500 hover:text-blue-700" />,
+          icon: (
+            <span title="Editer le dossier">
+              <Edit className="w-5 h-5 text-blue-500 hover:text-blue-700" />
+            </span>
+          ),
           onClick: () =>
             router.push(
               `${FE_ADMIN_SUBSCRIPTIONS_EDIT_URL}?studentId=${row.student.id}`
@@ -700,18 +757,26 @@ export default function Page({ params: { locale } }) {
       3: [
         {
           icon: (
-            <CircleCheck className="w-5 h-5 text-green-500 hover:text-green-700" />
+            <span title="Valider le dossier">
+              <CheckCircle className="w-5 h-5 text-green-500 hover:text-green-700" />
+            </span>
           ),
-          onClick: () =>
-            router.push(
-              `${FE_ADMIN_SUBSCRIPTIONS_VALIDATE_URL}?studentId=${row.student.id}&firstName=${row.student.first_name}&lastName=${row.student.last_name}&paymentMode=${row.registration_payment}&file=${row.registration_file}`
-            ),
+          onClick: () => {
+            const paymentSepa =
+              row.registration_payment === 1 || row.tuition_payment === 1
+                ? 1
+                : 0;
+            const url = `${FE_ADMIN_SUBSCRIPTIONS_VALIDATE_URL}?studentId=${row.student.id}&firstName=${row.student.first_name}&lastName=${row.student.last_name}&paymentSepa=${paymentSepa}&file=${row.registration_file}`;
+            router.push(`${url}`);
+          },
         },
       ],
       5: [
         {
           icon: (
-            <CircleCheck className="w-5 h-5 text-green-500 hover:text-green-700" />
+            <span title="Valider le dossier">
+              <CheckCircle className="w-5 h-5 text-green-500 hover:text-green-700" />
+            </span>
           ),
           onClick: () => openModalAssociationEleve(row.student),
         },
@@ -719,7 +784,9 @@ export default function Page({ params: { locale } }) {
       default: [
         {
           icon: (
-            <Archive className="w-5 h-5 text-gray-500 hover:text-gray-700" />
+            <span title="Archiver le dossier">
+              <Archive className="w-5 h-5 text-gray-500 hover:text-gray-700" />
+            </span>
           ),
           onClick: () =>
             archiveFicheInscription(
@@ -785,17 +852,34 @@ export default function Page({ params: { locale } }) {
     },
     {
       name: t('files'),
-      transform: (row) =>
-        row.registration_file != null && (
-          <ul>
+      transform: (row) => (
+        <ul>
+          {row.registration_file && (
             <li className="flex justify-center items-center gap-2">
               <FileText size={16} />
-              <a href={`${BASE_URL}${row.registration_file}`} target="_blank">
+              <a
+                href={`${BASE_URL}${row.registration_file}`}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
                 {row.registration_file?.split('/').pop()}
               </a>
             </li>
-          </ul>
-        ),
+          )}
+          {row.sepa_file && (
+            <li className="flex justify-center items-center gap-2">
+              <FileText size={16} />
+              <a
+                href={`${BASE_URL}${row.sepa_file}`}
+                target="_blank"
+                rel="noopener noreferrer"
+              >
+                {row.sepa_file?.split('/').pop()}
+              </a>
+            </li>
+          )}
+        </ul>
+      ),
     },
     {
       name: 'Actions',
@@ -865,7 +949,7 @@ export default function Page({ params: { locale } }) {
             {
               label: (
                 <>
-                  <CircleCheck size={16} className="mr-2" /> Rattacher
+                  <CheckCircle size={16} className="mr-2" /> Rattacher
                 </>
               ),
               onClick: () => openModalAssociationEleve(row.student),

Front-End/src/app/[locale]/admin/subscriptions/validateSubscription/page.js

@@ -15,7 +15,7 @@ export default function Page() {
   const studentId = searchParams.get('studentId');
   const firstName = searchParams.get('firstName');
   const lastName = searchParams.get('lastName');
-  const paymentMode = searchParams.get('paymentMode');
+  const paymentSepa = searchParams.get('paymentSepa') === '1';
   const file = searchParams.get('file');
 
   const csrfToken = useCsrfToken();
@@ -45,7 +45,7 @@ export default function Page() {
       studentId={studentId}
       firstName={firstName}
       lastName={lastName}
-      paymentMode={paymentMode}
+      paymentSepa={paymentSepa}
       file={file}
       onAccept={handleAcceptRF}
     />