fnp
/
edumed.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
48efe1c
)
school address in csv results
author
Jan Szejko
<janek37@gmail.com>
Tue, 20 Mar 2018 12:00:26 +0000
(13:00 +0100)
committer
Jan Szejko
<janek37@gmail.com>
Tue, 20 Mar 2018 12:00:26 +0000
(13:00 +0100)
stage2/views.py
patch
|
blob
|
history
diff --git
a/stage2/views.py
b/stage2/views.py
index
11be830
..
2015295
100644
(file)
--- 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)
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():
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.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)
]
for assignment, expert in assignments_experts:
marks = expert.mark_set.filter(answer__assignment=assignment, answer__participant=participant)