diff --git a/contrib/forms/project.py b/contrib/forms/project.py
index 5750967a..36417f72 100644
--- a/contrib/forms/project.py
+++ b/contrib/forms/project.py
@@ -284,8 +284,11 @@ class DoctorateAdmissionProjectForm(forms.Form):
class Media:
js = ('js/dependsOn.min.js',)
- def __init__(self, hide_proximity_commission_fields=True, *args, **kwargs):
+ def __init__(self, admission_type, hide_proximity_commission_fields=True, *args, **kwargs):
self.person = getattr(self, 'person', kwargs.pop('person', None))
+ self.admission_type = admission_type
+ self.label_classes = self.get_field_label_classes()
+
super().__init__(*args, **kwargs)
# Set proximity commission fields value from API data
@@ -367,3 +370,38 @@ def get_selected_doctorate(self, sector, doctorat):
return next( # pragma: no branch
d for d in doctorats if doctorat == "{doctorat.sigle}-{doctorat.annee}".format(doctorat=d)
)
+
+ def get_field_label_classes(self):
+ """Returns the classes that should be applied to the label of the form fields."""
+
+ possible_mandatory_fields = [
+ 'justification',
+ 'type_contrat_travail',
+ 'eft',
+ 'bourse_recherche',
+ 'autre_bourse_recherche',
+ 'raison_non_soutenue',
+ 'titre_projet',
+ ]
+
+ if self.admission_type == AdmissionType.ADMISSION.name:
+ possible_mandatory_fields += [
+ 'type_financement',
+ 'bourse_date_debut',
+ 'bourse_date_fin',
+ 'bourse_preuve',
+ 'duree_prevue',
+ 'temps_consacre',
+ 'est_lie_fnrs_fria_fresh_csc',
+ 'resume_projet',
+ 'documents_projet',
+ 'proposition_programme_doctoral',
+ 'langue_redaction_these',
+ 'projet_doctoral_deja_commence',
+ 'projet_doctoral_institution',
+ 'projet_doctoral_date_debut',
+ 'institution',
+ 'domaine_these',
+ ]
+
+ return {field_name: 'required_text' for field_name in possible_mandatory_fields}
diff --git a/contrib/views/doctorate/form_tabs/project.py b/contrib/views/doctorate/form_tabs/project.py
index c76275ac..0916cfbe 100644
--- a/contrib/views/doctorate/form_tabs/project.py
+++ b/contrib/views/doctorate/form_tabs/project.py
@@ -59,6 +59,7 @@ class DoctorateAdmissionProjectFormView(LoadDossierViewMixin, WebServiceFormMixi
def get_form_kwargs(self):
kwargs = super().get_form_kwargs()
kwargs['person'] = self.person
+ kwargs['admission_type'] = self.admission.type_admission
return kwargs
def get_initial(self):
diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 90849c66..2eec36e2 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -2462,6 +2462,10 @@ msgid ""
"
Without any filter nor any contour
"
msgstr ""
+msgid ""
+"The promoters may be changed during the admissions process."
+msgstr ""
+
msgid ""
"The secondary school diploma is the Certificat d'Enseignement Secondaire "
"Superieur (CESS, Certificate of Higher Secondary Education). It is commonly "
diff --git a/locale/fr_BE/LC_MESSAGES/django.po b/locale/fr_BE/LC_MESSAGES/django.po
index 690ad08f..af58aaf7 100644
--- a/locale/fr_BE/LC_MESSAGES/django.po
+++ b/locale/fr_BE/LC_MESSAGES/django.po
@@ -2842,6 +2842,10 @@ msgstr ""
"et de face
Photo récente en couleur
Aucun filtre appliqué ni trace de contour
"
+msgid ""
+"The promoters may be changed during the admissions process."
+msgstr "Le promoteur ou la promotrice pourront être modifiés au cours du processus d'admission."
+
msgid ""
"The secondary school diploma is the Certificat d'Enseignement Secondaire "
"Superieur (CESS, Certificate of Higher Secondary Education). It is commonly "
diff --git a/templates/admission/doctorate/forms/project.html b/templates/admission/doctorate/forms/project.html
index 1f9d47ae..5532dcff 100644
--- a/templates/admission/doctorate/forms/project.html
+++ b/templates/admission/doctorate/forms/project.html
@@ -48,7 +48,7 @@
Please also consult the special provisions of the field for all pre-admission conditions.
{% endblocktrans %}
- {% bootstrap_field form.justification form_group_class="form-group required_field" %}
+ {% bootstrap_field form.justification label_class=form.label_classes.justification %}
{% endif %}
@@ -91,50 +91,50 @@
{% panel _("Funding") %}
{% endpanel %}
diff --git a/templates/admission/doctorate/forms/supervision.html b/templates/admission/doctorate/forms/supervision.html
index b075e4c7..64a9b98b 100644
--- a/templates/admission/doctorate/forms/supervision.html
+++ b/templates/admission/doctorate/forms/supervision.html
@@ -8,7 +8,7 @@
* The core business involves the administration of students, teachers,
* courses, programs and so on.
*
- * Copyright (C) 2015-2023 Université catholique de Louvain (http://www.uclouvain.be)
+ * Copyright (C) 2015-2024 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
@@ -88,40 +88,55 @@