Fix modal feedback/choice templating rendering when using

outcomeDeclarations with multiple cardinalities.
oat-sa · Jul 10, 2015 · 13ed421 · 13ed421
1 parent 1d1a8e2
commit 13ed421
Show file tree

Hide file tree

Showing 2 changed files with 28 additions and 3 deletions.
diff --git a/src/qtism/runtime/rendering/markup/AbstractMarkupRenderingEngine.php b/src/qtism/runtime/rendering/markup/AbstractMarkupRenderingEngine.php
@@ -25,6 +25,12 @@
 
 namespace qtism\runtime\rendering\markup;
 
+use qtism\common\collections\Container;
+
+use qtism\common\datatypes\Identifier;
+
+use qtism\common\datatypes\Scalar;
+
 use qtism\runtime\rendering\RenderingException;
 use qtism\runtime\rendering\Renderable;
 use qtism\data\content\ModalFeedback;
@@ -595,11 +601,21 @@ protected function mustIgnoreComponent(QtiComponent $component)
     protected function identifierMatches(QtiComponent $component)
     {
         $variableIdentifier = ($component instanceof FeedbackElement || $component instanceof ModalFeedback) ? $component->getOutcomeIdentifier() : $component->getTemplateIdentifier();
-        $identifier = $component->getIdentifier();
+        $identifier = new Identifier($component->getIdentifier());
         $showHide = $component->getShowHide();
         $state = $this->getState();
-
-        return (($val = $state[$variableIdentifier]) !== null && $val->equals($identifier));
+
+        $matches = false;
+
+        if (($val = $state[$variableIdentifier]) !== null) {
+            if ($val instanceof Scalar) {
+                $matches = $val->equals($identifier);
+            } elseif ($val instanceof Container) {
+                $matches = $val->contains($identifier);
+            }
+        }
+
+        return $matches;
     }
 
     /**

diff --git a/test/qtismtest/common/collections/ContainerTest.php b/test/qtismtest/common/collections/ContainerTest.php
@@ -1,6 +1,8 @@
 <?php
 namespace qtismtest\common\collections;
 
+use qtism\common\datatypes\Identifier;
+
 use qtismtest\QtiSmTestCase;
 use qtism\common\datatypes\Boolean;
 use qtism\common\datatypes\String;
@@ -216,6 +218,13 @@ public function testContains() {
 		$this->assertTrue($container->contains(new Pair('A', 'B')));
 	}
 
+	public function testContains2() {
+	    $identifier = new Identifier('test');
+	    $container = $this->getContainer();
+	    $container[] = $identifier;
+	    $this->assertTrue($container->contains(new Identifier('test')));
+	}
+
 	/**
 	 * @dataProvider toStringProvider
 	 *