from django.contrib import admin
from django import forms
from django.utils import simplejson
+from django.core.urlresolvers import reverse
from .models import Submission, Assignment
+from .middleware import get_current_request
f = file(os.path.dirname(__file__) + '/fixtures/exercises.json')
return [e for e in exercises if e['id'] in assignment.exercises]
-readonly_fields = ('contact', 'first_name', 'last_name', 'email', 'key', 'key_sent')
+readonly_fields = ('submitted_by', 'first_name', 'last_name', 'email', 'key', 'key_sent')
class SubmissionFormBase(forms.ModelForm):
class Meta:
model = Submission
- exclude = ('answers', 'marks') + readonly_fields
+ exclude = ('answers', 'marks', 'contact') + readonly_fields
def get_form(request, submission):
class SubmissionAdmin(admin.ModelAdmin):
+ list_display = ('__unicode__', 'todo',)
readonly_fields = readonly_fields
def get_form(self, request, obj, **kwargs):
return get_form(request, obj)
+ def submitted_by(self, instance):
+ if instance.contact:
+ return '<a href="%s">%s</a>' % (
+ reverse('admin:contact_contact_change', args = [instance.contact.id]),
+ instance.contact.contact
+ )
+ return '-'
+ submitted_by.allow_tags = True
+ submitted_by.short_description = "Zgłoszony/a przez"
+
+ def todo(self, submission):
+ user = get_current_request().user
+ user_exercises = get_user_exercises(user)
+ user_marks = submission.marks.get(str(user.id), {})
+ return ','.join([str(e['id']) for e in user_exercises if str(e['id']) not in user_marks.keys()])
+
def save_model(self, request, submission, form, change):
for name, value in form.cleaned_data.items():
if name.startswith('markof_'):