X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/fd65827f7d34921b927dfd735099b0690aa3a2df..829d0d2004d3f22facae4f649c8b88f67f02beb8:/wtem/management/commands/wtem_send_results_csv.py

diff --git a/wtem/management/commands/wtem_send_results_csv.py b/wtem/management/commands/wtem_send_results_csv.py
index 0d15c17..97a98eb 100644
--- a/wtem/management/commands/wtem_send_results_csv.py
+++ b/wtem/management/commands/wtem_send_results_csv.py
@@ -3,39 +3,41 @@
 from optparse import make_option
 
 from django.core.management.base import BaseCommand
-from django.conf import settings
-from wtem.management.commands import send_mail
-from django.utils import translation
 from django.template.loader import render_to_string
+from django.utils import translation
 
-from contact.models import Contact
+from wtem.management.commands import send_mail
 from wtem.models import Submission
 
 
 def get_submissions():
-    return sorted(Submission.objects.exclude(answers = None).all(), key=lambda s: -s.final_result)
+    return sorted(Submission.objects.exclude(answers=None).all(), key=lambda s: -s.final_result)
+
+minimum = 52
 
-minimum = 55
 
 class Command(BaseCommand):
     args = 'csv_filename'
 
     option_list = BaseCommand.option_list + (
-        make_option('--to-teachers',
+        make_option(
+            '--to-teachers',
             action='store_true',
             dest='to_teachers',
             default=False,
             help='Send emails to teachers'),
-        make_option('--to-students',
+        make_option(
+            '--to-students',
             action='store_true',
             dest='to_students',
             default=False,
             help='Send emails to students'),
-        make_option('--only-to',
+        make_option(
+            '--only-to',
             action='store',
             dest='only_to',
             default=None,
-            help='Send emails to students'),
+            help='Send emails only to listed addresses'),
     )
 
     def handle(self, csv_filename, *args, **options):
@@ -49,47 +51,51 @@ class Command(BaseCommand):
 
     def handle_to_students(self, *args, **options):
         self.stdout.write('>>> Sending results to students')
-        subject = 'Wyniki I etapu Wielkiego Turnieju Edukacji Medialnej'
+        subject = 'Wyniki II etapu Wielkiego Turnieju Edukacji Medialnej'
 
-        for result in self.results:
-            if options['only_to'] and result[1] != options['only_to']:
+        for email, last_name, first_name, final_result in self.results:
+            if options['only_to'] and email != options['only_to']:
                 continue
-            final_result = result[4]
-            if result[5] != 'TAK':
+            if final_result == 'dyskwalifikacja':
+                template = 'results_student_disqualified.txt'
+            elif float(final_result) < minimum:
                 template = 'results_student_failed.txt'
             else:
                 template = 'results_student_passed.txt'
             message = render_to_string('wtem/' + template, dict(final_result=final_result))
-            self.send_message(message, subject, result[1])
+            self.send_message(message, subject, email)
 
         self.sum_up()
 
     def handle_to_teachers(self, *args, **options):
         self.stdout.write('>>> Sending results to teachers')
-        subject = 'Wyniki I etapu Wielkiego Turnieju Edukacji Medialnej'
-        failed = sent = 0
+        subject = 'Wyniki II etapu Wielkiego Turnieju Edukacji Medialnej'
 
         submissions_by_contact = dict()
 
         from decimal import Decimal, InvalidOperation
+
         def dec_or_0(s):
             try:
                 return Decimal(s)
             except InvalidOperation:
                 return Decimal(0)
 
-        for result in sorted(self.results, key=lambda r: dec_or_0(r[4]), reverse=True):
-            if options['only_to'] and result[3] != options['only_to']:
+        sorted_results = sorted(self.results, key=lambda r: dec_or_0(r[3]), reverse=True)
+        for email, last_name, first_name, final_result in sorted_results:
+            submission = Submission.objects.get(email=email)
+            teacher_email = submission.contact.contact
+            if options['only_to'] and teacher_email != options['only_to']:
                 continue
-            submissions_by_contact.setdefault(result[3], []).append({
-                'first_name': result[0].split()[0],
-                'last_name': result[0].split()[1],
-                'final_result': result[4],
+            submissions_by_contact.setdefault(teacher_email, []).append({
+                'first_name': first_name,
+                'last_name': last_name,
+                'final_result': final_result,
             })
 
         for email, submissions in submissions_by_contact.items():
             # contact = Contact.objects.get(id=contact_id)
-            message = render_to_string('wtem/results_teacher.txt', dict(submissions = submissions))
+            message = render_to_string('wtem/results_teacher.txt', dict(submissions=submissions))
             self.send_message(message, subject, email)
 
         self.sum_up()
@@ -100,16 +106,10 @@ class Command(BaseCommand):
     def send_message(self, message, subject, email):
         self.stdout.write('>>> sending results to %s' % email)
         try:
-            send_mail(
-                subject = subject,
-                body = message,
-                to = [email]
-            )
+            send_mail(subject=subject, body=message, to=[email])
         except BaseException, e:
             self.failed += 1
             self.stdout.write('failed sending to: ' + email + ': ' + str(e))
         else:
             self.sent += 1
             self.stdout.write('message sent to: ' + email)
-
-