X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/cced2ec09ed232c6044bfc2c8e98fb6af6503ba2..f628e9fb60284be37eba3c3b114a154a8cb20154:/stage2/models.py

diff --git a/stage2/models.py b/stage2/models.py
index c21c53a..4a5b103 100644
--- a/stage2/models.py
+++ b/stage2/models.py
@@ -8,6 +8,7 @@ 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.html import format_html
 from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
 from jsonfield import JSONField
@@ -81,13 +82,26 @@ class Assignment(models.Model):
         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()
 
@@ -103,6 +117,18 @@ class Answer(models.Model):
     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: