From 61446a074b85b091f59cc0282ae5e37ea4c0c60d Mon Sep 17 00:00:00 2001
From: Benjamin Bertrand <lafrite@poneyworld.net>
Date: Fri, 10 Mar 2017 08:23:05 +0300
Subject: [PATCH] adapt templates to new structure

---
 notes_tools/reports/templates/tpl_reports.tex |  3 ++
 .../reports/templates/tpl_reports_term.tex    | 54 +++++++++++++++----
 2 files changed, 46 insertions(+), 11 deletions(-)

diff --git a/notes_tools/reports/templates/tpl_reports.tex b/notes_tools/reports/templates/tpl_reports.tex
index 5f9ee25..2b9f271 100644
--- a/notes_tools/reports/templates/tpl_reports.tex
+++ b/notes_tools/reports/templates/tpl_reports.tex
@@ -16,6 +16,9 @@
 
 \pagebreak
 
+\Block{block evalPOV}\Block{endblock}
+
+\pagebreak
 
 \Block{block students}\Block{endblock}
 
diff --git a/notes_tools/reports/templates/tpl_reports_term.tex b/notes_tools/reports/templates/tpl_reports_term.tex
index 4e90b29..05fc261 100644
--- a/notes_tools/reports/templates/tpl_reports_term.tex
+++ b/notes_tools/reports/templates/tpl_reports_term.tex
@@ -2,32 +2,64 @@
 % FILENAME: "tpl_reports_term.tex
 
 %- block classPOV
+\maketitle
+{\Large Regard sur la classe}
+
+\Var{classe.eval_tabular}
+
+\vfill
+
+\Var{classe.parallel_on_evals | includegraphics(document_path=directory, scale=0.5)}
+
+\begin{multicols}{2}
+    Compétences
+
+    \Var{classe.pies_eff_pts_on_competence | includegraphics(document_path=directory, scale=0.3)}
+
+
+    Élements du programme
+
+    \Var{classe.pies_eff_pts_on_domaine | includegraphics(document_path=directory, scale=0.3)}
+
+\end{multicols}
+
 %- endblock
 
+%-block evalPOV
+\maketitle
+{\Large Regard sur les évaluations}
+
+\Var{classe.evals_tabular}
+
+
+%-endblock
+
+
+
 %-block students
 %- for e in students
 \maketitle
 
-{\Large \Var{e["Nom"]}}
+{\Large \Var{e.name}}
 
 \vfill
 
-\Var{e["eval"].groupby("Nom").sum()[["Mark","Bareme"]].T.to_latex()}
+\Var{e.marks_tabular}
 
 \vfill
-\Var{e["quest"] | radar_on("Competence") | includegraphics(document_path=directory, scale=0.6)}
-\Var{e["quest"] | radar_on("Domaine") | includegraphics(document_path=directory, scale=0.6)}
-
-\vfill
-\hspace{-2cm}
-\Var{e["quest"] | pies_skills_level("Competence") | includegraphics(document_path=directory, scale=0.3)}
+\Var{e.radar_on_competence | includegraphics(document_path=directory, scale=0.5)}
+\Var{e.radar_on_domaine | includegraphics(document_path=directory, scale=0.5)}
 
 
 \vfill
+\Var{e.pies_on_competence | includegraphics(document_path=directory, scale=0.2)}
+\Var{e.pies_on_domaine | includegraphics(document_path=directory, scale=0.2)}
+
+
 %#\Var{conn_df}
-%- if not conn_df.empty
-\Var{conn_df | parallele_on("Exercice", e["Nom"]) | includegraphics(document_path=directory, scale=0.5)}
-%- endif
+%# %- if not conn_df.empty
+%# \Var{e.parallel_on_evals(classe.eval_df) | includegraphics(document_path=directory, scale=0.5)}
+%# %- endif
 
 \vfill
 \vfill