X-Git-Url: https://git.mdrn.pl/edumed.git/blobdiff_plain/97cfe21a67fcf45235d48bbf68b85a6d0b720204..cc3642cc8629e6568c75e15283b4cfcc60e02a53:/wtem/models.py

diff --git a/wtem/models.py b/wtem/models.py
index 4038485..0c7f78a 100644
--- a/wtem/models.py
+++ b/wtem/models.py
@@ -25,8 +25,9 @@ class Submission(models.Model):
     email = models.EmailField(max_length = 100, unique = True)
     answers = models.CharField(max_length = 65536, null = True, blank = True)
     key_sent = models.BooleanField(default = False)
-    marks = JSONField()
+    marks = JSONField(default={})
     examiners = models.ManyToManyField(User, null = True, blank = True)
+    end_time = models.CharField(max_length = 5, null = True, blank = True)
 
     def __unicode__(self):
         return ', '.join((self.last_name, self.first_name, self.email))
@@ -79,11 +80,12 @@ class Submission(models.Model):
         return marks
 
     def get_final_exercise_mark(self, exercise_id):
-        exercise = exercises[int(exercise_id)-1]
+        #exercise = exercises[int(exercise_id)-1]
+        exercise = [e for e in exercises if str(e['id']) == str(exercise_id)][0]
         if exercise_checked_manually(exercise):
             marks_by_examiner = self.get_exercise_marks_by_examiner(exercise_id)
             if len(marks_by_examiner):
-                return max(map(int, marks_by_examiner.values()))
+                return sum(map(float, marks_by_examiner.values())) / float(len(marks_by_examiner))
             else:
                 return None
         else:
@@ -97,7 +99,12 @@ class Submission(models.Model):
                 toret = 0
                 for bucket_id, items in answer.items():
                     for item_id in items:
-                        if int(item_id) in exercise['answer'].get(bucket_id, []):
+                        is_corect = False
+                        if exercise.get('answer_mode', None) == 'possible_buckets_for_item':
+                            is_correct = int(bucket_id) in exercise['answer'].get(item_id)
+                        else:
+                            is_correct = int(item_id) in exercise['answer'].get(bucket_id, [])
+                        if is_correct:
                             toret += exercise['points_per_hit']
                 return toret
             if t == 'edumed_wybor':
@@ -108,9 +115,12 @@ class Submission(models.Model):
                         return 0
                 else:
                     toret = 0
-                    for id in map(int, answer):
-                        if id in exercise['answer']:
-                            toret += exercise['points_per_hit']
+                    if exercise.get('answer_mode', None) == 'all_or_nothing':
+                        toret = exercise['points'] if map(int, answer) == exercise['answer'] else 0
+                    else:
+                        for id in map(int, answer):
+                            if id in exercise['answer']:
+                                toret += exercise['points_per_hit']
                     return toret
             if t == 'edumed_prawdafalsz':
                 toret = 0
@@ -129,7 +139,8 @@ class Submission(models.Model):
     @property
     def final_result(self):
         final = 0
-        for exercise_id in map(str,range(1, len(exercises) + 1)):
+        #for exercise_id in map(str,range(1, len(exercises) + 1)):
+        for exercise_id in [str(x['id']) for x in exercises]:
             mark = self.get_final_exercise_mark(exercise_id)
             if mark is not None:
                 final += mark
@@ -142,6 +153,7 @@ class Submission(models.Model):
 class Attachment(models.Model):
     submission = models.ForeignKey(Submission)
     exercise_id = models.IntegerField()
+    tag = models.CharField(max_length=128, null=True, blank=True)
     file = models.FileField(upload_to = 'wtem/attachment')
 
 
@@ -152,13 +164,13 @@ class Assignment(models.Model):
     def clean(self):
         if not isinstance(self.exercises, list):
             raise ValidationError(_('Assigned exercises must be declared in a list format'))
-        for exercise in self.exercises:
-            if not isinstance(exercise, int) or exercise < 1:
-                raise ValidationError(_('Invalid exercise id: %s' % exercise))
+        #for exercise in self.exercises:
+        #    if not isinstance(exercise, int) or exercise < 1:
+        #        raise ValidationError(_('Invalid exercise id: %s' % exercise))
 
     def __unicode__(self):
         return self.user.username + ': ' + ','.join(map(str,self.exercises))
 
 
 def exercise_checked_manually(exercise):
-    return (exercise['type'] in ('open', 'file_upload')) or 'open_part' in exercise
\ No newline at end of file
+    return (exercise['type'] in ('open', 'file_upload')) or 'open_part' in exercise