Fix correct js load order in index.html template

Fix input/output values not being trimed in authoring interface

js/iassign-integration-functions.js

@@ -69,13 +69,14 @@ function getAnswer () {
 function prepareTestCases () {
   var ret = ' \n "testcases" : [ '
   var test_cases_array = $('form[name="test_cases"]').serializeArray();
+  console.log(test_cases_array);
   for (var i = 0; i < test_cases_array.length; i = i + 2) {
     ret += '\n{ ';
     ret += '\n "input": [';
     var inps = test_cases_array[i].value.match(/[^\r\n]+/g);
     if (inps) {
       for (var j = 0; j < inps.length; j++) {
-        ret += '"' + inps[j] + '"';
+        ret += '"' + inps[j].trim() + '"';
         if ((j + 1) < inps.length) {
           ret += ', ';
         }
@@ -85,7 +86,7 @@ function prepareTestCases () {
     var outs = test_cases_array[i+1].value.match(/[^\r\n]+/g);
     if (outs) {
       for (var j = 0; j < outs.length; j++) {
-        ret += '"' + outs[j] + '"';
+        ret += '"' + outs[j].trim() + '"';
         if ((j + 1) < outs.length) {
           ret += ', ';
         }
@@ -273,11 +274,11 @@ function iassingIntegration () {
   // Disable by default...
   $('.assessment_button').addClass('disabled');
 
+  prepareEnvironment();
   if (inIframe()) {
     orderIcons();
     orderWidth();
   }
-  prepareEnvironment();
 }
 
 // Função para preparar a interface para o professor criar atividade:

templates/index.html

@@ -4,18 +4,14 @@
     <meta http-equiv="content-type" content="text/html; charset=UTF-8">
     <title></title>
     <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.1/semantic.min.css" 
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.0/semantic.min.css" integrity="sha256-9mbkOfVho3ZPXfM7W8sV2SndrGDuh7wuyLjtsWeTI1Q=" crossorigin="anonymous" />
-      integrity="sha256-9mbkOfVho3ZPXfM7W8sV2SndrGDuh7wuyLjtsWeTI1Q=" 
-      crossorigin="anonymous" />
     <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/semantic-ui/2.4.1/semantic.min.js"
-      integrity="sha256-t8GepnyPmw9t+foMh3mKNvcorqNHamSKtKRxxpUEgFI="
-      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>
     <script src="js/Sortable.js"></script>
     <script src="js/iassign-integration-functions.js"></script>
   </head>
@@ -104,7 +100,7 @@
       </div>
 
     </div>
-
+    <script src="js/iassign-integration-functions.js"></script>
   </div>
   </body>
   <script>
@@ -143,7 +139,6 @@
         $('.created_element').css('left', mouseX);*/
       });
       ivprogCore.LocalizedStrings.updateTagText();
-      
       iassingIntegration();
       if (iLMparameters.iLM_PARAM_TeacherAutoEval == null) {
         ivprogCore.initVisualUI();