school in results csv

diff --git a/wtem/management/commands/wtem_send_results.py b/wtem/management/commands/wtem_send_results.py
index d2dc147..ef593e7 100644 (file)
--- a/wtem/management/commands/wtem_send_results.py
+++ b/wtem/management/commands/wtem_send_results.py
@@ -50,7 +50,7 @@ class Command(BaseCommand):
 
     def handle_to_students(self, *args, **options):
         self.stdout.write('>>> Sending results to students')
 
     def handle_to_students(self, *args, **options):
         self.stdout.write('>>> Sending results to students')

-        subject = 'Wyniki II etapu Wielkiego Turnieju Edukacji Medialnej'
+        subject = 'Wyniki I etapu Olimpiady Cyfrowej'

 
         for submission in get_submissions():
             if options['only_to'] and submission.email != options['only_to']:
 
         for submission in get_submissions():
             if options['only_to'] and submission.email != options['only_to']:


@@ -67,8 +67,7 @@ class Command(BaseCommand):
 
     def handle_to_teachers(self, *args, **options):
         self.stdout.write('>>> Sending results to teachers')
 
     def handle_to_teachers(self, *args, **options):
         self.stdout.write('>>> Sending results to teachers')

-        subject = 'Wyniki II etapu Wielkiego Turnieju Edukacji Medialnej'
-        failed = sent = 0
+        subject = 'Wyniki I etapu Olimpiady Cyfrowej'

 
         submissions_by_contact = dict()
 
 
         submissions_by_contact = dict()
 

diff --git a/wtem/models.py b/wtem/models.py
index d355506..3947632 100644 (file)
--- a/wtem/models.py
+++ b/wtem/models.py
@@ -127,6 +127,8 @@ class Submission(models.Model):
             if t == 'edumed_prawdafalsz':
                 toret = 0
                 for idx, statement in enumerate(exercise['statements']):
             if t == 'edumed_prawdafalsz':
                 toret = 0
                 for idx, statement in enumerate(exercise['statements']):

+                    if statement[1] == 'ignore':
+                        continue

                     if answer[idx] == 'true':
                         given = True
                     elif answer[idx] == 'false':
                     if answer[idx] == 'true':
                         given = True
                     elif answer[idx] == 'false':

diff --git a/wtem/templates/wtem/admin_report.csv b/wtem/templates/wtem/admin_report.csv
index c6ef91f..f97755f 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 %}
 {% 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.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
+{{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