Merge branch 'release-8.6.1'

migrations/Version202211031046021465QtiItemPci.php

@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+namespace oat\qtiItemPci\migrations;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\Exception\IrreversibleMigration;
+use oat\qtiItemPci\scripts\install\RegisterPciMathEntry;
+use oat\tao\scripts\tools\migrations\AbstractMigration;
+
+/**
+ * Auto-generated Migration: Please modify to your needs!
+ */
+final class Version202211031046021465QtiItemPci extends AbstractMigration
+{
+
+    public function getDescription(): string
+    {
+        return 'Update the Math Entry PCI, set response mapping default to 0 for incorrect responses';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addReport(
+            $this->propagate(
+                new RegisterPciMathEntry()
+            )(
+                ['2.4.1']
+            )
+        );
+
+    }
+
+    public function down(Schema $schema): void
+    {
+        throw new IrreversibleMigration(
+            'In order to undo this migration, please revert the client-side changes and run ' . RegisterPciMathEntry::class
+        );
+
+    }
+}

views/js/pciCreator/ims/mathEntryInteraction/creator/tpl/scoreForm.tpl

@@ -4,7 +4,7 @@
     </div>
     <div class="math-entry-score-wrap math-entry-response-correct">
         <span class="math-entry-score-title math-entry-response-correct">{{__ "Score"}}</span>
-        <input value type="text" name="mathEntryScoreInput"
+        <input value="{{score}}" type="text" name="mathEntryScoreInput"
             class="math-entry-score-input math-entry-response-correct" data-validate="$numeric"
             data-validate-option="$allowEmpty; $event(type=keyup)" placeholder="{{placeholder}}">
     </div>

views/js/pciCreator/ims/mathEntryInteraction/creator/widget/states/Map.js

@@ -49,6 +49,7 @@ define([
         return parseInt(value) + 1;
     });
     let uidCounter = 0;
+    let defaultScoreValue = 1;
 
     const MathEntryInteractionStateResponse = stateFactory.create(
         MapState,
@@ -71,12 +72,6 @@ define([
         let interaction = this.widget.element;
         this.activeEditId = null;
 
-        const response = this.widget.element.getResponseDeclaration();
-        const getMappingDefault = response.getMappingAttribute('defaultValue');
-        if (getMappingDefault <= 0) {
-            response.setMappingAttribute('defaultValue', 1);
-        }
-
         const pci = this.widget.element.data('pci');
         const responsesManager = pci.getResponsesManager();
 
@@ -101,6 +96,17 @@ define([
         }
     };
 
+    MathEntryInteractionStateResponse.prototype.getScoreValue = function getScoreValue() {
+        const response = this.widget.element.getResponseDeclaration();
+        const getMappingDefault = response.getMappingAttribute('defaultValue');
+        if (+getMappingDefault !== 0) {
+            defaultScoreValue = getMappingDefault;
+        } else {
+            defaultScoreValue = 1;
+        }
+        return defaultScoreValue;
+    };
+
     MathEntryInteractionStateResponse.prototype.checkValues = function (index) {
         let inputValue = {};
         if (this.correctResponses.has(index) && Object.keys(this.correctResponses.get(index)).includes('input')) {
@@ -118,8 +124,7 @@ define([
         const $responseForm = this.widget.$responseForm;
 
         const response = interaction.getResponseDeclaration();
-        const mapEntries = response.getMapEntries();
-        const mappingDisabled = _.isEmpty(mapEntries);
+        const mappingDisabled = false;
         this.initResponseChangeEventListener();
 
         $responseForm.html(responseFormTpl({
@@ -208,7 +213,7 @@ define([
                 this.correctResponses.set(newId, Object.assign(inputValue, { response: entry }));
 
                 if (mapEntries[entry] && index < 1) {
-                    $score[0].value = mapEntries[entry] || response.getMappingAttribute('defaultValue');
+                    $score[0].value = mapEntries[entry];
                 }
             });
         } else {
@@ -259,7 +264,8 @@ define([
         const $input = $container.find('.math-entry-input');
         const parent = $input[0].parentNode;
         $(parent).prepend(scoreTpl({
-            placeholder: response.getMappingAttribute('defaultValue')
+            placeholder: response.getMappingAttribute('defaultValue'),
+            score: this.getScoreValue()
         }));
         const $correct = $container.find('.math-entry-correct-wrap');
         $input.detach().appendTo($correct);
@@ -464,7 +470,7 @@ define([
         const id = responseId || this.uid();
 
         let gapValues = '';
-        let scoreValue = '';
+        let scoreValue = this.getScoreValue();
         if (this.inGapMode() === true) {
             if (this.correctResponses.has(responseId)) {
                 gapValues = {
@@ -495,12 +501,16 @@ define([
             }
             responseValue = this.gapTemplate;
             this.correctResponses.set(id, { response: gapValues });
-            scoreValue = !!responseId && Object.keys(mapEntries).length > 0 && mapEntries[this.correctResponses.get(responseId).response.base.string] || '';
+            if (!!responseId && Object.keys(mapEntries).length > 0) {
+                scoreValue = mapEntries[this.correctResponses.get(responseId).response.base.string];
+            }
         } else {
             let value = this.correctResponses.has(responseId) && this.correctResponses.get(responseId).response;
             responseValue = value || '';
             this.correctResponses.set(id, { response: responseValue });
-            scoreValue = !!responseId && Object.keys(mapEntries).length > 0 && mapEntries[this.correctResponses.get(responseId).response] || '';
+            if (!!responseId && Object.keys(mapEntries).length > 0) {
+                scoreValue = mapEntries[this.correctResponses.get(responseId).response];
+            }
         }
 
         let alternativeNumber = 1;

views/js/pciCreator/ims/mathEntryInteraction/imsPciCreator.json

@@ -8,7 +8,7 @@
     "label": "Math entry",
     "short": "Math entry",
     "description": "Allow test taker to type math formulas",
-    "version": "2.4.0",
+    "version": "2.4.1",
     "author": "Christophe Noël",
     "email": "christophe@taotesting.com",
     "tags": [