X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/edf75472e12f32cbffb5e9b1d255a00238259e29..4d579bfcf20ca69d142c3bcc9eb96feb72888d63:/stage2/models.py?ds=sidebyside diff --git a/stage2/models.py b/stage2/models.py index 1c6bc49..dc7ac63 100644 --- a/stage2/models.py +++ b/stage2/models.py @@ -6,7 +6,10 @@ import string from django.contrib.auth.models import User from django.core.urlresolvers import reverse from django.db import models +from django.db.models.signals import post_save +from django.dispatch import receiver from django.utils.translation import ugettext_lazy as _ +from django.utils import timezone from jsonfield import JSONField from contact.models import Contact @@ -49,34 +52,75 @@ class Participant(models.Model): def check(self, key): return key == self.key + def score(self): + return sum(answer.score() for answer in self.answer_set.all()) + 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') + arbiters = models.ManyToManyField( + User, blank=True, verbose_name=_('arbiters'), related_name='stage2_arbitrated') file_descriptions = JSONField(_('file descriptions')) class Meta: - ordering = ['deadline'] + ordering = ['deadline', 'title'] verbose_name = _('assignment') verbose_name_plural = _('assignments') def __unicode__(self): return self.title + def available_answers(self, expert): + answers = self.answer_set.exclude(mark__expert=expert).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() + class Answer(models.Model): participant = models.ForeignKey(Participant) assignment = models.ForeignKey(Assignment) + # useful redundancy + complete = models.BooleanField(default=False) + need_arbiter = models.BooleanField(default=False) class Meta: unique_together = ['participant', 'assignment'] + def update_complete(self): + 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')) + def attachment_path(instance, filename): answer = instance.answer - return 'stage2/attachment/%s/%s/%s' % (answer.participant_id, answer.assignment_id, filename) + return 'stage2/attachment/%s/%s/%s/%s' % (answer.participant_id, answer.assignment_id, instance.file_no, filename) class Attachment(models.Model): @@ -84,6 +128,9 @@ class Attachment(models.Model): file_no = models.IntegerField() file = models.FileField(upload_to=attachment_path) + class Meta: + ordering = ['file_no'] + def filename(self): return os.path.basename(self.file.name) @@ -93,11 +140,20 @@ class Attachment(models.Model): args=(self.answer.assignment_id, self.file_no, self.answer.participant_id, self.answer.participant.key)) + def expert_download_url(self): + return reverse('stage2_expert_download', args=[self.id]) + class Mark(models.Model): expert = models.ForeignKey(User) answer = models.ForeignKey(Answer) - points = models.DecimalField(max_digits=3, decimal_places=1) + points = models.DecimalField(verbose_name=_('points'), max_digits=3, decimal_places=1) class Meta: unique_together = ['expert', 'answer'] + + +@receiver(post_save, sender=Mark, dispatch_uid='update_answer') +def update_answer(sender, **kwargs): + mark = kwargs['instance'] + mark.answer.update_complete()