Adicionada versão mais recente do iVProg ao pacote iAssign

ilm/iVProg/1.0.20190717/ivprog/css/codemirror.css

@@ -164,17 +164,17 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
 
 .CodeMirror-scroll {
   overflow: scroll !important; /* Things will break if this is overridden */
-  /* 30px is the magic margin used to hide the element's real scrollbars */
+  /* 50px is the magic margin used to hide the element's real scrollbars */
   /* See overflow: hidden in .CodeMirror */
-  margin-bottom: -30px; margin-right: -30px;
-  padding-bottom: 30px;
+  margin-bottom: -50px; margin-right: -50px;
+  padding-bottom: 50px;
   height: 100%;
   outline: none; /* Prevent dragging from highlighting the element */
   position: relative;
 }
 .CodeMirror-sizer {
   position: relative;
-  border-right: 30px solid transparent;
+  border-right: 50px solid transparent;
 }
 
 /* The fake, visible scrollbars. Used to force redraw during scrolling
@@ -212,7 +212,7 @@ div.CodeMirror span.CodeMirror-nonmatchingbracket {color: #a22;}
   height: 100%;
   display: inline-block;
   vertical-align: top;
-  margin-bottom: -30px;
+  margin-bottom: -50px;
 }
 .CodeMirror-gutter-wrapper {
   position: absolute;

ilm/iVProg/1.0.20190717/ivprog/css/ivprog-assessment.css

@@ -66,7 +66,10 @@ table td { font-size: 14pt;}
 }
 .assessment-string-expected, .assessment-string-generated, .assessment-string-diff {text-align: left;}
 p.assessment-failed-execution {padding-left: 1rem;}
-.assessment-failed-case {color:#FF1212}
+.assessment-failed-case {
+  color:#FF1212;
+  padding-right: 1rem;
+}
 .assessment-input-unread {color: #d02929}
 .assessment-number-result-failed, .assessment-bool-result-failed {color: #d02929}
 .assessment-number-result, .assessment-bool-result, .assessment-string-result {color: #22a222}
@@ -115,4 +118,4 @@ p.assessment-failed-execution {padding-left: 1rem;}
 .assessment-empty-output {
   height: 1.5rem;
   width: 1.5rem;
-}
+}

ilm/iVProg/1.0.20190717/ivprog/css/ivprog-term.css

@@ -9,6 +9,10 @@
   z-index: 10;
 }
 
+.ivprog-term-userText {
+  white-space: pre;
+}
+
 .ivprog-term-userText, .ivprog-term-userInput {
   color: #f2d6d6;
 }

ilm/iVProg/1.0.20190717/ivprog/css/ivprog-visual-1.0.css

@@ -698,6 +698,7 @@ div.function_name_div_updated:active,
 .global_container .span_value_variable,
 .variable_container .span_value_variable {
     font-size: 110%;
+    white-space: pre;
 }
 .global_container .global_type, .global_container .editing_name_var, .global_container .span_value_variable,
 .variable_container .variable_type,  .variable_container .span_value_variable, .variable_container .editing_name_var,
@@ -1076,4 +1077,10 @@ div.ui.checkbox.transition.visible {
 
 .pass_button button {
 	padding-bottom: 2px;
-}
+}
+
+/* Write newline button*/
+.ivprog_newline_btn {
+  position: absolute;
+  height: 32px;
+}

ilm/iVProg/1.0.20190717/ivprog/index.html

@@ -4,16 +4,16 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <title></title>
     <link href="css/roboto.css" type="text/css" rel="stylesheet">
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.0/semantic.min.css"/>
+    <link rel="stylesheet" href="css/semantic.min.css"/>
     <link rel="stylesheet" type="text/css" href="css/codemirror.css">
     <link rel="stylesheet" type="text/css" href="css/show-hint.css">
     <link rel="stylesheet" type="text/css" href="css/ttcn.css">
     <link rel="stylesheet" type="text/css" href="css/ivprog-visual-1.0.css">
     <link rel="stylesheet" type="text/css" href="css/ivprog-term.css">
     <link rel="stylesheet" type="text/css" href="css/ivprog-editor.css">
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.0/semantic.min.js"></script>
+    <script src="js/jquery.min.js"></script>
+    <script src="js/jquery-ui.min.js"></script>
+    <script src="js/semantic.min.js"></script>
     <script src="js/Sortable.js"></script>
     <script src="js/iassign-integration-functions.js"></script>
   </head>
@@ -26,7 +26,7 @@
       </div>
 
     <div class="content height_100">
-   
+
       <div class="ui raised container segment div_to_body">
 
         <div class="ui container main_title only_in_frame">
@@ -80,7 +80,7 @@
                 <i class="icon superscript" style="margin-top: -2px;margin-bottom: 2px;margin-left: 1px;margin-right: 1px; font-size: 18px;"></i>
                 <i class="corner add icon inverted" style="font-size: 10px;padding-top: 5px;padding-left: 7px;"></i>
               </i>
-              
+
             </div>
 
             <div class="list_globals" id="listGlobalsHandle"></div>
@@ -105,7 +105,7 @@
           <textarea id="ivprog-text-editor" class=".ivprog_textual_code"></textarea>
         </div>
         <div id='ivprog-term-div' class="six column wide">
-          
+
         </div>
       </div>
     </div>
@@ -115,12 +115,12 @@
     </div>
     <script src="js/iassign-integration-functions.js"></script>
   </div>
-  <script src="js/vendors~main.28bb9bf067b35b9514f7.js"></script><script src="js/main.953c46193185032c68f7.js"></script></body>
+  <script src="js/vendors~main.353f485e4f54a59e8ea8.js"></script><script src="js/main.f255f7efef480c0fecaf.js"></script></body>
   <script>
     var mouseX;
     var mouseY;
     $(document).ready(() => {
-      var $buttons = $('.ivprog_format .button'), 
+      var $buttons = $('.ivprog_format .button'),
         handler = {
           activate: function () {
             $(this)
@@ -131,7 +131,6 @@
         };
 
       $buttons.on('click', handler.activate);
-
       $('.ivprog_format_info').popup(
         {
           popup: $('.custom.popup'),
@@ -152,10 +151,11 @@
         $('.created_element').css('left', mouseX);*/
       });
       ivprogCore.LocalizedStrings.updateTagText();
+      ivprogCore.CodeEditor.initTextEditor("ivprog-text-editor");
       iassingIntegration();
       if (iLMparameters.iLM_PARAM_TeacherAutoEval == null) {
         ivprogCore.initVisualUI();
       }
     });
   </script>
-</html>
+</html>

ilm/iVProg/1.0.20190717/ivprog/js/iassign-integration-functions.js

@@ -39,7 +39,7 @@ function getAnswer () {
         if (key == 'dom_object') {
             return;
         }
-        return value; 
+        return value;
       });
     }
 
@@ -51,21 +51,21 @@ function getAnswer () {
   } else {
     // Montar o retorno com a criação da atividade do professor
     var ret = ' { ' + prepareTestCases()
-        + ',\n"settings_programming_type": \n' + JSON.stringify($('form[name="settings_programming_type"]').serializeArray()) 
-        + ',\n"settings_data_types": \n' + JSON.stringify($('form[name="settings_data_types"]').serializeArray()) 
-        + ',\n"settings_commands": \n' + JSON.stringify($('form[name="settings_commands"]').serializeArray()) 
-        + ',\n"settings_functions": \n' + JSON.stringify($('form[name="settings_functions"]').serializeArray()) 
-        + ',\n"settings_filter": \n' + JSON.stringify($('form[name="settings_filter"]').serializeArray()) 
+        + ',\n"settings_programming_type": \n' + JSON.stringify($('form[name="settings_programming_type"]').serializeArray())
+        + ',\n"settings_data_types": \n' + JSON.stringify($('form[name="settings_data_types"]').serializeArray())
+        + ',\n"settings_commands": \n' + JSON.stringify($('form[name="settings_commands"]').serializeArray())
+        + ',\n"settings_functions": \n' + JSON.stringify($('form[name="settings_functions"]').serializeArray())
+        + ',\n"settings_filter": \n' + JSON.stringify($('form[name="settings_filter"]').serializeArray())
         + ' } ';
 
     if ($("input[name='include_algo']").is(':checked')) {
       ret += '\n::algorithm::';
       ret += JSON.stringify(window.program_obj, function(key, value) {
-          
+
           if (key == 'dom_object') {
               return;
           }
-          return value; 
+          return value;
       });
     }
 
@@ -83,7 +83,7 @@ function prepareTestCases () {
     var inps = test_cases_array[i].value.match(/[^\r\n]+/g);
     if (inps) {
       for (var j = 0; j < inps.length; j++) {
-        ret += '"' + inps[j].trim() + '"';
+        ret += '"' + inps[j] + '"';
         if ((j + 1) < inps.length) {
           ret += ', ';
         }
@@ -91,9 +91,11 @@ function prepareTestCases () {
     }
     ret += '], \n "output": [';
     var outs = test_cases_array[i+1].value.match(/[^\r\n]+/g);
+    console.log(outs);
     if (outs) {
       for (var j = 0; j < outs.length; j++) {
-        ret += '"' + outs[j].trim() + '"';
+        console.log("output -> ",outs[j]);
+        ret += '"' + outs[j] + '"';
         if ((j + 1) < outs.length) {
           ret += ', ';
         }
@@ -140,7 +142,6 @@ function getiLMContent () {
   // requisitado via AJAX para a captura dos dados da atividade
   $.get(iLMparameters.iLM_PARAM_Assignment, function (data) {
     //professor invocou a avaliação automática dos exercícios do bloco
-    ivprogCore.CodeEditor.initTextEditor("ivprog-text-editor");
     if (iLMparameters.iLM_PARAM_TeacherAutoEval != null) {
         teacherAutoEval(data);
         //não deve exibir nenhuma interface...
@@ -322,49 +323,49 @@ function blockAllEditingOptions () {
 
   $('.add_global_button').addClass('disabled');
   $('.move_function').addClass('disabled');
-  $('.add_function_button').addClass('disabled'); 
+  $('.add_function_button').addClass('disabled');
   $('.add_var_button_function .ui.icon.button.purple').addClass('disabled');
   $('.add_var_button_function').addClass('disabled');
   $('.menu_commands').addClass('disabled');
-  
+
   $('.global_type').addClass('disabled');
   $('.editing_name_var').addClass('disabled');
   $('.span_value_variable').addClass('disabled');
 
-  $('.remove_global').addClass('disabled'); 
+  $('.remove_global').addClass('disabled');
   $('.ui.icon.ellipsis.vertical.inverted').addClass('disabled');
 
-  $('.alternate_constant').addClass('disabled'); 
-  $('.remove_variable').addClass('disabled'); 
-  
-  $('.add_global_matrix_column').addClass('disabled'); 
-  $('.remove_global_matrix_column').addClass('disabled'); 
-  
-  $('.add_global_matrix_line').addClass('disabled'); 
-  $('.remove_global_matrix_line').addClass('disabled'); 
+  $('.alternate_constant').addClass('disabled');
+  $('.remove_variable').addClass('disabled');
+
+  $('.add_global_matrix_column').addClass('disabled');
+  $('.remove_global_matrix_column').addClass('disabled');
+
+  $('.add_global_matrix_line').addClass('disabled');
+  $('.remove_global_matrix_line').addClass('disabled');
 
-  $('.add_global_vector_column').addClass('disabled'); 
-  $('.remove_global_vector_column').addClass('disabled'); 
+  $('.add_global_vector_column').addClass('disabled');
+  $('.remove_global_vector_column').addClass('disabled');
 
-  $('.add_expression').addClass('disabled'); 
-  $('.add_parentheses').addClass('disabled'); 
+  $('.add_expression').addClass('disabled');
+  $('.add_parentheses').addClass('disabled');
 
-  $('.remove_function_button').addClass('disabled'); 
-  $('.button_remove_command').addClass('disabled'); 
+  $('.remove_function_button').addClass('disabled');
+  $('.button_remove_command').addClass('disabled');
 
-  $('.command_drag').addClass('disabled'); 
-  $('.simple_add').addClass('disabled'); 
+  $('.command_drag').addClass('disabled');
+  $('.simple_add').addClass('disabled');
 
-  $('.add_parameter_button').addClass('disabled'); 
+  $('.add_parameter_button').addClass('disabled');
   $('.parameter_div_edit').addClass('disabled');
   $('.function_name_div_updated').addClass('disabled');
   $('.value_rendered').addClass('disabled');
   $('.var_name').addClass('disabled');
   $('.variable_rendered').addClass('disabled');
-  
-  $('.dropdown').addClass('disabled'); 
+
+  $('.dropdown').addClass('disabled');
   $('.remove_parameter').addClass('disabled');
-  
+
   $('.ui.dropdown.global_type.disabled').css('opacity', '1');
   $('.ui.dropdown.variable_type.disabled').css('opacity', '1');
   $('.ui.dropdown.function_return.disabled').css('opacity', '1');
@@ -378,12 +379,12 @@ function ivprogTextualOrVisual () {
 
   if (settingsProgrammingTypes) {
     if (settingsProgrammingTypes == "textual") {
-      $('.ivprog_visual_panel').css('display', 'none'); 
+      $('.ivprog_visual_panel').css('display', 'none');
       $('.ivprog_textual_panel').css('display', 'block');
       $('.ivprog_textual_panel').removeClass('loading');
 
       $('.visual_coding_button').removeClass('active');
-      $('.textual_coding_button').addClass('active'); 
+      $('.textual_coding_button').addClass('active');
       $('.visual_coding_button').addClass('disabled');
 
       let textual_code = algorithm_in_ilm;
@@ -397,7 +398,7 @@ function ivprogTextualOrVisual () {
       ivprogCore.CodeEditor.disable(false);
     }
     if (settingsProgrammingTypes == "visual") {
-      
+
     }
   }
 }
@@ -428,14 +429,14 @@ function prepareActivityCreation () {
 
   menuTab.insertBefore('.add_accordion');
   $('.tabular.menu .item').tab();
-  
+
   $('.main_title').remove();
   $('.ui.accordion').addClass('styled');
-  
+
   $('<div class="content_margin"></div>').insertBefore($('.add_accordion').find('.content').find('.div_to_body'));
 
   $('<div class="ui checkbox"><input type="checkbox" name="include_algo" class="include_algo" tabindex="0" class="hidden"><label>'+LocalizedStrings.getUI('text_teacher_algorithm_include')+'</label></div>').insertAfter('.content_margin');
-  
+
   var cases_test_div = $('<div></div>');
 
   $('.tab_test_cases').append(cases_test_div);
@@ -499,7 +500,7 @@ function generateOutputs () {
   ivprogCore.autoGenerateTestCaseOutput(code_teacher, test_cases).catch(function (error) {
     showAlert("Houve um erro durante a execução do seu programa: "+error.message);
   });
-  
+
 }
 
 function outputGenerated (test_cases) {
@@ -516,13 +517,14 @@ function outputGenerated (test_cases) {
   }*/
   animateOutput(fields, test_cases, 0);
 
-  
+
 }
 
 function animateOutput (list, test_cases, index) {
   if (list.length == index) return;
   $(list[index]).val('');
   for (var j = 0; j < test_cases[index].output.length; j++) {
+    console.log(test_cases[index].output[j].charCodeAt(0));
     $(list[index]).val($(list[index]).val() + test_cases[index].output[j]);
     if (j < test_cases[index].output.length - 1) {
       $(list[index]).val($(list[index]).val() + '\n');
@@ -550,7 +552,7 @@ function addTestCase (test_case = null) {
         text_row += '\n';
       }
     }
-    
+
     text_row += '</textarea></td><td class="expandingArea"><textarea rows="'+test_case.output.length+'" name="output" class="text_area_output">';
 
     for (var i = 0; i < test_case.output.length; i ++) {
@@ -577,7 +579,7 @@ function addTestCase (test_case = null) {
       var lines = $(this).val().split('\n').length;
       $(this).attr('rows', lines);
   });
-  
+
   updateTestCaseCounter();
 
   $('.text_area_output').keydown(function(e) {
@@ -675,7 +677,7 @@ function getTrackingLogs () {
 // var trackingMatrix = [];
 
 /* function adCoords(e, code){
-  var x = e.pageX; 
+  var x = e.pageX;
   var y = e.pageY;
   if (code === 1) {
     return [new Date().getTime(), x, y, code, e.target.classList['value']];
@@ -722,13 +724,13 @@ function full_screen() {
       //requestFullscreen is used to display an element in full screen mode.
       if("requestFullscreen" in element) {
         element.requestFullscreen();
-      } 
+      }
       else if ("webkitRequestFullscreen" in element) {
         element.webkitRequestFullscreen();
-      } 
+      }
       else if ("mozRequestFullScreen" in element) {
         element.mozRequestFullScreen();
-      } 
+      }
       else if ("msRequestFullscreen" in element) {
         element.msRequestFullscreen();
       }
@@ -738,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]) {
-      
-      blockAllEditingOptions();
-    }
-  });
+  ivprogTextualOrVisual();
+  if (settingsFilter && settingsFilter[0]) {
+
+    blockAllEditingOptions(); 
+  }
 }
 
 function displayGrade(grade) {
@@ -782,4 +787,4 @@ function showInvalidData () {
   $('.dimmer_content_message').css('display', 'block');
   $('.ui.height_100.add_accordion').dimmer('add content', '.dimmer_content_message');
   $('.ui.height_100.add_accordion').dimmer('show');
-}
+}

ilm/iVProg/1.0.20190717/ivprog/runner.html

@@ -2,20 +2,16 @@
 <html>
 <head>
   <meta http-equiv="content-type" content="text/html; charset=UTF-8">
-  <link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
-  <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.0/semantic.min.css" integrity="sha256-9mbkOfVho3ZPXfM7W8sV2SndrGDuh7wuyLjtsWeTI1Q=" crossorigin="anonymous" />
+  <link href="css/roboto.css" type="text/css" rel="stylesheet">
+  <link rel="stylesheet" href="css/semantic.min.css"/>
   <link rel="stylesheet" type="text/css" href="css/ivprog-visual-1.0.css">
   <link rel="stylesheet" type="text/css" href="css/ivprog-term.css">
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jquery/3.3.1/jquery.min.js" integrity="sha256-FgpCb/KJQlLNfOu91ta32o/NMZxltwRo8QtmkMRdAu8=" crossorigin="anonymous"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"
-    integrity="sha256-KM512VNnjElC30ehFwehXjx1YCHPiQkOPmqnrWtpccM="
-    crossorigin="anonymous"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.0/semantic.min.js" integrity="sha256-x1fC6BXl6BwnUhfQqqqC0Fd/n12wH+u8u9va6+E7xaA=" crossorigin="anonymous"></script>
+  <link rel="stylesheet" type="text/css" href="css/ivprog-term.css">
+  <link rel="stylesheet" type="text/css" href="css/ivprog-editor.css">
+  <script src="js/jquery.min.js"></script>
+  <script src="js/jquery-ui.min.js"></script>
+  <script src="js/semantic.min.js"></script>
   <script type="text/javascript" src="js/jquery.json-editor.min.js"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js"
-      integrity="sha256-KM512VNnjElC30ehFwehXjx1YCHPiQkOPmqnrWtpccM="
-      crossorigin="anonymous"></script>
-  <script src="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.0/semantic.min.js" integrity="sha256-x1fC6BXl6BwnUhfQqqqC0Fd/n12wH+u8u9va6+E7xaA=" crossorigin="anonymous"></script>
 </head>
 <body>
     <div style="padding-top: 50px;content: ''"></div>
@@ -56,10 +52,10 @@
   </div>
   
   
-<script src="js/vendors~main.28bb9bf067b35b9514f7.js"></script><script src="js/main.953c46193185032c68f7.js"></script></body>
+<script src="js/vendors~main.353f485e4f54a59e8ea8.js"></script><script src="js/main.f255f7efef480c0fecaf.js"></script></body>
 <script>
   ( function () {
     ivprogCore.runner();
   })();
 </script>
-</html>
+</html>