Questions can be seen during the third phase

LICENSE

@@ -632,7 +632,7 @@ state the exclusion of warranty; and each file should have at least
 the "copyright" line and a pointer to where the full notice is found.
 
     <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
+    Copyright (C) 2020  Animath
 
     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
@@ -652,7 +652,7 @@ Also add information on how to contact you by electronic and paper mail.
   If the program does terminal interaction, make it output a short
 notice like this when it starts in an interactive mode:
 
-    <program>  Copyright (C) <year>  <name of author>
+    <program>  Copyright (C) 2020  Animath
     This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
     This is free software, and you are welcome to redistribute it
     under certain conditions; type `show c' for details.

apps/api/__init__.py

@@ -1 +1,4 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 default_app_config = 'api.apps.APIConfig'

apps/api/apps.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.apps import AppConfig
 from django.utils.translation import gettext_lazy as _
 

apps/api/serializers.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.contrib.auth.models import User
 from rest_framework import serializers
 

apps/api/tests.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from unittest.case import skipIf
 
 from django.conf import settings

apps/api/urls.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.conf import settings
 from django.conf.urls import include, url
 from rest_framework import routers

apps/api/viewsets.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.contrib.auth.models import User
 from django_filters.rest_framework import DjangoFilterBackend
 from rest_framework.filters import SearchFilter

apps/eastereggs/__init__.py

@@ -1 +1,4 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 default_app_config = 'eastereggs.apps.EastereggsConfig'

apps/eastereggs/apps.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.apps import AppConfig
 
 

apps/eastereggs/migrations/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later

apps/eastereggs/urls.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.urls import path
 from django.views.generic import TemplateView
 

apps/logs/api/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2018-2020 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later

apps/logs/migrations/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2020 by BDE ENS Paris-Saclay
+# SPDX-License-Identifier: GPL-3.0-or-later

apps/participation/__init__.py

@@ -1 +1,4 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 default_app_config = 'participation.apps.ParticipationConfig'

apps/participation/admin.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.contrib import admin
 from django.utils.translation import gettext_lazy as _
 

apps/participation/apps.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.apps import AppConfig
 from django.db.models.signals import post_save, pre_delete, pre_save
 

apps/participation/forms.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 import re
 
 from bootstrap_datepicker_plus import DateTimePickerInput

apps/participation/management/commands/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later

apps/participation/management/commands/fix_matrix_channels.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 import os
 
 from asgiref.sync import async_to_sync

apps/participation/management/commands/fix_sympa_lists.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from corres2math.lists import get_sympa_client
 from django.core.management import BaseCommand
 from django.db.models import Q
@@ -35,6 +38,6 @@ class Command(BaseCommand):
             sympa.subscribe(team.email, "equipes-non-valides", f"Equipe {team.name}", True)
 
         for student in StudentRegistration.objects.filter(team__isnull=False).all():
-            sympa.subscribe(student.user.email, f"equipe-{student.team.trigram.lower}", True, f"{student}")
+            sympa.subscribe(student.user.email, f"equipe-{student.team.trigram.lower()}", True, f"{student}")
         for coach in CoachRegistration.objects.filter(team__isnull=False).all():
-            sympa.subscribe(coach.user.email, f"equipe-{coach.team.trigram.lower}", True, f"{coach}")
+            sympa.subscribe(coach.user.email, f"equipe-{coach.team.trigram.lower()}", True, f"{coach}")

apps/participation/management/commands/setup_third_phase.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from corres2math.matrix import Matrix, RoomVisibility
 from django.core.management import BaseCommand
 from participation.models import Participation

apps/participation/migrations/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later

apps/participation/models.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 import os
 import re
 
@@ -285,7 +288,7 @@ class Phase(models.Model):
     )
 
     @classmethod
-    def current_phase(cls):
+    def current_phase(cls) -> "Phase":
         """
         Retrieve the current phase of this day
         """

apps/participation/search_indexes.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from haystack import indexes
 
 from .models import Participation, Team, Video

apps/participation/signals.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from corres2math.lists import get_sympa_client
 from participation.models import Participation, Team, Video
 

apps/participation/tables.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.utils import timezone
 from django.utils.translation import gettext_lazy as _
 import django_tables2 as tables
@@ -39,6 +42,9 @@ class TeamTable(tables.Table):
         attrs = {
             'class': 'table table condensed table-striped',
         }
+        row_attrs = {
+            'class': lambda record: '' if record.participation.solution.link else 'bg-warning',
+        }
         model = Team
         fields = ('name', 'trigram', 'problem',)
         template_name = 'django_tables2/bootstrap4.html'

apps/participation/templates/participation/participation_detail.html

@@ -194,13 +194,14 @@
         {% trans "This video platform is not supported yet." as unsupported_platform %}
         {% include "base_modal.html" with modal_id="displayOtherSolution" modal_action="" modal_button="" modal_additional_class="modal-lg" modal_content=participation.received_participation.solution.as_iframe|default:unsupported_platform %}
     {% endif %}
-{% endif %}
 
-{% if user.registration.participates and current_phase.phase_number == 2 %}
+    {% if current_phase.phase_number == 2 %}
         {% trans "Add question" as modal_title %}
         {% trans "Add" as modal_button %}
         {% url "participation:add_question" pk=participation.pk as modal_action %}
         {% include "base_modal.html" with modal_id="addQuestion" modal_button_type="success" %}
+    {% endif %}
+
     {% for question in participation.questions.all %}
         {% with number_str=forloop.counter|stringformat:"d"%}
             {% with modal_id="updateQuestion"|add:number_str %}
@@ -260,12 +261,13 @@
                 });
             {% endif %}
 
-            {% if user.registration.participates and current_phase.phase_number == 2 %}
+            {% if current_phase.phase_number == 2 %}
                 $('button[data-target="#addQuestionModal"]').click(function() {
                     let modalBody = $("#addQuestionModal div.modal-body");
                     if (!modalBody.html().trim())
                         modalBody.load("{% url "participation:add_question" pk=participation.pk %} #form-content");
                 });
+            {% endif %}
 
             {% for question in participation.questions.all %}
                 $('button[data-target="#updateQuestion{{ forloop.counter }}Modal"]').click(function() {
@@ -274,13 +276,14 @@
                         modalBody.load("{% url "participation:update_question" pk=question.pk %} #form-content");
                 });
 
+                {% if current_phase.phase_number == 2 %}
                     $('button[data-target="#deleteQuestion{{ forloop.counter }}Modal"]').click(function() {
                         let modalBody = $("#deleteQuestion{{ forloop.counter }}Modal div.modal-body");
                         if (!modalBody.html().trim())
                             modalBody.load("{% url "participation:delete_question" pk=question.pk %} #form-content");
                     });
-                {% endfor %}
                 {% endif %}
+            {% endfor %}
 
             $('button[data-target="#uploadSolutionModal"]').click(function() {
                 let modalBody = $("#uploadSolutionModal div.modal-body");

apps/participation/templatetags/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later

apps/participation/templatetags/calendar.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django import template
 
 from ..models import Phase

apps/participation/tests.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from datetime import timedelta
 
 from django.contrib.auth.models import User

apps/participation/urls.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.urls import path
 from django.views.generic import TemplateView
 

apps/participation/views.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from io import BytesIO
 from zipfile import ZipFile
 
@@ -474,6 +477,12 @@ class UpdateQuestionView(LoginRequiredMixin, UpdateView):
             return super().dispatch(request, *args, **kwargs)
         raise PermissionDenied
 
+    def form_valid(self, form):
+        if not self.request.user.registration.is_admin and Phase.current_phase().phase_number != 2:
+            form.add_error(None, _("You can update your questions now."))
+            return self.form_invalid(form)
+        return super().form_valid(form)
+
     def get_success_url(self):
         return reverse_lazy("participation:participation_detail", args=(self.object.participation.pk,))
 
@@ -496,6 +505,11 @@ class DeleteQuestionView(LoginRequiredMixin, DeleteView):
             return super().dispatch(request, *args, **kwargs)
         raise PermissionDenied
 
+    def delete(self, request, *args, **kwargs):
+        if not request.user.registration.is_admin and Phase.current_phase().phase_number != 2:
+            raise PermissionDenied(_("You can update your questions now."))
+        return super().delete(request, *args, **kwargs)
+
     def get_success_url(self):
         return reverse_lazy("participation:participation_detail", args=(self.object.participation.pk,))
 

apps/registration/__init__.py

@@ -1 +1,4 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 default_app_config = 'registration.apps.RegistrationConfig'

apps/registration/admin.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.contrib import admin
 from polymorphic.admin import PolymorphicChildModelAdmin, PolymorphicParentModelAdmin
 

apps/registration/apps.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.apps import AppConfig
 from django.db.models.signals import post_save, pre_save
 

apps/registration/auth.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from cas_server.auth import DjangoAuthUser  # pragma: no cover
 
 

apps/registration/forms.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django import forms
 from django.contrib.auth.forms import UserCreationForm
 from django.contrib.auth.models import User

apps/registration/migrations/0001_initial.py

@@ -50,7 +50,7 @@ class Migration(migrations.Migration):
                 ('student_class', models.IntegerField(choices=[(12, '12th grade'), (11, '11th grade'), (10, '10th grade or lower')], verbose_name='student class')),
                 ('school', models.CharField(max_length=255, verbose_name='school')),
                 ('photo_authorization', models.FileField(blank=True, default='', upload_to=registration.models.get_random_filename, verbose_name='photo authorization')),
-                ('team', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='students', to='participation.team', verbose_name='team')),
+                ('team', models.ForeignKey(default=None, blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='students', to='participation.team', verbose_name='team')),
             ],
             options={
                 'verbose_name': 'student registration',
@@ -63,7 +63,7 @@ class Migration(migrations.Migration):
             fields=[
                 ('registration_ptr', models.OneToOneField(auto_created=True, on_delete=django.db.models.deletion.CASCADE, parent_link=True, primary_key=True, serialize=False, to='registration.registration')),
                 ('professional_activity', models.TextField(verbose_name='professional activity')),
-                ('team', models.ForeignKey(default=None, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='coachs', to='participation.team', verbose_name='team')),
+                ('team', models.ForeignKey(default=None, blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='coachs', to='participation.team', verbose_name='team')),
             ],
             options={
                 'verbose_name': 'coach registration',

apps/registration/migrations/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later

apps/registration/models.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from corres2math.tokens import email_validation_token
 from django.contrib.sites.models import Site
 from django.db import models
@@ -102,6 +105,7 @@ class StudentRegistration(Registration):
         related_name="students",
         on_delete=models.PROTECT,
         null=True,
+        blank=True,
         default=None,
         verbose_name=_("team"),
     )
@@ -151,6 +155,7 @@ class CoachRegistration(Registration):
         related_name="coachs",
         on_delete=models.PROTECT,
         null=True,
+        blank=True,
         default=None,
         verbose_name=_("team"),
     )

apps/registration/search_indexes.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from haystack import indexes
 
 from .models import Registration

apps/registration/signals.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from corres2math.lists import get_sympa_client
 from corres2math.matrix import Matrix
 from django.contrib.auth.models import User

apps/registration/tables.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.utils.translation import gettext_lazy as _
 import django_tables2 as tables
 

apps/registration/templatetags/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later

apps/registration/templatetags/search_results_tables.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django import template
 from django_tables2 import Table
 from participation.models import Participation, Team, Video

apps/registration/tests.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from datetime import timedelta
 import os
 

apps/registration/urls.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.urls import path
 
 from .views import MyAccountDetailView, ResetAdminView, SignupView, UserDetailView, UserImpersonateView, \

apps/registration/views.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 import os
 
 from corres2math.tokens import email_validation_token
@@ -210,7 +213,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
         context["title"] = _("Update user {user}").format(user=str(self.object.registration))
         context["registration_form"] = user.registration.form_class(data=self.request.POST or None,
                                                                     instance=self.object.registration)
-        if not user.registration.is_admin:
+        if not self.request.user.registration.is_admin:
             if "team" in context["registration_form"].fields:
                 del context["registration_form"].fields["team"]
             del context["registration_form"].fields["email_confirmed"]
@@ -221,7 +224,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
         user = form.instance
         registration_form = user.registration.form_class(data=self.request.POST or None,
                                                          instance=self.object.registration)
-        if not user.registration.is_admin:
+        if not self.request.user.registration.is_admin:
             if "team" in registration_form.fields:
                 del registration_form.fields["team"]
             del registration_form.fields["email_confirmed"]

corres2math/__init__.py

@@ -0,0 +1,2 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later

corres2math/asgi.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 """
 ASGI config for corres2math project.
 

corres2math/lists.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 import os
 
 _client = None

corres2math/matrix.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from enum import Enum
 import os
 

corres2math/middlewares.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from threading import local
 
 from django.conf import settings

corres2math/settings.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 """
 Django settings for corres2math project.
 

corres2math/settings_dev.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 # Database
 # https://docs.djangoproject.com/en/3.0/ref/settings/#databases
 

corres2math/settings_prod.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 import os
 
 # Break it, fix it!

corres2math/tests.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 import os
 
 from django.core.handlers.asgi import ASGIHandler

corres2math/tokens.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.contrib.auth.tokens import PasswordResetTokenGenerator
 
 

corres2math/urls.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 """corres2math URL Configuration
 
 The `urlpatterns` list routes URLs to views. For more information please see:

corres2math/views.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core.exceptions import PermissionDenied
 from haystack.generic_views import SearchView

corres2math/wsgi.py

@@ -1,3 +1,6 @@
+# Copyright (C) 2020 by Animath
+# SPDX-License-Identifier: GPL-3.0-or-later
+
 """
 WSGI config for corres2math project.