Merge remote-tracking branch 'origin/fixBrowserBack' into improveTextualView

css/ivprog-visual-1.0.css

@@ -1008,4 +1008,9 @@ div.ui.checkbox.transition.visible {
 
 .disabled {
 	pointer-events: none;
+}
+
+.dimmer_content_message {
+	color: white;
+	display: none;
 }

i18n/en/ui.json

@@ -51,6 +51,8 @@
   "text_logic_expression": "Logic Expression",
   "text_arithmetic_expression": "Relational Expression",
   "text_iftrue": "If true then",
+  "text_message_error_activity_file": "There was an error processing the activity. <br>Please reload the page and try again.",
+  "text_message_error_activity_reload": "Reload",
   "text_receives": "receives",
   "text_repeatNtimes": "Repeat N times",
   "text_return":"return",

i18n/es/ui.json

@@ -51,6 +51,8 @@
   "text_logic_expression": "Logic Expression",
   "text_arithmetic_expression": "Relational Expression",
   "text_iftrue": "If true then",
+  "text_message_error_activity_file": "There was an error processing the activity. <br>Please reload the page and try again.",
+  "text_message_error_activity_reload": "Reload",
   "text_receives": "receives",
   "text_repeatNtimes": "Repeat N times",
   "text_return":"return",

i18n/pt/ui.json

@@ -59,6 +59,8 @@
   "text_logic_expression": "Expressão Lógica",
   "text_arithmetic_expression": "Expressão Relacional",
   "text_iftrue": "Se verdadeiro então",
+  "text_message_error_activity_file": "Aconteceu um erro ao processar a atividade. <br> Recarregue a página para tentar novamente.",
+  "text_message_error_activity_reload": "Recarregar",
   "text_repeatNtimes": "Repita N vezes",
   "text_receives": "recebe",
   "text_whiletrue": "Enquanto verdadeiro",

js/util/iassignHelpers.js

@@ -3,6 +3,7 @@ import { generate } from "../visualUI/code_generator";
 import { IVProgAssessment } from "../assessment/ivprogAssessment";
 import { TestConsole } from "./testConsole";
 import { parseLogs } from "./../services/userLog";
+import { LocalizedStrings } from './../services/localizedStringsService';
 
 function parseActivityData (data) {
   let algorithm_in_ilm = null;
@@ -13,8 +14,21 @@ function parseActivityData (data) {
       parseLogs(logs);
     }
   }
-  let content = JSON.parse(data.split('\n::algorithm::')[0]);
-  content['algorithm_in_ilm'] = algorithm_in_ilm;
+  let content;
+  try {
+    content = JSON.parse(data.split('\n::algorithm::')[0]);
+    content['algorithm_in_ilm'] = algorithm_in_ilm;
+  } catch (e) {
+    $('.ui.height_100.add_accordion').dimmer({
+      closable: false
+    });
+    $('.dimmer_content_message h3').html(LocalizedStrings.getUI('text_message_error_activity_file'));
+    $('.dimmer_content_message button').text(LocalizedStrings.getUI('text_message_error_activity_reload'));
+    $('.dimmer_content_message').css('display', 'block');
+    $('.ui.height_100.add_accordion').dimmer('add content', '.dimmer_content_message');
+    $('.ui.height_100.add_accordion').dimmer('show');
+    console.error(e);
+  }
   return content;
 }
 

templates/index.html

@@ -111,7 +111,10 @@
           
         </div>
       </div>
-
+    </div>
+    <div class="dimmer_content_message">
+      <h3>Aconteceu um erro ao processar a atividade. <br> Recarregue a página para tentar novamente.</h3>
+      <button class="positive ui button" onclick="window.parent.location.reload()">Recarregar</button>
     </div>
     <script src="js/iassign-integration-functions.js"></script>
   </div>