Home Explore Help
Sign In
marcelovbcfilho
/
iVProg
forked from LInE/iVProg
1
0
Fork 0
Files
Browse Source

Continuando os comandos

Igor 6 years ago
parent
58a208e352
commit
ba1d66b3ff
7 changed files with 160 additions and 18 deletions
Unified View Show Diff Stats
  1. 8 0
      css/ivprog-visual-1.0.css
  2. 14 1
      i18n/en/ui.json
  3. 14 1
      i18n/es/ui.json
  4. 14 1
      i18n/pt/ui.json
  5. 15 7
      index.html
  6. 88 4
      js/iassign-integration-functions.js
  7. 7 4
      js/visualUI/functions.js

+ 8 - 0
css/ivprog-visual-1.0.css
View File 

@@ -340,4 +340,12 @@ div.buttons_manage_columns {
 
 .ui.icon.red.exclamation.triangle.error_icon {
 
 .ui.icon.red.exclamation.triangle.error_icon {
 
 	float: left;
 
 	float: left;
 
     margin-left: -30px;
 
     margin-left: -30px;
 
+}
 
+
 
+.height_100 {
 
+  height: 100%;
 
+}
 
+
 
+.default_visual_title {
 
+  display: none;
 
 }
 
 }

+ 14 - 1
i18n/en/ui.json
View File 

@@ -54,5 +54,18 @@
 
   "text_value": "Value",
 
   "text_value": "Value",
 
   "text_operator": "Operator",
 
   "text_operator": "Operator",
 
   "text_parentheses": "Parentheses",
 
   "text_parentheses": "Parentheses",
 
-  "text_change": "Change"
 
+  "text_change": "Change",
 
+  "text_teacher_algorithm": "Algorithm",
 
+  "text_teacher_algorithm_include": "Include the following algorithm in exercise",
 
+  "text_teacher_test_case": "Test cases",
 
+  "text_teacher_config": "Settings",
 
+  "text_teacher_data_types": "Data types",
 
+  "text_teacher_commands": "Commands",
 
+  "text_teacher_functions": "Functions",
 
+  "text_teacher_create_functions": "Create new functions",
 
+  "text_teacher_create_movement_functions": "Move functions",
 
+  "text_teacher_test_case_input": "Input",
 
+  "text_teacher_test_case_output": "Output",
 
+  "text_teacher_test_case_actions": "Actions",
 
+  "text_teacher_test_case_add": "Add test cases"
 
 }
 
 }

+ 14 - 1
i18n/es/ui.json
View File 

@@ -54,5 +54,18 @@
 
   "text_value": "Value",
 
   "text_value": "Value",
 
   "text_operator": "Operator",
 
   "text_operator": "Operator",
 
   "text_parentheses": "Parentheses",
 
   "text_parentheses": "Parentheses",
 
-  "text_change": "Change"
 
+  "text_change": "Change",
 
+  "text_teacher_algorithm": "Algorithm",
 
+  "text_teacher_algorithm_include": "Include the following algorithm in exercise",
 
+  "text_teacher_test_case": "Test cases",
 
+  "text_teacher_config": "Settings",
 
+  "text_teacher_data_types": "Data types",
 
+  "text_teacher_commands": "Commands",
 
+  "text_teacher_functions": "Functions",
 
+  "text_teacher_create_functions": "Create new functions",
 
+  "text_teacher_create_movement_functions": "Move functions",
 
+  "text_teacher_test_case_input": "Input",
 
+  "text_teacher_test_case_output": "Output",
 
+  "text_teacher_test_case_actions": "Actions",
 
+  "text_teacher_test_case_add": "Add test cases"
 
 }
 
 }

+ 14 - 1
i18n/pt/ui.json
View File 

@@ -55,5 +55,18 @@
 
   "text_value": "Valor",
 
   "text_value": "Valor",
 
   "text_operator": "Operador",
 
   "text_operator": "Operador",
 
   "text_parentheses": "Parênteses",
 
   "text_parentheses": "Parênteses",
 
-  "text_change": "Alterar"
 
+  "text_change": "Alterar",
 
+  "text_teacher_algorithm": "Algoritmo",
 
+  "text_teacher_algorithm_include": "Incluir o algoritmo abaixo no exercício",
 
+  "text_teacher_test_case": "Casos de teste",
 
+  "text_teacher_config": "Configurações",
 
+  "text_teacher_data_types": "Tipos de dados",
 
+  "text_teacher_commands": "Comandos",
 
+  "text_teacher_functions": "Funções",
 
+  "text_teacher_create_functions": "Criar novas funções",
 
+  "text_teacher_create_movement_functions": "Movimentar funções",
 
+  "text_teacher_test_case_input": "Entrada",
 
+  "text_teacher_test_case_output": "Saída",
 
+  "text_teacher_test_case_actions": "Ações",
 
+  "text_teacher_test_case_add": "Adicionar caso de teste"
 
 }
 
 }

+ 15 - 7
index.html
View File 

@@ -17,6 +17,15 @@
 
     
     
   </head>
 
   </head>
 
   <body>
 
   <body>
 
+
 
+    <div class="ui accordion height_100">
 
+
 
+      <div class="title default_visual_title">
 
+        <i class="dropdown icon"></i>
 
+        
+      </div>
 
+
 
+    <div class="content height_100">
 
    
    
     <div class="ui one column doubling stackable grid container">
 
     <div class="ui one column doubling stackable grid container">
 
       <div class="column">
 
       <div class="column">
 
@@ -25,8 +34,6 @@
 
           <span>interactive coding</span>
 
           <span>interactive coding</span>
 
         </div>
 
         </div>
 
 
 
-        
-
 
         <div class="ui container content_margin">
 
         <div class="ui container content_margin">
 
           <div class="content_sub_margin">
 
           <div class="content_sub_margin">
 
               <div class="blue ui ivprog_format buttons">
 
               <div class="blue ui ivprog_format buttons">
 
@@ -43,15 +50,10 @@
 
             </div>
 
             </div>
 
           </div>
 
           </div>
 
 
 
-
 
       </div>
 
       </div>
 
       
       
     </div>
 
     </div>
 
 
 
-    
-
 
-    
-
 
     <div class="ui raised container segment div_to_body">
 
     <div class="ui raised container segment div_to_body">
 
 
 
       <div class="ui icon menu center aligned container" style="width: 438px; margin-top: -10px;">
 
       <div class="ui icon menu center aligned container" style="width: 438px; margin-top: -10px;">
 
@@ -117,9 +119,14 @@
 
       
       
     </div>
 
     </div>
 
 
 
+    </div>
 
+
 
+  </div>
 
+
 
     <script>
 
     <script>
 
       $(document).ready(() => {
 
       $(document).ready(() => {
 
         ivprogCore.initVisualUI();
 
         ivprogCore.initVisualUI();
 
+        prepareEnvironment();
 
       });
 
       });
 
     </script>
 
     </script>
 
 
 
@@ -127,5 +134,6 @@
 
     <script src="js/semantic/semantic.min.js"></script>
 
     <script src="js/semantic/semantic.min.js"></script>
 
     <script src="js/semantic/semantic-buttons.js"></script>
 
     <script src="js/semantic/semantic-buttons.js"></script>
 
 
 
+
 
   </body>
 
   </body>
 
 </html>
 
 </html>

+ 88 - 4
js/iassign-integration-functions.js
View File 

@@ -1,6 +1,6 @@
 
 // Função para ler parâmetros informados pelo iTarefa via URL
 
 // Função para ler parâmetros informados pelo iTarefa via URL
 
 // Apesar de não ser obrigatório, será muito útil para capturar os parâmetros
 
 // Apesar de não ser obrigatório, será muito útil para capturar os parâmetros
 
-function getParameterByName(name, defaultReturn = null) {
 
+function getParameterByName (name, defaultReturn = null) {
 
     var match = RegExp('[?&]' + name + '=([^&]*)').exec(window.location.search);
 
     var match = RegExp('[?&]' + name + '=([^&]*)').exec(window.location.search);
 
     return match ? decodeURIComponent(match[1].replace(/\+/g, ' ')) : defaultReturn;
 
     return match ? decodeURIComponent(match[1].replace(/\+/g, ' ')) : defaultReturn;
 
 }
 
 }
 
@@ -23,7 +23,7 @@ localStorage.setItem('ivprog.lang', iLMparameters.lang);
 
 // ou quando o aluno finaliza a resolução do exercício
 
 // ou quando o aluno finaliza a resolução do exercício
 
 // O retorno é um JSON com os dados do exercício ou da resolução
 
 // O retorno é um JSON com os dados do exercício ou da resolução
 
 // Esse retorno será armazenado no banco de dados do Moodle, pelo iTarefa
 
 // Esse retorno será armazenado no banco de dados do Moodle, pelo iTarefa
 
-function getAnswer() {
 
+function getAnswer () {
 
     // Se o parâmetro "iLM_PARAM_SendAnswer" for false,
 
     // Se o parâmetro "iLM_PARAM_SendAnswer" for false,
 
     // então trata-se de resolução de atividade
 
     // então trata-se de resolução de atividade
 
     if (iLMparameters.iLM_PARAM_SendAnswer == 'false') {
 
     if (iLMparameters.iLM_PARAM_SendAnswer == 'false') {
 
@@ -36,7 +36,7 @@ function getAnswer() {
 
 
 
 // Função chamada pelo iTarefa para receber a nota do aluno na atividade
 
 // Função chamada pelo iTarefa para receber a nota do aluno na atividade
 
 // O retorno é um valor entre 0.0 e 1.0
 
 // O retorno é um valor entre 0.0 e 1.0
 
-function getEvaluation() {
 
+function getEvaluation () {
 
     if (iLMparameters.iLM_PARAM_SendAnswer == 'false') {
 
     if (iLMparameters.iLM_PARAM_SendAnswer == 'false') {
 
         // Calcula a nota do aluno:
 
         // Calcula a nota do aluno:
 
 
 
@@ -48,7 +48,7 @@ function getEvaluation() {
 
 
 
 
 
 // Função para que o iMA leia os dados da atividade fornecidos pelo iTarefa
 
 // Função para que o iMA leia os dados da atividade fornecidos pelo iTarefa
 
-function getiLMContent() {
 
+function getiLMContent () {
 
 
 
     // O parâmetro "iLM_PARAM_Assignment" fornece o URL do endereço que deve ser
 
     // O parâmetro "iLM_PARAM_Assignment" fornece o URL do endereço que deve ser
 
     // requisitado via AJAX para a captura dos dados da atividade
 
     // requisitado via AJAX para a captura dos dados da atividade
 
@@ -56,3 +56,87 @@ function getiLMContent() {
 
         
         
     });
 
     });
 
 }
 
 }
 
+
 
+// Função para organizar se para criação, visualização ou resolução de atividade
 
+function prepareEnvironment () {
 
+    if ((iLMparameters.iLM_PARAM_AssignmentURL == "true") && (iLMparameters.iLM_PARAM_SendAnswer == "true")) {
 
+        prepareActivityCreation();
 
+    }
 
+}
 
+
 
+// Função para preparar a interface para o professor criar atividade:
 
+function prepareActivityCreation () {
 
+    $('.default_visual_title').toggle();
 
+    $('.default_visual_title').append('<span>'+LocalizedStrings.getUI('text_teacher_algorithm')+'</span>');
 
+    $('.height_100').removeClass('height_100');
 
+    $('.main_title').remove();
 
+    $('.ui.accordion').addClass('styled');
 
+    
+    $('<div class="ui checkbox"><input type="checkbox" name="include_algo" tabindex="0" class="hidden"><label>'+LocalizedStrings.getUI('text_teacher_algorithm_include')+'</label></div>').insertBefore('.content_margin');
 
+    
+    var cases_test_div = $('<div class="ui accordion styled"><div class="active title"><i class="dropdown icon"></i>'+LocalizedStrings.getUI('text_teacher_test_case')+'</div><div class="active content"></div></div>');
 
+
 
+    cases_test_div.insertBefore('.accordion');
 
+
 
+    var config_div = $('<div class="ui accordion styled"><div class="title"><i class="dropdown icon"></i>'+LocalizedStrings.getUI('text_teacher_config')+'</div><div class="content"></div></div>');
 
+
 
+    config_div.insertAfter(cases_test_div);
 
+
 
+    $('.ui.accordion').accordion();
 
+
 
+    $('.ui.checkbox').checkbox();
 
+
 
+    prepareTableSettings(config_div.find('.content'));
 
+
 
+    prepareTableTestCases(cases_test_div.find('.content'));
 
+}
 
+
 
+function prepareTableTestCases (div_el) {
 
+    var table_el = '<table class="ui blue table"><thead><tr><th width="30px">#</th><th>'+LocalizedStrings.getUI('text_teacher_test_case_input')+'</th><th>'+LocalizedStrings.getUI('text_teacher_test_case_output')+'</th><th width="80px">'+LocalizedStrings.getUI('text_teacher_test_case_actions')+'</th></tr></thead>'
 
+            + '<tbody class="content_cases"></tbody></table>';
 
+
 
+    div_el.append(table_el);
 
+
 
+    div_el.append('<button class="ui teal labeled icon button button_add_case"><i class="plus icon"></i>'+LocalizedStrings.getUI('text_teacher_test_case_add')+'</button>');
 
+
 
+    $('.button_add_case').on('click', function(e) {
 
+        $('.content_cases').append('<tr><td>88</td><td>more data</td><td>my data</td><td>more data</td></tr>');
 
+    });
 
+
 
+}
 
+
 
+function prepareTableSettings (div_el) {
 
+    div_el.append('<h4 class="ui header">'+LocalizedStrings.getUI('text_teacher_data_types')+'</h4>');
 
+    div_el.append('<div class="ui stackable five column grid">'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="integer_data_type" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('integer')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="real_data_type" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('real')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="text_data_type" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="boolean_data_type" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('boolean')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="void_data_type" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('void')+'</label></div></div>'
 
+        +'</div>');
 
+
 
+
 
+    div_el.append('<h4 class="ui header">'+LocalizedStrings.getUI('text_teacher_commands')+'</h4>');
 
+    div_el.append('<div class="ui stackable three column grid">'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="commands_read" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_read_var')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="commands_write" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_write_var')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="commands_comment" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_comment')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="commands_attribution" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_attribution')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="commands_functioncall" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_functioncall')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="commands_iftrue" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_iftrue')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="commands_repeatNtimes" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_repeatNtimes')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="commands_while" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_whiletrue')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="commands_dowhile" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_dowhiletrue')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="commands_switch" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_switch')+'</label></div></div>'
 
+        +'</div>');
 
+
 
+    div_el.append('<h4 class="ui header">'+LocalizedStrings.getUI('text_teacher_functions')+'</h4>');
 
+    div_el.append('<div class="ui stackable one column grid">'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_teacher_create_functions')+'</label></div></div>'
 
+        +'<div class="column"><div class="ui checkbox"><input type="checkbox" name="" checked tabindex="0" class="hidden small"><label>'+LocalizedStrings.getUI('text_teacher_create_movement_functions')+'</label></div></div>'
 
+        +'</div>');
 
+
 
+    $('.ui.checkbox').checkbox();
 
+
 
+
 
+}

+ 7 - 4
js/visualUI/functions.js
View File 

@@ -19,16 +19,19 @@ var counter_new_parameters = 0;
 
 
 
 let domConsole = null; 
 let domConsole = null; 
 const program = new Models.Program();
 
 const program = new Models.Program();
 
-const variable1 = new Models.Variable(Types.INTEGER, "a", 1);
 
-const mainFunction = new Models.Function(LocalizedStrings.getUI("start"), Types.VOID, 0, [], true, false, [variable1]);
 
-mainFunction.function_comment = new Models.Comment(LocalizedStrings.getUI('text_comment_main'));
 
+/*const variable1 = new Models.Variable(Types.INTEGER, "a", 1);
 
 const parameter1 = new Models.Variable(Types.INTEGER, "par_1", 1);
 
 const parameter1 = new Models.Variable(Types.INTEGER, "par_1", 1);
 
 const command1 = new Models.Comment(new Models.VariableValueMenu(VariableValueMenu.VAR_OR_VALUE_TYPES.only_value, "Testing rendering commands"));
 
 const command1 = new Models.Comment(new Models.VariableValueMenu(VariableValueMenu.VAR_OR_VALUE_TYPES.only_value, "Testing rendering commands"));
 
 
 
 const sumFunction = new Models.Function("soma", Types.INTEGER, 0, [parameter1], false, false, [], null, [command1]);
 
 const sumFunction = new Models.Function("soma", Types.INTEGER, 0, [parameter1], false, false, [], null, [command1]);
 
 
 
-program.addFunction(mainFunction);
 
+
 
 program.addFunction(sumFunction);
 
 program.addFunction(sumFunction);
 
+*/
 
+
 
+const mainFunction = new Models.Function(LocalizedStrings.getUI("start"), Types.VOID, 0, [], true, false);
 
+mainFunction.function_comment = new Models.Comment(LocalizedStrings.getUI('text_comment_main'));
 
+program.addFunction(mainFunction);
 
 
 
 window.program_obj = program;
 
 window.program_obj = program;