X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/243f4c5eef6c3f1d6e6d2875080e5830cf5382a8..6c92937de5aaa2cae84e7e397657c3f44a6b62fb:/wtem/models.py?ds=inline

diff --git a/wtem/models.py b/wtem/models.py
index abeb56b..1146770 100644
--- a/wtem/models.py
+++ b/wtem/models.py
@@ -19,11 +19,24 @@ from django.utils import timezone
 from django.utils.translation import ugettext as _
 from jsonfield import JSONField
 
-from contact.models import Contact
 
-f = file(os.path.dirname(__file__) + '/fixtures/exercises.json')
-exercises = json.loads(f.read())
-f.close()
+def prepare_exercises():
+    f = file(os.path.dirname(__file__) + '/fixtures/exercises.json')
+    exercises = json.loads(f.read())
+    for i, exercise in enumerate(exercises, 1):
+        exercise['id'] = i
+        if exercise['type'] == 'edumed_wybor' and exercise['answer_mode'] == 'multi':
+            answer = []
+            for j, option in enumerate(exercise['options'], 1):
+                option['id'] = j
+                if option['answer']:
+                    answer.append(j)
+            exercise['answer'] = answer
+    f.close()
+    return exercises
+
+
+exercises = prepare_exercises()
 
 DEBUG_KEY = 'smerfetka159'
 
@@ -72,7 +85,7 @@ class CompetitionState(models.Model):
 
 
 class Submission(models.Model):
-    contact = models.ForeignKey(Contact, null=True)
+    contact = models.ForeignKey('contact.Contact', null=True)
     key = models.CharField(max_length=30, unique=True)
     first_name = models.CharField(max_length=100)
     last_name = models.CharField(max_length=100)
@@ -236,7 +249,7 @@ class Submission(models.Model):
             mark = self.get_final_exercise_mark(exercise_id)
             if mark is not None:
                 final += mark
-        return final
+        return round(final, 2)
 
     @property
     def final_result_as_string(self):
@@ -265,13 +278,32 @@ class Assignment(models.Model):
         return self.user.username + ': ' + ','.join(map(str, self.exercises))
 
 
-class Confirmation(models.Model):
+class AbstractConfirmation(models.Model):
+    contact = models.ForeignKey('contact.Contact', null=True)
+    key = models.CharField(max_length=30)
+    confirmed = models.BooleanField(default=False)
+
+    class Meta:
+        abstract = True
+
+    def readable_contact(self):
+        return '%s <%s>' % (self.contact.body.get('przewodniczacy'), self.contact.contact)
+
+    def school_phone(self):
+        return '%s, tel. %s' % (self.contact.body.get('school'), self.contact.body.get('school_phone'))
+
+    def age(self):
+        return timezone.now() - self.contact.created_at
+
+    def readable_age(self):
+        td = self.age()
+        return '%s dni, %s godzin' % (td.days, td.seconds/3600)
+
+
+class Confirmation(AbstractConfirmation):
     first_name = models.CharField(max_length=100)
     last_name = models.CharField(max_length=100)
     email = models.EmailField(max_length=100, unique=True)
-    contact = models.ForeignKey(Contact, null=True)
-    key = models.CharField(max_length=30)
-    confirmed = models.BooleanField(default=False)
 
     class Meta:
         ordering = ['contact__contact']
@@ -292,19 +324,6 @@ class Confirmation(models.Model):
     def absolute_url(self):
         return reverse('student_confirmation', args=(self.id, self.key))
 
-    def readable_contact(self):
-        return '%s <%s>' % (self.contact.body.get('przewodniczacy'), self.contact.contact)
-
-    def school_phone(self):
-        return '%s, tel. %s' % (self.contact.body.get('school'), self.contact.body.get('school_phone'))
-
-    def age(self):
-        return timezone.now() - self.contact.created_at
-
-    def readable_age(self):
-        td = self.age()
-        return '%s dni, %s godzin' % (td.days, td.seconds/3600)
-
     def send_mail(self):
         mail_subject = render_to_string('contact/olimpiada/student_mail_subject.html').strip()
         mail_body = render_to_string(
@@ -318,5 +337,23 @@ class Confirmation(models.Model):
                       fail_silently=True)
 
 
+class TeacherConfirmation(AbstractConfirmation):
+
+    class Meta:
+        ordering = ['contact__contact']
+
+    @classmethod
+    def create(cls, contact=None, key=None):
+        confirmation = cls(
+            contact=contact,
+            key=key if key else make_key(30),
+        )
+        confirmation.save()
+        return confirmation
+
+    def absolute_url(self):
+        return reverse('teacher_confirmation', args=(self.id, self.key))
+
+
 def exercise_checked_manually(exercise):
     return (exercise['type'] in ('open', 'file_upload')) or 'open_part' in exercise