Maybe a final solution for templateProcessing + templateDefaults?

oat-sa · May 6, 2016 · fd38526 · fd38526
1 parent 037c9eb
commit fd38526
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 27 deletions.
diff --git a/src/qtism/runtime/common/State.php b/src/qtism/runtime/common/State.php
@@ -163,7 +163,7 @@ public function offsetGet($offset)
     }
 
     /**
-	 * Reset all test-level outcome variables to their defaults.
+	 * Reset all outcome variables to their defaults.
 	 *
 	 * @param boolean $preserveBuiltIn Whether the built-in outcome variable 'completionStatus' should be preserved.
 	 */
@@ -181,6 +181,22 @@ public function resetOutcomeVariables($preserveBuiltIn = true)
             }
         }
     }
+
+    /**
+     * Reset all template variables to their defaults.
+     * 
+     * @return void
+     */
+    public function resetTemplateVariables()
+    {
+        $data = &$this->getDataPlaceHolder();
+
+        foreach (array_keys($data) as $k) {
+            if ($data[$k] instanceof TemplateVariable) {
+                $data[$k]->applyDefaultValue();
+            }
+        }
+    }
 
     /**
 	 * @see \qtism\common\collections\AbstractCollection::checkType()

diff --git a/src/qtism/runtime/tests/AssessmentItemSession.php b/src/qtism/runtime/tests/AssessmentItemSession.php
@@ -634,22 +634,18 @@ public function beginItemSession()
             }
         }
 
+        // Apply default values to Template variables.
+        $this->resetTemplateVariables();
+
         // Apply templateProcessing if needed.
         $templateProcessing = false;
         if ($this->mustAutoTemplateProcessing() === true) {
             $templateProcessing = $this->templateProcessing();
-
-            foreach ($data as $identifier => $variable) {
-                if (in_array($identifier, $filter) === false) {
-
-                    // Outcome variables are applied their default value if any.
-                    if ($variable instanceof OutcomeVariable || ($variable instanceof TemplateVariable && $templateProcessing === false)) {
-                        $variable->applyDefaultValue();
-                    }
-                }
-            }
         }
 
+        // Apply default values of outcomes variables.
+        $this->resetOutcomeVariables();
+
         // The session gets the INITIAL state, ready for a first attempt, and
         // built-in variables get their initial value set.
         $this->setState(AssessmentItemSessionState::INITIAL);

diff --git a/src/qtism/runtime/tests/AssessmentTestSession.php b/src/qtism/runtime/tests/AssessmentTestSession.php
@@ -1871,6 +1871,7 @@ protected function applyTemplateDefaults(AssessmentItemSession $session)
                 if (is_null($variable) === false) {
                     $val = $expressionEngine->process();
                     $variable->setDefaultValue($val);
+                    $variable->applyDefaultValue();
                 }
             }
         }

diff --git a/test/qtismtest/runtime/storage/binary/TemporaryQtiBinaryStorageTest.php b/test/qtismtest/runtime/storage/binary/TemporaryQtiBinaryStorageTest.php
@@ -903,6 +903,7 @@ public function testTemplateDefault1() {
         // TPL1's responses should be applied their default values if any at the
         // beginning of the first attempt.
         $this->assertEquals(null, $session['QTPL1.RESPONSE']);
+        $this->assertEquals(1.0, $session['QTPL1.GOODSCORE']->getValue());
 
         // Noisy persistence ...
         $storage->persist($session);

diff --git a/test/samples/custom/runtime/templates/template_test_simple.xml b/test/samples/custom/runtime/templates/template_test_simple.xml
@@ -20,14 +20,6 @@
                 <outcomeDeclaration identifier="SCORE" cardinality="single" baseType="float"/>
                 <templateDeclaration identifier="GOODSCORE" cardinality="single" baseType="float"/>
                 <templateDeclaration identifier="WRONGSCORE" cardinality="single" baseType="float"/>
-                <templateProcessing>
-                    <setTemplateValue identifier="GOODSCORE">
-                        <default identifier="GOODSCORE"/>
-                    </setTemplateValue>
-                    <setTemplateValue identifier="WRONGSCORE">
-                        <default identifier="WRONGSCORE"/>
-                    </setTemplateValue>
-                </templateProcessing>
                 <responseProcessing>
 			        <responseCondition>
 			            <responseIf>
@@ -63,14 +55,6 @@
                 <outcomeDeclaration identifier="SCORE" cardinality="single" baseType="float"/>
                 <templateDeclaration identifier="GOODSCORE" cardinality="single" baseType="float"/>
                 <templateDeclaration identifier="WRONGSCORE" cardinality="single" baseType="float"/>
-                <templateProcessing>
-                    <setTemplateValue identifier="GOODSCORE">
-                        <default identifier="GOODSCORE"/>
-                    </setTemplateValue>
-                    <setTemplateValue identifier="WRONGSCORE">
-                        <default identifier="WRONGSCORE"/>
-                    </setTemplateValue>
-                </templateProcessing>
                 <responseProcessing>
                     <responseCondition>
                         <responseIf>