Merge pull request #382 from oat-sa/release-19.2.1

Release 19.2.1
oat-sa · Dec 13, 2023 · 8224abf · 8224abf
2 parents e3fba84 + 37b52f5
commit 8224abf
Show file tree

Hide file tree

Showing 5 changed files with 55 additions and 5 deletions.
diff --git a/src/qtism/data/rules/BranchRuleCollection.php b/src/qtism/data/rules/BranchRuleCollection.php
@@ -31,6 +31,20 @@
  */
 class BranchRuleCollection extends QtiComponentCollection
 {
+
+ /** @var bool */
+ private $allowNonLinearNavigationMode = false;
+
+ public function isNonLinearNavigationModeAllowed(): bool
+ {
+ return $this->allowNonLinearNavigationMode;
+ }
+
+ public function allowNonLinearNavigationMode(): void
+ {
+ $this->allowNonLinearNavigationMode = true;
+ }
+
  /**
  * Check if a given $value is an instance of BranchRule.
  *

diff --git a/src/qtism/runtime/tests/AssessmentTestSession.php b/src/qtism/runtime/tests/AssessmentTestSession.php
@@ -2412,7 +2412,11 @@ protected function nextRouteItem($ignoreBranchings = false, $ignorePreConditions
  $numberOfBranchRules = $branchRules->count();
 
  // Branchings?
- if ($ignoreBranchings === false && $numberOfBranchRules > 0 && $this->mustApplyBranchRules() === true) {
+ if (
+ $ignoreBranchings === false &&
+ $numberOfBranchRules > 0 &&
+ ($this->mustApplyBranchRules() || $branchRules->isNonLinearNavigationModeAllowed())
+ ) {
  for ($i = 0; $i < $numberOfBranchRules; $i++) {
  $engine = new ExpressionEngine($branchRules[$i]->getExpression(), $this);
  $condition = $engine->process();

diff --git a/src/qtism/runtime/tests/RouteItem.php b/src/qtism/runtime/tests/RouteItem.php
@@ -478,6 +478,9 @@ public function getEffectiveBranchRules(): BranchRuleCollection
  } while ($parentSection = $parentSection->getParent());
 
  // Return branching rules from the Test Part level
- return $this->getTestPart()->getBranchRules();
+ $branchingRules = $this->getTestPart()->getBranchRules();
+ $branchingRules->allowNonLinearNavigationMode();
+
+ return $branchingRules;
  }
 }
diff --git a/test/qtismtest/runtime/tests/AssessmentTestSessionBranchingsTest.php b/test/qtismtest/runtime/tests/AssessmentTestSessionBranchingsTest.php
@@ -305,5 +305,17 @@ public function testBranchingRules(): void
  $this->assertEquals('testPart-5', $session->getCurrentTestPart()->getIdentifier());
  $this->assertEquals('assessmentSection-8', $session->getCurrentAssessmentSection()->getIdentifier());
  $this->assertEquals('item-11', $session->getCurrentAssessmentItemRef()->getIdentifier());
+
+ $session->moveNext();
+
+ $this->assertEquals('testPart-6', $session->getCurrentTestPart()->getIdentifier());
+ $this->assertEquals('assessmentSection-9', $session->getCurrentAssessmentSection()->getIdentifier());
+ $this->assertEquals('item-12', $session->getCurrentAssessmentItemRef()->getIdentifier());
+
+ $session->moveNext();
+
+ $this->assertEquals('testPart-8', $session->getCurrentTestPart()->getIdentifier());
+ $this->assertEquals('assessmentSection-11', $session->getCurrentAssessmentSection()->getIdentifier());
+ $this->assertEquals('item-14', $session->getCurrentAssessmentItemRef()->getIdentifier());
  }
 }
diff --git a/test/samples/custom/runtime/branchings/branching_rules.xml b/test/samples/custom/runtime/branchings/branching_rules.xml
@@ -85,18 +85,35 @@
  <assessmentItemRef identifier="item-11" href="./item-11.xml" timeDependent="false">
  <itemSessionControl maxAttempts="0" allowComment="false" validateResponses="false"/>
  </assessmentItemRef>
+ </assessmentSection>
+ </testPart>
+ <testPart identifier="testPart-6" navigationMode="nonlinear" submissionMode="individual">
+ <branchRule target="testPart-8">
+ <baseValue baseType="boolean">true</baseValue>
+ </branchRule>
+ <assessmentSection identifier="assessmentSection-9" title="Section" visible="true">
+ <itemSessionControl maxAttempts="0" allowComment="false" validateResponses="false"/>
  <assessmentItemRef identifier="item-12" href="./item-12.xml" timeDependent="false">
  <itemSessionControl maxAttempts="0" allowComment="false" validateResponses="false"/>
  </assessmentItemRef>
+ </assessmentSection>
+ </testPart>
+ <!-- Will be skipped -->
+ <testPart identifier="testPart-7" navigationMode="nonlinear" submissionMode="individual">
+ <assessmentSection identifier="assessmentSection-10" title="Section" visible="true">
+ <itemSessionControl maxAttempts="0" allowComment="false" validateResponses="false"/>
  <assessmentItemRef identifier="item-13" href="./item-13.xml" timeDependent="false">
  <itemSessionControl maxAttempts="0" allowComment="false" validateResponses="false"/>
  </assessmentItemRef>
+ </assessmentSection>
+ </testPart>
+ <!-- Jump from testPart-6 -->
+ <testPart identifier="testPart-8" navigationMode="nonlinear" submissionMode="individual">
+ <assessmentSection identifier="assessmentSection-11" title="Section" visible="true">
+ <itemSessionControl maxAttempts="0" allowComment="false" validateResponses="false"/>
  <assessmentItemRef identifier="item-14" href="./item-14.xml" timeDependent="false">
  <itemSessionControl maxAttempts="0" allowComment="false" validateResponses="false"/>
  </assessmentItemRef>
- <assessmentItemRef identifier="item-15" required="false" fixed="false" href="./item-15.xml" timeDependent="false">
- <itemSessionControl maxAttempts="0" allowComment="false" validateResponses="false"/>
- </assessmentItemRef>
  </assessmentSection>
  </testPart>
  <outcomeProcessing/>