1
0
Переглянути джерело

Alterando o iassign function

Douglas Lima 6 роки тому
батько
коміт
450a5ed7f8

+ 19 - 4
js/iassign-integration-functions.js

@@ -30,7 +30,12 @@ function getAnswer () {
         // Montar o retorno com a resposta do aluno
         var contentToSend = previousContent.split("\n::algorithm::")[0];
         contentToSend += '\n::algorithm::\n';
-        contentToSend += JSON.stringify(window.program_obj);
+        contentToSend += JSON.stringify(window.program_obj, function(key, value) {
+            if (key == 'dom_object') {
+                return;
+            }
+            return value; 
+        });
 
         contentToSend += '\n::logs::';
         contentToSend += getTrackingLogs();
@@ -47,10 +52,17 @@ function getAnswer () {
 
         if ($("input[name='include_algo']").is(':checked')) {
             ret += '\n::algorithm::\n';
-            ret += JSON.stringify(window.program_obj);
+            ret += JSON.stringify(window.program_obj, function(key, value) {
+                
+                if (key == 'dom_object') {
+                    return;
+                }
+                return value; 
+            });
         }
 
         return ret;
+
     }
 }
 
@@ -123,6 +135,9 @@ function getiLMContent () {
             previousContent = data;
             prepareActivityToEdit(data);
         }
+
+        window.block_render = false;
+        renderAlgorithm();
     });
 }
 
@@ -432,7 +447,7 @@ $( document ).ready(function() {
         orderIcons();
         orderWidth();
     }
-
+    renderAlgorithm();
 });
 
 function orderWidth() {
@@ -479,4 +494,4 @@ function full_screen() {
     } else {
         $('.expand_button').addClass('disabled');
     }
-}
+}

+ 4 - 4
js/visualUI/algorithm.js

@@ -13,13 +13,13 @@ import { IVProgParser } from './../ast/ivprogParser';
 import { IVProgProcessor } from './../processor/ivprogProcessor';
 import { LanguageService } from '../services/languageService';
 
-var block_render = false;
+window.block_render = false;
 
 export function renderAlgorithm () {
-	if (block_render) {
+	if (window.block_render) {
 		return;
 	}
-	block_render = true;
+	window.block_render = true;
 
  	$('.all_functions').children().off();
 	$('.all_functions').empty();
@@ -35,5 +35,5 @@ export function renderAlgorithm () {
 		GlobalsManagement.renderGlobal(window.program_obj.globals[i]);
 	}	
 
-	setTimeout(function(){ block_render = false; }, 500);
+	setTimeout(function(){ window.block_render = false; }, 500);
 }

+ 3 - 3
js/visualUI/algorithm_sidebar.js

@@ -13,14 +13,14 @@ import { IVProgParser } from './../ast/ivprogParser';
 import { IVProgProcessor } from './../processor/ivprogProcessor';
 import { LanguageService } from '../services/languageService';
 
-var block_render = false;
+window.block_render = false;
 
 export function renderAlgorithm () {
 
-	if (block_render) {
+	if (window.block_render) {
 		return;
 	}
-	block_render = true;
+	window.block_render = true;
 
  	$('.all_functions').children().off();
 	$('.all_functions').empty();