Skip to content

Commit

Permalink
[OS-1317] Doctorate > use the PHD training type instead of the FORMAT…
Browse files Browse the repository at this point in the history
…ION_PHD type
  • Loading branch information
jcougnaud committed Nov 15, 2024
1 parent ac7057b commit 4d3a592
Show file tree
Hide file tree
Showing 10 changed files with 22 additions and 22 deletions.
2 changes: 1 addition & 1 deletion contrib/enums/training_choice.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/test_templatetags.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion tests/utils/test_utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
)
Expand Down
2 changes: 1 addition & 1 deletion tests/views/curriculum/mixin.py
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
2 changes: 1 addition & 1 deletion tests/views/test_accounting.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
2 changes: 1 addition & 1 deletion tests/views/test_autocomplete.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
),
Expand Down
4 changes: 2 additions & 2 deletions tests/views/test_list.py
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand All @@ -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,
),
),
],
Expand Down
2 changes: 1 addition & 1 deletion tests/views/test_pdf_recap.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
10 changes: 5 additions & 5 deletions tests/views/test_project.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,31 +121,31 @@ def setUp(self):
annee=2021,
sigle_entite_gestion="CDE",
links=[],
type=TrainingType.FORMATION_PHD.name,
type=TrainingType.PHD.name,
),
Mock(
sigle='FOOBARBAZ',
intitule='Foobarbaz',
annee=2021,
sigle_entite_gestion=COMMISSION_CDSS,
links=[],
type=TrainingType.FORMATION_PHD.name,
type=TrainingType.PHD.name,
),
Mock(
sigle='BARBAZ',
intitule='Barbaz',
annee=2021,
sigle_entite_gestion="AZERT",
links=[],
type=TrainingType.FORMATION_PHD.name,
type=TrainingType.PHD.name,
),
Mock(
sigle=SCIENCE_DOCTORATE,
intitule='FooBarbaz',
annee=2021,
sigle_entite_gestion="AZERT",
links=[],
type=TrainingType.FORMATION_PHD.name,
type=TrainingType.PHD.name,
),
]
self.addCleanup(autocomplete_api_patcher.stop)
Expand Down Expand Up @@ -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,
Expand Down
16 changes: 8 additions & 8 deletions tests/views/training_choice/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
},
),
Expand All @@ -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',
},
),
Expand All @@ -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',
},
),
Expand Down Expand Up @@ -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',
},
Expand Down Expand Up @@ -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(
Expand All @@ -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(
Expand All @@ -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(
Expand All @@ -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',
),
]
Expand Down

0 comments on commit 4d3a592

Please sign in to comment.