From cbac93ec0cfdb3d2fcb30f2a001b67714b4271d1 Mon Sep 17 00:00:00 2001 From: Benjamin Bertrand Date: Wed, 29 Mar 2017 08:57:45 +0300 Subject: [PATCH] Adapt eval template --- .../reports/templates/tpl_reports_eval.tex | 40 ++++--------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/notes_tools/reports/templates/tpl_reports_eval.tex b/notes_tools/reports/templates/tpl_reports_eval.tex index b25b3a7..6adbd49 100644 --- a/notes_tools/reports/templates/tpl_reports_eval.tex +++ b/notes_tools/reports/templates/tpl_reports_eval.tex @@ -9,10 +9,10 @@ Devoir sur \Var{eval_df["Bareme"].iloc[0]} \vfill -\Var{eval_df.describe()[["Mark"]].T.to_latex()} +%- \Var{eval_df.describe()[["Mark"]].T.to_latex()} \vfill -\Var{eval_df| marks_hist | includegraphics(document_path=directory, scale=0.5)} +%- \Var{eval_df| marks_hist | includegraphics(document_path=directory, scale=0.5)} %- endblock @@ -22,11 +22,11 @@ Devoir sur \Var{eval_df["Bareme"].iloc[0]} \begin{minipage}{0.5\linewidth} \large - \Var{e["Nom"]} + \Var{e.name} \end{minipage} \begin{minipage}{0.3\linewidth} \begin{flushright} - \Large \Var{e["Total"]["Mark"]} / \Var{e["Total"]["Bareme"]} + \Large \Var{e.eval["Mark_barem"]} \end{flushright} \end{minipage} @@ -41,40 +41,16 @@ Devoir sur \Var{eval_df["Bareme"].iloc[0]} } \end{minipage} \begin{minipage}{0.4\linewidth} - \Var{e["quest"] | radar_on("Competence") | includegraphics(document_path=directory, scale=0.4)} + %- \Var{e["quest"] | radar_on("Competence") | includegraphics(document_path=directory, scale=0.4)} \end{minipage} \vfill \scriptsize \begin{multicols}{3} - - %- for exo in e["Exercices"] -\begin{tabular}{|p{2cm}|c|} - - %- if exo["Nom"] in ["Bonus", "Malus", "Presentation"] - %- for _,q in exo["Questions"].iterrows() - %- if q["Mark"] - \hline - \rowcolor{highlightbg} - \Var{exo["Nom"]} (\Var{q["Question"]}) & \Var{q["Latex_rep"]} \\ - %- endif - %- endfor - %- else - - \hline - \rowcolor{highlightbg} - Exerice \Var{exo["Nom"]} & \Var{exo["Total"]["Mark"]} / \Var{exo["Total"]["Bareme"]} \\ - %- for _,q in exo["Questions"].iterrows() - \hline - \Var{q["Question"]} \newline \Var{q["Commentaire"]} & \Var{q["Latex_rep"]} \\ - %- endfor - %- endif - - - \hline -\end{tabular} -%- endfor + %- for exo_tab in e.latex_exo_tabulars() + \Var{exo_tab} + %- endfor \end{multicols} \vfill