W trybie naglym.

[edumed.git] / wtem / models.py

diff --git a/wtem/models.py b/wtem/models.py
index d24430d..fd8e834 100644 (file)
--- a/wtem/models.py
+++ b/wtem/models.py
@@ -25,7 +25,7 @@ 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)
 
@@ -84,7 +84,7 @@ class Submission(models.Model):
         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(int, marks_by_examiner.values())) / float(len(marks_by_examiner))
             else:
                 return None
         else: