Merge pull request #37 from oat-sa/feature/association-response-const…

…raints New AssociationValidityConstraint class.
oat-sa · Jul 19, 2016 · 69567e4 · 69567e4
2 parents d671b61 + a2ae7c4
commit 69567e4
Show file tree

Hide file tree

Showing 25 changed files with 1,250 additions and 100 deletions.
diff --git a/src/qtism/data/AssessmentItem.php b/src/qtism/data/AssessmentItem.php
@@ -751,7 +751,9 @@ public function getResponseValidityConstraints()
             'selectPointInteraction',
             'graphicOrderInteraction',
             'graphicAssociateInteraction',
-            'positionObjectInteraction'
+            'positionObjectInteraction',
+            'gapMatchInteraction',
+            'graphicGapMatchInteraction'
         );
 
         $responseValidityConstraints = new ResponseValidityConstraintCollection();

diff --git a/src/qtism/data/content/interactions/AssociateInteraction.php b/src/qtism/data/content/interactions/AssociateInteraction.php
@@ -24,6 +24,8 @@
 
 use qtism\data\QtiComponentCollection;
 use qtism\data\state\ResponseValidityConstraint;
+use qtism\data\state\AssociationValidityConstraint;
+use qtism\data\state\AssociationValidityConstraintCollection;
 use \InvalidArgumentException;
 
 /**
@@ -247,11 +249,24 @@ public function getSimpleAssociableChoices()
      */
     public function getResponseValidityConstraint()
     {
-        return new ResponseValidityConstraint(
+        $responseValidityConstraint = new ResponseValidityConstraint(
             $this->getResponseIdentifier(),
             $this->getMinAssociations(),
             $this->getMaxAssociations()
         );
+
+        $simpleAssociableChoices = $this->getComponentsByClassName('simpleAssociableChoice');
+        foreach ($simpleAssociableChoices as $simpleAssociableChoice) {
+            $responseValidityConstraint->addAssociationValidityConstraint(
+                new AssociationValidityConstraint(
+                    $simpleAssociableChoice->getIdentifier(),
+                    $simpleAssociableChoice->getMatchMin(),
+                    $simpleAssociableChoice->getMatchMax()
+                )
+            );
+        }
+
+        return $responseValidityConstraint;
     }
 
     /**

diff --git a/src/qtism/data/content/interactions/GapMatchInteraction.php b/src/qtism/data/content/interactions/GapMatchInteraction.php
@@ -14,7 +14,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) 2013-2014 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);
+ * Copyright (c) 2013-2016 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  *
  * @author Jérôme Bogaerts <[email protected]>
  * @license GPLv2
@@ -23,7 +23,8 @@
 namespace qtism\data\content\interactions;
 
 use qtism\data\QtiComponentCollection;
-
+use qtism\data\state\ResponseValidityConstraint;
+use qtism\data\state\AssociationValidityConstraint;
 use qtism\data\content\BlockStaticCollection;
 use \InvalidArgumentException;
 
@@ -180,6 +181,30 @@ public function getContent()
     {
         return $this->content;
     }
+
+    /**
+     * @see qtism\data\content\interactions\Interaction::getResponseValidityConstraint()
+     */
+    public function getResponseValidityConstraint()
+    {
+        $responseValidityConstraint = new ResponseValidityConstraint(
+            $this->getResponseIdentifier(),
+            0,
+            0
+        );
+
+        foreach ($this->getComponentsByClassName(array('gapImg', 'gapText')) as $gapChoice) {
+            $responseValidityConstraint->addAssociationValidityConstraint(
+                new AssociationValidityConstraint(
+                    $gapChoice->getIdentifier(),
+                    $gapChoice->getMatchMin(),
+                    $gapChoice->getMatchMax()
+                )
+            );
+        }
+
+        return $responseValidityConstraint;
+    }
 
     /**
      * @see \qtism\data\content\interactions\BlockInteraction::getComponents()

diff --git a/src/qtism/data/content/interactions/GraphicAssociateInteraction.php b/src/qtism/data/content/interactions/GraphicAssociateInteraction.php
@@ -25,6 +25,7 @@
 use qtism\data\content\xhtml\Object;
 use qtism\data\QtiComponentCollection;
 use qtism\data\state\ResponseValidityConstraint;
+use qtism\data\state\AssociationValidityConstraint;
 use \InvalidArgumentException;
 
 /**
@@ -194,11 +195,23 @@ public function getMinAssociations()
      */
     public function getResponseValidityConstraint()
     {
-        return new ResponseValidityConstraint(
+        $responseValidityConstraint = new ResponseValidityConstraint(
             $this->getResponseIdentifier(),
             $this->getMinAssociations(),
             $this->getMaxAssociations()
         );
+
+        foreach ($this->getComponentsByClassName('associableHotspot') as $associableHotspot) {
+            $responseValidityConstraint->addAssociationValidityConstraint(
+                new AssociationValidityConstraint(
+                    $associableHotspot->getIdentifier(),
+                    $associableHotspot->getMatchMin(),
+                    $associableHotspot->getMatchMax()
+                )
+            );
+        }
+
+        return $responseValidityConstraint;
     }
 
     /**

diff --git a/src/qtism/data/content/interactions/GraphicGapMatchInteraction.php b/src/qtism/data/content/interactions/GraphicGapMatchInteraction.php
@@ -14,7 +14,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) 2013-2014 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);
+ * Copyright (c) 2013-2016 (original work) Open Assessment Technologies SA (under the project TAO-PRODUCT);
  *
  * @author Jérôme Bogaerts <[email protected]>
  * @license GPLv2
@@ -23,6 +23,8 @@
 namespace qtism\data\content\interactions;
 
 use qtism\data\QtiComponentCollection;
+use qtism\data\state\ResponseValidityConstraint;
+use qtism\data\state\AssociationValidityConstraint;
 use \InvalidArgumentException;
 
 /**
@@ -145,6 +147,30 @@ public function getAssociableHotspots()
     {
         return $this->associableHotspots;
     }
+
+    /**
+     * @see qtism\data\content\interactions\Interaction::getResponseValidityConstraint()
+     */
+    public function getResponseValidityConstraint()
+    {
+        $responseValidityConstraint = new ResponseValidityConstraint(
+            $this->getResponseIdentifier(),
+            0,
+            0
+        );
+
+        foreach ($this->getComponentsByClassName(array('gapImg', 'gapText')) as $gapChoice) {
+            $responseValidityConstraint->addAssociationValidityConstraint(
+                new AssociationValidityConstraint(
+                    $gapChoice->getIdentifier(),
+                    $gapChoice->getMatchMin(),
+                    $gapChoice->getMatchMax()
+                )
+            );
+        }
+
+        return $responseValidityConstraint;
+    }
 
     /**
      * @see \qtism\data\content\interactions\BlockInteraction::getComponents()

diff --git a/src/qtism/data/content/interactions/MatchInteraction.php b/src/qtism/data/content/interactions/MatchInteraction.php
@@ -24,6 +24,7 @@
 
 use qtism\data\QtiComponentCollection;
 use qtism\data\state\ResponseValidityConstraint;
+use qtism\data\state\AssociationValidityConstraint;
 use \InvalidArgumentException;
 
 /**
@@ -249,11 +250,23 @@ public function getTargetChoices()
      */
     public function getResponseValidityConstraint()
     {
-        return new ResponseValidityConstraint(
+        $responseValidityConstraint = new ResponseValidityConstraint(
             $this->getResponseIdentifier(),
             $this->getMinAssociations(),
             $this->getMaxAssociations()
         );
+
+        foreach ($this->getComponentsByClassName('simpleAssociableChoice') as $simpleAssociableChoice) {
+            $responseValidityConstraint->addAssociationValidityConstraint(
+                new AssociationValidityConstraint(
+                    $simpleAssociableChoice->getIdentifier(),
+                    $simpleAssociableChoice->getMatchMin(),
+                    $simpleAssociableChoice->getMatchMax()
+                )
+            );
+        }
+
+        return $responseValidityConstraint;
     }
 
     /**