From 18696a805c49a76f4fd499f9f73c87943ca2fe96 Mon Sep 17 00:00:00 2001
From: Bertrand Benjamin <benjamin.bertrand@opytex.org>
Date: Sun, 4 Aug 2019 16:43:06 +0200
Subject: [PATCH] Feat: tpl_evaluation parameters and absolute path

---
 recopytex.py                   | 15 ++++++++++-----
 templates/tpl_evaluation.ipynb | 24 ++++++++----------------
 templates/tpl_student.ipynb    | 24 ++++++++++++------------
 3 files changed, 30 insertions(+), 33 deletions(-)

diff --git a/recopytex.py b/recopytex.py
index dc3db95..af99a81 100644
--- a/recopytex.py
+++ b/recopytex.py
@@ -32,17 +32,22 @@ def report(csv_file):
         click.echo(f"{csv_file} has to be a csv file")
         sys.exit(1)
 
-    *a, tribe, assessment_file = csv_file.split("/")
-    assessment_desc = assessment_file.split(".")[0]
-    assessment_name = assessment_desc.split("_")[-1].capitalize()
+    csv_file = Path(csv_file)
+    csv_filename = csv_file.name.split(".")[0]
+    assessment = str(csv_filename).split("_")[-1].capitalize()
+    tribe = str(csv_file.parent).split("/")[-1]
 
     template = Path(config["templates"]) / "tpl_evaluation.ipynb"
-    dest = Path(config["output"]) / tribe / assessment_name / f"{assessment_name}.ipynb"
 
+    dest = Path(config["output"]) / tribe / csv_filename / f"{assessment}.ipynb"
     dest.parent.mkdir(parents=True, exist_ok=True)
 
     pm.execute_notebook(
-        str(template), str(dest), parameters=dict(tribe=tribe, assessment=assessment_name)
+        str(template),
+        str(dest),
+        parameters=dict(
+            tribe=tribe, assessment=assessment, csv_file=str(csv_file.absolute())
+        ),
     )
 
 
diff --git a/templates/tpl_evaluation.ipynb b/templates/tpl_evaluation.ipynb
index e411d53..55e4150 100644
--- a/templates/tpl_evaluation.ipynb
+++ b/templates/tpl_evaluation.ipynb
@@ -1,19 +1,5 @@
 {
  "cells": [
-  {
-   "cell_type": "code",
-   "execution_count": 36,
-   "metadata": {
-    "tags": [
-     "parameters"
-    ]
-   },
-   "outputs": [],
-   "source": [
-    "tribe = \"308\"\n",
-    "assessment = \"161114_dm2\""
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": 37,
@@ -27,10 +13,16 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 40,
-   "metadata": {},
+   "execution_count": 36,
+   "metadata": {
+    "tags": [
+     "parameters"
+    ]
+   },
    "outputs": [],
    "source": [
+    "tribe = \"308\"\n",
+    "assessment = \"161114_dm2\"\n",
     "csv_file = Path(f\"./sheets/{tribe}/{assessment}.csv\")"
    ]
   },
diff --git a/templates/tpl_student.ipynb b/templates/tpl_student.ipynb
index b98e8ed..82612b3 100644
--- a/templates/tpl_student.ipynb
+++ b/templates/tpl_student.ipynb
@@ -1,5 +1,16 @@
 {
  "cells": [
+  {
+   "cell_type": "code",
+   "execution_count": 7,
+   "metadata": {},
+   "outputs": [],
+   "source": [
+    "from IPython.display import Markdown as md\n",
+    "import pandas as pd\n",
+    "from pathlib import Path"
+   ]
+  },
   {
    "cell_type": "code",
    "execution_count": 6,
@@ -10,21 +21,10 @@
    },
    "outputs": [],
    "source": [
-    "tribe = 308\n",
+    "tribe = 30\n",
     "student = \"ABDOU Asmahane\""
    ]
   },
-  {
-   "cell_type": "code",
-   "execution_count": 7,
-   "metadata": {},
-   "outputs": [],
-   "source": [
-    "from IPython.display import Markdown as md\n",
-    "import pandas as pd\n",
-    "from pathlib import Path"
-   ]
-  },
   {
    "cell_type": "code",
    "execution_count": 9,