X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/ff6b3c61fefe067e73adb8bc076ffd8792c6ad5e..f9f1b488caf738a20f0a3590d89b77fb1c5c7b3d:/wtem/management/commands/wtem_send_results.py

diff --git a/wtem/management/commands/wtem_send_results.py b/wtem/management/commands/wtem_send_results.py
index c0da6fd..f3f9917 100644
--- a/wtem/management/commands/wtem_send_results.py
+++ b/wtem/management/commands/wtem_send_results.py
@@ -3,40 +3,46 @@
 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 contact.models import Contact
 from wtem.models import Submission
 
 
 def get_submissions():
-    return Submission.objects.exclude(answers = None).all()
+    return sorted(Submission.objects.exclude(answers=None).all(), key=lambda s: -s.final_result)
+
+minimum = 34
 
-minimum = 47.5
 
 class Command(BaseCommand):
 
     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 email only to one address'),
     )
 
+    def __init__(self):
+        super(Command, self).__init__()
+        self.sent = self.failed = None
+
     def handle(self, *args, **options):
         translation.activate('pl')
         for target in ['to_teachers', 'to_students']:
@@ -47,7 +53,7 @@ class Command(BaseCommand):
 
     def handle_to_students(self, *args, **options):
         self.stdout.write('>>> Sending results to students')
-        subject = 'Twój wynik w I etapie 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']:
@@ -57,27 +63,25 @@ class Command(BaseCommand):
                 template = 'results_student_failed.txt'
             else:
                 template = 'results_student_passed.txt'
-            message = render_to_string('wtem/' + template, dict(final_result = submission.final_result))
+            message = render_to_string('wtem/' + template, dict(final_result=submission.final_result))
             self.send_message(message, subject, submission.email)
 
         self.sum_up()
 
     def handle_to_teachers(self, *args, **options):
         self.stdout.write('>>> Sending results to teachers')
-        subject = 'Wyniki Twoich uczniów w I etapie Wielkiego Turnieju Edukacji Medialnej'
-        failed = sent = 0
+        subject = 'Wyniki I etapu Olimpiady Cyfrowej'
 
         submissions_by_contact = dict()
 
         for submission in get_submissions():
             if options['only_to'] and submission.contact.contact != options['only_to']:
                 continue
-            submissions_by_contact.setdefault(submission.contact.id, []).append(submission)
+            submissions_by_contact.setdefault(submission.contact.contact, []).append(submission)
 
-        for contact_id, submissions in submissions_by_contact.items():
-            contact = Contact.objects.get(id=contact_id)
-            message = render_to_string('wtem/results_teacher.txt', dict(submissions = submissions))
-            self.send_message(message, subject, contact.contact)
+        for contact_email, submissions in submissions_by_contact.items():
+            message = render_to_string('wtem/results_teacher.txt', dict(submissions=submissions))
+            self.send_message(message, subject, contact_email)
 
         self.sum_up()
 
@@ -87,16 +91,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]
-            )
-        except:
+            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)
-
-