chore(release): 0.0.5

Back-End/Auth/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-03-14 13:23
+# Generated by Django 5.1.3 on 2026-04-05 14:05
 
 import django.contrib.auth.models
 import django.contrib.auth.validators

Back-End/Auth/serializers.py

@@ -14,7 +14,7 @@ class ProfileSerializer(serializers.ModelSerializer):
 
     class Meta:
         model = Profile
-        fields = ['id', 'password', 'email', 'code', 'datePeremption', 'username', 'roles', 'roleIndexLoginDefault']
+        fields = ['id', 'password', 'email', 'code', 'datePeremption', 'username', 'roles', 'roleIndexLoginDefault', 'first_name', 'last_name']
         extra_kwargs = {'password': {'write_only': True}}
 
     def get_roles(self, obj):

Back-End/Common/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-03-14 13:23
+# Generated by Django 5.1.3 on 2026-04-05 14:04
 
 import django.db.models.deletion
 from django.db import migrations, models

Back-End/Common/views.py

@@ -137,6 +137,12 @@ class ServeFileView(APIView):
                 status=status.HTTP_400_BAD_REQUEST,
             )
 
+        # Nettoyer les prefixes media usuels si presents
+        if file_path.startswith('/media/'):
+            file_path = file_path[len('/media/'):]
+        elif file_path.startswith('media/'):
+            file_path = file_path[len('media/'):]
+
         # Nettoyer le préfixe /data/ si présent
         if file_path.startswith('/data/'):
             file_path = file_path[len('/data/'):]

Back-End/Establishment/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-03-14 13:23
+# Generated by Django 5.1.3 on 2026-04-05 14:04
 
 import Establishment.models
 import django.contrib.postgres.fields

Back-End/GestionEmail/urls.py

@@ -1,9 +1,10 @@
 from django.urls import path
 from .views import (
-    SendEmailView, search_recipients
+    SendEmailView, search_recipients, SendFeedbackView
 )
 
 urlpatterns = [
     path('send-email/', SendEmailView.as_view(), name='send_email'),
     path('search-recipients/', search_recipients, name='search_recipients'),
+    path('send-feedback/', SendFeedbackView.as_view(), name='send_feedback'),
 ]

Back-End/GestionEmail/views.py

@@ -5,6 +5,7 @@ from rest_framework import status
 from rest_framework.decorators import api_view, permission_classes
 from rest_framework.permissions import IsAuthenticated
 from django.db.models import Q
+from django.conf import settings
 from Auth.models import Profile, ProfileRole
 
 import N3wtSchool.mailManager as mailer
@@ -119,3 +120,84 @@ def search_recipients(request):
         })
 
     return JsonResponse(results, safe=False)
+
+
+class SendFeedbackView(APIView):
+    """
+    API pour envoyer un feedback au support (EMAIL_HOST_USER).
+    """
+    permission_classes = [IsAuthenticated]
+
+    def post(self, request):
+        data = request.data
+        category = data.get('category', '')
+        subject = data.get('subject', 'Feedback')
+        message = data.get('message', '')
+        user_email = data.get('user_email', '')
+        user_name = data.get('user_name', '')
+        establishment = data.get('establishment', {})
+
+        logger.info(f"Feedback received - Category: {category}, Subject: {subject}")
+
+        if not message or not subject or not category:
+            return Response(
+                {'error': 'La catégorie, le sujet et le message sont requis.'},
+                status=status.HTTP_400_BAD_REQUEST
+            )
+
+        try:
+            # Construire le message formaté
+            category_labels = {
+                'bug': 'Signalement de bug',
+                'feature': 'Proposition de fonctionnalité',
+                'question': 'Question',
+                'other': 'Autre'
+            }
+            category_label = category_labels.get(category, category)
+
+            # Construire les infos établissement
+            establishment_id = establishment.get('id', 'N/A')
+            establishment_name = establishment.get('name', 'N/A')
+            establishment_capacity = establishment.get('total_capacity', 'N/A')
+            establishment_frequency = establishment.get('evaluation_frequency', 'N/A')
+
+            formatted_message = f"""
+            <h2>Nouveau Feedback - {category_label}</h2>
+            <p><strong>De:</strong> {user_name} ({user_email})</p>
+            <h3>Établissement</h3>
+            <ul>
+                <li><strong>ID:</strong> {establishment_id}</li>
+                <li><strong>Nom:</strong> {establishment_name}</li>
+                <li><strong>Capacité:</strong> {establishment_capacity}</li>
+                <li><strong>Fréquence d'évaluation:</strong> {establishment_frequency}</li>
+            </ul>
+            <hr>
+            <p><strong>Sujet:</strong> {subject}</p>
+            <div>
+                <strong>Message:</strong><br>
+                {message}
+            </div>
+            """
+
+            formatted_subject = f"[N3WT School Feedback] [{category_label}] {subject}"
+
+            # Envoyer à EMAIL_HOST_USER avec la configuration SMTP par défaut
+            result = mailer.sendMail(
+                subject=formatted_subject,
+                message=formatted_message,
+                recipients=[settings.EMAIL_HOST_USER],
+                cc=[],
+                bcc=[],
+                attachments=[],
+                connection=None  # Utilise la configuration SMTP par défaut
+            )
+
+            logger.info("Feedback envoyé avec succès")
+            return result
+
+        except Exception as e:
+            logger.error(f"Erreur lors de l'envoi du feedback: {str(e)}", exc_info=True)
+            return Response(
+                {'error': "Erreur lors de l'envoi du feedback"},
+                status=status.HTTP_500_INTERNAL_SERVER_ERROR
+            )

Back-End/GestionMessagerie/consumers.py

@@ -72,11 +72,11 @@ class ChatConsumer(AsyncWebsocketConsumer):
         if presence:
             await self.broadcast_presence_update(self.user_id, 'online')
 
+        await self.accept()
+
         # Envoyer les statuts de présence existants des autres utilisateurs connectés
         await self.send_existing_user_presences()
 
-        await self.accept()
-
         logger.info(f"User {self.user_id} connected to chat")
 
     async def send_existing_user_presences(self):

Back-End/GestionMessagerie/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-03-14 13:23
+# Generated by Django 5.1.3 on 2026-04-05 14:05
 
 import django.db.models.deletion
 import django.utils.timezone

Back-End/GestionNotification/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-03-14 13:23
+# Generated by Django 5.1.3 on 2026-04-05 14:05
 
 import django.db.models.deletion
 from django.conf import settings

Back-End/Planning/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-03-14 13:23
+# Generated by Django 5.1.3 on 2026-04-05 14:05
 
 import django.db.models.deletion
 from django.db import migrations, models

Back-End/Planning/views.py

@@ -9,6 +9,7 @@ from .models import Planning, Events, RecursionType
 from .serializers import PlanningSerializer, EventsSerializer
 
 from N3wtSchool import bdd
+from Subscriptions.util import getCurrentSchoolYear
 
 
 class PlanningView(APIView):
@@ -17,6 +18,7 @@ class PlanningView(APIView):
     def get(self, request):
         establishment_id = request.GET.get('establishment_id', None)
         planning_mode = request.GET.get('planning_mode', None)
+        current_school_year = getCurrentSchoolYear()
 
         plannings = bdd.getAllObjects(Planning)
 
@@ -25,7 +27,10 @@ class PlanningView(APIView):
 
         # Filtrer en fonction du planning_mode
         if planning_mode == "classSchedule":
-            plannings = plannings.filter(school_class__isnull=False)
+            plannings = plannings.filter(
+                school_class__isnull=False,
+                school_class__school_year=current_school_year,
+            )
         elif planning_mode == "planning":
             plannings = plannings.filter(school_class__isnull=True)
 
@@ -79,6 +84,7 @@ class EventsView(APIView):
     def get(self, request):
         establishment_id = request.GET.get('establishment_id', None)
         planning_mode = request.GET.get('planning_mode', None)
+        current_school_year = getCurrentSchoolYear()
         filterParams = {}
         plannings=[]
         events = Events.objects.all()
@@ -86,6 +92,8 @@ class EventsView(APIView):
             filterParams['establishment'] = establishment_id
         if planning_mode is not None:
             filterParams['school_class__isnull'] = (planning_mode!="classSchedule")
+            if planning_mode == "classSchedule":
+                filterParams['school_class__school_year'] = current_school_year
         if filterParams:
             plannings = Planning.objects.filter(**filterParams)
             events = Events.objects.filter(planning__in=plannings)

Back-End/School/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-03-14 13:23
+# Generated by Django 5.1.3 on 2026-04-05 14:05
 
 import django.contrib.postgres.fields
 import django.db.models.deletion
@@ -99,6 +99,7 @@ class Migration(migrations.Migration):
                 ('number_of_students', models.PositiveIntegerField(blank=True, null=True)),
                 ('teaching_language', models.CharField(blank=True, max_length=255)),
                 ('school_year', models.CharField(blank=True, max_length=9)),
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
                 ('updated_date', models.DateTimeField(auto_now=True)),
                 ('type', models.IntegerField(choices=[(1, 'Annuel'), (2, 'Semestriel'), (3, 'Trimestriel')], default=1)),
                 ('time_range', models.JSONField(default=list)),
@@ -126,6 +127,26 @@ class Migration(migrations.Migration):
                 ('establishment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='specialities', to='Establishment.establishment')),
             ],
         ),
+        migrations.CreateModel(
+            name='Evaluation',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('name', models.CharField(max_length=255)),
+                ('description', models.TextField(blank=True)),
+                ('period', models.CharField(help_text='Période ex: T1_2025-2026, S1_2025-2026, A_2025-2026', max_length=20)),
+                ('date', models.DateField(blank=True, null=True)),
+                ('max_score', models.DecimalField(decimal_places=2, default=20, max_digits=5)),
+                ('coefficient', models.DecimalField(decimal_places=2, default=1, max_digits=3)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('establishment', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='evaluations', to='Establishment.establishment')),
+                ('school_class', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='evaluations', to='School.schoolclass')),
+                ('speciality', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='evaluations', to='School.speciality')),
+            ],
+            options={
+                'ordering': ['-date', '-created_at'],
+            },
+        ),
         migrations.CreateModel(
             name='Teacher',
             fields=[

Back-End/School/models.py

@@ -21,7 +21,6 @@ class Speciality(models.Model):
     name = models.CharField(max_length=100)
     updated_date = models.DateTimeField(auto_now=True)
     color_code = models.CharField(max_length=7, default='#FFFFFF')
-    school_year = models.CharField(max_length=9, blank=True)
     establishment = models.ForeignKey('Establishment.Establishment', on_delete=models.CASCADE, related_name='specialities')
 
     def __str__(self):
@@ -32,7 +31,6 @@ class Teacher(models.Model):
     first_name = models.CharField(max_length=100)
     specialities = models.ManyToManyField(Speciality, blank=True)
     profile_role = models.OneToOneField('Auth.ProfileRole', on_delete=models.CASCADE, related_name='teacher_profile', null=True, blank=True)
-    school_year = models.CharField(max_length=9, blank=True)
     updated_date = models.DateTimeField(auto_now=True)
 
     def __str__(self):

Back-End/Settings/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-03-14 13:23
+# Generated by Django 5.1.3 on 2026-04-05 14:04
 
 import django.db.models.deletion
 from django.db import migrations, models

Back-End/Subscriptions/migrations/0001_initial.py

@@ -1,4 +1,4 @@
-# Generated by Django 5.1.3 on 2026-03-14 13:23
+# Generated by Django 5.1.3 on 2026-04-05 14:04
 
 import Subscriptions.models
 import django.db.models.deletion
@@ -40,6 +40,8 @@ class Migration(migrations.Migration):
                 ('birth_place', models.CharField(blank=True, default='', max_length=200)),
                 ('birth_postal_code', models.IntegerField(blank=True, default=0)),
                 ('attending_physician', models.CharField(blank=True, default='', max_length=200)),
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
+                ('updated_at', models.DateTimeField(auto_now=True, null=True)),
                 ('associated_class', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='students', to='School.schoolclass')),
             ],
         ),
@@ -51,7 +53,9 @@ class Migration(migrations.Migration):
                 ('name', models.CharField(default='', max_length=255)),
                 ('file', models.FileField(blank=True, null=True, upload_to=Subscriptions.models.registration_school_file_upload_to)),
                 ('formTemplateData', models.JSONField(blank=True, default=list, null=True)),
-                ('isValidated', models.BooleanField(default=False)),
+                ('isValidated', models.BooleanField(blank=True, default=None, null=True)),
+                ('electronic_signature', models.TextField(blank=True, help_text='Signature électronique encodée en base64', null=True)),
+                ('electronic_signature_date', models.DateTimeField(blank=True, help_text='Date de la signature électronique', null=True)),
             ],
         ),
         migrations.CreateModel(
@@ -90,6 +94,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('student', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, primary_key=True, serialize=False, to='Subscriptions.student')),
                 ('status', models.IntegerField(choices=[(0, "Pas de dossier d'inscription"), (1, "Dossier d'inscription initialisé"), (2, "Dossier d'inscription envoyé"), (3, "Dossier d'inscription en cours de validation"), (4, "Dossier d'inscription à relancer"), (5, "Dossier d'inscription validé"), (6, "Dossier d'inscription archivé"), (7, 'Mandat SEPA envoyé'), (8, 'Mandat SEPA à envoyer')], default=0)),
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
                 ('last_update', models.DateTimeField(auto_now=True)),
                 ('school_year', models.CharField(blank=True, default='', max_length=9)),
                 ('notes', models.CharField(blank=True, max_length=200)),
@@ -166,6 +171,7 @@ class Migration(migrations.Migration):
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('name', models.CharField(default='', max_length=255)),
                 ('is_required', models.BooleanField(default=False)),
+                ('requires_electronic_signature', models.BooleanField(default=False, help_text='Si activé, le parent devra signer électroniquement ce document')),
                 ('formMasterData', models.JSONField(blank=True, default=list, null=True)),
                 ('file', models.FileField(blank=True, help_text='Fichier du formulaire existant (PDF, DOC, etc.)', null=True, upload_to=Subscriptions.models.registration_school_file_master_upload_to)),
                 ('establishment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='school_file_masters', to='Establishment.establishment')),
@@ -197,7 +203,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
                 ('file', models.FileField(blank=True, null=True, upload_to=Subscriptions.models.registration_parent_file_upload_to)),
-                ('isValidated', models.BooleanField(default=False)),
+                ('isValidated', models.BooleanField(blank=True, default=None, null=True)),
                 ('master', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='parent_file_templates', to='Subscriptions.registrationparentfilemaster')),
                 ('registration_form', models.ForeignKey(blank=True, on_delete=django.db.models.deletion.CASCADE, related_name='parent_file_templates', to='Subscriptions.registrationform')),
             ],
@@ -209,6 +215,8 @@ class Migration(migrations.Migration):
                 ('score', models.IntegerField(blank=True, null=True)),
                 ('comment', models.TextField(blank=True, null=True)),
                 ('period', models.CharField(blank=True, default='', help_text="Période d'évaluation ex: T1-2024_2025, S1-2024_2025, A-2024_2025", max_length=20)),
+                ('created_at', models.DateTimeField(auto_now_add=True, null=True)),
+                ('updated_at', models.DateTimeField(auto_now=True, null=True)),
                 ('establishment_competency', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student_scores', to='School.establishmentcompetency')),
                 ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='competency_scores', to='Subscriptions.student')),
             ],
@@ -216,4 +224,20 @@ class Migration(migrations.Migration):
                 'unique_together': {('student', 'establishment_competency', 'period')},
             },
         ),
+        migrations.CreateModel(
+            name='StudentEvaluation',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('score', models.DecimalField(blank=True, decimal_places=2, max_digits=5, null=True)),
+                ('comment', models.TextField(blank=True)),
+                ('is_absent', models.BooleanField(default=False)),
+                ('created_at', models.DateTimeField(auto_now_add=True)),
+                ('updated_at', models.DateTimeField(auto_now=True)),
+                ('evaluation', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='student_scores', to='School.evaluation')),
+                ('student', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='evaluation_scores', to='Subscriptions.student')),
+            ],
+            options={
+                'unique_together': {('student', 'evaluation')},
+            },
+        ),
     ]

Back-End/Subscriptions/models.py

@@ -54,17 +54,38 @@ class Sibling(models.Model):
         return "SIBLING"
 
 def registration_photo_upload_to(instance, filename):
-    return f"registration_files/dossier_rf_{instance.pk}/parent/{filename}"
+    """
+    Génère le chemin de stockage pour la photo élève.
+    Structure : Etablissement/dossier_NomEleve_PrenomEleve/filename
+    """
+    register_form = getattr(instance, 'registrationform', None)
+    if register_form and register_form.establishment:
+        est_name = register_form.establishment.name
+    elif instance.associated_class and instance.associated_class.establishment:
+        est_name = instance.associated_class.establishment.name
+    else:
+        est_name = "unknown_establishment"
+
+    student_last = instance.last_name if instance and instance.last_name else "unknown"
+    student_first = instance.first_name if instance and instance.first_name else "unknown"
+    return f"{est_name}/dossier_{student_last}_{student_first}/{filename}"
 
 def registration_bilan_form_upload_to(instance, filename):
-    # On récupère le RegistrationForm lié à l'élève
+    """
+    Génère le chemin de stockage pour les bilans de compétences.
+    Structure : Etablissement/dossier_NomEleve_PrenomEleve/filename
+    """
     register_form = getattr(instance.student, 'registrationform', None)
-    if register_form:
-        pk = register_form.pk
+    if register_form and register_form.establishment:
+        est_name = register_form.establishment.name
+    elif instance.student.associated_class and instance.student.associated_class.establishment:
+        est_name = instance.student.associated_class.establishment.name
     else:
-        # fallback sur l'id de l'élève si pas de registrationform
-        pk = instance.student.pk
-    return f"registration_files/dossier_rf_{pk}/bilan/{filename}"
+        est_name = "unknown_establishment"
+
+    student_last = instance.student.last_name if instance.student else "unknown"
+    student_first = instance.student.first_name if instance.student else "unknown"
+    return f"{est_name}/dossier_{student_last}_{student_first}/{filename}"
 
 class BilanCompetence(models.Model):
     student = models.ForeignKey('Subscriptions.Student', on_delete=models.CASCADE, related_name='bilans')
@@ -363,6 +384,7 @@ class RegistrationSchoolFileMaster(models.Model):
     groups = models.ManyToManyField(RegistrationFileGroup, related_name='school_file_masters', blank=True)
     name = models.CharField(max_length=255, default="")
     is_required = models.BooleanField(default=False)
+    requires_electronic_signature = models.BooleanField(default=False, help_text="Si activé, le parent devra signer électroniquement ce document")
     formMasterData = models.JSONField(default=list, blank=True, null=True)
     file = models.FileField(
         upload_to=registration_school_file_master_upload_to,
@@ -403,7 +425,9 @@ class RegistrationSchoolFileMaster(models.Model):
                         and isinstance(self.formMasterData, dict)
                         and self.formMasterData.get("fields")
                     ):
-                        new_filename = f"{self.name}.pdf"
+                        # Si un fichier source est déjà présent, conserver son extension.
+                        extension = os.path.splitext(old_filename)[1] or '.pdf'
+                        new_filename = f"{self.name}{extension}"
                     else:
                         # Pour les forms existants, le nom attendu est self.name + extension du fichier existant
                         extension = os.path.splitext(old_filename)[1]
@@ -438,16 +462,9 @@ class RegistrationSchoolFileMaster(models.Model):
             except RegistrationSchoolFileMaster.DoesNotExist:
                 pass
 
-        # --- Traitement PDF dynamique AVANT le super().save() ---
-        if (
-            self.formMasterData
-            and isinstance(self.formMasterData, dict)
-            and self.formMasterData.get("fields")
-        ):
-            from Subscriptions.util import generate_form_json_pdf
-            pdf_filename = f"{self.name}.pdf"
-            pdf_file = generate_form_json_pdf(self, self.formMasterData)
-            self.file.save(pdf_filename, pdf_file, save=False)
+        # IMPORTANT: pour les formulaires dynamiques, le fichier du master doit
+        # rester le document source uploadé (PDF/image). La génération du PDF final
+        # est faite au niveau des templates (par élève), pas sur le master.
 
         super().save(*args, **kwargs)
 
@@ -540,7 +557,11 @@ class RegistrationSchoolFileTemplate(models.Model):
     registration_form = models.ForeignKey(RegistrationForm, on_delete=models.CASCADE, related_name='school_file_templates', blank=True)
     file = models.FileField(null=True,blank=True, upload_to=registration_school_file_upload_to)
     formTemplateData = models.JSONField(default=list, blank=True, null=True)
-    isValidated = models.BooleanField(default=False)
+    # Tri-etat: None=en attente, True=valide, False=refuse
+    isValidated = models.BooleanField(null=True, blank=True, default=None)
+    # Signature électronique (base64 SVG ou PNG)
+    electronic_signature = models.TextField(null=True, blank=True, help_text="Signature électronique encodée en base64")
+    electronic_signature_date = models.DateTimeField(null=True, blank=True, help_text="Date de la signature électronique")
 
     def __str__(self):
         return self.name
@@ -622,7 +643,8 @@ class RegistrationParentFileTemplate(models.Model):
     master = models.ForeignKey(RegistrationParentFileMaster, on_delete=models.CASCADE, related_name='parent_file_templates', blank=True)
     registration_form = models.ForeignKey(RegistrationForm, on_delete=models.CASCADE, related_name='parent_file_templates', blank=True)
     file = models.FileField(null=True,blank=True, upload_to=registration_parent_file_upload_to)
-    isValidated = models.BooleanField(default=False)
+    # Tri-etat: None=en attente, True=valide, False=refuse
+    isValidated = models.BooleanField(null=True, blank=True, default=None)
 
     def __str__(self):
         return self.master.name if self.master else f"ParentFile_{self.pk}"

Back-End/Subscriptions/serializers.py

@@ -21,7 +21,6 @@ from N3wtSchool import settings
 from django.utils import timezone
 import pytz
 import Subscriptions.util as util
-from N3wtSchool.mailManager import sendRegisterForm
 
 class AbsenceManagementSerializer(serializers.ModelSerializer):
     student_name = serializers.SerializerMethodField()
@@ -39,10 +38,15 @@ class AbsenceManagementSerializer(serializers.ModelSerializer):
 
 class RegistrationSchoolFileMasterSerializer(serializers.ModelSerializer):
     id = serializers.IntegerField(required=False)
+    file_url = serializers.SerializerMethodField()
+
     class Meta:
         model = RegistrationSchoolFileMaster
         fields = '__all__'
 
+    def get_file_url(self, obj):
+        return obj.file.url if obj.file else None
+
 class RegistrationParentFileMasterSerializer(serializers.ModelSerializer):
     id = serializers.IntegerField(required=False)
     class Meta:
@@ -52,6 +56,9 @@ class RegistrationParentFileMasterSerializer(serializers.ModelSerializer):
 class RegistrationSchoolFileTemplateSerializer(serializers.ModelSerializer):
     id = serializers.IntegerField(required=False)
     file_url = serializers.SerializerMethodField()
+    master_file_url = serializers.SerializerMethodField()
+    requires_electronic_signature = serializers.SerializerMethodField()
+    is_electronically_signed = serializers.SerializerMethodField()
 
     class Meta:
         model = RegistrationSchoolFileTemplate
@@ -61,6 +68,33 @@ class RegistrationSchoolFileTemplateSerializer(serializers.ModelSerializer):
         # Retourne l'URL complète du fichier si disponible
         return obj.file.url if obj.file else None
 
+    def get_master_file_url(self, obj):
+        # URL du fichier source du master (pour l'aperçu FileUpload côté parent)
+        if obj.master and obj.master.file:
+            return obj.master.file.url
+        return None
+
+    def get_requires_electronic_signature(self, obj):
+        # Retourne si le document nécessite une signature électronique
+        if obj.master:
+            return obj.master.requires_electronic_signature
+        return False
+
+    def get_is_electronically_signed(self, obj):
+        # Retourne True si le document a été signé électroniquement
+        return bool(obj.electronic_signature)
+
+    def update(self, instance, validated_data):
+        # Auto-remplir la date de signature si electronic_signature est fournie
+        from django.utils import timezone
+        if 'electronic_signature' in validated_data and validated_data['electronic_signature']:
+            # Nouvelle signature ou re-signature : enregistrer la date
+            validated_data['electronic_signature_date'] = timezone.now()
+            # Si le document était refusé, le repasser en attente de validation
+            if instance.isValidated == False:
+                validated_data['isValidated'] = None
+        return super().update(instance, validated_data)
+
 class RegistrationParentFileTemplateSerializer(serializers.ModelSerializer):
     id = serializers.IntegerField(required=False)
     file_url = serializers.SerializerMethodField()
@@ -216,14 +250,6 @@ class StudentSerializer(serializers.ModelSerializer):
                     profile_role_serializer = ProfileRoleSerializer(data=profile_role_data)
                     profile_role_serializer.is_valid(raise_exception=True)
                     profile_role = profile_role_serializer.save()
-                    # Envoi du mail d'inscription si un nouveau profil vient d'être créé
-                    email = None
-                    if profile_data and 'email' in profile_data:
-                        email = profile_data['email']
-                    elif profile_role and profile_role.profile:
-                        email = profile_role.profile.email
-                    if email:
-                        sendRegisterForm(email, establishment_id)
             elif profile_role:
                 # Récupérer un ProfileRole existant par son ID
                 profile_role = ProfileRole.objects.get(id=profile_role.id)
@@ -399,10 +425,11 @@ class RegistrationFormSerializer(serializers.ModelSerializer):
 class StudentByParentSerializer(serializers.ModelSerializer):
     id = serializers.IntegerField(required=False)
     associated_class_name = serializers.SerializerMethodField()
+    associated_class_id = serializers.SerializerMethodField()
 
     class Meta:
         model = Student
-        fields = ['id', 'last_name', 'first_name', 'level', 'photo', 'associated_class_name']
+        fields = ['id', 'last_name', 'first_name', 'level', 'photo', 'associated_class_name', 'associated_class_id']
 
     def __init__(self, *args, **kwargs):
         super(StudentByParentSerializer, self).__init__(*args, **kwargs)
@@ -412,6 +439,9 @@ class StudentByParentSerializer(serializers.ModelSerializer):
     def get_associated_class_name(self, obj):
         return obj.associated_class.atmosphere_name if obj.associated_class else None
 
+    def get_associated_class_id(self, obj):
+        return obj.associated_class.id if obj.associated_class else None
+
 class RegistrationFormByParentSerializer(serializers.ModelSerializer):
     student = StudentByParentSerializer(many=False, required=True)
 

Back-End/Subscriptions/templates/pdfs/bilan_competences.html

@@ -4,9 +4,22 @@
     <meta charset="UTF-8">
     <title>Bilan de compétences</title>
     <style>
-        body { font-family: Arial, sans-serif; margin: 2em; }
+        body { font-family: Arial, sans-serif; margin: 1.2em; color: #111827; }
         h1, h2 { color: #059669; }
-        .student-info { margin-bottom: 2em; }
+        .top-header { width: 100%; border-bottom: 2px solid #d1fae5; border-collapse: collapse; margin-bottom: 14px; }
+        .top-header td { vertical-align: top; border: none; padding: 0; }
+        .school-logo { width: 54px; height: 54px; object-fit: contain; margin-right: 8px; }
+        .product-logo { width: 58px; }
+        .title-row { margin: 8px 0 10px 0; }
+        .student-info {
+            margin-bottom: 1em;
+            border: 1px solid #e5e7eb;
+            border-radius: 8px;
+            padding: 8px 12px;
+            background: #f8fafc;
+        }
+        .student-info table { width: 100%; border-collapse: collapse; font-size: 0.98em; }
+        .student-info td { border: none; padding: 1px 0; }
         .domain-table { width: 100%; border-collapse: collapse; margin-bottom: 2em; }
         .domain-header th {
             background: #d1fae5;
@@ -25,16 +38,77 @@
         th, td { border: 1px solid #e5e7eb; padding: 0.5em; }
         th.competence-header { background: #d1fae5; }
         td.competence-nom { word-break: break-word; max-width: 320px; }
+        .footer-note { margin-top: 32px; }
+        .comment-space {
+            min-height: 180px;
+            margin-top: 18px;
+            margin-bottom: 78px;
+        }
+        .footer-grid { width: 100%; border-collapse: collapse; }
+        .footer-grid td {
+            border: none;
+            padding: 0;
+            vertical-align: top;
+        }
+        .field-line { border-bottom: 1px solid #9ca3af; height: 24px; margin-top: 6px; }
+        .signature-line { border-bottom: 2px solid #059669; height: 30px; margin-top: 6px; }
     </style>
 </head>
 <body>
-    <h1>Bilan de compétences</h1>
+    <table class="top-header">
+        <tr>
+            <td style="width: 68%; padding-bottom: 8px;">
+                <table style="border-collapse: collapse; width: 100%;">
+                    <tr>
+                        {% if establishment.logo_path %}
+                        <td style="width: 64px; border: none; vertical-align: top;">
+                            <img src="{{ establishment.logo_path }}" alt="Logo établissement" class="school-logo">
+                        </td>
+                        {% endif %}
+                        <td style="border: none; vertical-align: top;">
+                            <div style="font-size: 1.25em; font-weight: 700; color: #065f46; margin-top: 2px;">{{ establishment.name }}</div>
+                            {% if establishment.address %}
+                            <div style="font-size: 0.9em; color: #4b5563; margin-top: 4px;">{{ establishment.address }}</div>
+                            {% endif %}
+                        </td>
+                    </tr>
+                </table>
+            </td>
+            <td style="width: 32%; text-align: right; padding-bottom: 8px;">
+                <table style="border-collapse: collapse; width: 100%; margin-left: auto;">
+                    <tr>
+                        <td style="border: none; text-align: right;">
+                            <div style="font-size: 0.86em; color: #6b7280; margin-bottom: 4px;">Généré avec</div>
+                            {% if product.logo_path %}
+                            <div style="margin-bottom: 4px;"><img src="{{ product.logo_path }}" alt="Logo n3wt" class="product-logo"></div>
+                            {% endif %}
+                            <div style="font-size: 0.95em; font-weight: 700; color: #059669;">{{ product.name }}</div>
+                        </td>
+                    </tr>
+                </table>
+            </td>
+        </tr>
+    </table>
+
+    <div class="title-row">
+        <h1>Bilan de compétences</h1>
+    </div>
+
     <div class="student-info">
-        <strong>Élève :</strong> {{ student.last_name }} {{ student.first_name }}<br>
-        <strong>Niveau :</strong> {{ student.level }}<br>
-        <strong>Classe :</strong> {{ student.class_name }}<br>
-        <strong>Période :</strong> {{ period }}<br>
-        <strong>Date :</strong> {{ date }}
+        <table>
+            <tr>
+                <td><strong>Élève :</strong> {{ student.last_name }} {{ student.first_name }}</td>
+                <td style="text-align: right;"><strong>Date :</strong> {{ date }}</td>
+            </tr>
+            <tr>
+                <td><strong>Niveau :</strong> {{ student.level }}</td>
+                <td style="text-align: right;"><strong>Période :</strong> {{ period }}</td>
+            </tr>
+            <tr>
+                <td><strong>Classe :</strong> {{ student.class_name }}</td>
+                <td></td>
+            </tr>
+        </table>
     </div>
 
     {% for domaine in domaines %}
@@ -72,41 +146,33 @@
     </table>
     {% endfor %}
 
-    <div style="margin-top: 60px; padding: 0; max-width: 700px;">
-        <div style="
-            min-height: 180px;
-            background: #fff;
-            border: 1.5px dashed #a7f3d0;
-            border-radius: 12px;
-            padding: 24px 24px 18px 24px;
-            display: flex;
-            flex-direction: column;
-            justify-content: flex-start;
-            position: relative;
-            margin-bottom: 64px; /* Augmente l'espace après l'encadré */
-        ">
-            <div style="font-weight: bold; color: #059669; font-size: 1.25em; display: flex; align-items: center; gap: 8px; margin-bottom: 8px;">
-                <span>Appréciation générale / Commentaire : </span>
-            </div>
-            <!-- Espace vide pour écrire -->
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-            <div style="flex:1;"></div>
-        </div>
-        <div style="display: flex; justify-content: flex-end; gap: 48px; margin-top: 32px;">
-            <div>
-                <span style="font-weight: bold; color: #059669;font-size: 1.25em;">Date :</span>
-                <span style="display: inline-block; min-width: 120px; border-bottom: 1.5px solid #a7f3d0; margin-left: 8px;">&nbsp;</span>
-            </div>
-            <div>
-                <span style="font-weight: bold; color: #059669;font-size: 1.25em;">Signature :</span>
-                <span style="display: inline-block; min-width: 180px; border-bottom: 2px solid #059669; margin-left: 8px;">&nbsp;</span>
-            </div>
+    <div class="footer-note">
+        <div style="font-weight: 700; color: #059669; font-size: 1.1em;">
+            Appréciation générale / Commentaire
         </div>
+        <div class="comment-space"></div>
+
+        <table class="footer-grid">
+            <tr>
+                <td style="width: 45%;">
+                    <table style="width: 100%; border-collapse: collapse;">
+                        <tr>
+                            <td style="width: 70px; border: none; font-weight: 700; color: #059669;">Date :</td>
+                            <td style="border: none;"><div class="field-line"></div></td>
+                        </tr>
+                    </table>
+                </td>
+                <td style="width: 10%;"></td>
+                <td style="width: 45%;">
+                    <table style="width: 100%; border-collapse: collapse;">
+                        <tr>
+                            <td style="width: 90px; border: none; font-weight: 700; color: #059669;">Signature :</td>
+                            <td style="border: none;"><div class="signature-line"></div></td>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+        </table>
     </div>
 </body>
 </html>

Back-End/Subscriptions/templates/pdfs/dynamic_form.html

@@ -0,0 +1,245 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="UTF-8" />
+    <title>{{ pdf_title }}</title>
+    <style>
+      @page {
+        size: A4;
+        margin: 1.4cm 1.6cm;
+      }
+
+      body {
+        font-family: Helvetica, Arial, sans-serif;
+        font-size: 11pt;
+        color: #111827;
+        margin: 0;
+        padding: 0;
+        line-height: 1.35;
+        background: #ffffff;
+      }
+
+      .page-shell {
+        border-left: 1px dashed #cbd5e1;
+        border-right: 1px dashed #cbd5e1;
+        padding: 0 22px 8px 22px;
+      }
+
+      .title {
+        font-size: 22pt;
+        font-weight: bold;
+        text-align: center;
+        margin: 0 0 18px 0;
+      }
+
+      .heading1 {
+        font-size: 26pt;
+        font-weight: bold;
+        margin: 18px 0 10px 0;
+      }
+
+      .heading2 {
+        font-size: 18pt;
+        font-weight: bold;
+        margin: 14px 0 8px 0;
+      }
+
+      .heading3 {
+        font-size: 14pt;
+        font-weight: bold;
+        margin: 12px 0 6px 0;
+      }
+
+      .heading4,
+      .heading5,
+      .heading6 {
+        font-size: 11pt;
+        font-weight: bold;
+        margin: 10px 0 6px 0;
+      }
+
+      .paragraph {
+        margin: 0 0 12px 0;
+        color: #374151;
+      }
+
+      .field-block {
+        margin: 10px 0 14px 0;
+        page-break-inside: avoid;
+      }
+
+      .field-label {
+        font-size: 9pt;
+        font-weight: bold;
+        color: #475569;
+        text-transform: uppercase;
+        margin: 0 0 4px 0;
+      }
+
+      .input-box {
+        border: 1px solid #d1d5db;
+        background: #ffffff;
+        padding: 8px 10px;
+        min-height: 18px;
+      }
+
+      .input-placeholder {
+        color: #9ca3af;
+      }
+
+      .phone-table {
+        width: 100%;
+        border-collapse: collapse;
+      }
+
+      .phone-prefix {
+        width: 78px;
+        border: 1px solid #d1d5db;
+        background: #f8fafc;
+        padding: 8px 10px;
+        font-size: 11pt;
+      }
+
+      .phone-value {
+        border: 1px solid #d1d5db;
+        padding: 8px 10px;
+        font-size: 11pt;
+      }
+
+      .file-card {
+        border: 1px solid #d1d5db;
+        background: #f8fafc;
+        padding: 12px;
+      }
+
+      .preview-page {
+        margin: 8px 0;
+        border: 1px solid #d1d5db;
+        background: #ffffff;
+        text-align: center;
+      }
+
+      .preview-page img {
+        height: auto;
+      }
+
+      .preview-meta {
+        margin-top: 6px;
+        font-size: 8.5pt;
+        color: #64748b;
+      }
+
+      .empty-file {
+        border: 2px dashed #94a3b8;
+        background: #ffffff;
+        padding: 18px 12px;
+        text-align: center;
+        color: #64748b;
+      }
+
+      .signature-box {
+        border: 1px solid #d1d5db;
+        background: #ffffff;
+        height: 84px;
+        text-align: center;
+        vertical-align: middle;
+      }
+
+      .signature-box img {
+        max-width: 200px;
+        max-height: 70px;
+        margin: 6px auto;
+      }
+
+      .field-meta {
+        margin-top: 4px;
+        color: #6b7280;
+        font-size: 8.5pt;
+      }
+    </style>
+  </head>
+  <body>
+    <div class="page-shell">
+      <h1 class="title">{{ pdf_title }}</h1>
+
+      {% for field in fields %}
+        {% if field.kind == 'heading' %}
+          {% if field.level == 'heading1' %}
+            <div class="heading1">{{ field.text }}</div>
+          {% elif field.level == 'heading2' %}
+            <div class="heading2">{{ field.text }}</div>
+          {% elif field.level == 'heading3' %}
+            <div class="heading3">{{ field.text }}</div>
+          {% elif field.level == 'heading4' %}
+            <div class="heading4">{{ field.text }}</div>
+          {% elif field.level == 'heading5' %}
+            <div class="heading5">{{ field.text }}</div>
+          {% else %}
+            <div class="heading6">{{ field.text }}</div>
+          {% endif %}
+        {% elif field.kind == 'paragraph' %}
+          <p class="paragraph">{{ field.text }}</p>
+        {% elif field.kind == 'file' %}
+          <div class="field-block">
+            <div class="field-label">{{ field.label }}</div>
+            <div class="file-card">
+              {% if field.has_preview %}
+                {% for preview in field.preview_pages %}
+                  <div class="preview-page">
+                    <img src="{{ preview.src }}" alt="{{ preview.alt }}" width="{{ preview.width }}" height="{{ preview.height }}" />
+                  </div>
+                {% endfor %}
+                {% if field.total_pages > 1 %}
+                  <div class="preview-meta">Aperçu de la première page sur {{ field.total_pages }} pages</div>
+                {% endif %}
+              {% else %}
+                <div class="empty-file">Aucun document source fourni</div>
+              {% endif %}
+            </div>
+          </div>
+        {% elif field.kind == 'phone' %}
+          <div class="field-block">
+            <div class="field-label">{{ field.label }}</div>
+            <table class="phone-table">
+              <tr>
+                <td class="phone-prefix">{{ field.prefix }}</td>
+                <td class="phone-value">
+                  {% if field.value %}
+                    {{ field.value }}
+                  {% else %}
+                    <span class="input-placeholder">&nbsp;</span>
+                  {% endif %}
+                </td>
+              </tr>
+            </table>
+          </div>
+        {% elif field.kind == 'signature' %}
+          <div class="field-block">
+            <div class="field-label">{{ field.label }}</div>
+            <div class="signature-box">
+              {% if field.signature_src %}
+                <img src="{{ field.signature_src }}" alt="Signature" />
+              {% else %}
+                &nbsp;
+              {% endif %}
+            </div>
+          </div>
+        {% else %}
+          <div class="field-block">
+            <div class="field-label">{{ field.label }}</div>
+            <div class="input-box">
+              {% if field.value %}
+                {{ field.value }}
+              {% else %}
+                <span class="input-placeholder">&nbsp;</span>
+              {% endif %}
+            </div>
+            {% if field.field_type %}
+              <div class="field-meta">Type: {{ field.field_type }}</div>
+            {% endif %}
+          </div>
+        {% endif %}
+      {% endfor %}
+    </div>
+  </body>
+</html>

Back-End/Subscriptions/templates/pdfs/fiche_eleve.html

@@ -1,228 +1,319 @@
-<!DOCTYPE html>
+<!doctype html>
 <html>
-<head>
-    <meta charset="UTF-8">
-    <title>Fiche élève de {{ student.last_name }} {{ student.first_name }}</title>
+  <head>
+    <meta charset="UTF-8" />
+    <title>
+      Fiche élève — {{ student.last_name }} {{ student.first_name }}
+    </title>
     <style>
-        @page {
-            size: A4;
-            margin: 2cm;
-        }
-        body {
-            font-family: 'Arial', sans-serif;
-            font-size: 12pt;
-            color: #222;
-            background: #fff;
-            margin: 0;
-            padding: 0;
-        }
-        .container {
-            width: 100%;
-            padding: 0;
-            background: #fff;
-        }
-        .header {
-            text-align: center;
-            margin-bottom: 24px;
-            border-bottom: 2px solid #4CAF50;
-            padding-bottom: 12px;
-            position: relative;
-        }
-        .title {
-            font-size: 22pt;
-            font-weight: bold;
-            color: #4CAF50;
-            margin: 0;
-        }
-        .photo {
-            position: absolute;
-            top: 0;
-            right: 0;
-            width: 90px;
-            height: 90px;
-            object-fit: cover;
-            border: 1px solid #4CAF50;
-            border-radius: 8px;
-        }
-        .section {
-            margin-bottom: 32px; /* Espacement augmenté entre les sections */
-        }
-        .section-title {
-            font-size: 15pt;
-            font-weight: bold;
-            color: #4CAF50;
-            margin-bottom: 18px; /* Espacement sous le titre de section */
-            border-bottom: 1px solid #4CAF50;
-            padding-bottom: 2px;
-        }
-        table {
-            width: 100%;
-            border-collapse: collapse;
-            margin-bottom: 8px;
-        }
-        th, td {
-            border: 1px solid #bbb;
-            padding: 6px 8px;
-            text-align: left;
-        }
-        th {
-            background: #f3f3f3;
-            font-weight: bold;
-        }
-        tr:nth-child(even) {
-            background: #fafafa;
-        }
-        .label-cell {
-            font-weight: bold;
-            width: 30%;
-            background: #f3f3f3;
-        }
-        .value-cell {
-            width: 70%;
-        }
-        .signature {
-            margin-top: 30px;
-            text-align: right;
-            font-style: italic;
-            color: #555;
-        }
-        .signature-text {
-            font-weight: bold;
-            color: #333;
-        }
-        .subsection-title {
-            font-size: 12pt;
-            color: #333;
-            margin: 8px 0 4px 0;
-            font-weight: bold;
-        }
+      @page {
+        size: A4;
+        margin: 1.5cm 2cm;
+      }
+      body {
+        font-family: "Helvetica", "Arial", sans-serif;
+        font-size: 10pt;
+        color: #1e293b;
+        background: #fff;
+        margin: 0;
+        padding: 0;
+        line-height: 1.4;
+      }
+
+      /* ── Header ── */
+      .header-table {
+        width: 100%;
+        border: none;
+        margin-bottom: 16px;
+      }
+      .header-table td {
+        border: none;
+        padding: 0;
+        vertical-align: middle;
+      }
+      .header-left {
+        width: 80%;
+      }
+      .header-right {
+        width: 20%;
+        text-align: right;
+      }
+      .school-name {
+        font-size: 10pt;
+        color: #64748b;
+        margin: 0 0 4px 0;
+        letter-spacing: 0.5px;
+      }
+      .title {
+        font-size: 20pt;
+        font-weight: bold;
+        color: #064e3b;
+        margin: 0 0 2px 0;
+      }
+      .subtitle {
+        font-size: 11pt;
+        color: #059669;
+        margin: 0;
+        font-weight: normal;
+      }
+      .header-line {
+        border: none;
+        border-top: 3px solid #059669;
+        margin: 12px 0 20px 0;
+      }
+      .photo {
+        width: 80px;
+        height: 80px;
+        object-fit: cover;
+        border: 2px solid #059669;
+        border-radius: 4px;
+      }
+
+      /* ── Sections ── */
+      .section {
+        margin-bottom: 20px;
+      }
+      .section-header {
+        background-color: #059669;
+        color: #ffffff;
+        font-size: 11pt;
+        font-weight: bold;
+        padding: 6px 12px;
+        margin-bottom: 0;
+        letter-spacing: 0.5px;
+        border-radius: 2px 2px 0 0;
+      }
+      .subsection-title {
+        font-size: 10pt;
+        color: #064e3b;
+        font-weight: bold;
+        padding: 6px 0 2px 0;
+        margin: 8px 0 4px 0;
+        border-bottom: 1px solid #d1d5db;
+      }
+
+      /* ── Tables ── */
+      table.data {
+        width: 100%;
+        border-collapse: collapse;
+        margin-bottom: 4px;
+      }
+      table.data td {
+        padding: 5px 8px;
+        border: 1px solid #e2e8f0;
+        font-size: 10pt;
+        vertical-align: top;
+      }
+      table.data .label {
+        font-weight: bold;
+        color: #064e3b;
+        background-color: #f0fdf4;
+        width: 25%;
+        white-space: nowrap;
+      }
+      table.data .value {
+        color: #1e293b;
+        width: 25%;
+      }
+
+      /* ── Paiement ── */
+      table.payment {
+        width: 100%;
+        border-collapse: collapse;
+      }
+      table.payment td {
+        padding: 5px 8px;
+        border: 1px solid #e2e8f0;
+        font-size: 10pt;
+      }
+      table.payment .label {
+        font-weight: bold;
+        color: #064e3b;
+        background-color: #f0fdf4;
+        width: 35%;
+      }
+      table.payment .value {
+        width: 65%;
+      }
+
+      /* ── Footer / Signature ── */
+      .signature-block {
+        margin-top: 24px;
+        padding: 10px 12px;
+        background-color: #f8fafc;
+        border: 1px solid #e2e8f0;
+        border-radius: 2px;
+      }
+      .signature-block p {
+        margin: 0;
+        font-size: 10pt;
+        color: #475569;
+      }
+      .signature-date {
+        font-weight: bold;
+        color: #064e3b;
+      }
+      .footer-line {
+        border: none;
+        border-top: 2px solid #059669;
+        margin: 20px 0 8px 0;
+      }
+      .footer-text {
+        text-align: center;
+        font-size: 8pt;
+        color: #94a3b8;
+      }
     </style>
-</head>
-<body>
+  </head>
+  <body>
     {% load myTemplateTag %}
-    <div class="container">
-        <!-- Header Section -->
-        <div class="header">
-            <h1 class="title">Fiche élève de {{ student.last_name }} {{ student.first_name }}</h1>
-            {% if student.photo %}
-            <img src="{{ student.get_photo_url }}" alt="Photo de l'élève" class="photo" />
-            {% else %}
-            <img src="/static/img/default-photo.jpg" alt="Photo par défaut" class="photo" />
-            {% endif %}
-        </div>
 
-        <!-- Élève -->
-        <div class="section">
-            <div class="section-title">ÉLÈVE</div>
-            <table>
-                <tr>
-                    <td class="label-cell">Nom</td>
-                    <td class="value-cell">{{ student.last_name }}</td>
-                    <td class="label-cell">Prénom</td>
-                    <td class="value-cell">{{ student.first_name }}</td>
-                </tr>
-                <tr>
-                    <td class="label-cell">Adresse</td>
-                    <td class="value-cell" colspan="3">{{ student.address }}</td>
-                </tr>
-                <tr>
-                    <td class="label-cell">Genre</td>
-                    <td class="value-cell">{{ student|getStudentGender }}</td>
-                    <td class="label-cell">Né(e) le</td>
-                    <td class="value-cell">{{ student.birth_date }}</td>
-                </tr>
-                <tr>
-                    <td class="label-cell">À</td>
-                    <td class="value-cell">{{ student.birth_place }} ({{ student.birth_postal_code }})</td>
-                    <td class="label-cell">Nationalité</td>
-                    <td class="value-cell">{{ student.nationality }}</td>
-                </tr>
-                <tr>
-                    <td class="label-cell">Niveau</td>
-                    <td class="value-cell">{{ student|getStudentLevel }}</td>
-                    <td class="label-cell"></td>
-                    <td class="value-cell"></td>
-                </tr>
-            </table>
-        </div>
+    <!-- ═══════ HEADER ═══════ -->
+    <table class="header-table">
+      <tr>
+        <td class="header-left">
+          {% if establishment %}
+          <p class="school-name">{{ establishment.name }}</p>
+          {% endif %}
+          <h1 class="title">Fiche &Eacute;l&egrave;ves</h1>
+          <!-- prettier-ignore -->
+          <p class="subtitle">{{ student.last_name }} {{ student.first_name }}{% if school_year %} — {{ school_year }}{% endif %}</p>
+        </td>
+        <td class="header-right">
+          {% if student.photo %}
+          <img src="{{ student.get_photo_url }}" alt="Photo" class="photo" />
+          {% endif %}
+        </td>
+      </tr>
+    </table>
+    <hr class="header-line" />
 
-        <!-- Responsables -->
-        <div class="section">
-            <div class="section-title">RESPONSABLES</div>
-            {% for guardian in student.getGuardians %}
-            <div>
-                <div class="subsection-title">Responsable {{ forloop.counter }}</div>
-                <table>
-                    <tr>
-                        <td class="label-cell">Nom</td>
-                        <td class="value-cell">{{ guardian.last_name }}</td>
-                        <td class="label-cell">Prénom</td>
-                        <td class="value-cell">{{ guardian.first_name }}</td>
-                    </tr>
-                    <tr>
-                        <td class="label-cell">Adresse</td>
-                        <td class="value-cell" colspan="3">{{ guardian.address }}</td>
-                    </tr>
-                    <tr>
-                        <td class="label-cell">Email</td>
-                        <td class="value-cell" colspan="3">{{ guardian.email }}</td>
-                    </tr>
-                    <tr>
-                        <td class="label-cell">Né(e) le</td>
-                        <td class="value-cell">{{ guardian.birth_date }}</td>
-                        <td class="label-cell">Téléphone</td>
-                        <td class="value-cell">{{ guardian.phone|phone_format }}</td>
-                    </tr>
-                    <tr>
-                        <td class="label-cell">Profession</td>
-                        <td class="value-cell" colspan="3">{{ guardian.profession }}</td>
-                    </tr>
-                </table>
-            </div>
-            {% endfor %}
-        </div>
-
-        <!-- Fratrie -->
-        <div class="section">
-            <div class="section-title">FRATRIE</div>
-            {% for sibling in student.getSiblings %}
-            <div>
-                <div class="subsection-title">Frère/Soeur {{ forloop.counter }}</div>
-                <table>
-                    <tr>
-                        <td class="label-cell">Nom</td>
-                        <td class="value-cell">{{ sibling.last_name }}</td>
-                        <td class="label-cell">Prénom</td>
-                        <td class="value-cell">{{ sibling.first_name }}</td>
-                    </tr>
-                    <tr>
-                        <td class="label-cell">Né(e) le</td>
-                        <td class="value-cell" colspan="3">{{ sibling.birth_date }}</td>
-                    </tr>
-                </table>
-            </div>
-            {% endfor %}
-        </div>
-
-        <!-- Paiement -->
-        <div class="section">
-            <div class="section-title">MODALITÉS DE PAIEMENT</div>
-            <table>
-                <tr>
-                    <td class="label-cell">Frais d'inscription</td>
-                    <td class="value-cell">{{ student|getRegistrationPaymentMethod }} en {{ student|getRegistrationPaymentPlan }}</td>
-                </tr>
-                <tr>
-                    <td class="label-cell">Frais de scolarité</td>
-                    <td class="value-cell">{{ student|getTuitionPaymentMethod }} en {{ student|getTuitionPaymentPlan }}</td>
-                </tr>
-            </table>
-        </div>
-
-        <!-- Signature -->
-        <div class="signature">
-            Fait le <span class="signature-text">{{ signatureDate }}</span> à <span class="signature-text">{{ signatureTime }}</span>
-        </div>
+    <!-- ═══════ ÉLÈVE ═══════ -->
+    <div class="section">
+      <div class="section-header">INFORMATIONS DE L'ÉLÈVE</div>
+      <table class="data">
+        <tr>
+          <td class="label">Nom</td>
+          <td class="value">{{ student.last_name }}</td>
+          <td class="label">Prénom</td>
+          <td class="value">{{ student.first_name }}</td>
+        </tr>
+        <tr>
+          <td class="label">Genre</td>
+          <td class="value">{{ student|getStudentGender }}</td>
+          <td class="label">Niveau</td>
+          <td class="value">{{ student|getStudentLevel }}</td>
+        </tr>
+        <tr>
+          <td class="label">Date de naissance</td>
+          <td class="value">{{ student.formatted_birth_date }}</td>
+          <td class="label">Lieu de naissance</td>
+          <!-- prettier-ignore -->
+          <td class="value">{{ student.birth_place }}{% if student.birth_postal_code %} ({{ student.birth_postal_code }}){% endif %}</td>
+        </tr>
+        <tr>
+          <td class="label">Nationalité</td>
+          <td class="value">{{ student.nationality }}</td>
+          <td class="label">Médecin traitant</td>
+          <td class="value">{{ student.attending_physician }}</td>
+        </tr>
+        <tr>
+          <td class="label">Adresse</td>
+          <td class="value" colspan="3">{{ student.address }}</td>
+        </tr>
+      </table>
     </div>
-</body>
-</html>
+
+    <!-- ═══════ RESPONSABLES ═══════ -->
+    <div class="section">
+      <div class="section-header">RESPONSABLES LÉGAUX</div>
+      {% for guardian in student.getGuardians %}
+      <div class="subsection-title">Responsable {{ forloop.counter }}</div>
+      <table class="data">
+        <tr>
+          <td class="label">Nom</td>
+          <td class="value">{{ guardian.last_name }}</td>
+          <td class="label">Prénom</td>
+          <td class="value">{{ guardian.first_name }}</td>
+        </tr>
+        <tr>
+          <td class="label">Date de naissance</td>
+          <td class="value">{{ guardian.birth_date }}</td>
+          <td class="label">Téléphone</td>
+          <td class="value">{{ guardian.phone|phone_format }}</td>
+        </tr>
+        <tr>
+          <td class="label">Email</td>
+          <td class="value" colspan="3">{{ guardian.email }}</td>
+        </tr>
+        <tr>
+          <td class="label">Adresse</td>
+          <td class="value" colspan="3">{{ guardian.address }}</td>
+        </tr>
+        <tr>
+          <td class="label">Profession</td>
+          <td class="value" colspan="3">{{ guardian.profession }}</td>
+        </tr>
+      </table>
+      {% empty %}
+      <p style="color: #94a3b8; font-style: italic; padding: 8px">
+        Aucun responsable renseigné.
+      </p>
+      {% endfor %}
+    </div>
+
+    <!-- ═══════ FRATRIE ═══════ -->
+    {% if student.getSiblings %}
+    <div class="section">
+      <div class="section-header">FRATRIE</div>
+      {% for sibling in student.getSiblings %}
+      <div class="subsection-title">Frère / Sœur {{ forloop.counter }}</div>
+      <table class="data">
+        <tr>
+          <td class="label">Nom</td>
+          <td class="value">{{ sibling.last_name }}</td>
+          <td class="label">Prénom</td>
+          <td class="value">{{ sibling.first_name }}</td>
+        </tr>
+        <tr>
+          <td class="label">Date de naissance</td>
+          <td class="value" colspan="3">{{ sibling.birth_date }}</td>
+        </tr>
+      </table>
+      {% endfor %}
+    </div>
+    {% endif %}
+
+    <!-- ═══════ PAIEMENT ═══════ -->
+    <div class="section">
+      <div class="section-header">MODALITÉS DE PAIEMENT</div>
+      <table class="payment">
+        <tr>
+          <td class="label">Frais d'inscription</td>
+          <!-- prettier-ignore -->
+          <td class="value">{{ student|getRegistrationPaymentMethod }} — {{ student|getRegistrationPaymentPlan }}</td>
+        </tr>
+        <tr>
+          <td class="label">Frais de scolarité</td>
+          <!-- prettier-ignore -->
+          <td class="value">{{ student|getTuitionPaymentMethod }} — {{ student|getTuitionPaymentPlan }}</td>
+        </tr>
+      </table>
+    </div>
+
+    <!-- ═══════ SIGNATURE ═══════ -->
+    <div class="signature-block">
+      <p>
+        Document généré le
+        <span class="signature-date">{{ signatureDate }}</span> à
+        <span class="signature-date">{{ signatureTime }}</span>
+      </p>
+    </div>
+
+    <hr class="footer-line" />
+    <p class="footer-text">
+      Ce document est généré automatiquement et fait office de fiche
+      d'inscription.
+    </p>
+  </body>
+</html>

Back-End/Subscriptions/urls.py

@@ -3,16 +3,16 @@ from django.urls import path, re_path
 from . import views
 
 # RF
-from .views import RegisterFormView, RegisterFormWithIdView, send, resend, archive
+from .views import RegisterFormView, RegisterFormWithIdView, send, resend, archive, generate_registration_pdf
 # SubClasses
 from .views import StudentView, GuardianView, ChildrenListView, StudentListView, DissociateGuardianView
 # Files
 from .views import (
-    RegistrationSchoolFileMasterView, 
-    RegistrationSchoolFileMasterSimpleView, 
-    RegistrationSchoolFileTemplateView, 
-    RegistrationSchoolFileTemplateSimpleView, 
-    RegistrationParentFileMasterSimpleView, 
+    RegistrationSchoolFileMasterView,
+    RegistrationSchoolFileMasterSimpleView,
+    RegistrationSchoolFileTemplateView,
+    RegistrationSchoolFileTemplateSimpleView,
+    RegistrationParentFileMasterSimpleView,
     RegistrationParentFileMasterView,
     RegistrationParentFileTemplateSimpleView,
     RegistrationParentFileTemplateView,
@@ -25,11 +25,12 @@ from .views import (
 
 from .views import RegistrationFileGroupView, RegistrationFileGroupSimpleView, get_registration_files_by_group
 from .views import (
-    get_school_file_templates_by_rf, 
+    get_school_file_templates_by_rf,
     get_parent_file_templates_by_rf
 )
 
 urlpatterns = [
+    re_path(r'^registerForms/(?P<id>[0-9]+)/pdf$', generate_registration_pdf, name="generate_registration_pdf"),
     re_path(r'^registerForms/(?P<id>[0-9]+)/archive$', archive, name="archive"),
     re_path(r'^registerForms/(?P<id>[0-9]+)/resend$', resend, name="resend"),
     re_path(r'^registerForms/(?P<id>[0-9]+)/send$', send, name="send"),
@@ -52,7 +53,7 @@ urlpatterns = [
     re_path(r'^registrationFileGroups/(?P<id>[0-9]+)$', RegistrationFileGroupSimpleView.as_view(), name='registrationFileGroupDetail'),
     re_path(r'^registrationFileGroups/(?P<id>[0-9]+)/templates$', get_registration_files_by_group, name="get_registration_files_by_group"),
     re_path(r'^registrationFileGroups$', RegistrationFileGroupView.as_view(), name='registrationFileGroups'),
-    
+
     re_path(r'^registrationSchoolFileMasters/(?P<id>[0-9]+)$', RegistrationSchoolFileMasterSimpleView.as_view(), name='registrationSchoolFileMasters'),
     re_path(r'^registrationSchoolFileMasters$', RegistrationSchoolFileMasterView.as_view(), name='registrationSchoolFileMasters'),
 

Back-End/Subscriptions/util.py

@@ -8,18 +8,22 @@ from N3wtSchool import renderers
 from N3wtSchool import bdd
 
 from io import BytesIO
+import base64
 from reportlab.pdfgen import canvas
 from reportlab.lib.pagesizes import A4
+from reportlab.lib.utils import ImageReader
+from reportlab.graphics import renderPDF
 from django.core.files.base import ContentFile
 from django.core.files import File
 from pathlib import Path
 import os
 from enum import Enum
+from urllib.parse import unquote_to_bytes
 
 import random
 import string
 from rest_framework.parsers import JSONParser
-from PyPDF2 import PdfMerger, PdfReader
+from PyPDF2 import PdfMerger, PdfReader, PdfWriter
 from PyPDF2.errors import PdfReadError
 
 import shutil
@@ -29,14 +33,84 @@ import json
 from django.http import QueryDict
 from rest_framework.response import Response
 from rest_framework import status
+from svglib.svglib import svg2rlg
 
 logger = logging.getLogger(__name__)
 
+
+def _draw_signature_data_url(cnv, data_url, x, y, width, height):
+    """
+    Dessine une signature issue d'un data URL dans un canvas ReportLab.
+    Supporte les images raster (PNG/JPEG/...) et SVG.
+    Retourne True si la signature a pu etre dessinee.
+    """
+    if not isinstance(data_url, str) or not data_url.startswith("data:image"):
+        return False
+
+    try:
+        header, payload = data_url.split(',', 1)
+    except ValueError:
+        return False
+
+    is_base64 = ';base64' in header
+    mime_type = header.split(':', 1)[1].split(';', 1)[0] if ':' in header else ''
+
+    try:
+        raw_bytes = base64.b64decode(payload) if is_base64 else unquote_to_bytes(payload)
+    except Exception as e:
+        logger.error(f"[_draw_signature_data_url] Decodage impossible: {e}")
+        return False
+
+    # Support SVG via svglib (deja present dans requirements)
+    if mime_type == 'image/svg+xml':
+        try:
+            drawing = svg2rlg(BytesIO(raw_bytes))
+            if drawing is None:
+                return False
+
+            src_w = float(getattr(drawing, 'width', 0) or 0)
+            src_h = float(getattr(drawing, 'height', 0) or 0)
+            if src_w <= 0 or src_h <= 0:
+                return False
+
+            scale = min(width / src_w, height / src_h)
+            draw_w = src_w * scale
+            draw_h = src_h * scale
+            offset_x = x + (width - draw_w) / 2
+            offset_y = y + (height - draw_h) / 2
+
+            cnv.saveState()
+            cnv.translate(offset_x, offset_y)
+            cnv.scale(scale, scale)
+            renderPDF.draw(drawing, cnv, 0, 0)
+            cnv.restoreState()
+            return True
+        except Exception as e:
+            logger.error(f"[_draw_signature_data_url] Rendu SVG impossible: {e}")
+            return False
+
+    # Support images raster classiques
+    try:
+        img_reader = ImageReader(BytesIO(raw_bytes))
+        cnv.drawImage(
+            img_reader,
+            x,
+            y,
+            width=width,
+            height=height,
+            preserveAspectRatio=True,
+            mask='auto',
+        )
+        return True
+    except Exception as e:
+        logger.error(f"[_draw_signature_data_url] Rendu raster impossible: {e}")
+        return False
+
 def save_file_replacing_existing(file_field, filename, content, save=True):
     """
     Sauvegarde un fichier en écrasant l'existant s'il porte le même nom.
     Évite les suffixes automatiques Django (ex: fichier_N5QdZpk.pdf).
-    
+
     Args:
         file_field: Le FileField Django (ex: registerForm.registration_file)
         filename: Le nom du fichier à sauvegarder
@@ -51,10 +125,46 @@ def save_file_replacing_existing(file_field, filename, content, save=True):
                 logger.debug(f"[save_file] Ancien fichier supprimé: {file_field.path}")
         except Exception as e:
             logger.error(f"[save_file] Erreur suppression ancien fichier: {e}")
-    
+
     # Sauvegarder le nouveau fichier
     file_field.save(filename, content, save=save)
 
+def save_file_field_without_suffix(instance, field_name, filename, content, save=False):
+    """
+    Sauvegarde un fichier dans un FileField Django en ecrasant le precedent,
+    sans laisser Django generer de suffixe (_abc123).
+
+    Args:
+        instance: instance Django portant le FileField
+        field_name: nom du FileField (ex: 'file')
+        filename: nom de fichier cible (basename)
+        content: contenu fichier (ContentFile, File, etc.)
+        save: si True, persiste immediatement l'instance
+    """
+    file_field = getattr(instance, field_name)
+    field = instance._meta.get_field(field_name)
+    storage = file_field.storage
+
+    target_name = field.generate_filename(instance, filename)
+
+    # Supprimer le fichier actuellement reference si different
+    if file_field and file_field.name and file_field.name != target_name:
+        try:
+            if storage.exists(file_field.name):
+                storage.delete(file_field.name)
+        except Exception as e:
+            logger.error(f"[save_file_field_without_suffix] Erreur suppression ancien fichier ({file_field.name}): {e}")
+
+    # Supprimer explicitement la cible si elle existe deja
+    try:
+        if storage.exists(target_name):
+            storage.delete(target_name)
+    except Exception as e:
+        logger.error(f"[save_file_field_without_suffix] Erreur suppression cible ({target_name}): {e}")
+
+    # Sauvegarde: la cible n'existe plus, donc pas de suffixe
+    file_field.save(filename, content, save=save)
+
 def build_payload_from_request(request):
     """
     Normalise la request en payload prêt à être donné au serializer.
@@ -194,6 +304,91 @@ def create_templates_for_registration_form(register_form):
         base_slug = (m.name or "master").strip().replace(" ", "_")[:40]
         slug = f"{base_slug}_{register_form.pk}_{m.pk}"
 
+        is_dynamic_master = (
+            isinstance(m.formMasterData, dict)
+            and bool(m.formMasterData.get("fields"))
+        )
+
+        # Formulaire dynamique: toujours générer le PDF final depuis le JSON
+        # (aperçu admin) au lieu de copier le fichier source brut (PNG/PDF).
+        if is_dynamic_master:
+            base_pdf_content = None
+            base_file_ext = None
+            if m.file and hasattr(m.file, 'name') and m.file.name:
+                base_file_ext = os.path.splitext(m.file.name)[1].lower()
+                try:
+                    m.file.open('rb')
+                    base_pdf_content = m.file.read()
+                    m.file.close()
+                except Exception as e:
+                    logger.error(f"Erreur lecture fichier source master dynamique: {e}")
+
+            try:
+                generated_pdf = generate_form_json_pdf(
+                    register_form,
+                    m.formMasterData,
+                    base_pdf_content=base_pdf_content,
+                    base_file_ext=base_file_ext,
+                )
+            except Exception as e:
+                logger.error(f"Erreur génération PDF dynamique pour template: {e}")
+                generated_pdf = None
+
+            if tmpl:
+                try:
+                    if tmpl.file and tmpl.file.name:
+                        tmpl.file.delete(save=False)
+                except Exception:
+                    logger.exception("Erreur suppression ancien fichier template dynamique %s", getattr(tmpl, "pk", None))
+
+                tmpl.name = m.name or ""
+                tmpl.slug = slug
+                tmpl.formTemplateData = m.formMasterData or []
+                if generated_pdf is not None:
+                    output_filename = os.path.basename(generated_pdf.name)
+                    save_file_field_without_suffix(
+                        tmpl,
+                        'file',
+                        output_filename,
+                        generated_pdf,
+                        save=False,
+                    )
+                tmpl.save()
+                created.append(tmpl)
+                logger.info(
+                    "util.create_templates_for_registration_form - Regenerated dynamic school template %s from master %s for RF %s",
+                    tmpl.pk,
+                    m.pk,
+                    register_form.pk,
+                )
+                continue
+
+            tmpl = RegistrationSchoolFileTemplate(
+                master=m,
+                registration_form=register_form,
+                name=m.name or "",
+                formTemplateData=m.formMasterData or [],
+                slug=slug,
+            )
+            if generated_pdf is not None:
+                output_filename = os.path.basename(generated_pdf.name)
+                save_file_field_without_suffix(
+                    tmpl,
+                    'file',
+                    output_filename,
+                    generated_pdf,
+                    save=False,
+                )
+            tmpl.save()
+            created.append(tmpl)
+            logger.info(
+                "util.create_templates_for_registration_form - Created dynamic school template %s from master %s for RF %s",
+                tmpl.pk,
+                m.pk,
+                register_form.pk,
+            )
+            continue
+
         file_name = None
         if m.file and hasattr(m.file, 'name') and m.file.name:
             file_name = os.path.basename(m.file.name)
@@ -207,19 +402,21 @@ def create_templates_for_registration_form(register_form):
                 logger.error(f"Erreur lors de la génération du PDF pour le template: {e}")
                 file_name = None
 
-        from django.core.files.base import ContentFile
-        upload_rel_path = registration_school_file_upload_to(
-            type("Tmp", (), {
-                "registration_form": register_form,
-                "establishment": getattr(register_form, "establishment", None),
-                "student": getattr(register_form, "student", None)
-            })(),
-            file_name
-        )
-        abs_path = os.path.join(settings.MEDIA_ROOT, upload_rel_path)
         master_file_path = m.file.path if m.file and hasattr(m.file, 'path') else None
 
+        def _build_upload_path(template_pk):
+            """Génère le chemin relatif et absolu pour un template avec un pk connu."""
+            rel = registration_school_file_upload_to(
+                type("Tmp", (), {
+                    "registration_form": register_form,
+                    "pk": template_pk,
+                })(),
+                file_name,
+            )
+            return rel, os.path.join(settings.MEDIA_ROOT, rel)
+
         if tmpl:
+            upload_rel_path, abs_path = _build_upload_path(tmpl.pk)
             template_file_name = os.path.basename(tmpl.file.name) if tmpl.file and tmpl.file.name else None
             master_file_changed = template_file_name != file_name
             # --- GESTION FORM EXISTANT : suppression ancien template si nom ou contenu master changé ---
@@ -254,7 +451,7 @@ def create_templates_for_registration_form(register_form):
             logger.info("util.create_templates_for_registration_form - Mise à jour school template %s from master %s for RF %s", tmpl.pk, m.pk, register_form.pk)
             continue
 
-        # Sinon, création du template comme avant
+        # Sinon, création du template — sauvegarder d'abord pour obtenir un pk
         tmpl = RegistrationSchoolFileTemplate(
             master=m,
             registration_form=register_form,
@@ -262,8 +459,10 @@ def create_templates_for_registration_form(register_form):
             formTemplateData=m.formMasterData or [],
             slug=slug,
         )
+        tmpl.save()  # pk attribué ici
         if file_name:
-            # Copier le fichier du master si besoin (form existant)
+            upload_rel_path, abs_path = _build_upload_path(tmpl.pk)
+            # Copier le fichier du master si besoin
             if master_file_path and not os.path.exists(abs_path):
                 try:
                     import shutil
@@ -273,7 +472,7 @@ def create_templates_for_registration_form(register_form):
                 except Exception as e:
                     logger.error(f"Erreur lors de la copie du fichier master pour le template: {e}")
             tmpl.file.name = upload_rel_path
-        tmpl.save()
+            tmpl.save()
         created.append(tmpl)
         logger.info("util.create_templates_for_registration_form - Created school template %s from master %s for RF %s", tmpl.pk, m.pk, register_form.pk)
 
@@ -453,6 +652,8 @@ def rfToPDF(registerForm, filename):
         'signatureDate': convertToStr(_now(), '%d-%m-%Y'),
         'signatureTime': convertToStr(_now(), '%H:%M'),
         'student': registerForm.student,
+        'establishment': registerForm.establishment,
+        'school_year': registerForm.school_year,
     }
 
     # Générer le PDF
@@ -474,6 +675,24 @@ def rfToPDF(registerForm, filename):
 
     return registerForm.registration_file
 
+def generateRegistrationPDF(registerForm):
+    """
+    Génère le PDF d'un dossier d'inscription à la volée et retourne le contenu binaire.
+    Ne sauvegarde pas le fichier sur disque.
+    """
+    data = {
+        'pdf_title': f"Dossier d'inscription de {registerForm.student.first_name}",
+        'signatureDate': convertToStr(_now(), '%d-%m-%Y'),
+        'signatureTime': convertToStr(_now(), '%H:%M'),
+        'student': registerForm.student,
+        'establishment': registerForm.establishment,
+        'school_year': registerForm.school_year,
+    }
+    pdf = renderers.render_to_pdf('pdfs/fiche_eleve.html', data)
+    if not pdf:
+        raise ValueError("Erreur lors de la génération du PDF.")
+    return pdf.content
+
 def delete_registration_files(registerForm):
     """
     Supprime le fichier et le dossier associés à un RegistrationForm.
@@ -527,55 +746,196 @@ def getHistoricalYears(count=5):
 
     return historical_years
 
-def generate_form_json_pdf(register_form, form_json):
+def generate_form_json_pdf(register_form, form_json, base_pdf_content=None, base_file_ext=None, base_pdf_path=None):
     """
-    Génère un PDF du rendu du formulaire dynamique à partir du JSON (formConfig)
-    et l'associe au RegistrationSchoolFileTemplate.
-    Le PDF contient le titre, les labels et types de champs.
-    Retourne un ContentFile prêt à être utilisé dans un FileField, avec uniquement le nom du fichier.
+    Génère un PDF composite du formulaire dynamique:
+    - le document source uploadé (PDF/image) si présent,
+    - puis un rendu du formulaire (similaire à l'aperçu),
+    - avec overlay de signature(s) sur la dernière page du document source.
     """
 
-    # Récupérer le nom du formulaire
     form_name = (form_json.get("title") or "formulaire").strip().replace(" ", "_")
     filename = f"{form_name}.pdf"
+    fields = form_json.get("fields", []) if isinstance(form_json, dict) else []
 
-    # Générer le PDF
-    buffer = BytesIO()
-    c = canvas.Canvas(buffer, pagesize=A4)
-    y = 800
+    # Compatibilité ascendante : charger depuis un chemin si nécessaire
+    if base_pdf_content is None and base_pdf_path and os.path.exists(base_pdf_path):
+        base_file_ext = os.path.splitext(base_pdf_path)[1].lower()
+        try:
+            with open(base_pdf_path, 'rb') as f:
+                base_pdf_content = f.read()
+        except Exception as e:
+            logger.error(f"[generate_form_json_pdf] Lecture fichier source: {e}")
 
-    # Titre
-    c.setFont("Helvetica-Bold", 20)
-    c.drawString(100, y, form_json.get("title", "Formulaire"))
-    y -= 40
+    writer = PdfWriter()
+    has_source_document = False
+    source_is_image = False
+    source_image_reader = None
+    source_image_size = None
 
-    # Champs
-    c.setFont("Helvetica", 12)
-    fields = form_json.get("fields", [])
+    # 1) Charger le document source (PDF/image) si présent
+    if base_pdf_content:
+        try:
+            image_exts = {'.png', '.jpg', '.jpeg', '.gif', '.bmp', '.tiff', '.webp'}
+            ext = (base_file_ext or '').lower()
+
+            if ext in image_exts:
+                # Pour les images, on les rend dans la section [fichier uploade]
+                # au lieu de les ajouter comme page source separee.
+                img_buffer = BytesIO(base_pdf_content)
+                source_image_reader = ImageReader(img_buffer)
+                source_image_size = source_image_reader.getSize()
+                source_is_image = True
+            else:
+                source_reader = PdfReader(BytesIO(base_pdf_content))
+                for page in source_reader.pages:
+                    writer.add_page(page)
+                has_source_document = len(source_reader.pages) > 0
+        except Exception as e:
+            logger.error(f"[generate_form_json_pdf] Erreur chargement source: {e}")
+
+    # 2) Overlay des signatures sur la dernière page du document source
+    # Desactive ici pour eviter les doublons: la signature est rendue
+    # dans la section JSON du formulaire (et non plus en overlay source).
+    signatures = []
     for field in fields:
-        label = field.get("label", field.get("id", ""))
-        ftype = field.get("type", "")
-        value = field.get("value", "")
-        # Afficher la valeur si elle existe
-        if value not in (None, ""):
-            c.drawString(100, y, f"{label} [{ftype}] : {value}")
-        else:
-            c.drawString(100, y, f"{label} [{ftype}]")
-        y -= 25
-        if y < 100:
-            c.showPage()
-            y = 800
+        if field.get("type") == "signature":
+            value = field.get("value")
+            if isinstance(value, str) and value.startswith("data:image"):
+                signatures.append(value)
 
-    c.save()
-    buffer.seek(0)
-    pdf_content = buffer.read()
+    enable_source_signature_overlay = False
+    if signatures and len(writer.pages) > 0 and enable_source_signature_overlay:
+        try:
+            target_page = writer.pages[len(writer.pages) - 1]
+            page_width = float(target_page.mediabox.width)
+            page_height = float(target_page.mediabox.height)
 
-    # Si un fichier existe déjà sur le template, le supprimer (optionnel, à adapter selon usage)
-    if hasattr(register_form, "registration_file") and register_form.registration_file and register_form.registration_file.name:
-        existing_file_path = os.path.join(settings.MEDIA_ROOT, register_form.registration_file.name.lstrip('/'))
-        if os.path.exists(existing_file_path):
-            os.remove(existing_file_path)
-            register_form.registration_file.delete(save=False)
+            packet = BytesIO()
+            c_overlay = canvas.Canvas(packet, pagesize=(page_width, page_height))
 
-    # Retourner le ContentFile avec uniquement le nom du fichier
-    return ContentFile(pdf_content, name=os.path.basename(filename))
+            sig_width = 170
+            sig_height = 70
+            margin = 36
+            spacing = 10
+
+            for i, data_url in enumerate(signatures[:3]):
+                try:
+                    x = page_width - sig_width - margin
+                    y = margin + i * (sig_height + spacing)
+                    _draw_signature_data_url(c_overlay, data_url, x, y, sig_width, sig_height)
+                except Exception as e:
+                    logger.error(f"[generate_form_json_pdf] Signature ignorée: {e}")
+
+            c_overlay.save()
+            packet.seek(0)
+            overlay_pdf = PdfReader(packet)
+            if overlay_pdf.pages:
+                target_page.merge_page(overlay_pdf.pages[0])
+        except Exception as e:
+            logger.error(f"[generate_form_json_pdf] Erreur overlay signature: {e}")
+
+    # 3) Rendu JSON explicite du formulaire final (toujours genere).
+    # Cela garantit la presence des sections H1 / FileUpload / Signature
+    # dans le PDF final, meme si un document source est fourni.
+    fields_to_render = fields
+
+    if fields_to_render:
+        layout_buffer = BytesIO()
+        c = canvas.Canvas(layout_buffer, pagesize=A4)
+        y = 800
+
+        c.setFont("Helvetica-Bold", 18)
+        c.drawString(60, y, form_json.get("title", "Formulaire"))
+        y -= 35
+
+        c.setFont("Helvetica", 11)
+        for field in fields_to_render:
+            ftype = field.get("type", "")
+            if ftype in {"heading1", "heading2", "heading3", "heading4", "heading5", "heading6", "paragraph"}:
+                text = field.get("text", "")
+                if text:
+                    c.setFont("Helvetica-Bold" if ftype.startswith("heading") else "Helvetica", 11)
+                    c.drawString(60, y, text[:120])
+                    y -= 18
+                    c.setFont("Helvetica", 11)
+                continue
+
+            label = field.get("label", field.get("id", "Champ"))
+            value = field.get("value", "")
+
+            if ftype == "file":
+                c.drawString(60, y, f"{label}")
+                y -= 18
+
+                if source_is_image and source_image_reader and source_image_size:
+                    img_w, img_h = source_image_size
+                    max_w = 420
+                    max_h = 260
+                    ratio = min(max_w / img_w, max_h / img_h)
+                    draw_w = img_w * ratio
+                    draw_h = img_h * ratio
+
+                    if y - draw_h < 80:
+                        c.showPage()
+                        y = 800
+                        c.setFont("Helvetica", 11)
+
+                    c.drawImage(
+                        source_image_reader,
+                        60,
+                        y - draw_h,
+                        width=draw_w,
+                        height=draw_h,
+                        preserveAspectRatio=True,
+                        mask='auto',
+                    )
+                    y -= draw_h + 14
+            elif ftype == "signature":
+                c.drawString(60, y, f"{label}")
+                sig_drawn = False
+                if isinstance(value, str) and value.startswith("data:image"):
+                    try:
+                        sig_drawn = _draw_signature_data_url(c, value, 260, y - 55, 170, 55)
+                    except Exception as e:
+                        logger.error(f"[generate_form_json_pdf] Signature render echoue: {e}")
+                if not sig_drawn:
+                    c.rect(260, y - 55, 170, 55)
+                y -= 70
+            else:
+                if value not in (None, ""):
+                    c.drawString(60, y, f"{label} [{ftype}] : {str(value)[:120]}")
+                else:
+                    c.drawString(60, y, f"{label} [{ftype}]")
+                y -= 18
+
+            if y < 80:
+                c.showPage()
+                y = 800
+                c.setFont("Helvetica", 11)
+
+        c.save()
+        layout_buffer.seek(0)
+        try:
+            layout_reader = PdfReader(layout_buffer)
+            for page in layout_reader.pages:
+                writer.add_page(page)
+        except Exception as e:
+            logger.error(f"[generate_form_json_pdf] Erreur ajout rendu formulaire: {e}")
+
+    # 4) Fallback minimal si aucune page n'a été créée
+    if len(writer.pages) == 0:
+        fallback = BytesIO()
+        c_fb = canvas.Canvas(fallback, pagesize=A4)
+        c_fb.setFont("Helvetica-Bold", 16)
+        c_fb.drawString(60, 800, form_json.get("title", "Formulaire"))
+        c_fb.save()
+        fallback.seek(0)
+        fallback_reader = PdfReader(fallback)
+        for page in fallback_reader.pages:
+            writer.add_page(page)
+
+    out = BytesIO()
+    writer.write(out)
+    out.seek(0)
+    return ContentFile(out.read(), name=os.path.basename(filename))

Back-End/Subscriptions/views/__init__.py

@@ -1,22 +1,23 @@
 from .register_form_views import (
-    RegisterFormView, 
-    RegisterFormWithIdView, 
-    send, 
-    resend, 
-    archive, 
-    get_school_file_templates_by_rf, 
-    get_parent_file_templates_by_rf
+    RegisterFormView,
+    RegisterFormWithIdView,
+    send,
+    resend,
+    archive,
+    get_school_file_templates_by_rf,
+    get_parent_file_templates_by_rf,
+    generate_registration_pdf
 )
 from .registration_school_file_masters_views import (
-    RegistrationSchoolFileMasterView, 
+    RegistrationSchoolFileMasterView,
     RegistrationSchoolFileMasterSimpleView,
 )
 from .registration_school_file_templates_views import (
-    RegistrationSchoolFileTemplateView, 
+    RegistrationSchoolFileTemplateView,
     RegistrationSchoolFileTemplateSimpleView
 )
 from .registration_parent_file_masters_views import (
-    RegistrationParentFileMasterView, 
+    RegistrationParentFileMasterView,
     RegistrationParentFileMasterSimpleView
 )
 from .registration_parent_file_templates_views import (
@@ -48,6 +49,7 @@ __all__ = [
     'get_registration_files_by_group',
     'get_school_file_templates_by_rf',
     'get_parent_file_templates_by_rf',
+    'generate_registration_pdf',
     'StudentView',
     'StudentListView',
     'ChildrenListView',

Back-End/Subscriptions/views/register_form_views.py

@@ -1,4 +1,5 @@
 from django.http.response import JsonResponse
+from django.http import HttpResponse
 from django.views.decorators.csrf import ensure_csrf_cookie, csrf_protect
 from django.utils.decorators import method_decorator
 from rest_framework.views import APIView
@@ -365,7 +366,7 @@ class RegisterFormWithIdView(APIView):
                     student = registerForm.student
                     student_name = f"{student.first_name} {student.last_name}"
                     notes = registerForm.notes or "Aucun motif spécifié"
-                    
+
                     guardians = student.guardians.all()
                     for guardian in guardians:
                         email = None
@@ -373,13 +374,13 @@ class RegisterFormWithIdView(APIView):
                             email = guardian.profile_role.profile.email
                         if not email:
                             email = getattr(guardian, "email", None)
-                        
+
                         if email:
                             logger.info(f"[RF_SENT] Envoi email de refus à {email} pour l'élève {student_name}")
                             mailer.sendRefusDossier(email, registerForm.establishment.pk, student_name, notes)
                 except Exception as e:
                     logger.error(f"[RF_SENT] Erreur lors de l'envoi de l'email de refus: {e}")
-                
+
                 updateStateMachine(registerForm, 'EVENT_REFUSE')
                 util.delete_registration_files(registerForm)
         elif _status == RegistrationForm.RegistrationFormStatus.RF_SEPA_SENT:
@@ -411,6 +412,17 @@ class RegisterFormWithIdView(APIView):
                 # Initialisation de la liste des fichiers à fusionner
                 fileNames = []
 
+                # Régénérer la fiche élève avec le nouveau template avant fusion
+                try:
+                    base_dir = os.path.join(settings.MEDIA_ROOT, f"registration_files/dossier_rf_{registerForm.pk}")
+                    os.makedirs(base_dir, exist_ok=True)
+                    initial_pdf = f"{base_dir}/Inscription_{registerForm.student.last_name}_{registerForm.student.first_name}.pdf"
+                    registerForm.registration_file = util.rfToPDF(registerForm, initial_pdf)
+                    registerForm.save()
+                    logger.debug(f"[RF_VALIDATED] Fiche élève régénérée avant fusion")
+                except Exception as e:
+                    logger.error(f"[RF_VALIDATED] Erreur lors de la régénération de la fiche élève: {e}")
+
                 # Ajout du fichier registration_file en première position
                 if registerForm.registration_file:
                     fileNames.append(registerForm.registration_file.path)
@@ -488,7 +500,7 @@ class RegisterFormWithIdView(APIView):
                     class_name = None
                     if student.associated_class:
                         class_name = student.associated_class.atmosphere_name
-                    
+
                     guardians = student.guardians.all()
                     for guardian in guardians:
                         email = None
@@ -496,13 +508,13 @@ class RegisterFormWithIdView(APIView):
                             email = guardian.profile_role.profile.email
                         if not email:
                             email = getattr(guardian, "email", None)
-                        
+
                         if email:
                             logger.info(f"[RF_VALIDATED] Envoi email de validation à {email} pour l'élève {student_name}")
                             mailer.sendValidationDossier(email, registerForm.establishment.pk, student_name, class_name)
                 except Exception as e:
                     logger.error(f"[RF_VALIDATED] Erreur lors de l'envoi de l'email de validation: {e}")
-            
+
             # Lancer l'envoi d'email dans un thread séparé pour ne pas bloquer la réponse
             email_thread = threading.Thread(target=send_validation_emails)
             email_thread.start()
@@ -518,7 +530,7 @@ class RegisterFormWithIdView(APIView):
                         student = registerForm.student
                         student_name = f"{student.first_name} {student.last_name}"
                         notes = data.get('notes', '') or "Aucun motif spécifié"
-                        
+
                         guardians = student.guardians.all()
                         for guardian in guardians:
                             email = None
@@ -526,17 +538,17 @@ class RegisterFormWithIdView(APIView):
                                 email = guardian.profile_role.profile.email
                             if not email:
                                 email = getattr(guardian, "email", None)
-                            
+
                             if email:
                                 logger.info(f"[RF_ARCHIVED] Envoi email de refus définitif à {email} pour l'élève {student_name}")
                                 mailer.sendRefusDefinitif(email, registerForm.establishment.pk, student_name, notes)
                     except Exception as e:
                         logger.error(f"[RF_ARCHIVED] Erreur lors de l'envoi de l'email de refus définitif: {e}")
-                
+
                 # Lancer l'envoi d'email dans un thread séparé pour ne pas bloquer la réponse
                 email_thread = threading.Thread(target=send_refus_definitif_emails)
                 email_thread.start()
-            
+
             updateStateMachine(registerForm, 'EVENT_ARCHIVE')
 
         # Retourner les données mises à jour
@@ -946,3 +958,26 @@ def get_parent_file_templates_by_rf(request, id):
         return JsonResponse(serializer.data, safe=False)
     except RegistrationParentFileTemplate.DoesNotExist:
         return JsonResponse({'error': 'Aucune pièce à fournir trouvée pour ce dossier d\'inscription'}, status=status.HTTP_404_NOT_FOUND)
+
+@swagger_auto_schema(
+    method='get',
+    responses={200: openapi.Response('PDF file', schema=openapi.Schema(type=openapi.TYPE_FILE))},
+    operation_description="Génère et retourne le PDF de la fiche élève à la volée",
+    operation_summary="Télécharger la fiche élève (régénérée)"
+)
+@api_view(['GET'])
+def generate_registration_pdf(request, id):
+    try:
+        registerForm = RegistrationForm.objects.select_related('student', 'establishment').get(student__id=id)
+    except RegistrationForm.DoesNotExist:
+        return JsonResponse({"error": "Dossier d'inscription introuvable"}, status=status.HTTP_404_NOT_FOUND)
+
+    try:
+        pdf_content = util.generateRegistrationPDF(registerForm)
+    except ValueError as e:
+        return JsonResponse({"error": str(e)}, status=status.HTTP_500_INTERNAL_SERVER_ERROR)
+
+    filename = f"Inscription_{registerForm.student.last_name}_{registerForm.student.first_name}.pdf"
+    response = HttpResponse(pdf_content, content_type='application/pdf')
+    response['Content-Disposition'] = f'inline; filename="{filename}"'
+    return response

Back-End/Subscriptions/views/registration_parent_file_templates_views.py

@@ -58,6 +58,8 @@ class RegistrationParentFileTemplateView(APIView):
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 
 class RegistrationParentFileTemplateSimpleView(APIView):
+    parser_classes = [MultiPartParser, FormParser, JSONParser]
+
     @swagger_auto_schema(
         operation_description="Récupère un template d'inscription spécifique",
         responses={
@@ -82,11 +84,15 @@ class RegistrationParentFileTemplateSimpleView(APIView):
         }
     )
     def put(self, request, id):
+        payload, resp = util.build_payload_from_request(request)
+        if resp is not None:
+            return resp
+
         template = bdd.getObject(_objectName=RegistrationParentFileTemplate, _columnName='id', _value=id)
         if template is None:
             return JsonResponse({'erreur': 'Le template d\'inscription n\'a pas été trouvé'}, safe=False, status=status.HTTP_404_NOT_FOUND)
 
-        serializer = RegistrationParentFileTemplateSerializer(template, data=request.data, partial=True)
+        serializer = RegistrationParentFileTemplateSerializer(template, data=payload, partial=True)
         if serializer.is_valid():
             serializer.save()
             return Response({'message': 'Template mis à jour avec succès', 'data': serializer.data}, status=status.HTTP_200_OK)

Back-End/Subscriptions/views/registration_school_file_masters_views.py

@@ -125,6 +125,25 @@ class RegistrationSchoolFileMasterSimpleView(APIView):
         if resp:
             return resp
 
+        # Garde-fou: eviter d'ecraser un master dynamique existant avec un
+        # formMasterData vide/malforme (cas observe en multipart).
+        if 'formMasterData' in payload:
+            incoming_form_data = payload.get('formMasterData')
+            current_is_dynamic = (
+                isinstance(master.formMasterData, dict)
+                and bool(master.formMasterData.get('fields'))
+            )
+            incoming_is_dynamic = (
+                isinstance(incoming_form_data, dict)
+                and bool(incoming_form_data.get('fields'))
+            )
+            if current_is_dynamic and not incoming_is_dynamic:
+                logger.warning(
+                    "formMasterData invalide recu pour master %s: conservation de la config dynamique existante",
+                    master.pk,
+                )
+                payload['formMasterData'] = master.formMasterData
+
 
         logger.info(f"payload for update serializer: {payload}")
         serializer = RegistrationSchoolFileMasterSerializer(master, data=payload, partial=True)

Back-End/Subscriptions/views/registration_school_file_templates_views.py

@@ -16,6 +16,20 @@ import Subscriptions.util as util
 
 logger = logging.getLogger(__name__)
 
+
+def _extract_nested_responses(data, max_depth=8):
+    """Extrait le dictionnaire de reponses depuis des structures imbriquees."""
+    current = data
+    for _ in range(max_depth):
+        if not isinstance(current, dict):
+            return None
+        nested = current.get("responses")
+        if isinstance(nested, dict):
+            current = nested
+            continue
+        return current
+    return current if isinstance(current, dict) else None
+
 class RegistrationSchoolFileTemplateView(APIView):
     @swagger_auto_schema(
         operation_description="Récupère tous les templates d'inscription pour un établissement donné",
@@ -95,15 +109,26 @@ class RegistrationSchoolFileTemplateSimpleView(APIView):
             responses = None
             if "responses" in formTemplateData:
                 resp = formTemplateData["responses"]
-                if isinstance(resp, dict) and "responses" in resp:
-                    responses = resp["responses"]
-                elif isinstance(resp, dict):
-                    responses = resp
+                responses = _extract_nested_responses(resp)
+
+            # Nettoyer les meta-cles qui ne sont pas des reponses de champs
+            if isinstance(responses, dict):
+                cleaned = {
+                    key: value
+                    for key, value in responses.items()
+                    if key not in {"responses", "formId", "id", "templateId"}
+                }
+                responses = cleaned
+
             if responses and "fields" in formTemplateData:
                 for field in formTemplateData["fields"]:
                     field_id = field.get("id")
                     if field_id and field_id in responses:
                         field["value"] = responses[field_id]
+
+            # Stocker les reponses aplaties pour eviter l'empilement responses.responses
+            if isinstance(responses, dict):
+                formTemplateData["responses"] = responses
             payload['formTemplateData'] = formTemplateData
 
         template = bdd.getObject(_objectName=RegistrationSchoolFileTemplate, _columnName='id', _value=id)
@@ -137,7 +162,7 @@ class RegistrationSchoolFileTemplateSimpleView(APIView):
             return Response({'message': 'Template mis à jour avec succès', 'data': RegistrationSchoolFileTemplateSerializer(template).data}, status=status.HTTP_200_OK)
 
         # Cas 2 : Formulaire dynamique (JSON)
-        serializer = RegistrationSchoolFileTemplateSerializer(template, data=payload)
+        serializer = RegistrationSchoolFileTemplateSerializer(template, data=payload, partial=True)
         if serializer.is_valid():
             serializer.save()
             # Régénérer le PDF si besoin
@@ -148,19 +173,50 @@ class RegistrationSchoolFileTemplateSimpleView(APIView):
                 and formTemplateData.get("fields")
                 and hasattr(template, "file")
             ):
-                old_pdf_name = None
-                if template.file and template.file.name:
-                    old_pdf_name = os.path.basename(template.file.name)
+                # Lire le contenu du fichier source en mémoire AVANT suppression.
+                # Priorité au fichier master (document source admin) pour éviter
+                # de re-générer à partir d'un PDF template déjà enrichi.
+                base_pdf_content = None
+                base_file_ext = None
+                if template.master and template.master.file and template.master.file.name:
+                    base_file_ext = os.path.splitext(template.master.file.name)[1].lower()
                     try:
+                        template.master.file.open('rb')
+                        base_pdf_content = template.master.file.read()
+                        template.master.file.close()
+                    except Exception as e:
+                        logger.error(f"Erreur lecture fichier source master: {e}")
+                elif template.file and template.file.name:
+                    base_file_ext = os.path.splitext(template.file.name)[1].lower()
+                    try:
+                        template.file.open('rb')
+                        base_pdf_content = template.file.read()
+                        template.file.close()
+                    except Exception as e:
+                        logger.error(f"Erreur lecture fichier source template: {e}")
+                    try:
+                        old_path = template.file.path
                         template.file.delete(save=False)
-                        if os.path.exists(template.file.path):
-                            os.remove(template.file.path)
+                        if os.path.exists(old_path):
+                            os.remove(old_path)
                     except Exception as e:
                         logger.error(f"Erreur lors de la suppression du fichier existant: {e}")
                 from Subscriptions.util import generate_form_json_pdf
-                pdf_file = generate_form_json_pdf(template.registration_form, formTemplateData)
-                pdf_filename = old_pdf_name or f"{template.name}_{template.id}.pdf"
-                template.file.save(pdf_filename, pdf_file, save=True)
+                pdf_file = generate_form_json_pdf(
+                    template.registration_form,
+                    formTemplateData,
+                    base_pdf_content=base_pdf_content,
+                    base_file_ext=base_file_ext,
+                )
+                form_name = (formTemplateData.get("title") or template.name or f"formulaire_{template.id}").strip().replace(" ", "_")
+                pdf_filename = f"{form_name}.pdf"
+                util.save_file_field_without_suffix(
+                    template,
+                    'file',
+                    pdf_filename,
+                    pdf_file,
+                    save=True,
+                )
             return Response({'message': 'Template mis à jour avec succès', 'data': serializer.data}, status=status.HTTP_200_OK)
         return Response(serializer.errors, status=status.HTTP_400_BAD_REQUEST)
 

Back-End/Subscriptions/views/student_competencies_views.py

@@ -175,13 +175,43 @@ class StudentCompetencyListCreateView(APIView):
                         domaine_dict["categories"].append(categorie_dict)
                 if domaine_dict["categories"]:
                     result.append(domaine_dict)
+
+            establishment = None
+            if student.associated_class and student.associated_class.establishment:
+                establishment = student.associated_class.establishment
+            else:
+                try:
+                    establishment = student.registrationform.establishment
+                except Exception:
+                    establishment = None
+
+            establishment_logo_path = None
+            if establishment and establishment.logo:
+                try:
+                    if establishment.logo.path and os.path.exists(establishment.logo.path):
+                        establishment_logo_path = establishment.logo.path
+                except Exception:
+                    establishment_logo_path = None
+
+            n3wt_logo_path = os.path.join(settings.BASE_DIR, 'static', 'img', 'logo_min.svg')
+            if not os.path.exists(n3wt_logo_path):
+                n3wt_logo_path = None
             
             context = {
                 "student": {
                     "first_name": student.first_name,
                     "last_name": student.last_name,
                     "level": student.level,
-                    "class_name": student.associated_class.atmosphere_name,
+                    "class_name": student.associated_class.atmosphere_name if student.associated_class else "Non assignée",
+                },
+                "establishment": {
+                    "name": establishment.name if establishment else "Établissement",
+                    "address": establishment.address if establishment else "",
+                    "logo_path": establishment_logo_path,
+                },
+                "product": {
+                    "name": "n3wt-school",
+                    "logo_path": n3wt_logo_path,
                 },
                 "period": period,
                 "date": date.today().strftime("%d/%m/%Y"),

Back-End/__version__.py

@@ -1 +1 @@
-__version__ = "0.0.3"
+__version__ = "0.0.5"

Back-End/start.py

@@ -11,13 +11,10 @@ def run_command(command):
         print(f"stderr: {stderr.decode()}")
     return process.returncode
 
-test_mode = os.getenv('test_mode', 'false').lower() == 'true'
-flush_data = os.getenv('flush_data', 'false').lower() == 'true'
-#flush_data=True
-migrate_data = os.getenv('migrate_data', 'false').lower() == 'true'
-migrate_data=True
+test_mode = os.getenv('TEST_MODE', 'false').lower() == 'true'
+flush_data = os.getenv('FLUSH_DATA', 'false').lower() == 'true'
+migrate_data = os.getenv('MIGRATE_DATA', 'false').lower() == 'true'
 watch_mode = os.getenv('DJANGO_WATCH', 'false').lower() == 'true'
-watch_mode=True
 
 collect_static_cmd = [
     ["python", "manage.py", "collectstatic", "--noinput"]
@@ -64,12 +61,6 @@ if __name__ == "__main__":
         if run_command(command) != 0:
             exit(1)
 
-    if flush_data:
-        for command in flush_data_cmd:
-            if run_command(command) != 0:
-                exit(1)
-
-
     for command in migrate_commands:
         if run_command(command) != 0:
             exit(1)
@@ -78,6 +69,11 @@ if __name__ == "__main__":
         if run_command(command) != 0:
             exit(1)
 
+    if flush_data:
+        for command in flush_data_cmd:
+            if run_command(command) != 0:
+                exit(1)
+
     if test_mode:
         for test_command in test_commands:
             if run_command(test_command) != 0:

Back-End/static/img/n3wt.svg

@@ -0,0 +1,7 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="420" height="120" viewBox="0 0 420 120" role="img" aria-label="n3wt-school">
+  <rect width="420" height="120" rx="16" fill="#F0FDF4"/>
+  <circle cx="56" cy="60" r="30" fill="#10B981"/>
+  <path d="M42 60h28M56 46v28" stroke="#064E3B" stroke-width="8" stroke-linecap="round"/>
+  <text x="104" y="70" font-family="Arial, sans-serif" font-size="42" font-weight="700" fill="#064E3B">n3wt</text>
+  <text x="245" y="70" font-family="Arial, sans-serif" font-size="30" font-weight="600" fill="#059669">school</text>
+</svg>

CHANGELOG.md

@@ -2,6 +2,146 @@
 
 Toutes les modifications notables apportées à ce projet seront documentées dans ce fichier.
 
+### [0.0.5](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/compare/0.0.3...0.0.5) (2026-04-05)
+
+
+### Documentation
+
+* **design-system:** add design system documentation and AI agent instructions ([cb76a23](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/cb76a23d02a9c0f27c9403e4d06cebfcc65d886b))
+
+
+### Nouvelles fonctionnalités
+
+*  Gestion de l'arborescence des documents d'école en fonction des requêtes CRUD [N3WTS-17] ([abb4b52](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/abb4b525b296ba01fce037c6c63fb7766cfbc9b3))
+* Ajout bouton de refus de dossier avec zone de saisie de motif [N3WTS-2] ([3779a47](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/3779a474171d7df716e3b0d06a26f7f9b69356fa))
+* Ajout d'un système d'historisation et d'export de données en CSV [N3WTS-5] ([f091fa0](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/f091fa0432135bb5478793ea92b97d13c3c68a2f))
+* Ajout d'un système de notation par classe et par matière et par élève [N3WTS-6] ([905fa5d](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/905fa5dbfb3d50710a3aa04d9b28664c1c86b991))
+* Ajout de la commande npm permettant de creer un etablissement ([09b1541](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/09b1541dc83b28dcba0aead633755d58e9a534fa))
+* Ajout des composants manquant dans le FormTemplateBuilder [N3WTS-17] ([5e62ee5](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/5e62ee510074e30cd33802aae20d3d1c297619a3))
+* Ajout FormTemplateBuilder [N3WTS-17] ([e89d2fc](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/e89d2fc4c34a99c6b67827bb895ad31a5eff10e6))
+* **backend,frontend:** régénération et visualisation inline de la fiche élève PDF ([e37aee2](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/e37aee2abcf7ed69145d217a30e2dce037d933d0))
+* Changement du rendu de la page des documents + gestion des ([12f5fc7](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/12f5fc7aa9de10fc5591495b9ede478593c1c21a))
+* creation d'un FormRenderer.js pour creer un formulaire dynamique [NEWTS-17] ([9481a01](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/9481a0132d2e1f18da5fc632d924adde04d316d4))
+* Début de suppression de docuseal côté Front [#N3WTS-17] ([1e5bc6c](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/1e5bc6ccba9053246e4767aa6c2da46ff776203e)), closes [#N3WTS-17](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/N3WTS-17)
+* Envoi mail d'inscription au second responsable [N3WTS-1] ([d66db1b](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/d66db1b019f2480a8a418acc982a6f9132ff3342))
+* Envoi mail d'inscription aux enseignants [N3WTS-1] ([bd7dc2b](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/bd7dc2b0c228b26e31c930342679e30aafa101e1))
+* Finalisation de la validation / refus des documents signés par les parents [N3WTS-2] ([0501c1d](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/0501c1dd7320d734ba6ae0b93ad4a270b903a5df))
+* Finalisation formulaire dynamique ([90b0d14](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/90b0d144184a1c402aedfe3f70647c4bb43f8c37))
+* **frontend:** fusion liste des frais et message compte existant [#NEWTS-9] ([e30a41a](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/e30a41a58b199b68eca687a159736b2025e9f22d)), closes [#NEWTS-9](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/NEWTS-9)
+* **frontend:** refonte mobile planning et ameliorations suivi pedagogique [#NEWTS-4] ([4248a58](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/4248a589c5f300fe0702b1c20cae5abaeba32688)), closes [#NEWTS-4](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/NEWTS-4) [#NEWTS-4](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/NEWTS-4)
+* Gestion de l'affichage des documents validés et non validés sur la page parent [N3WTS-2] ([4f7d7d0](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/4f7d7d002442bb0cb04063734d97f993a40474a7))
+* Gestion de la sidebar [N3WTS-8] ([ddcaba3](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/ddcaba382e6573f4a628a691bc0f20226a954fd7))
+* Gestion du refus définitif d'un dossier [N3WTS-2] ([2fef6d6](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/2fef6d61a4d38f82c28587a9642aef65b5fd387a))
+* lister uniquement les élèves inscrits dans une classe [N3WTS-6] ([6fb3c5c](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/6fb3c5cdb40f05b9c34b96334e785bc184751e4f))
+* Mise à jour de la page parent ([2d678b7](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/2d678b732f1be19b4653fbe68486455326da2157))
+* Page Inscriptions : suppression de la possibilité de créer un nouveau DI [N3WTS-8] ([195579e](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/195579e21710427d303e10c97b4a4438ec381da4))
+* Page Structure : suppression de la possibilité de faire des actions d'admin [N3WTS-8] ([05c68eb](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/05c68ebfaa0ff30a70ca9c42bcb306261c0fbb85))
+* Précablage du formulaire dynamique [N3WTS-17] ([dd00cba](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/dd00cba385a131ed7db66656738340234bcf5e73))
+* push test [#N3WTS-17] ([0fb668b](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/0fb668b21284a682a8dd5addd14e47c580723f13)), closes [#N3WTS-17](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/N3WTS-17)
+* Réorganisation items dans la page [N3WTS-17] ([8549699](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/8549699dec253a9763a4074e05130c4d7d40ac6e))
+* Sauvegarde des formulaires d'école dans les bons dossiers / ([b4f70e6](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/b4f70e6bad2fa31b6c1fd68d8538962b9d5e2650))
+* Securisation du Backend ([fa84309](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/fa843097ba9490c5083b652ec2dc9a9b28c096a0))
+* Securisation du téléchargement de fichier ([a329126](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/a3291262d80d2bddfc11412f55bc271ea6bf8219))
+* Traitement de clonages des templates de documents dans le back ([7486f6c](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/7486f6c5ce6c5aac2b051469903ef7b2936f5634)), closes [#N3WTS-17](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/N3WTS-17)
+* Validation document par document [N3WTS-2] ([8fd1b62](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/8fd1b62ec09a663f40262b406c2f17f64a8d5a2f))
+* WIP finalisation partie signature des parents [N3WTS-17] ([9dff32b](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/9dff32b388fd27a899a44e3424bb7d24b2b26afd))
+
+
+### Corrections de bugs
+
+* Boutons de navigation + mise en page de l'aperçu du formulaire dynamique ([762dede](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/762dede0af37c41b2c1616216bd9f986d1e0c57f))
+* Changement des niveaux de logs [N3WTS-1] ([26d4b56](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/26d4b5633f7ebf5630105c3e9db802cdaeee4e37))
+* Chat getSession + passage en asyn ces getWebSocketUrl et connectToChat ([409cf05](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/409cf05f1a4554263d5f08185bce97d9425287fa))
+* coorection démarrage ([2579af9](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/2579af9b8b397d24e66ee08365e345f81bfb00cf))
+* Coquille [N3WTS-17] ([a034149](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/a034149eae7f3b746af32c392499217cf73ab582))
+* correction du téléchargement du fichier ([053140c](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/053140c8be1e10ac9b127cfb47b5691e70dd26e0))
+* Edition d'un teacher, champ email désactivé [N3WTS-1] ([176edc5](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/176edc5c452fa7b03da266f5a227c730ff4ad525))
+* Emploi du temps pour les classes de l'année scolaire en cours ([5bbbcb9](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/5bbbcb9dc1f688cd68f47f8f7629aa03678ba582))
+* Lint ([2dc0dfa](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/2dc0dfa26889b319f8c6cfb08b1701f8540d06ed))
+* messagerie ([a81b76e](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/a81b76eceac0919fc1873cdf8362e5fe55b97adb))
+* Mise à jour des plannings ([12939fc](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/12939fca85b139a2b0178b11a4a29ee5e97800ff))
+* Mise en page sur absence de frais ou de tarifs lors de la création d'un DI ([ccdbae1](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/ccdbae1c08e1d1edb3bc1e3e14e8244f196cac60))
+* Mise en place de l'auto reload pour Daphne [[#65](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/65)] ([7f002e2](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/7f002e2e6a93d651a8d9c2a03baa0f1035844f96))
+* Ne pas envoyer de mail lors de la création d'un DI ([3c72666](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/3c7266608d45cd1650775c9a2060dd1007280096))
+* On n'historise plus les matières ni les enseignants ([f9c0585](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/f9c0585b3061a6ae4a8978c9f0329c8710f9bd60))
+* Réintégration du bouton de Bilan de compétence + harmonisation des paths d'upload de fichier ([2a223fe](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/2a223fe3dd9dfae71117f0f47c07aee8a8893de5))
+* Revue des modales de création de groupes / formulaire ([1f2a1b8](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/1f2a1b88acab312dc90dcf4ba4d55048a3f302d9))
+* sélection enseignants dans les plannings ([4431c42](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/4431c428d3709ef3b2e8f66edd13beed73e42709))
+* signature électronique ([92c3183](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/92c318315335d126ccd6d8637c0381a3367b7a4f))
+* Suppression d'un PROFILE si aucun PROFILE_ROLE n'y est associé [N3WTS-1] ([92c6a31](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/92c6a31740b930fb5363b9dbf91b664f78c7f1a6))
+* Suppression envoi mail / création page feedback ([4c56cb6](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/4c56cb647470f86151b1ff78c318e0b6468f009d))
+* Upload document ([b0e04e3](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/b0e04e3adc480005b0d0d74bbc0ac28f1f9d6e4b))
+
+### [0.0.4](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/compare/0.0.3...0.0.4) (2026-04-05)
+
+
+### Documentation
+
+* **design-system:** add design system documentation and AI agent instructions ([cb76a23](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/cb76a23d02a9c0f27c9403e4d06cebfcc65d886b))
+
+
+### Nouvelles fonctionnalités
+
+*  Gestion de l'arborescence des documents d'école en fonction des requêtes CRUD [N3WTS-17] ([abb4b52](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/abb4b525b296ba01fce037c6c63fb7766cfbc9b3))
+* Ajout bouton de refus de dossier avec zone de saisie de motif [N3WTS-2] ([3779a47](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/3779a474171d7df716e3b0d06a26f7f9b69356fa))
+* Ajout d'un système d'historisation et d'export de données en CSV [N3WTS-5] ([f091fa0](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/f091fa0432135bb5478793ea92b97d13c3c68a2f))
+* Ajout d'un système de notation par classe et par matière et par élève [N3WTS-6] ([905fa5d](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/905fa5dbfb3d50710a3aa04d9b28664c1c86b991))
+* Ajout de la commande npm permettant de creer un etablissement ([09b1541](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/09b1541dc83b28dcba0aead633755d58e9a534fa))
+* Ajout des composants manquant dans le FormTemplateBuilder [N3WTS-17] ([5e62ee5](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/5e62ee510074e30cd33802aae20d3d1c297619a3))
+* Ajout FormTemplateBuilder [N3WTS-17] ([e89d2fc](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/e89d2fc4c34a99c6b67827bb895ad31a5eff10e6))
+* **backend,frontend:** régénération et visualisation inline de la fiche élève PDF ([e37aee2](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/e37aee2abcf7ed69145d217a30e2dce037d933d0))
+* Changement du rendu de la page des documents + gestion des ([12f5fc7](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/12f5fc7aa9de10fc5591495b9ede478593c1c21a))
+* creation d'un FormRenderer.js pour creer un formulaire dynamique [NEWTS-17] ([9481a01](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/9481a0132d2e1f18da5fc632d924adde04d316d4))
+* Début de suppression de docuseal côté Front [#N3WTS-17] ([1e5bc6c](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/1e5bc6ccba9053246e4767aa6c2da46ff776203e)), closes [#N3WTS-17](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/N3WTS-17)
+* Envoi mail d'inscription au second responsable [N3WTS-1] ([d66db1b](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/d66db1b019f2480a8a418acc982a6f9132ff3342))
+* Envoi mail d'inscription aux enseignants [N3WTS-1] ([bd7dc2b](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/bd7dc2b0c228b26e31c930342679e30aafa101e1))
+* Finalisation de la validation / refus des documents signés par les parents [N3WTS-2] ([0501c1d](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/0501c1dd7320d734ba6ae0b93ad4a270b903a5df))
+* Finalisation formulaire dynamique ([90b0d14](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/90b0d144184a1c402aedfe3f70647c4bb43f8c37))
+* **frontend:** fusion liste des frais et message compte existant [#NEWTS-9] ([e30a41a](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/e30a41a58b199b68eca687a159736b2025e9f22d)), closes [#NEWTS-9](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/NEWTS-9)
+* **frontend:** refonte mobile planning et ameliorations suivi pedagogique [#NEWTS-4] ([4248a58](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/4248a589c5f300fe0702b1c20cae5abaeba32688)), closes [#NEWTS-4](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/NEWTS-4) [#NEWTS-4](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/NEWTS-4)
+* Gestion de l'affichage des documents validés et non validés sur la page parent [N3WTS-2] ([4f7d7d0](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/4f7d7d002442bb0cb04063734d97f993a40474a7))
+* Gestion de la sidebar [N3WTS-8] ([ddcaba3](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/ddcaba382e6573f4a628a691bc0f20226a954fd7))
+* Gestion du refus définitif d'un dossier [N3WTS-2] ([2fef6d6](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/2fef6d61a4d38f82c28587a9642aef65b5fd387a))
+* lister uniquement les élèves inscrits dans une classe [N3WTS-6] ([6fb3c5c](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/6fb3c5cdb40f05b9c34b96334e785bc184751e4f))
+* Mise à jour de la page parent ([2d678b7](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/2d678b732f1be19b4653fbe68486455326da2157))
+* Page Inscriptions : suppression de la possibilité de créer un nouveau DI [N3WTS-8] ([195579e](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/195579e21710427d303e10c97b4a4438ec381da4))
+* Page Structure : suppression de la possibilité de faire des actions d'admin [N3WTS-8] ([05c68eb](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/05c68ebfaa0ff30a70ca9c42bcb306261c0fbb85))
+* Précablage du formulaire dynamique [N3WTS-17] ([dd00cba](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/dd00cba385a131ed7db66656738340234bcf5e73))
+* push test [#N3WTS-17] ([0fb668b](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/0fb668b21284a682a8dd5addd14e47c580723f13)), closes [#N3WTS-17](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/N3WTS-17)
+* Réorganisation items dans la page [N3WTS-17] ([8549699](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/8549699dec253a9763a4074e05130c4d7d40ac6e))
+* Sauvegarde des formulaires d'école dans les bons dossiers / ([b4f70e6](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/b4f70e6bad2fa31b6c1fd68d8538962b9d5e2650))
+* Securisation du Backend ([fa84309](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/fa843097ba9490c5083b652ec2dc9a9b28c096a0))
+* Securisation du téléchargement de fichier ([a329126](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/a3291262d80d2bddfc11412f55bc271ea6bf8219))
+* Traitement de clonages des templates de documents dans le back ([7486f6c](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/7486f6c5ce6c5aac2b051469903ef7b2936f5634)), closes [#N3WTS-17](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/N3WTS-17)
+* Validation document par document [N3WTS-2] ([8fd1b62](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/8fd1b62ec09a663f40262b406c2f17f64a8d5a2f))
+* WIP finalisation partie signature des parents [N3WTS-17] ([9dff32b](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/9dff32b388fd27a899a44e3424bb7d24b2b26afd))
+
+
+### Corrections de bugs
+
+* Boutons de navigation + mise en page de l'aperçu du formulaire dynamique ([762dede](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/762dede0af37c41b2c1616216bd9f986d1e0c57f))
+* Changement des niveaux de logs [N3WTS-1] ([26d4b56](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/26d4b5633f7ebf5630105c3e9db802cdaeee4e37))
+* Chat getSession + passage en asyn ces getWebSocketUrl et connectToChat ([409cf05](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/409cf05f1a4554263d5f08185bce97d9425287fa))
+* coorection démarrage ([2579af9](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/2579af9b8b397d24e66ee08365e345f81bfb00cf))
+* Coquille [N3WTS-17] ([a034149](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/a034149eae7f3b746af32c392499217cf73ab582))
+* correction du téléchargement du fichier ([053140c](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/053140c8be1e10ac9b127cfb47b5691e70dd26e0))
+* Edition d'un teacher, champ email désactivé [N3WTS-1] ([176edc5](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/176edc5c452fa7b03da266f5a227c730ff4ad525))
+* Emploi du temps pour les classes de l'année scolaire en cours ([5bbbcb9](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/5bbbcb9dc1f688cd68f47f8f7629aa03678ba582))
+* Lint ([2dc0dfa](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/2dc0dfa26889b319f8c6cfb08b1701f8540d06ed))
+* messagerie ([a81b76e](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/a81b76eceac0919fc1873cdf8362e5fe55b97adb))
+* Mise à jour des plannings ([12939fc](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/12939fca85b139a2b0178b11a4a29ee5e97800ff))
+* Mise en page sur absence de frais ou de tarifs lors de la création d'un DI ([ccdbae1](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/ccdbae1c08e1d1edb3bc1e3e14e8244f196cac60))
+* Mise en place de l'auto reload pour Daphne [[#65](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/issues/65)] ([7f002e2](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/7f002e2e6a93d651a8d9c2a03baa0f1035844f96))
+* Ne pas envoyer de mail lors de la création d'un DI ([3c72666](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/3c7266608d45cd1650775c9a2060dd1007280096))
+* On n'historise plus les matières ni les enseignants ([f9c0585](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/f9c0585b3061a6ae4a8978c9f0329c8710f9bd60))
+* Réintégration du bouton de Bilan de compétence + harmonisation des paths d'upload de fichier ([2a223fe](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/2a223fe3dd9dfae71117f0f47c07aee8a8893de5))
+* Revue des modales de création de groupes / formulaire ([1f2a1b8](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/1f2a1b88acab312dc90dcf4ba4d55048a3f302d9))
+* sélection enseignants dans les plannings ([4431c42](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/4431c428d3709ef3b2e8f66edd13beed73e42709))
+* signature électronique ([92c3183](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/92c318315335d126ccd6d8637c0381a3367b7a4f))
+* Suppression d'un PROFILE si aucun PROFILE_ROLE n'y est associé [N3WTS-1] ([92c6a31](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/92c6a31740b930fb5363b9dbf91b664f78c7f1a6))
+* Suppression envoi mail / création page feedback ([4c56cb6](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/4c56cb647470f86151b1ff78c318e0b6468f009d))
+* Upload document ([b0e04e3](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/commit/b0e04e3adc480005b0d0d74bbc0ac28f1f9d6e4b))
+
 ### [0.0.3](https://git.v0id.ovh:5022/n3wt-innov/n3wt-school/compare/0.0.2...0.0.3) (2025-06-01)
 
 

Front-End/messages/en/feedback.json

@@ -0,0 +1,21 @@
+{
+  "title": "Feedback",
+  "description": "Share your feedback, report a bug, or suggest an improvement. We read every message!",
+  "category_label": "Category",
+  "category_placeholder": "Select a category",
+  "category_bug": "Report a bug",
+  "category_feature": "Suggest a feature",
+  "category_question": "Ask a question",
+  "category_other": "Other",
+  "subject_label": "Subject",
+  "subject_placeholder": "Summarize your request",
+  "message_label": "Message",
+  "message_placeholder": "Describe your feedback in detail...",
+  "send": "Send",
+  "sending": "Sending...",
+  "success": "Success",
+  "success_message": "Your feedback has been sent. Thank you!",
+  "error": "Error",
+  "error_required_fields": "Please fill in all required fields.",
+  "error_sending": "An error occurred while sending your feedback."
+}

Front-End/messages/en/sidebar.json

@@ -7,5 +7,6 @@
   "educational_monitoring": "Educational Monitoring",
   "settings": "Settings",
   "schoolAdmin": "School Administration",
-  "messagerie": "Messenger"
+  "messagerie": "Messenger",
+  "feedback": "Feedback"
 }

Front-End/messages/fr/feedback.json

@@ -0,0 +1,21 @@
+{
+  "title": "Feedback",
+  "description": "Partagez vos retours, signalez un bug ou proposez une amélioration. Nous lisons chaque message !",
+  "category_label": "Catégorie",
+  "category_placeholder": "Sélectionnez une catégorie",
+  "category_bug": "Signaler un bug",
+  "category_feature": "Proposer une fonctionnalité",
+  "category_question": "Poser une question",
+  "category_other": "Autre",
+  "subject_label": "Sujet",
+  "subject_placeholder": "Résumez votre demande",
+  "message_label": "Message",
+  "message_placeholder": "Décrivez en détail votre retour...",
+  "send": "Envoyer",
+  "sending": "Envoi en cours...",
+  "success": "Succès",
+  "success_message": "Votre feedback a bien été envoyé. Merci !",
+  "error": "Erreur",
+  "error_required_fields": "Veuillez remplir tous les champs obligatoires.",
+  "error_sending": "Une erreur est survenue lors de l'envoi du feedback."
+}

Front-End/messages/fr/sidebar.json

@@ -7,5 +7,6 @@
   "educational_monitoring": "Suivi pédagogique",
   "settings": "Paramètres",
   "schoolAdmin": "Administration Scolaire",
-  "messagerie": "Messagerie"
+  "messagerie": "Messagerie",
+  "feedback": "Feedback"
 }

Front-End/package.json

@@ -1,6 +1,6 @@
 {
   "name": "n3wt-school-front-end",
-  "version": "0.0.3",
+  "version": "0.0.5",
   "private": true,
   "scripts": {
     "dev": "next dev",

Front-End/src/app/500.js

@@ -3,16 +3,19 @@ import Logo from '../components/Logo';
 
 export default function Custom500() {
   return (
-    <div className="flex items-center justify-center min-h-screen bg-emerald-500">
-      <div className="text-center p-6 ">
+    <div className="flex items-center justify-center min-h-screen bg-primary">
+      <div className="text-center p-6 bg-white rounded-md shadow-sm border border-gray-200">
         <Logo className="w-32 h-32 mx-auto mb-4" />
-        <h2 className="text-2xl font-bold text-emerald-900 mb-4">
+        <h2 className="font-headline text-2xl font-bold text-secondary mb-4">
           500 | Erreur interne
         </h2>
-        <p className="text-emerald-900 mb-4">
+        <p className="font-body text-gray-600 mb-4">
           Une erreur interne est survenue.
         </p>
-        <Link className="text-gray-900 hover:underline" href="/">
+        <Link
+          className="inline-flex items-center justify-center min-h-[44px] px-4 py-2 rounded font-label font-medium bg-primary hover:bg-secondary text-white transition-colors"
+          href="/"
+        >
           Retour Accueil
         </Link>
       </div>

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

@@ -2,8 +2,17 @@
 import React, { useState, useEffect } from 'react';
 import { useEstablishment } from '@/context/EstablishmentContext';
 import { PARENT_FILTER, SCHOOL_FILTER } from '@/utils/constants';
-import { Trash2, ToggleLeft, ToggleRight, Info, XCircle } from 'lucide-react';
+import {
+  Trash2,
+  ToggleLeft,
+  ToggleRight,
+  Info,
+  XCircle,
+  Users,
+  UserPlus,
+} from 'lucide-react';
 import Table from '@/components/Table';
+import EmptyState from '@/components/EmptyState';
 import Popup from '@/components/Popup';
 import StatusLabel from '@/components/StatusLabel';
 import SpecialityItem from '@/components/Structure/Configuration/SpecialityItem';
@@ -17,7 +26,6 @@ import { dissociateGuardian } from '@/app/actions/subscriptionAction';
 import { useCsrfToken } from '@/context/CsrfContext';
 import DjangoCSRFToken from '@/components/DjangoCSRFToken';
 import logger from '@/utils/logger';
-import AlertMessage from '@/components/AlertMessage';
 
 const roleTypeToLabel = (roleType) => {
   switch (roleType) {
@@ -39,7 +47,7 @@ const roleTypeToBadgeClass = (roleType) => {
     case 1:
       return 'bg-red-100 text-red-600';
     case 2:
-      return 'bg-green-100 text-green-600';
+      return 'bg-tertiary/10 text-tertiary';
     default:
       return 'bg-gray-100 text-gray-600';
   }
@@ -378,7 +386,7 @@ export default function Page() {
             type="button"
             className={
               row.is_active
-                ? 'text-emerald-500 hover:text-emerald-700'
+                ? 'text-primary hover:text-secondary'
                 : 'text-orange-500 hover:text-orange-700'
             }
             onClick={() => handleConfirmActivateProfile(row)}
@@ -474,7 +482,7 @@ export default function Page() {
             type="button"
             className={
               row.is_active
-                ? 'text-emerald-500 hover:text-emerald-700'
+                ? 'text-primary hover:text-secondary'
                 : 'text-orange-500 hover:text-orange-700'
             }
             onClick={() => handleConfirmActivateProfile(row)}
@@ -516,10 +524,10 @@ export default function Page() {
                   totalPages={totalProfilesParentPages}
                   onPageChange={handlePageChange}
                   emptyMessage={
-                    <AlertMessage
-                      type="info"
-                      title="Aucun profil PARENT enregistré"
-                      message="Un profil Parent est ajouté lors de la création d'un nouveau dossier d'inscription."
+                    <EmptyState
+                      icon={Users}
+                      title="Aucun profil parent enregistré"
+                      description="Les profils parents sont créés automatiquement lors de la création d'un dossier d'inscription."
                     />
                   }
                 />
@@ -540,10 +548,10 @@ export default function Page() {
                   totalPages={totalProfilesSchoolPages}
                   onPageChange={handlePageChange}
                   emptyMessage={
-                    <AlertMessage
-                      type="info"
-                      title="Aucun profil ECOLE enregistré"
-                      message="Un profil ECOLE est ajouté lors de la création d'un nouvel enseignant."
+                    <EmptyState
+                      icon={UserPlus}
+                      title="Aucun profil école enregistré"
+                      description="Les profils école sont créés automatiquement lors de l'ajout d'un enseignant."
                     />
                   }
                 />

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

@@ -0,0 +1,136 @@
+'use client';
+
+import React, { useState } from 'react';
+import { sendFeedback } from '@/app/actions/emailAction';
+import { useNotification } from '@/context/NotificationContext';
+import { useEstablishment } from '@/context/EstablishmentContext';
+import { useTranslations } from 'next-intl';
+import WisiwigTextArea from '@/components/Form/WisiwigTextArea';
+import InputText from '@/components/Form/InputText';
+import Button from '@/components/Form/Button';
+import SelectChoice from '@/components/Form/SelectChoice';
+import logger from '@/utils/logger';
+
+export default function FeedbackPage() {
+  const t = useTranslations('feedback');
+  const { showNotification } = useNotification();
+  const { selectedEstablishmentId, establishments, user } = useEstablishment();
+
+  // Récupérer les infos complètes de l'établissement sélectionné
+  const selectedEstablishment = establishments?.find(
+    (e) => e.id === selectedEstablishmentId
+  );
+
+  const [category, setCategory] = useState('');
+  const [subject, setSubject] = useState('');
+  const [message, setMessage] = useState('');
+  const [isSubmitting, setIsSubmitting] = useState(false);
+
+  const categoryChoices = [
+    { value: 'bug', label: t('category_bug') },
+    { value: 'feature', label: t('category_feature') },
+    { value: 'question', label: t('category_question') },
+    { value: 'other', label: t('category_other') },
+  ];
+
+  const handleSubmit = async () => {
+    if (!category || !subject || !message) {
+      showNotification(t('error_required_fields'), 'error', t('error'));
+      return;
+    }
+
+    setIsSubmitting(true);
+
+    // Construire le nom de l'utilisateur (fallback vers l'email si nom indisponible)
+    const userName = user
+      ? user.first_name && user.last_name
+        ? `${user.first_name} ${user.last_name}`
+        : user.username || user.email?.split('@')[0] || ''
+      : '';
+
+    const feedbackData = {
+      category,
+      subject,
+      message,
+      establishment: selectedEstablishment
+        ? {
+            id: selectedEstablishment.id,
+            name: selectedEstablishment.name,
+            total_capacity: selectedEstablishment.total_capacity,
+            evaluation_frequency: selectedEstablishment.evaluation_frequency,
+          }
+        : { id: selectedEstablishmentId },
+      user_email: user?.email || '',
+      user_name: userName,
+    };
+
+    try {
+      await sendFeedback(feedbackData);
+      showNotification(t('success_message'), 'success', t('success'));
+      // Réinitialiser les champs après succès
+      setCategory('');
+      setSubject('');
+      setMessage('');
+    } catch (error) {
+      logger.error("Erreur lors de l'envoi du feedback:", { error });
+      showNotification(t('error_sending'), 'error', t('error'));
+    } finally {
+      setIsSubmitting(false);
+    }
+  };
+
+  return (
+    <div className="h-full flex flex-col p-4">
+      <div className="max-w-3xl mx-auto w-full">
+        <h1 className="font-headline text-2xl font-bold text-gray-800 mb-2">
+          {t('title')}
+        </h1>
+        <p className="text-gray-600 mb-6">{t('description')}</p>
+
+        <div className="bg-white rounded-md shadow-sm border border-gray-200 p-6">
+          {/* Catégorie */}
+          <SelectChoice
+            name="category"
+            label={t('category_label')}
+            selected={category}
+            callback={(e) => setCategory(e.target.value)}
+            choices={categoryChoices}
+            placeHolder={t('category_placeholder')}
+            required
+          />
+
+          {/* Sujet */}
+          <InputText
+            name="subject"
+            label={t('subject_label')}
+            value={subject}
+            onChange={(e) => setSubject(e.target.value)}
+            placeholder={t('subject_placeholder')}
+            required
+            className="mb-4 mt-4"
+          />
+
+          {/* Message */}
+          <div className="mb-6">
+            <WisiwigTextArea
+              label={t('message_label')}
+              value={message}
+              onChange={setMessage}
+              placeholder={t('message_placeholder')}
+              required
+            />
+          </div>
+
+          {/* Bouton d'envoi */}
+          <div className="flex justify-end">
+            <Button
+              text={isSubmitting ? t('sending') : t('send')}
+              onClick={handleSubmit}
+              disabled={isSubmitting}
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+  );
+}

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

@@ -251,31 +251,31 @@ export default function StudentGradesPage() {
       <div className="flex items-center gap-3">
         <button
           onClick={() => router.push('/admin/grades')}
-          className="p-2 rounded-md hover:bg-gray-100 border border-gray-200"
+          className="p-2 rounded hover:bg-gray-100 border border-gray-200 min-h-[44px] min-w-[44px] flex items-center justify-center transition-colors"
           aria-label="Retour à la liste"
         >
           <ArrowLeft size={20} />
         </button>
-        <h1 className="text-xl font-bold text-gray-800">Suivi pédagogique</h1>
+        <h1 className="font-headline text-xl font-bold text-gray-800">Suivi pédagogique</h1>
       </div>
 
       {/* Student profile */}
       {student && (
-        <div className="bg-stone-50 rounded-lg shadow-sm border border-gray-100 p-4 md:p-6 flex flex-col sm:flex-row items-center sm:items-start gap-4">
+        <div className="bg-neutral rounded-md shadow-sm border border-gray-100 p-4 md:p-6 flex flex-col sm:flex-row items-center sm:items-start gap-4">
           {student.photo ? (
             <img
               src={getSecureFileUrl(student.photo)}
               alt={`${student.first_name} ${student.last_name}`}
-              className="w-24 h-24 object-cover rounded-full border-4 border-emerald-200 shadow"
+              className="w-24 h-24 object-cover rounded-full border-4 border-primary/20 shadow"
             />
           ) : (
-            <div className="w-24 h-24 flex items-center justify-center bg-gray-200 rounded-full text-gray-500 font-bold text-3xl border-4 border-emerald-100">
+            <div className="w-24 h-24 flex items-center justify-center bg-gray-200 rounded-full text-gray-500 font-bold text-3xl border-4 border-primary/10">
               {student.first_name?.[0]}
               {student.last_name?.[0]}
             </div>
           )}
           <div className="flex-1 text-center sm:text-left">
-            <div className="text-xl font-bold text-emerald-800">
+            <div className="text-xl font-bold text-secondary">
               {student.last_name} {student.first_name}
             </div>
             <div className="text-sm text-gray-600 mt-1">
@@ -322,7 +322,7 @@ export default function StudentGradesPage() {
                   `${FE_ADMIN_GRADES_STUDENT_COMPETENCIES_URL}?studentId=${studentId}&period=${periodString}`
                 );
               }}
-              className="px-4 py-2 rounded-md shadow bg-emerald-500 text-white hover:bg-emerald-600 w-full sm:w-auto"
+              className="px-4 py-2 rounded shadow bg-primary text-white font-label font-medium hover:bg-secondary w-full sm:w-auto min-h-[44px] transition-colors"
               icon={<Award className="w-5 h-5" />}
               text="Évaluer"
               title="Évaluer l'élève"
@@ -351,10 +351,10 @@ export default function StudentGradesPage() {
         </div>
 
         {/* Évaluations par matière */}
-        <div className="bg-stone-50 rounded-lg shadow-sm border border-gray-200 p-4 md:p-6">
+        <div className="bg-neutral rounded-md shadow-sm border border-gray-200 p-4 md:p-6">
           <div className="flex items-center gap-2 mb-4">
-            <BookOpen className="w-6 h-6 text-emerald-600" />
-            <h2 className="text-xl font-semibold text-gray-800">
+            <BookOpen className="w-6 h-6 text-primary" />
+            <h2 className="font-headline text-xl font-semibold text-gray-800">
               Évaluations par matière
             </h2>
           </div>

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

@@ -10,14 +10,19 @@ import {
   Pencil,
   Trash2,
   Save,
-  Download
+  Download,
+  FileText,
+  UserPlus,
+  Users,
 } from 'lucide-react';
 import SectionHeader from '@/components/SectionHeader';
 import Table from '@/components/Table';
+import EmptyState from '@/components/EmptyState';
 import logger from '@/utils/logger';
 import {
   FE_ADMIN_GRADES_STUDENT_COMPETENCIES_URL,
   FE_ADMIN_STRUCTURE_SCHOOLCLASS_MANAGEMENT_URL,
+  FE_ADMIN_SUBSCRIPTIONS_CREATE_URL,
 } from '@/utils/Url';
 import { getSecureFileUrl } from '@/utils/fileUrl';
 import {
@@ -35,15 +40,25 @@ import { useClasses } from '@/context/ClassesContext';
 import { useCsrfToken } from '@/context/CsrfContext';
 import { exportToCSV } from '@/utils/exportCSV';
 import SchoolYearFilter from '@/components/SchoolYearFilter';
-import { getCurrentSchoolYear, getNextSchoolYear, getHistoricalYears } from '@/utils/Date';
-import { CURRENT_YEAR_FILTER, NEXT_YEAR_FILTER, HISTORICAL_FILTER } from '@/utils/constants';
+import {
+  getCurrentSchoolYear,
+  getNextSchoolYear,
+  getHistoricalYears,
+} from '@/utils/Date';
+import {
+  CURRENT_YEAR_FILTER,
+  NEXT_YEAR_FILTER,
+  HISTORICAL_FILTER,
+} from '@/utils/constants';
 import dayjs from 'dayjs';
 
 function getPeriodString(periodValue, frequency, schoolYear = null) {
-  const year = schoolYear || (() => {
-    const y = dayjs().month() >= 8 ? dayjs().year() : dayjs().year() - 1;
-    return `${y}-${y + 1}`;
-  })();
+  const year =
+    schoolYear ||
+    (() => {
+      const y = dayjs().month() >= 8 ? dayjs().year() : dayjs().year() - 1;
+      return `${y}-${y + 1}`;
+    })();
   if (frequency === 1) return `T${periodValue}_${year}`;
   if (frequency === 2) return `S${periodValue}_${year}`;
   if (frequency === 3) return `A_${year}`;
@@ -96,7 +111,7 @@ const COMPETENCY_COLUMNS = [
   {
     key: 'acquired',
     label: 'Acquises',
-    color: 'bg-emerald-100 text-emerald-700',
+    color: 'bg-primary/10 text-secondary',
   },
   {
     key: 'inProgress',
@@ -144,7 +159,7 @@ function PercentBadge({ value, loading, color }) {
   const badgeColor =
     color ||
     (value >= 75
-      ? 'bg-emerald-100 text-emerald-700'
+      ? 'bg-primary/10 text-secondary'
       : value >= 50
         ? 'bg-yellow-100 text-yellow-700'
         : 'bg-red-100 text-red-600');
@@ -176,13 +191,13 @@ export default function Page() {
   const [editingEvalId, setEditingEvalId] = useState(null);
   const [editScore, setEditScore] = useState('');
   const [editAbsent, setEditAbsent] = useState(false);
-  
+
   // Filtrage par année scolaire
   const [activeYearFilter, setActiveYearFilter] = useState(CURRENT_YEAR_FILTER);
   const currentSchoolYear = useMemo(() => getCurrentSchoolYear(), []);
   const nextSchoolYear = useMemo(() => getNextSchoolYear(), []);
   const historicalYears = useMemo(() => getHistoricalYears(5), []);
-  
+
   // Déterminer l'année scolaire sélectionnée
   const selectedSchoolYear = useMemo(() => {
     if (activeYearFilter === CURRENT_YEAR_FILTER) return currentSchoolYear;
@@ -192,10 +207,11 @@ export default function Page() {
     return historicalYears[0];
   }, [activeYearFilter, currentSchoolYear, nextSchoolYear, historicalYears]);
 
-  const periodColumns = useMemo(() => getPeriodColumns(
-    selectedEstablishmentEvaluationFrequency
-  ), [selectedEstablishmentEvaluationFrequency]);
-  
+  const periodColumns = useMemo(
+    () => getPeriodColumns(selectedEstablishmentEvaluationFrequency),
+    [selectedEstablishmentEvaluationFrequency]
+  );
+
   const currentPeriodValue = getCurrentPeriodValue(
     selectedEstablishmentEvaluationFrequency
   );
@@ -228,7 +244,11 @@ export default function Page() {
 
     const tasks = students.flatMap((student) =>
       periodColumns.map(({ value: periodValue }) => {
-        const periodStr = getPeriodString(periodValue, frequency, selectedSchoolYear);
+        const periodStr = getPeriodString(
+          periodValue,
+          frequency,
+          selectedSchoolYear
+        );
         return fetchStudentCompetencies(student.id, periodStr)
           .then((data) => ({ studentId: student.id, periodValue, data }))
           .catch(() => ({ studentId: student.id, periodValue, data: null }));
@@ -280,7 +300,12 @@ export default function Page() {
       setStatsMap(map);
       setStatsLoading(false);
     });
-  }, [students, selectedEstablishmentEvaluationFrequency, selectedSchoolYear, periodColumns]);
+  }, [
+    students,
+    selectedEstablishmentEvaluationFrequency,
+    selectedSchoolYear,
+    periodColumns,
+  ]);
 
   const filteredStudents = students.filter(
     (student) =>
@@ -329,12 +354,16 @@ export default function Page() {
       { key: 'last_name', label: 'Nom' },
       { key: 'first_name', label: 'Prénom' },
       { key: 'birth_date', label: 'Date de naissance' },
-      { key: 'level', label: 'Niveau', transform: (value) => getNiveauLabel(value) },
+      {
+        key: 'level',
+        label: 'Niveau',
+        transform: (value) => getNiveauLabel(value),
+      },
       { key: 'associated_class_name', label: 'Classe' },
-      { 
-        key: 'id', 
+      {
+        key: 'id',
         label: 'Absences',
-        transform: (value) => absencesMap[value] || 0
+        transform: (value) => absencesMap[value] || 0,
       },
     ];
 
@@ -346,7 +375,7 @@ export default function Page() {
         transform: (value) => {
           const stats = statsMap[value];
           return stats?.[key] !== undefined ? `${stats[key]}%` : '';
-        }
+        },
       });
     });
 
@@ -435,6 +464,37 @@ export default function Page() {
     );
   };
 
+  const getBilanForStudent = (student) => {
+    const bilans = Array.isArray(student?.bilans) ? student.bilans : [];
+    if (!bilans.length) return null;
+
+    const currentPeriodStr = currentPeriodValue
+      ? getPeriodString(
+          currentPeriodValue,
+          selectedEstablishmentEvaluationFrequency,
+          selectedSchoolYear
+        )
+      : null;
+
+    if (currentPeriodStr) {
+      const exact = bilans.find(
+        (bilan) => bilan?.period === currentPeriodStr && bilan?.file
+      );
+      if (exact) return exact;
+    }
+
+    const schoolYearSuffix = `_${selectedSchoolYear}`;
+    const sameYearBilans = bilans.filter(
+      (bilan) => bilan?.file && bilan?.period?.endsWith(schoolYearSuffix)
+    );
+
+    if (!sameYearBilans.length) return null;
+
+    return [...sameYearBilans].sort(
+      (a, b) => new Date(b.created_at || 0) - new Date(a.created_at || 0)
+    )[0];
+  };
+
   const columns = [
     { name: 'Photo', transform: () => null },
     { name: 'Élève', transform: () => null },
@@ -494,7 +554,7 @@ export default function Page() {
                 `${FE_ADMIN_STRUCTURE_SCHOOLCLASS_MANAGEMENT_URL}?schoolClassId=${student.associated_class_id}`
               );
             }}
-            className="text-emerald-700 hover:underline font-medium"
+            className="text-secondary hover:underline font-medium"
           >
             {student.associated_class_name}
           </button>
@@ -510,8 +570,23 @@ export default function Page() {
           <span className="text-gray-400 text-xs">0</span>
         );
       case 'Actions':
+        const bilan = getBilanForStudent(student);
+
         return (
           <div className="flex items-center justify-center gap-2">
+            {bilan?.file && (
+              <a
+                href={getSecureFileUrl(bilan.file)}
+                target="_blank"
+                rel="noopener noreferrer"
+                onClick={(e) => e.stopPropagation()}
+                className="flex items-center gap-1 px-2 py-1 rounded text-xs font-medium bg-cyan-100 text-cyan-700 hover:bg-cyan-200 transition whitespace-nowrap"
+                title={`Télécharger le bilan de compétences (${bilan.period})`}
+              >
+                <FileText size={14} />
+                Bilan
+              </a>
+            )}
             <button
               onClick={(e) => {
                 e.stopPropagation();
@@ -534,7 +609,7 @@ export default function Page() {
             <button
               onClick={(e) => handleEvaluer(e, student.id)}
               disabled={!currentPeriodValue}
-              className="flex items-center gap-1 px-2 py-1 rounded text-xs font-medium bg-emerald-100 text-emerald-700 hover:bg-emerald-200 transition whitespace-nowrap disabled:opacity-40 disabled:cursor-not-allowed"
+              className="flex items-center gap-1 px-2 py-1 rounded text-xs font-medium bg-primary/10 text-secondary hover:bg-primary/20 transition whitespace-nowrap disabled:opacity-40 disabled:cursor-not-allowed"
               title="Évaluer"
             >
               <Award size={14} />
@@ -587,7 +662,7 @@ export default function Page() {
         </div>
         <button
           onClick={handleExportCSV}
-          className="flex items-center gap-2 px-4 py-2 text-sm font-medium text-emerald-700 bg-emerald-100 rounded-lg hover:bg-emerald-200 transition-colors ml-4"
+          className="flex items-center gap-2 px-4 py-2 text-sm font-medium text-secondary bg-primary/10 rounded hover:bg-primary/20 transition-colors ml-4"
           title="Exporter en CSV"
         >
           <Download className="w-4 h-4" />
@@ -604,7 +679,22 @@ export default function Page() {
         totalPages={totalPages}
         onPageChange={setCurrentPage}
         emptyMessage={
-          <span className="text-gray-400 text-sm">Aucun élève trouvé</span>
+          students.length === 0 && !searchTerm ? (
+            <EmptyState
+              icon={Users}
+              title="Aucun élève inscrit"
+              description="Commencez par inscrire des élèves pour suivre leur parcours pédagogique."
+              actionLabel="Inscrire un élève"
+              actionIcon={UserPlus}
+              onAction={() => router.push(FE_ADMIN_SUBSCRIPTIONS_CREATE_URL)}
+            />
+          ) : (
+            <EmptyState
+              icon={Search}
+              title="Aucun élève trouvé"
+              description="Modifiez votre recherche pour trouver un élève."
+            />
+          )
         }
       />
 
@@ -615,7 +705,7 @@ export default function Page() {
             {/* Header */}
             <div className="flex items-center justify-between px-6 py-4 border-b bg-gray-50">
               <div>
-                <h2 className="text-lg font-semibold text-gray-800">
+                <h2 className="font-headline text-lg font-semibold text-gray-800">
                   Notes de {gradesModalStudent.first_name}{' '}
                   {gradesModalStudent.last_name}
                 </h2>
@@ -636,7 +726,7 @@ export default function Page() {
             <div className="flex-1 overflow-y-auto p-6">
               {gradesLoading ? (
                 <div className="flex items-center justify-center py-12">
-                  <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-emerald-600"></div>
+                  <div className="animate-spin rounded-full h-8 w-8 border-b-2 border-primary"></div>
                 </div>
               ) : Object.keys(groupedBySubject).length === 0 ? (
                 <div className="text-center py-12 text-gray-400">
@@ -673,13 +763,13 @@ export default function Page() {
                       : null;
 
                     return (
-                      <div className="bg-gradient-to-r from-emerald-50 to-blue-50 rounded-lg p-4 border border-emerald-100">
+                      <div className="bg-gradient-to-r from-primary/5 to-blue-50 rounded-lg p-4 border border-primary/10">
                         <div className="flex items-center justify-between mb-3">
                           <span className="text-sm font-medium text-gray-600">
                             Résumé
                           </span>
                           {overallAvg !== null && (
-                            <span className="text-lg font-bold text-emerald-700">
+                            <span className="text-lg font-bold text-secondary">
                               Moyenne générale : {overallAvg}/20
                             </span>
                           )}
@@ -831,7 +921,7 @@ export default function Page() {
                                             onClick={() =>
                                               handleSaveEval(evalItem)
                                             }
-                                            className="p-1 text-emerald-600 hover:bg-emerald-50 rounded"
+                                            className="p-1 text-primary hover:bg-primary/5 rounded"
                                             title="Enregistrer"
                                           >
                                             <Save size={14} />

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

@@ -70,7 +70,7 @@ export default function StudentCompetenciesPage() {
           'success',
           'Succès'
         );
-        router.push(`/admin/grades/${studentId}`);
+        router.push('/admin/grades');
       })
       .catch((error) => {
         showNotification(
@@ -86,12 +86,12 @@ export default function StudentCompetenciesPage() {
       <div className="flex items-center gap-3 mb-4">
         <button
           onClick={() => router.push('/admin/grades')}
-          className="p-2 rounded-md hover:bg-gray-100 border border-gray-200"
+          className="p-2 rounded hover:bg-gray-100 border border-gray-200 min-h-[44px] min-w-[44px] flex items-center justify-center transition-colors"
           aria-label="Retour à la fiche élève"
         >
           <ArrowLeft size={20} />
         </button>
-        <h1 className="text-xl font-bold text-gray-800">Bilan de compétence</h1>
+        <h1 className="font-headline text-xl font-bold text-gray-800">Bilan de compétence</h1>
       </div>
       <div className="flex-1 min-h-0 flex flex-col">
         <form

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

@@ -12,6 +12,7 @@ import {
   Calendar,
   Settings,
   MessageSquare,
+  MessageCircleHeart,
 } from 'lucide-react';
 
 import Popup from '@/components/Popup';
@@ -24,6 +25,7 @@ import {
   FE_ADMIN_PLANNING_URL,
   FE_ADMIN_SETTINGS_URL,
   FE_ADMIN_MESSAGERIE_URL,
+  FE_ADMIN_FEEDBACK_URL,
 } from '@/utils/Url';
 
 import { disconnect } from '@/app/actions/authAction';
@@ -32,12 +34,13 @@ import Footer from '@/components/Footer';
 import MobileTopbar from '@/components/MobileTopbar';
 import { RIGHTS } from '@/utils/rights';
 import { useEstablishment } from '@/context/EstablishmentContext';
+import { useChatConnection } from '@/context/ChatConnectionContext';
 
 export default function Layout({ children }) {
   const t = useTranslations('sidebar');
   const [isSidebarOpen, setIsSidebarOpen] = useState(false);
-  const { profileRole, establishments, clearContext } =
-    useEstablishment();
+  const { profileRole, establishments, clearContext } = useEstablishment();
+  const { totalUnreadCount, resetUnreadCount } = useChatConnection();
 
   const sidebarItems = {
     admin: {
@@ -81,6 +84,13 @@ export default function Layout({ children }) {
       name: t('messagerie'),
       url: FE_ADMIN_MESSAGERIE_URL,
       icon: MessageSquare,
+      badge: totalUnreadCount,
+    },
+    feedback: {
+      id: 'feedback',
+      name: t('feedback'),
+      url: FE_ADMIN_FEEDBACK_URL,
+      icon: MessageCircleHeart,
     },
     settings: {
       id: 'settings',
@@ -111,7 +121,11 @@ export default function Layout({ children }) {
   useEffect(() => {
     // Fermer la sidebar quand on change de page sur mobile
     setIsSidebarOpen(false);
-  }, [pathname]);
+    // Réinitialiser le compteur non lu quand on ouvre la messagerie
+    if (pathname?.includes('/messagerie')) {
+      resetUnreadCount();
+    }
+  }, [pathname, resetUnreadCount]);
 
   // Filtrage dynamique des items de la sidebar selon le rôle
   let sidebarItemsToDisplay = Object.values(sidebarItems);
@@ -150,7 +164,7 @@ export default function Layout({ children }) {
       )}
 
       {/* Main container */}
-      <div className="absolute overflow-auto bg-gradient-to-br from-emerald-50 via-sky-50 to-emerald-100 top-14 md:top-0 bottom-16 left-0 md:left-64 right-0">
+      <div className="absolute overflow-auto bg-gradient-to-br from-primary/5 via-sky-50 to-primary/10 top-14 md:top-0 bottom-16 left-0 md:left-64 right-0">
         {children}
       </div>
 

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

@@ -1,17 +1,10 @@
 'use client';
 import React from 'react';
 import SidebarTabs from '@/components/SidebarTabs';
-import EmailSender from '@/components/Admin/EmailSender';
 import InstantMessaging from '@/components/Admin/InstantMessaging';
-import logger from '@/utils/logger';
 
 export default function MessageriePage({ csrfToken }) {
   const tabs = [
-    {
-      id: 'email',
-      label: 'Envoyer un Mail',
-      content: <EmailSender csrfToken={csrfToken} />,
-    },
     {
       id: 'instant',
       label: 'Messagerie Instantanée',

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

@@ -174,14 +174,14 @@ export default function DashboardPage() {
         <StatCard
           title={t('pendingRegistrations')}
           value={pendingRegistrationCount}
-          icon={<Clock className="text-green-500" size={24} />}
-          color="green"
+          icon={<Clock className="text-tertiary" size={24} />}
+          color="tertiary"
         />
         <StatCard
           title={t('structureCapacity')}
           value={selectedEstablishmentTotalCapacity}
-          icon={<School className="text-green-500" size={24} />}
-          color="emerald"
+          icon={<School className="text-primary" size={24} />}
+          color="primary"
         />
         <StatCard
           title={t('capacityRate')}
@@ -200,8 +200,8 @@ export default function DashboardPage() {
         {/* Colonne de gauche : Graphique des inscriptions + Présence */}
         <div className="flex flex-col gap-6">
           {/* Graphique des inscriptions */}
-          <div className="bg-stone-50 p-4 md:p-6 rounded-lg shadow-sm border border-gray-100 flex-1">
-            <h2 className="text-lg font-semibold mb-4 md:mb-6">
+          <div className="bg-neutral p-4 md:p-6 rounded-md shadow-sm border border-gray-100 flex-1">
+            <h2 className="font-headline text-lg font-semibold mb-4 md:mb-6">
               {t('inscriptionTrends')}
             </h2>
             <div className="flex flex-col sm:flex-row gap-6 mt-4">
@@ -214,14 +214,14 @@ export default function DashboardPage() {
             </div>
           </div>
           {/* Présence et assiduité */}
-          <div className="bg-stone-50 p-4 md:p-6 rounded-lg shadow-sm border border-gray-100 flex-1">
+          <div className="bg-neutral p-4 md:p-6 rounded-md shadow-sm border border-gray-100 flex-1">
             <Attendance absences={absencesToday} readOnly={true} />
           </div>
         </div>
 
         {/* Colonne de droite : Événements à venir */}
-        <div className="bg-stone-50 p-4 md:p-6 rounded-lg shadow-sm border border-gray-100 flex-1 h-full">
-          <h2 className="text-lg font-semibold mb-4">{t('upcomingEvents')}</h2>
+        <div className="bg-neutral p-4 md:p-6 rounded-md shadow-sm border border-gray-100 flex-1 h-full">
+          <h2 className="font-headline text-lg font-semibold mb-4">{t('upcomingEvents')}</h2>
           {upcomingEvents.map((event, index) => (
             <EventCard key={index} {...event} />
           ))}

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

@@ -9,6 +9,7 @@ import EventModal from '@/components/Calendar/EventModal';
 import ScheduleNavigation from '@/components/Calendar/ScheduleNavigation';
 import { useState } from 'react';
 import { useEstablishment } from '@/context/EstablishmentContext';
+import { usePlanning } from '@/context/PlanningContext';
 
 export default function Page() {
   const [isModalOpen, setIsModalOpen] = useState(false);
@@ -29,33 +30,36 @@ export default function Page() {
   });
   const { selectedEstablishmentId } = useEstablishment();
 
-  const initializeNewEvent = (date = new Date()) => {
-    // S'assurer que date est un objet Date valide
-    const eventDate = date instanceof Date ? date : new Date();
+  const PlanningContent = ({ isDrawerOpen, setIsDrawerOpen, isModalOpen, setIsModalOpen, eventData, setEventData }) => {
+    const { selectedSchedule, schedules } = usePlanning();
 
-    setEventData({
-      title: '',
-      description: '',
-      start: eventDate.toISOString(),
-      end: new Date(eventDate.getTime() + 2 * 60 * 60 * 1000).toISOString(),
-      location: '',
-      planning: '', // Ne pas définir de valeur par défaut ici non plus
-      recursionType: RecurrenceType.NONE,
-      selectedDays: [],
-      recursionEnd: new Date(
-        eventDate.getTime() + 2 * 60 * 60 * 1000
-      ).toISOString(),
-      customInterval: 1,
-      customUnit: 'days',
-    });
-    setIsModalOpen(true);
-  };
+    const initializeNewEvent = (date = new Date()) => {
+      const eventDate = date instanceof Date ? date : new Date();
 
-  return (
-    <PlanningProvider
-      establishmentId={selectedEstablishmentId}
-      modeSet={PlanningModes.PLANNING}
-    >
+      const selected =
+        schedules.find((schedule) => Number(schedule.id) === Number(selectedSchedule)) ||
+        schedules[0];
+
+      setEventData({
+        title: '',
+        description: '',
+        start: eventDate.toISOString(),
+        end: new Date(eventDate.getTime() + 2 * 60 * 60 * 1000).toISOString(),
+        location: '',
+        planning: selected?.id || '',
+        color: selected?.color || '',
+        recursionType: RecurrenceType.NONE,
+        selectedDays: [],
+        recursionEnd: new Date(
+          eventDate.getTime() + 2 * 60 * 60 * 1000
+        ).toISOString(),
+        customInterval: 1,
+        customUnit: 'days',
+      });
+      setIsModalOpen(true);
+    };
+
+    return (
       <div className="flex h-full overflow-hidden">
         <ScheduleNavigation
           isOpen={isDrawerOpen}
@@ -76,6 +80,22 @@ export default function Page() {
           setEventData={setEventData}
         />
       </div>
+    );
+  };
+
+  return (
+    <PlanningProvider
+      establishmentId={selectedEstablishmentId}
+      modeSet={PlanningModes.PLANNING}
+    >
+      <PlanningContent
+        isDrawerOpen={isDrawerOpen}
+        setIsDrawerOpen={setIsDrawerOpen}
+        isModalOpen={isModalOpen}
+        setIsModalOpen={setIsModalOpen}
+        eventData={eventData}
+        setEventData={setEventData}
+      />
     </PlanningProvider>
   );
 }

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

@@ -1,7 +1,5 @@
 'use client';
 import React, { useState, useEffect } from 'react';
-import Tab from '@/components/Tab';
-import TabContent from '@/components/TabContent';
 import Button from '@/components/Form/Button';
 import InputText from '@/components/Form/InputText';
 import CheckBox from '@/components/Form/CheckBox'; // Import du composant CheckBox
@@ -13,13 +11,8 @@ import {
 import { useEstablishment } from '@/context/EstablishmentContext';
 import { useCsrfToken } from '@/context/CsrfContext'; // Import du hook pour récupérer le csrfToken
 import { useNotification } from '@/context/NotificationContext';
-import { useSearchParams } from 'next/navigation'; // Ajoute cet import
 
 export default function SettingsPage() {
-  const [activeTab, setActiveTab] = useState('smtp');
-  const [email, setEmail] = useState('');
-  const [password, setPassword] = useState('');
-  const [confirmPassword, setConfirmPassword] = useState('');
   const [smtpServer, setSmtpServer] = useState('');
   const [smtpPort, setSmtpPort] = useState('');
   const [smtpUser, setSmtpUser] = useState('');
@@ -29,23 +22,10 @@ export default function SettingsPage() {
   const { selectedEstablishmentId } = useEstablishment();
   const csrfToken = useCsrfToken(); // Récupération du csrfToken
   const { showNotification } = useNotification();
-  const searchParams = useSearchParams();
-
-  const handleTabClick = (tab) => {
-    setActiveTab(tab);
-  };
-
-  // Ajout : sélection automatique de l'onglet via l'ancre ou le paramètre de recherche
-  useEffect(() => {
-    const tabParam = searchParams.get('tab');
-    if (tabParam === 'smtp') {
-      setActiveTab('smtp');
-    }
-  }, [searchParams]);
 
   // Charger les paramètres SMTP existants
   useEffect(() => {
-    if (activeTab === 'smtp') {
+    if (csrfToken && selectedEstablishmentId) {
       fetchSmtpSettings(csrfToken, selectedEstablishmentId) // Passer le csrfToken ici
         .then((data) => {
           setSmtpServer(data.smtp_server || '');
@@ -75,7 +55,7 @@ export default function SettingsPage() {
           }
         });
     }
-  }, [activeTab, csrfToken]); // Ajouter csrfToken comme dépendance
+  }, [csrfToken, selectedEstablishmentId]);
 
   const handleSmtpServerChange = (e) => {
     setSmtpServer(e.target.value);
@@ -128,66 +108,63 @@ export default function SettingsPage() {
   };
 
   return (
-    <div className="p-8">
-      <div className="flex space-x-4 mb-4">
-        <Tab
-          text="Paramètres SMTP"
-          active={activeTab === 'smtp'}
-          onClick={() => handleTabClick('smtp')}
-        />
-      </div>
-      <div className="mt-4">
-        <TabContent isActive={activeTab === 'smtp'}>
-          <form onSubmit={handleSmtpSubmit}>
-            <div className="grid grid-cols-2 gap-4">
-              <InputText
-                label="Serveur SMTP"
-                value={smtpServer}
-                onChange={handleSmtpServerChange}
+    <div className="p-6">
+      <h1 className="font-headline text-2xl font-bold text-gray-900 mb-6">
+        Paramètres
+      </h1>
+      <div className="bg-white rounded-md border border-gray-200 shadow-sm p-6">
+        <h2 className="font-headline text-lg font-semibold text-gray-800 mb-4">
+          Paramètres SMTP
+        </h2>
+        <form onSubmit={handleSmtpSubmit}>
+          <div className="grid grid-cols-2 gap-4">
+            <InputText
+              label="Serveur SMTP"
+              value={smtpServer}
+              onChange={handleSmtpServerChange}
+            />
+            <InputText
+              label="Port SMTP"
+              value={smtpPort}
+              onChange={handleSmtpPortChange}
+            />
+            <InputText
+              label="Utilisateur SMTP"
+              value={smtpUser}
+              onChange={handleSmtpUserChange}
+            />
+            <InputText
+              label="Mot de passe SMTP"
+              type="password"
+              value={smtpPassword}
+              onChange={handleSmtpPasswordChange}
+            />
+          </div>
+          <div className="mt-6 border-t pt-4">
+            <div className="flex items-center space-x-4">
+              <CheckBox
+                item={{ id: 'useTls' }}
+                formData={{ useTls }}
+                handleChange={() => setUseTls((prev) => !prev)} // Inverser la valeur booléenne
+                fieldName="useTls"
+                itemLabelFunc={() => 'Utiliser TLS'}
               />
-              <InputText
-                label="Port SMTP"
-                value={smtpPort}
-                onChange={handleSmtpPortChange}
-              />
-              <InputText
-                label="Utilisateur SMTP"
-                value={smtpUser}
-                onChange={handleSmtpUserChange}
-              />
-              <InputText
-                label="Mot de passe SMTP"
-                type="password"
-                value={smtpPassword}
-                onChange={handleSmtpPasswordChange}
+              <CheckBox
+                item={{ id: 'useSsl' }}
+                formData={{ useSsl }}
+                handleChange={() => setUseSsl((prev) => !prev)} // Inverser la valeur booléenne
+                fieldName="useSsl"
+                itemLabelFunc={() => 'Utiliser SSL'}
               />
             </div>
-            <div className="mt-6 border-t pt-4">
-              <div className="flex items-center space-x-4">
-                <CheckBox
-                  item={{ id: 'useTls' }}
-                  formData={{ useTls }}
-                  handleChange={() => setUseTls((prev) => !prev)} // Inverser la valeur booléenne
-                  fieldName="useTls"
-                  itemLabelFunc={() => 'Utiliser TLS'}
-                />
-                <CheckBox
-                  item={{ id: 'useSsl' }}
-                  formData={{ useSsl }}
-                  handleChange={() => setUseSsl((prev) => !prev)} // Inverser la valeur booléenne
-                  fieldName="useSsl"
-                  itemLabelFunc={() => 'Utiliser SSL'}
-                />
-              </div>
-            </div>
-            <Button
-              type="submit"
-              primary
-              text="Mettre à jour"
-              className="mt-6"
-            ></Button>
-          </form>
-        </TabContent>
+          </div>
+          <Button
+            type="submit"
+            primary
+            text="Mettre à jour"
+            className="mt-6"
+          ></Button>
+        </form>
       </div>
     </div>
   );

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

@@ -0,0 +1,225 @@
+'use client';
+import React, { useEffect, useMemo, useState } from 'react';
+import { useSearchParams, useRouter } from 'next/navigation';
+import { ArrowLeft } from 'lucide-react';
+import FormTemplateBuilder from '@/components/Form/FormTemplateBuilder';
+import { useEstablishment } from '@/context/EstablishmentContext';
+import { useCsrfToken } from '@/context/CsrfContext';
+import {
+  fetchRegistrationFileGroups,
+  fetchRegistrationSchoolFileMasterById,
+  createRegistrationSchoolFileMaster,
+  editRegistrationSchoolFileMaster,
+} from '@/app/actions/registerFileGroupAction';
+import { getSecureFileUrl } from '@/utils/fileUrl';
+import logger from '@/utils/logger';
+import { useNotification } from '@/context/NotificationContext';
+import { FE_ADMIN_STRUCTURE_URL } from '@/utils/Url';
+
+export default function FormBuilderPage() {
+  const searchParams = useSearchParams();
+  const router = useRouter();
+  const { selectedEstablishmentId } = useEstablishment();
+  const csrfToken = useCsrfToken();
+  const { showNotification } = useNotification();
+
+  const formId = searchParams.get('id');
+  const preGroupId = searchParams.get('groupId');
+  const isEditing = !!formId;
+
+  const [groups, setGroups] = useState([]);
+  const [initialData, setInitialData] = useState(null);
+  const [loading, setLoading] = useState(true);
+  const [uploadedFile, setUploadedFile] = useState(null);
+  const [existingFileUrl, setExistingFileUrl] = useState(null);
+
+  const normalizeBackendFile = (rawFile, rawFileUrl) => {
+    if (typeof rawFileUrl === 'string' && rawFileUrl.trim()) {
+      return rawFileUrl;
+    }
+
+    if (typeof rawFile === 'string' && rawFile.trim()) {
+      return rawFile;
+    }
+
+    if (rawFile && typeof rawFile === 'object') {
+      if (typeof rawFile.url === 'string' && rawFile.url.trim()) {
+        return rawFile.url;
+      }
+      if (typeof rawFile.path === 'string' && rawFile.path.trim()) {
+        return rawFile.path;
+      }
+      if (typeof rawFile.name === 'string' && rawFile.name.trim()) {
+        return rawFile.name;
+      }
+    }
+
+    return null;
+  };
+
+  const previewFileUrl = useMemo(() => {
+    if (uploadedFile instanceof File) {
+      return URL.createObjectURL(uploadedFile);
+    }
+    return existingFileUrl || null;
+  }, [uploadedFile, existingFileUrl]);
+
+  useEffect(() => {
+    return () => {
+      if (previewFileUrl && previewFileUrl.startsWith('blob:')) {
+        URL.revokeObjectURL(previewFileUrl);
+      }
+    };
+  }, [previewFileUrl]);
+
+  useEffect(() => {
+    if (!selectedEstablishmentId) return;
+
+    Promise.all([
+      fetchRegistrationFileGroups(selectedEstablishmentId),
+      formId ? fetchRegistrationSchoolFileMasterById(formId) : Promise.resolve(null),
+    ])
+      .then(([groupsData, formData]) => {
+        setGroups(groupsData || []);
+        if (formData) {
+          setInitialData(formData);
+          const resolvedFile = normalizeBackendFile(
+            formData.file,
+            formData.file_url
+          );
+          if (resolvedFile) {
+            setExistingFileUrl(resolvedFile);
+          }
+        } else if (preGroupId) {
+          setInitialData({ groups: [{ id: Number(preGroupId) }] });
+        }
+      })
+      .catch((err) => {
+        logger.error('Error loading FormBuilder data:', err);
+      })
+      .finally(() => {
+        setLoading(false);
+      });
+  }, [selectedEstablishmentId, formId, preGroupId]);
+
+  const buildFormData = async (name, group_ids, formMasterData) => {
+    const dataToSend = new FormData();
+    dataToSend.append(
+      'data',
+      JSON.stringify({
+        name,
+        groups: group_ids,
+        formMasterData,
+        establishment: selectedEstablishmentId,
+      })
+    );
+
+    if (uploadedFile instanceof File) {
+      const ext =
+        uploadedFile.name.lastIndexOf('.') !== -1
+          ? uploadedFile.name.substring(uploadedFile.name.lastIndexOf('.'))
+          : '';
+      const cleanName = (name || 'document')
+        .replace(/[^a-zA-Z0-9_\-]/g, '_')
+        .replace(/_+/g, '_')
+        .replace(/^_+|_+$/g, '');
+      dataToSend.append('file', uploadedFile, `${cleanName}${ext}`);
+    } else if (existingFileUrl && isEditing) {
+      const lastDot = existingFileUrl.lastIndexOf('.');
+      const ext = lastDot !== -1 ? existingFileUrl.substring(lastDot) : '';
+      const cleanName = (name || 'document')
+        .replace(/[^a-zA-Z0-9_\-]/g, '_')
+        .replace(/_+/g, '_')
+        .replace(/^_+|_+$/g, '');
+      try {
+        const resp = await fetch(getSecureFileUrl(existingFileUrl));
+        if (resp.ok) {
+          const blob = await resp.blob();
+          dataToSend.append('file', blob, `${cleanName}${ext}`);
+        }
+      } catch (e) {
+        logger.error('Could not re-fetch existing file:', e);
+      }
+    }
+
+    return dataToSend;
+  };
+
+  const handleSave = async ({ name, group_ids, formMasterData, id }) => {
+    const hasFileField = (formMasterData?.fields || []).some(
+      (field) => field.type === 'file'
+    );
+    const hasUploadedDocument =
+      uploadedFile instanceof File || Boolean(existingFileUrl);
+
+    if (hasFileField && !hasUploadedDocument) {
+      showNotification(
+        'Un document PDF doit être uploadé si le formulaire contient un champ fichier.',
+        'error',
+        'Erreur'
+      );
+      return;
+    }
+
+    try {
+      const dataToSend = await buildFormData(name, group_ids, formMasterData);
+      if (isEditing) {
+        await editRegistrationSchoolFileMaster(id || formId, dataToSend, csrfToken);
+        showNotification(
+          `Le formulaire "${name}" a été modifié avec succès.`,
+          'success',
+          'Succès'
+        );
+      } else {
+        await createRegistrationSchoolFileMaster(dataToSend, csrfToken);
+        showNotification(
+          `Le formulaire "${name}" a été créé avec succès.`,
+          'success',
+          'Succès'
+        );
+      }
+      router.push(FE_ADMIN_STRUCTURE_URL);
+    } catch (err) {
+      logger.error('Error saving form:', err);
+      showNotification('Erreur lors de la sauvegarde du formulaire', 'error', 'Erreur');
+    }
+  };
+
+  if (loading) {
+    return (
+      <div className="flex items-center justify-center min-h-screen">
+        <p className="text-gray-500">Chargement...</p>
+      </div>
+    );
+  }
+
+  return (
+    <div className="w-full min-h-screen bg-neutral">
+      {/* Header sticky */}
+      <div className="sticky top-0 z-10 bg-white border-b border-gray-200 px-4 py-3 flex items-center gap-4">
+        <button
+          onClick={() => router.push(FE_ADMIN_STRUCTURE_URL)}
+          className="flex items-center gap-2 text-primary hover:text-secondary font-label font-medium transition-colors"
+        >
+          <ArrowLeft size={20} />
+          Retour
+        </button>
+        <h1 className="font-headline text-lg font-headline font-semibold text-gray-800">
+          {isEditing ? 'Modifier le formulaire' : 'Créer un formulaire personnalisé'}
+        </h1>
+      </div>
+
+      <div className="max-w-5xl mx-auto px-4 py-6 space-y-4">
+        {/* FormTemplateBuilder */}
+        <FormTemplateBuilder
+          onSave={handleSave}
+          initialData={initialData}
+          groups={groups}
+          isEditing={isEditing}
+          masterFile={previewFileUrl}
+          onMasterFileUpload={(file) => setUploadedFile(file)}
+        />
+      </div>
+    </div>
+  );
+}

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

@@ -1,10 +1,28 @@
 'use client';
 
 import React, { useState, useEffect } from 'react';
-import { Users, Layers, CheckCircle, Clock, XCircle, ClipboardList, Plus } from 'lucide-react';
+import {
+  Users,
+  Layers,
+  CheckCircle,
+  Clock,
+  XCircle,
+  ClipboardList,
+  Plus,
+} from 'lucide-react';
 import Table from '@/components/Table';
 import Popup from '@/components/Popup';
-import { fetchClasse, fetchSpecialities, fetchEvaluations, createEvaluation, updateEvaluation, deleteEvaluation, fetchStudentEvaluations, saveStudentEvaluations, deleteStudentEvaluation } from '@/app/actions/schoolAction';
+import {
+  fetchClasse,
+  fetchSpecialities,
+  fetchEvaluations,
+  createEvaluation,
+  updateEvaluation,
+  deleteEvaluation,
+  fetchStudentEvaluations,
+  saveStudentEvaluations,
+  deleteStudentEvaluation,
+} from '@/app/actions/schoolAction';
 import { useSearchParams } from 'next/navigation';
 import logger from '@/utils/logger';
 import { useClasses } from '@/context/ClassesContext';
@@ -17,7 +35,11 @@ import {
   editAbsences,
   deleteAbsences,
 } from '@/app/actions/subscriptionAction';
-import { EvaluationForm, EvaluationList, EvaluationGradeTable } from '@/components/Evaluation';
+import {
+  EvaluationForm,
+  EvaluationList,
+  EvaluationGradeTable,
+} from '@/components/Evaluation';
 
 import { useCsrfToken } from '@/context/CsrfContext';
 import { useEstablishment } from '@/context/EstablishmentContext';
@@ -53,14 +75,15 @@ export default function Page() {
   const [editingEvaluation, setEditingEvaluation] = useState(null);
 
   const csrfToken = useCsrfToken();
-  const { selectedEstablishmentId, selectedEstablishmentEvaluationFrequency } = useEstablishment();
+  const { selectedEstablishmentId, selectedEstablishmentEvaluationFrequency } =
+    useEstablishment();
 
   // Périodes selon la fréquence d'évaluation
   const getPeriods = () => {
     const year = dayjs().month() >= 8 ? dayjs().year() : dayjs().year() - 1;
     const nextYear = (year + 1).toString();
     const schoolYear = `${year}-${nextYear}`;
-    
+
     if (selectedEstablishmentEvaluationFrequency === 1) {
       return [
         { label: 'Trimestre 1', value: `T1_${schoolYear}` },
@@ -205,21 +228,32 @@ export default function Page() {
     }
   }, [filteredStudents, fetchedAbsences]);
 
-  // Load specialities for evaluations
+  // Load specialities for evaluations (filtered by current school year)
   useEffect(() => {
     if (selectedEstablishmentId) {
-      fetchSpecialities(selectedEstablishmentId)
+      const year = dayjs().month() >= 8 ? dayjs().year() : dayjs().year() - 1;
+      const currentSchoolYear = `${year}-${year + 1}`;
+      fetchSpecialities(selectedEstablishmentId, currentSchoolYear)
         .then((data) => setSpecialities(data))
-        .catch((error) => logger.error('Erreur lors du chargement des matières:', error));
+        .catch((error) =>
+          logger.error('Erreur lors du chargement des matières:', error)
+        );
     }
   }, [selectedEstablishmentId]);
 
   // Load evaluations when tab is active and period is selected
   useEffect(() => {
-    if (activeTab === 'evaluations' && selectedEstablishmentId && schoolClassId && selectedPeriod) {
+    if (
+      activeTab === 'evaluations' &&
+      selectedEstablishmentId &&
+      schoolClassId &&
+      selectedPeriod
+    ) {
       fetchEvaluations(selectedEstablishmentId, schoolClassId, selectedPeriod)
         .then((data) => setEvaluations(data))
-        .catch((error) => logger.error('Erreur lors du chargement des évaluations:', error));
+        .catch((error) =>
+          logger.error('Erreur lors du chargement des évaluations:', error)
+        );
     }
   }, [activeTab, selectedEstablishmentId, schoolClassId, selectedPeriod]);
 
@@ -228,7 +262,9 @@ export default function Page() {
     if (selectedEvaluation && schoolClassId) {
       fetchStudentEvaluations(null, selectedEvaluation.id, null, schoolClassId)
         .then((data) => setStudentEvaluations(data))
-        .catch((error) => logger.error('Erreur lors du chargement des notes:', error));
+        .catch((error) =>
+          logger.error('Erreur lors du chargement des notes:', error)
+        );
     }
   }, [selectedEvaluation, schoolClassId]);
 
@@ -239,7 +275,11 @@ export default function Page() {
       showNotification('Évaluation créée avec succès', 'success', 'Succès');
       setShowEvaluationForm(false);
       // Reload evaluations
-      const updatedEvaluations = await fetchEvaluations(selectedEstablishmentId, schoolClassId, selectedPeriod);
+      const updatedEvaluations = await fetchEvaluations(
+        selectedEstablishmentId,
+        schoolClassId,
+        selectedPeriod
+      );
       setEvaluations(updatedEvaluations);
     } catch (error) {
       logger.error('Erreur lors de la création:', error);
@@ -259,7 +299,11 @@ export default function Page() {
       setShowEvaluationForm(false);
       setEditingEvaluation(null);
       // Reload evaluations
-      const updatedEvaluations = await fetchEvaluations(selectedEstablishmentId, schoolClassId, selectedPeriod);
+      const updatedEvaluations = await fetchEvaluations(
+        selectedEstablishmentId,
+        schoolClassId,
+        selectedPeriod
+      );
       setEvaluations(updatedEvaluations);
     } catch (error) {
       logger.error('Erreur lors de la modification:', error);
@@ -270,20 +314,31 @@ export default function Page() {
   const handleDeleteEvaluation = async (evaluationId) => {
     await deleteEvaluation(evaluationId, csrfToken);
     // Reload evaluations
-    const updatedEvaluations = await fetchEvaluations(selectedEstablishmentId, schoolClassId, selectedPeriod);
+    const updatedEvaluations = await fetchEvaluations(
+      selectedEstablishmentId,
+      schoolClassId,
+      selectedPeriod
+    );
     setEvaluations(updatedEvaluations);
   };
 
   const handleSaveGrades = async (gradesData) => {
     await saveStudentEvaluations(gradesData, csrfToken);
     // Reload student evaluations
-    const updatedStudentEvaluations = await fetchStudentEvaluations(null, selectedEvaluation.id, null, schoolClassId);
+    const updatedStudentEvaluations = await fetchStudentEvaluations(
+      null,
+      selectedEvaluation.id,
+      null,
+      schoolClassId
+    );
     setStudentEvaluations(updatedStudentEvaluations);
   };
 
   const handleDeleteGrade = async (studentEvalId) => {
     await deleteStudentEvaluation(studentEvalId, csrfToken);
-    setStudentEvaluations((prev) => prev.filter((se) => se.id !== studentEvalId));
+    setStudentEvaluations((prev) =>
+      prev.filter((se) => se.id !== studentEvalId)
+    );
   };
 
   const handleLevelClick = (label) => {
@@ -541,14 +596,16 @@ export default function Page() {
 
   return (
     <div className="p-6 space-y-6">
-      <h1 className="text-2xl font-bold">{classe?.atmosphere_name}</h1>
+      <h1 className="font-headline text-2xl font-bold">
+        {classe?.atmosphere_name}
+      </h1>
 
       {/* Section Niveaux et Enseignants */}
       <div className="grid grid-cols-1 md:grid-cols-2 gap-4">
         {/* Section Niveaux */}
-        <div className="bg-white p-4 rounded-lg shadow-md">
-          <h2 className="text-xl font-semibold mb-4 flex items-center">
-            <Layers className="w-6 h-6 mr-2" />
+        <div className="bg-white p-4 rounded-md shadow-sm">
+          <h2 className="font-headline text-xl font-semibold mb-4 flex items-center">
+            <Layers className="w-6 h-6 mr-2 text-primary" />
             Niveaux
           </h2>
           <p className="text-sm text-gray-500 mb-4">
@@ -557,24 +614,24 @@ export default function Page() {
           <div className="flex flex-wrap gap-2">
             {classe?.levels?.length > 0 ? (
               getNiveauxLabels(classe.levels).map((label, index) => (
-                <span
+                <button
                   key={index}
-                  onClick={() => handleLevelClick(label)} // Gérer le clic sur un niveau
-                  className={`px-4 py-2 rounded-full cursor-pointer border transition-all duration-200 ${
+                  onClick={() => handleLevelClick(label)}
+                  className={`px-4 py-2 rounded font-label font-medium cursor-pointer border transition-colors min-h-[44px] ${
                     selectedLevels.includes(label)
-                      ? 'bg-emerald-200 text-emerald-800 border-emerald-300 shadow-md'
+                      ? 'bg-primary/20 text-secondary border-primary/30 shadow-sm'
                       : 'bg-gray-200 text-gray-800 border-gray-300 hover:bg-gray-300'
                   }`}
                 >
                   {selectedLevels.includes(label) ? (
                     <span className="flex items-center gap-2">
-                      <CheckCircle className="w-4 h-4 text-emerald-600" />
+                      <CheckCircle className="w-4 h-4 text-primary" />
                       {label}
                     </span>
                   ) : (
                     label
                   )}
-                </span>
+                </button>
               ))
             ) : (
               <span className="text-gray-500">Aucun niveau associé</span>
@@ -583,9 +640,9 @@ export default function Page() {
         </div>
 
         {/* Section Enseignants */}
-        <div className="bg-white p-4 rounded-lg shadow-md">
-          <h2 className="text-xl font-semibold mb-4 flex items-center">
-            <Users className="w-6 h-6 mr-2" />
+        <div className="bg-white p-4 rounded-md shadow-sm">
+          <h2 className="font-headline text-xl font-semibold mb-4 flex items-center">
+            <Users className="w-6 h-6 mr-2 text-primary" />
             Enseignants
           </h2>
           <p className="text-sm text-gray-500 mb-4">Liste des enseignants</p>
@@ -593,7 +650,7 @@ export default function Page() {
             {classe?.teachers_details?.map((teacher) => (
               <span
                 key={teacher.id}
-                className="px-3 py-1 bg-emerald-200 rounded-full text-emerald-800"
+                className="px-3 py-1 bg-primary/20 rounded text-secondary font-label text-sm"
               >
                 {teacher.last_name} {teacher.first_name}
               </span>
@@ -603,14 +660,14 @@ export default function Page() {
       </div>
 
       {/* Tabs Navigation */}
-      <div className="bg-white rounded-lg shadow-md overflow-hidden">
+      <div className="bg-white rounded-md shadow-sm overflow-hidden">
         <div className="flex border-b border-gray-200">
           <button
             onClick={() => setActiveTab('attendance')}
-            className={`flex-1 py-3 px-4 text-center font-medium transition-colors ${
+            className={`flex-1 py-3 px-4 text-center font-label font-medium transition-colors min-h-[44px] ${
               activeTab === 'attendance'
-                ? 'text-emerald-600 border-b-2 border-emerald-600 bg-emerald-50'
-                : 'text-gray-500 hover:text-gray-700 hover:bg-gray-50'
+                ? 'text-primary border-b-2 border-primary bg-primary/5'
+                : 'text-gray-500 hover:text-secondary hover:bg-gray-50'
             }`}
           >
             <div className="flex items-center justify-center gap-2">
@@ -620,10 +677,10 @@ export default function Page() {
           </button>
           <button
             onClick={() => setActiveTab('evaluations')}
-            className={`flex-1 py-3 px-4 text-center font-medium transition-colors ${
+            className={`flex-1 py-3 px-4 text-center font-label font-medium transition-colors min-h-[44px] ${
               activeTab === 'evaluations'
-                ? 'text-emerald-600 border-b-2 border-emerald-600 bg-emerald-50'
-                : 'text-gray-500 hover:text-gray-700 hover:bg-gray-50'
+                ? 'text-primary border-b-2 border-primary bg-primary/5'
+                : 'text-gray-500 hover:text-secondary hover:bg-gray-50'
             }`}
           >
             <div className="flex items-center justify-center gap-2">
@@ -638,14 +695,14 @@ export default function Page() {
       {activeTab === 'attendance' && (
         <>
           {/* Affichage de la date du jour */}
-          <div className="flex justify-between items-center mb-4 bg-white p-4 rounded-lg shadow-md">
+          <div className="flex justify-between items-center mb-4 bg-white p-4 rounded-md shadow-sm">
             <div className="flex items-center space-x-3">
-              <div className="flex items-center justify-center w-10 h-10 bg-emerald-100 text-emerald-600 rounded-full">
+              <div className="flex items-center justify-center w-10 h-10 bg-primary/10 text-primary rounded">
                 <Clock className="w-6 h-6" />
               </div>
-              <h2 className="text-lg font-semibold text-gray-800">
+              <h2 className="font-headline text-lg font-semibold text-gray-800">
                 Appel du jour :{' '}
-                <span className="ml-2 text-emerald-600">{today}</span>
+                <span className="ml-2 text-primary">{today}</span>
               </h2>
             </div>
             <div className="flex items-center">
@@ -654,14 +711,14 @@ export default function Page() {
                   text="Faire l'appel"
                   onClick={handleToggleAttendanceMode}
                   primary
-                  className="px-4 py-2 bg-emerald-500 text-white rounded-lg shadow hover:bg-emerald-600 transition-all"
+                  className="px-4 py-2 bg-primary text-white font-label font-medium rounded shadow-sm hover:bg-secondary transition-colors min-h-[44px]"
                 />
               ) : (
                 <Button
                   text="Valider l'appel"
                   onClick={handleValidateAttendance}
                   primary
-                  className="px-4 py-2 bg-emerald-500 text-white rounded-lg shadow hover:bg-emerald-600 transition-all"
+                  className="px-4 py-2 bg-primary text-white font-label font-medium rounded shadow-sm hover:bg-secondary transition-colors min-h-[44px]"
                 />
               )}
             </div>
@@ -679,218 +736,224 @@ export default function Page() {
                 name: 'Prénom',
                 transform: (row) => (
                   <div className="text-center">{row.first_name}</div>
-            ),
-          },
-          {
-            name: 'Niveau',
-            transform: (row) => (
-              <div className="text-center">{getNiveauLabel(row.level)}</div>
-            ),
-          },
-          ...(isEditingAttendance
-            ? [
-                {
-                  name: "Gestion de l'appel",
-                  transform: (row) => (
-                    <div className="flex flex-col gap-2 items-center">
-                      {/* Présence */}
-                      <div className="flex items-center gap-2">
-                        {attendance[row.id] ? (
-                          <>
-                            <CheckBox
-                              item={{ id: row.id }}
-                              formData={{
-                                attendance: attendance[row.id] ? [row.id] : [],
-                              }}
-                              handleChange={() =>
-                                handleAttendanceChange(row.id)
-                              }
-                              fieldName="attendance"
-                            />
-                            <span className="text-sm font-medium text-gray-700">
-                              Présent
-                            </span>
-                          </>
-                        ) : (
-                          <>
-                            {/* Icône croix pour remettre l'élève en présent */}
-                            <button
-                              type="button"
-                              onClick={() => handleAttendanceChange(row.id)}
-                              className="text-red-500 hover:text-red-700 transition"
-                              title="Annuler l'absence"
-                            >
-                              <XCircle className="w-6 h-6" />
-                            </button>
-                            <span className="text-sm font-medium text-red-600">
-                              Effacer l&apos;absence
-                            </span>
-                          </>
-                        )}
-                      </div>
-
-                      {/* Détails absence/retard */}
-                      {!attendance[row.id] && (
-                        <div className="w-full bg-emerald-50 border border-emerald-100 rounded-lg p-3 mt-2 shadow-sm">
-                          <div className="flex items-center gap-2 mb-2">
-                            <Clock className="w-4 h-4 text-emerald-500" />
-                            <span className="font-semibold text-emerald-700 text-sm">
-                              Motif d&apos;absence
-                            </span>
+                ),
+              },
+              {
+                name: 'Niveau',
+                transform: (row) => (
+                  <div className="text-center">{getNiveauLabel(row.level)}</div>
+                ),
+              },
+              ...(isEditingAttendance
+                ? [
+                    {
+                      name: "Gestion de l'appel",
+                      transform: (row) => (
+                        <div className="flex flex-col gap-2 items-center">
+                          {/* Présence */}
+                          <div className="flex items-center gap-2">
+                            {attendance[row.id] ? (
+                              <>
+                                <CheckBox
+                                  item={{ id: row.id }}
+                                  formData={{
+                                    attendance: attendance[row.id]
+                                      ? [row.id]
+                                      : [],
+                                  }}
+                                  handleChange={() =>
+                                    handleAttendanceChange(row.id)
+                                  }
+                                  fieldName="attendance"
+                                />
+                                <span className="text-sm font-medium text-gray-700">
+                                  Présent
+                                </span>
+                              </>
+                            ) : (
+                              <>
+                                {/* Icône croix pour remettre l'élève en présent */}
+                                <button
+                                  type="button"
+                                  onClick={() => handleAttendanceChange(row.id)}
+                                  className="text-red-500 hover:text-red-700 transition"
+                                  title="Annuler l'absence"
+                                >
+                                  <XCircle className="w-6 h-6" />
+                                </button>
+                                <span className="text-sm font-medium text-red-600">
+                                  Effacer l&apos;absence
+                                </span>
+                              </>
+                            )}
                           </div>
-                          <div className="grid grid-cols-1 md:grid-cols-4 gap-2 items-center">
-                            {/* Select Absence/Retard */}
-                            <SelectChoice
-                              name={`type-${row.id}`}
-                              label=""
-                              placeHolder="Type"
-                              selected={formAbsences[row.id]?.type || ''}
-                              callback={(e) =>
-                                setFormAbsences((prev) => ({
-                                  ...prev,
-                                  [row.id]: {
-                                    ...prev[row.id],
-                                    type: e.target.value,
-                                  },
-                                }))
-                              }
-                              choices={[
-                                { value: 'absence', label: 'Absence' },
-                                { value: 'retard', label: 'Retard' },
-                              ]}
-                            />
 
-                            {/* Select Moment */}
-                            <SelectChoice
-                              name={`moment-${row.id}`}
-                              label=""
-                              placeHolder="Durée"
-                              selected={formAbsences[row.id]?.moment || ''}
-                              callback={(e) =>
-                                setFormAbsences((prev) => ({
-                                  ...prev,
-                                  [row.id]: {
-                                    ...prev[row.id],
-                                    moment: parseInt(e.target.value, 10),
-                                  },
-                                }))
-                              }
-                              choices={Object.values(AbsenceMoment).map(
-                                (moment) => ({
-                                  value: moment.value,
-                                  label: moment.label,
-                                })
-                              )}
-                            />
+                          {/* Détails absence/retard */}
+                          {!attendance[row.id] && (
+                            <div className="w-full bg-primary/5 border border-primary/10 rounded-lg p-3 mt-2 shadow-sm">
+                              <div className="flex items-center gap-2 mb-2">
+                                <Clock className="w-4 h-4 text-primary" />
+                                <span className="font-semibold text-secondary text-sm">
+                                  Motif d&apos;absence
+                                </span>
+                              </div>
+                              <div className="grid grid-cols-1 md:grid-cols-4 gap-2 items-center">
+                                {/* Select Absence/Retard */}
+                                <SelectChoice
+                                  name={`type-${row.id}`}
+                                  label=""
+                                  placeHolder="Type"
+                                  selected={formAbsences[row.id]?.type || ''}
+                                  callback={(e) =>
+                                    setFormAbsences((prev) => ({
+                                      ...prev,
+                                      [row.id]: {
+                                        ...prev[row.id],
+                                        type: e.target.value,
+                                      },
+                                    }))
+                                  }
+                                  choices={[
+                                    { value: 'absence', label: 'Absence' },
+                                    { value: 'retard', label: 'Retard' },
+                                  ]}
+                                />
 
-                            {/* Nouveau champ commentaire */}
-                            <input
-                              type="text"
-                              className="border rounded px-2 py-1 text-sm w-full"
-                              placeholder="Commentaire"
-                              value={formAbsences[row.id]?.commentaire || ''}
-                              onChange={(e) =>
-                                setFormAbsences((prev) => ({
-                                  ...prev,
-                                  [row.id]: {
-                                    ...prev[row.id],
-                                    commentaire: e.target.value,
-                                  },
-                                }))
-                              }
-                            />
+                                {/* Select Moment */}
+                                <SelectChoice
+                                  name={`moment-${row.id}`}
+                                  label=""
+                                  placeHolder="Durée"
+                                  selected={formAbsences[row.id]?.moment || ''}
+                                  callback={(e) =>
+                                    setFormAbsences((prev) => ({
+                                      ...prev,
+                                      [row.id]: {
+                                        ...prev[row.id],
+                                        moment: parseInt(e.target.value, 10),
+                                      },
+                                    }))
+                                  }
+                                  choices={Object.values(AbsenceMoment).map(
+                                    (moment) => ({
+                                      value: moment.value,
+                                      label: moment.label,
+                                    })
+                                  )}
+                                />
 
-                            {/* Checkbox Justifié */}
-                            <div className="flex items-center gap-2 justify-center">
-                              <CheckBox
-                                item={{ id: `justified-${row.id}` }}
-                                formData={{
-                                  justified: !!formAbsences[row.id]?.justified,
-                                }}
-                                handleChange={() =>
-                                  setFormAbsences((prev) => ({
-                                    ...prev,
-                                    [row.id]: {
-                                      ...prev[row.id],
-                                      justified: !prev[row.id]?.justified,
-                                    },
-                                  }))
-                                }
-                                fieldName="justified"
-                                itemLabelFunc={() => 'Justifié'}
-                              />
+                                {/* Nouveau champ commentaire */}
+                                <input
+                                  type="text"
+                                  className="border rounded px-2 py-1 text-sm w-full"
+                                  placeholder="Commentaire"
+                                  value={
+                                    formAbsences[row.id]?.commentaire || ''
+                                  }
+                                  onChange={(e) =>
+                                    setFormAbsences((prev) => ({
+                                      ...prev,
+                                      [row.id]: {
+                                        ...prev[row.id],
+                                        commentaire: e.target.value,
+                                      },
+                                    }))
+                                  }
+                                />
+
+                                {/* Checkbox Justifié */}
+                                <div className="flex items-center gap-2 justify-center">
+                                  <CheckBox
+                                    item={{ id: `justified-${row.id}` }}
+                                    formData={{
+                                      justified:
+                                        !!formAbsences[row.id]?.justified,
+                                    }}
+                                    handleChange={() =>
+                                      setFormAbsences((prev) => ({
+                                        ...prev,
+                                        [row.id]: {
+                                          ...prev[row.id],
+                                          justified: !prev[row.id]?.justified,
+                                        },
+                                      }))
+                                    }
+                                    fieldName="justified"
+                                    itemLabelFunc={() => 'Justifié'}
+                                  />
+                                </div>
+                              </div>
                             </div>
-                          </div>
+                          )}
                         </div>
-                      )}
-                    </div>
-                  ),
-                },
-              ]
-            : [
-                {
-                  name: 'Statut',
-                  transform: (row) => {
-                    const today = new Date().toISOString().split('T')[0];
-                    const absence =
-                      formAbsences[row.id] ||
-                      Object.values(fetchedAbsences).find(
-                        (absence) =>
-                          absence.student === row.id && absence.day === today
-                      );
+                      ),
+                    },
+                  ]
+                : [
+                    {
+                      name: 'Statut',
+                      transform: (row) => {
+                        const today = new Date().toISOString().split('T')[0];
+                        const absence =
+                          formAbsences[row.id] ||
+                          Object.values(fetchedAbsences).find(
+                            (absence) =>
+                              absence.student === row.id &&
+                              absence.day === today
+                          );
 
-                    if (!absence) {
-                      return (
-                        <div className="text-center text-green-500 flex justify-center items-center gap-2">
-                          <CheckCircle className="w-5 h-5" />
-                          Présent
-                        </div>
-                      );
-                    }
+                        if (!absence) {
+                          return (
+                            <div className="text-center text-green-500 flex justify-center items-center gap-2">
+                              <CheckCircle className="w-5 h-5" />
+                              Présent
+                            </div>
+                          );
+                        }
 
-                    switch (absence.reason) {
-                      case AbsenceReason.JUSTIFIED_LATE.value:
-                        return (
-                          <div className="text-center text-yellow-500 flex justify-center items-center gap-2">
-                            <Clock className="w-5 h-5" />
-                            Retard justifié
-                          </div>
-                        );
-                      case AbsenceReason.UNJUSTIFIED_LATE.value:
-                        return (
-                          <div className="text-center text-red-500 flex justify-center items-center gap-2">
-                            <Clock className="w-5 h-5" />
-                            Retard non justifié
-                          </div>
-                        );
-                      case AbsenceReason.JUSTIFIED_ABSENCE.value:
-                        return (
-                          <div className="text-center text-blue-500 flex justify-center items-center gap-2">
-                            <CheckCircle className="w-5 h-5" />
-                            Absence justifiée
-                          </div>
-                        );
-                      case AbsenceReason.UNJUSTIFIED_ABSENCE.value:
-                        return (
-                          <div className="text-center text-red-500 flex justify-center items-center gap-2">
-                            <CheckCircle className="w-5 h-5" />
-                            Absence non justifiée
-                          </div>
-                        );
-                      default:
-                        return (
-                          <div className="text-center text-gray-500 flex justify-center items-center gap-2">
-                            <CheckCircle className="w-5 h-5" />
-                            Statut inconnu
-                          </div>
-                        );
-                    }
-                  },
-                },
-              ]),
-        ]}
-        data={filteredStudents} // Utiliser les élèves filtrés
-      />
+                        switch (absence.reason) {
+                          case AbsenceReason.JUSTIFIED_LATE.value:
+                            return (
+                              <div className="text-center text-yellow-500 flex justify-center items-center gap-2">
+                                <Clock className="w-5 h-5" />
+                                Retard justifié
+                              </div>
+                            );
+                          case AbsenceReason.UNJUSTIFIED_LATE.value:
+                            return (
+                              <div className="text-center text-red-500 flex justify-center items-center gap-2">
+                                <Clock className="w-5 h-5" />
+                                Retard non justifié
+                              </div>
+                            );
+                          case AbsenceReason.JUSTIFIED_ABSENCE.value:
+                            return (
+                              <div className="text-center text-blue-500 flex justify-center items-center gap-2">
+                                <CheckCircle className="w-5 h-5" />
+                                Absence justifiée
+                              </div>
+                            );
+                          case AbsenceReason.UNJUSTIFIED_ABSENCE.value:
+                            return (
+                              <div className="text-center text-red-500 flex justify-center items-center gap-2">
+                                <CheckCircle className="w-5 h-5" />
+                                Absence non justifiée
+                              </div>
+                            );
+                          default:
+                            return (
+                              <div className="text-center text-gray-500 flex justify-center items-center gap-2">
+                                <CheckCircle className="w-5 h-5" />
+                                Statut inconnu
+                              </div>
+                            );
+                        }
+                      },
+                    },
+                  ]),
+            ]}
+            data={filteredStudents} // Utiliser les élèves filtrés
+          />
         </>
       )}
 
@@ -898,11 +961,11 @@ export default function Page() {
       {activeTab === 'evaluations' && (
         <div className="space-y-4">
           {/* Header avec sélecteur de période et bouton d'ajout */}
-          <div className="bg-white p-4 rounded-lg shadow-md">
+          <div className="bg-white p-4 rounded-md shadow-sm border border-gray-200">
             <div className="flex flex-col sm:flex-row items-start sm:items-center justify-between gap-4">
               <div className="flex items-center gap-4">
-                <ClipboardList className="w-6 h-6 text-emerald-600" />
-                <h2 className="text-lg font-semibold text-gray-800">
+                <ClipboardList className="w-6 h-6 text-primary" />
+                <h2 className="font-headline text-lg font-semibold text-gray-800">
                   Évaluations de la classe
                 </h2>
               </div>
@@ -934,7 +997,11 @@ export default function Page() {
               schoolClassId={parseInt(schoolClassId)}
               establishmentId={selectedEstablishmentId}
               initialValues={editingEvaluation}
-              onSubmit={editingEvaluation ? handleUpdateEvaluation : handleCreateEvaluation}
+              onSubmit={
+                editingEvaluation
+                  ? handleUpdateEvaluation
+                  : handleCreateEvaluation
+              }
               onCancel={() => {
                 setShowEvaluationForm(false);
                 setEditingEvaluation(null);
@@ -943,12 +1010,14 @@ export default function Page() {
           )}
 
           {/* Liste des évaluations */}
-          <div className="bg-white p-4 rounded-lg shadow-md">
+          <div className="bg-white p-4 rounded-md shadow-sm border border-gray-200">
             <EvaluationList
               evaluations={evaluations}
               onDelete={handleDeleteEvaluation}
               onEdit={handleEditEvaluation}
-              onGradeStudents={(evaluation) => setSelectedEvaluation(evaluation)}
+              onGradeStudents={(evaluation) =>
+                setSelectedEvaluation(evaluation)
+              }
             />
           </div>
 

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

@@ -1,5 +1,6 @@
 'use client';
 import React, { useState, useEffect } from 'react';
+import { getCurrentSchoolYear } from '@/utils/Date';
 
 import StructureManagement from '@/components/Structure/Configuration/StructureManagement';
 import ScheduleManagement from '@/components/Structure/Planning/ScheduleManagement';
@@ -54,6 +55,13 @@ export default function Page() {
 
   const csrfToken = useCsrfToken();
   const { selectedEstablishmentId, profileRole } = useEstablishment();
+  const currentSchoolYear = getCurrentSchoolYear();
+
+  const scheduleClasses = classes.filter(
+    (classe) => classe?.school_year === currentSchoolYear
+  );
+  const scheduleSpecialities = specialities;
+  const scheduleTeachers = teachers;
 
   useEffect(() => {
     if (selectedEstablishmentId) {
@@ -299,9 +307,9 @@ export default function Page() {
           <ClassesProvider>
             <ScheduleManagement
               handleUpdatePlanning={handleUpdatePlanning}
-              classes={classes}
-              specialities={specialities}
-              teachers={teachers}
+              classes={scheduleClasses}
+              specialities={scheduleSpecialities}
+              teachers={scheduleTeachers}
             />
           </ClassesProvider>
         </div>

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

@@ -1,7 +1,7 @@
 'use client';
 
 import React, { useState, useRef, useEffect } from 'react';
-import { User, Mail } from 'lucide-react';
+import { User, Mail, Info } from 'lucide-react';
 import InputTextIcon from '@/components/Form/InputTextIcon';
 import ToggleSwitch from '@/components/Form/ToggleSwitch';
 import Button from '@/components/Form/Button';
@@ -43,6 +43,23 @@ import { FE_ADMIN_SUBSCRIPTIONS_URL } from '@/utils/Url';
 import { getSecureFileUrl } from '@/utils/fileUrl';
 import { useNotification } from '@/context/NotificationContext';
 
+function NoInfoAlert({ message }) {
+  return (
+    <div
+      className="w-full rounded border border-orange-300 bg-orange-50 px-4 py-3 text-orange-800"
+      role="alert"
+    >
+      <div className="flex items-start gap-3">
+        <Info className="mt-0.5 h-4 w-4 shrink-0" />
+        <div className="text-sm leading-6">
+          <span className="font-semibold">Information :</span>{' '}
+          <span>{message}</span>
+        </div>
+      </div>
+    </div>
+  );
+}
+
 export default function CreateSubscriptionPage() {
   const [formData, setFormData] = useState({
     studentLastName: '',
@@ -729,11 +746,11 @@ export default function CreateSubscriptionPage() {
   return (
     <div className="mx-auto p-12 space-y-12">
       {registerFormID ? (
-        <h1 className="text-2xl font-bold">
+        <h1 className="font-headline text-2xl font-bold">
           Modifier un dossier d&apos;inscription
         </h1>
       ) : (
-        <h1 className="text-2xl font-bold">
+        <h1 className="font-headline text-2xl font-bold">
           Créer un dossier d&apos;inscription
         </h1>
       )}
@@ -936,7 +953,7 @@ export default function CreateSubscriptionPage() {
             }}
             rowClassName={(row) =>
               selectedStudent && selectedStudent.id === row.id
-                ? 'bg-emerald-600 text-white'
+                ? 'bg-primary text-white'
                 : ''
             }
             selectedRows={selectedStudent ? [selectedStudent.id] : []} // Assurez-vous que selectedRows est un tableau
@@ -948,7 +965,7 @@ export default function CreateSubscriptionPage() {
 
           {selectedStudent && (
             <div className="mt-4">
-              <h3 className="font-bold">
+              <h3 className="font-headline font-bold">
                 Responsables associés à {selectedStudent.last_name}{' '}
                 {selectedStudent.first_name} :
               </h3>
@@ -1003,22 +1020,13 @@ export default function CreateSubscriptionPage() {
                     }
                   />
                 ) : (
-                  <p
-                    className="bg-orange-100 border border-orange-400 text-orange-700 px-4 py-3 rounded relative"
-                    role="alert"
-                  >
-                    <strong className="font-bold">Information</strong>
-                    <span className="block sm:inline">
-                      Aucune réduction n&apos;a été créée sur les frais
-                      d&apos;inscription.
-                    </span>
-                  </p>
+                  <NoInfoAlert message="Aucune réduction n&apos;a été créée sur les frais d&apos;inscription." />
                 )}
               </div>
             </div>
 
             {/* Montant total */}
-            <div className="flex items-center justify-between bg-gray-50 p-4 rounded-lg shadow-sm border border-gray-300 mt-4">
+            <div className="flex items-center justify-between bg-gray-50 p-4 rounded-md shadow-sm border border-gray-300 mt-4">
               <span className="text-sm font-medium text-gray-600">
                 Montant total des frais d&apos;inscription :
               </span>
@@ -1028,15 +1036,7 @@ export default function CreateSubscriptionPage() {
             </div>
           </>
         ) : (
-          <p
-            className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative"
-            role="alert"
-          >
-            <strong className="font-bold">Attention!</strong>
-            <span className="block sm:inline">
-              Aucun frais d&apos;inscription n&apos;a été créé.
-            </span>
-          </p>
+          <NoInfoAlert message="Aucun frais d&apos;inscription n&apos;a été créé." />
         )}
       </SectionTitle>
 
@@ -1067,22 +1067,13 @@ export default function CreateSubscriptionPage() {
                     handleDiscountSelection={handleTuitionDiscountSelection}
                   />
                 ) : (
-                  <p
-                    className="bg-orange-100 border border-orange-400 text-orange-700 px-4 py-3 rounded relative"
-                    role="alert"
-                  >
-                    <strong className="font-bold">Information</strong>
-                    <span className="block sm:inline">
-                      Aucune réduction n&apos;a été créée sur les frais de
-                      scolarité.
-                    </span>
-                  </p>
+                  <NoInfoAlert message="Aucune réduction n&apos;a été créée sur les frais de scolarité." />
                 )}
               </div>
             </div>
 
             {/* Montant total */}
-            <div className="flex items-center justify-between bg-gray-50 p-4 rounded-lg shadow-sm border border-gray-300 mt-4">
+            <div className="flex items-center justify-between bg-gray-50 p-4 rounded-md shadow-sm border border-gray-300 mt-4">
               <span className="text-sm font-medium text-gray-600">
                 Montant total des frais de scolarité :
               </span>
@@ -1092,15 +1083,7 @@ export default function CreateSubscriptionPage() {
             </div>
           </>
         ) : (
-          <p
-            className="bg-red-100 border border-red-400 text-red-700 px-4 py-3 rounded relative"
-            role="alert"
-          >
-            <strong className="font-bold">Attention!</strong>
-            <span className="block sm:inline">
-              Aucun frais de scolarité n&apos;a été créé.
-            </span>
-          </p>
+          <NoInfoAlert message="Aucun frais de scolarité n&apos;a été créé." />
         )}
       </SectionTitle>
 
@@ -1153,7 +1136,7 @@ export default function CreateSubscriptionPage() {
           className={`px-6 py-2 rounded-md shadow ${
             isSubmitDisabled()
               ? 'bg-gray-300 text-gray-500 cursor-not-allowed'
-              : 'bg-emerald-500 text-white hover:bg-emerald-600'
+              : 'bg-primary text-white hover:bg-primary'
           }`}
           primary
           disabled={isSubmitDisabled()}

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

@@ -1,7 +1,7 @@
 'use client';
 import React, { useState, useEffect } from 'react';
 import Table from '@/components/Table';
-import Tab from '@/components/Tab';
+import SidebarTabs from '@/components/SidebarTabs';
 import Textarea from '@/components/Textarea';
 import { useTranslations } from 'next-intl';
 import StatusLabel from '@/components/StatusLabel';
@@ -55,6 +55,7 @@ import {
   HISTORICAL_FILTER,
 } from '@/utils/constants';
 import AlertMessage from '@/components/AlertMessage';
+import EmptyState from '@/components/EmptyState';
 import { useNotification } from '@/context/NotificationContext';
 import { exportToCSV } from '@/utils/exportCSV';
 
@@ -167,43 +168,86 @@ export default function Page({ params: { locale } }) {
 
   // Export CSV
   const handleExportCSV = () => {
-    const dataToExport = activeTab === CURRENT_YEAR_FILTER
-      ? registrationFormsDataCurrentYear
-      : activeTab === NEXT_YEAR_FILTER
-        ? registrationFormsDataNextYear
-        : registrationFormsDataHistorical;
+    const dataToExport =
+      activeTab === CURRENT_YEAR_FILTER
+        ? registrationFormsDataCurrentYear
+        : activeTab === NEXT_YEAR_FILTER
+          ? registrationFormsDataNextYear
+          : registrationFormsDataHistorical;
 
     const exportColumns = [
-      { key: 'student', label: 'Nom', transform: (value) => value?.last_name || '' },
-      { key: 'student', label: 'Prénom', transform: (value) => value?.first_name || '' },
-      { key: 'student', label: 'Date de naissance', transform: (value) => value?.birth_date || '' },
-      { key: 'student', label: 'Email contact', transform: (value) => value?.guardians?.[0]?.associated_profile_email || '' },
-      { key: 'student', label: 'Téléphone contact', transform: (value) => value?.guardians?.[0]?.phone || '' },
-      { key: 'student', label: 'Nom responsable 1', transform: (value) => value?.guardians?.[0]?.last_name || '' },
-      { key: 'student', label: 'Prénom responsable 1', transform: (value) => value?.guardians?.[0]?.first_name || '' },
-      { key: 'student', label: 'Nom responsable 2', transform: (value) => value?.guardians?.[1]?.last_name || '' },
-      { key: 'student', label: 'Prénom responsable 2', transform: (value) => value?.guardians?.[1]?.first_name || '' },
+      {
+        key: 'student',
+        label: 'Nom',
+        transform: (value) => value?.last_name || '',
+      },
+      {
+        key: 'student',
+        label: 'Prénom',
+        transform: (value) => value?.first_name || '',
+      },
+      {
+        key: 'student',
+        label: 'Date de naissance',
+        transform: (value) => value?.birth_date || '',
+      },
+      {
+        key: 'student',
+        label: 'Email contact',
+        transform: (value) =>
+          value?.guardians?.[0]?.associated_profile_email || '',
+      },
+      {
+        key: 'student',
+        label: 'Téléphone contact',
+        transform: (value) => value?.guardians?.[0]?.phone || '',
+      },
+      {
+        key: 'student',
+        label: 'Nom responsable 1',
+        transform: (value) => value?.guardians?.[0]?.last_name || '',
+      },
+      {
+        key: 'student',
+        label: 'Prénom responsable 1',
+        transform: (value) => value?.guardians?.[0]?.first_name || '',
+      },
+      {
+        key: 'student',
+        label: 'Nom responsable 2',
+        transform: (value) => value?.guardians?.[1]?.last_name || '',
+      },
+      {
+        key: 'student',
+        label: 'Prénom responsable 2',
+        transform: (value) => value?.guardians?.[1]?.first_name || '',
+      },
       { key: 'school_year', label: 'Année scolaire' },
-      { key: 'status', label: 'Statut', transform: (value) => {
-        const statusMap = {
-          0: 'En attente',
-          1: 'En cours',
-          2: 'Envoyé',
-          3: 'À relancer',
-          4: 'À valider',
-          5: 'Validé',
-          6: 'Archivé',
-        };
-        return statusMap[value] || value;
-      }},
+      {
+        key: 'status',
+        label: 'Statut',
+        transform: (value) => {
+          const statusMap = {
+            0: 'En attente',
+            1: 'En cours',
+            2: 'Envoyé',
+            3: 'À relancer',
+            4: 'À valider',
+            5: 'Validé',
+            6: 'Archivé',
+          };
+          return statusMap[value] || value;
+        },
+      },
       { key: 'formatted_last_update', label: 'Dernière mise à jour' },
     ];
 
-    const yearLabel = activeTab === CURRENT_YEAR_FILTER
-      ? currentSchoolYear
-      : activeTab === NEXT_YEAR_FILTER
-        ? nextSchoolYear
-        : 'historique';
+    const yearLabel =
+      activeTab === CURRENT_YEAR_FILTER
+        ? currentSchoolYear
+        : activeTab === NEXT_YEAR_FILTER
+          ? nextSchoolYear
+          : 'historique';
     const filename = `inscriptions_${yearLabel}_${new Date().toISOString().split('T')[0]}`;
     exportToCSV(dataToExport, exportColumns, filename);
   };
@@ -506,7 +550,7 @@ export default function Page({ params: { locale } }) {
         {
           icon: (
             <span title="Envoyer le dossier">
-              <Send className="w-5 h-5 text-green-500 hover:text-green-700" />
+              <Send className="w-5 h-5 text-primary hover:text-secondary" />
             </span>
           ),
           onClick: () =>
@@ -536,7 +580,7 @@ export default function Page({ params: { locale } }) {
         {
           icon: (
             <span title="Renvoyer le dossier">
-              <Send className="w-5 h-5 text-green-500 hover:text-green-700" />
+              <Send className="w-5 h-5 text-primary hover:text-secondary" />
             </span>
           ),
           onClick: () =>
@@ -575,7 +619,7 @@ export default function Page({ params: { locale } }) {
         {
           icon: (
             <span title="Valider le dossier">
-              <CheckCircle className="w-5 h-5 text-green-500 hover:text-green-700" />
+              <CheckCircle className="w-5 h-5 text-primary hover:text-secondary" />
             </span>
           ),
           onClick: () => {
@@ -690,7 +734,7 @@ export default function Page({ params: { locale } }) {
         {
           icon: (
             <span title="Uploader un mandat SEPA">
-              <Upload className="w-5 h-5 text-emerald-500 hover:text-emerald-700" />
+              <Upload className="w-5 h-5 text-primary hover:text-secondary" />
             </span>
           ),
           onClick: () => openSepaUploadModal(row),
@@ -800,161 +844,139 @@ export default function Page({ params: { locale } }) {
     },
   ];
 
-  let emptyMessage;
-  if (activeTab === CURRENT_YEAR_FILTER && searchTerm === '') {
-    emptyMessage = (
-      <AlertMessage
-        type="warning"
-        title="Aucun dossier d'inscription pour l'année en cours"
-        message="Veuillez procéder à la création d'un nouveau dossier d'inscription pour l'année scolaire en cours."
+  const getEmptyMessageForTab = (tabFilter) => {
+    if (searchTerm !== '') {
+      return (
+        <EmptyState
+          icon={Search}
+          title="Aucun dossier trouvé"
+          description="Modifiez votre recherche pour trouver un dossier d'inscription."
+        />
+      );
+    }
+    if (tabFilter === CURRENT_YEAR_FILTER) {
+      return (
+        <EmptyState
+          icon={FileText}
+          title="Aucun dossier d'inscription pour l'année en cours"
+          description="Commencez par créer un dossier d'inscription pour l'année scolaire en cours."
+          actionLabel="Créer un dossier"
+          actionIcon={Plus}
+          onAction={() => router.push(FE_ADMIN_SUBSCRIPTIONS_CREATE_URL)}
+        />
+      );
+    }
+    if (tabFilter === NEXT_YEAR_FILTER) {
+      return (
+        <EmptyState
+          icon={FileText}
+          title="Aucun dossier pour l'année prochaine"
+          description="Aucun dossier n'a encore été créé pour la prochaine année scolaire."
+          actionLabel="Créer un dossier"
+          actionIcon={Plus}
+          onAction={() => router.push(FE_ADMIN_SUBSCRIPTIONS_CREATE_URL)}
+        />
+      );
+    }
+    return (
+      <EmptyState
+        icon={Archive}
+        title="Aucun dossier archivé"
+        description="Aucun dossier archivé n'est disponible pour les années précédentes."
       />
     );
-  } else if (activeTab === NEXT_YEAR_FILTER && searchTerm === '') {
-    emptyMessage = (
-      <AlertMessage
-        type="info"
-        title="Aucun dossier d'inscription pour l'année prochaine"
-        message="Aucun dossier n'a encore été créé pour la prochaine année scolaire."
+  };
+
+  const renderTabContent = (data, currentPage, totalPages, tabFilter) => (
+    <div className="p-4">
+      <div className="flex justify-between items-center mb-4 w-full">
+        <div className="relative flex-grow">
+          <Search
+            className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400"
+            size={20}
+          />
+          <input
+            type="text"
+            placeholder={t('searchStudent')}
+            className="w-full pl-10 pr-4 py-2 border border-gray-200 rounded-md"
+            value={searchTerm}
+            onChange={handleSearchChange}
+          />
+        </div>
+        <div className="flex items-center gap-2 ml-4">
+          <button
+            onClick={handleExportCSV}
+            className="flex items-center gap-2 px-4 py-2 text-sm font-medium text-secondary bg-primary/10 rounded hover:bg-primary/20 transition-colors"
+            title="Exporter en CSV"
+          >
+            <Download className="w-4 h-4" />
+            Exporter
+          </button>
+          {profileRole !== 0 && (
+            <button
+              onClick={() => router.push(FE_ADMIN_SUBSCRIPTIONS_CREATE_URL)}
+              className="flex items-center bg-primary text-white p-2 rounded-full shadow hover:bg-secondary transition duration-200"
+            >
+              <Plus className="w-5 h-5" />
+            </button>
+          )}
+        </div>
+      </div>
+      <DjangoCSRFToken csrfToken={csrfToken} />
+      <Table
+        key={`${tabFilter}-${currentPage}-${searchTerm}`}
+        data={data}
+        columns={columns}
+        itemsPerPage={itemsPerPage}
+        currentPage={currentPage}
+        totalPages={totalPages}
+        onPageChange={handlePageChange}
+        emptyMessage={getEmptyMessageForTab(tabFilter)}
       />
-    );
-  } else if (activeTab === HISTORICAL_FILTER && searchTerm === '') {
-    emptyMessage = (
-      <AlertMessage
-        type="info"
-        title="Aucun dossier d'inscription historique"
-        message="Aucun dossier archivé n'est disponible pour les années précédentes."
-      />
-    );
-  }
+    </div>
+  );
 
   if (isLoading) {
     return <Loader />;
   }
 
   return (
-    <div className="p-8">
-      <div className="border-b border-gray-200 mb-6">
-        <div className="flex items-center gap-8">
-          {/* Tab pour l'année scolaire en cours */}
-          <Tab
-            text={
-              <>
-                {currentSchoolYear}
-                <span className="ml-2 text-sm text-gray-400">
-                  ({totalCurrentYear})
-                </span>
-              </>
-            }
-            active={activeTab === CURRENT_YEAR_FILTER}
-            onClick={() => setActiveTab(CURRENT_YEAR_FILTER)}
-          />
-
-          {/* Tab pour l'année scolaire prochaine */}
-          <Tab
-            text={
-              <>
-                {nextSchoolYear}
-                <span className="ml-2 text-sm text-gray-400">
-                  ({totalNextYear})
-                </span>
-              </>
-            }
-            active={activeTab === NEXT_YEAR_FILTER}
-            onClick={() => setActiveTab(NEXT_YEAR_FILTER)}
-          />
-
-          {/* Tab pour l'historique */}
-          <Tab
-            text={
-              <>
-                {t('historical')}
-                <span className="ml-2 text-sm text-gray-400">
-                  ({totalHistorical})
-                </span>
-              </>
-            }
-            active={activeTab === HISTORICAL_FILTER}
-            onClick={() => setActiveTab(HISTORICAL_FILTER)}
-          />
-        </div>
-      </div>
-
-      <div className="border-b border-gray-200 mb-6 w-full">
-        {activeTab === CURRENT_YEAR_FILTER ||
-        activeTab === NEXT_YEAR_FILTER ||
-        activeTab === HISTORICAL_FILTER ? (
-          <React.Fragment>
-            <div className="flex justify-between items-center mb-4 w-full">
-              <div className="relative flex-grow">
-                <Search
-                  className="absolute left-3 top-1/2 transform -translate-y-1/2 text-gray-400"
-                  size={20}
-                />
-                <input
-                  type="text"
-                  placeholder={t('searchStudent')}
-                  className="w-full pl-10 pr-4 py-2 border border-gray-200 rounded-md"
-                  value={searchTerm}
-                  onChange={handleSearchChange}
-                />
-              </div>
-              <div className="flex items-center gap-2 ml-4">
-                <button
-                  onClick={handleExportCSV}
-                  className="flex items-center gap-2 px-4 py-2 text-sm font-medium text-emerald-700 bg-emerald-100 rounded-lg hover:bg-emerald-200 transition-colors"
-                  title="Exporter en CSV"
-                >
-                  <Download className="w-4 h-4" />
-                  Exporter
-                </button>
-                {profileRole !== 0 && (
-                  <button
-                    onClick={() => {
-                      const url = `${FE_ADMIN_SUBSCRIPTIONS_CREATE_URL}`;
-                      router.push(url);
-                    }}
-                    className="flex items-center bg-emerald-600 text-white p-2 rounded-full shadow hover:bg-emerald-900 transition duration-200"
-                  >
-                    <Plus className="w-5 h-5" />
-                  </button>
-                )}
-              </div>
-            </div>
-
-            <div className="w-full">
-              <DjangoCSRFToken csrfToken={csrfToken} />
-              <Table
-                key={`${currentSchoolYearPage}-${searchTerm}`}
-                data={
-                  activeTab === CURRENT_YEAR_FILTER
-                    ? registrationFormsDataCurrentYear
-                    : activeTab === NEXT_YEAR_FILTER
-                      ? registrationFormsDataNextYear
-                      : registrationFormsDataHistorical
-                }
-                columns={columns}
-                itemsPerPage={itemsPerPage}
-                currentPage={
-                  activeTab === CURRENT_YEAR_FILTER
-                    ? currentSchoolYearPage
-                    : activeTab === NEXT_YEAR_FILTER
-                      ? currentSchoolNextYearPage
-                      : currentSchoolHistoricalYearPage
-                }
-                totalPages={
-                  activeTab === CURRENT_YEAR_FILTER
-                    ? totalCurrentSchoolYearPages
-                    : activeTab === NEXT_YEAR_FILTER
-                      ? totalNextSchoolYearPages
-                      : totalHistoricalPages
-                }
-                onPageChange={handlePageChange}
-                emptyMessage={emptyMessage}
-              />
-            </div>
-          </React.Fragment>
-        ) : null}
-      </div>
+    <div className="h-full flex flex-col">
+      <SidebarTabs
+        tabs={[
+          {
+            id: CURRENT_YEAR_FILTER,
+            label: `${currentSchoolYear}${totalCurrentYear > 0 ? ` (${totalCurrentYear})` : ''}`,
+            content: renderTabContent(
+              registrationFormsDataCurrentYear,
+              currentSchoolYearPage,
+              totalCurrentSchoolYearPages,
+              CURRENT_YEAR_FILTER
+            ),
+          },
+          {
+            id: NEXT_YEAR_FILTER,
+            label: `${nextSchoolYear}${totalNextYear > 0 ? ` (${totalNextYear})` : ''}`,
+            content: renderTabContent(
+              registrationFormsDataNextYear,
+              currentSchoolNextYearPage,
+              totalNextSchoolYearPages,
+              NEXT_YEAR_FILTER
+            ),
+          },
+          {
+            id: HISTORICAL_FILTER,
+            label: `${t('historical')}${totalHistorical > 0 ? ` (${totalHistorical})` : ''}`,
+            content: renderTabContent(
+              registrationFormsDataHistorical,
+              currentSchoolHistoricalYearPage,
+              totalHistoricalPages,
+              HISTORICAL_FILTER
+            ),
+          },
+        ]}
+        onTabChange={(newTab) => setActiveTab(newTab)}
+      />
       <Popup
         isOpen={confirmPopupVisible}
         message={confirmPopupMessage}

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

@@ -10,10 +10,10 @@ export default function Home() {
   const t = useTranslations('homePage');
 
   return (
-    <div className="flex flex-col items-center justify-center min-h-screen py-2">
-      <Logo className="mb-4" /> {/* Ajout du logo */}
-      <h1 className="text-4xl font-bold mb-4">{t('welcomeParents')}</h1>
-      <p className="text-lg mb-8">{t('pleaseLogin')}</p>
+    <div className="flex flex-col items-center justify-center min-h-screen py-2 bg-neutral">
+      <Logo className="mb-4" />
+      <h1 className="font-headline text-4xl font-bold mb-4">{t('welcomeParents')}</h1>
+      <p className="font-body text-lg mb-8">{t('pleaseLogin')}</p>
       <Button text={t('loginButton')} primary href="/users/login" />
     </div>
   );

Front-End/src/app/[locale]/parents/layout.js

@@ -4,10 +4,7 @@ import React, { useState, useEffect } from 'react';
 import Sidebar from '@/components/Sidebar';
 import { useRouter, usePathname } from 'next/navigation';
 import { MessageSquare, Settings, Home } from 'lucide-react';
-import {
-  FE_PARENTS_HOME_URL,
-  FE_PARENTS_MESSAGERIE_URL
-} from '@/utils/Url';
+import { FE_PARENTS_HOME_URL, FE_PARENTS_MESSAGERIE_URL } from '@/utils/Url';
 import ProtectedRoute from '@/components/ProtectedRoute';
 import { disconnect } from '@/app/actions/authAction';
 import Popup from '@/components/Popup';
@@ -15,6 +12,7 @@ import MobileTopbar from '@/components/MobileTopbar';
 import { RIGHTS } from '@/utils/rights';
 import { useEstablishment } from '@/context/EstablishmentContext';
 import Footer from '@/components/Footer';
+import { useChatConnection } from '@/context/ChatConnectionContext';
 
 export default function Layout({ children }) {
   const router = useRouter();
@@ -22,6 +20,7 @@ export default function Layout({ children }) {
   const [isPopupVisible, setIsPopupVisible] = useState(false);
   const [isSidebarOpen, setIsSidebarOpen] = useState(false);
   const { clearContext } = useEstablishment();
+  const { totalUnreadCount, resetUnreadCount } = useChatConnection();
   const softwareName = 'N3WT School';
   const softwareVersion = `${process.env.NEXT_PUBLIC_APP_VERSION}`;
 
@@ -41,7 +40,8 @@ export default function Layout({ children }) {
       name: 'Messagerie',
       url: FE_PARENTS_MESSAGERIE_URL,
       icon: MessageSquare,
-    }
+      badge: totalUnreadCount,
+    },
   ];
 
   // Déterminer la page actuelle pour la sidebar
@@ -70,7 +70,11 @@ export default function Layout({ children }) {
   useEffect(() => {
     // Fermer la sidebar quand on change de page sur mobile
     setIsSidebarOpen(false);
-  }, [pathname]);
+    // Réinitialiser le compteur non lu quand on ouvre la messagerie
+    if (pathname?.includes('/messagerie')) {
+      resetUnreadCount();
+    }
+  }, [pathname, resetUnreadCount]);
 
   return (
     <ProtectedRoute requiredRight={RIGHTS.PARENT}>
@@ -100,7 +104,7 @@ export default function Layout({ children }) {
 
       {/* Main container */}
       <div
-        className={`absolute overflow-auto bg-gradient-to-br from-emerald-50 via-sky-50 to-emerald-100 top-14 md:top-0 bottom-16 left-0 md:left-64 right-0 ${!isMessagingPage ? 'p-4 md:p-8' : ''}`}
+        className={`absolute overflow-auto bg-gradient-to-br from-primary/5 via-sky-50 to-primary/10 top-14 md:top-0 bottom-16 left-0 md:left-64 right-0 ${!isMessagingPage ? 'p-4 md:p-8' : ''}`}
       >
         {children}
       </div>

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

@@ -1,7 +1,6 @@
 'use client';
-import React, { useEffect, useState } from 'react';
+import React, { useEffect, useState, useMemo } from 'react';
 import { useRouter } from 'next/navigation';
-import Table from '@/components/Table';
 import {
   Edit3,
   Users,
@@ -9,6 +8,12 @@ import {
   Eye,
   Upload,
   CalendarDays,
+  Award,
+  ChevronDown,
+  ChevronUp,
+  BookOpen,
+  ArrowLeft,
+  Clock,
 } from 'lucide-react';
 import StatusLabel from '@/components/StatusLabel';
 import FileUpload from '@/components/Form/FileUpload';
@@ -16,7 +21,13 @@ import { FE_PARENTS_EDIT_SUBSCRIPTION_URL } from '@/utils/Url';
 import {
   fetchChildren,
   editRegisterForm,
+  fetchStudentCompetencies,
+  fetchAbsences,
 } from '@/app/actions/subscriptionAction';
+import {
+  fetchEvaluations,
+  fetchStudentEvaluations,
+} from '@/app/actions/schoolAction';
 import { fetchUpcomingEvents } from '@/app/actions/planningAction';
 import logger from '@/utils/logger';
 import { getSecureFileUrl } from '@/utils/fileUrl';
@@ -27,13 +38,47 @@ import { PlanningProvider, PlanningModes } from '@/context/PlanningContext';
 import SectionHeader from '@/components/SectionHeader';
 import ParentPlanningSection from '@/components/ParentPlanningSection';
 import EventCard from '@/components/EventCard';
+import SelectChoice from '@/components/Form/SelectChoice';
+import dayjs from 'dayjs';
+
+// Fonction utilitaire pour générer la chaîne de période
+function getPeriodString(selectedPeriod, frequency) {
+  const year = dayjs().month() >= 8 ? dayjs().year() : dayjs().year() - 1;
+  const nextYear = (year + 1).toString();
+  const schoolYear = `${year}-${nextYear}`;
+  if (frequency === 1) return `T${selectedPeriod}_${schoolYear}`;
+  if (frequency === 2) return `S${selectedPeriod}_${schoolYear}`;
+  if (frequency === 3) return `A_${schoolYear}`;
+  return '';
+}
+
+// Fonction pour obtenir les périodes selon la fréquence d'évaluation
+function getPeriods(frequency) {
+  if (frequency === 1) {
+    return [
+      { label: 'Trimestre 1', value: 1, start: '09-01', end: '12-31' },
+      { label: 'Trimestre 2', value: 2, start: '01-01', end: '03-31' },
+      { label: 'Trimestre 3', value: 3, start: '04-01', end: '07-15' },
+    ];
+  }
+  if (frequency === 2) {
+    return [
+      { label: 'Semestre 1', value: 1, start: '09-01', end: '01-31' },
+      { label: 'Semestre 2', value: 2, start: '02-01', end: '07-15' },
+    ];
+  }
+  if (frequency === 3) {
+    return [{ label: 'Année', value: 1, start: '09-01', end: '07-15' }];
+  }
+  return [];
+}
 
 export default function ParentHomePage() {
   const [children, setChildren] = useState([]);
-  const { user, selectedEstablishmentId } = useEstablishment();
-  const [uploadingStudentId, setUploadingStudentId] = useState(null); // ID de l'étudiant pour l'upload
-  const [uploadedFile, setUploadedFile] = useState(null); // Fichier uploadé
-  const [uploadState, setUploadState] = useState('off'); // État "on" ou "off" pour l'affichage du composant
+  const { user, selectedEstablishmentId, selectedEstablishmentEvaluationFrequency } = useEstablishment();
+  const [uploadingStudentId, setUploadingStudentId] = useState(null);
+  const [uploadedFile, setUploadedFile] = useState(null);
+  const [uploadState, setUploadState] = useState('off');
   const [showPlanning, setShowPlanning] = useState(false);
   const [planningClassName, setPlanningClassName] = useState(null);
   const [upcomingEvents, setUpcomingEvents] = useState([]);
@@ -42,16 +87,114 @@ export default function ParentHomePage() {
   const [reloadFetch, setReloadFetch] = useState(false);
   const { getNiveauLabel } = useClasses();
 
+  // États pour la vue détaillée de l'élève inscrit
+  const [expandedStudentId, setExpandedStudentId] = useState(null);
+  const [studentCompetencies, setStudentCompetencies] = useState(null);
+  const [grades, setGrades] = useState({});
+  const [selectedPeriod, setSelectedPeriod] = useState(null);
+  const [evaluations, setEvaluations] = useState([]);
+  const [studentEvaluationsData, setStudentEvaluationsData] = useState([]);
+  const [allAbsences, setAllAbsences] = useState([]);
+  const [detailLoading, setDetailLoading] = useState(false);
+
+  // Périodes disponibles selon la fréquence d'évaluation
+  const periods = useMemo(
+    () => getPeriods(selectedEstablishmentEvaluationFrequency),
+    [selectedEstablishmentEvaluationFrequency]
+  );
+
+  // Auto-sélection de la période courante
+  useEffect(() => {
+    if (periods.length > 0 && !selectedPeriod) {
+      const today = dayjs();
+      const current = periods.find((p) => {
+        const start = dayjs(`${today.year()}-${p.start}`);
+        const end = dayjs(`${today.year()}-${p.end}`);
+        return today.isAfter(start.subtract(1, 'day')) && today.isBefore(end.add(1, 'day'));
+      });
+      setSelectedPeriod(current ? current.value : periods[0]?.value);
+    }
+  }, [periods, selectedPeriod]);
+
   useEffect(() => {
     if (user !== null) {
       const userIdFromSession = user.user_id;
       fetchChildren(userIdFromSession, selectedEstablishmentId).then((data) => {
         setChildren(data);
+        // Auto-expand si un seul enfant inscrit
+        const enrolledChildren = (data || []).filter((c) => c.status === 5);
+        if (enrolledChildren.length === 1) {
+          setExpandedStudentId(enrolledChildren[0].student.id);
+        }
       });
       setReloadFetch(false);
     }
   }, [selectedEstablishmentId, reloadFetch, user]);
 
+  // Charger les absences
+  useEffect(() => {
+    if (selectedEstablishmentId) {
+      fetchAbsences(selectedEstablishmentId)
+        .then((data) => setAllAbsences(data || []))
+        .catch((error) => logger.error('Erreur fetch absences:', error));
+    }
+  }, [selectedEstablishmentId]);
+
+  // Charger les données détaillées quand un élève est étendu
+  useEffect(() => {
+    if (!expandedStudentId || !selectedPeriod || !selectedEstablishmentEvaluationFrequency) {
+      return;
+    }
+
+    const expandedChild = children.find((c) => c.student.id === expandedStudentId);
+    if (!expandedChild || expandedChild.status !== 5) return;
+
+    const loadDetails = async () => {
+      setDetailLoading(true);
+      const periodString = getPeriodString(selectedPeriod, selectedEstablishmentEvaluationFrequency);
+
+      try {
+        // Charger les compétences
+        const competenciesData = await fetchStudentCompetencies(expandedStudentId, periodString);
+        setStudentCompetencies(competenciesData);
+        if (competenciesData?.data) {
+          const initialGrades = {};
+          competenciesData.data.forEach((domaine) => {
+            domaine.categories.forEach((cat) => {
+              cat.competences.forEach((comp) => {
+                initialGrades[comp.competence_id] = comp.score ?? 0;
+              });
+            });
+          });
+          setGrades(initialGrades);
+        }
+
+        // Charger les évaluations si l'élève a une classe
+        if (expandedChild.student.associated_class_id) {
+          const [evalData, studentEvalData] = await Promise.all([
+            fetchEvaluations(
+              selectedEstablishmentId,
+              expandedChild.student.associated_class_id,
+              periodString
+            ),
+            fetchStudentEvaluations(expandedStudentId, null, periodString, null)
+          ]);
+          setEvaluations(evalData || []);
+          setStudentEvaluationsData(studentEvalData || []);
+        } else {
+          setEvaluations([]);
+          setStudentEvaluationsData([]);
+        }
+      } catch (error) {
+        logger.error('Erreur lors du chargement des détails:', error);
+      } finally {
+        setDetailLoading(false);
+      }
+    };
+
+    loadDetails();
+  }, [expandedStudentId, selectedPeriod, selectedEstablishmentEvaluationFrequency, children, selectedEstablishmentId]);
+
   useEffect(() => {
     if (selectedEstablishmentId) {
       // Fetch des événements à venir
@@ -132,153 +275,6 @@ export default function ParentHomePage() {
     setShowPlanning(true);
   };
 
-  const childrenColumns = [
-    {
-      name: 'photo',
-      transform: (row) => (
-        <div className="flex justify-center items-center">
-          {row.student.photo ? (
-            <a
-              href={getSecureFileUrl(row.student.photo)} // Lien vers la photo
-              target="_blank"
-              rel="noopener noreferrer"
-            >
-              <img
-                src={getSecureFileUrl(row.student.photo)}
-                alt={`${row.student.first_name} ${row.student.last_name}`}
-                className="w-10 h-10 object-cover transition-transform duration-200 hover:scale-125 cursor-pointer rounded-full"
-              />
-            </a>
-          ) : (
-            <div className="w-10 h-10 flex items-center justify-center bg-gray-200 rounded-full">
-              <span className="text-gray-500 text-sm font-semibold">
-                {row.student.first_name[0]}
-                {row.student.last_name[0]}
-              </span>
-            </div>
-          )}
-        </div>
-      ),
-    },
-    { name: 'Nom', transform: (row) => `${row.student.last_name}` },
-    { name: 'Prénom', transform: (row) => `${row.student.first_name}` },
-    {
-      name: 'Classe',
-      transform: (row) => (
-        <div className="text-center">{row.student.associated_class_name}</div>
-      ),
-    },
-    {
-      name: 'Niveau',
-      transform: (row) => (
-        <div className="text-center">{getNiveauLabel(row.student.level)}</div>
-      ),
-    },
-    {
-      name: 'Statut',
-      transform: (row) => (
-        <div className="flex justify-center items-center">
-          <StatusLabel status={row.status} showDropdown={false} parent />
-        </div>
-      ),
-    },
-    {
-      name: 'Actions',
-      transform: (row) => (
-        <div className="flex justify-center items-center gap-2">
-          {row.status === 2 && (
-            <button
-              className="text-blue-500 hover:text-blue-700"
-              onClick={(e) => {
-                e.stopPropagation();
-                handleEdit(row.student.id);
-              }}
-              aria-label="Remplir le dossier"
-            >
-              <Edit3 className="h-5 w-5" />
-            </button>
-          )}
-
-          {(row.status === 3 || row.status === 8) && (
-            <button
-              className="text-purple-500 hover:text-purple-700"
-              onClick={(e) => {
-                e.stopPropagation();
-                handleView(row.student.id);
-              }}
-              aria-label="Visualiser le dossier"
-            >
-              <Eye className="h-5 w-5" />
-            </button>
-          )}
-
-          {row.status === 7 && (
-            <>
-              <button
-                className="flex items-center justify-center w-8 h-8 rounded-full text-purple-500 hover:text-purple-700"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  handleView(row.student.id);
-                }}
-                aria-label="Visualiser le dossier"
-              >
-                <Eye className="h-5 w-5" />
-              </button>
-              <a
-                href={getSecureFileUrl(row.sepa_file)}
-                target="_blank"
-                rel="noopener noreferrer"
-                className="flex items-center justify-center w-8 h-8 rounded-full text-green-500 hover:text-green-700"
-                aria-label="Télécharger le mandat SEPA"
-              >
-                <Download className="h-5 w-5" />
-              </a>
-              <button
-                className={`flex items-center justify-center w-8 h-8 rounded-full ${
-                  uploadingStudentId === row.student.id && uploadState === 'on'
-                    ? 'bg-blue-100 text-blue-600 ring-3 ring-blue-500'
-                    : 'text-blue-500 hover:text-blue-700'
-                }`}
-                onClick={(e) => {
-                  e.stopPropagation();
-                  toggleUpload(row.student.id);
-                }}
-                aria-label="Uploader un fichier"
-              >
-                <Upload className="h-5 w-5" />
-              </button>
-            </>
-          )}
-
-          {row.status === 5 && (
-            <>
-              <button
-                className="text-purple-500 hover:text-purple-700"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  handleView(row.student.id);
-                }}
-                aria-label="Visualiser le dossier"
-              >
-                <Eye className="h-5 w-5" />
-              </button>
-              <button
-                className="text-emerald-500 hover:text-emerald-700 ml-1"
-                onClick={(e) => {
-                  e.stopPropagation();
-                  showClassPlanning(row.student);
-                }}
-                aria-label="Voir le planning de la classe"
-              >
-                <CalendarDays className="h-5 w-5" />
-              </button>
-            </>
-          )}
-        </div>
-      ),
-    },
-  ];
-
   return (
     <div className="w-full h-full">
       {showPlanning && planningClassName ? (
@@ -286,10 +282,10 @@ export default function ParentHomePage() {
         <>
           <div className="p-4 flex items-center border-b">
             <button
-              className="text-emerald-600 hover:text-emerald-800 font-semibold flex items-center"
+              className="text-primary hover:text-secondary font-label font-medium min-h-[44px] flex items-center transition-colors"
               onClick={() => setShowPlanning(false)}
             >
-              ← Retour
+              <ArrowLeft className="w-4 h-4 mr-1" /> Retour
             </button>
           </div>
           <div className="flex-1 flex overflow-hidden">
@@ -313,7 +309,7 @@ export default function ParentHomePage() {
                 title="Événements à venir"
                 description="Prochains événements de l'établissement"
               />
-              <div className="bg-stone-50 p-4 rounded-lg shadow-sm border border-gray-100">
+              <div className="bg-neutral p-4 rounded-md shadow-sm border border-gray-100">
                 {upcomingEvents.slice(0, 3).map((event, index) => (
                   <EventCard key={index} {...event} />
                 ))}
@@ -326,29 +322,375 @@ export default function ParentHomePage() {
             title="Vos enfants"
             description="Suivez le parcours de vos enfants"
           />
-          <div className="overflow-x-auto">
-            <Table data={children} columns={childrenColumns} />
+          
+          {/* Cartes des enfants */}
+          <div className="space-y-4">
+            {children.map((child) => {
+              const student = child.student;
+              const isEnrolled = child.status === 5;
+              const isExpanded = expandedStudentId === student.id;
+              
+              // Absences pour cet élève (détaillées par type)
+              const studentAbsencesList = allAbsences.filter((a) => a.student === student.id);
+              const absenceStats = {
+                justifiedAbsence: studentAbsencesList.filter((a) => a.reason === 1).length,
+                unjustifiedAbsence: studentAbsencesList.filter((a) => a.reason === 2).length,
+                justifiedLate: studentAbsencesList.filter((a) => a.reason === 3).length,
+                unjustifiedLate: studentAbsencesList.filter((a) => a.reason === 4).length,
+              };
+              const totalAbsences = absenceStats.justifiedAbsence + absenceStats.unjustifiedAbsence;
+
+              return (
+                <div
+                  key={student.id}
+                  className="bg-white rounded-md shadow-sm border border-gray-200 overflow-hidden"
+                >
+                  {/* En-tête de la carte (toujours visible) */}
+                  <div
+                    className={`p-4 flex flex-col sm:flex-row items-start sm:items-center gap-4 ${
+                      isEnrolled ? 'cursor-pointer hover:bg-gray-50' : ''
+                    }`}
+                    onClick={() => {
+                      if (isEnrolled) {
+                        setExpandedStudentId(isExpanded ? null : student.id);
+                      }
+                    }}
+                  >
+                    {/* Photo */}
+                    <div className="flex-shrink-0">
+                      {student.photo ? (
+                        <img
+                          src={getSecureFileUrl(student.photo)}
+                          alt={`${student.first_name} ${student.last_name}`}
+                          className="w-16 h-16 object-cover rounded-full border-2 border-primary"
+                        />
+                      ) : (
+                        <div className="w-16 h-16 flex items-center justify-center bg-gray-200 rounded-full text-gray-500 font-bold text-xl">
+                          {student.first_name?.[0]}{student.last_name?.[0]}
+                        </div>
+                      )}
+                    </div>
+
+                    {/* Infos principales */}
+                    <div className="flex-1 min-w-0">
+                      <h3 className="font-headline text-lg font-semibold text-gray-800">
+                        {student.last_name} {student.first_name}
+                      </h3>
+                      <div className="mt-1">
+                        <StatusLabel status={child.status} showDropdown={false} parent />
+                      </div>
+                      <div className="text-sm text-gray-600 mt-2">
+                        {student.associated_class_name && (
+                          <span>Classe : <span className="font-medium">{student.associated_class_name}</span></span>
+                        )}
+                        {student.level !== undefined && (
+                          <span className="ml-3">Niveau : <span className="font-medium">{getNiveauLabel(student.level)}</span></span>
+                        )}
+                      </div>
+                      {isEnrolled && (
+                        <div className="text-xs text-gray-500 mt-1 flex items-center gap-1">
+                          <Award className="w-3 h-3" />
+                          <span>Cliquez pour voir le suivi pédagogique</span>
+                        </div>
+                      )}
+                    </div>
+
+                    {/* Actions */}
+                    <div className="flex items-center gap-2 flex-shrink-0">
+                      {child.status === 2 && (
+                        <button
+                          className="p-2 min-h-[44px] min-w-[44px] flex items-center justify-center text-blue-500 hover:text-blue-700 hover:bg-blue-50 rounded-full transition-colors"
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            handleEdit(student.id);
+                          }}
+                          title="Remplir le dossier"
+                        >
+                          <Edit3 className="h-5 w-5" />
+                        </button>
+                      )}
+
+                      {(child.status === 3 || child.status === 8 || child.status === 5 || child.status === 7) && (
+                        <button
+                          className="p-2 min-h-[44px] min-w-[44px] flex items-center justify-center text-purple-500 hover:text-purple-700 hover:bg-purple-50 rounded-full transition-colors"
+                          onClick={(e) => {
+                            e.stopPropagation();
+                            handleView(student.id);
+                          }}
+                          title="Visualiser le dossier"
+                        >
+                          <Eye className="h-5 w-5" />
+                        </button>
+                      )}
+
+                      {child.status === 7 && (
+                        <>
+                          <a
+                            href={getSecureFileUrl(child.sepa_file)}
+                            target="_blank"
+                            rel="noopener noreferrer"
+                            className="p-2 min-h-[44px] min-w-[44px] flex items-center justify-center text-primary hover:text-secondary hover:bg-primary/5 rounded-full transition-colors"
+                            onClick={(e) => e.stopPropagation()}
+                            title="Télécharger le mandat SEPA"
+                          >
+                            <Download className="h-5 w-5" />
+                          </a>
+                          <button
+                            className={`p-2 min-h-[44px] min-w-[44px] flex items-center justify-center rounded-full transition-colors ${
+                              uploadingStudentId === student.id && uploadState === 'on'
+                                ? 'bg-blue-100 text-blue-600'
+                                : 'text-blue-500 hover:text-blue-700 hover:bg-blue-50'
+                            }`}
+                            onClick={(e) => {
+                              e.stopPropagation();
+                              toggleUpload(student.id);
+                            }}
+                            title="Uploader un fichier"
+                          >
+                            <Upload className="h-5 w-5" />
+                          </button>
+                        </>
+                      )}
+
+                      {isEnrolled && (
+                        <>
+                          <button
+                            className="p-2 min-h-[44px] min-w-[44px] flex items-center justify-center text-primary hover:text-secondary hover:bg-tertiary/10 rounded-full transition-colors"
+                            onClick={(e) => {
+                              e.stopPropagation();
+                              showClassPlanning(student);
+                            }}
+                            title="Voir le planning de la classe"
+                          >
+                            <CalendarDays className="h-5 w-5" />
+                          </button>
+                          <div className="ml-2">
+                            {isExpanded ? (
+                              <ChevronUp className="w-5 h-5 text-gray-400" />
+                            ) : (
+                              <ChevronDown className="w-5 h-5 text-gray-400" />
+                            )}
+                          </div>
+                        </>
+                      )}
+                    </div>
+                  </div>
+
+                  {/* Upload SEPA si activé */}
+                  {uploadState === 'on' && uploadingStudentId === student.id && (
+                    <div className="p-4 border-t bg-gray-50">
+                      <FileUpload
+                        selectionMessage="Sélectionnez un fichier à uploader"
+                        onFileSelect={handleFileUpload}
+                      />
+                      <button
+                        className={`mt-4 px-4 py-2 rounded font-label font-medium min-h-[44px] transition-colors ${
+                          uploadedFile
+                            ? 'bg-primary text-white hover:bg-secondary'
+                            : 'bg-gray-300 text-gray-700 cursor-not-allowed'
+                        }`}
+                        onClick={handleSubmit}
+                        disabled={!uploadedFile}
+                      >
+                        Valider
+                      </button>
+                    </div>
+                  )}
+
+                  {/* Section détaillée pour les élèves inscrits (expanded) */}
+                  {isEnrolled && isExpanded && (
+                    <div className="border-t bg-neutral p-4 space-y-6">
+
+                      {/* Bloc période : compétences + notes */}
+                      <div className="bg-white rounded-md border border-primary/20 p-4 space-y-4">
+                        {/* Sélecteur de période */}
+                        <div className="flex items-center gap-3 pb-3 border-b border-gray-100">
+                          <div className="w-full sm:w-48">
+                            <SelectChoice
+                              name="period"
+                              label="Période"
+                              placeHolder="Choisir la période"
+                              choices={periods.map((period) => ({
+                                value: period.value,
+                                label: period.label,
+                              }))}
+                              selected={selectedPeriod || ''}
+                              callback={(e) => setSelectedPeriod(Number(e.target.value))}
+                            />
+                          </div>
+                        </div>
+
+                      {detailLoading ? (
+                        <div className="text-center py-8 text-gray-500">
+                          Chargement des données...
+                        </div>
+                      ) : (
+                        <>
+                          {/* Résumé des compétences (pourcentages) */}
+                          {(() => {
+                            const total = Object.keys(grades).length;
+                            const acquired = Object.values(grades).filter((g) => g === 3).length;
+                            const inProgress = Object.values(grades).filter((g) => g === 2).length;
+                            const notAcquired = Object.values(grades).filter((g) => g === 1).length;
+                            const notEvaluated = Object.values(grades).filter((g) => g === 0).length;
+                            
+                            const pctAcquired = total ? Math.round((acquired / total) * 100) : 0;
+                            const pctInProgress = total ? Math.round((inProgress / total) * 100) : 0;
+                            const pctNotAcquired = total ? Math.round((notAcquired / total) * 100) : 0;
+                            const pctNotEvaluated = total ? Math.round((notEvaluated / total) * 100) : 0;
+
+                            return (
+                              <div className="border border-gray-100 rounded-md p-4">
+                                <div className="flex items-center gap-2 mb-4">
+                                  <Award className="w-5 h-5 text-primary" />
+                                  <h3 className="font-headline text-lg font-semibold text-gray-800">
+                                    Compétences
+                                  </h3>
+                                  {total > 0 && (
+                                    <span className="text-sm text-gray-500">({total} compétences)</span>
+                                  )}
+                                </div>
+                                {total > 0 ? (
+                                  <div className="grid grid-cols-2 sm:grid-cols-4 gap-4">
+                                    <div className="flex flex-col items-center p-3 bg-primary/5 rounded-md">
+                                      <span className="text-2xl font-bold text-primary">{pctAcquired}%</span>
+                                      <span className="text-sm text-secondary">Acquises</span>
+                                    </div>
+                                    <div className="flex flex-col items-center p-3 bg-yellow-50 rounded-md">
+                                      <span className="text-2xl font-bold text-yellow-600">{pctInProgress}%</span>
+                                      <span className="text-sm text-yellow-700">En cours</span>
+                                    </div>
+                                    <div className="flex flex-col items-center p-3 bg-red-50 rounded-md">
+                                      <span className="text-2xl font-bold text-red-500">{pctNotAcquired}%</span>
+                                      <span className="text-sm text-red-600">Non acquises</span>
+                                    </div>
+                                    <div className="flex flex-col items-center p-3 bg-gray-100 rounded-md">
+                                      <span className="text-2xl font-bold text-gray-500">{pctNotEvaluated}%</span>
+                                      <span className="text-sm text-gray-600">Non évaluées</span>
+                                    </div>
+                                  </div>
+                                ) : (
+                                  <p className="text-gray-500 text-sm">Aucune compétence évaluée pour cette période.</p>
+                                )}
+                              </div>
+                            );
+                          })()}
+
+                          {/* Notes par matière - Vue simplifiée */}
+                          <div className="border border-gray-100 rounded-md p-4">
+                            <div className="flex items-center gap-2 mb-4">
+                              <Award className="w-5 h-5 text-primary" />
+                              <h3 className="font-headline text-lg font-semibold text-gray-800">
+                                Notes par matière
+                              </h3>
+                            </div>
+                            {evaluations.length > 0 ? (
+                              <div className="grid grid-cols-1 sm:grid-cols-2 lg:grid-cols-3 gap-3">
+                                {(() => {
+                                  // Grouper par matière
+                                  const bySpeciality = evaluations.reduce((acc, ev) => {
+                                    const key = ev.speciality_name || 'Sans matière';
+                                    if (!acc[key]) {
+                                      acc[key] = {
+                                        name: key,
+                                        color: ev.speciality_color || '#6B7280',
+                                        evaluations: [],
+                                        totalWeighted: 0,
+                                        totalCoef: 0,
+                                      };
+                                    }
+                                    const studentEval = studentEvaluationsData.find((se) => se.evaluation === ev.id);
+                                    acc[key].evaluations.push({ ...ev, studentScore: studentEval?.score, isAbsent: studentEval?.is_absent });
+                                    if (studentEval?.score != null && !studentEval?.is_absent) {
+                                      const normalized = (studentEval.score / ev.max_score) * 20;
+                                      acc[key].totalWeighted += normalized * ev.coefficient;
+                                      acc[key].totalCoef += parseFloat(ev.coefficient);
+                                    }
+                                    return acc;
+                                  }, {});
+
+                                  return Object.values(bySpeciality).map((group) => {
+                                    const avg = group.totalCoef > 0 ? (group.totalWeighted / group.totalCoef) : null;
+                                    const evalCount = group.evaluations.length;
+                                    const gradedCount = group.evaluations.filter((e) => e.studentScore != null).length;
+
+                                    return (
+                                      <div
+                                        key={group.name}
+                                        className="rounded-md p-4 border"
+                                        style={{
+                                          backgroundColor: `${group.color}10`,
+                                          borderColor: `${group.color}40`,
+                                        }}
+                                      >
+                                        <div className="flex items-center gap-2 mb-2">
+                                          <span
+                                            className="w-3 h-3 rounded-full flex-shrink-0"
+                                            style={{ backgroundColor: group.color }}
+                                          />
+                                          <span className="font-medium text-gray-800 truncate">{group.name}</span>
+                                        </div>
+                                        <div className="flex items-baseline justify-between">
+                                          <span
+                                            className="text-2xl font-bold"
+                                            style={{ color: group.color }}
+                                          >
+                                            {avg !== null ? avg.toFixed(1) : '-'}
+                                          </span>
+                                          <span className="text-sm text-gray-500">/20</span>
+                                        </div>
+                                        <div className="text-xs text-gray-500 mt-1">
+                                          {gradedCount}/{evalCount} évaluation{evalCount > 1 ? 's' : ''}
+                                        </div>
+                                      </div>
+                                    );
+                                  });
+                                })()}
+                              </div>
+                            ) : (
+                              <p className="text-gray-500 text-sm text-center py-4">Aucune évaluation pour cette période.</p>
+                            )}
+                          </div>
+                        </>
+                      )}
+                      </div>
+                      {/* Fin bloc période */}
+
+                      {/* Section Absences — toute l'année scolaire */}
+                      <div className="bg-white rounded-md border border-gray-200 p-4">
+                        <div className="flex items-center gap-2 mb-1">
+                          <Clock className="w-5 h-5 text-primary" />
+                          <h3 className="font-headline text-lg font-semibold text-gray-800">
+                            Absences & Retards
+                          </h3>
+                        </div>
+                        <p className="text-xs text-gray-400 mb-4">Toute l&apos;année scolaire</p>
+                        <div className="grid grid-cols-2 sm:grid-cols-4 gap-4">
+                          <div className="flex flex-col items-center p-3 bg-primary/5 rounded-md">
+                            <span className="text-2xl font-bold text-primary">{absenceStats.justifiedAbsence}</span>
+                            <span className="text-sm text-secondary text-center">Absences justifiées</span>
+                          </div>
+                          <div className="flex flex-col items-center p-3 bg-red-50 rounded-md">
+                            <span className="text-2xl font-bold text-red-500">{absenceStats.unjustifiedAbsence}</span>
+                            <span className="text-sm text-red-600 text-center">Absences non justifiées</span>
+                          </div>
+                          <div className="flex flex-col items-center p-3 bg-blue-50 rounded-md">
+                            <span className="text-2xl font-bold text-blue-600">{absenceStats.justifiedLate}</span>
+                            <span className="text-sm text-blue-700 text-center">Retards justifiés</span>
+                          </div>
+                          <div className="flex flex-col items-center p-3 bg-orange-50 rounded-md">
+                            <span className="text-2xl font-bold text-orange-500">{absenceStats.unjustifiedLate}</span>
+                            <span className="text-sm text-orange-600 text-center">Retards non justifiés</span>
+                          </div>
+                        </div>
+                      </div>
+
+                    </div>
+                  )}
+                </div>
+              );
+            })}
           </div>
-          {/* Composant FileUpload et bouton Valider en dessous du tableau */}
-          {uploadState === 'on' && uploadingStudentId && (
-            <div className="mt-4">
-              <FileUpload
-                selectionMessage="Sélectionnez un fichier à uploader"
-                onFileSelect={handleFileUpload}
-              />
-              <button
-                className={`mt-4 px-6 py-2 rounded-md ${
-                  uploadedFile
-                    ? 'bg-emerald-500 text-white hover:bg-emerald-600'
-                    : 'bg-gray-300 text-gray-700 cursor-not-allowed'
-                }`}
-                onClick={handleSubmit}
-                disabled={!uploadedFile}
-              >
-                Valider
-              </button>
-            </div>
-          )}
         </div>
       )}
     </div>

Front-End/src/app/[locale]/parents/settings/page.js

@@ -39,37 +39,41 @@ export default function SettingsPage() {
   };
 
   return (
-    <div className="p-4">
-      <h2 className="text-xl mb-4">Paramètres du compte</h2>
-      <form onSubmit={handleSubmit}>
-        <InputText
-          type="email"
-          id="email"
-          label="Email"
-          value={email}
-          onChange={handleEmailChange}
-          required
-        />
-        <InputText
-          type="password"
-          id="password"
-          label="Nouveau mot de passe"
-          value={password}
-          onChange={handlePasswordChange}
-          required
-        />
-        <InputText
-          type="password"
-          id="confirmPassword"
-          label="Confirmer le mot de passe"
-          value={confirmPassword}
-          onChange={handleConfirmPasswordChange}
-          required
-        />
-        <div className="flex items-center justify-between">
-          <Button type="submit" primary text={' Mettre à jour'} />
-        </div>
-      </form>
+    <div className="p-6">
+      <h1 className="font-headline text-2xl font-bold text-gray-900 mb-6">
+        Paramètres du compte
+      </h1>
+      <div className="bg-white rounded-md border border-gray-200 shadow-sm p-6 max-w-md">
+        <form onSubmit={handleSubmit} className="space-y-4">
+          <InputText
+            type="email"
+            id="email"
+            label="Email"
+            value={email}
+            onChange={handleEmailChange}
+            required
+          />
+          <InputText
+            type="password"
+            id="password"
+            label="Nouveau mot de passe"
+            value={password}
+            onChange={handlePasswordChange}
+            required
+          />
+          <InputText
+            type="password"
+            id="confirmPassword"
+            label="Confirmer le mot de passe"
+            value={confirmPassword}
+            onChange={handleConfirmPasswordChange}
+            required
+          />
+          <div className="flex items-center justify-between pt-2">
+            <Button type="submit" primary text={'Mettre à jour'} />
+          </div>
+        </form>
+      </div>
     </div>
   );
 }

Front-End/src/app/[locale]/users/login/page.js

@@ -80,16 +80,15 @@ export default function Page() {
     return <Loader />; // Affichez le composant Loader
   } else {
     return (
-      <>
-        <div className="container max mx-auto p-4">
-          <div className="flex justify-center mb-4">
+      <div className="min-h-screen flex items-center justify-center p-4 bg-neutral">
+        <div className="bg-white rounded-md border border-gray-200 shadow-sm p-8 w-full max-w-md">
+          <div className="flex justify-center mb-6">
             <Logo className="h-150 w-150" />
           </div>
-          <h1 className="text-2xl font-bold text-center mb-4">
+          <h1 className="font-headline text-2xl font-bold text-center text-gray-900 mb-6">
             Authentification
           </h1>
           <form
-            className="max-w-md mx-auto"
             onSubmit={(e) => {
               e.preventDefault();
               handleFormLogin(new FormData(e.target));
@@ -112,27 +111,24 @@ export default function Page() {
               placeholder="Mot de passe"
               className="w-full mb-5"
             />
-            <div className="input-group mb-4"></div>
-            <label>
+            <div className="flex justify-end mb-4">
               <a
-                className="float-right mb-4"
+                className="text-sm text-primary hover:text-secondary font-label transition-colors"
                 href={`${FE_USERS_NEW_PASSWORD_URL}`}
               >
                 Mot de passe oublié ?
               </a>
-            </label>
-            <div className="form-group-submit mt-4">
-              <Button
-                text="Se Connecter"
-                className="w-full"
-                primary
-                type="submit"
-                name="connect"
-              />
             </div>
+            <Button
+              text="Se Connecter"
+              className="w-full"
+              primary
+              type="submit"
+              name="connect"
+            />
           </form>
         </div>
-      </>
+      </div>
     );
   }
 }

Front-End/src/app/[locale]/users/password/new/page.js

@@ -48,16 +48,15 @@ export default function Page() {
     return <Loader />;
   } else {
     return (
-      <>
-        <div className="container max mx-auto p-4">
-          <div className="flex justify-center mb-4">
+      <div className="min-h-screen bg-neutral flex items-center justify-center p-4">
+        <div className="bg-white rounded-md border border-gray-200 shadow-sm p-8 w-full max-w-md">
+          <div className="flex justify-center mb-6">
             <Logo className="h-150 w-150" />
           </div>
-          <h1 className="text-2xl font-bold text-center mb-4">
+          <h1 className="font-headline text-2xl font-bold text-center text-gray-900 mb-6">
             Nouveau Mot de passe
           </h1>
           <form
-            className="max-w-md mx-auto"
             onSubmit={(e) => {
               e.preventDefault();
               validate(new FormData(e.target));
@@ -70,28 +69,23 @@ export default function Page() {
               IconItem={User}
               label="Identifiant"
               placeholder="Identifiant"
-              className="w-full"
+              className="w-full mb-6"
+            />
+            <Button
+              text="Réinitialiser"
+              className="w-full mb-3"
+              primary
+              type="submit"
+              name="validate"
             />
-            <div className="form-group-submit mt-4">
-              <Button
-                text="Réinitialiser"
-                className="w-full"
-                primary
-                type="submit"
-                name="validate"
-              />
-            </div>
-          </form>
-          <br />
-          <div className="flex justify-center mt-2 max-w-md mx-auto">
             <Button
               text="Annuler"
               className="w-full"
               href={`${FE_USERS_LOGIN_URL}`}
             />
-          </div>
+          </form>
         </div>
-      </>
+      </div>
     );
   }
 }

Front-End/src/app/[locale]/users/password/reset/page.js

@@ -61,16 +61,15 @@ export default function Page() {
     return <Loader />;
   } else {
     return (
-      <>
-        <div className="container max mx-auto p-4">
-          <div className="flex justify-center mb-4">
+      <div className="min-h-screen bg-neutral flex items-center justify-center p-4">
+        <div className="bg-white rounded-md border border-gray-200 shadow-sm p-8 w-full max-w-md">
+          <div className="flex justify-center mb-6">
             <Logo className="h-150 w-150" />
           </div>
-          <h1 className="text-2xl font-bold text-center mb-4">
+          <h1 className="font-headline text-2xl font-bold text-center text-gray-900 mb-6">
             Réinitialisation du mot de passe
           </h1>
           <form
-            className="max-w-md mx-auto"
             onSubmit={(e) => {
               e.preventDefault();
               validate(new FormData(e.target));
@@ -91,28 +90,23 @@ export default function Page() {
               IconItem={KeySquare}
               label="Confirmation mot de passe"
               placeholder="Confirmation mot de passe"
-              className="w-full"
+              className="w-full mb-6"
+            />
+            <Button
+              text="Enregistrer"
+              className="w-full mb-3"
+              primary
+              type="submit"
+              name="validate"
             />
-            <div className="form-group-submit mt-4">
-              <Button
-                text="Enregistrer"
-                className="w-full"
-                primary
-                type="submit"
-                name="validate"
-              />
-            </div>
-          </form>
-          <br />
-          <div className="flex justify-center mt-2 max-w-md mx-auto">
             <Button
               text="Annuler"
               className="w-full"
               href={`${FE_USERS_LOGIN_URL}`}
             />
-          </div>
+          </form>
         </div>
-      </>
+      </div>
     );
   }
 }

Front-End/src/app/[locale]/users/subscribe/page.js

@@ -65,16 +65,15 @@ export default function Page() {
     return <Loader />;
   } else {
     return (
-      <>
-        <div className="container max mx-auto p-4">
-          <div className="flex justify-center mb-4">
+      <div className="min-h-screen bg-neutral flex items-center justify-center p-4">
+        <div className="bg-white rounded-md border border-gray-200 shadow-sm p-8 w-full max-w-md">
+          <div className="flex justify-center mb-6">
             <Logo className="h-150 w-150" />
           </div>
-          <h1 className="text-2xl font-bold text-center mb-4">
+          <h1 className="font-headline text-2xl font-bold text-center text-gray-900 mb-6">
             Nouveau profil
           </h1>
           <form
-            className="max-w-md mx-auto"
             onSubmit={(e) => {
               e.preventDefault();
               subscribeFormSubmit(new FormData(e.target));
@@ -103,30 +102,23 @@ export default function Page() {
               IconItem={KeySquare}
               label="Confirmation mot de passe"
               placeholder="Confirmation mot de passe"
-              className="w-full"
+              className="w-full mb-6"
+            />
+            <Button
+              text="Enregistrer"
+              className="w-full mb-3"
+              primary
+              type="submit"
+              name="validate"
             />
-            <div className="form-group-submit mt-4">
-              <Button
-                text="Enregistrer"
-                className="w-full"
-                primary
-                type="submit"
-                name="validate"
-              />
-            </div>
-          </form>
-          <br />
-          <div className="flex justify-center mt-2 max-w-md mx-auto">
             <Button
               text="Annuler"
               className="w-full"
-              onClick={() => {
-                router.push(`${FE_USERS_LOGIN_URL}`);
-              }}
+              onClick={() => router.push(`${FE_USERS_LOGIN_URL}`)}
             />
-          </div>
+          </form>
         </div>
-      </>
+      </div>
     );
   }
 }

Front-End/src/app/actions/emailAction.js

@@ -1,6 +1,7 @@
 import {
   BE_GESTIONEMAIL_SEARCH_RECIPIENTS_URL,
   BE_GESTIONEMAIL_SEND_EMAIL_URL,
+  BE_GESTIONEMAIL_SEND_FEEDBACK_URL,
 } from '@/utils/Url';
 import { fetchWithAuth } from '@/utils/fetchWithAuth';
 import { getCsrfToken } from '@/utils/getCsrfToken';
@@ -19,3 +20,13 @@ export const sendEmail = async (messageData) => {
     body: JSON.stringify(messageData),
   });
 };
+
+// Envoyer un feedback au support
+export const sendFeedback = async (feedbackData) => {
+  const csrfToken = getCsrfToken();
+  return fetchWithAuth(BE_GESTIONEMAIL_SEND_FEEDBACK_URL, {
+    method: 'POST',
+    headers: { 'X-CSRFToken': csrfToken },
+    body: JSON.stringify(feedbackData),
+  });
+};

Front-End/src/app/actions/registerFileGroupAction.js

@@ -26,6 +26,10 @@ export const fetchRegistrationSchoolFileMasters = (establishment) => {
   return fetchWithAuth(url);
 };
 
+export const fetchRegistrationSchoolFileMasterById = (id) => {
+  return fetchWithAuth(`${BE_SUBSCRIPTION_REGISTRATION_SCHOOL_FILE_MASTERS_URL}/${id}`);
+};
+
 export const fetchRegistrationParentFileMasters = (establishment) => {
   const url = `${BE_SUBSCRIPTION_REGISTRATION_PARENT_FILE_MASTERS_URL}?establishment_id=${establishment}`;
   return fetchWithAuth(url);

Front-End/src/app/actions/schoolAction.js

@@ -37,10 +37,10 @@ export const fetchEstablishmentCompetencies = (establishment, cycle = 1) => {
   );
 };
 
-export const fetchSpecialities = (establishment) => {
-  return fetchWithAuth(
-    `${BE_SCHOOL_SPECIALITIES_URL}?establishment_id=${establishment}`
-  );
+export const fetchSpecialities = (establishment, schoolYear = null) => {
+  let url = `${BE_SCHOOL_SPECIALITIES_URL}?establishment_id=${establishment}`;
+  if (schoolYear) url += `&school_year=${schoolYear}`;
+  return fetchWithAuth(url);
 };
 
 export const fetchTeachers = (establishment) => {

Front-End/src/app/layout.js

@@ -1,19 +1,19 @@
 import React from 'react';
 import { getMessages } from 'next-intl/server';
-import { Inter, Manrope } from 'next/font/google';
+import localFont from 'next/font/local';
 import Providers from '@/components/Providers';
 import ServiceWorkerRegister from '@/components/ServiceWorkerRegister';
 import '@/css/tailwind.css';
 import { headers } from 'next/headers';
 
-const inter = Inter({
-  subsets: ['latin'],
+const inter = localFont({
+  src: '../fonts/Inter-Variable.woff2',
   variable: '--font-inter',
   display: 'swap',
 });
 
-const manrope = Manrope({
-  subsets: ['latin'],
+const manrope = localFont({
+  src: '../fonts/Manrope-Variable.woff2',
   variable: '--font-manrope',
   display: 'swap',
 });

Front-End/src/app/not-found.js

@@ -3,16 +3,19 @@ import Logo from '../components/Logo';
 
 export default function NotFound() {
   return (
-    <div className="flex items-center justify-center min-h-screen bg-emerald-500">
-      <div className="text-center p-6 ">
+    <div className="flex items-center justify-center min-h-screen bg-primary">
+      <div className="text-center p-6 bg-white rounded-md shadow-sm border border-gray-200">
         <Logo className="w-32 h-32 mx-auto mb-4" />
-        <h2 className="text-2xl font-bold text-emerald-900 mb-4">
+        <h2 className="font-headline text-2xl font-bold text-secondary mb-4">
           404 | Page non trouvée
         </h2>
-        <p className="text-emerald-900 mb-4">
+        <p className="font-body text-gray-600 mb-4">
           La ressource que vous souhaitez consulter n&apos;existe pas ou plus.
         </p>
-        <Link className="text-gray-900 hover:underline" href="/">
+        <Link
+          className="inline-flex items-center justify-center min-h-[44px] px-4 py-2 rounded font-label font-medium bg-primary hover:bg-secondary text-white transition-colors"
+          href="/"
+        >
           Retour Accueil
         </Link>
       </div>

Front-End/src/components/Admin/AnnouncementScheduler.js

@@ -14,7 +14,7 @@ export default function AnnouncementScheduler({ csrfToken }) {
 
   return (
     <div className="p-4 bg-white rounded shadow">
-      <h2 className="text-xl font-bold mb-4">Planifier une Annonce</h2>
+      <h2 className="font-headline text-xl font-bold mb-4">Planifier une Annonce</h2>
       <div className="mb-4">
         <label className="block font-medium">Titre</label>
         <input

Front-End/src/components/AffectationClasseForm.js

@@ -39,7 +39,7 @@ const AffectationClasseForm = ({ eleve = {}, onSubmit, classes }) => {
                 value={classe.id}
                 checked={formData.classeAssocie_id === classe.id}
                 onChange={handleChange}
-                className="form-radio h-3 w-3 text-emerald-600 focus:ring-emerald-500 hover:ring-emerald-400 checked:bg-emerald-600 checked:h-3 checked:w-3"
+                className="form-radio h-3 w-3 text-primary focus:ring-primary hover:ring-tertiary checked:bg-primary checked:h-3 checked:w-3"
               />
               <label
                 htmlFor={`classe-${classe.id}`}
@@ -57,7 +57,7 @@ const AffectationClasseForm = ({ eleve = {}, onSubmit, classes }) => {
           className={`px-4 py-2 rounded-md shadow-sm focus:outline-none ${
             !formData.classeAssocie_id
               ? 'bg-gray-300 text-gray-700 cursor-not-allowed'
-              : 'bg-emerald-500 text-white hover:bg-emerald-600'
+              : 'bg-primary text-white hover:bg-primary'
           }`}
           disabled={!formData.classeAssocie_id}
         >

Front-End/src/components/AlertMessage.js

@@ -7,7 +7,6 @@ const AlertMessage = ({
   actionLabel,
   onAction,
 }) => {
-  // Définir les styles en fonction du type d'alerte
   const typeStyles = {
     info: 'bg-blue-100 border-blue-500 text-blue-700',
     warning: 'bg-yellow-100 border-yellow-500 text-yellow-700',
@@ -18,13 +17,13 @@ const AlertMessage = ({
   const alertStyle = typeStyles[type] || typeStyles.info;
 
   return (
-    <div className={`alert centered border-l-4 p-4 ${alertStyle}`} role="alert">
-      <h3 className="font-bold">{title}</h3>
+    <div className={`alert centered border-l-4 p-4 rounded ${alertStyle}`} role="alert">
+      <h3 className="font-headline font-bold">{title}</h3>
       <p className="mt-2">{message}</p>
       {actionLabel && onAction && (
         <div className="alert-actions mt-4">
           <button
-            className="btn primary bg-emerald-500 text-white rounded-md px-4 py-2 hover:bg-emerald-600"
+            className="bg-primary text-white font-label font-medium rounded px-4 py-2 hover:bg-secondary transition-colors min-h-[44px]"
             onClick={onAction}
           >
             {actionLabel}

Front-End/src/components/AlertWithModal.js

@@ -14,11 +14,11 @@ const AlertWithModal = ({ title, message, buttonText }) => {
       className="alert centered bg-yellow-100 border-l-4 border-yellow-500 text-yellow-700 p-4"
       role="alert"
     >
-      <h3 className="font-bold">{title}</h3>
+      <h3 className="font-headline font-bold">{title}</h3>
       <p className="mt-2">{message}</p>
       <div className="alert-actions mt-4">
         <button
-          className="btn primary bg-emerald-500 text-white rounded-md px-4 py-2 hover:bg-emerald-600 flex items-center"
+          className="btn primary bg-primary text-white rounded-md px-4 py-2 hover:bg-primary flex items-center"
           onClick={openModal}
         >
           {buttonText} <UserPlus size={20} className="ml-2" />

Front-End/src/components/AlphabetLinks.js

@@ -4,7 +4,7 @@ const AlphabetPaginationNumber = ({ letter, active, onClick }) => (
   <button
     className={`w-8 h-8 flex items-center justify-center rounded ${
       active
-        ? 'bg-emerald-500 text-white'
+        ? 'bg-primary text-white'
         : 'text-gray-600 bg-gray-200 hover:bg-gray-50'
     }`}
     onClick={onClick}

Front-End/src/components/Calendar/Calendar.js

@@ -126,7 +126,7 @@ const Calendar = ({ modeSet, onDateClick, onEventClick, planningClassName = '',
                     onClick={() => setShowDatePicker(!showDatePicker)}
                     className="flex items-center gap-1 px-2 py-1 hover:bg-gray-100 rounded-md"
                   >
-                    <h2 className="text-xl font-semibold">
+                    <h2 className="font-headline text-xl font-semibold">
                       {format(currentDate, viewType === 'year' ? 'yyyy' : 'MMMM yyyy', { locale: fr })}
                     </h2>
                     <ChevronDown className="w-4 h-4" />
@@ -185,7 +185,7 @@ const Calendar = ({ modeSet, onDateClick, onEventClick, planningClassName = '',
               {(planningMode === PlanningModes.PLANNING || (planningMode === PlanningModes.CLASS_SCHEDULE && !parentView)) && (
                 <button
                   onClick={onDateClick}
-                  className="w-10 h-10 flex items-center justify-center bg-emerald-600 text-white rounded-full hover:bg-emerald-700 shadow-md transition-colors"
+                  className="w-10 h-10 flex items-center justify-center bg-primary text-white rounded-full hover:bg-secondary shadow-md transition-colors"
                 >
                   <Plus className="w-5 h-5" />
                 </button>

Front-End/src/components/Calendar/DayView.js

@@ -13,7 +13,7 @@ import { getWeekEvents } from '@/utils/events';
 import { CalendarDays, ChevronLeft, ChevronRight, Plus } from 'lucide-react';
 
 const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
-  const { currentDate, setCurrentDate, parentView } = usePlanning();
+  const { currentDate, setCurrentDate, parentView, schedules } = usePlanning();
   const [currentTime, setCurrentTime] = useState(new Date());
   const scrollRef = useRef(null);
 
@@ -43,11 +43,28 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
     return `${(hours + minutes / 60) * 5}rem`;
   };
 
+  const getScheduleColor = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    return schedule?.color || event.color || '#6B7280';
+  };
+
+  const getScheduleClassLevelLabel = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    const scheduleName = schedule?.name || '';
+    if (!scheduleName) return '';
+    return scheduleName;
+  };
+
   const calculateEventStyle = (event, allDayEvents) => {
     const start = new Date(event.start);
     const end = new Date(event.end);
     const startMinutes = (start.getMinutes() / 60) * 5;
     const duration = ((end - start) / (1000 * 60 * 60)) * 5;
+    const scheduleColor = getScheduleColor(event);
 
     const overlapping = allDayEvents.filter((other) => {
       if (other.id === event.id) return false;
@@ -114,7 +131,7 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
 
         <button
           onClick={() => onDateClick?.(currentDate)}
-          className="w-9 h-9 flex items-center justify-center bg-emerald-600 text-white rounded-full hover:bg-emerald-700 shadow-md transition-colors"
+          className="w-9 h-9 flex items-center justify-center bg-primary text-white rounded-full hover:bg-secondary shadow-md transition-colors"
         >
           <Plus className="w-4 h-4" />
         </button>
@@ -128,9 +145,9 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
             onClick={() => setCurrentDate(day)}
             className={`flex flex-col items-center min-w-[2.75rem] px-1 py-1.5 rounded-xl transition-colors ${
               isSameDay(day, currentDate)
-                ? 'bg-emerald-600 text-white'
+                ? 'bg-primary text-white'
                 : isToday(day)
-                  ? 'border border-emerald-400 text-emerald-600'
+                  ? 'border border-tertiary text-primary'
                   : 'text-gray-600 hover:bg-gray-100'
             }`}
           >
@@ -146,10 +163,10 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
       <div ref={scrollRef} className="flex-1 overflow-y-auto relative">
         {isCurrentDay && (
           <div
-            className="absolute left-0 right-0 z-10 border-emerald-500 border pointer-events-none"
+            className="absolute left-0 right-0 z-10 border-primary border pointer-events-none"
             style={{ top: getCurrentTimePosition() }}
           >
-            <div className="absolute -left-2 -top-2 w-2 h-2 rounded-full bg-emerald-500" />
+            <div className="absolute -left-2 -top-2 w-2 h-2 rounded-full bg-primary" />
           </div>
         )}
 
@@ -163,8 +180,8 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
                 {`${hour.toString().padStart(2, '0')}:00`}
               </div>
               <div
-                className={`h-20 relative border-b border-gray-100 ${
-                  isCurrentDay ? 'bg-emerald-50/30' : 'bg-white'
+                className={`h-20 relative ${
+                  isCurrentDay ? 'bg-primary/5/30' : 'bg-white'
                 }`}
                 onClick={
                   parentView
@@ -179,8 +196,11 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
               >
                 {dayEvents
                   .filter((e) => new Date(e.start).getHours() === hour)
-                  .map((event) => (
-                    <div
+                  .map((event) => {
+                    const scheduleColor = getScheduleColor(event);
+                    const classLevelLabel = getScheduleClassLevelLabel(event);
+                    return (
+                      <div
                       key={event.id}
                       className="rounded-sm overflow-hidden cursor-pointer hover:shadow-lg"
                       style={calculateEventStyle(event, dayEvents)}
@@ -192,32 +212,53 @@ const DayView = ({ onDateClick, onEventClick, events, onOpenDrawer }) => {
                               onEventClick(event);
                             }
                       }
-                    >
-                      <div className="p-1">
-                        <div
-                          className="font-semibold text-xs truncate"
-                          style={{ color: event.color }}
-                        >
-                          {event.title}
-                        </div>
-                        <div
-                          className="text-xs"
-                          style={{ color: event.color, opacity: 0.75 }}
-                        >
-                          {format(new Date(event.start), 'HH:mm')} –{' '}
-                          {format(new Date(event.end), 'HH:mm')}
-                        </div>
-                        {event.location && (
+                      >
+                        {classLevelLabel && (
                           <div
-                            className="text-xs truncate"
-                            style={{ color: event.color, opacity: 0.75 }}
+                            className="px-1 py-0.5 border-t-2"
+                            style={{
+                              borderTopColor: scheduleColor,
+                              backgroundColor: `${scheduleColor}22`,
+                            }}
                           >
-                            {event.location}
+                            <span
+                              className="text-[10px] font-semibold uppercase tracking-wide truncate block text-center"
+                              style={{ color: scheduleColor }}
+                            >
+                              {classLevelLabel}
+                            </span>
                           </div>
                         )}
+                        <div className="p-1">
+                          <div
+                            className="font-semibold text-xs truncate flex items-center gap-1"
+                            style={{ color: event.color }}
+                          >
+                            <span
+                              className="w-2 h-2 rounded-full shrink-0"
+                              style={{ backgroundColor: event.color }}
+                            />
+                            <span className="truncate flex-1">{event.title}</span>
+                          </div>
+                          <div
+                            className="text-xs"
+                            style={{ color: event.color, opacity: 0.75 }}
+                          >
+                            {format(new Date(event.start), 'HH:mm')} –{' '}
+                            {format(new Date(event.end), 'HH:mm')}
+                          </div>
+                          {event.location && (
+                            <div
+                              className="text-xs truncate"
+                              style={{ color: event.color, opacity: 0.75 }}
+                            >
+                              {event.location}
+                            </div>
+                          )}
+                        </div>
                       </div>
-                    </div>
-                  ))}
+                    );
+                  })}
               </div>
             </React.Fragment>
           ))}

Front-End/src/components/Calendar/EventModal.js

@@ -10,20 +10,31 @@ export default function EventModal({
   eventData,
   setEventData,
 }) {
-  const { addEvent, handleUpdateEvent, handleDeleteEvent, schedules } =
+  const {
+    addEvent,
+    handleUpdateEvent,
+    handleDeleteEvent,
+    schedules,
+    selectedSchedule,
+  } =
     usePlanning();
   const { showNotification } = useNotification();
 
   // S'assurer que planning est défini lors du premier rendu
   React.useEffect(() => {
     if (!eventData?.planning && schedules.length > 0) {
+      const defaultSchedule =
+        schedules.find(
+          (schedule) => Number(schedule.id) === Number(selectedSchedule)
+        ) || schedules[0];
+
       setEventData((prev) => ({
         ...prev,
-        planning: schedules[0].id,
-        color: schedules[0].color,
+        planning: defaultSchedule.id,
+        color: defaultSchedule.color,
       }));
     }
-  }, [schedules, eventData?.planning]);
+  }, [schedules, selectedSchedule, eventData?.planning]);
 
   if (!isOpen) return null;
 
@@ -105,7 +116,7 @@ export default function EventModal({
             onChange={(e) =>
               setEventData({ ...eventData, title: e.target.value })
             }
-            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
             required
           />
         </div>
@@ -120,7 +131,7 @@ export default function EventModal({
             onChange={(e) =>
               setEventData({ ...eventData, description: e.target.value })
             }
-            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
             rows="3"
           />
         </div>
@@ -142,7 +153,7 @@ export default function EventModal({
                 color: selectedSchedule?.color || '#10b981',
               });
             }}
-            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
             required
           >
             {schedules.map((schedule) => (
@@ -185,7 +196,7 @@ export default function EventModal({
                 recursionType: e.target.value,
               });
             }}
-            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
           >
             {recurrenceOptions.map((option) => (
               <option key={option.value} value={option.value}>
@@ -215,7 +226,7 @@ export default function EventModal({
                   }}
                   className={`px-3 py-1 rounded-full text-sm ${
                     (eventData.selectedDays || []).includes(day.value)
-                      ? 'bg-emerald-100 text-emerald-800'
+                      ? 'bg-primary/10 text-secondary'
                       : 'bg-gray-100 text-gray-600'
                   }`}
                 >
@@ -247,7 +258,7 @@ export default function EventModal({
                     : null,
                 })
               }
-              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
             />
           </div>
         )}
@@ -267,7 +278,7 @@ export default function EventModal({
                   start: new Date(e.target.value).toISOString(),
                 })
               }
-              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
               required
             />
           </div>
@@ -284,7 +295,7 @@ export default function EventModal({
                   end: new Date(e.target.value).toISOString(),
                 })
               }
-              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+              className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
               required
             />
           </div>
@@ -301,7 +312,7 @@ export default function EventModal({
             onChange={(e) =>
               setEventData({ ...eventData, location: e.target.value })
             }
-            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-emerald-500"
+            className="w-full p-2 border rounded focus:outline-none focus:ring-2 focus:ring-primary"
           />
         </div>
 
@@ -328,7 +339,7 @@ export default function EventModal({
             </button>
             <button
               type="submit"
-              className="px-4 py-2 bg-emerald-600 text-white rounded hover:bg-emerald-700"
+              className="px-4 py-2 bg-primary text-white rounded hover:bg-secondary"
             >
               {eventData.id ? 'Modifier' : 'Créer'}
             </button>

Front-End/src/components/Calendar/MonthView.js

@@ -14,7 +14,24 @@ import { fr } from 'date-fns/locale';
 import { getEventsForDate } from '@/utils/events';
 
 const MonthView = ({ onDateClick, onEventClick }) => {
-  const { currentDate, setViewType, setCurrentDate, events } = usePlanning();
+  const { currentDate, setViewType, setCurrentDate, events, schedules } =
+    usePlanning();
+
+  const getScheduleColor = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    return schedule?.color || event.color || '#6B7280';
+  };
+
+  const getScheduleClassLevelLabel = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    const scheduleName = schedule?.name || '';
+    if (!scheduleName) return '';
+    return scheduleName;
+  };
 
   // Obtenir tous les jours du mois actuel
   const monthStart = startOfMonth(currentDate);
@@ -39,22 +56,25 @@ const MonthView = ({ onDateClick, onEventClick }) => {
         key={day.toString()}
         className={`p-2 overflow-y-auto relative flex flex-col
           ${!isCurrentMonth ? 'bg-gray-100 text-gray-400' : ''}
-          ${isCurrentDay ? 'bg-emerald-50' : ''}
+          ${isCurrentDay ? 'bg-primary/5' : ''}
           hover:bg-gray-100 cursor-pointer border-b border-r`}
         onClick={() => handleDayClick(day)}
       >
         <div className="flex justify-between items-center mb-1">
           <span
             className={`text-sm font-medium rounded-full w-7 h-7 flex items-center justify-center
-            ${isCurrentDay ? 'bg-emerald-500 text-white' : ''}
+            ${isCurrentDay ? 'bg-primary text-white' : ''}
             ${!isCurrentMonth ? 'text-gray-400' : ''}`}
           >
             {format(day, 'd')}
           </span>
         </div>
         <div className="space-y-1 flex-1">
-          {dayEvents.map((event, index) => (
-            <div
+          {dayEvents.map((event) => {
+            const scheduleColor = getScheduleColor(event);
+            const classLevelLabel = getScheduleClassLevelLabel(event);
+            return (
+              <div
               key={event.id}
               className="text-xs p-1 rounded truncate cursor-pointer"
               style={{
@@ -67,9 +87,32 @@ const MonthView = ({ onDateClick, onEventClick }) => {
                 onEventClick(event);
               }}
             >
-              {event.title}
+                {classLevelLabel && (
+                  <div
+                    className="-mx-1 -mt-1 mb-1 px-1 py-0.5 border-t-2"
+                    style={{
+                      borderTopColor: scheduleColor,
+                      backgroundColor: `${scheduleColor}22`,
+                    }}
+                  >
+                    <span
+                      className="text-[10px] font-semibold uppercase tracking-wide truncate block text-center"
+                      style={{ color: scheduleColor }}
+                    >
+                      {classLevelLabel}
+                    </span>
+                  </div>
+                )}
+              <span className="inline-flex items-center gap-1 max-w-full">
+                <span
+                  className="w-2 h-2 rounded-full shrink-0"
+                  style={{ backgroundColor: event.color }}
+                />
+                <span className="truncate flex-1">{event.title}</span>
+              </span>
             </div>
-          ))}
+            );
+          })}
         </div>
       </div>
     );

Front-End/src/components/Calendar/ScheduleNavigation.js

@@ -247,7 +247,7 @@ export default function ScheduleNavigation({ classes, modeSet = 'event', isOpen
       {/* Desktop : sidebar fixe */}
       <nav className="hidden md:flex flex-col w-64 border-r p-4 h-full overflow-y-auto shrink-0">
         <div className="flex items-center justify-between mb-4">
-          <h2 className="font-semibold">{title}</h2>
+          <h2 className="font-headline font-semibold">{title}</h2>
           <button onClick={() => setIsAddingNew(true)} className="p-1 hover:bg-gray-100 rounded">
             <Plus className="w-4 h-4" />
           </button>
@@ -268,7 +268,7 @@ export default function ScheduleNavigation({ classes, modeSet = 'event', isOpen
           }`}
         >
           <div className="flex items-center justify-between p-4 border-b shrink-0">
-            <h2 className="font-semibold">{title}</h2>
+            <h2 className="font-headline font-semibold">{title}</h2>
             <div className="flex items-center gap-1">
               <button onClick={() => setIsAddingNew(true)} className="p-1 hover:bg-gray-100 rounded">
                 <Plus className="w-4 h-4" />

Front-End/src/components/Calendar/WeekView.js

@@ -7,7 +7,7 @@ import { isToday } from 'date-fns';
 
 
 const WeekView = ({ onDateClick, onEventClick, events }) => {
-  const { currentDate, planningMode, parentView } = usePlanning();
+  const { currentDate, planningMode, parentView, schedules } = usePlanning();
   const [currentTime, setCurrentTime] = useState(new Date());
   const scrollContainerRef = useRef(null); // Ajouter cette référence
 
@@ -54,6 +54,8 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
     return acc;
   }, {});
 
+  const todayIndex = weekDays.findIndex((day) => isToday(day));
+
   const isWeekend = (date) => {
     const day = date.getDay();
     return day === 0 || day === 6;
@@ -71,11 +73,28 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
     });
   };
 
+  const getScheduleColor = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    return schedule?.color || event.color || '#6B7280';
+  };
+
+  const getScheduleClassLevelLabel = (event) => {
+    const schedule = schedules?.find(
+      (item) => Number(item.id) === Number(event.planning)
+    );
+    const scheduleName = schedule?.name || '';
+    if (!scheduleName) return '';
+    return scheduleName;
+  };
+
   const calculateEventStyle = (event, dayEvents) => {
     const start = new Date(event.start);
     const end = new Date(event.end);
     const startMinutes = (start.getMinutes() / 60) * 5;
     const duration = ((end - start) / (1000 * 60 * 60)) * 5;
+    const scheduleColor = getScheduleColor(event);
 
     // Trouver les événements qui se chevauchent
     const overlappingEvents = findOverlappingEvents(event, dayEvents);
@@ -101,6 +120,8 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
 
   const renderEventInCell = (event, dayEvents) => {
     const eventStyle = calculateEventStyle(event, dayEvents);
+    const scheduleColor = getScheduleColor(event);
+    const classLevelLabel = getScheduleClassLevelLabel(event);
 
     return (
       <div
@@ -116,12 +137,32 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
               }
         }
       >
+        {classLevelLabel && (
+          <div
+            className="px-1 py-0.5 border-t-2"
+            style={{
+              borderTopColor: scheduleColor,
+              backgroundColor: `${scheduleColor}22`,
+            }}
+          >
+            <span
+              className="text-[10px] font-semibold uppercase tracking-wide truncate block text-center"
+              style={{ color: scheduleColor }}
+            >
+              {classLevelLabel}
+            </span>
+          </div>
+        )}
         <div className="p-1">
           <div
-            className="font-semibold text-xs truncate"
+            className="font-semibold text-xs truncate flex items-center gap-1"
             style={{ color: event.color }}
           >
-            {event.title}
+            <span
+              className="w-2 h-2 rounded-full shrink-0"
+              style={{ backgroundColor: event.color }}
+            />
+            <span className="truncate flex-1">{event.title}</span>
           </div>
           <div
             className="text-xs"
@@ -156,14 +197,14 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
             key={day}
             className={`h-14 p-2 text-center border-b
               ${isWeekend(day) ? 'bg-gray-50' : 'bg-white'}
-              ${isToday(day) ? 'bg-emerald-100 border-x border-emerald-600' : ''}`}
+              ${isToday(day) ? 'bg-primary/10 border-x border-primary' : ''}`}
           >
             <div className="text-xs font-medium text-gray-500">
               {format(day, 'EEEE', { locale: fr })}
             </div>
             <div
               className={`text-sm font-semibold inline-block rounded-full w-7 h-7 leading-7
-              ${isToday(day) ? 'bg-emerald-500 text-white' : ''}`}
+              ${isToday(day) ? 'bg-primary text-white' : ''}`}
             >
               {format(day, 'd', { locale: fr })}
             </div>
@@ -173,15 +214,25 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
 
       {/* Grille horaire */}
       <div ref={scrollContainerRef} className="flex-1  relative">
+        {isCurrentWeek && todayIndex >= 0 && (
+          <div
+            className="absolute top-0 bottom-0 z-[5] border-x border-primary pointer-events-none"
+            style={{
+              left: `calc(2.5rem + ((100% - 2.5rem) / 7) * ${todayIndex})`,
+              width: 'calc((100% - 2.5rem) / 7)',
+            }}
+          />
+        )}
+
         {/* Ligne de temps actuelle */}
         {isCurrentWeek && (
           <div
-            className="absolute left-0 right-0 z-10 border-emerald-500 border pointer-events-none"
+            className="absolute left-0 right-0 z-10 border-primary border pointer-events-none"
             style={{
               top: getCurrentTimePosition(),
             }}
           >
-            <div className="absolute -left-2 -top-2 w-2 h-2 rounded-full bg-emerald-500" />
+            <div className="absolute -left-2 -top-2 w-2 h-2 rounded-full bg-primary" />
           </div>
         )}
 
@@ -202,7 +253,7 @@ const WeekView = ({ onDateClick, onEventClick, events }) => {
                     key={`${hour}-${day}`}
                     className={`h-20 relative border-b border-gray-100
                       ${isWeekend(day) ? 'bg-gray-50' : 'bg-white'}
-                      ${isToday(day) ? 'bg-emerald-100/50 border-x border-emerald-600' : ''}`}
+                      ${isToday(day) ? 'bg-primary/10/50' : ''}`}
                     onClick={
                       parentView
                         ? undefined

Front-End/src/components/Calendar/YearView.js

@@ -8,14 +8,14 @@ import { isSameMonth } from 'date-fns';
 const MonthCard = ({ month, eventCount, onClick }) => (
   <div
     className={`bg-white p-4 rounded shadow hover:shadow-lg cursor-pointer
-      ${isSameMonth(month, new Date()) ? 'ring-2 ring-emerald-500' : ''}`}
+      ${isSameMonth(month, new Date()) ? 'ring-2 ring-primary' : ''}`}
     onClick={onClick}
   >
-    <h3 className="font-medium text-center mb-2">
+    <h3 className="font-headline font-medium text-center mb-2">
       {format(month, 'MMMM', { locale: fr })}
     </h3>
     <div className="text-center text-sm">
-      <span className="inline-flex items-center justify-center bg-emerald-100 text-emerald-800 px-2 py-1 rounded-full">
+      <span className="inline-flex items-center justify-center bg-primary/10 text-secondary px-2 py-1 rounded-full">
         {eventCount} événements
       </span>
     </div>

Front-End/src/components/Charts/LineChart.js

@@ -31,7 +31,7 @@ export default function LineChart({ data }) {
               style={{ height: chartHeight }}
             >
               <div
-                className={`${isMax ? 'bg-emerald-400' : 'bg-blue-400'} rounded-t w-4`}
+                className={`${isMax ? 'bg-tertiary' : 'bg-blue-400'} rounded-t w-4`}
                 style={{ height: `${barHeight}px`, transition: 'height 0.3s' }}
                 title={`${point.month}: ${point.value}`}
               />

Front-End/src/components/Chat/ConversationItem.js

@@ -51,7 +51,7 @@ const ConversationItem = ({
   const getLastMessageText = () => {
     if (isTyping) {
       return (
-        <span className="text-emerald-500 italic">Tape un message...</span>
+        <span className="text-primary italic">Tape un message...</span>
       );
     }
 
@@ -96,7 +96,7 @@ const ConversationItem = ({
   const getPresenceColor = (status) => {
     switch (status) {
       case 'online':
-        return 'bg-emerald-400';
+        return 'bg-tertiary';
       case 'away':
         return 'bg-yellow-400';
       case 'busy':
@@ -127,7 +127,7 @@ const ConversationItem = ({
     <div
       className={`group flex items-center p-3 cursor-pointer rounded-lg transition-all duration-200 hover:bg-gray-50 ${
         isSelected
-          ? 'bg-emerald-50 border-l-4 border-emerald-500'
+          ? 'bg-primary/5 border-l-4 border-primary'
           : 'hover:bg-gray-50'
       }`}
       onClick={onClick}
@@ -154,8 +154,8 @@ const ConversationItem = ({
       <div className="flex-1 ml-3 overflow-hidden">
         <div className="flex items-center justify-between">
           <h3
-            className={`font-semibold truncate ${
-              isSelected ? 'text-emerald-700' : 'text-gray-900'
+            className={`font-headline font-semibold truncate ${
+              isSelected ? 'text-secondary' : 'text-gray-900'
             }`}
           >
             {getInterlocutorName()}

Front-End/src/components/Chat/InstantChat.js

@@ -116,7 +116,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
   const handleWebSocketMessage = useCallback(
     (data) => {
       // Debug : vérifier userProfileId à chaque message
-      logger.debug('🔍 handleWebSocketMessage appelé:', {
+      logger.debug(' handleWebSocketMessage appelé:', {
         messageType: data.type,
         currentUserProfileId: userProfileId,
         userProfileIdType: typeof userProfileId,
@@ -153,7 +153,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
         case 'new_message':
           const newMessage = data.message;
 
-          logger.debug('🆕 NOUVEAU MESSAGE WebSocket reçu:', {
+          logger.debug(' NOUVEAU MESSAGE WebSocket reçu:', {
             senderId: newMessage.sender?.id,
             content: newMessage.content?.substring(0, 50),
             conversationId:
@@ -171,14 +171,14 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
 
           // Vérifier si ce message a déjà été traité
           if (processedMessages.has(messageId)) {
-            logger.debug('🔍 Message déjà traité, ignoré:', {
+            logger.debug(' Message déjà traité, ignoré:', {
               messageId,
               processedCount: processedMessages.size,
             });
             break;
           }
 
-          logger.debug('🆔 ID unique généré pour le message:', messageId);
+          logger.debug(' ID unique généré pour le message:', messageId);
 
           // Marquer le message comme traité
           setProcessedMessages((prev) => {
@@ -193,7 +193,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
           });
 
           // Debug: vérifier le type de message reçu
-          logger.debug('🔍 Message reçu:', {
+          logger.debug(' Message reçu:', {
             content: newMessage.content?.substring(0, 50),
             message_type: newMessage.message_type,
             sender_id: newMessage.sender_id,
@@ -235,7 +235,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                   String(newMessage.sender.id) === String(userProfileId);
 
                 // Debug détaillé pour comprendre le problème d'incrémentation
-                logger.debug('🔍 Analyse du message pour compteur:', {
+                logger.debug(' Analyse du message pour compteur:', {
                   messageId: messageId,
                   senderId: newMessage.sender.id,
                   userProfileId: userProfileId,
@@ -253,12 +253,12 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
 
                 if (shouldIncrementUnread) {
                   logger.debug(
-                    '🔺 INCRÉMENTATION du compteur non lu pour conversation:',
+                    ' INCRÉMENTATION du compteur non lu pour conversation:',
                     convId
                   );
                 } else {
                   logger.debug(
-                    "➡️ Pas d'incrémentation (message de l'utilisateur connecté)"
+                    " Pas d'incrémentation (message de l'utilisateur connecté)"
                   );
                 }
 
@@ -278,7 +278,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
 
         case 'typing_status':
           const { user_id, is_typing, conversation_id, user_name } = data;
-          logger.debug('📝 Typing status reçu:', {
+          logger.debug(' Typing status reçu:', {
             user_id,
             is_typing,
             conversation_id,
@@ -294,13 +294,13 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
             String(currentConversationId) === String(conversation_id)
           ) {
             logger.debug(
-              '📝 Mise à jour typing pour conversation sélectionnée'
+              ' Mise à jour typing pour conversation sélectionnée'
             );
             setTypingUsers((prev) => {
               // Utiliser le nom de l'utilisateur s'il est disponible, sinon l'ID
               const displayName = user_name || `Utilisateur ${user_id}`;
               logger.debug(
-                '📝 Display name:',
+                ' Display name:',
                 displayName,
                 'is_typing:',
                 is_typing
@@ -311,21 +311,21 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                   ? prev
                   : [...prev, displayName];
                 logger.debug(
-                  '📝 Nouveaux utilisateurs en train de taper:',
+                  ' Nouveaux utilisateurs en train de taper:',
                   newUsers
                 );
                 return newUsers;
               } else {
                 const newUsers = prev.filter((name) => name !== displayName);
                 logger.debug(
-                  '📝 Utilisateurs en train de taper après suppression:',
+                  ' Utilisateurs en train de taper après suppression:',
                   newUsers
                 );
                 return newUsers;
               }
             });
           } else {
-            logger.debug('📝 Typing status pour une autre conversation:', {
+            logger.debug(' Typing status pour une autre conversation:', {
               selectedConversationId: currentConversationId,
               messageConversationId: conversation_id,
             });
@@ -378,7 +378,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
 
       setConversations(data || []);
     } catch (error) {
-      logger.error('❌ Erreur lors du chargement des conversations:', error);
+      logger.error(' Erreur lors du chargement des conversations:', error);
       setConversations([]);
     } finally {
       setLoading(false);
@@ -539,30 +539,30 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
   // Sélectionner une conversation
   const selectConversation = useCallback(
     (conversation) => {
-      logger.debug('🔄 Sélection de la conversation:', conversation);
+      logger.debug(' Sélection de la conversation:', conversation);
       setSelectedConversation(conversation);
       setTypingUsers([]);
       setIsMobileSidebarOpen(false);
 
       // Utiliser id ou conversation_id selon ce qui est disponible
       const conversationId = conversation.id || conversation.conversation_id;
-      logger.debug('🔄 ID de conversation extrait:', conversationId);
+      logger.debug(' ID de conversation extrait:', conversationId);
 
       if (conversationId) {
         logger.debug(
-          '🔄 Chargement des messages pour conversation:',
+          ' Chargement des messages pour conversation:',
           conversationId
         );
         loadMessages(conversationId);
 
         logger.debug(
-          '🔄 Tentative de rejoindre la conversation:',
+          ' Tentative de rejoindre la conversation:',
           conversationId
         );
         const joinResult = joinConversation(conversationId);
-        logger.debug('🔄 Résultat joinConversation:', joinResult);
+        logger.debug(' Résultat joinConversation:', joinResult);
       } else {
-        logger.error("❌ Impossible de trouver l'ID de conversation");
+        logger.error(" Impossible de trouver l'ID de conversation");
       }
     },
     [loadMessages, joinConversation]
@@ -571,20 +571,20 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
   // Envoyer un message
   const handleSendMessage = useCallback(
     (content, attachment = null) => {
-      logger.debug('📤 handleSendMessage appelé:', {
+      logger.debug(' handleSendMessage appelé:', {
         content,
         attachment,
         selectedConversation,
       });
 
       if (!selectedConversation) {
-        logger.warn('❌ Aucune conversation sélectionnée');
+        logger.warn(' Aucune conversation sélectionnée');
         return;
       }
 
       // Vérifier qu'on a soit du contenu, soit un fichier
       if (!content.trim() && !attachment) {
-        logger.warn('❌ Aucun contenu ni fichier à envoyer');
+        logger.warn(' Aucun contenu ni fichier à envoyer');
         return;
       }
 
@@ -592,7 +592,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
       const conversationId =
         selectedConversation.id || selectedConversation.conversation_id;
       if (!conversationId) {
-        logger.error("❌ Impossible de trouver l'ID de la conversation");
+        logger.error(" Impossible de trouver l'ID de la conversation");
         return;
       }
 
@@ -608,23 +608,23 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
         messageData.attachment = attachment;
       }
 
-      logger.debug('📤 Envoi du message via WebSocket:', messageData);
-      logger.debug('📤 Type de message:', messageData.type);
-      logger.debug('📤 État de la connexion:', {
+      logger.debug(' Envoi du message via WebSocket:', messageData);
+      logger.debug(' Type de message:', messageData.type);
+      logger.debug(' État de la connexion:', {
         isConnected,
         connectionStatus,
       });
 
       const success = sendChatMessage(messageData);
 
-      logger.debug('📤 Résultat envoi message:', success);
+      logger.debug(' Résultat envoi message:', success);
 
       if (!success) {
         logger.error(
-          "❌ Impossible d'envoyer le message - WebSocket non connecté"
+          " Impossible d'envoyer le message - WebSocket non connecté"
         );
       } else {
-        logger.debug('✅ Message envoyé avec succès');
+        logger.debug(' Message envoyé avec succès');
       }
     },
     [
@@ -834,7 +834,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
         {/* En-tête */}
         <div className="p-4 border-b border-gray-200">
           <div className="flex items-center justify-between mb-3">
-            <h2 className="text-lg font-semibold text-gray-900">Messages</h2>
+            <h2 className="font-headline text-lg font-semibold text-gray-900">Messages</h2>
             <button
               onClick={handleStartNewConversation}
               className="p-2 hover:bg-gray-200 rounded-lg transition-colors"
@@ -857,7 +857,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
               value={searchQuery}
               onChange={(e) => handleSearch(e.target.value)}
               className={`w-full pl-10 pr-4 py-2 bg-white border border-gray-200 rounded-lg focus:outline-none focus:ring-2 ${
-                showSearch ? 'focus:ring-emerald-500' : 'focus:ring-emerald-500'
+                showSearch ? 'focus:ring-primary' : 'focus:ring-primary'
               }`}
             />
             {showSearch && searchQuery && (
@@ -896,7 +896,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
             </div>
           ) : showSearch && searchResults.length > 0 ? (
             <div className="p-2">
-              <h3 className="text-sm font-medium text-gray-700 mb-2 px-2">
+              <h3 className="font-headline text-sm font-medium text-gray-700 mb-2 px-2">
                 Résultats de recherche
               </h3>
               {searchResults.map((user) => (
@@ -915,7 +915,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                     <div
                       className={`absolute -bottom-0.5 -right-0.5 w-3 h-3 ${
                         userPresences[user.id]?.status === 'online'
-                          ? 'bg-emerald-400'
+                          ? 'bg-tertiary'
                           : 'bg-gray-400'
                       } border-2 border-white rounded-full`}
                       title={
@@ -937,7 +937,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                     <div
                       className={`text-xs ${
                         userPresences[user.id]?.status === 'online'
-                          ? 'text-emerald-500'
+                          ? 'text-primary'
                           : 'text-gray-500'
                       }`}
                     >
@@ -1019,7 +1019,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                         selectedConversation.interlocuteur?.id &&
                         userPresences[selectedConversation.interlocuteur.id]
                           ?.status === 'online'
-                          ? 'bg-emerald-400'
+                          ? 'bg-tertiary'
                           : 'bg-gray-400'
                       } border-2 border-white rounded-full`}
                       title={
@@ -1032,7 +1032,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                     ></div>
                   </div>
                   <div className="flex-1 ml-3 overflow-hidden">
-                    <h3 className="font-semibold text-gray-900">
+                    <h3 className="font-headline font-semibold text-gray-900">
                       {selectedConversation.interlocuteur
                         ? selectedConversation.interlocuteur.first_name &&
                           selectedConversation.interlocuteur.last_name
@@ -1046,7 +1046,7 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
                         selectedConversation.interlocuteur?.id &&
                         userPresences[selectedConversation.interlocuteur.id]
                           ?.status === 'online'
-                          ? 'text-emerald-500'
+                          ? 'text-primary'
                           : 'text-gray-500'
                       }`}
                     >
@@ -1140,10 +1140,10 @@ const InstantChat = ({ userProfileId, establishmentId }) => {
         ) : (
           <div className="flex-1 flex items-center justify-center bg-gray-50">
             <div className="text-center">
-              <div className="w-16 h-16 bg-emerald-200 rounded-full flex items-center justify-center mx-auto mb-4">
-                <MessageSquare className="w-8 h-8 text-emerald-600" />
+              <div className="w-16 h-16 bg-primary/20 rounded-full flex items-center justify-center mx-auto mb-4">
+                <MessageSquare className="w-8 h-8 text-primary" />
               </div>
-              <h3 className="text-lg font-medium text-gray-900 mb-2">
+              <h3 className="font-headline text-lg font-medium text-gray-900 mb-2">
                 Sélectionnez une conversation
               </h3>
               <p className="text-gray-500">

Front-End/src/components/Chat/MessageInput.js

@@ -60,19 +60,19 @@ const MessageInput = ({
 
   const handleSend = () => {
     const trimmedMessage = message.trim();
-    logger.debug('📝 MessageInput: handleSend appelé:', {
+    logger.debug(' MessageInput: handleSend appelé:', {
       message,
       trimmedMessage,
       disabled,
     });
 
     if (!trimmedMessage || disabled) {
-      logger.debug('❌ MessageInput: Message vide ou désactivé');
+      logger.debug(' MessageInput: Message vide ou désactivé');
       return;
     }
 
     logger.debug(
-      '📤 MessageInput: Appel de onSendMessage avec:',
+      ' MessageInput: Appel de onSendMessage avec:',
       trimmedMessage
     );
     onSendMessage(trimmedMessage);

Front-End/src/components/ClasseDetails.js

@@ -10,7 +10,7 @@ const ClasseDetails = ({ classe }) => {
   const pourcentage = Math.round((nombreElevesInscrits / capaciteTotale) * 100);
 
   const getColor = (pourcentage) => {
-    if (pourcentage < 50) return 'bg-emerald-500';
+    if (pourcentage < 50) return 'bg-primary';
     if (pourcentage < 75) return 'bg-orange-500';
     return 'bg-red-500';
   };
@@ -52,7 +52,7 @@ const ClasseDetails = ({ classe }) => {
         </div>
       </div>
 
-      <h3 className="text-xl font-semibold mb-4">Liste des élèves</h3>
+      <h3 className="font-headline text-xl font-semibold mb-4">Liste des élèves</h3>
       <div className="bg-white rounded-lg border border-gray-200 shadow-md">
         <Table
           columns={[

Front-End/src/components/DateTab.js

@@ -50,7 +50,7 @@ const DateTab = ({
       <div className="flex flex-col space-y-3">
         {dates[activeTab]?.map((date, index) => (
           <div key={index} className="flex items-center space-x-3">
-            <span className="text-emerald-700 font-semibold">
+            <span className="text-secondary font-semibold">
               Échéance {index + 1}
             </span>
             <input
@@ -63,7 +63,7 @@ const DateTab = ({
                   e.target.value
                 )
               }
-              className="p-2 border border-emerald-300 rounded focus:outline-none focus:ring-2 focus:ring-emerald-500 cursor-pointer"
+              className="p-2 border border-primary/30 rounded focus:outline-none focus:ring-2 focus:ring-primary cursor-pointer"
             />
             {modifiedDates[`${activeTab}-${index}`] && (
               <button
@@ -74,7 +74,7 @@ const DateTab = ({
                     due_dates: dates[activeTab],
                   })
                 }
-                className="text-emerald-500 hover:text-emerald-800"
+                className="text-primary hover:text-secondary"
               >
                 <Check className="w-5 h-5" />
               </button>

Front-End/src/components/EmptyState.js

@@ -0,0 +1,36 @@
+import React from 'react';
+import { Inbox } from 'lucide-react';
+
+const EmptyState = ({
+  icon: Icon = Inbox,
+  title,
+  description,
+  actionLabel,
+  onAction,
+  actionIcon: ActionIcon,
+}) => {
+  return (
+    <div className="flex flex-col items-center justify-center py-12 px-4 text-center">
+      <div className="bg-neutral p-4 rounded-full mb-4">
+        <Icon size={40} className="text-gray-400" />
+      </div>
+      <h3 className="font-headline text-lg font-semibold text-gray-700 mb-2">
+        {title}
+      </h3>
+      {description && (
+        <p className="text-sm text-gray-500 max-w-md mb-6">{description}</p>
+      )}
+      {actionLabel && onAction && (
+        <button
+          onClick={onAction}
+          className="flex items-center gap-2 bg-primary hover:bg-secondary text-white font-label font-medium px-6 py-2.5 rounded transition-colors min-h-[44px]"
+        >
+          {ActionIcon && <ActionIcon size={18} />}
+          {actionLabel}
+        </button>
+      )}
+    </div>
+  );
+};
+
+export default EmptyState;

Front-End/src/components/Evaluation/EvaluationForm.js

@@ -74,7 +74,7 @@ export default function EvaluationForm({
       className="space-y-4 p-4 bg-white rounded-lg border border-gray-200 shadow-sm"
     >
       <div className="flex items-center justify-between">
-        <h3 className="font-semibold text-lg text-gray-800">
+        <h3 className="font-headline font-semibold text-lg text-gray-800">
           {isEditing ? 'Modifier l\'évaluation' : 'Nouvelle évaluation'}
         </h3>
         <button

Front-End/src/components/Evaluation/EvaluationGradeTable.js

@@ -112,7 +112,7 @@ export default function EvaluationGradeTable({
       <div className="p-4 border-b border-gray-200 bg-gray-50 rounded-t-lg">
         <div className="flex items-center justify-between">
           <div>
-            <h3 className="font-semibold text-lg text-gray-800">
+            <h3 className="font-headline font-semibold text-lg text-gray-800">
               {evaluation.name}
             </h3>
             <div className="text-sm text-gray-500 flex gap-3">
@@ -191,7 +191,7 @@ export default function EvaluationGradeTable({
                         handleScoreChange(student.id, e.target.value)
                       }
                       disabled={isAbsent}
-                      className={`w-20 px-2 py-1 text-center border rounded focus:ring-2 focus:ring-emerald-500 focus:border-emerald-500 ${
+                      className={`w-20 px-2 py-1 text-center border rounded focus:ring-2 focus:ring-primary focus:border-primary ${
                         isAbsent
                           ? 'bg-gray-100 text-gray-400 cursor-not-allowed'
                           : 'border-gray-300'
@@ -219,7 +219,7 @@ export default function EvaluationGradeTable({
                         handleCommentChange(student.id, e.target.value)
                       }
                       placeholder="Commentaire..."
-                      className="w-full px-2 py-1 border border-gray-300 rounded focus:ring-2 focus:ring-emerald-500 focus:border-emerald-500"
+                      className="w-full px-2 py-1 border border-gray-300 rounded focus:ring-2 focus:ring-primary focus:border-primary"
                     />
                   </td>
                   {onDeleteGrade && (
@@ -258,7 +258,7 @@ export default function EvaluationGradeTable({
             <div className="flex gap-4 text-sm text-gray-600">
               <span>
                 Moyenne:{' '}
-                <span className="font-semibold text-emerald-600">
+                <span className="font-semibold text-primary">
                   {stats.avg.toFixed(2)}
                 </span>
               </span>

Front-End/src/components/Evaluation/EvaluationStudentView.js

@@ -123,14 +123,14 @@ export default function EvaluationStudentView({
     <div className="space-y-4">
       {/* Moyenne générale */}
       {generalAverage !== null && (
-        <div className="bg-emerald-50 border border-emerald-200 rounded-lg p-4 flex items-center justify-between">
+        <div className="bg-primary/5 border border-primary/20 rounded-lg p-4 flex items-center justify-between">
           <div className="flex items-center gap-2">
-            <BookOpen className="text-emerald-600" size={24} />
-            <span className="font-medium text-emerald-800">Moyenne générale</span>
+            <BookOpen className="text-primary" size={24} />
+            <span className="font-medium text-secondary">Moyenne générale</span>
           </div>
           <div className="flex items-center gap-2">
             {getAverageIcon(generalAverage)}
-            <span className="text-2xl font-bold text-emerald-700">
+            <span className="text-2xl font-bold text-secondary">
               {generalAverage.toFixed(2)}/20
             </span>
           </div>
@@ -233,7 +233,7 @@ export default function EvaluationStudentView({
                         <span className="text-gray-500">/{ev.max_score}</span>
                         <button
                           onClick={() => handleSaveEdit(ev, studentEval)}
-                          className="p-1 text-emerald-600 hover:bg-emerald-50 rounded"
+                          className="p-1 text-primary hover:bg-primary/5 rounded"
                           title="Enregistrer"
                         >
                           <Save size={16} />

Front-End/src/components/EventCard.js

@@ -103,12 +103,12 @@ const EventCard = ({ title, start, end, date, description, type }) => {
     <div className="bg-white p-4 rounded-lg shadow-sm border border-gray-200 mb-3 hover:shadow-md transition-shadow">
       <div className="flex items-start gap-3">
         <div className="flex-shrink-0 mt-1">
-          <CalendarCheck className="text-emerald-500" size={20} />
+          <CalendarCheck className="text-primary" size={20} />
         </div>
         <div className="flex-1">
           <h4 className="font-medium text-gray-900 mb-1">{title}</h4>
           <div className="flex flex-col text-sm text-gray-500">
-            <span className="font-medium text-emerald-600">{dayName}</span>
+            <span className="font-medium text-primary">{dayName}</span>
             <span>{formattedDate}</span>
             {timeRange && (
               <span className="text-xs text-gray-600 mt-1">{timeRange}</span>

Front-End/src/components/Footer.js

@@ -10,7 +10,7 @@ export default function Footer({ softwareName, softwareVersion }) {
       </div>
       <div className="text-sm font-light flex items-center justify-between">
         <div className="text-sm font-light mr-4">
-          {softwareName} - {softwareVersion}
+          &nbsp;{softwareName} - {softwareVersion}
         </div>
         <Logo className="w-8 h-8" />
       </div>

Front-End/src/components/Form/AddFieldModal.js

@@ -3,6 +3,7 @@ import { useForm, Controller } from 'react-hook-form';
 import InputTextIcon from './InputTextIcon';
 import SelectChoice from './SelectChoice';
 import Button from './Button';
+import FileUpload from './FileUpload';
 import IconSelector from './IconSelector';
 import * as LucideIcons from 'lucide-react';
 import { FIELD_TYPES } from './FormTypes';
@@ -14,6 +15,8 @@ export default function AddFieldModal({
   onSubmit,
   editingField = null,
   editingIndex = -1,
+  hasMasterFile = false,
+  onMasterFileUpload,
 }) {
   const isEditing = editingIndex >= 0;
 
@@ -29,6 +32,7 @@ export default function AddFieldModal({
     acceptTypes: '',
     maxSize: 5, // 5MB par défaut
     checked: false,
+      masterFileToUpload: null,
     validation: {
       pattern: '',
       minLength: '',
@@ -56,6 +60,7 @@ export default function AddFieldModal({
         acceptTypes: '',
         maxSize: 5,
         checked: false,
+        masterFileToUpload: null,
         signatureData: '',
         backgroundColor: '#ffffff',
         penColor: '#000000',
@@ -154,7 +159,7 @@ export default function AddFieldModal({
     <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
       <div className="bg-white rounded-lg p-6 max-w-xl w-full mx-4 max-h-[90vh] overflow-y-auto">
         <div className="flex justify-between items-center mb-4">
-          <h3 className="text-xl font-semibold">
+          <h3 className="font-headline text-xl font-semibold">
             {isEditing ? 'Modifier le champ' : 'Ajouter un champ'}
           </h3>
           <button
@@ -492,6 +497,31 @@ export default function AddFieldModal({
 
           {currentField.type === 'file' && (
             <>
+              <div className="rounded border border-gray-200 bg-gray-50 p-3">
+                <label className="block text-sm font-medium text-gray-700 mb-2">
+                  Document PDF du formulaire{' '}
+                  <span className="text-red-500">*</span>
+                </label>
+                <FileUpload
+                  selectionMessage="Uploader le PDF à afficher dans l'aperçu"
+                  onFileSelect={(file) => {
+                    setCurrentField((prev) => ({
+                      ...prev,
+                      masterFileToUpload: file,
+                    }));
+                    if (onMasterFileUpload) {
+                      onMasterFileUpload(file);
+                    }
+                  }}
+                  enable
+                />
+                {!hasMasterFile && !currentField.masterFileToUpload && (
+                  <p className="text-xs text-red-500 mt-2">
+                    Uploadez un document avant d&apos;ajouter ce type de champ.
+                  </p>
+                )}
+              </div>
+
               <Controller
                 name="acceptTypes"
                 control={control}
@@ -690,7 +720,7 @@ export default function AddFieldModal({
             <Button
               type="submit"
               text={isEditing ? 'Modifier' : 'Ajouter'}
-              className="px-4 py-2 bg-green-500 text-white rounded-md hover:bg-green-600"
+              className="px-4 py-2 bg-primary text-white rounded hover:bg-secondary"
             />
             <Button
               type="button"

Front-End/src/components/Form/Button.js

@@ -12,8 +12,8 @@ const Button = ({
 }) => {
   const router = useRouter();
   const baseClass =
-    'px-4 py-2 rounded-md text-white h-8 flex items-center justify-center';
-  const primaryClass = 'bg-emerald-500 hover:bg-emerald-600';
+    'px-4 py-2 rounded font-label font-medium min-h-[44px] flex items-center justify-center transition-colors';
+  const primaryClass = 'bg-primary hover:bg-secondary text-white';
   const secondaryClass = 'bg-gray-300 hover:bg-gray-400 text-black';
   const buttonClass = `${baseClass} ${primary && !disabled ? primaryClass : secondaryClass} ${className}`;
 

Front-End/src/components/Form/CheckBox.js

@@ -34,7 +34,7 @@ const CheckBox = ({
         value={item.id}
         checked={isChecked}
         onChange={handleChange}
-        className={`form-checkbox h-4 w-4 rounded-mg text-emerald-600 hover:ring-emerald-400 checked:bg-emerald-600 hover:border-emerald-500 hover:bg-emerald-500 cursor-pointer ${horizontal ? 'mt-1' : 'mr-2'}`}
+        className={`form-checkbox h-4 w-4 rounded-mg text-primary hover:ring-tertiary checked:bg-primary hover:border-primary hover:bg-primary cursor-pointer ${horizontal ? 'mt-1' : 'mr-2'}`}
         style={{ borderRadius: '6px', outline: 'none', boxShadow: 'none' }}
       />
       {!horizontal && (

Front-End/src/components/Form/FieldTypeSelector.js

@@ -44,7 +44,7 @@ export default function FieldTypeSelector({ isOpen, onClose, onSelect }) {
     <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
       <div className="bg-white rounded-lg p-6 max-w-4xl w-full mx-4 max-h-[85vh] overflow-y-auto">
         <div className="flex justify-between items-center mb-4">
-          <h3 className="text-lg font-semibold">
+          <h3 className="font-headline text-lg font-semibold">
             Choisir un type de champ ({filteredFieldTypes.length} /{' '}
             {FIELD_TYPES.length} types)
           </h3>

Front-End/src/components/Form/FileUpload.js

@@ -46,7 +46,7 @@ export default function FileUpload({
         !enable ? 'bg-gray-100 cursor-not-allowed' : ''
       }`}
     >
-      <h3 className="text-lg font-semibold mb-4">
+      <h3 className="font-headline text-lg font-semibold mb-4">
         {`${selectionMessage}`}
         {required && <span className="text-red-500 ml-1">*</span>}
       </h3>
@@ -54,7 +54,7 @@ export default function FileUpload({
         className={`border-2 border-dashed p-6 rounded-lg flex flex-col items-center justify-center ${
           !enable
             ? 'border-gray-300 bg-gray-100 cursor-not-allowed'
-            : 'border-gray-500 hover:border-emerald-500'
+            : 'border-gray-500 hover:border-primary'
         }`}
         onClick={() => enable && fileInputRef.current.click()} // Désactiver le clic si `enable` est false
         onDragOver={(e) => enable && e.preventDefault()}
@@ -62,7 +62,7 @@ export default function FileUpload({
       >
         <CloudUpload
           className={`w-12 h-12 mb-4 ${
-            !enable ? 'text-gray-400' : 'text-emerald-500'
+            !enable ? 'text-gray-400' : 'text-primary'
           }`}
         />
         <input
@@ -93,7 +93,7 @@ export default function FileUpload({
       {/* Affichage du fichier existant */}
       {existingFile && !localFileName && (
         <div className="mt-4 flex items-center space-x-4 bg-gray-100 p-3 rounded-md shadow-sm">
-          <CloudUpload className="w-6 h-6 text-emerald-500" />
+          <CloudUpload className="w-6 h-6 text-primary" />
           <p className="text-sm font-medium text-gray-800">
             <span className="font-semibold">
               {typeof existingFile === 'string'
@@ -107,7 +107,7 @@ export default function FileUpload({
       {/* Affichage du fichier sélectionné */}
       {localFileName && (
         <div className="mt-4 flex items-center space-x-4 bg-gray-100 p-3 rounded-md shadow-sm">
-          <CloudUpload className="w-6 h-6 text-emerald-500" />
+          <CloudUpload className="w-6 h-6 text-primary" />
           <p className="text-sm font-medium text-gray-800">
             <span className="font-semibold">{localFileName}</span>
           </p>

Front-End/src/components/Form/FormRenderer.js

@@ -2,6 +2,7 @@ import logger from '@/utils/logger';
 import { useForm, Controller } from 'react-hook-form';
 import { useEffect } from 'react';
 import SelectChoice from './SelectChoice';
+import { getSecureFileUrl } from '@/utils/fileUrl';
 import InputTextIcon from './InputTextIcon';
 import * as LucideIcons from 'lucide-react';
 import Button from './Button';
@@ -33,7 +34,70 @@ export default function FormRenderer({
   onFormSubmit = (data) => {
     alert(JSON.stringify(data, null, 2));
   }, // Callback de soumission personnalisé (optionnel)
+  masterFile = null,
 }) {
+  const formFields = formConfig?.fields || [];
+
+  const resolveMasterFileUrl = (fileValue) => {
+    if (!fileValue) return null;
+    if (typeof fileValue !== 'string') return null;
+    if (fileValue.startsWith('blob:')) return fileValue;
+    if (fileValue.startsWith('data:')) return fileValue;
+    if (fileValue.startsWith('http://') || fileValue.startsWith('https://')) {
+      return fileValue;
+    }
+    if (fileValue.startsWith('/api/download?')) return fileValue;
+    return getSecureFileUrl(fileValue);
+  };
+
+  const masterFileUrl = resolveMasterFileUrl(masterFile);
+
+  const detectMasterFileType = (fileUrl) => {
+    if (!fileUrl || typeof fileUrl !== 'string') return 'unknown';
+
+    let candidate = fileUrl;
+
+    if (fileUrl.startsWith('/api/download?')) {
+      const queryPart = fileUrl.split('?')[1] || '';
+      const params = new URLSearchParams(queryPart);
+      const pathFromQuery = params.get('path') || params.get('file');
+      if (pathFromQuery) {
+        candidate = pathFromQuery;
+      }
+    }
+
+    const cleanUrl = candidate.split('?')[0];
+
+    let lowerUrl = cleanUrl.toLowerCase();
+    try {
+      lowerUrl = decodeURIComponent(cleanUrl).toLowerCase();
+    } catch {
+      lowerUrl = cleanUrl.toLowerCase();
+    }
+
+    if (lowerUrl.endsWith('.pdf')) return 'pdf';
+    if (
+      lowerUrl.endsWith('.png') ||
+      lowerUrl.endsWith('.jpg') ||
+      lowerUrl.endsWith('.jpeg') ||
+      lowerUrl.endsWith('.gif') ||
+      lowerUrl.endsWith('.webp') ||
+      lowerUrl.endsWith('.bmp') ||
+      lowerUrl.endsWith('.svg')
+    ) {
+      return 'image';
+    }
+
+    return 'other';
+  };
+
+  const masterFileType = detectMasterFileType(masterFileUrl);
+  const hasFileField = formFields.some((field) => field.type === 'file');
+
+  const formContainerClass = hasFileField
+    ? 'w-full max-w-4xl mx-auto'
+    : 'w-full max-w-md mx-auto';
+
   const {
     handleSubmit,
     control,
@@ -57,8 +121,7 @@ export default function FormRenderer({
       const hasFiles = Object.keys(data).some((key) => {
         return (
           data[key] instanceof FileList ||
-          (data[key] && data[key][0] instanceof File) ||
-          (typeof data[key] === 'string' && data[key].startsWith('data:image'))
+          (data[key] && data[key][0] instanceof File)
         );
       });
 
@@ -83,29 +146,6 @@ export default function FormRenderer({
                 formData.append(`files.${key}`, value[i]);
               }
             }
-          } else if (
-            typeof value === 'string' &&
-            value.startsWith('data:image')
-          ) {
-            // Gérer les signatures (SVG ou images base64)
-            if (value.includes('svg+xml')) {
-              // Gérer les signatures SVG
-              const svgData = value.split(',')[1];
-              const svgBlob = new Blob([atob(svgData)], {
-                type: 'image/svg+xml',
-              });
-              formData.append(`files.${key}`, svgBlob, `signature_${key}.svg`);
-            } else {
-              // Gérer les images base64 classiques
-              const byteString = atob(value.split(',')[1]);
-              const ab = new ArrayBuffer(byteString.length);
-              const ia = new Uint8Array(ab);
-              for (let i = 0; i < byteString.length; i++) {
-                ia[i] = byteString.charCodeAt(i);
-              }
-              const blob = new Blob([ab], { type: 'image/png' });
-              formData.append(`files.${key}`, blob, `signature_${key}.png`);
-            }
           } else {
             // Gérer les autres types de champs
             formData.append(
@@ -157,26 +197,26 @@ export default function FormRenderer({
   return (
     <form
       onSubmit={handleSubmit(onSubmit, onError)}
-      className="max-w-md mx-auto"
+      className={formContainerClass}
     >
       {csrfToken ? <DjangoCSRFToken csrfToken={csrfToken} /> : null}
-      <h2 className="text-2xl font-bold text-center mb-4">
+      <h2 className="font-headline text-2xl font-bold text-center mb-4">
         {formConfig?.title || 'Formulaire'}
       </h2>
 
-      {(formConfig?.fields || []).map((field) => (
+      {formFields.map((field) => (
         <div
           key={field.id || `field-${Math.random().toString(36).substr(2, 9)}`}
           className="flex flex-col mt-4"
         >
           {field.type === 'heading1' && (
-            <h1 className="text-3xl font-bold mb-3">{field.text}</h1>
+            <h1 className="font-headline text-3xl font-bold mb-3">{field.text}</h1>
           )}
           {field.type === 'heading2' && (
-            <h2 className="text-2xl font-bold mb-3">{field.text}</h2>
+            <h2 className="font-headline text-2xl font-bold mb-3">{field.text}</h2>
           )}
           {field.type === 'heading3' && (
-            <h3 className="text-xl font-bold mb-2">{field.text}</h3>
+            <h3 className="font-headline text-xl font-bold mb-2">{field.text}</h3>
           )}
           {field.type === 'heading4' && (
             <h4 className="text-lg font-bold mb-2">{field.text}</h4>
@@ -356,24 +396,56 @@ export default function FormRenderer({
               control={control}
               rules={{ required: field.required }}
               render={({ field: { onChange, value } }) => (
-                <FileUpload
-                  selectionMessage={field.label}
-                  required={field.required}
-                  uploadedFileName={value ? value[0]?.name : null}
-                  onFileSelect={(file) => {
-                    // Créer un objet de type FileList similaire pour la compatibilité
-                    const dataTransfer = new DataTransfer();
-                    dataTransfer.items.add(file);
-                    onChange(dataTransfer.files);
-                  }}
-                  errorMsg={
-                    errors[field.id]
-                      ? field.required
-                        ? `${field.label} est requis`
-                        : 'Champ invalide'
-                      : ''
-                  }
-                />
+                masterFileUrl ? (
+                  <div className="w-full bg-neutral border border-gray-200 rounded p-3">
+                    {field.label && (
+                      <p className="text-sm font-medium text-gray-700 mb-2">
+                        {field.label}
+                      </p>
+                    )}
+                    {masterFileType === 'image' ? (
+                      <img
+                        src={masterFileUrl}
+                        alt={field.label || 'Document'}
+                        className="w-full h-auto rounded border border-gray-200 bg-white"
+                      />
+                    ) : masterFileType === 'pdf' ? (
+                      <iframe
+                        src={masterFileUrl}
+                        title={field.label || 'Document'}
+                        className="w-full rounded border border-gray-200 bg-white"
+                        style={{ height: '720px', border: 'none' }}
+                      />
+                    ) : (
+                      <a
+                        href={masterFileUrl}
+                        target="_blank"
+                        rel="noopener noreferrer"
+                        className="inline-flex items-center px-4 py-2 rounded bg-primary text-white hover:bg-secondary"
+                      >
+                        Ouvrir le document
+                      </a>
+                    )}
+                  </div>
+                ) : (
+                  <FileUpload
+                    selectionMessage={field.label}
+                    required={field.required}
+                    uploadedFileName={value ? value[0]?.name : null}
+                    onFileSelect={(file) => {
+                      const dataTransfer = new DataTransfer();
+                      dataTransfer.items.add(file);
+                      onChange(dataTransfer.files);
+                    }}
+                    errorMsg={
+                      errors[field.id]
+                        ? field.required
+                          ? `${field.label} est requis`
+                          : 'Champ invalide'
+                        : ''
+                    }
+                  />
+                )
               )}
             />
           )}
@@ -406,7 +478,14 @@ export default function FormRenderer({
               control={control}
               rules={{ required: field.required }}
               render={({ field: { onChange, value } }) => (
-                <div>
+                <div
+                  className={
+                    masterFile
+                      ? 'mt-3 flex justify-end'
+                      : ''
+                  }
+                >
+                  <div className={masterFile ? 'w-full max-w-xs' : 'w-full'}>
                   <SignatureField
                     label={field.label}
                     required={field.required}
@@ -415,6 +494,8 @@ export default function FormRenderer({
                     backgroundColor={field.backgroundColor || '#ffffff'}
                     penColor={field.penColor || '#000000'}
                     penWidth={field.penWidth || 2}
+                    displayWidth={masterFile ? 260 : 400}
+                    displayHeight={masterFile ? 120 : 200}
                   />
                   {errors[field.id] && (
                     <p className="text-red-500 text-sm mt-1">
@@ -423,6 +504,7 @@ export default function FormRenderer({
                         : 'Champ invalide'}
                     </p>
                   )}
+                  </div>
                 </div>
               )}
             />
@@ -434,7 +516,7 @@ export default function FormRenderer({
           type="submit"
           primary
           text={formConfig?.submitLabel || 'Envoyer'}
-          className="mb-1 px-4 py-2 rounded-md shadow bg-emerald-500 text-white hover:bg-emerald-600 w-full"
+          className="mb-1 px-4 py-2 rounded-md shadow bg-primary text-white hover:bg-primary w-full"
         />
       </div>
     </form>

Front-End/src/components/Form/FormTemplateBuilder.js

@@ -177,6 +177,8 @@ export default function FormTemplateBuilder({
   initialData,
   groups,
   isEditing,
+  masterFile = null,
+  onMasterFileUpload,
 }) {
   const [formConfig, setFormConfig] = useState({
     id: initialData?.id || 0,
@@ -186,7 +188,9 @@ export default function FormTemplateBuilder({
   });
 
   const [selectedGroups, setSelectedGroups] = useState(
-    initialData?.groups?.map((g) => g.id) || []
+    initialData?.groups?.map((g) =>
+      typeof g === 'object' && g !== null ? g.id : g
+    ) || []
   );
 
   const [showAddFieldModal, setShowAddFieldModal] = useState(false);
@@ -209,7 +213,11 @@ export default function FormTemplateBuilder({
         submitLabel: 'Envoyer',
         fields: initialData.formMasterData?.fields || [],
       });
-      setSelectedGroups(initialData.groups?.map((g) => g.id) || []);
+      setSelectedGroups(
+        initialData.groups?.map((g) =>
+          typeof g === 'object' && g !== null ? g.id : g
+        ) || []
+      );
     }
   }, [initialData]);
 
@@ -256,6 +264,21 @@ export default function FormTemplateBuilder({
   const handleFieldSubmit = (data, currentField, editIndex) => {
     const isHeadingType = data.type.startsWith('heading');
     const isContentTypeOnly = data.type === 'paragraph' || isHeadingType;
+    const effectiveMasterFile = masterFile || currentField?.masterFileToUpload;
+
+    if (currentField?.masterFileToUpload && onMasterFileUpload) {
+      onMasterFileUpload(currentField.masterFileToUpload);
+    }
+
+    // Un champ fichier nécessite un document source déjà uploadé.
+    if (data.type === 'file' && !effectiveMasterFile) {
+      setSaveMessage({
+        type: 'error',
+        text:
+          'Veuillez d\'abord uploader le document du formulaire avant d\'ajouter un champ fichier.',
+      });
+      return;
+    }
 
     const fieldData = {
       ...data,
@@ -436,14 +459,14 @@ export default function FormTemplateBuilder({
             }
           >
             <div className="bg-white p-6 rounded-lg shadow">
-              <h2 className="text-xl font-bold mb-6">
+              <h2 className="font-headline text-xl font-bold mb-6">
                 Configuration du formulaire
               </h2>
 
               {/* Configuration générale */}
               <div className="space-y-4 mb-6">
                 <div className="flex justify-between items-center">
-                  <h3 className="text-lg font-semibold mr-4">
+                  <h3 className="font-headline text-lg font-semibold mr-4">
                     Paramètres généraux
                   </h3>
                   <div className="flex gap-2">
@@ -486,7 +509,7 @@ export default function FormTemplateBuilder({
                     className={`p-3 rounded ${
                       saveMessage.type === 'error'
                         ? 'bg-red-100 text-red-700'
-                        : 'bg-green-100 text-green-700'
+                        : 'bg-primary/10 text-secondary'
                     }`}
                   >
                     {saveMessage.text}
@@ -555,7 +578,7 @@ export default function FormTemplateBuilder({
               {/* Liste des champs */}
               <div className="space-y-4">
                 <div className="flex justify-between items-center">
-                  <h3 className="text-lg font-semibold mr-4">
+                  <h3 className="font-headline text-lg font-semibold mr-4">
                     Champs du formulaire ({formConfig.fields.length})
                   </h3>
                   <button
@@ -564,7 +587,7 @@ export default function FormTemplateBuilder({
                       setSelectedFieldType(null);
                       setShowFieldTypeSelector(true);
                     }}
-                    className="p-2 bg-green-500 text-white rounded-md hover:bg-green-600 transition-colors"
+                    className="p-2 bg-primary text-white rounded hover:bg-secondary transition-colors"
                     title="Ajouter un champ"
                   >
                     <PlusCircle size={18} />
@@ -582,7 +605,7 @@ export default function FormTemplateBuilder({
                         setSelectedFieldType(null);
                         setShowFieldTypeSelector(true);
                       }}
-                      className="px-4 py-2 bg-green-500 text-white rounded-md hover:bg-green-600 transition-colors inline-flex items-center gap-2"
+                      className="px-4 py-2 bg-primary text-white rounded hover:bg-secondary transition-colors inline-flex items-center gap-2"
                     >
                       <PlusCircle size={18} />
                       <span>Ajouter mon premier champ</span>
@@ -616,7 +639,7 @@ export default function FormTemplateBuilder({
             <div className="lg:col-span-2">
               <div className="bg-white p-6 rounded-lg shadow h-full">
                 <div className="flex justify-between items-center mb-4">
-                  <h3 className="text-lg font-semibold mr-4">JSON généré</h3>
+                  <h3 className="font-headline text-lg font-semibold mr-4">JSON généré</h3>
                   <div className="flex gap-2">
                     <button
                       onClick={exportJson}
@@ -650,10 +673,10 @@ export default function FormTemplateBuilder({
         {/* Aperçu */}
         <div className="mt-6">
           <div className="bg-white p-6 rounded-lg shadow">
-            <h3 className="text-lg font-semibold mb-4">Aperçu du formulaire</h3>
+            <h3 className="font-headline text-lg font-semibold mb-4">Aperçu du formulaire</h3>
             <div className="border-2 border-dashed border-gray-300 p-6 rounded">
               {formConfig.fields.length > 0 ? (
-                <FormRenderer formConfig={formConfig} />
+                <FormRenderer formConfig={formConfig} masterFile={masterFile} />
               ) : (
                 <p className="text-gray-500 italic text-center">
                   Ajoutez des champs pour voir l&apos;aperçu
@@ -668,6 +691,8 @@ export default function FormTemplateBuilder({
           isOpen={showAddFieldModal}
           onClose={() => setShowAddFieldModal(false)}
           onSubmit={handleFieldSubmit}
+          hasMasterFile={Boolean(masterFile)}
+          onMasterFileUpload={onMasterFileUpload}
           editingField={
             editingIndex >= 0
               ? formConfig.fields[editingIndex]

Front-End/src/components/Form/IconSelector.js

@@ -42,7 +42,7 @@ export default function IconSelector({
     <div className="fixed inset-0 bg-black bg-opacity-50 flex items-center justify-center z-50">
       <div className="bg-white rounded-lg p-6 max-w-4xl w-full mx-4 max-h-[85vh] overflow-y-auto">
         <div className="flex justify-between items-center mb-4">
-          <h3 className="text-lg font-semibold">
+          <h3 className="font-headline text-lg font-semibold">
             Choisir une icône ({filteredIcons.length} / {allIcons.length}{' '}
             icônes)
           </h3>

Front-End/src/components/Form/MultiSelect.js

@@ -45,7 +45,7 @@ const MultiSelect = ({
       <div className="relative mt-1">
         <button
           type="button"
-          className="w-full bg-white border border-gray-300 rounded-md shadow-sm pl-3 pr-10 py-2 text-left cursor-pointer focus:outline-none sm:text-sm hover:border-emerald-500 focus:border-emerald-500"
+          className="w-full bg-white border border-gray-300 rounded-md shadow-sm pl-3 pr-10 py-2 text-left cursor-pointer focus:outline-none sm:text-sm hover:border-primary focus:border-primary"
           onClick={() => setIsOpen(!isOpen)}
         >
           {selectedOptions.length > 0 ? (
@@ -53,7 +53,7 @@ const MultiSelect = ({
               {selectedOptions.map((option) => (
                 <span
                   key={option.id}
-                  className="bg-emerald-100 text-emerald-700 px-2 py-1 rounded-md text-sm"
+                  className="bg-primary/10 text-secondary px-2 py-1 rounded-md text-sm"
                 >
                   {option.name}
                 </span>
@@ -71,8 +71,8 @@ const MultiSelect = ({
                 key={option.id}
                 className={`cursor-pointer select-none relative py-2 pl-3 pr-9 ${
                   selectedOptions.some((selected) => selected.id === option.id)
-                    ? 'text-white bg-emerald-600'
-                    : 'text-gray-900 hover:bg-emerald-100 hover:text-emerald-900'
+                    ? 'text-white bg-primary'
+                    : 'text-gray-900 hover:bg-primary/10 hover:text-secondary'
                 }`}
                 onClick={() => handleSelect(option)}
               >