fnp
/
edumed.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
update results emails
[edumed.git]
/
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
94c2653
..
4f2de33
100644
(file)
--- a/
wtem/management/commands/wtem_send_results.py
+++ b/
wtem/management/commands/wtem_send_results.py
@@
-3,7
+3,6
@@
from optparse import make_option
from django.core.management.base import BaseCommand
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 wtem.management.commands import send_mail
from django.utils import translation
from django.template.loader import render_to_string
@@
-13,25
+12,38
@@
from wtem.models import Submission
def get_submissions():
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 = 52
-minimum = 47.5
class Command(BaseCommand):
option_list = BaseCommand.option_list + (
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'),
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'),
action='store_true',
dest='to_students',
default=False,
help='Send emails to students'),
+ make_option(
+ '--only-to',
+ action='store',
+ dest='only_to',
+ default=None,
+ 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']:
def handle(self, *args, **options):
translation.activate('pl')
for target in ['to_teachers', 'to_students']:
@@
-42,32
+54,35
@@
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 = '
Twój wynik w I etapie Wielkiego Turnieju Edukacji Medialn
ej'
+ subject = '
Wyniki I etapu Olimpiady Cyfrow
ej'
for submission in get_submissions():
for submission in get_submissions():
+ if options['only_to'] and submission.email != options['only_to']:
+ continue
final_result = submission.final_result
if final_result < minimum:
template = 'results_student_failed.txt'
else:
template = 'results_student_passed.txt'
final_result = submission.final_result
if final_result < minimum:
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()
self.send_message(message, subject, submission.email)
self.sum_up()
- def handle_to_teachers(self, *args, **
kwarg
s):
+ def handle_to_teachers(self, *args, **
option
s):
self.stdout.write('>>> Sending results to teachers')
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():
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)
for contact_id, submissions in submissions_by_contact.items():
contact = Contact.objects.get(id=contact_id)
submissions_by_contact.setdefault(submission.contact.id, []).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))
+ message = render_to_string('wtem/results_teacher.txt', dict(submissions
=
submissions))
self.send_message(message, subject, contact.contact)
self.sum_up()
self.send_message(message, subject, contact.contact)
self.sum_up()
@@
-78,16
+93,10
@@
class Command(BaseCommand):
def send_message(self, message, subject, email):
self.stdout.write('>>> sending results to %s' % email)
try:
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)
self.failed += 1
self.stdout.write('failed sending to: ' + email + ': ' + str(e))
else:
self.sent += 1
self.stdout.write('message sent to: ' + email)
-
-