various fixes and updates

[edumed.git] / wtem / admin.py

diff --git a/wtem/admin.py b/wtem/admin.py
index 3608628..4621f5f 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, CompetitionState

 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')


@@ -224,8 +224,9 @@ class SubmissionsSet:
                     examiners = self.examiners_by_exercise.setdefault(exercise_id, [])
                     if user not in examiners:
                         examiners.append(user)
                     examiners = self.examiners_by_exercise.setdefault(exercise_id, [])
                     if user not in examiners:
                         examiners.append(user)

-            contact_body = submission.contact.body
-            submission.school = '%s %s' % (contact_body['institution'], contact_body['institution_address'])
+            if submission.contact:
+                contact_body = submission.contact.body
+                submission.school = '%s %s' % (contact_body.get('school'), contact_body.get('school_address'))

 
 
 def report_view(request):
 
 
 def report_view(request):


@@ -237,5 +238,19 @@ 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', 'readable_contact', 'readable_age', 'confirmed')
+    readonly_fields = ('contact', 'readable_contact', 'readable_age', '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)
+admin.site.register(CompetitionState)