mirror of
https://gitlab.com/animath/si/plateforme.git
synced 2024-12-25 05:42:23 +00:00
There is no video in the TFJM²
This commit is contained in:
parent
6bcb050754
commit
b4e7ec6550
@ -7,7 +7,7 @@ from django.db.models.signals import post_save, pre_save
|
|||||||
|
|
||||||
class ParticipationConfig(AppConfig):
|
class ParticipationConfig(AppConfig):
|
||||||
"""
|
"""
|
||||||
The participation app contains the data about the teams, videos, ...
|
The participation app contains the data about the teams, solutions, ...
|
||||||
"""
|
"""
|
||||||
name = 'participation'
|
name = 'participation'
|
||||||
|
|
||||||
|
@ -14,8 +14,7 @@ from .models import Participation, Team, Tournament
|
|||||||
|
|
||||||
class TeamForm(forms.ModelForm):
|
class TeamForm(forms.ModelForm):
|
||||||
"""
|
"""
|
||||||
Form to create a team, with the name and the trigram,
|
Form to create a team, with the name and the trigram,...
|
||||||
and if the team accepts that Animath diffuse the videos.
|
|
||||||
"""
|
"""
|
||||||
def clean_trigram(self):
|
def clean_trigram(self):
|
||||||
trigram = self.cleaned_data["trigram"].upper()
|
trigram = self.cleaned_data["trigram"].upper()
|
||||||
|
@ -235,7 +235,7 @@ class Tournament(models.Model):
|
|||||||
class Participation(models.Model):
|
class Participation(models.Model):
|
||||||
"""
|
"""
|
||||||
The Participation model contains all data that are related to the participation:
|
The Participation model contains all data that are related to the participation:
|
||||||
chosen problem, validity status, videos,...
|
chosen problem, validity status, solutions,...
|
||||||
"""
|
"""
|
||||||
team = models.OneToOneField(
|
team = models.OneToOneField(
|
||||||
Team,
|
Team,
|
||||||
|
@ -7,7 +7,7 @@ from tfjm.lists import get_sympa_client
|
|||||||
|
|
||||||
def create_team_participation(instance, created, **_):
|
def create_team_participation(instance, created, **_):
|
||||||
"""
|
"""
|
||||||
When a team got created, create an associated team and create Video objects.
|
When a team got created, create an associated participation.
|
||||||
"""
|
"""
|
||||||
participation = Participation.objects.get_or_create(team=instance)[0]
|
participation = Participation.objects.get_or_create(team=instance)[0]
|
||||||
participation.save()
|
participation.save()
|
||||||
|
@ -93,7 +93,7 @@
|
|||||||
{% if team.participation.valid %}
|
{% if team.participation.valid %}
|
||||||
<div class="text-center">
|
<div class="text-center">
|
||||||
<a class="btn btn-info" href="{% url "participation:participation_detail" pk=team.participation.pk %}">
|
<a class="btn btn-info" href="{% url "participation:participation_detail" pk=team.participation.pk %}">
|
||||||
<i class="fas fa-video"></i> {% trans "Access to team participation" %} <i class="fas fa-video"></i>
|
<i class="fas fa-file-pdf"></i> {% trans "Access to team participation" %}
|
||||||
</a>
|
</a>
|
||||||
</div>
|
</div>
|
||||||
{% elif team.participation.valid == None %} {# Team did not ask for validation #}
|
{% elif team.participation.valid == None %} {# Team did not ask for validation #}
|
||||||
|
@ -374,7 +374,7 @@ class MyParticipationDetailView(LoginRequiredMixin, RedirectView):
|
|||||||
|
|
||||||
class ParticipationDetailView(LoginRequiredMixin, DetailView):
|
class ParticipationDetailView(LoginRequiredMixin, DetailView):
|
||||||
"""
|
"""
|
||||||
Display detail about the participation of a team, and manage the video submission.
|
Display detail about the participation of a team, and manage the solution submission.
|
||||||
"""
|
"""
|
||||||
model = Participation
|
model = Participation
|
||||||
|
|
||||||
|
@ -1137,12 +1137,11 @@ msgstr "Requête invalide"
|
|||||||
#: tfjm/templates/400.html:7
|
#: tfjm/templates/400.html:7
|
||||||
msgid ""
|
msgid ""
|
||||||
"Sorry, your request was bad. Don't know what could be wrong. An email has "
|
"Sorry, your request was bad. Don't know what could be wrong. An email has "
|
||||||
"been sent to webmasters with the details of the error. You can now watch "
|
"been sent to webmasters with the details of the error. You can now think about other solutions."
|
||||||
"some videos."
|
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Désolé, votre requête est invalide. Aucune idée de ce qui a pu se passer. Un "
|
"Désolé, votre requête est invalide. Aucune idée de ce qui a pu se passer. Un "
|
||||||
"email a été envoyé aux administrateurs avec les détails de l'erreur. Vous "
|
"email a été envoyé aux administrateurs avec les détails de l'erreur. Vous "
|
||||||
"pouvez désormais retourner voir des vidéos."
|
"pouvez désormais retourner chercher d'autres solutions."
|
||||||
|
|
||||||
#: tfjm/templates/403.html:6
|
#: tfjm/templates/403.html:6
|
||||||
msgid "Permission denied"
|
msgid "Permission denied"
|
||||||
@ -1176,12 +1175,11 @@ msgstr "Erreur du serveur"
|
|||||||
msgid ""
|
msgid ""
|
||||||
"Sorry, an error occurred when processing your request. An email has been "
|
"Sorry, an error occurred when processing your request. An email has been "
|
||||||
"sent to webmasters with the detail of the error, and this will be fixed "
|
"sent to webmasters with the detail of the error, and this will be fixed "
|
||||||
"soon. You can now watch some videos."
|
"soon. You can now think about other solutions."
|
||||||
msgstr ""
|
msgstr ""
|
||||||
"Désolé, une erreur est survenue lors du traitement de votre requête. Aucune "
|
"Désolé, une erreur est survenue lors du traitement de votre requête. Aucune "
|
||||||
"idée de ce qui a pu se passer. Un email a été envoyé aux administrateurs "
|
"idée de ce qui a pu se passer. Un email a été envoyé aux administrateurs "
|
||||||
"avec les détails de l'erreur. Vous pouvez désormais retourner voir des "
|
"avec les détails de l'erreur. Vous pouvez désormais retourner chercher d'autres solutions.."
|
||||||
"vidéos."
|
|
||||||
|
|
||||||
#: tfjm/templates/base.html:56
|
#: tfjm/templates/base.html:56
|
||||||
msgid "Home"
|
msgid "Home"
|
||||||
|
@ -4,5 +4,5 @@
|
|||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1>{% trans "Bad request" %}</h1>
|
<h1>{% trans "Bad request" %}</h1>
|
||||||
{% blocktrans %}Sorry, your request was bad. Don't know what could be wrong. An email has been sent to webmasters with the details of the error. You can now watch some videos.{% endblocktrans %}
|
{% blocktrans %}Sorry, your request was bad. Don't know what could be wrong. An email has been sent to webmasters with the details of the error. You can now think about other solutions.{% endblocktrans %}
|
||||||
{% endblock %}
|
{% endblock %}
|
@ -4,5 +4,5 @@
|
|||||||
|
|
||||||
{% block content %}
|
{% block content %}
|
||||||
<h1>{% trans "Server error" %}</h1>
|
<h1>{% trans "Server error" %}</h1>
|
||||||
{% blocktrans %}Sorry, an error occurred when processing your request. An email has been sent to webmasters with the detail of the error, and this will be fixed soon. You can now watch some videos.{% endblocktrans %}
|
{% blocktrans %}Sorry, an error occurred when processing your request. An email has been sent to webmasters with the detail of the error, and this will be fixed soon. You can now think about other solutions.{% endblocktrans %}
|
||||||
{% endblock %}
|
{% endblock %}
|
||||||
|
@ -87,7 +87,7 @@
|
|||||||
</li>
|
</li>
|
||||||
<li class="nav-item active">
|
<li class="nav-item active">
|
||||||
<a href="{% url "participation:my_participation_detail" %}" class="nav-link">
|
<a href="{% url "participation:my_participation_detail" %}" class="nav-link">
|
||||||
<i class="fas fa-video"></i> {% trans "My participation" %}
|
<i class="fas fa-file-pdf"></i> {% trans "My participation" %}
|
||||||
</a>
|
</a>
|
||||||
</li>
|
</li>
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
Loading…
Reference in New Issue
Block a user