update test duration

[edumed.git] / wtem / models.py

diff --git a/wtem/models.py b/wtem/models.py
index 361bff3..69337a0 100644 (file)
--- a/wtem/models.py
+++ b/wtem/models.py
@@ -7,6 +7,7 @@ import json
 from django.db import models
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError
 from django.db import models
 from django.contrib.auth.models import User
 from django.core.exceptions import ValidationError

+from django.core.urlresolvers import reverse

 from django.utils.translation import ugettext as _
 from jsonfield import JSONField
 
 from django.utils.translation import ugettext as _
 from jsonfield import JSONField
 


@@ -16,7 +17,13 @@ f = file(os.path.dirname(__file__) + '/fixtures/exercises.json')
 exercises = json.loads(f.read())
 f.close()
 
 exercises = json.loads(f.read())
 f.close()
 

-DEBUG_KEY = '12345'
+DEBUG_KEY = 'smerfetka159'
+
+
+def make_key(length):
+    return ''.join(
+        random.choice(string.ascii_uppercase + string.ascii_lowercase + string.digits)
+        for i in range(length))

 
 
 class Submission(models.Model):
 
 
 class Submission(models.Model):


@@ -38,8 +45,7 @@ class Submission(models.Model):
     def generate_key(cls):
         key = ''
         while not key or key in [record['key'] for record in cls.objects.values('key')]:
     def generate_key(cls):
         key = ''
         while not key or key in [record['key'] for record in cls.objects.values('key')]:

-            key = ''.join(random.choice(string.ascii_uppercase + string.ascii_lowercase + string.digits)
-                          for i in range(30))
+            key = make_key(30)

         return key
 
     @classmethod
         return key
 
     @classmethod


@@ -127,6 +133,8 @@ class Submission(models.Model):
             if t == 'edumed_prawdafalsz':
                 toret = 0
                 for idx, statement in enumerate(exercise['statements']):
             if t == 'edumed_prawdafalsz':
                 toret = 0
                 for idx, statement in enumerate(exercise['statements']):

+                    if statement[1] == 'ignore':
+                        continue

                     if answer[idx] == 'true':
                         given = True
                     elif answer[idx] == 'false':
                     if answer[idx] == 'true':
                         given = True
                     elif answer[idx] == 'false':


@@ -175,5 +183,30 @@ class Assignment(models.Model):
         return self.user.username + ': ' + ','.join(map(str, self.exercises))
 
 
         return self.user.username + ': ' + ','.join(map(str, self.exercises))
 
 

+class Confirmation(models.Model):
+    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)
+
+    @classmethod
+    def create(cls, first_name, last_name, email, contact=None, key=None):
+        confirmation = cls(
+            contact=contact,
+            key=key if key else make_key(30),
+            first_name=first_name,
+            last_name=last_name,
+            email=email
+        )
+
+        confirmation.save()
+        return confirmation
+
+    def absolute_url(self):
+        return reverse('student_confirmation', args=(self.id, self.key))
+
+

 def exercise_checked_manually(exercise):
     return (exercise['type'] in ('open', 'file_upload')) or 'open_part' in exercise
 def exercise_checked_manually(exercise):
     return (exercise['type'] in ('open', 'file_upload')) or 'open_part' in exercise