瀏覽代碼

Continuando :)

Igor 5 年之前
父節點
當前提交
036359c37f
共有 4 個文件被更改,包括 39 次插入28 次删除
  1. 15 5
      css/ivprog-visual-1.0.css
  2. 6 6
      index.html
  3. 6 3
      js/iassign-integration-functions.js
  4. 12 14
      js/visualUI/functions.js

+ 15 - 5
css/ivprog-visual-1.0.css

@@ -6,12 +6,15 @@ body {
   height: 100%;
 }
 
-.div_to_body {
-  height: 90%;
+.ui.raised.container.segment.div_to_body {
+  height: 96%;
+  padding: 10px;
+  padding-left: 6px;
+  padding-right: 6px;
 }
 
 .ivprog_visual_panel {
-	height: 91%;
+	height: 96%;
 	overflow: auto;
 	overflow-x: auto;
 
@@ -174,8 +177,9 @@ body {
 }
 
 .ui.segment.ivprog_visual_panel {
-	padding: 8px;
-	background-image: url('../img/background-panel.png');
+	padding: 3px;
+	margin-top: -5px;
+	background: #edf4ff;
 }
 
 .ui.segment.function_div {
@@ -428,3 +432,9 @@ div.buttons_manage_columns {
 	padding-top: 10px;
 }
 
+.ui.icon.button.add-globalVar-button.add_global_button {
+	padding: 8px;
+}
+.all_functions {
+	margin-top: -5px;
+}

+ 6 - 6
index.html

@@ -53,16 +53,17 @@
 
       </div>
       
+
     </div>
 
     <div class="ui raised container segment div_to_body">
 
-      <div class="ui icon menu center aligned container" style="width: 438px; margin-top: -10px;">
-        <a class="item">
-          <i class="file icon"></i>
+      <div class="ui icon menu center aligned container" style="width: 438px; margin-top: -25px;">
+        <a class="item visual_coding_button" data-content="Testing interface">
+          <i class="window maximize outline icon"></i>
         </a>
-        <a class="item">
-          <i class="save icon"></i>
+        <a class="item textual_coding_button">
+          <i class="code icon"></i>
         </a>
         <a class="item">
           <i class="upload icon"></i>
@@ -88,7 +89,6 @@
       </div>
 
       <div class="ui one column container segment ivprog_visual_panel loading">
-        <div class="program_signature"><data class="i18n" value="ui:program">program</data> </div>
 
         <div class="global_var">
           

+ 6 - 3
js/iassign-integration-functions.js

@@ -132,7 +132,8 @@ function prepareActivityToStudent (ilm_cont) {
     settingsFunctions = content.settings_functions;
     algorithm_in_ilm = ilm_cont.split('\n::algorithm::')[1].split('\n::logs::')[0];
 
-    window.program_obj = JSON.parse(algorithm_in_ilm);
+    window.program_obj.functions = JSON.parse(algorithm_in_ilm).functions;
+    window.program_obj.globals = JSON.parse(algorithm_in_ilm).globals;
     renderAlgorithm();
 }
 
@@ -313,12 +314,14 @@ $( document ).ready(function() {
     });
 
     if (inIframe()) {
-        
+        orderIcons();
     }
 
 });
 
-
+function orderIcons() {
+    $('.ui.one.column.doubling.stackable.grid.container').css('display', 'none');
+}
 
 
 function inIframe () {

+ 12 - 14
js/visualUI/functions.js

@@ -305,6 +305,13 @@ $( document ).ready(function() {
     renderFunction(program.functions[i]);
   }
 
+  $('.div_to_body div a').popup({
+    delay: {
+      show: 750,
+      hide: 0
+    }
+  });
+
 });
 
 
@@ -320,26 +327,17 @@ function runCodeAssessment () {
   $("#ivprog-term").slideDown(500);
   const runner = new IVProgAssessment(strCode, testCases, domConsole);
 
-  runner.runTest().then(grade => studentTemp = grade).catch( err => domConsole.err(err.message));
-  
-  gradeMonitor();
-}
-
-function gradeMonitor () {
-
-  if (studentTemp == null) { 
-    setTimeout(gradeMonitor, 50); 
-  } else {
-    window.studentGrade = studentTemp;
+  runner.runTest().then(grade => {
     if (!is_iassign) {
-      parent.getEvaluationCallback(window.studentGrade);
+      parent.getEvaluationCallback(grade);
     } else {
       is_iassign = false;
     }
-  }
-
+  }).catch( err => domConsole.err(err.message));
+  
 }
 
+
 function runCode () {
   const strCode = CodeManagement.generate();
   if (strCode == null) {