|
@@ -12,6 +12,7 @@ var iLMparameters = {
|
|
|
iLM_PARAM_SendAnswer: getParameterByName("iLM_PARAM_SendAnswer"),
|
|
|
iLM_PARAM_AssignmentURL: getParameterByName("iLM_PARAM_AssignmentURL"),
|
|
|
iLM_PARAM_Assignment: getParameterByName("iLM_PARAM_Assignment"),
|
|
|
+ iLM_PARAM_TeacherAutoEval: getParameterByName("iLM_PARAM_TeacherAutoEval"),
|
|
|
lang: getParameterByName("lang", "pt")
|
|
|
};
|
|
|
|
|
@@ -127,8 +128,13 @@ function getiLMContent () {
|
|
|
|
|
|
|
|
|
$.get(iLMparameters.iLM_PARAM_Assignment, function (data) {
|
|
|
-
|
|
|
- if (iLMparameters.iLM_PARAM_SendAnswer == 'false') {
|
|
|
+
|
|
|
+ if (iLMparameters.iLM_PARAM_TeacherAutoEval == 'true') {
|
|
|
+ teacherAutoEval(data);
|
|
|
+
|
|
|
+ return;
|
|
|
+ } else if (iLMparameters.iLM_PARAM_SendAnswer == 'false') {
|
|
|
+
|
|
|
previousContent = data;
|
|
|
prepareActivityToStudent(data);
|
|
|
} else {
|
|
@@ -254,25 +260,21 @@ $(document).ready(function() {
|
|
|
$('.div_to_body').click(function(e) {
|
|
|
trackingMatrix.push(adCoords(e, 1));
|
|
|
});
|
|
|
-
|
|
|
-
|
|
|
-
|
|
|
- } else {
|
|
|
+ } else if (iLMparameters.iLM_PARAM_Assignment) {
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
- if (iLMparameters.iLM_PARAM_Assignment) {
|
|
|
- getiLMContent();
|
|
|
- }
|
|
|
+ getiLMContent();
|
|
|
+ } else {
|
|
|
+ renderAlgorithm();
|
|
|
}
|
|
|
if (inIframe()) {
|
|
|
orderIcons();
|
|
|
orderWidth();
|
|
|
}
|
|
|
-
|
|
|
|
|
|
});
|
|
|
|
|
@@ -507,4 +509,20 @@ function full_screen() {
|
|
|
} else {
|
|
|
$('.expand_button').addClass('disabled');
|
|
|
}
|
|
|
+}
|
|
|
+
|
|
|
+function teacherAutoEval (data) {
|
|
|
+
|
|
|
+ var content = ivprogCore.prepareActivityToStudentHelper(data);
|
|
|
+
|
|
|
+
|
|
|
+ settingsDataTypes = content.settingsDataTypes;
|
|
|
+ settingsCommands = content.settingsCommands;
|
|
|
+ settingsFunctions = content.settingsFunctions;
|
|
|
+
|
|
|
+ if (content.algorithmInIlm != null) {
|
|
|
+ algorithm_in_ilm = content.algorithmInIlm;
|
|
|
+ parsePreviousAlgorithm();
|
|
|
+ ivprogCore.autoEval(parent.getEvaluationCallback);
|
|
|
+ }
|
|
|
}
|