dd basic partial marking feature per test case

1 files changed, 26 insertions, 9 deletions

diff --git a/yaksh/models.py b/yaksh/models.py
index 7f9eead..e7a96c9 100644
--- a/yaksh/models.py
+++ b/yaksh/models.py
@@ -245,6 +245,9 @@ class Question(models.Model):
     # user for particular question
     user = models.ForeignKey(User, related_name="user")
 
+    # Does this question allow partial grading
+    partial_grading = models.BooleanField(default=False)
+
     def consolidate_answer_data(self, user_answer):
         question_data = {}
         test_case_data = []
@@ -257,6 +260,7 @@ class Question(models.Model):
 
         question_data['test_case_data'] = test_case_data
         question_data['user_answer'] = user_answer
+        question_data['partial_grading'] = self.partial_grading
         files = FileUpload.objects.filter(question=self)
         if files:
             question_data['file_paths'] = [(file.file.path, file.extract)
@@ -937,11 +941,17 @@ class AnswerPaper(models.Model):
 
     def _update_marks_obtained(self):
         """Updates the total marks earned by student for this paper."""
-        marks = sum([x.marks for x in self.answers.filter(marks__gt=0.0)])
-        if not marks:
-            self.marks_obtained = 0
-        else:
-            self.marks_obtained = marks
+        # marks = sum([x.marks for x in self.answers.filter(marks__gt=0.0)])
+        # if not marks:
+        #     self.marks_obtained = 0
+        # else:
+        #     self.marks_obtained = marks
+        marks = 0
+        for question in self.questions.all():
+            max_marks = max([a.marks for a in self.answers.filter(question=question)])
+            marks += max_marks
+        self.marks_obtained = marks
+
 
     def _update_percent(self):
         """Updates the percent gained by the student for this paper."""
@@ -1023,7 +1033,7 @@ class AnswerPaper(models.Model):
             For code questions success is True only if the answer is correct.
         """
 
-        result = {'success': True, 'error': 'Incorrect answer'}
+        result = {'success': True, 'error': 'Incorrect answer', 'marks': 0.0}
         correct = False
         if user_answer is not None:
             if question.type == 'mcq':
@@ -1071,11 +1081,16 @@ class AnswerPaper(models.Model):
         json_data = question.consolidate_answer_data(answer) \
                             if question.type == 'code' else None
         correct, result = self.validate_answer(answer, question, json_data)
-        user_answer.marks = question.points if correct else 0.0
         user_answer.correct = correct
         user_answer.error = result.get('error')
+        if correct:
+            user_answer.marks = question.points * result['marks'] \
+                if question.partial_grading and question.type == 'code' else question.points
+        else:
+            user_answer.marks = question.points * result['marks'] \
+                if question.partial_grading and question.type == 'code' else 0
         user_answer.save()
-        self.update_marks('complete')
+        self.update_marks('completed')
         return True, msg
 
     def __str__(self):
@@ -1098,9 +1113,11 @@ class TestCase(models.Model):
 
 class StandardTestCase(TestCase):
     test_case = models.TextField(blank=True)
+    marks = models.FloatField(default=0.0)
 
     def get_field_value(self):
-        return {"test_case": self.test_case}
+        return {"test_case": self.test_case,
+                "marks": self.marks}
 
     def __str__(self):
         return u'Question: {0} | Test Case: {1}'.format(self.question,