diff --git a/contrib/enums/training_choice.py b/contrib/enums/training_choice.py index 681b4140..396e6ad5 100644 --- a/contrib/enums/training_choice.py +++ b/contrib/enums/training_choice.py @@ -111,7 +111,7 @@ class TrainingType(ChoiceEnum): TrainingType.MASTER_MC.name, ], TypeFormation.DOCTORAT.name: [ - TrainingType.FORMATION_PHD.name, + TrainingType.PHD.name, ], TypeFormation.AGREGATION_CAPES.name: [ TrainingType.AGGREGATION.name, diff --git a/tests/test_templatetags.py b/tests/test_templatetags.py index e42ea023..d98006db 100644 --- a/tests/test_templatetags.py +++ b/tests/test_templatetags.py @@ -659,7 +659,7 @@ def test_interpolate_a_string(self): class DisplayStatusTestCase(TestCase): @classmethod def setUpTestData(cls): - cls.doctorate_training_type = TrainingType.FORMATION_PHD.name + cls.doctorate_training_type = TrainingType.PHD.name cls.general_training_type = TrainingType.BACHELOR.name cls.continuing_training_type = TrainingType.UNIVERSITY_FIRST_CYCLE_CERTIFICATE.name diff --git a/tests/utils/test_utils.py b/tests/utils/test_utils.py index 131f6b51..d645e621 100644 --- a/tests/utils/test_utils.py +++ b/tests/utils/test_utils.py @@ -162,7 +162,7 @@ def test_format_training_with_year_for_doctorate(self): annee=2021, sigle_entite_gestion="CDE", campus="Mons", - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, campus_inscription='Mons', code='FOOBAR', ) diff --git a/tests/views/curriculum/mixin.py b/tests/views/curriculum/mixin.py index 5f368adc..6915a213 100644 --- a/tests/views/curriculum/mixin.py +++ b/tests/views/curriculum/mixin.py @@ -284,7 +284,7 @@ def setUpTestData(cls): intitule='Doctorate name', sigle_entite_gestion="CDSS", campus="Mons", - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, campus_inscription="Mons", ), matricule_candidat=cls.person.global_id, diff --git a/tests/views/test_accounting.py b/tests/views/test_accounting.py index d9f5d289..759fcfac 100644 --- a/tests/views/test_accounting.py +++ b/tests/views/test_accounting.py @@ -80,7 +80,7 @@ def setUpTestData(cls): intitule='Doctorate name', sigle_entite_gestion="CDSS", campus="Mons", - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, ), matricule_candidat=cls.person.global_id, code_secteur_formation='CS', diff --git a/tests/views/test_autocomplete.py b/tests/views/test_autocomplete.py index 54359cae..f990726c 100644 --- a/tests/views/test_autocomplete.py +++ b/tests/views/test_autocomplete.py @@ -77,7 +77,7 @@ def test_autocomplete_doctorate(self, api): annee=2021, sigle_entite_gestion="CDE", campus="Louvain-La-Neuve", - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, campus_inscription='Mons', code='CODE', ), diff --git a/tests/views/test_list.py b/tests/views/test_list.py index 0610c887..ee2a0fb7 100644 --- a/tests/views/test_list.py +++ b/tests/views/test_list.py @@ -62,7 +62,7 @@ def test_list(self, api, *args): statut=ChoixStatutPropositionDoctorale.EN_BROUILLON.name, erreurs=[], doctorat=Mock( - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, ), ), Mock( @@ -71,7 +71,7 @@ def test_list(self, api, *args): erreurs=[], statut=ChoixStatutPropositionDoctorale.EN_BROUILLON.name, doctorat=Mock( - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, ), ), ], diff --git a/tests/views/test_pdf_recap.py b/tests/views/test_pdf_recap.py index c126d2d8..11017bb4 100644 --- a/tests/views/test_pdf_recap.py +++ b/tests/views/test_pdf_recap.py @@ -53,7 +53,7 @@ def setUpTestData(cls): intitule='Doctorate name', sigle_entite_gestion="CDSS", campus="Mons", - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, ), matricule_candidat=cls.person.global_id, code_secteur_formation='CS', diff --git a/tests/views/test_project.py b/tests/views/test_project.py index b28ececa..4edf1c91 100644 --- a/tests/views/test_project.py +++ b/tests/views/test_project.py @@ -121,7 +121,7 @@ def setUp(self): annee=2021, sigle_entite_gestion="CDE", links=[], - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, ), Mock( sigle='FOOBARBAZ', @@ -129,7 +129,7 @@ def setUp(self): annee=2021, sigle_entite_gestion=COMMISSION_CDSS, links=[], - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, ), Mock( sigle='BARBAZ', @@ -137,7 +137,7 @@ def setUp(self): annee=2021, sigle_entite_gestion="AZERT", links=[], - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, ), Mock( sigle=SCIENCE_DOCTORATE, @@ -145,7 +145,7 @@ def setUp(self): annee=2021, sigle_entite_gestion="AZERT", links=[], - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, ), ] self.addCleanup(autocomplete_api_patcher.stop) @@ -211,7 +211,7 @@ def test_update(self): 'sigle': 'FOOBARBAZ', 'annee': '2021', 'code_secteur_formation': "SSH", - 'type': TrainingType.FORMATION_PHD.name, + 'type': TrainingType.PHD.name, }, 'bourse_recherche': str(self.doctorate_international_scholarship.uuid), "commission_proximite": ChoixCommissionProximiteCDSS.ECLI.name, diff --git a/tests/views/training_choice/__init__.py b/tests/views/training_choice/__init__.py index 3bfe446d..642095e4 100644 --- a/tests/views/training_choice/__init__.py +++ b/tests/views/training_choice/__init__.py @@ -92,7 +92,7 @@ def get_training(cls, acronym, year, **kwargs): 'main_teaching_campus': { 'name': 'Louvain-La-Neuve', }, - 'education_group_type': 'FORMATION_PHD', + 'education_group_type': 'PHD', 'management_entity': 'CDE', }, ), @@ -105,7 +105,7 @@ def get_training(cls, acronym, year, **kwargs): 'main_teaching_campus': { 'name': 'Louvain-La-Neuve', }, - 'education_group_type': 'FORMATION_PHD', + 'education_group_type': 'PHD', 'management_entity': 'CDSS', }, ), @@ -131,7 +131,7 @@ def get_training(cls, acronym, year, **kwargs): 'main_teaching_campus': { 'name': 'Louvain-La-Neuve', }, - 'education_group_type': 'FORMATION_PHD', + 'education_group_type': 'PHD', 'management_entity': 'ME3', }, ), @@ -470,7 +470,7 @@ def setUpTestData(cls): 'intitule': 'Formation', 'campus': 'Louvain-La-Neuve', 'sigle': 'TR3', - 'type': TrainingType.FORMATION_PHD.name, + 'type': TrainingType.PHD.name, 'sigle_entite_gestion': 'CDE', 'campus_inscription': 'Mons', }, @@ -525,7 +525,7 @@ def setUpTestData(cls): annee=2021, sigle_entite_gestion="CDE", links=[], - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, campus_inscription='Mons', ), Mock( @@ -534,7 +534,7 @@ def setUpTestData(cls): annee=2021, sigle_entite_gestion=COMMISSION_CDSS, links=[], - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, campus_inscription='Mons', ), Mock( @@ -543,7 +543,7 @@ def setUpTestData(cls): annee=2021, sigle_entite_gestion="AZERT", links=[], - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, campus_inscription='Mons', ), Mock( @@ -552,7 +552,7 @@ def setUpTestData(cls): annee=2021, sigle_entite_gestion="AZERT", links=[], - type=TrainingType.FORMATION_PHD.name, + type=TrainingType.PHD.name, campus_inscription='Mons', ), ]