from django.db import models
from django.db.models.signals import post_save
from django.dispatch import receiver
+from django.utils.html import format_html
from django.utils.translation import ugettext_lazy as _
from django.utils import timezone
from jsonfield import JSONField
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'))
+ file_descriptions = JSONField(_('file descriptions'), default=[], blank=True)
+ field_descriptions = JSONField(_('field descriptions'), default=[], blank=True)
class Meta:
ordering = ['deadline', 'title']
return self.title
def available_answers(self, expert):
- answers = self.answer_set.exclude(mark__expert=expert).filter(participant__complete_set=True)
+ answers = self.answer_set.exclude(mark__expert=expert)
+ answers = answers.extra(where=[
+ "field_values::text ~ ': *\"[^\"]+\"' "
+ "OR EXISTS (SELECT id FROM stage2_attachment WHERE answer_id = stage2_answer.id) "
+ "OR EXISTS (SELECT id FROM stage2_fieldoption WHERE answer_id = stage2_answer.id)"])
if expert not in self.supervisors.all():
- answers = answers.exclude(complete=True)
+ answers = answers.exclude(complete=True).filter(participant__complete_set=True)
if expert in self.arbiters.all():
answers = answers.filter(need_arbiter=True)
return answers
+ def field_counts(self, answers):
+ for field_desc in self.field_descriptions:
+ field_name, params = field_desc
+ if params['type'] == 'options':
+ field_count = FieldOption.objects.filter(answer__in=list(answers), set__name=params['option_set']).count()
+ else: # text, link
+ field_count = sum(1 for answer in answers if answer.field_values.get(field_name))
+ yield field_name, field_count
+
def is_active(self):
return self.deadline >= timezone.now()
class Answer(models.Model):
participant = models.ForeignKey(Participant)
assignment = models.ForeignKey(Assignment)
+ field_values = JSONField(_('field values'), default={})
# useful redundancy
complete = models.BooleanField(default=False)
need_arbiter = models.BooleanField(default=False)
class Meta:
unique_together = ['participant', 'assignment']
+ def fields(self):
+ for field_desc in self.assignment.field_descriptions:
+ field_name, params = field_desc
+ if params['type'] == 'options':
+ option = self.fieldoption_set.filter(set__name=params['option_set'])
+ value = option.get().value if option else '--------'
+ else: # text, link
+ value = self.field_values.get(field_name, '')
+ if params['type'] == 'link':
+ value = format_html(u'<a href="{url}">{url}</a>', url=value)
+ yield field_name, value
+
def update_complete(self):
marks = self.mark_set.all()
if len(marks) < 2:
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']
+
+
+class FieldOptionSet(models.Model):
+ name = models.CharField(verbose_name=_('nazwa'), max_length=32, db_index=True)
+
+ class Meta:
+ verbose_name = _('option set')
+ verbose_name_plural = _('option sets')
+
+ def __unicode__(self):
+ return self.name
+
+ def choices(self, answer):
+ return [('', '--------')] + [
+ (option.id, option.value)
+ for option in self.fieldoption_set.extra(
+ where=['answer_id is null or answer_id = %s'],
+ params=[answer.id])]
+
+
+class FieldOption(models.Model):
+ set = models.ForeignKey(FieldOptionSet, verbose_name=_('zestaw'))
+ value = models.CharField(verbose_name=_('value'), max_length=255)
+ answer = models.ForeignKey(Answer, verbose_name=_('answer'), null=True, blank=True)
+
+ class Meta:
+ ordering = ['set', 'value']
+ verbose_name = _('option')
+ verbose_name_plural = _('options')
+
+ def __unicode__(self):
+ return self.value
def attachment_path(instance, filename):