[OS-1693] IUFC > checklist > add the personal data tab

Author: jcougnaud

auth/roles/central_manager.py

@@ -198,10 +198,10 @@ def common_rule_set(cls, is_entity_manager: callable):
             & (general.in_sic_status | continuing.is_submitted | doctorate.in_sic_status)
             & ~is_sent_to_epc,
             'admission.change_personal_data_checklist_status_to_be_processed': is_entity_manager
-            & (general.in_sic_status | doctorate.in_sic_status)
+            & (general.in_sic_status | continuing.is_submitted | doctorate.in_sic_status)
             & ~is_sent_to_epc,
             'admission.change_personal_data_checklist_status_cleaned': is_entity_manager
-            & (general.in_sic_status | doctorate.in_sic_status)
+            & (general.in_sic_status | continuing.is_submitted | doctorate.in_sic_status)
             & ~is_sent_to_epc,
             'admission.change_checklist_iufc': is_entity_manager & continuing.is_submitted & ~is_sent_to_epc,
             'admission.cancel_admission_iufc': is_entity_manager & continuing.is_submitted,

auth/roles/program_manager.py

@@ -91,19 +91,17 @@ def rule_set(cls):
             'admission.view_admission_person': is_part_of_education_group,
             'admission.change_admission_person': is_part_of_education_group
             & (
-                general.in_manager_status & personal_data_checklist_status_is_not_validated
+                general.in_manager_status
                 | continuing.in_manager_status & ~candidate_has_other_doctorate_or_general_admissions
-                | doctorate.in_manager_status & personal_data_checklist_status_is_not_validated
+                | doctorate.in_manager_status
             )
+            & personal_data_checklist_status_is_not_validated
             & ~is_sent_to_epc
             & ~workflow_injection_signaletique_en_cours,
             'admission.view_admission_coordinates': is_part_of_education_group,
             'admission.change_admission_coordinates': is_part_of_education_group
-            & (
-                general.in_manager_status & personal_data_checklist_status_is_not_validated
-                | continuing.in_manager_status
-                | doctorate.in_manager_status & personal_data_checklist_status_is_not_validated
-            )
+            & (general.in_manager_status | continuing.in_manager_status | doctorate.in_manager_status)
+            & personal_data_checklist_status_is_not_validated
             & ~is_sent_to_epc
             & ~workflow_injection_signaletique_en_cours,
             'admission.view_admission_secondary_studies': is_part_of_education_group,
@@ -199,11 +197,11 @@ def rule_set(cls):
             & continuing.is_submitted
             & ~is_sent_to_epc,
             'admission.change_personal_data_checklist_status_to_be_processed': is_part_of_education_group
-            & (general.in_manager_status | doctorate.in_manager_status)
+            & (general.in_manager_status | doctorate.in_manager_status | continuing.is_submitted)
             & personal_data_checklist_status_is_cleaned
             & ~is_sent_to_epc,
             'admission.change_personal_data_checklist_status_cleaned': is_part_of_education_group
-            & (general.in_manager_status | doctorate.in_manager_status)
+            & (general.in_manager_status | doctorate.in_manager_status | continuing.is_submitted)
             & personal_data_checklist_status_is_to_be_processed
             & ~is_sent_to_epc,
             'admission.cancel_admission_iufc': is_part_of_education_group

ddd/admission/doctorat/preparation/domain/model/statut_checklist.py

@@ -152,7 +152,7 @@ def get_status(self, status: str, extra: Optional[Dict[str, any]] = None) -> Opt
 
 STATUTS_CHECKLIST_PAR_ONGLET: Dict[str, Dict[str, ConfigurationStatutChecklist]] = {}
 
-onglet_donnes_personnelles = ConfigurationOngletChecklist(
+onglet_donnees_personnelles = ConfigurationOngletChecklist(
     identifiant=OngletsChecklist.donnees_personnelles,
     statuts=[
         ConfigurationStatutChecklist(
@@ -508,7 +508,7 @@ def get_status(self, status: str, extra: Optional[Dict[str, any]] = None) -> Opt
 )
 
 ORGANISATION_ONGLETS_CHECKLIST: List[ConfigurationOngletChecklist] = [
-    onglet_donnes_personnelles,
+    onglet_donnees_personnelles,
     onglet_assimilation,
     onglet_parcours_anterieur,
     onglets_parcours_anterieur_experiences,

ddd/admission/formation_continue/domain/model/enums.py

@@ -6,7 +6,7 @@
 #  The core business involves the administration of students, teachers,
 #  courses, programs and so on.
 #
-#  Copyright (C) 2015-2024 Université catholique de Louvain (http://www.uclouvain.be)
+#  Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -24,7 +24,8 @@
 #
 # ##############################################################################
 
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import pgettext_lazy
 
 from base.models.utils.utils import ChoiceEnum
 
@@ -131,3 +132,4 @@ class ChoixEdition(ChoiceEnum):
 class OngletsChecklist(ChoiceEnum):
     fiche_etudiant = _("Student report")
     decision = _("Decision")
+    donnees_personnelles = _("Personal data")

ddd/admission/formation_continue/domain/model/proposition.py

@@ -6,7 +6,7 @@
 #  The core business involves the administration of students, teachers,
 #  courses, programs and so on.
 #
-#  Copyright (C) 2015-2025 Université catholique de Louvain (http://www.uclouvain.be)
+#  Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -31,18 +31,6 @@
 from django.utils.timezone import now
 from django.utils.translation import gettext_noop as __
 
-from admission.ddd.admission.shared_kernel.domain.model._profil_candidat import ProfilCandidat
-from admission.ddd.admission.shared_kernel.domain.model.formation import FormationIdentity
-from admission.ddd.admission.shared_kernel.domain.model.question_specifique import QuestionSpecifique
-from admission.ddd.admission.shared_kernel.domain.service.i_profil_candidat import (
-    IProfilCandidatTranslator,
-)
-from admission.ddd.admission.shared_kernel.domain.service.i_question_specifique import (
-    ISuperQuestionSpecifiqueTranslator,
-)
-from admission.ddd.admission.shared_kernel.domain.service.profil_candidat import (
-    ProfilCandidat as ProfilCandidatService,
-)
 from admission.ddd.admission.formation_continue.domain.model._adresse import Adresse
 from admission.ddd.admission.formation_continue.domain.model.enums import (
     ChoixEdition,
@@ -71,6 +59,18 @@
     MettreEnAttenteValidatorList,
     RefuserPropositionValidatorList,
 )
+from admission.ddd.admission.shared_kernel.domain.model._profil_candidat import ProfilCandidat
+from admission.ddd.admission.shared_kernel.domain.model.formation import FormationIdentity
+from admission.ddd.admission.shared_kernel.domain.model.question_specifique import QuestionSpecifique
+from admission.ddd.admission.shared_kernel.domain.service.i_profil_candidat import (
+    IProfilCandidatTranslator,
+)
+from admission.ddd.admission.shared_kernel.domain.service.i_question_specifique import (
+    ISuperQuestionSpecifiqueTranslator,
+)
+from admission.ddd.admission.shared_kernel.domain.service.profil_candidat import (
+    ProfilCandidat as ProfilCandidatService,
+)
 from base.models.enums.academic_calendar_type import AcademicCalendarTypes
 from ddd.logic.formation_catalogue.formation_continue.dtos.informations_specifiques import (
     InformationsSpecifiquesDTO,
@@ -391,7 +391,7 @@ def approuver_proposition(
         profil_candidat_translator: IProfilCandidatTranslator,
     ):
         ApprouverPropositionValidatorList(
-            checklist_statut=self.checklist_actuelle.decision,
+            checklist_actuelle=self.checklist_actuelle,
         ).validate()
 
         ProfilCandidatService.verifier_quarantaine(

ddd/admission/formation_continue/domain/model/statut_checklist.py

@@ -6,7 +6,7 @@
 #  The core business involves the administration of students, teachers,
 #  courses, programs and so on.
 #
-#  Copyright (C) 2015-2024 Université catholique de Louvain (http://www.uclouvain.be)
+#  Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -24,10 +24,11 @@
 #
 # ##############################################################################
 from enum import Enum
-from typing import List, Optional, Dict
+from typing import Dict, List, Optional
 
 import attr
-from django.utils.translation import gettext_lazy as _, pgettext_lazy
+from django.utils.translation import gettext_lazy as _
+from django.utils.translation import pgettext_lazy
 
 from admission.ddd.admission.formation_continue.domain.model.enums import ChoixStatutChecklist, OngletsChecklist
 from osis_common.ddd import interface
@@ -61,6 +62,7 @@ def _serialize(cls, inst, field, value):
 
 @attr.dataclass
 class StatutsChecklistContinue:
+    donnees_personnelles: StatutChecklist
     decision: StatutChecklist
     fiche_etudiant: StatutChecklist
 
@@ -79,7 +81,8 @@ def recuperer_enfant(self, onglet, identifiant_enfant) -> StatutChecklist:
 
 
 INDEX_ONGLETS_CHECKLIST = {
-    onglet: index for index, onglet in enumerate(attr.fields_dict(StatutsChecklistContinue))  # type: ignore
+    onglet: index
+    for index, onglet in enumerate(attr.fields_dict(StatutsChecklistContinue))  # type: ignore
 }
 
 
@@ -188,8 +191,42 @@ def get_status(self, status: str, extra: Optional[Dict[str, any]] = None) -> Opt
     ],
 )
 
+onglet_donnees_personnelles = ConfigurationOngletChecklist(
+    identifiant=OngletsChecklist.donnees_personnelles,
+    statuts=[
+        ConfigurationStatutChecklist(
+            identifiant='A_TRAITER',
+            libelle=_('To be processed'),
+            statut=ChoixStatutChecklist.INITIAL_CANDIDAT,
+        ),
+        ConfigurationStatutChecklist(
+            identifiant='TOILETTEES',
+            libelle=pgettext_lazy('plural', 'Cleaned'),
+            statut=ChoixStatutChecklist.GEST_EN_COURS,
+        ),
+        ConfigurationStatutChecklist(
+            identifiant='A_COMPLETER',
+            libelle=_('To be completed'),
+            statut=ChoixStatutChecklist.GEST_BLOCAGE,
+            extra={'fraud': '0'},
+        ),
+        ConfigurationStatutChecklist(
+            identifiant='FRAUDEUR',
+            libelle=_('Fraudster'),
+            statut=ChoixStatutChecklist.GEST_BLOCAGE,
+            extra={'fraud': '1'},
+        ),
+        ConfigurationStatutChecklist(
+            identifiant='VALIDEES',
+            libelle=pgettext_lazy('plural', 'Validated'),
+            statut=ChoixStatutChecklist.GEST_REUSSITE,
+        ),
+    ],
+)
+
 
 ORGANISATION_ONGLETS_CHECKLIST: List[ConfigurationOngletChecklist] = [
+    onglet_donnees_personnelles,
     onglet_decision,
 ]
 

ddd/admission/formation_continue/domain/service/checklist.py

@@ -6,7 +6,7 @@
 #  The core business involves the administration of students, teachers,
 #  courses, programs and so on.
 #
-#  Copyright (C) 2015-2024 Université catholique de Louvain (http://www.uclouvain.be)
+#  Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #  This program is free software: you can redistribute it and/or modify
 #  it under the terms of the GNU General Public License as published by
@@ -62,4 +62,8 @@ def recuperer_checklist_initiale(
                 libelle=_('To be processed'),
                 statut=ChoixStatutChecklist.INITIAL_CANDIDAT,
             ),
+            donnees_personnelles=StatutChecklist(
+                libelle=_("To be processed"),
+                statut=ChoixStatutChecklist.INITIAL_CANDIDAT,
+            ),
         )

ddd/admission/formation_continue/domain/validator/_should_informations_checklist_etre_completees.py

@@ -6,7 +6,7 @@
 #    The core business involves the administration of students, teachers,
 #    courses, programs and so on.
 #
-#    Copyright (C) 2015-2024 Université catholique de Louvain (http://www.uclouvain.be)
+#    Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -29,14 +29,18 @@
 from admission.ddd.admission.formation_continue.domain.model.enums import (
     ChoixStatutChecklist,
 )
-from admission.ddd.admission.formation_continue.domain.model.statut_checklist import StatutChecklist
+from admission.ddd.admission.formation_continue.domain.model.statut_checklist import (
+    StatutChecklist,
+    StatutsChecklistContinue,
+)
 from admission.ddd.admission.formation_continue.domain.validator.exceptions import (
-    ApprouverPropositionTransitionStatutException,
     AnnulerPropositionTransitionStatutException,
-    RefuserPropositionTransitionStatutException,
     ApprouverParFacTransitionStatutException,
-    MettreEnAttenteTransitionStatutException,
+    ApprouverPropositionTransitionStatutException,
+    EtatChecklistDonneesPersonnellesNonValidePourApprouverDemande,
     MettreAValiderTransitionStatutException,
+    MettreEnAttenteTransitionStatutException,
+    RefuserPropositionTransitionStatutException,
 )
 from base.ddd.utils.business_validator import BusinessValidator
 
@@ -118,3 +122,12 @@ class ShouldPeutCloturerProposition(BusinessValidator):
 
     def validate(self, *args, **kwargs):
         pass
+
+
+@attr.dataclass(frozen=True, slots=True)
+class ShouldDonneesPersonnellesEtreDansEtatCorrectPourApprouverDemande(BusinessValidator):
+    checklist_actuelle: StatutsChecklistContinue
+
+    def validate(self, *args, **kwargs):
+        if self.checklist_actuelle.donnees_personnelles.statut != ChoixStatutChecklist.GEST_REUSSITE:
+            raise EtatChecklistDonneesPersonnellesNonValidePourApprouverDemande

ddd/admission/formation_continue/domain/validator/exceptions.py

@@ -6,7 +6,7 @@
 #    The core business involves the administration of students, teachers,
 #    courses, programs and so on.
 #
-#    Copyright (C) 2015-2024 Université catholique de Louvain (http://www.uclouvain.be)
+#    Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -128,3 +128,11 @@ class MettreAValiderTransitionStatutException(BusinessException):
     def __init__(self, **kwargs):
         message = _('You can only transition to the "To validate IUFC" status from the "Approved" status.')
         super().__init__(message, **kwargs)
+
+
+class EtatChecklistDonneesPersonnellesNonValidePourApprouverDemande(BusinessException):
+    status_code = "FORMATION-CONTINUE-13"
+
+    def __init__(self, **kwargs):
+        message = _('The status of the checklist for the personal data must be "Validated".')
+        super().__init__(message, **kwargs)

ddd/admission/formation_continue/domain/validator/validator_by_business_actions.py

@@ -6,7 +6,7 @@
 #    The core business involves the administration of students, teachers,
 #    courses, programs and so on.
 #
-#    Copyright (C) 2015-2024 Université catholique de Louvain (http://www.uclouvain.be)
+#    Copyright (C) 2015-2026 Université catholique de Louvain (http://www.uclouvain.be)
 #
 #    This program is free software: you can redistribute it and/or modify
 #    it under the terms of the GNU General Public License as published by
@@ -27,18 +27,22 @@
 
 import attr
 
-from admission.ddd.admission.formation_continue.domain.model.statut_checklist import StatutChecklist
+from admission.ddd.admission.formation_continue.domain.model.statut_checklist import (
+    StatutChecklist,
+    StatutsChecklistContinue,
+)
 from admission.ddd.admission.formation_continue.domain.validator import (
     ShouldRenseignerExperiencesCurriculum,
 )
 from admission.ddd.admission.formation_continue.domain.validator._should_informations_checklist_etre_completees import (
-    ShouldPeutMettreEnAttente,
-    ShouldPeutApprouverParFac,
-    ShouldPeutRefuserProposition,
+    ShouldDonneesPersonnellesEtreDansEtatCorrectPourApprouverDemande,
     ShouldPeutAnnulerProposition,
+    ShouldPeutApprouverParFac,
     ShouldPeutApprouverProposition,
     ShouldPeutCloturerProposition,
     ShouldPeutMettreAValider,
+    ShouldPeutMettreEnAttente,
+    ShouldPeutRefuserProposition,
 )
 from base.ddd.utils.business_validator import BusinessValidator, TwoStepsMultipleBusinessExceptionListValidator
 
@@ -122,15 +126,18 @@ def get_invariants_validators(self) -> List[BusinessValidator]:
 
 @attr.dataclass(frozen=True, slots=True)
 class ApprouverPropositionValidatorList(TwoStepsMultipleBusinessExceptionListValidator):
-    checklist_statut: StatutChecklist
+    checklist_actuelle: StatutsChecklistContinue
 
     def get_data_contract_validators(self) -> List[BusinessValidator]:
         return []
 
     def get_invariants_validators(self) -> List[BusinessValidator]:
         return [
             ShouldPeutApprouverProposition(
-                checklist_statut=self.checklist_statut,
+                checklist_statut=self.checklist_actuelle.decision,
+            ),
+            ShouldDonneesPersonnellesEtreDansEtatCorrectPourApprouverDemande(
+                checklist_actuelle=self.checklist_actuelle,
             ),
         ]