From 053e27000540396b84c26d5a5f593d4389e0787a Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 2 Nov 2016 16:02:03 +0530
Subject: dd basic partial marking feature per test case

---
 yaksh/views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'yaksh/views.py')

diff --git a/yaksh/views.py b/yaksh/views.py
index 1afcef7..2478544 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -517,11 +517,14 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None):
                         if question.type == 'code' else None
         correct, result = paper.validate_answer(user_answer, question, json_data)
         if correct:
+            new_answer.marks = question.points * result['marks'] if question.partial_grading \
+                and question.type == 'code' else question.points
             new_answer.correct = correct
-            new_answer.marks = question.points
             new_answer.error = result.get('error')
         else:
             new_answer.error = result.get('error')
+            new_answer.marks = question.points * result['marks'] if question.partial_grading \
+                and question.type == 'code' else question.points
         new_answer.save()
         paper.update_marks('inprogress')
         paper.set_end_time(timezone.now())
-- 
cgit 


From a09df642d4f3623ee517aaed2eac1372ebacc0e0 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Thu, 10 Nov 2016 12:36:13 +0530
Subject: Add point based weightage for partial grading instead of percentage
 based partial grading

---
 yaksh/views.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

(limited to 'yaksh/views.py')

diff --git a/yaksh/views.py b/yaksh/views.py
index 2478544..aca89ef 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -517,14 +517,16 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None):
                         if question.type == 'code' else None
         correct, result = paper.validate_answer(user_answer, question, json_data)
         if correct:
-            new_answer.marks = question.points * result['marks'] if question.partial_grading \
-                and question.type == 'code' else question.points
+            new_answer.marks = (question.points * result['weightage'] / 
+                question.get_maximum_test_case_weightage()) \
+                if question.partial_grading and question.type == 'code' else question.points
             new_answer.correct = correct
             new_answer.error = result.get('error')
         else:
             new_answer.error = result.get('error')
-            new_answer.marks = question.points * result['marks'] if question.partial_grading \
-                and question.type == 'code' else question.points
+            new_answer.marks = (question.points * result['weightage'] /
+                question.get_maximum_test_case_weightage()) \
+                if question.partial_grading and question.type == 'code' else 0
         new_answer.save()
         paper.update_marks('inprogress')
         paper.set_end_time(timezone.now())
-- 
cgit 


From b32d7e91fe608c4cbd09b50520d4a3cab75d2e53 Mon Sep 17 00:00:00 2001
From: ankitjavalkar
Date: Wed, 16 Nov 2016 11:25:30 +0530
Subject: Change test_case weightage field name to weight

---
 yaksh/views.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'yaksh/views.py')

diff --git a/yaksh/views.py b/yaksh/views.py
index aca89ef..c3d743b 100644
--- a/yaksh/views.py
+++ b/yaksh/views.py
@@ -517,15 +517,15 @@ def check(request, q_id, attempt_num=None, questionpaper_id=None):
                         if question.type == 'code' else None
         correct, result = paper.validate_answer(user_answer, question, json_data)
         if correct:
-            new_answer.marks = (question.points * result['weightage'] / 
-                question.get_maximum_test_case_weightage()) \
+            new_answer.marks = (question.points * result['weight'] / 
+                question.get_maximum_test_case_weight()) \
                 if question.partial_grading and question.type == 'code' else question.points
             new_answer.correct = correct
             new_answer.error = result.get('error')
         else:
             new_answer.error = result.get('error')
-            new_answer.marks = (question.points * result['weightage'] /
-                question.get_maximum_test_case_weightage()) \
+            new_answer.marks = (question.points * result['weight'] /
+                question.get_maximum_test_case_weight()) \
                 if question.partial_grading and question.type == 'code' else 0
         new_answer.save()
         paper.update_marks('inprogress')
-- 
cgit