Merge branch 'master' of https://github.com/FOSSEE/online_test into student-interface

Resolved
Conflicts:
	yaksh/templates/yaksh/question.html

Added testarea back for now.

1 files changed, 6 insertions, 3 deletions

diff --git a/yaksh/scilab_code_evaluator.py b/yaksh/scilab_code_evaluator.py
index 915491c..3c2d44c 100644
--- a/yaksh/scilab_code_evaluator.py
+++ b/yaksh/scilab_code_evaluator.py
@@ -16,6 +16,7 @@ class ScilabCodeEvaluator(CodeEvaluator):
     """Tests the Scilab code obtained from Code Server"""
     def setup(self):
         super(ScilabCodeEvaluator, self).setup()
+        self.files = []
         self.submit_code_path = \
             self.create_submit_code_file('function.sci')
 
@@ -26,8 +27,7 @@ class ScilabCodeEvaluator(CodeEvaluator):
             delete_files(self.files)
         super(ScilabCodeEvaluator, self).teardown()
 
-    def check_code(self, user_answer, file_paths, test_case):
-        self.files = []
+    def check_code(self, user_answer, file_paths, partial_grading, test_case, weight):
         if file_paths:
             self.files = copy_files(file_paths)
         ref_code_path = test_case
@@ -37,6 +37,8 @@ class ScilabCodeEvaluator(CodeEvaluator):
             self._remove_scilab_exit(user_answer.lstrip())
 
         success = False
+        test_case_weight = 0.0
+
         self.write_to_submit_code_file(self.submit_code_path, user_answer)
         # Throw message if there are commmands that terminates scilab
         add_err = ""
@@ -63,11 +65,12 @@ class ScilabCodeEvaluator(CodeEvaluator):
             stdout = self._strip_output(stdout)
             if proc.returncode == 5:
                 success, err = True, "Correct answer"
+                test_case_weight = float(weight) if partial_grading else 0.0
             else:
                 err = add_err + stdout
         else:
             err = add_err + stderr
-        return success, err
+        return success, err, test_case_weight
 
     def _remove_scilab_exit(self, string):
         """