From 1de527b403042ae29020e328ff24e4a26b575189 Mon Sep 17 00:00:00 2001 From: Jan Szejko Date: Thu, 24 Nov 2016 11:38:26 +0100 Subject: [PATCH] fix in results csv --- wtem/admin.py | 2 ++ wtem/templates/wtem/admin_report.csv | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/wtem/admin.py b/wtem/admin.py index 03c4446..3608628 100644 --- a/wtem/admin.py +++ b/wtem/admin.py @@ -224,6 +224,8 @@ class SubmissionsSet: examiners = self.examiners_by_exercise.setdefault(exercise_id, []) if user not in examiners: examiners.append(user) + contact_body = submission.contact.body + submission.school = '%s %s' % (contact_body['institution'], contact_body['institution_address']) def report_view(request): diff --git a/wtem/templates/wtem/admin_report.csv b/wtem/templates/wtem/admin_report.csv index f97755f..c436b2c 100644 --- a/wtem/templates/wtem/admin_report.csv +++ b/wtem/templates/wtem/admin_report.csv @@ -1,2 +1,2 @@ -{% load wtem_csv %}email,nazwisko,imie,suma{% for exercise_id in exercise_ids %}{% csv_header exercise_id submissionsSet %}{% endfor %}{% for submission in submissionsSet.submissions %} -{{submission.email}},{{submission.last_name}},{{submission.first_name}},"{{submission.contact.body.institution}} {{submission.contact.body.institution_address}}",{{submission.final_result_as_string}}{% for exercise_id in exercise_ids %},{% csv_row_fragment exercise_id submission submissionsSet %}{% endfor %}{% endfor %} \ No newline at end of file +{% load wtem_csv %}email,nazwisko,imie,szkola,suma{% for exercise_id in exercise_ids %}{% csv_header exercise_id submissionsSet %}{% endfor %}{% for submission in submissionsSet.submissions %} +{{submission.email}},{{submission.last_name}},{{submission.first_name}},"{{submission.school}}",{{submission.final_result_as_string}}{% for exercise_id in exercise_ids %},{% csv_row_fragment exercise_id submission submissionsSet %}{% endfor %}{% endfor %} \ No newline at end of file -- 2.20.1