diff --git a/locale/fr/LC_MESSAGES/django.po b/locale/fr/LC_MESSAGES/django.po index e8d3973..75c20fa 100644 --- a/locale/fr/LC_MESSAGES/django.po +++ b/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: TFJM2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-05-06 00:19+0200\n" +"POT-Creation-Date: 2020-05-06 18:53+0200\n" "PO-Revision-Date: 2020-04-29 02:30+0000\n" "Last-Translator: Yohann D'ANELLO \n" "Language-Team: fr \n" @@ -324,8 +324,8 @@ msgid "Organizers" msgstr "Organisateurs" #: apps/tournament/apps.py:7 apps/tournament/models.py:110 -#: apps/tournament/models.py:147 apps/tournament/tables.py:57 -#: apps/tournament/tables.py:91 templates/tournament/pool_detail.html:21 +#: apps/tournament/models.py:147 apps/tournament/tables.py:94 +#: templates/tournament/pool_detail.html:21 #: templates/tournament/team_detail.html:21 msgid "tournament" msgstr "tournoi" @@ -490,7 +490,7 @@ msgid "Registration validated" msgstr "Inscription validée" #: apps/tournament/models.py:162 apps/tournament/models.py:319 -#: templates/tournament/team_detail.html:30 +#: templates/tournament/team_detail.html:32 msgid "validation status" msgstr "statut de validation" @@ -556,28 +556,28 @@ msgstr "paiements" msgid "Payment of {user}" msgstr "Paiement de {user}" -#: apps/tournament/tables.py:17 templates/tournament/tournament_detail.html:24 +#: apps/tournament/tables.py:18 templates/tournament/tournament_detail.html:24 msgid "dates" msgstr "dates" -#: apps/tournament/tables.py:21 +#: apps/tournament/tables.py:22 msgid "From {start:%b %d %Y} to {end:%b %d %Y}" msgstr "Du {start: %d %b %Y} au {end:%d %b %Y}" -#: apps/tournament/tables.py:71 apps/tournament/tables.py:105 -#: templates/tournament/team_detail.html:121 -#: templates/tournament/team_detail.html:129 +#: apps/tournament/tables.py:59 apps/tournament/tables.py:127 +msgid "Tournament" +msgstr "Tournoi" + +#: apps/tournament/tables.py:73 apps/tournament/tables.py:108 +#: templates/tournament/team_detail.html:135 +#: templates/tournament/team_detail.html:144 msgid "Download" msgstr "Télécharger" -#: apps/tournament/tables.py:116 +#: apps/tournament/tables.py:120 msgid "Problems" msgstr "Problèmes" -#: apps/tournament/tables.py:118 -msgid "Tournament" -msgstr "Tournoi" - #: apps/tournament/views.py:50 msgid "Tournaments list" msgstr "Liste des tournois" @@ -595,54 +595,54 @@ msgstr "Tournoi de {name}" msgid "Update tournament" msgstr "Modifier le tournoi" -#: apps/tournament/views.py:134 apps/tournament/views.py:223 +#: apps/tournament/views.py:134 apps/tournament/views.py:244 #, python-brace-format msgid "Solutions for team {team}.zip" msgstr "Solutions pour l'équipe {team}.zip" -#: apps/tournament/views.py:167 +#: apps/tournament/views.py:187 msgid "Information about team" msgstr "Informations sur l'équipe" -#: apps/tournament/views.py:176 +#: apps/tournament/views.py:197 msgid "Update team" msgstr "Modifier l'équipe" -#: apps/tournament/views.py:188 +#: apps/tournament/views.py:209 msgid "Add organizer" msgstr "Ajouter un organisateur" -#: apps/tournament/views.py:207 templates/base.html:108 templates/base.html:126 +#: apps/tournament/views.py:228 templates/base.html:108 templates/base.html:126 #: templates/tournament/pool_detail.html:31 msgid "Solutions" msgstr "Solutions" -#: apps/tournament/views.py:248 +#: apps/tournament/views.py:270 msgid "" "You can't publish your solution anymore. Deadline: {date:%m-%d-%Y %H:%M}." msgstr "" "Vous ne pouvez plus publier vos solutions. Deadline : {date:%d/%m/%Y %H:%M}." -#: apps/tournament/views.py:272 +#: apps/tournament/views.py:294 msgid "All solutions" msgstr "Toutes les solutions" -#: apps/tournament/views.py:291 +#: apps/tournament/views.py:313 #, python-brace-format msgid "Solutions for tournament {tournament}.zip" msgstr "Solutions pour le tournoi {tournament}.zip" -#: apps/tournament/views.py:317 templates/base.html:111 templates/base.html:129 -#: templates/tournament/pool_detail.html:59 +#: apps/tournament/views.py:340 templates/base.html:111 templates/base.html:129 +#: templates/tournament/pool_detail.html:57 msgid "Syntheses" msgstr "Synthèses" -#: apps/tournament/views.py:333 +#: apps/tournament/views.py:356 #, python-brace-format msgid "Syntheses for team {team}.zip" msgstr "Notes de synthèse de l'équipe {team}.zip" -#: apps/tournament/views.py:358 +#: apps/tournament/views.py:381 msgid "" "You can't publish your synthesis anymore for the first round. Deadline: " "{date:%m-%d-%Y %H:%M}." @@ -650,7 +650,7 @@ msgstr "" "Vous ne pouvez plus envoyer vos notes de synthèse pour le premier tour. " "Deadline : {date:%d/%m/%Y %h:%M}." -#: apps/tournament/views.py:364 +#: apps/tournament/views.py:387 msgid "" "You can't publish your synthesis anymore for the second round. Deadline: " "{date:%m-%d-%Y %H:%M}." @@ -658,32 +658,32 @@ msgstr "" "Vous ne pouvez plus envoyer vos notes de synthèse pour le second tour. " "Deadline : {date:%d/%m/%Y %h:%M}." -#: apps/tournament/views.py:390 +#: apps/tournament/views.py:413 msgid "All syntheses" msgstr "Toutes les notes de synthèses" -#: apps/tournament/views.py:409 +#: apps/tournament/views.py:432 #, python-brace-format msgid "Syntheses for tournament {tournament}.zip" msgstr "Notes de synthèse pour le tournoi {tournament}.zip" -#: apps/tournament/views.py:434 templates/base.html:133 +#: apps/tournament/views.py:457 templates/base.html:133 msgid "Pools" msgstr "Poules" -#: apps/tournament/views.py:450 +#: apps/tournament/views.py:474 msgid "Create pool" msgstr "Créer une poule" -#: apps/tournament/views.py:458 +#: apps/tournament/views.py:482 msgid "Pool detail" msgstr "Détails d'une poule" -#: apps/tournament/views.py:487 +#: apps/tournament/views.py:511 msgid "Solutions of a pool.zip" msgstr "Solutions d'une poule.zip" -#: apps/tournament/views.py:503 +#: apps/tournament/views.py:527 msgid "Syntheses of a pool.zip" msgstr "Notes de synthèse d'une poule.zip" @@ -811,7 +811,7 @@ msgstr "Filtres" #: templates/member/my_account.html:8 templates/tournament/add_organizer.html:9 #: templates/tournament/pool_form.html:9 #: templates/tournament/solutions_list.html:24 -#: templates/tournament/syntheses_list.html:10 +#: templates/tournament/syntheses_list.html:15 #: templates/tournament/team_form.html:9 #: templates/tournament/tournament_form.html:9 msgid "Submit" @@ -830,7 +830,7 @@ msgid "class" msgstr "classe" #: templates/member/tfjmuser_detail.html:76 -#: templates/tournament/team_detail.html:116 +#: templates/tournament/team_detail.html:129 msgid "Documents" msgstr "Documents" @@ -986,11 +986,16 @@ msgid "Solutions will be available here for teams from:" msgstr "Les solutions seront disponibles ici pour les équipes à partir du :" #: templates/tournament/pool_detail.html:49 -#: templates/tournament/pool_detail.html:71 +#: templates/tournament/pool_detail.html:74 msgid "Download ZIP archive" msgstr "Télécharger l'archive ZIP" -#: templates/tournament/pool_detail.html:80 +#: templates/tournament/pool_detail.html:61 +#: templates/tournament/syntheses_list.html:7 +msgid "Templates for syntheses are available here:" +msgstr "Le modèle de note de synthèse est disponible ici :" + +#: templates/tournament/pool_detail.html:83 msgid "Pool list" msgstr "Liste des poules" @@ -1026,55 +1031,61 @@ msgstr "%(tournament)s — ZIP" msgid "Team" msgstr "Équipe" -#: templates/tournament/team_detail.html:24 +#: templates/tournament/team_detail.html:25 msgid "coachs" msgstr "encadrants" -#: templates/tournament/team_detail.html:27 +#: templates/tournament/team_detail.html:28 msgid "participants" msgstr "participants" -#: templates/tournament/team_detail.html:37 +#: templates/tournament/team_detail.html:39 msgid "Send a mail to people in this team" msgstr "Envoyer un mail à toutes les personnes de cette équipe" -#: templates/tournament/team_detail.html:44 +#: templates/tournament/team_detail.html:49 msgid "Edit team" msgstr "Modifier l'équipe" -#: templates/tournament/team_detail.html:50 +#: templates/tournament/team_detail.html:53 +#, fuzzy +#| msgid "selected for final" +msgid "Select for final" +msgstr "sélectionnée pour la finale" + +#: templates/tournament/team_detail.html:59 msgid "Delete team" msgstr "Supprimer l'équipe" -#: templates/tournament/team_detail.html:52 +#: templates/tournament/team_detail.html:61 msgid "Leave this team" msgstr "Quitter l'équipe" -#: templates/tournament/team_detail.html:93 +#: templates/tournament/team_detail.html:105 msgid "The team is waiting about validation." msgstr "L'équipe est en attente de validation" -#: templates/tournament/team_detail.html:100 +#: templates/tournament/team_detail.html:112 msgid "Message addressed to the team:" msgstr "Message adressé à l'équipe :" -#: templates/tournament/team_detail.html:101 +#: templates/tournament/team_detail.html:114 msgid "Message..." msgstr "Message ..." -#: templates/tournament/team_detail.html:106 +#: templates/tournament/team_detail.html:119 msgid "Invalidate team" msgstr "Invalider l'équipe" -#: templates/tournament/team_detail.html:107 +#: templates/tournament/team_detail.html:120 msgid "Validate team" msgstr "Valider l'équipe" -#: templates/tournament/team_detail.html:120 +#: templates/tournament/team_detail.html:133 msgid "Motivation letter:" msgstr "Lettre de motivation :" -#: templates/tournament/team_detail.html:136 +#: templates/tournament/team_detail.html:152 msgid "Download solutions as ZIP" msgstr "Télécharger les solutions en archive ZIP" diff --git a/static/Fiche synthèse.pdf b/static/Fiche synthèse.pdf new file mode 100644 index 0000000..af8ed1c Binary files /dev/null and b/static/Fiche synthèse.pdf differ diff --git a/static/Fiche synthèse.tex b/static/Fiche synthèse.tex new file mode 100644 index 0000000..bc2daa9 --- /dev/null +++ b/static/Fiche synthèse.tex @@ -0,0 +1,194 @@ +\documentclass{article} + +\usepackage[utf8]{inputenc} +\usepackage[french]{babel} +\usepackage{graphicx} + +\usepackage[left=2cm,right=2cm,top=2cm,bottom=2cm]{geometry} % marges + +\usepackage{amsthm} +\usepackage{amsmath} +\usepackage{amsfonts} +\usepackage{amssymb} +\usepackage{tikz} + +\newcommand{\N}{{\bf N}} +\newcommand{\Z}{{\bf Z}} +\newcommand{\Q}{{\bf Q}} +\newcommand{\R}{{\bf R}} +\newcommand{\C}{{\bf C}} +\newcommand{\A}{{\bf A}} + +\newtheorem{theo}{Théorème} +\newtheorem{theo-defi}[theo]{Théorème-Définition} +\newtheorem{defi}[theo]{Définition} +\newtheorem{lemme}[theo]{Lemme} +\newtheorem{slemme}[theo]{Sous-lemme} +\newtheorem{prop}[theo]{Proposition} +\newtheorem{coro}[theo]{Corollaire} +\newtheorem{conj}[theo]{Conjecture} + +\title{Note de synthèse} + +\begin{document} +\pagestyle{empty} + +\begin{center} +\begin{Huge} +$\mathbb{TFJM}^2$ +\end{Huge} + +\bigskip + +\begin{Large} +NOTE DE SYNTHESE +\end{Large} +\end{center} + +Tour \underline{~~~~} poule \underline{~~~~} + +\medskip + +Problème \underline{~~~~} défendu par l'équipe \underline{~~~~~~~~~~~~~~~~~~~~~~~~} + +\medskip + +Synthèse par l'équipe \underline{~~~~~~~~~~~~~~~~~~~~~~~~} dans le rôle de : ~ $\square$ Opposant ~ $\square$ Rapporteur + +\section*{Questions traitées} + +\begin{tabular}{r c l} + \begin{tabular}{|c|c|c|c|c|c|} + \hline + Question ~ & ER & ~PR~ & QE & NT \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + \end{tabular} +& ~~ & + \begin{tabular}{|c|c|c|c|c|c|} + \hline + Question ~ & ER & ~PR~ & QE & NT \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + \end{tabular} \\ + + & & \\ + +ER : entièrement résolue & & PR : partiellement résolue \\ + +\smallskip + +QE : quelques éléments de réponse & & NT : non traitée +\end{tabular} + +~ + +\smallskip + +Remarque : il est possible de cocher entre les cases pour un cas intermédiaire. + +\section*{Evaluation qualitative de la solution} + +Donnez votre avis concernant la solution. Mettez notamment en valeur les points positifs (des idées +importantes, originales, etc.) et précisez ce qui aurait pu améliorer la solution. + +\vfill + +\textbf{Evaluation générale :} ~ $\square$ Excellente ~ $\square$ Bonne ~ $\square$ Suffisante ~ $\square$ Passable + +\newpage + +\section*{Erreurs et imprécisions} + +Listez ci-dessous les cinq erreurs et/ou imprécisions les plus importantes selon vous, par ordre d'importance, en précisant la +question concernée, la page, le paragraphe et le type de remarque. + +\bigskip + +1. Question \underline{~~~~} Page \underline{~~~~} Paragraphe \underline{~~~~} + +$\square$ Erreur majeure ~ $\square$ Erreur mineure ~ $\square$ Imprécision ~ $\square$ Autre : \underline{~~~~~~~~} + +Description : + +\vfill + +2. Question \underline{~~~~} Page \underline{~~~~} Paragraphe \underline{~~~~} + +$\square$ Erreur majeure ~ $\square$ Erreur mineure ~ $\square$ Imprécision ~ $\square$ Autre : \underline{~~~~~~~~} + +Description : + +\vfill + +3. Question \underline{~~~~} Page \underline{~~~~} Paragraphe \underline{~~~~} + +$\square$ Erreur majeure ~ $\square$ Erreur mineure ~ $\square$ Imprécision ~ $\square$ Autre : \underline{~~~~~~~~} + +Description : + +\vfill + +4. Question \underline{~~~~} Page \underline{~~~~} Paragraphe \underline{~~~~} + +$\square$ Erreur majeure ~ $\square$ Erreur mineure ~ $\square$ Imprécision ~ $\square$ Autre : \underline{~~~~~~~~} + +Description : + +\vfill + +5. Question \underline{~~~~} Page \underline{~~~~} Paragraphe \underline{~~~~} + +$\square$ Erreur majeure ~ $\square$ Erreur mineure ~ $\square$ Imprécision ~ $\square$ Autre : \underline{~~~~~~~~} + +Description : + +\vfill + +\section*{Remarques formelles (facultatif)} + +Donnez votre avis concernant la présentation de la solution (lisibilité, etc.). + +\vfill + + + +\end{document} diff --git a/templates/tournament/pool_detail.html b/templates/tournament/pool_detail.html index 7735607..4788ff7 100644 --- a/templates/tournament/pool_detail.html +++ b/templates/tournament/pool_detail.html @@ -50,29 +50,32 @@ +
- {% if user.organizes %} -
- -
-
-

{% trans "Syntheses" %}

+
+
+

{% trans "Syntheses" %}

+
+
+
+ {% trans "Templates for syntheses are available here:" %} + PDF -- TEX
-
+ {% if user.organizes %} -
-
-
- {% csrf_token %} - -
-
-
- {% endif %} +
+
+
+ {% csrf_token %} + +
+
+ {% endif %} +
diff --git a/templates/tournament/syntheses_list.html b/templates/tournament/syntheses_list.html index 2503997..d81d68d 100644 --- a/templates/tournament/syntheses_list.html +++ b/templates/tournament/syntheses_list.html @@ -3,6 +3,11 @@ {% load i18n crispy_forms_filters django_tables2 %} {% block content %} +
+ {% trans "Templates for syntheses are available here:" %} + PDF -- TEX +
+ {% if form %}
{% csrf_token %}