From: Jan Szejko Date: Tue, 20 Mar 2018 12:00:26 +0000 (+0100) Subject: school address in csv results X-Git-Url: https://git.mdrn.pl/edumed.git/commitdiff_plain/c610fabe645148de87c1ebbf249dfe0da4106bfb?ds=sidebyside school address in csv results --- diff --git a/stage2/views.py b/stage2/views.py index 11be830..2015295 100644 --- a/stage2/views.py +++ b/stage2/views.py @@ -241,7 +241,7 @@ def csv_results(request): writer = csv.writer(response) assignments = Assignment.objects.all() participants = Participant.objects.filter(complete_set=True) - headers = [u'imię', u'nazwisko', u'szkoła'] + headers = [u'imię', u'nazwisko', u'szkoła', u'adres szkoły'] assignments_experts = [] for assignment in assignments: for expert in assignment.experts.filter(mark__answer__assignment=assignment).distinct(): @@ -256,6 +256,7 @@ def csv_results(request): participant.first_name, participant.last_name, participant.contact.body['school'], + participant.contact.body['school_address'], ] for assignment, expert in assignments_experts: marks = expert.mark_set.filter(answer__assignment=assignment, answer__participant=participant)