confirmations in admin

[edumed.git] / stage2 / models.py

diff --git a/stage2/models.py b/stage2/models.py
index 1d4859f..924b153 100644 (file)
--- a/stage2/models.py
+++ b/stage2/models.py
@@ -3,7 +3,7 @@ import os
 import random
 import string
 
-from django.contrib.auth.models import User
+from django.conf import settings
 from django.core.urlresolvers import reverse
 from django.db import models
 from django.db.models.signals import post_save
@@ -22,6 +22,7 @@ class Participant(models.Model):
     last_name = models.CharField(_('last_name'), max_length=100)
     email = models.EmailField(_('email'), max_length=100, unique=True)
     key_sent = models.BooleanField(_('key sent'), default=False)
+    complete_set = models.BooleanField(default=False)
 
     class Meta:
         verbose_name = _('participant')
@@ -59,13 +60,19 @@ class Participant(models.Model):
 class Assignment(models.Model):
     title = models.CharField(_('title'), max_length=128)
     content = models.TextField(_('content'))
+    content_url = models.URLField(_('URL'))
     deadline = models.DateTimeField(_('deadline'))
     max_points = models.IntegerField(_('max points'))
-    experts = models.ManyToManyField(User, verbose_name=_('experts'), related_name='stage2_assignments')
+    experts = models.ManyToManyField(
+        settings.AUTH_USER_MODEL, verbose_name=_('experts'), related_name='stage2_assignments')
+    arbiters = models.ManyToManyField(
+        settings.AUTH_USER_MODEL, blank=True, verbose_name=_('arbiters'), related_name='stage2_arbitrated')
+    supervisors = models.ManyToManyField(
+        settings.AUTH_USER_MODEL, verbose_name=_('supervisors'), related_name='stage2_supervised')
     file_descriptions = JSONField(_('file descriptions'))
 
     class Meta:
-        ordering = ['deadline']
+        ordering = ['deadline', 'title']
         verbose_name = _('assignment')
         verbose_name_plural = _('assignments')
 
@@ -73,7 +80,12 @@ class Assignment(models.Model):
         return self.title
 
     def available_answers(self, expert):
-        return self.answer_set.exclude(mark__expert=expert).exclude(complete=True)
+        answers = self.answer_set.exclude(mark__expert=expert).filter(participant__complete_set=True)
+        if expert not in self.supervisors.all():
+            answers = answers.exclude(complete=True)
+        if expert in self.arbiters.all():
+            answers = answers.filter(need_arbiter=True)
+        return answers
 
     def is_active(self):
         return self.deadline >= timezone.now()
@@ -84,6 +96,7 @@ class Answer(models.Model):
     assignment = models.ForeignKey(Assignment)
     # useful redundancy
     complete = models.BooleanField(default=False)
+    need_arbiter = models.BooleanField(default=False)
 
     class Meta:
         unique_together = ['participant', 'assignment']
@@ -92,19 +105,23 @@ class Answer(models.Model):
         marks = self.mark_set.all()
         if len(marks) < 2:
             complete = False
+            need_arbiter = False
         elif len(marks) == 2:
             mark1, mark2 = marks
             complete = abs(mark1.points - mark2.points) < 0.2 * self.assignment.max_points
+            need_arbiter = not complete
         else:
             complete = True
+            need_arbiter = False
         self.complete = complete
+        self.need_arbiter = need_arbiter
         self.save()
 
     def score(self):
         marks = self.mark_set.all()
         if len(marks) < 2:
             return None
-        return self.mark_set.aggregate(models.Avg('points'))
+        return self.mark_set.aggregate(avg=models.Avg('points'))['avg']
 
 
 def attachment_path(instance, filename):
@@ -134,7 +151,7 @@ class Attachment(models.Model):
 
 
 class Mark(models.Model):
-    expert = models.ForeignKey(User)
+    expert = models.ForeignKey(settings.AUTH_USER_MODEL)
     answer = models.ForeignKey(Answer)
     points = models.DecimalField(verbose_name=_('points'), max_digits=3, decimal_places=1)