Add last degree field for coaches

Signed-off-by: Emmy D'Anello <emmy.danello@animath.fr>

locale/fr/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: TFJM\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-18 19:49+0100\n"
+"POT-Creation-Date: 2024-01-20 18:25+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Emmy D'Anello <emmy.danello@animath.fr>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -933,8 +933,8 @@ msgstr "Rejoindre"
 #: participation/templates/participation/update_team.html:12
 #: registration/templates/registration/payment_form.html:49
 #: registration/templates/registration/update_user.html:16
-#: registration/templates/registration/user_detail.html:174
+#: registration/templates/registration/user_detail.html:180
-#: registration/templates/registration/user_detail.html:211
+#: registration/templates/registration/user_detail.html:217
 msgid "Update"
 msgstr "Modifier"
 
@@ -1000,11 +1000,11 @@ msgstr "Envoyer une solution"
 #: registration/templates/registration/upload_parental_authorization.html:17
 #: registration/templates/registration/upload_photo_authorization.html:18
 #: registration/templates/registration/upload_vaccine_sheet.html:13
-#: registration/templates/registration/user_detail.html:184
+#: registration/templates/registration/user_detail.html:190
-#: registration/templates/registration/user_detail.html:189
+#: registration/templates/registration/user_detail.html:195
-#: registration/templates/registration/user_detail.html:194
+#: registration/templates/registration/user_detail.html:200
-#: registration/templates/registration/user_detail.html:199
+#: registration/templates/registration/user_detail.html:205
-#: registration/templates/registration/user_detail.html:204
+#: registration/templates/registration/user_detail.html:210
 msgid "Upload"
 msgstr "Téléverser"
 
@@ -1635,7 +1635,7 @@ msgstr "rôle"
 msgid "participant"
 msgstr "participant⋅e"
 
-#: registration/forms.py:25 registration/models.py:290
+#: registration/forms.py:25 registration/models.py:298
 msgid "coach"
 msgstr "encadrant⋅e"
 
@@ -1660,7 +1660,7 @@ msgstr "email confirmé"
 msgid "Activate your TFJM² account"
 msgstr "Activez votre compte du TFJM²"
 
-#: registration/models.py:95 registration/models.py:343
+#: registration/models.py:95 registration/models.py:351
 msgid "registration"
 msgstr "inscription"
 
@@ -1801,23 +1801,35 @@ msgstr "inscription d'élève"
 msgid "student registrations"
 msgstr "inscriptions d'élève"
 
-#: registration/models.py:285 registration/models.py:307
+#: registration/models.py:287
+msgid "most recent degree in mathematics, computer science or physics"
+msgstr "Dernier diplôme obtenu en mathématiques, informatique ou physique"
+
+#: registration/models.py:288
+msgid ""
+"Your most recent degree in maths, computer science or physics, or your last "
+"entrance exam (CAPES, Agrégation,…)"
+msgstr ""
+"Votre dernier diplôme en mathématiques, informatique ou physique, ou votre "
+"dernier concours obtenu (CAPES, Agrégation, …)"
+
+#: registration/models.py:293 registration/models.py:315
 msgid "professional activity"
 msgstr "activité professionnelle"
 
-#: registration/models.py:298
+#: registration/models.py:306
 msgid "coach registration"
 msgstr "inscription d'encadrant⋅e"
 
-#: registration/models.py:299
+#: registration/models.py:307
 msgid "coach registrations"
 msgstr "inscriptions d'encadrant⋅es"
 
-#: registration/models.py:311
+#: registration/models.py:319
 msgid "administrator"
 msgstr "administrateur⋅rice"
 
-#: registration/models.py:312
+#: registration/models.py:320
 msgid ""
 "An administrator has all rights. Please don't give this right to all juries "
 "and volunteers."
@@ -1825,76 +1837,76 @@ msgstr ""
 "Un⋅e administrateur⋅rice a tous les droits. Merci de ne pas donner ce droit "
 "à toustes les juré⋅es et bénévoles."
 
-#: registration/models.py:322
+#: registration/models.py:330
 msgid "admin"
 msgstr "admin"
 
-#: registration/models.py:322
+#: registration/models.py:330
 msgid "volunteer"
 msgstr "bénévole"
 
-#: registration/models.py:330
+#: registration/models.py:338
 msgid "volunteer registration"
 msgstr "inscription de bénévole"
 
-#: registration/models.py:331
+#: registration/models.py:339
 msgid "volunteer registrations"
 msgstr "inscriptions de bénévoles"
 
-#: registration/models.py:347
+#: registration/models.py:355
 msgid "type"
 msgstr "type"
 
-#: registration/models.py:350
+#: registration/models.py:358
 msgid "No payment"
 msgstr "Pas de paiement"
 
-#: registration/models.py:352
+#: registration/models.py:360
 msgid "Scholarship"
 msgstr "Notification de bourse"
 
-#: registration/models.py:353
+#: registration/models.py:361
 msgid "Bank transfer"
 msgstr "Virement bancaire"
 
-#: registration/models.py:354
+#: registration/models.py:362
 msgid "Other (please indicate)"
 msgstr "Autre (veuillez spécifier)"
 
-#: registration/models.py:355
+#: registration/models.py:363
 msgid "The tournament is free"
 msgstr "Le tournoi est gratuit"
 
-#: registration/models.py:362
+#: registration/models.py:370
 msgid "scholarship file"
 msgstr "Notification de bourse"
 
-#: registration/models.py:363
+#: registration/models.py:371
 msgid "only if you have a scholarship."
 msgstr "Nécessaire seulement si vous déclarez être boursier."
 
-#: registration/models.py:370
+#: registration/models.py:378
 msgid "additional information"
 msgstr "informations additionnelles"
 
-#: registration/models.py:371
+#: registration/models.py:379
 msgid "To help us to find your payment."
 msgstr "Pour nous aider à retrouver votre paiement, si nécessaire."
 
-#: registration/models.py:377
+#: registration/models.py:385
 msgid "payment valid"
 msgstr "paiement valide"
 
-#: registration/models.py:386
+#: registration/models.py:394
 #, python-brace-format
 msgid "Payment of {registration}"
 msgstr "Paiement de {registration}"
 
-#: registration/models.py:389
+#: registration/models.py:397
 msgid "payment"
 msgstr "paiement"
 
-#: registration/models.py:390
+#: registration/models.py:398
 msgid "payments"
 msgstr "paiements"
 
@@ -2227,60 +2239,65 @@ msgid "Responsible email address:"
 msgstr "Adresse e-mail de læ responsable légal⋅e :"
 
 #: registration/templates/registration/user_detail.html:127
-msgid "Profesional activity:"
+msgid "Most recent degree:"
+msgstr "Dernier diplôme obtenu :"
+
+#: registration/templates/registration/user_detail.html:130
+#: registration/templates/registration/user_detail.html:134
+msgid "Professional activity:"
 msgstr "Activité professionnelle :"
 
-#: registration/templates/registration/user_detail.html:131
+#: registration/templates/registration/user_detail.html:137
 msgid "Admin:"
 msgstr "Administrateur⋅rice :"
 
-#: registration/templates/registration/user_detail.html:136
+#: registration/templates/registration/user_detail.html:142
 msgid "Grant Animath to contact me in the future about other actions:"
 msgstr "Autorise Animath à recontacter à propos d'autres actions :"
 
-#: registration/templates/registration/user_detail.html:144
+#: registration/templates/registration/user_detail.html:150
 msgid "Payment information:"
 msgstr "Informations de paiement :"
 
-#: registration/templates/registration/user_detail.html:146
+#: registration/templates/registration/user_detail.html:152
 msgid "yes,no,pending"
 msgstr "oui,non,en attente"
 
-#: registration/templates/registration/user_detail.html:150
+#: registration/templates/registration/user_detail.html:156
-#: registration/templates/registration/user_detail.html:153
+#: registration/templates/registration/user_detail.html:159
 msgid "valid:"
 msgstr "valide :"
 
-#: registration/templates/registration/user_detail.html:157
+#: registration/templates/registration/user_detail.html:163
-#: registration/templates/registration/user_detail.html:210
+#: registration/templates/registration/user_detail.html:216
 msgid "Update payment"
 msgstr "Modifier le paiement"
 
-#: registration/templates/registration/user_detail.html:163
+#: registration/templates/registration/user_detail.html:169
 msgid "Download scholarship attestation"
 msgstr "Télécharger l'attestation de bourse"
 
-#: registration/templates/registration/user_detail.html:176
+#: registration/templates/registration/user_detail.html:182
 msgid "Impersonate"
 msgstr "Impersonifier"
 
-#: registration/templates/registration/user_detail.html:183
+#: registration/templates/registration/user_detail.html:189
 #: registration/views.py:312
 msgid "Upload photo authorization"
 msgstr "Téléverser l'autorisation de droit à l'image"
 
-#: registration/templates/registration/user_detail.html:188
+#: registration/templates/registration/user_detail.html:194
 #: registration/views.py:333
 msgid "Upload health sheet"
 msgstr "Téléverser la fiche sanitaire"
 
-#: registration/templates/registration/user_detail.html:193
+#: registration/templates/registration/user_detail.html:199
 #: registration/views.py:354
 msgid "Upload vaccine sheet"
 msgstr "Téléverser le carnet de vaccination"
 
-#: registration/templates/registration/user_detail.html:198
+#: registration/templates/registration/user_detail.html:204
-#: registration/templates/registration/user_detail.html:203
+#: registration/templates/registration/user_detail.html:209
 #: registration/views.py:375
 msgid "Upload parental authorization"
 msgstr "Téléverser l'autorisation parentale"
@@ -2319,27 +2336,27 @@ msgstr "Détails de l'utilisateur⋅rice {user}"
 msgid "Update user {user}"
 msgstr "Mise à jour de l'utilisateur⋅rice {user}"
 
-#: registration/views.py:481
+#: registration/views.py:487
 #, python-brace-format
 msgid "Photo authorization of {student}.{ext}"
 msgstr "Autorisation de droit à l'image de {student}.{ext}"
 
-#: registration/views.py:504
+#: registration/views.py:510
 #, python-brace-format
 msgid "Health sheet of {student}.{ext}"
 msgstr "Fiche sanitaire de {student}.{ext}"
 
-#: registration/views.py:527
+#: registration/views.py:533
 #, python-brace-format
 msgid "Vaccine sheet of {student}.{ext}"
 msgstr "Carnet de vaccination de {student}.{ext}"
 
-#: registration/views.py:550
+#: registration/views.py:556
 #, python-brace-format
 msgid "Parental authorization of {student}.{ext}"
 msgstr "Autorisation parentale de {student}.{ext}"
 
-#: registration/views.py:572
+#: registration/views.py:578
 #, python-brace-format
 msgid "Scholarship attestation of {user}.{ext}"
 msgstr "Notification de bourse de {user}.{ext}"

registration/forms.py

@@ -206,7 +206,7 @@ class CoachRegistrationForm(forms.ModelForm):
     class Meta:
         model = CoachRegistration
         fields = ('team', 'gender', 'address', 'zip_code', 'city', 'phone_number',
-                  'professional_activity', 'health_issues', 'housing_constraints',
+                  'last_degree', 'professional_activity', 'health_issues', 'housing_constraints',
                   'give_contact_to_animath', 'email_confirmed',)
 
 

registration/migrations/0010_coachregistration_last_degree.py

@@ -0,0 +1,22 @@
+# Generated by Django 5.0.1 on 2024-01-20 17:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("registration", "0009_participantregistration_housing_constraints_and_more"),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name="coachregistration",
+            name="last_degree",
+            field=models.CharField(
+                default="",
+                help_text="Your most recent degree in maths, computer science or physics, or your last entrance exam (CAPES, Agrégation,…)",
+                max_length=255,
+                verbose_name="most recent degree in mathematics, computer science or physics",
+            ),
+        ),
+    ]

registration/models.py

@@ -281,6 +281,14 @@ class CoachRegistration(ParticipantRegistration):
     Specific registration for coaches.
     They have a team and a professional activity.
     """
+    last_degree = models.CharField(
+        max_length=255,
+        default="",
+        verbose_name=_("most recent degree in mathematics, computer science or physics"),
+        help_text=_("Your most recent degree in maths, computer science or physics, "
+                    "or your last entrance exam (CAPES, Agrégation,…)"),
+    )
+
     professional_activity = models.TextField(
         verbose_name=_("professional activity"),
     )

registration/templates/registration/user_detail.html

@@ -123,15 +123,20 @@
                 {% with user_object.registration.responsible_email as email %}
                     <dd class="col-sm-6"><a href="mailto:{{ email }}">{{ email }}</a></dd>
                 {% endwith %}
-            {% elif user_object.registration.coachregistration or user_object.registration.is_volunteer %}
+            {% elif user_object.registration.coachregistration %}
-                <dt class="col-sm-6 text-end">{% trans "Profesional activity:" %}</dt>
+                <dt class="col-sm-6 text-end">{% trans "Most recent degree:" %}</dt>
+                <dd class="col-sm-6">{{ user_object.registration.last_degree }}</dd>
+
+                <dt class="col-sm-6 text-end">{% trans "Professional activity:" %}</dt>
+                <dd class="col-sm-6">{{ user_object.registration.professional_activity }}</dd>
+
+            {% elif user_object.registration.is_volunteer %}
+                <dt class="col-sm-6 text-end">{% trans "Professional activity:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.professional_activity }}</dd>
 
-                {% if user_object.registration.is_volunteer %}
                 <dt class="col-sm-6 text-end">{% trans "Admin:" %}</dt>
                 <dd class="col-sm-6">{{ user_object.registration.is_admin|yesno }}</dd>
             {% endif %}
-            {% endif %}
 
             <dt class="col-sm-6 text-end">{% trans "Grant Animath to contact me in the future about other actions:" %}</dt>
             <dd class="col-sm-6">{{ user_object.registration.give_contact_to_animath|yesno }}</dd>