From 7ef602c6cd2816a3bba84c05be8605581612f199 Mon Sep 17 00:00:00 2001 From: Yohann D'ANELLO Date: Mon, 28 Dec 2020 18:52:50 +0100 Subject: [PATCH] Drop a lot of Corres2math content --- .gitignore | 2 + apps/participation/admin.py | 44 +-- apps/participation/apps.py | 3 +- apps/participation/forms.py | 115 +------ .../management/commands/setup_third_phase.py | 44 --- apps/participation/migrations/0001_initial.py | 138 -------- apps/participation/models.py | 39 +-- apps/participation/search_indexes.py | 12 +- apps/participation/signals.py | 12 +- apps/participation/tables.py | 20 +- .../participation/participation_detail.html | 282 ---------------- .../templates/participation/team_detail.html | 3 - apps/participation/templatetags/__init__.py | 2 - apps/participation/templatetags/calendar.py | 15 - apps/participation/tests.py | 308 +----------------- apps/participation/urls.py | 17 +- apps/participation/views.py | 157 +-------- apps/registration/migrations/0001_initial.py | 74 ----- apps/registration/models.py | 4 +- .../templatetags/search_results_tables.py | 4 +- apps/registration/tests.py | 17 +- apps/registration/views.py | 10 - ...{Fiche synthèse.pdf => Fiche_synthèse.pdf} | Bin ...{Fiche synthèse.tex => Fiche_synthèse.tex} | 0 tfjm/templates/base.html | 25 +- tfjm/views.py | 2 - tfjm/whoosh_index/MAIN_3c7ed6y4sljdfo5s.seg | Bin 201663 -> 0 bytes tfjm/whoosh_index/_MAIN_11.toc | Bin 3787 -> 0 bytes 28 files changed, 63 insertions(+), 1286 deletions(-) delete mode 100644 apps/participation/management/commands/setup_third_phase.py delete mode 100644 apps/participation/migrations/0001_initial.py delete mode 100644 apps/participation/templatetags/__init__.py delete mode 100644 apps/participation/templatetags/calendar.py delete mode 100644 apps/registration/migrations/0001_initial.py rename tfjm/static/{Fiche synthèse.pdf => Fiche_synthèse.pdf} (100%) rename tfjm/static/{Fiche synthèse.tex => Fiche_synthèse.tex} (100%) delete mode 100644 tfjm/whoosh_index/MAIN_3c7ed6y4sljdfo5s.seg delete mode 100644 tfjm/whoosh_index/_MAIN_11.toc diff --git a/.gitignore b/.gitignore index 1299f3e..61d9bad 100644 --- a/.gitignore +++ b/.gitignore @@ -42,3 +42,5 @@ db.sqlite3 # Don't git index whoosh_index/ + +migrations/ diff --git a/apps/participation/admin.py b/apps/participation/admin.py index 25bbdcc..acef641 100644 --- a/apps/participation/admin.py +++ b/apps/participation/admin.py @@ -4,19 +4,14 @@ from django.contrib import admin from django.utils.translation import gettext_lazy as _ -from .models import Participation, Phase, Question, Team, Video +from .models import Participation, Pool, Solution, Synthesis, Team, Tournament @admin.register(Team) class TeamAdmin(admin.ModelAdmin): - list_display = ('name', 'trigram', 'problem', 'valid',) + list_display = ('name', 'trigram', 'valid',) search_fields = ('name', 'trigram',) - list_filter = ('participation__problem', 'participation__valid',) - - def problem(self, team): - return team.participation.get_problem_display() - - problem.short_description = _('problem number') + list_filter = ('participation__valid',) def valid(self, team): return team.participation.valid @@ -26,24 +21,29 @@ class TeamAdmin(admin.ModelAdmin): @admin.register(Participation) class ParticipationAdmin(admin.ModelAdmin): - list_display = ('team', 'problem', 'valid',) + list_display = ('team', 'valid',) search_fields = ('team__name', 'team__trigram',) - list_filter = ('problem', 'valid',) + list_filter = ('valid',) -@admin.register(Video) -class VideoAdmin(admin.ModelAdmin): - list_display = ('participation', 'link',) - search_fields = ('participation__team__name', 'participation__team__trigram', 'link',) +@admin.register(Pool) +class PoolAdmin(admin.ModelAdmin): + search_fields = ('participations__team__name', 'participations__team__trigram',) -@admin.register(Question) -class QuestionAdmin(admin.ModelAdmin): - list_display = ('participation', 'question',) - search_fields = ('participation__team__name', 'participation__team__trigram', 'question',) +@admin.register(Solution) +class SolutionAdmin(admin.ModelAdmin): + list_display = ('participation',) + search_fields = ('participation__team__name', 'participation__team__trigram',) -@admin.register(Phase) -class PhaseAdmin(admin.ModelAdmin): - list_display = ('phase_number', 'start', 'end',) - ordering = ('phase_number', 'start',) +@admin.register(Synthesis) +class SynthesisAdmin(admin.ModelAdmin): + list_display = ('participation',) + search_fields = ('participation__team__name', 'participation__team__trigram',) + + +@admin.register(Tournament) +class TournamentAdmin(admin.ModelAdmin): + list_display = ('name',) + search_fields = ('name',) diff --git a/apps/participation/apps.py b/apps/participation/apps.py index e76d270..bb84d56 100644 --- a/apps/participation/apps.py +++ b/apps/participation/apps.py @@ -12,7 +12,6 @@ class ParticipationConfig(AppConfig): name = 'participation' def ready(self): - from participation.signals import create_team_participation, delete_related_videos, update_mailing_list + from participation.signals import create_team_participation, update_mailing_list pre_save.connect(update_mailing_list, "participation.Team") - pre_delete.connect(delete_related_videos, "participation.Participation") post_save.connect(create_team_participation, "participation.Team") diff --git a/apps/participation/forms.py b/apps/participation/forms.py index 6ec054f..7d17e5f 100644 --- a/apps/participation/forms.py +++ b/apps/participation/forms.py @@ -3,13 +3,11 @@ import re -from bootstrap_datepicker_plus import DateTimePickerInput from django import forms -from django.core.exceptions import ObjectDoesNotExist, ValidationError -from django.db.models import Q +from django.core.exceptions import ValidationError from django.utils.translation import gettext_lazy as _ -from .models import Participation, Phase, Question, Team, Video +from .models import Participation, Team class TeamForm(forms.ModelForm): @@ -25,7 +23,7 @@ class TeamForm(forms.ModelForm): class Meta: model = Team - fields = ('name', 'trigram', 'grant_animath_access_videos',) + fields = ('name', 'trigram',) class JoinTeamForm(forms.ModelForm): @@ -56,7 +54,7 @@ class ParticipationForm(forms.ModelForm): """ class Meta: model = Participation - fields = ('problem',) + fields = ('tournament',) class RequestValidationForm(forms.Form): @@ -87,108 +85,3 @@ class ValidateParticipationForm(forms.Form): label=_("Message to address to the team:"), widget=forms.Textarea(), ) - - -class UploadVideoForm(forms.ModelForm): - """ - Form to upload a video, for a solution or a synthesis. - """ - class Meta: - model = Video - fields = ('link',) - - def clean(self): - if Phase.current_phase().phase_number != 1 and Phase.current_phase().phase_number != 4 and self.instance.link: - self.add_error("link", _("You can't upload your video after the deadline.")) - return super().clean() - - -class ReceiveParticipationForm(forms.ModelForm): - """ - Update the received participation of a participation. - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.fields["received_participation"].queryset = Participation.objects.filter( - ~Q(pk=self.instance.pk) & Q(problem=self.instance.problem, valid=True) - ) - - class Meta: - model = Participation - fields = ('received_participation',) - - -class SendParticipationForm(forms.ModelForm): - """ - Update the sent participation of a participation. - """ - sent_participation = forms.ModelChoiceField( - queryset=Participation.objects, - label=lambda: _("Send to team"), - ) - - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - try: - self.fields["sent_participation"].initial = self.instance.sent_participation - except ObjectDoesNotExist: # No sent participation - pass - self.fields["sent_participation"].queryset = Participation.objects.filter( - ~Q(pk=self.instance.pk) & Q(problem=self.instance.problem, valid=True) - ) - - def clean(self, commit=True): - cleaned_data = super().clean() - if "sent_participation" in cleaned_data: - participation = cleaned_data["sent_participation"] - participation.received_participation = self.instance - self.instance = participation - return cleaned_data - - class Meta: - model = Participation - fields = ('sent_participation',) - - -class QuestionForm(forms.ModelForm): - """ - Create or update a question. - """ - def __init__(self, *args, **kwargs): - super().__init__(*args, **kwargs) - self.fields["question"].widget.attrs.update({"placeholder": _("How did you get the idea to ...?")}) - - def clean(self): - if Phase.current_phase().phase_number != 2: - self.add_error(None, _("You can only create or update a question during the second phase.")) - return super().clean() - - class Meta: - model = Question - fields = ('question',) - - -class PhaseForm(forms.ModelForm): - """ - Form to update the calendar of a phase. - """ - class Meta: - model = Phase - fields = ('start', 'end',) - widgets = { - 'start': DateTimePickerInput(format='%d/%m/%Y %H:%M'), - 'end': DateTimePickerInput(format='%d/%m/%Y %H:%M'), - } - - def clean(self): - # Ensure that dates are in a right order - cleaned_data = super().clean() - start = cleaned_data["start"] - end = cleaned_data["end"] - if end <= start: - self.add_error("end", _("Start date must be before the end date.")) - if Phase.objects.filter(phase_number__lt=self.instance.phase_number, end__gt=start).exists(): - self.add_error("start", _("This phase must start after the previous phases.")) - if Phase.objects.filter(phase_number__gt=self.instance.phase_number, start__lt=end).exists(): - self.add_error("end", _("This phase must end after the next phases.")) - return cleaned_data diff --git a/apps/participation/management/commands/setup_third_phase.py b/apps/participation/management/commands/setup_third_phase.py deleted file mode 100644 index c0e1f8b..0000000 --- a/apps/participation/management/commands/setup_third_phase.py +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (C) 2020 by Animath -# SPDX-License-Identifier: GPL-3.0-or-later - -from tfjm.matrix import Matrix, RoomVisibility -from django.core.management import BaseCommand -from participation.models import Participation - - -class Command(BaseCommand): - def handle(self, *args, **options): - for participation in Participation.objects.filter(valid=True).all(): - for i, question in enumerate(participation.questions.order_by("id").all()): - solution_author = participation.received_participation.team - alias = f"equipe-{solution_author.trigram.lower()}-question-{i}" - room_id = f"#{alias}:tfjm.org" - Matrix.create_room( - visibility=RoomVisibility.public, - alias=alias, - name=f"Solution équipe {solution_author.trigram} - question {i+1}", - topic=f"Échange entre l'équipe {solution_author.name} ({solution_author.trigram}) " - f"et l'équipe {participation.team.name} ({participation.team.trigram}) " - f"autour de la question {i+1} sur le problème {participation.problem}", - federate=False, - invite=[f"@{registration.matrix_username}:tfjm.org" for registration in - list(participation.team.students.all()) + list(participation.team.coachs.all()) + - list(solution_author.students.all()) + list(solution_author.coachs.all())], - ) - Matrix.set_room_power_level_event(room_id, "events_default", 21) - for registration in solution_author.students.all(): - Matrix.set_room_power_level(room_id, - f"@{registration.matrix_username}:tfjm.org", 42) - - Matrix.send_message(room_id, "Bienvenue dans la troisième phase du TFJM² !") - Matrix.send_message(room_id, f"L'équipe {participation.team.name} a visionné la vidéo de l'équipe " - f"{solution_author.name} sur le problème {participation.problem}, et a posé " - "une série de questions.") - Matrix.send_message(room_id, "L'équipe ayant composé la vidéo doit maintenant proposer une réponse.") - Matrix.send_message(room_id, "Une fois la réponse apportée, vous pourrez ensuite échanger plus " - "librement autour de la question, au travers de ce canal.") - Matrix.send_message(room_id, "**Question posée :**", formatted_body="Question posée :") - Matrix.send_message(room_id, question.question, - formatted_body=f"{question.question}") - - # TODO Setup the bot the set the power level of all members of the room to 42 diff --git a/apps/participation/migrations/0001_initial.py b/apps/participation/migrations/0001_initial.py deleted file mode 100644 index 903bf86..0000000 --- a/apps/participation/migrations/0001_initial.py +++ /dev/null @@ -1,138 +0,0 @@ -# Generated by Django 3.1.3 on 2020-11-04 12:05 - -import django.core.validators -from django.db import migrations, models -import django.utils.timezone - - -def register_phases(apps, _): - """ - Import the different phases of the action - """ - Phase = apps.get_model("participation", "phase") - Phase.objects.get_or_create( - phase_number=1, - description="Soumission des vidéos", - ) - Phase.objects.get_or_create( - phase_number=2, - description="Phase de questions", - ) - Phase.objects.get_or_create( - phase_number=3, - description="Phase d'échanges entre les équipes", - ) - Phase.objects.get_or_create( - phase_number=4, - description="Synthèse de l'échange", - ) - - -def reverse_phase_registering(apps, _): # pragma: no cover - """ - Drop all phases in order to unapply this migration. - """ - Phase = apps.get_model("participation", "phase") - Phase.objects.all().delete() - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - ] - - operations = [ - migrations.CreateModel( - name='Participation', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('problem', models.IntegerField(choices=[(1, 'Problem #1'), (2, 'Problem #2'), (3, 'Problem #3')], default=None, null=True, verbose_name='problem number')), - ('valid', models.BooleanField(default=None, help_text='The video got the validation of the administrators.', null=True, verbose_name='valid')), - ], - options={ - 'verbose_name': 'participation', - 'verbose_name_plural': 'participations', - }, - ), - migrations.CreateModel( - name='Phase', - fields=[ - ('phase_number', models.AutoField(primary_key=True, serialize=False, unique=True, verbose_name='phase number')), - ('description', models.CharField(max_length=255, verbose_name='phase description')), - ('start', models.DateTimeField(default=django.utils.timezone.now, verbose_name='start date of the given phase')), - ('end', models.DateTimeField(default=django.utils.timezone.now, verbose_name='end date of the given phase')), - ], - options={ - 'verbose_name': 'phase', - 'verbose_name_plural': 'phases', - }, - ), - migrations.CreateModel( - name='Question', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('question', models.TextField(verbose_name='question')), - ], - ), - migrations.CreateModel( - name='Team', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('name', models.CharField(max_length=255, unique=True, verbose_name='name')), - ('trigram', models.CharField(help_text='The trigram must be composed of three uppercase letters.', max_length=3, unique=True, validators=[django.core.validators.RegexValidator('[A-Z]{3}')], verbose_name='trigram')), - ('access_code', models.CharField(help_text='The access code let other people to join the team.', max_length=6, verbose_name='access code')), - ('grant_animath_access_videos', models.BooleanField(default=False, help_text='Give the authorisation to publish the video on the main website to promote the action.', verbose_name='Grant Animath to publish my video')), - ], - options={ - 'verbose_name': 'team', - 'verbose_name_plural': 'teams', - }, - ), - migrations.CreateModel( - name='Video', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('link', models.URLField(help_text='The full video link.', verbose_name='link')), - ('valid', models.BooleanField(default=None, help_text='The video got the validation of the administrators.', null=True, verbose_name='valid')), - ], - options={ - 'verbose_name': 'video', - 'verbose_name_plural': 'videos', - }, - ), - migrations.AddIndex( - model_name='team', - index=models.Index(fields=['trigram'], name='participati_trigram_239255_idx'), - ), - migrations.AddField( - model_name='question', - name='participation', - field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='questions', to='participation.participation', verbose_name='participation'), - ), - migrations.AddField( - model_name='participation', - name='received_participation', - field=models.OneToOneField(default=None, null=True, on_delete=django.db.models.deletion.PROTECT, related_name='sent_participation', to='participation.participation', verbose_name='received participation'), - ), - migrations.AddField( - model_name='participation', - name='solution', - field=models.OneToOneField(default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='participation_solution', to='participation.video', verbose_name='solution video'), - ), - migrations.AddField( - model_name='participation', - name='synthesis', - field=models.OneToOneField(default=None, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='participation_synthesis', to='participation.video', verbose_name='synthesis video'), - ), - migrations.AddField( - model_name='participation', - name='team', - field=models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to='participation.team', verbose_name='team'), - ), - migrations.RunPython( - register_phases, - reverse_code=reverse_phase_registering, - ) - ] diff --git a/apps/participation/models.py b/apps/participation/models.py index 9d1583b..f2b7123 100644 --- a/apps/participation/models.py +++ b/apps/participation/models.py @@ -44,6 +44,14 @@ class Team(models.Model): help_text=_("The access code let other people to join the team."), ) + @property + def students(self): + return self.participants.filter(studentregistration__isnull=False) + + @property + def coachs(self): + return self.participants.filter(coachregistration__isnull=False) + @property def email(self): """ @@ -224,33 +232,6 @@ class Participation(models.Model): help_text=_("The video got the validation of the administrators."), ) - solution = models.OneToOneField( - "participation.Video", - on_delete=models.SET_NULL, - related_name="participation_solution", - null=True, - default=None, - verbose_name=_("solution video"), - ) - - received_participation = models.OneToOneField( - "participation.Participation", - on_delete=models.PROTECT, - related_name="sent_participation", - null=True, - default=None, - verbose_name=_("received participation"), - ) - - synthesis = models.OneToOneField( - "participation.Video", - on_delete=models.SET_NULL, - related_name="participation_synthesis", - null=True, - default=None, - verbose_name=_("synthesis video"), - ) - def get_absolute_url(self): return reverse_lazy("participation:participation_detail", args=(self.pk,)) @@ -324,7 +305,7 @@ class Solution(models.Model): class Meta: verbose_name = _("solution") verbose_name_plural = _("solutions") - unique_by = (('participation', 'problem', 'final_solution', ), ) + unique_together = (('participation', 'problem', 'final_solution', ), ) class Synthesis(models.Model): @@ -359,4 +340,4 @@ class Synthesis(models.Model): class Meta: verbose_name = _("synthesis") verbose_name_plural = _("syntheses") - unique_by = (('participation', 'pool', 'type', ), ) + unique_together = (('participation', 'pool', 'type', ), ) diff --git a/apps/participation/search_indexes.py b/apps/participation/search_indexes.py index 22e722a..1512a71 100644 --- a/apps/participation/search_indexes.py +++ b/apps/participation/search_indexes.py @@ -3,7 +3,7 @@ from haystack import indexes -from .models import Participation, Team, Video +from .models import Participation, Team class TeamIndex(indexes.ModelSearchIndex, indexes.Indexable): @@ -24,13 +24,3 @@ class ParticipationIndex(indexes.ModelSearchIndex, indexes.Indexable): class Meta: model = Participation - - -class VideoIndex(indexes.ModelSearchIndex, indexes.Indexable): - """ - Index all teams by their team name and team trigram. - """ - text = indexes.NgramField(document=True, use_template=True) - - class Meta: - model = Video diff --git a/apps/participation/signals.py b/apps/participation/signals.py index 45dc5de..14f3830 100644 --- a/apps/participation/signals.py +++ b/apps/participation/signals.py @@ -2,7 +2,7 @@ # SPDX-License-Identifier: GPL-3.0-or-later from tfjm.lists import get_sympa_client -from participation.models import Participation, Team, Video +from participation.models import Participation, Team def create_team_participation(instance, created, **_): @@ -10,10 +10,6 @@ def create_team_participation(instance, created, **_): When a team got created, create an associated team and create Video objects. """ participation = Participation.objects.get_or_create(team=instance)[0] - if not participation.solution: - participation.solution = Video.objects.create() - if not participation.synthesis: - participation.synthesis = Video.objects.create() participation.save() if not created: participation.team.create_mailing_list() @@ -38,9 +34,3 @@ def update_mailing_list(instance: Team, **_): get_sympa_client().subscribe(coach.user.email, f"equipe-{instance.trigram.lower()}", False, f"{coach.user.first_name} {coach.user.last_name}") - -def delete_related_videos(instance: Participation, **_): - if instance.solution: - instance.solution.delete() - if instance.synthesis: - instance.synthesis.delete() diff --git a/apps/participation/tables.py b/apps/participation/tables.py index cfd121f..d38cd90 100644 --- a/apps/participation/tables.py +++ b/apps/participation/tables.py @@ -1,28 +1,10 @@ # 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 -from .models import Phase, Team - - -class CalendarTable(tables.Table): - class Meta: - attrs = { - 'class': 'table table condensed table-striped', - } - row_attrs = { - 'class': lambda record: 'bg-success' if timezone.now() > record.end else - 'bg-warning' if timezone.now() > record.start else - 'bg-danger', - 'data-id': lambda record: str(record.phase_number), - } - model = Phase - fields = ('phase_number', 'description', 'start', 'end',) - template_name = 'django_tables2/bootstrap4.html' - order_by = ('phase_number',) +from .models import Team # noinspection PyTypeChecker diff --git a/apps/participation/templates/participation/participation_detail.html b/apps/participation/templates/participation/participation_detail.html index ae0a2a2..d4393eb 100644 --- a/apps/participation/templates/participation/participation_detail.html +++ b/apps/participation/templates/participation/participation_detail.html @@ -12,289 +12,7 @@
{% trans "Team:" %}
{{ participation.team }}
- -
{% trans "Chosen problem:" %}
-
{{ participation.get_problem_display }}
- -
-
- {% trans "No video sent" as novideo %} -
{% trans "Proposed solution:" %}
-
- {{ participation.solution.link|default:novideo }} - {% if current_phase.phase_number == 1 or participation.solution.link == "" %} - - {% endif %} - {% if participation.solution.link %} - - {% endif %} -
-
-
- - {% if user.registration.is_admin or current_phase.phase_number >= 2 %} -
- -
-
-
-
-

{% trans "Sent solution" %}

-
-
-
-
{% trans "Team that received your solution:" %}
-
{{ participation.sent_participation.team|default:any }}
- {% if user.registration.is_admin %} -
- -
- {% endif %} -
- - {% if current_phase.phase_number == 2 %} -
- {% blocktrans trimmed %} - The mentioned team received your video. They are now watching your video, - and formulating questions. You would be able to exchange with the other phase during - the next phase. - {% endblocktrans %} -
- {% elif current_phase.phase_number == 3 %} -
- {% blocktrans trimmed with user_id=user.pk %} - The other team sent you questions about your solution. Your are now able to answer them, - then to exchange freely with the other team. You can click on the Chat button, or to - connect to your dedicated Matrix account: - @tfjm_{{ user_id }}:tfjm.org. - You can use your own Matrix client, or use the dedicated Element client: - element.correpondances-maths.fr - {% endblocktrans %} -
- {% elif current_phase.phase_number == 4 %} -
-
{% trans "Synthesis from the other team:" %}
-
- {{ participation.received_participation.synthesis.link|default:novideo }} - {% if participation.received_participation.synthesis.link %} - - {% endif %} -
-
- {% endif %} -
-
-
-
-
-
-

{% trans "Received solution" %}

-
-
-
-
{% trans "Team that sent you their solution:" %}
-
{{ participation.received_participation.team|default:any }}
- {% if user.registration.is_admin %} -
- -
- {% endif %} - -
{% trans "Proposed solution:" %}
-
- {{ participation.received_participation.solution.link|default:novideo }} - {% if participation.received_participation.solution.link %} - - {% endif %} -
- - {% if current_phase.phase_number == 2 %} -
- {% blocktrans trimmed %} - You received a solution about the same problem that you treated from another team. - You are now encouraged to see the video, then to ask from 3 to 6 questions about the video. - After that, you will be invited to exchange with the other team about the solution. - {% endblocktrans %} -
- - {% for question in participation.questions.all %} -
{{ question.question }}
-
- -
-
- {% endfor %} - - {% if user.registration.participates %} - - {% endif %} - {% elif current_phase.phase_number == 3 %} -
- {% blocktrans trimmed with user_id=user.pk %} - You sent your questions to the other team about their solution. When they answer to - your questions, you will be able to exchange freely with the other team. - You can click on the Chat button, or to connect to your dedicated Matrix account: - @tfjm_{{ user_id }}:tfjm.org. - You can use your own Matrix client, or use the dedicated Element client: - element.correpondances-maths.fr - {% endblocktrans %} -
- {% elif current_phase.phase_number == 4 %} -
-
- {% trans "No video sent" as novideo %} -
{% trans "Your synthesis of the exchange:" %}
-
- {{ participation.synthesis.link|default:novideo }} - - {% if participation.synthesis.link %} - - {% endif %} -
-
-
- {% endif %} -
-
-
-
-
- {% endif %} - -{% if user.registration.is_admin %} - {% trans "Define received video" as modal_title %} - {% trans "Update" as modal_button %} - {% url "participation:participation_receive_participation" pk=participation.pk as modal_action %} - {% include "base_modal.html" with modal_id="defineReceivedParticipation" %} - - {% trans "Define team that receives your video" as modal_title %} - {% trans "Update" as modal_button %} - {% url "participation:participation_send_participation" pk=participation.pk as modal_action %} - {% include "base_modal.html" with modal_id="defineSentParticipation" %} -{% endif %} - -{% trans "Upload video" as modal_title %} -{% trans "Upload" as modal_button %} -{% url "participation:upload_video" pk=participation.solution_id as modal_action %} -{% include "base_modal.html" with modal_id="uploadSolution" %} - -{% trans "Display solution" as modal_title %} -{% trans "This video platform is not supported yet." as unsupported_platform %} -{% include "base_modal.html" with modal_id="displaySolution" modal_action="" modal_button="" modal_additional_class="modal-lg" modal_content=participation.solution.as_iframe|default:unsupported_platform %} - - -{% if user.registration.is_admin or current_phase.phase_number >= 2 %} - {% if participation.received_participation.solution.link %} - {% trans "Display solution" as modal_title %} - {% 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 %} - {% 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" %} - {% for question in participation.questions.all %} - {% with number_str=forloop.counter|stringformat:"d"%} - {% with modal_id="updateQuestion"|add:number_str %} - {% trans "Delete" as delete %} - {% with extra_modal_button='"|safe %} - {% trans "Update question" as modal_title %} - {% trans "Update" as modal_button %} - {% url "participation:update_question" pk=question.pk as modal_action %} - {% include "base_modal.html" %} - {% endwith %} - {% endwith %} - - {% with modal_id="deleteQuestion"|add:number_str %} - {% trans "Delete question" as modal_title %} - {% trans "Delete" as modal_button %} - {% url "participation:delete_question" pk=question.pk as modal_action %} - {% include "base_modal.html" with modal_button_type="danger" %} - {% endwith %} - {% endwith %} - {% endfor %} -{% endif %} - -{% if current_phase.phase_number >= 4 %} - {% if participation.received_participation.synthesis.link %} - {% trans "Display synthesis" as modal_title %} - {% trans "This video platform is not supported yet." as unsupported_platform %} - {% include "base_modal.html" with modal_id="displayOtherSynthesis" modal_action="" modal_button="" modal_additional_class="modal-lg" modal_content=participation.received_participation.synthesis.as_iframe|default:unsupported_platform %} - {% endif %} - - {% trans "Upload video" as modal_title %} - {% trans "Upload" as modal_button %} - {% url "participation:upload_video" pk=participation.synthesis_id as modal_action %} - {% include "base_modal.html" with modal_id="uploadSynthesis" %} - - {% if participation.synthesis.link %} - {% trans "Display synthesis" as modal_title %} - {% trans "This video platform is not supported yet." as unsupported_platform %} - {% include "base_modal.html" with modal_id="displaySynthesis" modal_action="" modal_button="" modal_additional_class="modal-lg" modal_content=participation.synthesis.as_iframe|default:unsupported_platform %} - {% endif %} -{% endif %} -{% endblock %} - -{% block extrajavascript %} - {% endblock %} diff --git a/apps/participation/templates/participation/team_detail.html b/apps/participation/templates/participation/team_detail.html index f6fcf21..c4a8ffe 100644 --- a/apps/participation/templates/participation/team_detail.html +++ b/apps/participation/templates/participation/team_detail.html @@ -45,9 +45,6 @@ {% trans "any" as any %}
{{ team.participation.get_problem_display|default:any }}
-
{% trans "Grant Animath to publish our video:" %}
-
{{ team.grant_animath_access_videos|yesno }}
-
{% trans "Authorizations:" %}
{% for student in team.students.all %} diff --git a/apps/participation/templatetags/__init__.py b/apps/participation/templatetags/__init__.py deleted file mode 100644 index dfc9706..0000000 --- a/apps/participation/templatetags/__init__.py +++ /dev/null @@ -1,2 +0,0 @@ -# Copyright (C) 2020 by Animath -# SPDX-License-Identifier: GPL-3.0-or-later diff --git a/apps/participation/templatetags/calendar.py b/apps/participation/templatetags/calendar.py deleted file mode 100644 index 0a8477b..0000000 --- a/apps/participation/templatetags/calendar.py +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (C) 2020 by Animath -# SPDX-License-Identifier: GPL-3.0-or-later - -from django import template - -from ..models import Phase - - -def current_phase(nb): - phase = Phase.current_phase() - return phase is not None and phase.phase_number == nb - - -register = template.Library() -register.filter("current_phase", current_phase) diff --git a/apps/participation/tests.py b/apps/participation/tests.py index 8c30e45..c62b90a 100644 --- a/apps/participation/tests.py +++ b/apps/participation/tests.py @@ -1,18 +1,15 @@ # Copyright (C) 2020 by Animath # SPDX-License-Identifier: GPL-3.0-or-later -from datetime import timedelta - from django.contrib.auth.models import User from django.contrib.contenttypes.models import ContentType from django.contrib.sites.models import Site from django.core.management import call_command from django.test import TestCase from django.urls import reverse -from django.utils import timezone from registration.models import CoachRegistration, StudentRegistration -from .models import Participation, Phase, Question, Team +from .models import Participation, Team class TestStudentParticipation(TestCase): @@ -40,10 +37,7 @@ class TestStudentParticipation(TestCase): name="Super team", trigram="AAA", access_code="azerty", - grant_animath_access_videos=True, ) - self.question = Question.objects.create(participation=self.team.participation, - question="Pourquoi l'existence précède l'essence ?") self.client.force_login(self.user) self.second_user = User.objects.create( @@ -63,7 +57,6 @@ class TestStudentParticipation(TestCase): name="Poor team", trigram="FFF", access_code="qwerty", - grant_animath_access_videos=True, ) self.coach = User.objects.create( @@ -108,29 +101,6 @@ class TestStudentParticipation(TestCase): self.assertRedirects(response, "http://" + Site.objects.get().domain + str(self.team.participation.get_absolute_url()), 302, 200) - # Test video pages - response = self.client.get(reverse("admin:index") + "participation/video/") - self.assertEqual(response.status_code, 200) - - response = self.client.get(reverse("admin:index") - + f"participation/video/{self.team.participation.solution.pk}/change/") - self.assertEqual(response.status_code, 200) - - # Test question pages - response = self.client.get(reverse("admin:index") + "participation/question/") - self.assertEqual(response.status_code, 200) - - response = self.client.get(reverse("admin:index") - + f"participation/question/{self.question.pk}/change/") - self.assertEqual(response.status_code, 200) - - # Test phase pages - response = self.client.get(reverse("admin:index") + "participation/phase/") - self.assertEqual(response.status_code, 200) - - response = self.client.get(reverse("admin:index") + "participation/phase/1/change/") - self.assertEqual(response.status_code, 200) - def test_create_team(self): """ Try to create a team. @@ -141,14 +111,12 @@ class TestStudentParticipation(TestCase): response = self.client.post(reverse("participation:create_team"), data=dict( name="Test team", trigram="123", - grant_animath_access_videos=False, )) self.assertEqual(response.status_code, 200) response = self.client.post(reverse("participation:create_team"), data=dict( name="Test team", trigram="TES", - grant_animath_access_videos=False, )) self.assertTrue(Team.objects.filter(trigram="TES").exists()) team = Team.objects.get(trigram="TES") @@ -158,7 +126,6 @@ class TestStudentParticipation(TestCase): response = self.client.post(reverse("participation:create_team"), data=dict( name="Test team 2", trigram="TET", - grant_animath_access_videos=False, )) self.assertEqual(response.status_code, 403) @@ -286,13 +253,6 @@ class TestStudentParticipation(TestCase): self.user.registration.photo_authorization = "authorization/photo/ananas" self.user.registration.save() - resp = self.client.get(reverse("participation:team_detail", args=(self.team.pk,))) - self.assertEqual(resp.status_code, 200) - self.assertFalse(resp.context["can_validate"]) - - self.team.participation.problem = 2 - self.team.participation.save() - resp = self.client.get(reverse("participation:team_detail", args=(self.team.pk,))) self.assertEqual(resp.status_code, 200) self.assertTrue(resp.context["can_validate"]) @@ -383,23 +343,12 @@ class TestStudentParticipation(TestCase): response = self.client.get(reverse("participation:update_team", args=(self.team.pk,))) self.assertEqual(response.status_code, 200) - # Form is invalid response = self.client.post(reverse("participation:update_team", args=(self.team.pk,)), data=dict( name="Updated team name", trigram="BBB", - grant_animath_access_videos=True, - problem=42, - )) - self.assertEqual(response.status_code, 200) - - response = self.client.post(reverse("participation:update_team", args=(self.team.pk,)), data=dict( - name="Updated team name", - trigram="BBB", - grant_animath_access_videos=True, - problem=3, )) self.assertRedirects(response, reverse("participation:team_detail", args=(self.team.pk,)), 302, 200) - self.assertTrue(Team.objects.filter(trigram="BBB", participation__problem=3).exists()) + self.assertTrue(Team.objects.filter(trigram="BBB").exists()) def test_leave_team(self): """ @@ -471,199 +420,6 @@ class TestStudentParticipation(TestCase): response = self.client.get(reverse("participation:participation_detail", args=(self.team.participation.pk,))) self.assertEqual(response.status_code, 403) - def test_upload_video(self): - """ - Try to send a solution video link. - """ - self.user.registration.team = self.team - self.user.registration.save() - - self.team.participation.valid = True - self.team.participation.save() - - response = self.client.get(reverse("participation:upload_video", args=(self.team.participation.solution.pk,))) - self.assertEqual(response.status_code, 200) - - response = self.client.post(reverse("participation:upload_video", args=(self.team.participation.solution.pk,)), - data=dict(link="https://youtube.com/watch?v=73nsrixx7eI")) - self.assertRedirects(response, - reverse("participation:participation_detail", args=(self.team.participation.id,)), - 302, 200) - self.team.participation.refresh_from_db() - self.assertEqual(self.team.participation.solution.platform, "youtube") - self.assertEqual(self.team.participation.solution.youtube_code, "73nsrixx7eI") - - response = self.client.get(reverse("participation:participation_detail", args=(self.team.participation.pk,))) - self.assertEqual(response.status_code, 200) - - # Set the second phase - for i in range(1, 5): - Phase.objects.filter(phase_number=i).update(start=timezone.now() + timedelta(days=i - 2), - end=timezone.now() + timedelta(days=i - 1)) - self.assertEqual(Phase.current_phase().phase_number, 2) - - # Can't update the link during the second phase - response = self.client.post(reverse("participation:upload_video", args=(self.team.participation.solution.pk,)), - data=dict(link="https://youtube.com/watch?v=73nsrixx7eI")) - self.assertEqual(response.status_code, 200) - - def test_questions(self): - """ - Ensure that creating/updating/deleting a question is working. - """ - self.user.registration.team = self.team - self.user.registration.save() - - self.team.participation.valid = True - self.team.participation.save() - - response = self.client.get(reverse("participation:add_question", args=(self.team.participation.pk,))) - self.assertEqual(response.status_code, 200) - - # We are not in second phase - response = self.client.post(reverse("participation:add_question", args=(self.team.participation.pk,)), - data=dict(question="I got censored!")) - self.assertEqual(response.status_code, 200) - - # Set the second phase - for i in range(1, 5): - Phase.objects.filter(phase_number=i).update(start=timezone.now() + timedelta(days=i - 2), - end=timezone.now() + timedelta(days=i - 1)) - self.assertEqual(Phase.current_phase().phase_number, 2) - - # Create a question - response = self.client.post(reverse("participation:add_question", args=(self.team.participation.pk,)), - data=dict(question="I asked a question!")) - self.assertRedirects(response, reverse("participation:participation_detail", - args=(self.team.participation.pk,)), 302, 200) - qs = Question.objects.filter(participation=self.team.participation, question="I asked a question!") - self.assertTrue(qs.exists()) - question = qs.get() - - # Update a question - response = self.client.get(reverse("participation:update_question", args=(question.pk,))) - self.assertEqual(response.status_code, 200) - response = self.client.post(reverse("participation:update_question", args=(question.pk,)), data=dict( - question="The question changed!", - )) - self.assertRedirects(response, reverse("participation:participation_detail", - args=(self.team.participation.pk,)), 302, 200) - question.refresh_from_db() - self.assertEqual(question.question, "The question changed!") - - # Delete the question - response = self.client.get(reverse("participation:delete_question", args=(question.pk,))) - self.assertEqual(response.status_code, 200) - response = self.client.post(reverse("participation:delete_question", args=(question.pk,))) - self.assertRedirects(response, reverse("participation:participation_detail", - args=(self.team.participation.pk,)), 302, 200) - self.assertFalse(Question.objects.filter(pk=question.pk).exists()) - - # Non-authenticated users are redirected to login page - self.client.logout() - response = self.client.get(reverse("participation:add_question", args=(self.team.participation.pk,))) - self.assertRedirects(response, reverse("login") + "?next=" + - reverse("participation:add_question", args=(self.team.participation.pk,)), 302, 200) - response = self.client.get(reverse("participation:update_question", args=(self.question.pk,))) - self.assertRedirects(response, reverse("login") + "?next=" + - reverse("participation:update_question", args=(self.question.pk,)), 302, 200) - response = self.client.get(reverse("participation:delete_question", args=(self.question.pk,))) - self.assertRedirects(response, reverse("login") + "?next=" + - reverse("participation:delete_question", args=(self.question.pk,)), 302, 200) - - def test_current_phase(self): - """ - Ensure that the current phase is the good one. - """ - # We are before the beginning - for i in range(1, 5): - Phase.objects.filter(phase_number=i).update(start=timezone.now() + timedelta(days=2 * i), - end=timezone.now() + timedelta(days=2 * i + 1)) - self.assertEqual(Phase.current_phase(), None) - - # We are after the end - for i in range(1, 5): - Phase.objects.filter(phase_number=i).update(start=timezone.now() - timedelta(days=2 * i), - end=timezone.now() - timedelta(days=2 * i + 1)) - self.assertEqual(Phase.current_phase().phase_number, Phase.objects.count()) - - # First phase - for i in range(1, 5): - Phase.objects.filter(phase_number=i).update(start=timezone.now() + timedelta(days=i - 1), - end=timezone.now() + timedelta(days=i)) - self.assertEqual(Phase.current_phase().phase_number, 1) - - # Second phase - for i in range(1, 5): - Phase.objects.filter(phase_number=i).update(start=timezone.now() + timedelta(days=i - 2), - end=timezone.now() + timedelta(days=i - 1)) - self.assertEqual(Phase.current_phase().phase_number, 2) - - # Third phase - for i in range(1, 5): - Phase.objects.filter(phase_number=i).update(start=timezone.now() + timedelta(days=i - 3), - end=timezone.now() + timedelta(days=i - 2)) - self.assertEqual(Phase.current_phase().phase_number, 3) - - # Fourth phase - for i in range(1, 5): - Phase.objects.filter(phase_number=i).update(start=timezone.now() + timedelta(days=i - 4), - end=timezone.now() + timedelta(days=i - 3)) - self.assertEqual(Phase.current_phase().phase_number, 4) - - response = self.client.get(reverse("participation:calendar")) - self.assertEqual(response.status_code, 200) - - response = self.client.get(reverse("participation:update_phase", args=(4,))) - self.assertEqual(response.status_code, 403) - - response = self.client.post(reverse("participation:update_phase", args=(4,)), data=dict( - start=timezone.now(), - end=timezone.now() + timedelta(days=3), - )) - self.assertEqual(response.status_code, 403) - - self.client.force_login(self.superuser) - response = self.client.get(reverse("participation:update_phase", args=(4,))) - self.assertEqual(response.status_code, 200) - - response = self.client.post(reverse("participation:update_phase", args=(4,)), data=dict( - start=timezone.now(), - end=timezone.now() + timedelta(days=3), - )) - self.assertRedirects(response, reverse("participation:calendar"), 302, 200) - fourth_phase = Phase.objects.get(phase_number=4) - self.assertEqual((fourth_phase.end - fourth_phase.start).days, 3) - - # First phase must be before the other phases - response = self.client.post(reverse("participation:update_phase", args=(1,)), data=dict( - start=timezone.now() + timedelta(days=8), - end=timezone.now() + timedelta(days=9), - )) - self.assertEqual(response.status_code, 200) - - # Fourth phase must be after the other phases - response = self.client.post(reverse("participation:update_phase", args=(4,)), data=dict( - start=timezone.now() - timedelta(days=9), - end=timezone.now() - timedelta(days=8), - )) - self.assertEqual(response.status_code, 200) - - # End must be after start - response = self.client.post(reverse("participation:update_phase", args=(4,)), data=dict( - start=timezone.now() + timedelta(days=3), - end=timezone.now(), - )) - self.assertEqual(response.status_code, 200) - - # Unauthenticated user can't update the calendar - self.client.logout() - response = self.client.get(reverse("participation:calendar")) - self.assertEqual(response.status_code, 200) - response = self.client.get(reverse("participation:update_phase", args=(2,))) - self.assertRedirects(response, reverse("login") + "?next=" + - reverse("participation:update_phase", args=(2,)), 302, 200) - def test_forbidden_access(self): """ Load personal pages and ensure that these are protected. @@ -679,20 +435,6 @@ class TestStudentParticipation(TestCase): self.assertEqual(resp.status_code, 403) resp = self.client.get(reverse("participation:participation_detail", args=(self.second_team.pk,))) self.assertEqual(resp.status_code, 403) - resp = self.client.get(reverse("participation:upload_video", - args=(self.second_team.participation.solution.pk,))) - self.assertEqual(resp.status_code, 403) - resp = self.client.get(reverse("participation:upload_video", - args=(self.second_team.participation.synthesis.pk,))) - self.assertEqual(resp.status_code, 403) - resp = self.client.get(reverse("participation:add_question", args=(self.second_team.pk,))) - self.assertEqual(resp.status_code, 403) - question = Question.objects.create(participation=self.second_team.participation, - question=self.question.question) - resp = self.client.get(reverse("participation:update_question", args=(question.pk,))) - self.assertEqual(resp.status_code, 403) - resp = self.client.get(reverse("participation:delete_question", args=(question.pk,))) - self.assertEqual(resp.status_code, 403) def test_cover_matrix(self): """ @@ -707,7 +449,6 @@ class TestStudentParticipation(TestCase): self.team.participation.save() call_command('fix_matrix_channels') - call_command('setup_third_phase') class TestAdmin(TestCase): @@ -765,50 +506,6 @@ class TestAdmin(TestCase): self.assertEqual(response.status_code, 200) self.assertTrue(response.context["object_list"]) - def test_set_received_video(self): - """ - Try to define the received video of a participation. - """ - response = self.client.get(reverse("participation:participation_receive_participation", - args=(self.team1.participation.pk,))) - self.assertEqual(response.status_code, 200) - - response = self.client.post(reverse("participation:participation_receive_participation", - args=(self.team1.participation.pk,)), - data=dict(received_participation=self.team2.participation.pk)) - self.assertRedirects(response, reverse("participation:participation_detail", - args=(self.team1.participation.pk,)), 302, 200) - - response = self.client.get(reverse("participation:participation_receive_participation", - args=(self.team1.participation.pk,))) - self.assertEqual(response.status_code, 200) - - response = self.client.post(reverse("participation:participation_send_participation", - args=(self.team1.participation.pk,)), - data=dict(sent_participation=self.team3.participation.pk)) - self.assertRedirects(response, reverse("participation:participation_detail", - args=(self.team1.participation.pk,)), 302, 200) - - self.team1.participation.refresh_from_db() - self.team2.participation.refresh_from_db() - self.team3.participation.refresh_from_db() - - self.assertEqual(self.team1.participation.received_participation.pk, self.team2.participation.pk) - self.assertEqual(self.team1.participation.sent_participation.pk, self.team3.participation.pk) - self.assertEqual(self.team2.participation.sent_participation.pk, self.team1.participation.pk) - self.assertEqual(self.team3.participation.received_participation.pk, self.team1.participation.pk) - - # The other team didn't work on the same problem - response = self.client.post(reverse("participation:participation_receive_participation", - args=(self.team1.participation.pk,)), - data=dict(received_participation=self.other_team.participation.pk)) - self.assertEqual(response.status_code, 200) - - response = self.client.post(reverse("participation:participation_send_participation", - args=(self.team1.participation.pk,)), - data=dict(sent_participation=self.other_team.participation.pk)) - self.assertEqual(response.status_code, 200) - def test_create_team_forbidden(self): """ Ensure that an admin can't create a team. @@ -816,7 +513,6 @@ class TestAdmin(TestCase): response = self.client.post(reverse("participation:create_team"), data=dict( name="Test team", trigram="TES", - grant_animath_access_videos=False, )) self.assertEqual(response.status_code, 403) diff --git a/apps/participation/urls.py b/apps/participation/urls.py index 7e6d3fe..4bb1766 100644 --- a/apps/participation/urls.py +++ b/apps/participation/urls.py @@ -4,10 +4,9 @@ from django.urls import path from django.views.generic import TemplateView -from .views import CalendarView, CreateQuestionView, CreateTeamView, DeleteQuestionView, JoinTeamView, \ - MyParticipationDetailView, MyTeamDetailView, ParticipationDetailView, PhaseUpdateView, \ - SetParticipationReceiveParticipationView, SetParticipationSendParticipationView, TeamAuthorizationsView, \ - TeamDetailView, TeamLeaveView, TeamListView, TeamUpdateView, UpdateQuestionView, UploadVideoView +from .views import CreateTeamView, JoinTeamView, \ + MyParticipationDetailView, MyTeamDetailView, ParticipationDetailView, TeamAuthorizationsView, \ + TeamDetailView, TeamLeaveView, TeamListView, TeamUpdateView app_name = "participation" @@ -23,15 +22,5 @@ urlpatterns = [ path("team/leave/", TeamLeaveView.as_view(), name="team_leave"), path("detail/", MyParticipationDetailView.as_view(), name="my_participation_detail"), path("detail//", ParticipationDetailView.as_view(), name="participation_detail"), - path("detail/upload-video//", UploadVideoView.as_view(), name="upload_video"), - path("detail//receive-participation/", SetParticipationReceiveParticipationView.as_view(), - name="participation_receive_participation"), - path("detail//send-participation/", SetParticipationSendParticipationView.as_view(), - name="participation_send_participation"), - path("detail//add-question/", CreateQuestionView.as_view(), name="add_question"), - path("update-question//", UpdateQuestionView.as_view(), name="update_question"), - path("delete-question//", DeleteQuestionView.as_view(), name="delete_question"), - path("calendar/", CalendarView.as_view(), name="calendar"), - path("calendar//", PhaseUpdateView.as_view(), name="update_phase"), path("chat/", TemplateView.as_view(template_name="participation/chat.html"), name="chat") ] diff --git a/apps/participation/views.py b/apps/participation/views.py index dcb15f2..efd923c 100644 --- a/apps/participation/views.py +++ b/apps/participation/views.py @@ -17,17 +17,15 @@ from django.shortcuts import redirect from django.template.loader import render_to_string from django.urls import reverse_lazy from django.utils.translation import gettext_lazy as _ -from django.views.generic import CreateView, DeleteView, DetailView, FormView, RedirectView, TemplateView, UpdateView +from django.views.generic import CreateView, DetailView, FormView, RedirectView, TemplateView, UpdateView from django.views.generic.edit import FormMixin, ProcessFormView from django_tables2 import SingleTableView from magic import Magic from registration.models import AdminRegistration -from .forms import JoinTeamForm, ParticipationForm, PhaseForm, QuestionForm, \ - ReceiveParticipationForm, RequestValidationForm, SendParticipationForm, TeamForm, \ - UploadVideoForm, ValidateParticipationForm -from .models import Participation, Phase, Question, Team, Video -from .tables import CalendarTable, TeamTable +from .forms import JoinTeamForm, ParticipationForm, RequestValidationForm, TeamForm, ValidateParticipationForm +from .models import Participation, Team +from .tables import TeamTable class CreateTeamView(LoginRequiredMixin, CreateView): @@ -177,8 +175,7 @@ class TeamDetailView(LoginRequiredMixin, FormMixin, ProcessFormView, DetailView) # and confirmed their email address context["can_validate"] = team.students.count() >= 3 and \ all(r.email_confirmed for r in team.students.all()) and \ - all(r.photo_authorization for r in team.students.all()) and \ - team.participation.problem + all(r.photo_authorization for r in team.students.all()) return context @@ -243,8 +240,6 @@ class TeamDetailView(LoginRequiredMixin, FormMixin, ProcessFormView, DetailView) get_sympa_client().subscribe(self.object.email, "equipes", False, f"Equipe {self.object.name}") get_sympa_client().unsubscribe(self.object.email, "equipes-non-valides", False) - get_sympa_client().subscribe(self.object.email, f"probleme-{self.object.participation.problem}", False, - f"Equipe {self.object.name}") elif "invalidate" in self.request.POST: self.object.participation.valid = None self.object.participation.save() @@ -318,7 +313,7 @@ class TeamAuthorizationsView(LoginRequiredMixin, DetailView): team = self.get_object() output = BytesIO() zf = ZipFile(output, "w") - for student in team.students.all(): + for student in team.participants.all(): magic = Magic(mime=True) mime_type = magic.from_file("media/" + student.photo_authorization.name) ext = mime_type.split("/")[1].replace("jpeg", "jpg") @@ -402,145 +397,5 @@ class ParticipationDetailView(LoginRequiredMixin, DetailView): context = super().get_context_data(**kwargs) context["title"] = lambda: _("Participation of team {trigram}").format(trigram=self.object.team.trigram) - context["current_phase"] = Phase.current_phase() return context - - -class SetParticipationReceiveParticipationView(AdminMixin, UpdateView): - """ - Define the solution that a team will receive. - """ - model = Participation - form_class = ReceiveParticipationForm - template_name = "participation/receive_participation_form.html" - - def get_success_url(self): - return reverse_lazy("participation:participation_detail", args=(self.kwargs["pk"],)) - - -class SetParticipationSendParticipationView(AdminMixin, UpdateView): - """ - Define the team where the solution will be sent. - """ - model = Participation - form_class = SendParticipationForm - template_name = "participation/send_participation_form.html" - - def get_success_url(self): - return reverse_lazy("participation:participation_detail", args=(self.kwargs["pk"],)) - - -class CreateQuestionView(LoginRequiredMixin, CreateView): - """ - Ask a question to another team. - """ - participation: Participation - model = Question - form_class = QuestionForm - extra_context = dict(title=_("Create question")) - - def dispatch(self, request, *args, **kwargs): - if not request.user.is_authenticated: - return self.handle_no_permission() - self.participation = Participation.objects.get(pk=kwargs["pk"]) - if request.user.registration.is_admin or \ - request.user.registration.participates and \ - self.participation.valid and \ - request.user.registration.team.pk == self.participation.team_id: - return super().dispatch(request, *args, **kwargs) - raise PermissionDenied - - def form_valid(self, form): - form.instance.participation = self.participation - return super().form_valid(form) - - def get_success_url(self): - return reverse_lazy("participation:participation_detail", args=(self.participation.pk,)) - - -class UpdateQuestionView(LoginRequiredMixin, UpdateView): - """ - Edit a question. - """ - model = Question - form_class = QuestionForm - - def dispatch(self, request, *args, **kwargs): - self.object = self.get_object() - if not request.user.is_authenticated: - return self.handle_no_permission() - if request.user.registration.is_admin or \ - request.user.registration.participates and \ - self.object.participation.valid and \ - request.user.registration.team.pk == self.object.participation.team_id: - return super().dispatch(request, *args, **kwargs) - raise PermissionDenied - - def get_success_url(self): - return reverse_lazy("participation:participation_detail", args=(self.object.participation.pk,)) - - -class DeleteQuestionView(LoginRequiredMixin, DeleteView): - """ - Remove a question. - """ - model = Question - extra_context = dict(title=_("Delete question")) - - def dispatch(self, request, *args, **kwargs): - self.object = self.get_object() - if not request.user.is_authenticated: - return self.handle_no_permission() - if request.user.registration.is_admin or \ - request.user.registration.participates and \ - self.object.participation.valid and \ - request.user.registration.team.pk == self.object.participation.team_id: - return super().dispatch(request, *args, **kwargs) - raise PermissionDenied - - def get_success_url(self): - return reverse_lazy("participation:participation_detail", args=(self.object.participation.pk,)) - - -class UploadVideoView(LoginRequiredMixin, UpdateView): - """ - Upload a solution video for a team. - """ - model = Video - form_class = UploadVideoForm - template_name = "participation/upload_video.html" - extra_context = dict(title=_("Upload video")) - - def dispatch(self, request, *args, **kwargs): - user = request.user - if not user.is_authenticated: - return super().handle_no_permission() - if user.registration.is_admin or user.registration.participates \ - and user.registration.team.participation.pk == self.get_object().participation.pk: - return super().dispatch(request, *args, **kwargs) - raise PermissionDenied - - def get_success_url(self): - return reverse_lazy("participation:participation_detail", args=(self.object.participation.pk,)) - - -class CalendarView(SingleTableView): - """ - Display the calendar of the action. - """ - table_class = CalendarTable - model = Phase - extra_context = dict(title=_("Calendar")) - - -class PhaseUpdateView(AdminMixin, UpdateView): - """ - Update a phase of the calendar, if we have sufficient rights. - """ - model = Phase - form_class = PhaseForm - extra_context = dict(title=_("Calendar update")) - - def get_success_url(self): - return reverse_lazy("participation:calendar") diff --git a/apps/registration/migrations/0001_initial.py b/apps/registration/migrations/0001_initial.py deleted file mode 100644 index 37baf8d..0000000 --- a/apps/registration/migrations/0001_initial.py +++ /dev/null @@ -1,74 +0,0 @@ -# Generated by Django 3.1.3 on 2020-11-04 12:05 - -from django.conf import settings -from django.db import migrations, models -import django.db.models.deletion -import registration.models - - -class Migration(migrations.Migration): - - initial = True - - dependencies = [ - migrations.swappable_dependency(settings.AUTH_USER_MODEL), - ('participation', '0001_initial'), - ('contenttypes', '0002_remove_content_type_name'), - ] - - operations = [ - migrations.CreateModel( - name='Registration', - fields=[ - ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), - ('give_contact_to_animath', models.BooleanField(default=False, verbose_name='Grant Animath to contact me in the future about other actions')), - ('email_confirmed', models.BooleanField(default=False, verbose_name='email confirmed')), - ('polymorphic_ctype', models.ForeignKey(editable=False, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='polymorphic_registration.registration_set+', to='contenttypes.contenttype')), - ('user', models.OneToOneField(on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='user')), - ], - options={ - 'verbose_name': 'registration', - 'verbose_name_plural': 'registrations', - }, - ), - migrations.CreateModel( - name='AdminRegistration', - 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')), - ('role', models.TextField(verbose_name='role of the administrator')), - ], - options={ - 'verbose_name': 'admin registration', - 'verbose_name_plural': 'admin registrations', - }, - bases=('registration.registration',), - ), - migrations.CreateModel( - name='StudentRegistration', - 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')), - ('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')), - ], - options={ - 'verbose_name': 'student registration', - 'verbose_name_plural': 'student registrations', - }, - bases=('registration.registration',), - ), - migrations.CreateModel( - name='CoachRegistration', - 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')), - ], - options={ - 'verbose_name': 'coach registration', - 'verbose_name_plural': 'coach registrations', - }, - bases=('registration.registration',), - ), - ] diff --git a/apps/registration/models.py b/apps/registration/models.py index 536befc..00ded2f 100644 --- a/apps/registration/models.py +++ b/apps/registration/models.py @@ -129,11 +129,11 @@ class ParticipantRegistration(Registration): ) @property - def type(self): + def type(self): # pragma: no cover raise NotImplementedError @property - def form_class(self): + def form_class(self): # pragma: no cover raise NotImplementedError diff --git a/apps/registration/templatetags/search_results_tables.py b/apps/registration/templatetags/search_results_tables.py index f80a2ac..795bd75 100644 --- a/apps/registration/templatetags/search_results_tables.py +++ b/apps/registration/templatetags/search_results_tables.py @@ -3,7 +3,7 @@ from django import template from django_tables2 import Table -from participation.models import Participation, Team, Video +from participation.models import Participation, Team from participation.tables import ParticipationTable, TeamTable, VideoTable from ..models import Registration @@ -19,8 +19,6 @@ def search_table(results): table_class = TeamTable elif issubclass(model_class, Participation): table_class = ParticipationTable - elif issubclass(model_class, Video): - table_class = VideoTable return table_class([result.object for result in results], prefix=model_class._meta.model_name) diff --git a/apps/registration/tests.py b/apps/registration/tests.py index dc3e93c..b4384e3 100644 --- a/apps/registration/tests.py +++ b/apps/registration/tests.py @@ -1,7 +1,6 @@ # Copyright (C) 2020 by Animath # SPDX-License-Identifier: GPL-3.0-or-later -from datetime import timedelta import os from tfjm.tokens import email_validation_token @@ -12,10 +11,9 @@ from django.core.files.uploadedfile import SimpleUploadedFile from django.core.management import call_command from django.test import TestCase from django.urls import reverse -from django.utils import timezone from django.utils.encoding import force_bytes from django.utils.http import urlsafe_base64_encode -from participation.models import Phase, Team +from participation.models import Team from .models import AdminRegistration, CoachRegistration, StudentRegistration @@ -54,8 +52,6 @@ class TestIndexPage(TestCase): response = self.client.get(reverse("participation:participation_detail", args=(1,))) self.assertRedirects(response, reverse("login") + "?next=" + reverse("participation:participation_detail", args=(1,))) - response = self.client.get(reverse("participation:upload_video", args=(1,))) - self.assertRedirects(response, reverse("login") + "?next=" + reverse("participation:upload_video", args=(1,))) class TestRegistration(TestCase): @@ -110,13 +106,6 @@ class TestRegistration(TestCase): """ Ensure that the signup form is working successfully. """ - # After first phase - response = self.client.get(reverse("registration:signup")) - self.assertEqual(response.status_code, 403) - - Phase.objects.filter(phase_number__gte=2).update(start=timezone.now() + timedelta(days=1), - end=timezone.now() + timedelta(days=2)) - response = self.client.get(reverse("registration:signup")) self.assertEqual(response.status_code, 200) @@ -300,7 +289,7 @@ class TestRegistration(TestCase): response = self.client.post(reverse("registration:upload_user_photo_authorization", args=(self.student.registration.pk,)), data=dict( - photo_authorization=open("tfjm/static/Autorisation de droit à l'image - majeur.pdf", "rb"), + photo_authorization=open("tfjm/static/Fiche_sanitaire.pdf", "rb"), )) self.assertRedirects(response, reverse("registration:user_detail", args=(self.student.pk,)), 302, 200) @@ -323,7 +312,7 @@ class TestRegistration(TestCase): old_authoratization = self.student.registration.photo_authorization.path response = self.client.post(reverse("registration:upload_user_photo_authorization", args=(self.student.registration.pk,)), data=dict( - photo_authorization=open("tfjm/static/Autorisation de droit à l'image - majeur.pdf", "rb"), + photo_authorization=open("tfjm/static/Fiche_sanitaire.pdf", "rb"), )) self.assertRedirects(response, reverse("registration:user_detail", args=(self.student.pk,)), 302, 200) self.assertFalse(os.path.isfile(old_authoratization)) diff --git a/apps/registration/views.py b/apps/registration/views.py index aa96f92..fa5d476 100644 --- a/apps/registration/views.py +++ b/apps/registration/views.py @@ -18,7 +18,6 @@ from django.utils.translation import gettext_lazy as _ from django.views.generic import CreateView, DetailView, RedirectView, TemplateView, UpdateView, View from django_tables2 import SingleTableView from magic import Magic -from participation.models import Phase from .forms import CoachRegistrationForm, PhotoAuthorizationForm, SignupForm, StudentRegistrationForm, UserForm from .models import Registration, StudentRegistration @@ -34,15 +33,6 @@ class SignupView(CreateView): template_name = "registration/signup.html" extra_context = dict(title=_("Sign up")) - def dispatch(self, request, *args, **kwargs): - """ - The signup view is available only during the first phase. - """ - current_phase = Phase.current_phase() - if not current_phase or current_phase.phase_number >= 2: - raise PermissionDenied(_("You can't register now.")) - return super().dispatch(request, *args, **kwargs) - def get_context_data(self, **kwargs): context = super().get_context_data() diff --git a/tfjm/static/Fiche synthèse.pdf b/tfjm/static/Fiche_synthèse.pdf similarity index 100% rename from tfjm/static/Fiche synthèse.pdf rename to tfjm/static/Fiche_synthèse.pdf diff --git a/tfjm/static/Fiche synthèse.tex b/tfjm/static/Fiche_synthèse.tex similarity index 100% rename from tfjm/static/Fiche synthèse.tex rename to tfjm/static/Fiche_synthèse.tex diff --git a/tfjm/templates/base.html b/tfjm/templates/base.html index 994e545..3407f74 100644 --- a/tfjm/templates/base.html +++ b/tfjm/templates/base.html @@ -1,4 +1,4 @@ -{% load static i18n static calendar %} +{% load static i18n static %} {% get_current_language as LANGUAGE_CODE %}{% get_current_language_bidi as LANGUAGE_BIDI %} @@ -63,13 +63,6 @@
  • {% trans "Home" %}
    • -
  • - {% if user.registration.is_admin %} - {% trans "Calendar" %} - {% else %} - {% trans "Calendar" %} - {% endif %} -
    • {% if user.is_authenticated and user.registration.is_admin %}
  • {% trans "Users" %} @@ -129,11 +122,9 @@
    • {% endif %} {% if not user.is_authenticated %} - {% if 1|current_phase %} -
  • - {% trans "Register" %} -
    • - {% endif %} +
  • + {% trans "Register" %} +
  • {% trans "Log in" %} @@ -228,9 +219,6 @@ -{% trans "Calendar" as modal_title %} -{% include "base_modal.html" with modal_id="calendar" modal_additional_class="modal-lg" %} - {% if user.is_authenticated %} {% trans "All teams" as modal_title %} {% include "base_modal.html" with modal_id="teams" modal_additional_class="modal-lg" %} @@ -259,11 +247,6 @@ $(".invalid-feedback").addClass("d-block"); $(document).ready(function () { - $('a[data-target="#calendarModal"]').click(function() { - let modalBody = $("#calendarModal div.modal-body"); - if (!modalBody.html().trim()) - modalBody.load("{% url "participation:calendar" %} #form-content") - }); {% if user.is_authenticated and user.registration.is_admin %} $('a[data-target="#teamsModal"]').click(function() { let modalBody = $("#teamsModal div.modal-body"); diff --git a/tfjm/views.py b/tfjm/views.py index c858a73..76a43df 100644 --- a/tfjm/views.py +++ b/tfjm/views.py @@ -8,8 +8,6 @@ from haystack.generic_views import SearchView class AdminMixin(LoginRequiredMixin): def dispatch(self, request, *args, **kwargs): - if not request.user.is_authenticated: - return self.handle_no_permission() if not request.user.registration.is_admin: raise PermissionDenied return super().dispatch(request, *args, **kwargs) diff --git a/tfjm/whoosh_index/MAIN_3c7ed6y4sljdfo5s.seg b/tfjm/whoosh_index/MAIN_3c7ed6y4sljdfo5s.seg deleted file mode 100644 index 032cf27e2654663e9eeaab43d322266c719d571e..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 201663 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 diff --git a/tfjm/whoosh_index/_MAIN_11.toc b/tfjm/whoosh_index/_MAIN_11.toc deleted file mode 100644 index 1494dfd3f393a1dcf2eae8cfae2fddb646ecebd9..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3787 zcmb_fXJ8yx5mq@_(#npVU=m0OIDKU&N|8&tBg?XpPdb~E6R*L?X3M*qwYS`Ck#vSf zWWYuWM+v^rdo{gxObZaY=`~<_F9A$1%DlIGwm3oZC;FkAeQ)0PX6DU&^IoneH$Q*u z?)mxoJ36{^_nbY`VNF30L@-cxm}^JMgaynq6m081fbASRRIR(MtxZp7v6Ev?)%s|} zuq+lux)s}@K`k;sV#np2T79C+0ra$+`= zX)CA@N*~9iS{H%Pj2Gdu5}u|mLWzTY%y(#qNGY-ko8H;{R&Y6Ctl)UMswo7*rmG>D z?gT!bVTDW~AH1sLG6f%^Ev5NAQ)|>c0~_h5e>JYmuR4SeE#jG4j;1O`HNvyz5_8e+ zWyg)h)?>jG3oRpJTjYR(52L*w{(sdc;-K2pJexGn;rIwux*E|;gy&kiZYBif_`0r? z!(c!2BNi+8$PzwE)jG(gpp2`uP7-QCg6Byo28QQLgQuJr@B*plM0lYbi@}KTBCVa4 z7jm0=9C5yn;%ALrE5ZB4IbUf?R6~2udgwOolh43xN4}V>(vDjZ$#RcvC9GIK&R(rXmifKxFpjd`AX4jUxq_ z!6EY#&!i0AGW$Ogzzf1EC=-;R&GXz!=lN)kqpG%qLLJde*~e|oRB#QyGEfad${Iz? zDVUd*ig6q($Td#I4=7yYK&M?eh}(;}L+d3h%b+5SDA(~Z<2&w3Oct3^pQ7whjEc=Y z((g#wA!>^9JyLLjjM~ZZ=Cp`qRqH0ze~hyq;Q@^$Q5Uj3E%kguq(fE8um>%6# zCJmR!=?mLvvl+>vo-v&besLRJK5ql-_AdIJZ#z{xF`JI@SZi3e7Kg?a{1OG_%N)Pb z%%87v{F=z0uP?p_`a}y}q!h%@0@D2kA$*hLw^Ta%P8i8A&kFC`)I1k+@fK>k32|{v z!SB$*?{d7S)!pwA0CBN6Q`u^$XMA6fG3ZoeaySkhVFVtR>HhHq5@{$^47|CZzL?l=8^&+*>Y2>jt>`u~yRpB^~< z#SNYkgLw9YWamF~{L2D%{wv47wQliu!On@yPCZJ@>=p74j{j7ltAzi8E(0nh{5Mn# z2ut`M2o0!}a2{#~%#^}5y5z!)0f$OqyATflf*Oz?gKu`5%B;3