feat: Nommage des templates / Intégration dans formulaire d'inscription

parent [#22]

Back-End/Subscriptions/models.py

@@ -180,26 +180,6 @@ class RegistrationTemplateMaster(models.Model):
     def __str__(self):
         return f'{self.group.name} - {self.template_id}'
 
-class RegistrationTemplate(models.Model):
-    master = models.ForeignKey(RegistrationTemplateMaster, on_delete=models.CASCADE, related_name='templates')
-    template_id = models.IntegerField(primary_key=True)
-    name = models.CharField(max_length=255, default="")
-    registration_form = models.ForeignKey('RegistrationForm', on_delete=models.CASCADE, related_name='templates')
-
-    def __str__(self):
-        return self.name
-    
-    @staticmethod
-    def get_files_from_rf(register_form_id):
-        """
-        Récupère tous les fichiers liés à un dossier d’inscription donné.
-        """
-        registration_files = RegistrationTemplate.objects.filter(register_form_id=register_form_id).order_by('template__order')
-        filenames = []
-        for reg_file in registration_files:
-            filenames.append(reg_file.file.path)
-        return filenames
-
 class RegistrationForm(models.Model):
     class RegistrationFormStatus(models.IntegerChoices):
         RF_ABSENT = 0, _('Pas de dossier d\'inscription')
@@ -238,3 +218,24 @@ class RegistrationForm(models.Model):
 
     def __str__(self):
         return "RF_" + self.student.last_name + "_" + self.student.first_name
+
+class RegistrationTemplate(models.Model):
+    master = models.ForeignKey(RegistrationTemplateMaster, on_delete=models.CASCADE, related_name='templates')
+    template_id = models.IntegerField(primary_key=True)
+    slug = models.CharField(max_length=255, default="")
+    name = models.CharField(max_length=255, default="")
+    registration_form = models.ForeignKey(RegistrationForm, on_delete=models.CASCADE, related_name='templates')
+
+    def __str__(self):
+        return self.name
+    
+    @staticmethod
+    def get_files_from_rf(register_form_id):
+        """
+        Récupère tous les fichiers liés à un dossier d’inscription donné.
+        """
+        registration_files = RegistrationTemplate.objects.filter(register_form_id=register_form_id).order_by('template__order')
+        filenames = []
+        for reg_file in registration_files:
+            filenames.append(reg_file.file.path)
+        return filenames

Back-End/Subscriptions/serializers.py

@@ -28,10 +28,18 @@ class GuardianSimpleSerializer(serializers.ModelSerializer):
 
 class RegistrationFormSimpleSerializer(serializers.ModelSerializer):
     guardians = GuardianSimpleSerializer(many=True, source='student.guardians')
+    last_name = serializers.SerializerMethodField()
+    first_name = serializers.SerializerMethodField()
 
     class Meta:
         model = RegistrationForm
-        fields = ['student_id', 'guardians']
+        fields = ['student_id', 'last_name', 'first_name', 'guardians']
+    
+    def get_last_name(self, obj):
+        return obj.student.last_name
+
+    def get_first_name(self, obj):
+        return obj.student.first_name
 
 class RegistrationFileGroupSerializer(serializers.ModelSerializer):
     registration_forms = serializers.SerializerMethodField()

Back-End/Subscriptions/urls.py

@@ -9,13 +9,14 @@ from .views import StudentView, GuardianView, ChildrenListView, StudentListView
 # Files
 from .views import RegistrationTemplateMasterView, RegistrationTemplateMasterSimpleView, RegistrationTemplateView, RegistrationTemplateSimpleView
 from .views import RegistrationFileGroupView, RegistrationFileGroupSimpleView, get_registration_files_by_group
-from .views import registration_file_views
+from .views import registration_file_views, get_templates_by_rf
 
 urlpatterns = [
     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"),
     re_path(r'^registerForms/(?P<id>[0-9]+)$', RegisterFormWithIdView.as_view(), name="registerForm"),
+    re_path(r'^registerForms/(?P<id>[0-9]+)/templates$', get_templates_by_rf, name="get_templates_by_rf"),
     re_path(r'^registerForms$', RegisterFormView.as_view(), name="registerForms"),
 
     # Page INSCRIPTION - Liste des élèves

Back-End/Subscriptions/views/__init__.py

@@ -1,4 +1,4 @@
-from .register_form_views import RegisterFormView, RegisterFormWithIdView, send, resend, archive
+from .register_form_views import RegisterFormView, RegisterFormWithIdView, send, resend, archive, get_templates_by_rf
 from .registration_file_views import RegistrationTemplateMasterView, RegistrationTemplateMasterSimpleView, RegistrationTemplateView, RegistrationTemplateSimpleView
 from .registration_file_group_views import RegistrationFileGroupView, RegistrationFileGroupSimpleView, get_registration_files_by_group
 from .student_views import StudentView, StudentListView, ChildrenListView
@@ -17,6 +17,7 @@ __all__ = [
     'RegistrationFileGroupView',
     'RegistrationFileGroupSimpleView',
     'get_registration_files_by_group',
+    'get_templates_by_rf',
     'StudentView',
     'StudentListView',
     'ChildrenListView',

Back-End/Subscriptions/views/register_form_views.py

@@ -383,3 +383,23 @@ def resend(request,id):
             return JsonResponse({"message": f"Le dossier a été renvoyé à l'adresse {email}"}, safe=False)
         return JsonResponse({"errorMessage":errorMessage}, safe=False, status=status.HTTP_400_BAD_REQUEST)
     return JsonResponse({"errorMessage":'Dossier d\'inscription non trouvé'}, safe=False, status=status.HTTP_404_NOT_FOUND)
+
+@swagger_auto_schema(
+    method='get',
+    responses={200: openapi.Response('Success', schema=openapi.Schema(
+        type=openapi.TYPE_OBJECT,
+        properties={
+            'message': openapi.Schema(type=openapi.TYPE_STRING)
+        }
+    ))},
+    operation_description="Récupère les fichiers à signer d'un dossier d'inscription donné",
+    operation_summary="Récupérer les fichiers à signer d'un dossier d'inscription donné"
+)
+@api_view(['GET'])
+def get_templates_by_rf(request, id):
+    try:
+        templates = RegistrationTemplate.objects.filter(registration_form=id)
+        templates_data = list(templates.values())
+        return JsonResponse(templates_data, safe=False)
+    except RegistrationFileGroup.DoesNotExist:
+        return JsonResponse({'error': 'Le groupe de fichiers n\'a pas été trouvé'}, status=404)

Back-End/Subscriptions/views/registration_file_group_views.py

@@ -118,8 +118,8 @@ class RegistrationFileGroupSimpleView(APIView):
 def get_registration_files_by_group(request, id):
     try:
         group = RegistrationFileGroup.objects.get(id=id)
-        templates = RegistrationTemplateMaster.objects.filter(groups=group)
-        templates_data = list(templates.values())
+        templateMasters = RegistrationTemplateMaster.objects.filter(groups=group)
+        templates_data = list(templateMasters.values())
         return JsonResponse(templates_data, safe=False)
     except RegistrationFileGroup.DoesNotExist:
         return JsonResponse({'error': 'Le groupe de fichiers n\'a pas été trouvé'}, status=404)