Adapt platform to have 3 rounds (untested)

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

participation/api/serializers.py

@@ -60,6 +60,7 @@ class TournamentSerializer(serializers.ModelSerializer):
         fields = ('id', 'pk', 'name', 'date_start', 'date_end', 'place', 'max_teams', 'price', 'remote',
                   'inscription_limit', 'solution_limit', 'solutions_draw', 'syntheses_first_phase_limit',
                   'solutions_available_second_phase', 'syntheses_second_phase_limit',
+                  'solutions_available_third_phase', 'syntheses_third_phase_limit',
                   'description', 'organizers', 'final', 'participations',)
 
 

participation/api/views.py

@@ -66,6 +66,7 @@ class TournamentViewSet(ModelViewSet):
     filterset_fields = ['name', 'date_start', 'date_end', 'place', 'max_teams', 'price', 'remote',
                         'inscription_limit', 'solution_limit', 'solutions_draw', 'syntheses_first_phase_limit',
                         'solutions_available_second_phase', 'syntheses_second_phase_limit',
+                        'solutions_available_third_phase', 'syntheses_third_phase_limit',
                         'description', 'organizers', 'final', ]
 
 

participation/forms.py

@@ -14,6 +14,7 @@ from django.utils.translation import gettext_lazy as _
 import pandas
 from pypdf import PdfReader
 from registration.models import VolunteerRegistration
+from tfjm import settings
 
 from .models import Note, Participation, Passage, Pool, Solution, Synthesis, Team, Tournament
 
@@ -125,6 +126,12 @@ class ValidateParticipationForm(forms.Form):
 
 
 class TournamentForm(forms.ModelForm):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        if settings.TFJM_APP != "ETEAM":
+            del self.fields['solutions_available_third_phase']
+            del self.fields['syntheses_third_phase_limit']
+
     class Meta:
         model = Tournament
         exclude = ('notes_sheet_id', )
@@ -136,10 +143,10 @@ class TournamentForm(forms.ModelForm):
             'solutions_draw': forms.DateTimeInput(attrs={'type': 'datetime-local'}, format='%Y-%m-%d %H:%M'),
             'syntheses_first_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
                                                                format='%Y-%m-%d %H:%M'),
-            'solutions_available_second_phase': forms.DateTimeInput(attrs={'type': 'datetime-local'},
-                                                                    format='%Y-%m-%d %H:%M'),
             'syntheses_second_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
                                                                 format='%Y-%m-%d %H:%M'),
+            'syntheses_third_phase_limit': forms.DateTimeInput(attrs={'type': 'datetime-local'},
+                                                               format='%Y-%m-%d %H:%M'),
             'organizers': forms.SelectMultiple(attrs={
                 'class': 'selectpicker',
                 'data-live-search': 'true',

participation/migrations/0015_tournament_solutions_available_third_phase_and_more.py

@@ -0,0 +1,42 @@
+# Generated by Django 5.0.6 on 2024-06-07 13:51
+
+import django.utils.timezone
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("participation", "0014_alter_team_trigram"),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name="tournament",
+            name="solutions_available_second_phase",
+        ),
+        migrations.AddField(
+            model_name="tournament",
+            name="solutions_available_second_phase",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="check this case when solutions for the second round become available",
+            ),
+        ),
+        migrations.AddField(
+            model_name="tournament",
+            name="solutions_available_third_phase",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="check this case when solutions for the third round become available",
+            ),
+        ),
+        migrations.AddField(
+            model_name="tournament",
+            name="syntheses_third_phase_limit",
+            field=models.DateTimeField(
+                default=django.utils.timezone.now,
+                verbose_name="limit date to upload the syntheses for the third phase",
+            ),
+        )
+    ]

participation/models.py

@@ -315,9 +315,9 @@ class Tournament(models.Model):
         default=timezone.now,
     )
 
-    solutions_available_second_phase = models.DateTimeField(
-        verbose_name=_("date when the solutions for the second round become available"),
-        default=timezone.now,
+    solutions_available_second_phase = models.BooleanField(
+        verbose_name=_("check this case when solutions for the second round become available"),
+        default=False,
     )
 
     syntheses_second_phase_limit = models.DateTimeField(
@@ -325,6 +325,16 @@ class Tournament(models.Model):
         default=timezone.now,
     )
 
+    solutions_available_third_phase = models.BooleanField(
+        verbose_name=_("check this case when solutions for the third round become available"),
+        default=False,
+    )
+
+    syntheses_third_phase_limit = models.DateTimeField(
+        verbose_name=_("limit date to upload the syntheses for the third phase"),
+        default=timezone.now,
+    )
+
     description = models.TextField(
         verbose_name=_("description"),
         blank=True,
@@ -901,6 +911,49 @@ class Participation(models.Model):
                                              for ext in ["pdf", "tex", "odt", "docx"])
             syntheses_templates_content = f"<p>{_('Templates:')} {syntheses_templates}</p>"
 
+            content = defender_content + opponent_content + reporter_content + syntheses_templates_content
+            informations.append({
+                'title': _("Second round"),
+                'type': "info",
+                'priority': 1,
+                'content': content,
+            })
+        elif settings.TFJM_APP == "ETEAM" \
+                and timezone.now() <= tournament.syntheses_third_phase_limit + timedelta(hours=2):
+            defender_passage = Passage.objects.get(pool__tournament=self.tournament, pool__round=3, defender=self)
+            opponent_passage = Passage.objects.get(pool__tournament=self.tournament, pool__round=3, opponent=self)
+            reporter_passage = Passage.objects.get(pool__tournament=self.tournament, pool__round=3, reporter=self)
+
+            defender_text = _("<p>For the third round, you will defend "
+                              "<a href='{solution_url}'>your solution of the problem {problem}</a>.</p>")
+            draw_url = reverse_lazy("draw:index")
+            solution_url = defender_passage.defended_solution.file.url
+            defender_content = format_lazy(defender_text, draw_url=draw_url,
+                                           solution_url=solution_url, problem=defender_passage.solution_number)
+
+            opponent_text = _("<p>You will oppose the solution of the team {opponent} on the "
+                              "<a href='{solution_url}'>problem {problem}</a>. "
+                              "You can upload your synthesis sheet on <a href='{passage_url}'>this page</a>.</p>")
+            solution_url = opponent_passage.defended_solution.file.url
+            passage_url = reverse_lazy("participation:passage_detail", args=(opponent_passage.pk,))
+            opponent_content = format_lazy(opponent_text, opponent=opponent_passage.defender.team.trigram,
+                                           solution_url=solution_url,
+                                           problem=opponent_passage.solution_number, passage_url=passage_url)
+
+            reporter_text = _("<p>You will report the solution of the team {reporter} on the "
+                              "<a href='{solution_url}'>problem {problem}. "
+                              "You can upload your synthesis sheet on <a href='{passage_url}'>this page</a>.</p>")
+            solution_url = reporter_passage.defended_solution.file.url
+            passage_url = reverse_lazy("participation:passage_detail", args=(reporter_passage.pk,))
+            reporter_content = format_lazy(reporter_text, reporter=reporter_passage.defender.team.trigram,
+                                           solution_url=solution_url,
+                                           problem=reporter_passage.solution_number, passage_url=passage_url)
+
+            syntheses_template_begin = f"{settings.STATIC_URL}Fiche_synthèse."
+            syntheses_templates = " — ".join(f"<a href='{syntheses_template_begin}{ext}'>{ext.upper()}</a>"
+                                             for ext in ["pdf", "tex", "odt", "docx"])
+            syntheses_templates_content = f"<p>{_('Templates:')} {syntheses_templates}</p>"
+
             content = defender_content + opponent_content + reporter_content + syntheses_templates_content
             informations.append({
                 'title': _("Second round"),

participation/templates/participation/tournament_detail.html

@@ -39,12 +39,14 @@
                 <dt class="col-sm-6 text-sm-end">{% trans 'date of maximal syntheses submission for the first round'|capfirst %}</dt>
                 <dd class="col-sm-6">{{ tournament.syntheses_first_phase_limit }}</dd>
 
-                <dt class="col-sm-6 text-sm-end">{% trans 'date when solutions of round 2 are available'|capfirst %}</dt>
-                <dd class="col-sm-6">{{ tournament.solutions_available_second_phase }}</dd>
-
                 <dt class="col-sm-6 text-sm-end">{% trans 'date of maximal syntheses submission for the second round'|capfirst %}</dt>
                 <dd class="col-sm-6">{{ tournament.syntheses_second_phase_limit }}</dd>
 
+                {% if TFJM_APP == "ETEAM" %}
+                    <dt class="col-sm-6 text-sm-end">{% trans 'date of maximal syntheses submission for the third round'|capfirst %}</dt>
+                    <dd class="col-sm-6">{{ tournament.syntheses_third_phase_limit }}</dd>
+                {% endif %}
+
                 <dt class="col-sm-6 text-sm-end">{% trans 'description'|capfirst %}</dt>
                 <dd class="col-sm-6">{{ tournament.description }}</dd>