diff --git a/participation/models.py b/participation/models.py index 1f7fcbc..383b9b5 100644 --- a/participation/models.py +++ b/participation/models.py @@ -937,7 +937,7 @@ class Participation(models.Model): problem=opponent_passage.solution_number, passage_url=passage_url) reviewer_text = _("

You will report the solution of the team {reviewer} on the " - "problem {problem}. " + "problem {problem}. " "You can upload your synthesis sheet on this page.

") solution_url = reviewer_passage.defended_solution.file.url passage_url = reverse_lazy("participation:passage_detail", args=(reviewer_passage.pk,)) @@ -947,7 +947,7 @@ class Participation(models.Model): if observer_passage: observer_text = _("

You will observe the solution of the team {observer} on the " - "problem {problem}. " + "problem {problem}. " "You can upload your synthesis sheet on this page.

") solution_url = observer_passage.defended_solution.file.url passage_url = reverse_lazy("participation:passage_detail", args=(observer_passage.pk,)) @@ -958,9 +958,14 @@ class Participation(models.Model): else: observer_content = "" - syntheses_template_begin = f"{settings.STATIC_URL}Fiche_synthèse." - syntheses_templates = " — ".join(f"{ext.upper()}" - for ext in ["pdf", "tex", "odt", "docx"]) + if settings.TFJM_APP == "TFJM": + syntheses_template_begin = f"{settings.STATIC_URL}tfjm/Fiche_synthèse." + syntheses_templates = " — ".join(f"{ext.upper()}" + for ext in ["pdf", "tex", "odt", "docx"]) + else: + syntheses_template_begin = f"{settings.STATIC_URL}eteam/Written_review." + syntheses_templates = " — ".join(f"{ext.upper()}" + for ext in ["pdf", "tex"]) syntheses_templates_content = f"

{_('Templates:')} {syntheses_templates}

" content = defender_content + opponent_content + reviewer_content + observer_content \ @@ -995,7 +1000,7 @@ class Participation(models.Model): problem=opponent_passage.solution_number, passage_url=passage_url) reviewer_text = _("

You will report the solution of the team {reviewer} on the " - "problem {problem}. " + "problem {problem}. " "You can upload your synthesis sheet on this page.

") solution_url = reviewer_passage.defended_solution.file.url passage_url = reverse_lazy("participation:passage_detail", args=(reviewer_passage.pk,)) @@ -1005,7 +1010,7 @@ class Participation(models.Model): if observer_passage: observer_text = _("

You will observe the solution of the team {observer} on the " - "problem {problem}. " + "problem {problem}. " "You can upload your synthesis sheet on this page.

") solution_url = observer_passage.defended_solution.file.url passage_url = reverse_lazy("participation:passage_detail", args=(observer_passage.pk,)) @@ -1016,9 +1021,14 @@ class Participation(models.Model): else: observer_content = "" - syntheses_template_begin = f"{settings.STATIC_URL}Fiche_synthèse." - syntheses_templates = " — ".join(f"{ext.upper()}" - for ext in ["pdf", "tex", "odt", "docx"]) + if settings.TFJM_APP == "TFJM": + syntheses_template_begin = f"{settings.STATIC_URL}tfjm/Fiche_synthèse." + syntheses_templates = " — ".join(f"{ext.upper()}" + for ext in ["pdf", "tex", "odt", "docx"]) + else: + syntheses_template_begin = f"{settings.STATIC_URL}eteam/Written_review." + syntheses_templates = " — ".join(f"{ext.upper()}" + for ext in ["pdf", "tex"]) syntheses_templates_content = f"

{_('Templates:')} {syntheses_templates}

" content = defender_content + opponent_content + reviewer_content + observer_content \ @@ -1054,7 +1064,7 @@ class Participation(models.Model): problem=opponent_passage.solution_number, passage_url=passage_url) reviewer_text = _("

You will report the solution of the team {reviewer} on the " - "problem {problem}. " + "problem {problem}. " "You can upload your synthesis sheet on this page.

") solution_url = reviewer_passage.defended_solution.file.url passage_url = reverse_lazy("participation:passage_detail", args=(reviewer_passage.pk,)) @@ -1064,7 +1074,7 @@ class Participation(models.Model): if observer_passage: observer_text = _("

You will observe the solution of the team {observer} on the " - "problem {problem}. " + "problem {problem}. " "You can upload your synthesis sheet on this page.

") solution_url = observer_passage.defended_solution.file.url passage_url = reverse_lazy("participation:passage_detail", args=(observer_passage.pk,)) @@ -1075,9 +1085,14 @@ class Participation(models.Model): else: observer_content = "" - syntheses_template_begin = f"{settings.STATIC_URL}Fiche_synthèse." - syntheses_templates = " — ".join(f"{ext.upper()}" - for ext in ["pdf", "tex", "odt", "docx"]) + if settings.TFJM_APP == "TFJM": + syntheses_template_begin = f"{settings.STATIC_URL}tfjm/Fiche_synthèse." + syntheses_templates = " — ".join(f"{ext.upper()}" + for ext in ["pdf", "tex", "odt", "docx"]) + else: + syntheses_template_begin = f"{settings.STATIC_URL}eteam/Written_review." + syntheses_templates = " — ".join(f"{ext.upper()}" + for ext in ["pdf", "tex"]) syntheses_templates_content = f"

{_('Templates:')} {syntheses_templates}

" content = defender_content + opponent_content + reviewer_content + observer_content \ diff --git a/participation/templates/participation/upload_synthesis.html b/participation/templates/participation/upload_synthesis.html index 87415a5..c4714a0 100644 --- a/participation/templates/participation/upload_synthesis.html +++ b/participation/templates/participation/upload_synthesis.html @@ -7,10 +7,15 @@
{% trans "Templates:" %} - PDF — - TEX — - ODT — - DOCX + {% if TFJM.APP == "TFJM" %} + PDF — + TEX — + ODT — + DOCX + {% elif TFJM.APP == "ETEAM" %} + PDF — + TEX + {% endif %}
{% csrf_token %} {{ form|crispy }} diff --git a/tfjm/static/eteam/Written_review.pdf b/tfjm/static/eteam/Written_review.pdf new file mode 100644 index 0000000..b63da11 Binary files /dev/null and b/tfjm/static/eteam/Written_review.pdf differ diff --git a/tfjm/static/eteam/Written_review.tex b/tfjm/static/eteam/Written_review.tex new file mode 100644 index 0000000..47a8747 --- /dev/null +++ b/tfjm/static/eteam/Written_review.tex @@ -0,0 +1,196 @@ +\documentclass{article} + +\usepackage[utf8]{inputenc} +\usepackage[english]{babel} +\usepackage{graphicx} + +\usepackage[margin=2cm]{geometry} % marges + +\usepackage{amsthm} +\usepackage{amsmath} +\usepackage{amsfonts} +\usepackage{amssymb} + +\title{Note de synthèse} + +\begin{document} +\pagestyle{empty} + +\begin{center} +\begin{Huge} +ETEAM +\end{Huge} + +\bigskip + +\begin{Large} +WRITTEN REVIEW +\end{Large} +\end{center} + +Round \underline{~~~~} pool \underline{~~~~} + +\medskip + +Problem \underline{~~~~} defended by team \underline{~~~~~~~~~~~~~~~~~~~~~~~~~~~~} + +\medskip + +Written review of the team \underline{~~~~~~~~~~~~~~~~~~~~~~~~~~~~} in the role of : ~ $\square$ Opponent ~ $\square$ Reviewer ~ $\square$ Observer + +\section*{Evaluation, question by question, of the solution} + +Note: it is possible to tick between the boxes for an intermediate case. + +\medskip + +\noindent + \begin{tabular}{|c|c|c|c|c|c|} + \hline + Question & ER & ~PA~ & ~SE~ & NA \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + \end{tabular} + \begin{tabular}{|c|c|c|c|c|c|} + \hline + Question & ER & ~PA~ & ~SE~ & NA \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + & & & & \\ + \hline + \end{tabular} +\hfill +\begin{minipage}{0.27\textwidth} +ER : entirely resolved, nor error, nor mathematical lack + +\smallskip + +PA : partially answered + +\smallskip + +SE : some elements of answer + +\smallskip + +NA : not addressed + +\bigskip + +\end{minipage} + + +\section*{Qualitative evaluation of the solution} + +Give your opinion regarding the solution. In particular, highlight the positive points (important, original +ideas, etc.) and specify what could have improved the solution. + +\vfill + +\begin{center} +\textbf{General evaluation of the solution:} ~ $\square$ Excellent ~ $\square$ Good ~ $\square$ Suffisant ~ $\square$ Average ~ $\square$ Poor +\end{center} + + +\newpage + +\section*{Errors and inaccuracies} + +List below in descending order of importance no more than four errors and/or inaccuracies in your opinion, specifying +the question concerned, the page, the paragraph and the type of remark. + +\medskip + +1. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~} + +$\square$ Major mistake ~ $\square$ Minor mistake ~ $\square$ Inaccuracy ~ $\square$ Other: \underline{~~~~~~~~} + +Description : + +\vfill + +2. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~} + +$\square$ Major mistake ~ $\square$ Minor mistake ~ $\square$ Inaccuracy ~ $\square$ Other: \underline{~~~~~~~~} + +Description : + +\vfill + +3. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~} + +$\square$ Major mistake ~ $\square$ Minor mistake ~ $\square$ Inaccuracy ~ $\square$ Other: \underline{~~~~~~~~} + +Description : + +\vfill + +4. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~} + +$\square$ Major mistake ~ $\square$ Minor mistake ~ $\square$ Inaccuracy ~ $\square$ Other: \underline{~~~~~~~~} + +Description : + +\vfill + + +\section*{Positive aspects} + +Identify at most two strong points of the solution and say why (examples: relevant propositions, important ideas, +relevant generalizations, significant examples, original constructions, etc.). + +\medskip + +1. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~} + +Description : + +\vfill + +2. Question \underline{~~~~~~} Page \underline{~~~~~~} Paragraph \underline{~~~~~~} + +Description : + +\vfill + +\section*{Other remarks (optional)} + +Give your opinion regarding the presentation of the solution (readability, etc.). + +\vfill + + + +\end{document}