confirmations in admin

diff --git a/edumed/contact_forms.py b/edumed/contact_forms.py
index 2cb7dd9..8629dce 100644 (file)
--- a/edumed/contact_forms.py
+++ b/edumed/contact_forms.py
@@ -308,28 +308,18 @@ class OlimpiadaForm(ContactForm):
     def save(self, request, formsets=None):
         contact = super(OlimpiadaForm, self).save(request, formsets)
 
     def save(self, request, formsets=None):
         contact = super(OlimpiadaForm, self).save(request, formsets)
 

-        mail_subject = render_to_string('contact/olimpiada/student_mail_subject.html').strip()

         for formset in formsets or []:
             if formset.prefix == 'student':
                 for f in formset.forms:
                     email = f.cleaned_data.get('email', None)
                     try:
         for formset in formsets or []:
             if formset.prefix == 'student':
                 for f in formset.forms:
                     email = f.cleaned_data.get('email', None)
                     try:

-                        confirmation = Confirmation.objects.get(email=email)
+                        Confirmation.objects.get(email=email)

                     except Confirmation.DoesNotExist:
                         first_name = f.cleaned_data.get('first_name', None)
                         last_name = f.cleaned_data.get('last_name', None)
                         confirmation = Confirmation.create(
                             first_name=first_name, last_name=last_name, email=email, contact=contact)
                     except Confirmation.DoesNotExist:
                         first_name = f.cleaned_data.get('first_name', None)
                         last_name = f.cleaned_data.get('last_name', None)
                         confirmation = Confirmation.create(
                             first_name=first_name, last_name=last_name, email=email, contact=contact)

-                    mail_body = render_to_string(
-                        'contact/olimpiada/student_mail_body.html', {'confirmation': confirmation})
-                    try:
-                        validate_email(email)
-                    except ValidationError:
-                        pass
-                    else:
-                        send_mail(mail_subject, mail_body, 'olimpiada@nowoczesnapolska.org.pl', [email],
-                                  fail_silently=True)
-
+                        confirmation.send_mail()

         return contact
 
 
         return contact
 
 

diff --git a/wtem/admin.py b/wtem/admin.py
index 93fd652..2fa38aa 100644 (file)
--- a/wtem/admin.py
+++ b/wtem/admin.py
@@ -10,6 +10,7 @@ from django.http import HttpResponse
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 
 from django.template.loader import render_to_string
 from django.utils.safestring import mark_safe
 

+from wtem.models import Confirmation

 from .middleware import get_current_request
 from .models import Submission, Assignment, Attachment, exercises
 
 from .middleware import get_current_request
 from .models import Submission, Assignment, Attachment, exercises
 


@@ -206,7 +207,6 @@ class SubmissionAdmin(admin.ModelAdmin):
         return qs
 
     def get_urls(self):
         return qs
 
     def get_urls(self):

-        urls = super(SubmissionAdmin, self).get_urls()

         return patterns(
             '',
             url(r'^report/$', self.admin_site.admin_view(report_view), name='wtem_admin_report')
         return patterns(
             '',
             url(r'^report/$', self.admin_site.admin_view(report_view), name='wtem_admin_report')


@@ -238,5 +238,18 @@ def report_view(request):
     response['Content-Disposition'] = 'attachment; filename="wyniki.csv"'
     return response
 
     response['Content-Disposition'] = 'attachment; filename="wyniki.csv"'
     return response
 

+
+class ConfirmationAdmin(admin.ModelAdmin):
+    list_display = ('email', 'first_name', 'last_name', 'confirmed')
+    readonly_fields = ('contact', 'readable_contact', 'key', 'confirmed')
+
+    def resend_mail(self, request, queryset):
+        for confirmation in queryset:
+            confirmation.send_mail()
+    resend_mail.short_description = "Wyślij kod ponownie"
+
+    actions = [resend_mail]
+

 admin.site.register(Submission, SubmissionAdmin)
 admin.site.register(Assignment)
 admin.site.register(Submission, SubmissionAdmin)
 admin.site.register(Assignment)

+admin.site.register(Confirmation, ConfirmationAdmin)

diff --git a/wtem/models.py b/wtem/models.py
index 69337a0..96d85b6 100644 (file)
--- a/wtem/models.py
+++ b/wtem/models.py
@@ -4,10 +4,13 @@ import string
 import os
 import json
 
 import os
 import json
 

+from django.core.validators import validate_email

 from django.db import models
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError

+from django.core.mail import send_mail

 from django.core.urlresolvers import reverse
 from django.core.urlresolvers import reverse

+from django.template.loader import render_to_string

 from django.utils.translation import ugettext as _
 from jsonfield import JSONField
 
 from django.utils.translation import ugettext as _
 from jsonfield import JSONField
 


@@ -191,6 +194,9 @@ class Confirmation(models.Model):
     key = models.CharField(max_length=30)
     confirmed = models.BooleanField(default=False)
 
     key = models.CharField(max_length=30)
     confirmed = models.BooleanField(default=False)
 

+    class Meta:
+        ordering = ['email']
+

     @classmethod
     def create(cls, first_name, last_name, email, contact=None, key=None):
         confirmation = cls(
     @classmethod
     def create(cls, first_name, last_name, email, contact=None, key=None):
         confirmation = cls(


@@ -207,6 +213,21 @@ class Confirmation(models.Model):
     def absolute_url(self):
         return reverse('student_confirmation', args=(self.id, self.key))
 
     def absolute_url(self):
         return reverse('student_confirmation', args=(self.id, self.key))
 

+    def readable_contact(self):
+        return '%s <%s>' % (self.contact.body.get('przewodniczacy'), self.contact.contact)
+
+    def send_mail(self):
+        mail_subject = render_to_string('contact/olimpiada/student_mail_subject.html').strip()
+        mail_body = render_to_string(
+            'contact/olimpiada/student_mail_body.html', {'confirmation': self})
+        try:
+            validate_email(self.email)
+        except ValidationError:
+            pass
+        else:
+            send_mail(mail_subject, mail_body, 'olimpiada@nowoczesnapolska.org.pl', [self.email],
+                      fail_silently=True)
+

 
 def exercise_checked_manually(exercise):
     return (exercise['type'] in ('open', 'file_upload')) or 'open_part' in exercise
 
 def exercise_checked_manually(exercise):
     return (exercise['type'] in ('open', 'file_upload')) or 'open_part' in exercise