Merge branch 'autoeval_improve' of LInE/iVProg into master

js/iassign-integration-functions.js

@@ -740,35 +740,38 @@ function full_screen() {
   }
 }
 
+function getAutoEvalOriginalData () {
+  return parent.getAutoEvalOriginalData();
+}
+
 function teacherAutoEval (data) {
   previousContent = data;
-  //$.get(iLMparameters.iLM_PARAM_TeacherAutoEval, function (originalData) {
-    // Ver arquivo js/util/iassignHelpers.js
-    var content = ivprogCore.prepareActivityToStudentHelper(data).getOrElse(null);
-    if(!content) {
-      showInvalidData();
-      return;
-    }
-    // Casos de testes agora são delegados ao tratamento apropriado pela função acima
-    // var testCases = content.testcases;
-    settingsProgrammingTypes = content.settingsProgrammingType;
-    settingsDataTypes = content.settingsDataTypes;
-    settingsCommands = content.settingsCommands;
-    settingsFunctions = content.settingsFunctions;
-    settingsFilter = content.settingsFilter;
+  // Ver arquivo js/util/iassignHelpers.js
+  var content = ivprogCore.prepareActivityToStudentHelper(data).getOrElse(null);
+  if(!content) {
+    showInvalidData();
+    return;
+  }
+  // Casos de testes agora são delegados ao tratamento apropriado pela função acima
+  // var testCases = content.testcases;
+  settingsProgrammingTypes = content.settingsProgrammingType;
+  settingsDataTypes = content.settingsDataTypes;
+  settingsCommands = content.settingsCommands;
+  settingsFunctions = content.settingsFunctions;
+  settingsFilter = content.settingsFilter;
 
-    if (content.algorithmInIlm != null) {
-      algorithm_in_ilm = content.algorithmInIlm;
-      parsePreviousAlgorithm();
-      //ivprogCore.autoEval(originalData, displayGrade);
-    }
+  if (content.algorithmInIlm != null) {
+    algorithm_in_ilm = content.algorithmInIlm;
+    parsePreviousAlgorithm();
+    var originalData = getAutoEvalOriginalData();
+    ivprogCore.autoEval(originalData, parent.postResultAutoEval);
+  }
 
-    ivprogTextualOrVisual();
-    if (settingsFilter && settingsFilter[0]) {
+  ivprogTextualOrVisual();
+  if (settingsFilter && settingsFilter[0]) {
 
-      blockAllEditingOptions(); 
-    }
-  //});
+    blockAllEditingOptions(); 
+  }
 }
 
 function displayGrade(grade) {