From ff07842dc629e07f081ae578e50c42e4a54bc810 Mon Sep 17 00:00:00 2001
From: jwansek <eddie.atten.ea29@gmail.com>
Date: Mon, 31 Jan 2022 15:40:56 +0000
Subject: Added datetime and removed newlines from pytest reports for txt
 template

---
 examplerun.bat       | 2 +-
 templates/txt.jinja2 | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/examplerun.bat b/examplerun.bat
index 01e133c..3364a63 100644
--- a/examplerun.bat
+++ b/examplerun.bat
@@ -1,3 +1,3 @@
 zip -r 100301654.zip .\ExampleSubmission\
-python .\mark.py -s 100301654.zip -a .\ExampleAssessments\example.yml -f md
+python .\mark.py -s 100301654.zip -a .\ExampleAssessments\example.yml -f md -o auto
 rm 100301654.zip
\ No newline at end of file
diff --git a/templates/txt.jinja2 b/templates/txt.jinja2
index df2e100..5ab8776 100644
--- a/templates/txt.jinja2
+++ b/templates/txt.jinja2
@@ -38,6 +38,7 @@
 {%- endmacro -%}
 
 === {{ name }} - Student ID: {{ student_no }} Automatic marking report ===
+Report generated at {{ get_datetime() }}
 
 == Class Tree: ==
 
@@ -109,5 +110,5 @@
 {% endfor %}
 
 {% if out != "stdout" -%}
-{{ test_results["pytest_report"] }}
+{{ test_results["pytest_report"].replace("\n", "") }}
 {%- endif -%}
\ No newline at end of file
-- 
cgit v1.2.3