Merge branch 'release-30.16.0'

oat-sa · Jul 19, 2024 · ce82146 · ce82146
2 parents 74342b8 + b32c884
commit ce82146
Show file tree

Hide file tree

Showing 11 changed files with 184 additions and 70 deletions.
diff --git a/locales/it-IT/messages.po b/locales/it-IT/messages.po
diff --git a/locales/it-IT/messages_po.js b/locales/it-IT/messages_po.js
diff --git a/locales/it-IT/qtiItemRunner.rdf.po b/locales/it-IT/qtiItemRunner.rdf.po
@@ -1,13 +1,13 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: tao-open-source\n"
-"PO-Revision-Date: 2023-09-13 14:47\n"
+"Project-Id-Version: TAO 2024.07\n"
+"PO-Revision-Date: 2024-07-17T14:43:35\n"
 "Last-Translator: TAO Translation Team <[email protected]>\n"
 "MIME-Version: 1.0\n"
-"Language: it\n"
+"Language: it-IT\n"
 "sourceLanguage: en-US\n"
-"targetLanguage: en-US\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"targetLanguage: it-IT\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: tao-open-source\n"

diff --git a/locales/it-IT/taoQti.rdf.po b/locales/it-IT/taoQti.rdf.po
@@ -1,13 +1,13 @@
 msgid ""
 msgstr ""
-"Project-Id-Version: tao-open-source\n"
-"PO-Revision-Date: 2023-09-13 14:47\n"
+"Project-Id-Version: TAO 2024.07\n"
+"PO-Revision-Date: 2024-07-17T14:43:35\n"
 "Last-Translator: TAO Translation Team <[email protected]>\n"
 "MIME-Version: 1.0\n"
-"Language: it\n"
+"Language: it-IT\n"
 "sourceLanguage: en-US\n"
-"targetLanguage: en-US\n"
-"Content-Type: text/plain; charset=UTF-8\n"
+"targetLanguage: it-IT\n"
+"Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Crowdin-Project: tao-open-source\n"

diff --git a/views/css/qti-runner.css b/views/css/qti-runner.css
diff --git a/views/css/qti-runner.css.map b/views/css/qti-runner.css.map
diff --git a/views/js/loader/taoQtiItem.min.js b/views/js/loader/taoQtiItem.min.js
diff --git a/views/js/loader/taoQtiItem.min.js.map b/views/js/loader/taoQtiItem.min.js.map
diff --git a/views/js/qtiCreator/tpl/forms/item.tpl b/views/js/qtiCreator/tpl/forms/item.tpl
@@ -57,3 +57,18 @@
         </select>
     </div>
 {{/if}}
+
+{{#if showRemoveInstructions}}
+<div class="panel">
+    <label>
+        <input name="removeInstructions" type="checkbox" {{#if removeInstructions}}checked="checked" {{/if}} />
+        <span class="icon-checkbox"></span>
+        {{__ "Remove Instructions"}}
+    </label>
+    <span class="icon-help tooltipstered" data-tooltip="~ .tooltip-content:first" data-tooltip-theme="info"></span>
+    <span class="tooltip-content">
+        {{__ "Removes all instruction messages generated by the system from the interface."}}<br />
+        <b>{{__ "Be aware, if you choose to remove the instructions, the system will not provide any warnings to the test takers if constraints are set."}}</b>
+    </span>
+</div>
+{{/if}}
diff --git a/views/js/qtiCreator/widgets/item/states/Active.js b/views/js/qtiCreator/widgets/item/states/Active.js
@@ -13,7 +13,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
  *
- * Copyright (c) 2014-2022 (original work) Open Assessment Technologies SA ;
+ * Copyright (c) 2014-2024 (original work) Open Assessment Technologies SA ;
  *
  */
 define([
@@ -29,6 +29,13 @@ define([
 ], function (_, features, languages, stateFactory, Active, formTpl, formElement, qtiIdentifier) {
     'use strict';
 
+    // These classes are supported for removing the instructions.
+    // Therefore, they are verified for checking the related option.
+    const removeInstructionClasses = ['remove-instructions', '__custom__remove-instructions'];
+
+    // This class will be set for removing the instructions
+    const removeInstructionClass = 'remove-instructions';
+
     const ItemStateActive = stateFactory.create(
         Active,
         function enterActiveState() {
@@ -39,7 +46,13 @@ define([
             const $itemBody = _widget.$container.find('.qti-itemBody');
 
             const showIdentifier = features.isVisible('taoQtiItem/creator/item/property/identifier');
-            const disableIdentifier = qtiIdentifier.isDisabled
+            const disableIdentifier = qtiIdentifier.isDisabled;
+
+            const itemElements = [$itemBody, item];
+            const itemHasClass = classes => classes.some(cls => $itemBody.hasClass(cls));
+            const itemAddClass = cls => itemElements.forEach(el => el.addClass(cls));
+            const itemRemoveClass = cls => itemElements.forEach(el => el.removeClass(cls));
+            const itemRemoveClasses = classes => classes.forEach(itemRemoveClass);
 
             //build form:
             $form.html(
@@ -50,6 +63,8 @@ define([
                     title: item.attr('title'),
                     timeDependent: !!item.attr('timeDependent'),
                     showTimeDependent: features.isVisible('taoQtiItem/creator/item/property/timeDependant'),
+                    removeInstructions: itemHasClass(removeInstructionClasses),
+                    showRemoveInstructions: true,
                     'xml:lang': item.attr('xml:lang'),
                     languagesList: item.data('languagesList'),
                     disableIdentifier
@@ -67,22 +82,26 @@ define([
                     areaBroker.getTitleArea().text(item.attr('title'));
                 },
                 timeDependent: formElement.getAttributeChangeCallback(),
+                removeInstructions(i, value) {
+                    if (value) {
+                        itemAddClass(removeInstructionClass);
+                    } else {
+                        itemRemoveClasses(removeInstructionClasses);
+                    }
+                },
                 'xml:lang': function langChange(i, lang) {
                     item.attr('xml:lang', lang);
-                    languages
-                        .isRTLbyLanguageCode(lang)
-                        .then((isRTL) => {
-                            if (isRTL) {
-                                item.bdy.attr('dir', 'rtl');
-                                $itemBody.attr('dir', 'rtl');
-                            } else {
-                                item.bdy.removeAttr('dir');
-                                $itemBody.removeAttr('dir');
-                            }
-
-                            $itemBody.trigger('item-dir-changed');
+                    languages.isRTLbyLanguageCode(lang).then(isRTL => {
+                        if (isRTL) {
+                            item.bdy.attr('dir', 'rtl');
+                            $itemBody.attr('dir', 'rtl');
+                        } else {
+                            item.bdy.removeAttr('dir');
+                            $itemBody.removeAttr('dir');
                         }
-                    );
+
+                        $itemBody.trigger('item-dir-changed');
+                    });
                 }
             });
 

diff --git a/views/scss/qti/_all-interactions.scss b/views/scss/qti/_all-interactions.scss
@@ -12,4 +12,10 @@
     }
 }
 
-
+.__custom__remove-instructions, .remove-instructions {
+    .qti-interaction {
+        .instruction-container {
+            display: none;
+        }
+    }
+}