X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/38be7e54873c139e95ac51842c77d6d145710b46..7095c251b3ed9450375c82a7f465e2db201fe841:/stage2/models.py?ds=inline

diff --git a/stage2/models.py b/stage2/models.py
index 4a5b103..7b791b2 100644
--- a/stage2/models.py
+++ b/stage2/models.py
@@ -83,13 +83,22 @@ class Assignment(models.Model):
 
     def available_answers(self, expert):
         answers = self.answer_set.exclude(mark__expert=expert)
+        assigned_to_expert = self.answer_set.filter(experts=expert).exists()
+        is_supervisor = expert in self.supervisors.all()
+        is_arbiter = expert in self.arbiters.all()
+        if assigned_to_expert:
+            expert_answers = answers.filter(experts=expert)
+            if expert_answers or not is_arbiter:
+                answers = expert_answers
         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).filter(participant__complete_set=True)
-        if expert in self.arbiters.all():
+        if not is_supervisor:
+            answers = answers.exclude(complete=True)
+        if not is_supervisor or not self.is_active():
+            answers = answers.filter(participant__complete_set=True)
+        if is_arbiter:
             answers = answers.filter(need_arbiter=True)
         return answers
 
@@ -110,6 +119,8 @@ class Answer(models.Model):
     participant = models.ForeignKey(Participant)
     assignment = models.ForeignKey(Assignment)
     field_values = JSONField(_('field values'), default={})
+    experts = models.ManyToManyField(
+        settings.AUTH_USER_MODEL, verbose_name=_('experts'), related_name='stage2_assigned_answers')
     # useful redundancy
     complete = models.BooleanField(default=False)
     need_arbiter = models.BooleanField(default=False)
@@ -151,6 +162,16 @@ class Answer(models.Model):
             return None
         return self.mark_set.aggregate(avg=models.Avg('points'))['avg']
 
+    # unrelated to `complete' attribute, but whatever
+    def is_complete(self):
+        file_count = len(self.assignment.file_descriptions)
+        field_count = len(self.assignment.field_descriptions)
+        if self.attachment_set.count() < file_count:
+            return False
+        if self.fieldoption_set.count() + sum(1 for k, v in self.field_values.iteritems() if v) < field_count:
+            return False
+        return True
+
 
 class FieldOptionSet(models.Model):
     name = models.CharField(verbose_name=_('nazwa'), max_length=32, db_index=True)