Add parental and photo authorizations + make health and vaccine sheet and motivation letter optional

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

participation/management/commands/export_results.py

@@ -1,6 +1,7 @@
 # Copyright (C) 2021 by Animath
 # SPDX-License-Identifier: GPL-3.0-or-later
 
+from django.conf import settings
 from django.core.management import BaseCommand
 from django.utils.formats import date_format
 from django.utils.translation import activate
@@ -9,7 +10,7 @@ from participation.models import Tournament
 
 class Command(BaseCommand):
     def handle(self, *args, **kwargs):
-        activate('fr')
+        activate(settings.PREFERRED_LANGUAGE_CODE)
 
         tournaments = Tournament.objects.order_by('-date_start', 'name')
         for tournament in tournaments:

participation/management/commands/export_solutions.py

@@ -11,7 +11,7 @@ from participation.models import Solution, Tournament
 
 class Command(BaseCommand):
     def handle(self, *args, **kwargs):
-        activate('fr')
+        activate(settings.PROBLEMS)
 
         base_dir = Path(__file__).parent.parent.parent.parent
         base_dir /= "output"

participation/management/commands/generate_seconds_sheet.py

@@ -12,7 +12,7 @@ from ...models import Passage, Tournament
 
 class Command(BaseCommand):
     def handle(self, *args, **options):
-        activate('fr')
+        activate(settings.PREFERRED_LANGUAGE_CODE)
         gc = gspread.service_account_from_dict(settings.GOOGLE_SERVICE_CLIENT)
         try:
             spreadsheet = gc.open("Tableau des deuxièmes", folder_id=settings.NOTES_DRIVE_FOLDER_ID)

participation/models.py

@@ -81,12 +81,12 @@ class Team(models.Model):
             return False
         if any(not r.photo_authorization for r in self.participants.all()):
             return False
-        if not self.motivation_letter:
+        if settings.MOTIVATION_LETTER_REQUIRED and not self.motivation_letter:
             return False
         if not self.participation.tournament.remote:
-            if any(r.under_18 and not r.health_sheet for r in self.students.all()):
+            if settings.HEALTH_SHEET_REQUIRED and any(r.under_18 and not r.health_sheet for r in self.students.all()):
                 return False
-            if any(r.under_18 and not r.vaccine_sheet for r in self.students.all()):
+            if settings.VACCINE_SHEET_REQUIRED and any(r.under_18 and not r.vaccine_sheet for r in self.students.all()):
                 return False
             if any(r.under_18 and not r.parental_authorization for r in self.students.all()):
                 return False
@@ -119,7 +119,7 @@ class Team(models.Model):
                     'content': content,
                 })
 
-                if not self.motivation_letter:
+                if settings.MOTIVATION_LETTER_REQUIRED and not self.motivation_letter:
                     text = _("The team {trigram} has not uploaded a motivation letter. "
                              "You can upload your motivation letter using <a href='{url}'>this link</a>.")
                     url = reverse_lazy("participation:upload_team_motivation_letter", args=(self.pk,))
@@ -458,7 +458,7 @@ class Tournament(models.Model):
         self.save()
 
     def update_ranking_spreadsheet(self):  # noqa: C901
-        translation.activate('fr')
+        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
 
         gc = gspread.service_account_from_dict(settings.GOOGLE_SERVICE_CLIENT)
         spreadsheet = gc.open_by_key(self.notes_sheet_id)
@@ -1101,7 +1101,7 @@ class Pool(models.Model):
         return super().validate_constraints()
 
     def update_spreadsheet(self):  # noqa: C901
-        translation.activate('fr')
+        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
 
         # Create tournament sheet if it does not exist
         self.tournament.create_spreadsheet()
@@ -1446,7 +1446,7 @@ class Pool(models.Model):
         worksheet.client.batch_update(spreadsheet.id, body)
 
     def update_juries_lines_spreadsheet(self):
-        translation.activate('fr')
+        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
 
         gc = gspread.service_account_from_dict(settings.GOOGLE_SERVICE_CLIENT)
         spreadsheet = gc.open_by_key(self.tournament.notes_sheet_id)
@@ -1467,7 +1467,7 @@ class Pool(models.Model):
                 max_row += 1
 
     def parse_spreadsheet(self):
-        translation.activate('fr')
+        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
 
         gc = gspread.service_account_from_dict(settings.GOOGLE_SERVICE_CLIENT)
         self.tournament.create_spreadsheet()
@@ -1837,7 +1837,7 @@ class Note(models.Model):
         if not self.has_any_note():
             return
 
-        translation.activate('fr')
+        translation.activate(settings.PREFERRED_LANGUAGE_CODE)
 
         gc = gspread.service_account_from_dict(settings.GOOGLE_SERVICE_CLIENT)
         passage = Passage.objects.prefetch_related('pool__tournament', 'pool__participations').get(pk=self.passage.pk)

participation/templates/participation/team_detail.html

@@ -73,32 +73,36 @@
                 </dd>
             {% endif %}
 
-            {% if not team.participation.tournament.remote  %}
-                <dt class="col-sm-6 text-sm-end">{% trans "Health sheets:" %}</dt>
-                <dd class="col-sm-6">
-                    {% for student in team.students.all %}
-                        {% if student.under_18 %}
-                            {% if student.health_sheet %}
-                                <a href="{{ student.health_sheet.url }}">{{ student }}</a>{% if not forloop.last %},{% endif %}
-                            {% else %}
-                                {{ student }} ({% trans "Not uploaded yet" %}){% if not forloop.last %},{% endif %}
+            {% if not team.participation.tournament.remote %}
+                {% if TFJM.HEALTH_SHEET_REQUIRED %}
+                    <dt class="col-sm-6 text-sm-end">{% trans "Health sheets:" %}</dt>
+                    <dd class="col-sm-6">
+                        {% for student in team.students.all %}
+                            {% if student.under_18 %}
+                                {% if student.health_sheet %}
+                                    <a href="{{ student.health_sheet.url }}">{{ student }}</a>{% if not forloop.last %},{% endif %}
+                                {% else %}
+                                    {{ student }} ({% trans "Not uploaded yet" %}){% if not forloop.last %},{% endif %}
+                                {% endif %}
                             {% endif %}
-                        {% endif %}
-                    {% endfor %}
-                </dd>
+                        {% endfor %}
+                    </dd>
+                {% endif %}
 
-                <dt class="col-sm-6 text-sm-end">{% trans "Vaccine sheets:" %}</dt>
-                <dd class="col-sm-6">
-                    {% for student in team.students.all %}
-                        {% if student.under_18 %}
-                            {% if student.vaccine_sheet %}
-                                <a href="{{ student.vaccine_sheet.url }}">{{ student }}</a>{% if not forloop.last %},{% endif %}
-                            {% else %}
-                                {{ student }} ({% trans "Not uploaded yet" %}){% if not forloop.last %},{% endif %}
+                {% if TFJM.VACCINE_SHEET_REQUIRED %}
+                    <dt class="col-sm-6 text-sm-end">{% trans "Vaccine sheets:" %}</dt>
+                    <dd class="col-sm-6">
+                        {% for student in team.students.all %}
+                            {% if student.under_18 %}
+                                {% if student.vaccine_sheet %}
+                                    <a href="{{ student.vaccine_sheet.url }}">{{ student }}</a>{% if not forloop.last %},{% endif %}
+                                {% else %}
+                                    {{ student }} ({% trans "Not uploaded yet" %}){% if not forloop.last %},{% endif %}
+                                {% endif %}
                             {% endif %}
-                        {% endif %}
-                    {% endfor %}
-                </dd>
+                        {% endfor %}
+                    </dd>
+                {% endif %}
 
                 <dt class="col-sm-6 text-sm-end">{% trans "Parental authorizations:" %}</dt>
                 <dd class="col-sm-6">
@@ -129,17 +133,19 @@
                 {% endif %}
             {% endif %}
 
-            <dt class="col-sm-6 text-sm-end">{% trans "Motivation letter:" %}</dt>
-            <dd class="col-sm-6">
-                {% if team.motivation_letter %}
-                    <a href="{{ team.motivation_letter.url }}">{% trans "Download" %}</a>
-                {% else %}
-                    <em>{% trans "Not uploaded yet" %}</em>
-                {% endif %}
-                {% if user.registration.team == team and not user.registration.team.participation.valid or user.registration.is_admin %}
-                    <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadMotivationLetterModal">{% trans "Replace" %}</button>
-                {% endif %}
-            </dd>
+            {% if TFJM.MOTIVATION_LETTER_REQUIRED %}
+                <dt class="col-sm-6 text-sm-end">{% trans "Motivation letter:" %}</dt>
+                <dd class="col-sm-6">
+                    {% if team.motivation_letter %}
+                        <a href="{{ team.motivation_letter.url }}">{% trans "Download" %}</a>
+                    {% else %}
+                        <em>{% trans "Not uploaded yet" %}</em>
+                    {% endif %}
+                    {% if user.registration.team == team and not user.registration.team.participation.valid or user.registration.is_admin %}
+                        <button class="btn btn-primary" data-bs-toggle="modal" data-bs-target="#uploadMotivationLetterModal">{% trans "Replace" %}</button>
+                    {% endif %}
+                </dd>
+            {% endif %}
 
         {% if user.registration.is_volunteer %}
             {% if user.registration in self.team.participation.tournament.organizers or user.registration.is_admin %}
@@ -234,10 +240,12 @@
         {% endif %}
     {% endif %}
 
-    {% trans "Upload motivation letter" as modal_title %}
-    {% trans "Upload" as modal_button %}
-    {% url "participation:upload_team_motivation_letter" pk=team.pk as modal_action %}
-    {% include "base_modal.html" with modal_id="uploadMotivationLetter" modal_enctype="multipart/form-data" %}
+    {% if TFJM.MOTIVATION_LETTER_REQUIRED %}
+        {% trans "Upload motivation letter" as modal_title %}
+        {% trans "Upload" as modal_button %}
+        {% url "participation:upload_team_motivation_letter" pk=team.pk as modal_action %}
+        {% include "base_modal.html" with modal_id="uploadMotivationLetter" modal_enctype="multipart/form-data" %}
+    {% endif %}
 
     {% trans "Update team" as modal_title %}
     {% trans "Update" as modal_button %}
@@ -253,7 +261,9 @@
 {% block extrajavascript %}
     <script>
         document.addEventListener('DOMContentLoaded', () => {
-            initModal("uploadMotivationLetter", "{% url "participation:upload_team_motivation_letter" pk=team.pk %}")
+            {% if TFJM.MOTIVATION_LETTER_REQUIRED %}
+              initModal("uploadMotivationLetter", "{% url "participation:upload_team_motivation_letter" pk=team.pk %}")
+            {% endif %}
             initModal("updateTeam", "{% url "participation:update_team" pk=team.pk %}")
             initModal("leaveTeam", "{% url "participation:team_leave" %}")
         })