Included action_buttons in iassign_ilm

db/install.php

@@ -68,47 +68,47 @@ function xmldb_iassign_install () {
         array('name', 'url', 'version', 'type', 'description',
               'extension', 'file_jar', 'file_class', 'width', 'height',
               'enable', 'evaluate', 'reevaluate', 'timemodified', 'author', 'timecreated',
-              'editingbehavior', 'submissionbehavior'),
+              'editingbehavior', 'submissionbehavior', 'action_buttons'),
         array('iVProg', 'http://www.usp.br/line/ivprog/', '1.0.20200121', 'HTML5', '{"en":"Visual Interactive Programming on the Internet (HTML)","pt_br":"Programação visual interativa na Internet"}',
               'ivph', 'ilm/iVProg/1.0.20190717/ivprog/', 'index.html', 800, 600,
               1, 1, 1, time(), $USER->id, time(),
-              1, 0)),
+              1, 0, 1)),
       array_combine( // iHanoi 1.0.20200803 - HTML5
         array('name', 'url', 'version', 'type', 'description',
               'extension', 'file_jar', 'file_class', 'width', 'height',
               'enable', 'evaluate', 'reevaluate', 'timemodified', 'author', 'timecreated',
-              'editingbehavior', 'submissionbehavior'),
+              'editingbehavior', 'submissionbehavior', 'action_buttons'),
         array('iHanoi', 'http://www.matematica.br/ihanoi', '1.0.20200803', 'HTML5', '{"en":"interactive Tower os Hanoi (by LInE)", "pt_br":"Torres de Hanói (do LInE)"}',
               'ihn', 'ilm/iHanoi/1.0.20200803/ihanoi/', 'index.html', 1100, 500,
               1, 1, 1, time(), $USER->id, time(),
-              0, 0)),
+              0, 0, 1)),
       array_combine( // iFractions 0.1.20200221 - HTML5
         array('name', 'url', 'version', 'type', 'description',
               'extension', 'file_jar', 'file_class', 'width', 'height',
               'enable', 'evaluate', 'reevaluate', 'timemodified', 'author', 'timecreated',
-              'editingbehavior', 'submissionbehavior'),
+              'editingbehavior', 'submissionbehavior', 'action_buttons'),
         array('iFractions', 'http://www.matematica.br/ifractions', '0.1.20200221', 'HTML5', '{"en":"Interactive Fractions game","pt_br":"Jogo interativa de frações"}',
               'frc', 'ilm/iFractions/0.1.20200221/ifractions/', 'index.html', 1000, 600,
               1, 1, 0, time(), $USER->id, time(),
-              0, 1)),
+              0, 1, 0)),
       array_combine( // iGeom 5.9.22 - Java
         array('name', 'url', 'version', 'type', 'description',
               'extension', 'file_jar', 'file_class', 'width', 'height',
               'enable', 'evaluate', 'reevaluate', 'timemodified', 'author', 'timecreated',
-              'editingbehavior', 'submissionbehavior'),
+              'editingbehavior', 'submissionbehavior', 'action_buttons'),
         array('iGeom', 'http://www.matematica.br/igeom', '5.9.22', 'Java', '{"en":"Interactive Geometry on the Internet","pt_br":"Geometria Interativa na Internet"}',
               'geo', 'ilm/iGeom/5.9.22/iGeom.jar', 'IGeomApplet.class', 800, 600, 
               1, 1, 0, time(), $USER->id, time(),
-              0, 0)),
+              0, 0, 1)),
       array_combine( // Risco 2.2.23 - Java
         array('name', 'url', 'version', 'type', 'description',
               'extension', 'file_jar', 'file_class', 'width', 'height',
               'enable', 'evaluate', 'reevaluate', 'timemodified', 'author', 'timecreated',
-              'editingbehavior', 'submissionbehavior'),
+              'editingbehavior', 'submissionbehavior', 'action_buttons'),
         array('Risko', 'http://risko.pcc.usp.br/', '2.2.23', 'Java', '{"en":"Technical drawing with triangle and ruler","pt_br":"Desenho Geomẽtrico com esquadro"}',
               'rsk', 'ilm/Risko/2.2.23/Risko.jar', 'RiskoApplet.class', 800, 600,
               1, 0, 0, time(), $USER->id, time(),
-              1, 0))
+              1, 0, 1))
       );
 
     $strInstalled_iLM = "";
@@ -133,6 +133,7 @@ function xmldb_iassign_install () {
       $newentry->timecreated = time();
       $newentry->editingbehavior = $record['editingbehavior'];
       $newentry->submissionbehavior = $record['submissionbehavior'];
+      $newentry->action_buttons = $record['action_buttons'];
       try {
         $DB->insert_record("iassign_ilm", $newentry, false);
         $strInstalled_iLM .= "\n" . '  <li>' . $record['name'] . ';' . $record['type'] . ';' . $record['version'] . ' </li>' . "\n";	  

ilm_handlers/html5.php

@@ -314,28 +314,25 @@ class html5 implements ilm_handle {
     //D </script>\n";
 
     if (!isguestuser() && $iassign_statement_activity_item->type_iassign != 1
-        && ($ilm->editingbehavior == 1 || ($ilm->editingbehavior == 0 && !in_array($_GET['action'], array('viewsubmission', 'view'))))) {
+    && ($ilm->editingbehavior == 1 || ($ilm->editingbehavior == 0 && !in_array($_GET['action'], array('viewsubmission', 'view'))))) {
       $iassign .= " <input type='hidden' name='iLM_PARAM_ArchiveContent' value=''>\n";
       $iassign .= " <input type='hidden' name='iLM_PARAM_ActivityEvaluation' value=''>\n";
       $iassign .= " <input type='hidden' name='iLM_PARAM_RealGrade' value=''>\n";
 
-      if (!has_capability('mod/iassign:evaluateiassign', $USER->context, $USER->id))
-        $iassign .= "<p><textarea rows='2' cols='60' name='submission_comment'></textarea></p>\n";
-      else
-        $iassign .= "<input type='hidden' name='submission_comment'>\n";
-      
-      if ($allow_submission) { // it is not iGeom
-        $iassign .= "<center>\n<!-- load button -->\n" .
-            "  <input type=button value='" . get_string('submit_iassign', 'iassign') . "' onClick = 'javascript:window.jsAnalyseAnswer();' title='" .
-            get_string('message_submit_iassign', 'iassign') . "'>\n" . "</center>\n";
-      } else {
-        // Works with 'javascript:window.jsAnalyseAnswer()' or simply 'jsAnalyseAnswer()'
-        $iassign .= "<center>\n<!-- load button -->\n" .
-            "  <input type=button value='" . get_string('submit_iassign', 'iassign') . "' onClick = 'javascript:window.jsAnalyseAnswer();' title='" .
-            get_string('message_submit_iassign', 'iassign') . "'>\n" . "</center>\n";
-      }
+      $disabled_button = "";
+      if ($ilm->action_buttons == 1)
+        $disabled_button = "";
+      elseif ($ilm->action_buttons == 0)
+        $disabled_button = " disabled='true' ";
+
+      $iassign .= "<p><textarea rows='2' cols='60' name='submission_comment'></textarea></p>\n";
+      $iassign .= "<center>\n<!-- load button -->\n" .
+      "  <input $disabled_button type=button value='" . get_string('submit_iassign', 'iassign') . "' onClick = 'javascript:window.jsAnalyseAnswer();' title='" .
+      get_string('message_submit_iassign', 'iassign') . "'>\n" . "</center>\n";
+
+
     } // if (!isguestuser() && $iassign_statement_activity_item->type_iassign != 1)
-    elseif ($ilm->editingbehavior == 0) {
+    elseif ($ilm->editingbehavior == 0 && $student_answer) {
       
       $iassign .= "<center><br><a href=\"view.php?action=repeat&id=".$_GET['id']
             ."&iassign_current=".$_GET['iassign_current']."\">

lang/en/iassign.php

@@ -231,6 +231,7 @@ $string['error_view_without_actiontype']  = 'Error: it is missing the action typ
 $string['error_xml_ilm']                  = 'ERROR: the descriptor (XML file) was not found in submitted package (iLM) or it\'s corrupted.';
 $string['error_xml_missing']              = 'ERROR: the descriptor XML file is incomplete, it is missing the following attributes: ';
 $string['evaluate']                       = 'Auto evaluate';
+$string['evaluate_button']                = 'Evaluate';
 $string['evaluate_iassign']               = 'Evaluating activity';
 $string['eventcoursemoduleviewed']        = 'view activity';
 $string['evententryviewed']               = 'entry has been viewed';

lang/es/iassign.php

@@ -231,6 +231,7 @@ $string['error_view_without_actiontype']  = 'Error: Falta el tipo de acción (ve
 $string['error_xml_ilm']                  = 'ERROR: el archivo XML no se encontró en el paquete enviado o está dañado.';
 $string['error_xml_missing']              = 'ERROR: el archivo XML carece de los siguientes atributos: ';
 $string['evaluate']                       = 'Evaluador automático';
+$string['evaluate_button']                = 'Evaluar';
 $string['evaluate_iassign']               = 'Evaluando tarea';
 $string['eventcoursemoduleviewed']        = 'Ver actividad';
 $string['evententryviewed']               = 'La entrada ha sido vista';

lang/fr/iassign.php

@@ -231,6 +231,7 @@ $string['error_view_without_actiontype']  = 'Erreur : il manque le type d\'actio
 $string['error_xml_ilm']                  = 'ERREUR : le descripteur (fichier XML) n\'a pas été trouvé dans le package (iMA) ou il est corrompu.';
 $string['error_xml_missing']              = 'ERREUR : le descripteur de iMA (fichier XML) est incomplet, il manque les attributs suivants :';
 $string['evaluate']                       = 'Evaluateur automatique';
+$string['evaluate_button']                = 'Evaluate';
 $string['evaluate_iassign']               = 'Evaluation de la tâche';
 $string['eventcoursemoduleviewed']        = 'voir l\'activité';
 $string['evententryviewed']               = 'l\'entrée a été vue';

lang/pt_br/iassign.php

@@ -231,6 +231,7 @@ $string['error_view_without_actiontype']  = 'Erro: faltando o tipo da ação (vi
 $string['error_xml_ilm']                  = 'ERRO: o arquivo descritor (XML descrevendo a estrutura do iMA em HTML5) não foi encontrado no pacote ou está corrompido.';
 $string['error_xml_missing']              = 'ERRO: os seguintes atributos não foram encontrados no arquivo XML (de configuração do iMA em HTML5): ';
 $string['evaluate']                       = 'Avaliador automático';
+$string['evaluate_button']                = 'Avaliar';
 $string['evaluate_iassign']               = 'Avaliando atividade';
 $string['eventcoursemoduleviewed']        = 'visualizar atividade';
 $string['evententryviewed']               = 'entrada visualizada';

version.php

@@ -90,7 +90,7 @@ defined('MOODLE_INTERNAL') || die();
 // v 1.0 2012/10/16
 $plugin->component = 'mod_iassign';  // Full name of the plugin (used for diagnostics)
 $plugin->release = '2.8.01 (Build: 2020080300)'; // Human-readable version name
-$plugin->version = 2020102908;       // The current module version (Date: YYYYMMDDXX)
+$plugin->version = 2020102910;       // The current module version (Date: YYYYMMDDXX)
 $plugin->requires = 2014021100;      // Requires this Moodle version since 3.0.0)
 $plugin->maturity = MATURITY_STABLE; // How stable the plugin is: MATURITY_ALPHA, MATURITY_BETA, MATURITY_RC, MATURITY_STABLE (Moodle 2.0 and above)
 $plugin->cron = 60;