[OS-1689] Checklist > personal data > add a new state and add editing permissions to the program managers

Author: jcougnaud

auth/predicates/common.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
@@ -224,3 +224,29 @@ def past_experiences_checklist_tab_is_not_sufficient(
     obj: Union[DoctorateAdmission, GeneralEducationAdmission],
 ):
     return obj.checklist.get('current', {}).get('parcours_anterieur', {}).get('statut') != 'GEST_REUSSITE'
+
+
+@predicate(bind=True)
+@predicate_failed_msg(
+    message=_("The \"Personal data\" checklist tab must be in the \"Cleaned\" status in order to do this action.")
+)
+def personal_data_checklist_status_is_cleaned(self, user: User, obj: BaseAdmission):
+    return obj.checklist.get('current', {}).get('donnees_personnelles', {}).get('statut') == 'GEST_EN_COURS'
+
+
+@predicate(bind=True)
+@predicate_failed_msg(
+    message=_(
+        "The \"Personal data\" checklist tab must be in the \"To be processed\" status in order to do this action."
+    )
+)
+def personal_data_checklist_status_is_to_be_processed(self, user: User, obj: BaseAdmission):
+    return obj.checklist.get('current', {}).get('donnees_personnelles', {}).get('statut') == 'INITIAL_CANDIDAT'
+
+
+@predicate(bind=True)
+@predicate_failed_msg(
+    message=_("The \"Personal data\" checklist tab must not be in the \"Validated\" status in order to do this action.")
+)
+def personal_data_checklist_status_is_not_validated(self, user: User, obj: BaseAdmission):
+    return obj.checklist.get('current', {}).get('donnees_personnelles', {}).get('statut') != 'GEST_REUSSITE'

auth/predicates/doctorate.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
@@ -37,6 +37,7 @@
     STATUTS_PROPOSITION_DOCTORALE_SOUMISE_POUR_CANDIDAT,
     STATUTS_PROPOSITION_DOCTORALE_SOUMISE_POUR_CDD,
     STATUTS_PROPOSITION_DOCTORALE_SOUMISE_POUR_CDD_ETENDUS,
+    STATUTS_PROPOSITION_DOCTORALE_SOUMISE_POUR_GESTIONNAIRE,
     STATUTS_PROPOSITION_DOCTORALE_SOUMISE_POUR_SIC,
     STATUTS_PROPOSITION_DOCTORALE_SOUMISE_POUR_SIC_ETENDUS,
     ChoixStatutPropositionDoctorale,
@@ -235,3 +236,11 @@ def can_send_to_fac_faculty_decision(self, user: User, obj: DoctorateAdmission):
 @predicate_failed_msg(message=_("The admission must not follow a pre-admission"))
 def must_not_follow_a_pre_admission(self, user: User, obj: DoctorateAdmission):
     return not bool(obj.related_pre_admission_id)
+
+
+@predicate(bind=True)
+@predicate_failed_msg(
+    not_in_doctorate_statuses_predicate_message(STATUTS_PROPOSITION_DOCTORALE_SOUMISE_POUR_GESTIONNAIRE)
+)
+def in_manager_status(self, user: User, obj: DoctorateAdmission):
+    return isinstance(obj, DoctorateAdmission) and obj.status in STATUTS_PROPOSITION_DOCTORALE_SOUMISE_POUR_GESTIONNAIRE

auth/predicates/general.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,18 +29,19 @@
 from rules import predicate
 
 from admission.auth.predicates import not_in_general_statuses_predicate_message
-from admission.models import GeneralEducationAdmission
 from admission.ddd.admission.formation_generale.domain.model.enums import (
-    ChoixStatutPropositionGenerale,
-    ChoixStatutChecklist,
+    STATUTS_PROPOSITION_GENERALE_ENVOYABLE_EN_FAC_POUR_DECISION,
+    STATUTS_PROPOSITION_GENERALE_SOUMISE,
     STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_FAC,
-    STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_SIC,
     STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_FAC_ETENDUS,
+    STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_GESTIONNAIRE,
+    STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_SIC,
     STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_SIC_ETENDUS,
-    STATUTS_PROPOSITION_GENERALE_SOUMISE,
     STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_SIC_OU_FRAIS_DOSSIER_EN_ATTENTE,
-    STATUTS_PROPOSITION_GENERALE_ENVOYABLE_EN_FAC_POUR_DECISION,
+    ChoixStatutChecklist,
+    ChoixStatutPropositionGenerale,
 )
+from admission.models import GeneralEducationAdmission
 from osis_role.errors import predicate_failed_msg
 
 
@@ -116,6 +117,15 @@ def in_fac_status(self, user: User, obj: GeneralEducationAdmission):
     return isinstance(obj, GeneralEducationAdmission) and obj.status in STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_FAC
 
 
+@predicate(bind=True)
+@predicate_failed_msg(not_in_general_statuses_predicate_message(STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_GESTIONNAIRE))
+def in_manager_status(self, user: User, obj: GeneralEducationAdmission):
+    return (
+        isinstance(obj, GeneralEducationAdmission)
+        and obj.status in STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_GESTIONNAIRE
+    )
+
+
 @predicate(bind=True)
 @predicate_failed_msg(not_in_general_statuses_predicate_message(STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_FAC_ETENDUS))
 def in_fac_status_extended(self, user: User, obj: GeneralEducationAdmission):

auth/roles/central_manager.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
@@ -34,16 +34,14 @@
     candidate_has_other_doctorate_or_general_admissions,
     has_scope,
     is_debug,
-)
-from admission.auth.predicates.common import (
-    is_entity_manager as is_entity_manager_without_scope,
-)
-from admission.auth.predicates.common import (
     is_scoped_entity_manager,
     is_sent_to_epc,
     past_experiences_checklist_tab_is_not_sufficient,
     workflow_injection_signaletique_en_cours,
 )
+from admission.auth.predicates.common import (
+    is_entity_manager as is_entity_manager_without_scope,
+)
 from admission.auth.scope import Scope
 from osis_role.contrib.models import EntityRoleModel
 
@@ -199,6 +197,12 @@ def common_rule_set(cls, is_entity_manager: callable):
             'admission.change_checklist': is_entity_manager
             & (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)
+            & ~is_sent_to_epc,
+            'admission.change_personal_data_checklist_status_cleaned': is_entity_manager
+            & (general.in_sic_status | 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,
             'admission.change_payment': is_entity_manager & general.in_sic_status_or_application_fees & ~is_sent_to_epc,

auth/roles/program_manager.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
@@ -36,6 +36,9 @@
     is_part_of_education_group,
     is_sent_to_epc,
     past_experiences_checklist_tab_is_not_sufficient,
+    personal_data_checklist_status_is_cleaned,
+    personal_data_checklist_status_is_not_validated,
+    personal_data_checklist_status_is_to_be_processed,
     workflow_injection_signaletique_en_cours,
 )
 from admission.infrastructure.admission.shared_kernel.domain.service.annee_inscription_formation import (
@@ -87,13 +90,20 @@ def rule_set(cls):
             # Profile
             'admission.view_admission_person': is_part_of_education_group,
             'admission.change_admission_person': is_part_of_education_group
-            & continuing.in_manager_status
+            & (
+                general.in_manager_status & personal_data_checklist_status_is_not_validated
+                | continuing.in_manager_status & ~candidate_has_other_doctorate_or_general_admissions
+                | doctorate.in_manager_status & personal_data_checklist_status_is_not_validated
+            )
             & ~is_sent_to_epc
-            & ~workflow_injection_signaletique_en_cours
-            & ~candidate_has_other_doctorate_or_general_admissions,
+            & ~workflow_injection_signaletique_en_cours,
             'admission.view_admission_coordinates': is_part_of_education_group,
             'admission.change_admission_coordinates': is_part_of_education_group
-            & continuing.in_manager_status
+            & (
+                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
+            )
             & ~is_sent_to_epc
             & ~workflow_injection_signaletique_en_cours,
             'admission.view_admission_secondary_studies': is_part_of_education_group,
@@ -188,6 +198,14 @@ def rule_set(cls):
             & continuing.is_continuing
             & 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)
+            & 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)
+            & personal_data_checklist_status_is_to_be_processed
+            & ~is_sent_to_epc,
             'admission.cancel_admission_iufc': is_part_of_education_group
             & continuing.is_submitted
             & ~continuing.is_validated

ddd/admission/doctorat/preparation/domain/model/enums/projet.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
@@ -138,6 +138,16 @@ def get_specific_values(cls, keys: Iterable[str]):
 }
 
 
+# Le gestionnaire FAC ou SIC à la main hors inscription autorisée
+STATUTS_PROPOSITION_DOCTORALE_SOUMISE_POUR_GESTIONNAIRE = (
+    STATUTS_PROPOSITION_DOCTORALE_SOUMISE_POUR_CDD
+    | STATUTS_PROPOSITION_DOCTORALE_SOUMISE_POUR_SIC
+    - {
+        ChoixStatutPropositionDoctorale.INSCRIPTION_AUTORISEE.name,
+    }
+)
+
+
 class ChoixCommissionProximiteCDEouCLSM(ChoiceEnum):
     ECONOMY = _('ECONOMY')
     MANAGEMENT = _('MANAGEMENT')

ddd/admission/doctorat/preparation/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-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
@@ -95,7 +95,8 @@ def recuperer_enfant(self, onglet, identifiant_enfant) -> StatutChecklist:
 
 
 INDEX_ONGLETS_CHECKLIST = {
-    onglet: index for index, onglet in enumerate(attr.fields_dict(StatutsChecklistDoctorale))  # type: ignore
+    onglet: index
+    for index, onglet in enumerate(attr.fields_dict(StatutsChecklistDoctorale))  # type: ignore
 }
 
 
@@ -159,6 +160,11 @@ def get_status(self, status: str, extra: Optional[Dict[str, any]] = None) -> Opt
             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'),
@@ -173,7 +179,7 @@ def get_status(self, status: str, extra: Optional[Dict[str, any]] = None) -> Opt
         ),
         ConfigurationStatutChecklist(
             identifiant='VALIDEES',
-            libelle=_('Validated'),
+            libelle=pgettext_lazy('plural', 'Validated'),
             statut=ChoixStatutChecklist.GEST_REUSSITE,
         ),
     ],

ddd/admission/formation_generale/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-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
@@ -150,6 +150,15 @@ def get_status_priorities(cls):
     - STATUTS_PROPOSITION_GENERALE_NON_SOUMISE_OU_FRAIS_DOSSIER_EN_ATTENTE
 )
 
+# Le gestionnaire FAC ou SIC à la main hors inscription autorisée
+STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_GESTIONNAIRE = (
+    STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_FAC
+    | STATUTS_PROPOSITION_GENERALE_SOUMISE_POUR_SIC
+    - {
+        ChoixStatutPropositionGenerale.INSCRIPTION_AUTORISEE.name,
+    }
+)
+
 
 class ChoixStatutChecklist(ChoiceEnum):
     INITIAL_NON_CONCERNE = _("INITIAL_NON_CONCERNE")

ddd/admission/formation_generale/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-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
@@ -115,7 +115,8 @@ def recuperer_enfant(self, onglet, identifiant_enfant) -> StatutChecklist:
 
 
 INDEX_ONGLETS_CHECKLIST = {
-    onglet: index for index, onglet in enumerate(attr.fields_dict(StatutsChecklistGenerale))  # type: ignore
+    onglet: index
+    for index, onglet in enumerate(attr.fields_dict(StatutsChecklistGenerale))  # type: ignore
 }
 
 
@@ -179,6 +180,11 @@ def get_status(self, status: str, extra: Optional[Dict[str, any]] = None) -> Opt
             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'),
@@ -193,7 +199,7 @@ def get_status(self, status: str, extra: Optional[Dict[str, any]] = None) -> Opt
         ),
         ConfigurationStatutChecklist(
             identifiant='VALIDEES',
-            libelle=_('Validated'),
+            libelle=pgettext_lazy('plural', 'Validated'),
             statut=ChoixStatutChecklist.GEST_REUSSITE,
         ),
     ],

locale/en/LC_MESSAGES/django.po

@@ -1459,6 +1459,10 @@ msgstr ""
 msgid "Cleaned"
 msgstr ""
 
+msgctxt "plural"
+msgid "Cleaned"
+msgstr ""
+
 msgid "Clear the reason"
 msgstr ""
 
@@ -6254,6 +6258,21 @@ msgstr ""
 msgid "Text size"
 msgstr ""
 
+msgid ""
+"The \"Personal data\" checklist tab must be in the \"Cleaned\" status in "
+"order to do this action."
+msgstr ""
+
+msgid ""
+"The \"Personal data\" checklist tab must be in the \"To be processed\" "
+"status in order to do this action."
+msgstr ""
+
+msgid ""
+"The \"Personal data\" checklist tab must not be in the \"Validated\" status "
+"in order to do this action."
+msgstr ""
+
 msgid ""
 "The \"Sufficient\" status requires the equivalence information to be "
 "specified."
@@ -7266,6 +7285,10 @@ msgctxt "decision-checklist"
 msgid "Validated"
 msgstr ""
 
+msgctxt "plural"
+msgid "Validated"
+msgstr ""
+
 msgid "Valuated diplomas or experiences:"
 msgstr ""