fix in results csv

diff --git a/wtem/admin.py b/wtem/admin.py
index 03c4446..3608628 100644 (file)
--- 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 (file)
--- 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