Changes to registration form : https://trackers.pilotsystems.net/prebarreau/0766

diff --git a/teleforma/forms.py b/teleforma/forms.py
index 9a9610e226e45499f6ab2d1786fcac96939047a1..b83393a57893f74262fc0fd66452c19d2d2a1a54 100644 (file)
--- a/teleforma/forms.py
+++ b/teleforma/forms.py
@@ -89,7 +89,7 @@ class UserForm(ModelForm):
     portrait = ImageField(widget=FileInput(attrs={'accept': "image/*;capture=camera"}), required=True,
                           help_text="Veuillez utiliser une photo au format d'identité.")
     level = ChoiceField(label=_('Studying level'), choices=LEVEL_CHOICES)
-    iej = ModelChoiceField(label='IEJ',
+    iej = ModelChoiceField(label="Niveau d'étude - IEJ",
                            queryset=IEJ.objects.all())
     period = ModelChoiceField(label='Période',
                               queryset=Period.objects.filter(is_open=True,

diff --git a/teleforma/templates/registration/registration_form.html b/teleforma/templates/registration/registration_form.html
index 15d644dffd017756cbb06bbc0e80ae433a9bc929..0d31286ffda78d9f6bb39fe1fe15bb5a79ddc92d 100644 (file)
--- a/teleforma/templates/registration/registration_form.html
+++ b/teleforma/templates/registration/registration_form.html
@@ -30,7 +30,7 @@
 
     <h1>{% if mode_corrector %}Pré-inscription des correcteurs - PRÉ-BARREAU -
         CRFPA{% else %}{% trans "Pre-registration" %} -
-        Formation CRFPA - Le pré-barreau{% endif %}</h1>
+        Formation de préparation au CRFPA - Le pré-barreau{% endif %}</h1>
 
     {{ introduction|safe }}
 
@@ -48,7 +48,7 @@
             {% with field=form|get_item:fieldname %}
             <div class="info_champs">
                 <label for="id_{{ field.name }}">
-                    {{ field.label }} {% if field.field.required %}<span class="required">*</span>{% endif %}
+                    {{ field.label }} {% if field.field.required and mode_corrector %}<span class="required">*</span>{% endif %}
                 </label>
                 <span class="helptext">
                     {{ field.help_text }}
@@ -73,7 +73,9 @@
             {% with field=form|get_item:fieldname %}
             <div class="info_champs">
                 <label for="id_{{ field.name }}">
-                    {{ field.label }} {% if field.field.required %}<span class="required">*</span>{% endif %}
+                    {{ field.label }}
+                    {% if field.field.required and mode_corrector %}<span class="required">*</span>{% endif %}
+                    {% if field.name == 'iej' %}<span class="required">*</span>{% endif %}
                 </label>
                 <span class="helptext">
                     {{ field.help_text }}
@@ -87,7 +89,12 @@
             {% endfor %}
         </div>
     </fieldset>
-    <span class="error">* Champs obligatoires</span>
+
+    {% if mode_corrector %}
+        <span class="error">* Champs obligatoires</span>
+    {% else %}
+        <span class="error">* Conditions nécessaires pour présenter le CRFPA</span>
+    {% endif %}
 
     <div class="submit-panel">
         <div>