Merge pull request #489 from oat-sa/release-2.36.0

Release 2.36.0

actions/class.TestRunner.php

@@ -28,7 +28,7 @@
 use qtism\runtime\common\ResponseVariable;
 use qtism\common\enums\BaseType;
 use qtism\common\enums\Cardinality;
-use qtism\common\datatypes\String as QtismString;
+use qtism\common\datatypes\QtiString as QtismString;
 use qtism\runtime\storage\binary\BinaryAssessmentTestSeeker;
 use qtism\runtime\storage\common\AbstractStorage;
 use qtism\data\SubmissionMode;
@@ -862,4 +862,4 @@ protected function handleAssessmentTestSessionException(AssessmentTestSessionExc
 	        break;
 	    }
 	}
-}
+}

composer.json

@@ -47,7 +47,6 @@
   },
   "minimum-stability": "dev",
   "require": {
-    "oat-sa/lib-tao-qti": "~0.1.0",
     "oat-sa/oatbox-extension-installer": "dev-master"
   },
   "autoload": {

helpers/class.SessionManager.php

@@ -25,7 +25,7 @@
 use qtism\runtime\tests\AssessmentItemSession;
 use qtism\data\AssessmentTest;
 use qtism\data\IAssessmentItem;
-use qtism\common\datatypes\Duration;
+use qtism\common\datatypes\QtiDuration;
 
 /**
  * A TAO specific implementation of QTISM's AbstractSessionManager.
@@ -62,7 +62,7 @@ class taoQtiTest_helpers_SessionManager extends AbstractSessionManager {
      */
     public function __construct(taoResultServer_models_classes_ResultServerStateFull $resultServer, core_kernel_classes_Resource $test) {
         parent::__construct();
-        $this->setAcceptableLatency(new Duration(taoQtiTest_models_classes_QtiTestService::singleton()->getQtiTestAcceptableLatency()));
+        $this->setAcceptableLatency(new QtiDuration(taoQtiTest_models_classes_QtiTestService::singleton()->getQtiTestAcceptableLatency()));
         $this->setResultServer($resultServer);
         $this->setTest($test);
     }
@@ -151,4 +151,4 @@ protected function instantiateAssessmentItemSession(IAssessmentItem $assessmentI
     public function createAssessmentItemSessionFactory() {
         return new AssessmentItemSessionFactory(false);
     }
-}
+}

helpers/class.TestRunnerUtils.php

@@ -29,7 +29,7 @@
 use qtism\runtime\tests\Jump;
 use qtism\runtime\tests\RouteItem;
 use oat\taoQtiTest\models\ExtendedStateService;
-use qtism\common\datatypes\String;
+use qtism\common\datatypes\QtiString;
 
 /**
 * Utility methods for the QtiTest Test Runner.
@@ -134,7 +134,7 @@ public static function setInitialOutcomes(AssessmentTestSession $session, \oat\o
                 $values = $testTaker->getPropertyValues($rdfPropUri);
                 $outcome = $session->getVariable($outcomeId);
                 if(!is_null($outcome) && count($values)){
-                    $outcome->setValue(new String($values[0]));
+                    $outcome->setValue(new QtiString($values[0]));
                 }
             }
         }

helpers/class.TestSession.php

@@ -28,8 +28,8 @@
 use qtism\data\expressions\NumberPresented;
 use qtism\data\expressions\NumberCorrect;
 use qtism\common\enums\BaseType;
-use qtism\common\datatypes\Float;
-use qtism\common\datatypes\Duration;
+use qtism\common\datatypes\QtiFloat;
+use qtism\common\datatypes\QtiDuration;
 use qtism\data\AssessmentTest;
 use qtism\runtime\tests\AssessmentTestSession;
 use qtism\runtime\tests\AssessmentTestSessionException;
@@ -200,7 +200,7 @@ public function endTestSession() {
         common_Logger::i('Ending test session.');
         try {
             // Compute the LtiOutcome variable for LTI support.
-            $this->setVariable(new OutcomeVariable('LtiOutcome', Cardinality::SINGLE, BaseType::FLOAT, new Float(0.0)));
+            $this->setVariable(new OutcomeVariable('LtiOutcome', Cardinality::SINGLE, BaseType::FLOAT, new QtiFloat(0.0)));
             $outcomeProcessingEngine = new OutcomeProcessingEngine($this->buildLtiOutcomeProcessing(), $this);
             $outcomeProcessingEngine->process();
 
@@ -582,7 +582,7 @@ public function closeTimer($identifier, $type = null)
             if ($placeId === $identifier) {
                 if (($timeLimits = $source->getTimeLimits()) !== null && ($maxTime = $timeLimits->getMaxTime()) !== null) {
                     $constraintDuration = $constraint->getDuration();
-                    if ($constraintDuration instanceof Duration) {
+                    if ($constraintDuration instanceof QtiDuration) {
                         $constraintDuration->sub($constraintDuration);
                         $constraintDuration->add($maxTime);
                     }

helpers/class.Utils.php

@@ -172,7 +172,7 @@ static public function emptyImsManifest() {
     static public function buildAssessmentItemRefsTestMap(XmlDocument $test, taoQtiTest_models_classes_ManifestParser $manifestParser, $basePath) {
         $assessmentItemRefs = $test->getDocumentComponent()->getComponentsByClassName('assessmentItemRef');
         $map = array('items' => array(), 'dependencies' => array());
-        $itemResources = $manifestParser->getResources(array('imsqti_item_xmlv2p1', 'imsqti_apipitem_xmlv2p1'), taoQtiTest_models_classes_ManifestParser::FILTER_RESOURCE_TYPE);
+        $itemResources = $manifestParser->getResources(Resource::getItemTypes(), taoQtiTest_models_classes_ManifestParser::FILTER_RESOURCE_TYPE);
         $allResources = $manifestParser->getResources();
 
         // cleanup $basePath.

manifest.php

@@ -33,11 +33,11 @@
     'label' => 'QTI test model',
 	'description' => 'TAO QTI test implementation',
     'license' => 'GPL-2.0',
-    'version' => '2.32.0',
+    'version' => '2.36.0',
 	'author' => 'Open Assessment Technologies',
     'requires' => array(
         'taoTests' => '>=2.19.0',
-        'taoQtiItem' => '>=2.6'
+        'taoQtiItem' => '>=2.33'
     ),
 	'models' => array(
 		'http://www.tao.lu/Ontologies/TAOTest.rdf'

models/classes/class.CrudQtiTestsService.php

@@ -17,7 +17,6 @@
  * Copyright (c) 2013-2014 (original work) Open Assessment Technologies SA
  * 
  */
-use \common_exception_UserReadableException;
 
 /**
  * Crud services implements basic CRUD services, orginally intended for 

models/classes/class.QtiTestConverter.php

@@ -19,7 +19,7 @@
 use qtism\data\storage\xml\XmlDocument;
 use qtism\data\QtiComponent;
 use qtism\data\QtiComponentCollection;
-use qtism\common\datatypes\Duration;
+use qtism\common\datatypes\QtiDuration;
 use qtism\common\collections\IntegerCollection;
 use qtism\common\collections\StringCollection;
 use qtism\data\ViewCollection;
@@ -139,7 +139,7 @@ private function componentToArray(QtiComponent $component)
                         if ($value instanceof QtiComponent) {
                             $array[$property->getName()] = $this->componentToArray($value);
                         } else
-                            if ($value instanceof Duration) {
+                            if ($value instanceof QtiDuration) {
                                 $array[$property->getName()] = $value->getSeconds(true);
                             } else
                                 if ($value instanceof IntegerCollection || $value instanceof StringCollection) {
@@ -310,16 +310,16 @@ private function arrayToComponent(array $testArray, QtiComponent $parent = null,
      *
      * @param mixed $value
      * @param object $class
-     * @return \qtism\common\datatypes\Duration
+     * @return \qtism\common\datatypes\QtiDuration
      */
     private function componentValue($value, $class)
     {
         if (! is_null($class)) {
             if (is_array($value)) {
                 return $this->createComponentCollection(new ReflectionClass($class->name), $value);
             } else
-                if ($class->name === 'qtism\common\datatypes\Duration') {
-                    return new qtism\common\datatypes\Duration('PT' . $value . 'S');
+                if ($class->name === 'qtism\common\datatypes\QtiDuration') {
+                    return new qtism\common\datatypes\QtiDuration('PT' . $value . 'S');
                 }
         }
         return $value;

models/classes/runner/QtiRunnerService.php

@@ -34,10 +34,10 @@
 use oat\taoTests\models\runner\time\TimePoint;
 use qtism\common\enums\BaseType;
 use qtism\common\enums\Cardinality;
-use qtism\common\datatypes\String as QtismString;
+use qtism\common\datatypes\QtiString as QtismString;
 use qtism\data\NavigationMode;
 use qtism\data\SubmissionMode;
-use qtism\common\datatypes\Duration;
+use qtism\common\datatypes\QtiDuration;
 use qtism\runtime\common\ResponseVariable;
 use qtism\runtime\common\State;
 use qtism\runtime\tests\AssessmentItemSession;

models/classes/runner/session/TestSession.php

@@ -24,7 +24,7 @@
 use oat\taoQtiTest\models\runner\time\QtiTimeStorage;
 use oat\taoTests\models\runner\time\InconsistentRangeException;
 use oat\taoTests\models\runner\time\TimePoint;
-use qtism\common\datatypes\Duration;
+use qtism\common\datatypes\QtiDuration;
 use qtism\runtime\tests\AssessmentItemSession;
 use qtism\runtime\tests\AssessmentTestPlace;
 use qtism\runtime\tests\AssessmentTestSessionException;
@@ -240,7 +240,7 @@ public function getTimerDuration($identifier, $target = 0)
 
         if (!isset($this->durationCache[$durationKey])) {
             $duration = round($this->getTimer()->compute($identifier, $target), 6);
-            $this->durationCache[$durationKey] = new Duration('PT' . $duration . 'S');
+            $this->durationCache[$durationKey] = new QtiDuration('PT' . $duration . 'S');
         }
 
         return $this->durationCache[$durationKey];

scripts/update/Updater.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) 2015 (original work) Open Assessment Technologies SA;
+ * Copyright (c) 2015-2016 (original work) Open Assessment Technologies SA;
  */
 
 namespace oat\taoQtiTest\scripts\update;
@@ -430,6 +430,6 @@ public function update($initialVersion) {
 
             $this->setVersion('2.31.1');
         }
-        $this->skip('2.31.1', '2.32.0');
+        $this->skip('2.31.1', '2.36.0');
     }
 }

views/js/runner/plugins/controls/timer/timer.js

@@ -298,6 +298,13 @@ define([
                         updateTimers(true);
                     })
 
+                    .on('enableitem', function() {
+                        self.enable();
+                    })
+                    .on('disableitem', function() {
+                        self.disable();
+                    })
+
                     .after('renderitem', function(){
                         //start timers
                         self.enable();

views/js/runner/provider/qti.js

@@ -378,6 +378,16 @@ define([
                         self.trigger('error', err);
                     });
             })
+            .on('pause', function(){
+                self.setPersistentState('paused', true).then(function() {
+                    self.trigger('leave', {
+                        code: self.getTestData().states.suspended
+                    });
+                })
+                .catch(function(err){
+                    self.trigger('error', err);
+                });
+            })
             .on('renderitem', function(itemRef){
 
                 var context = this.getTestContext();

views/js/test/runner/plugins/controls/timerComponent/test.js

@@ -253,7 +253,7 @@ define([
             remaining: 1 * 60 * 1000,
             warnings: {
                 120: { type: 'warning', showed: false, point: 2 * 60 * 1000 },
-                300: { type: 'error', showed: true, point: 5 * 60 * 1000 }
+                300: { type: 'danger', showed: true, point: 5 * 60 * 1000 }
             }
         };
 
@@ -264,13 +264,13 @@ define([
              .render($container)
              .refresh();
 
-        assert.ok( ! $('.qti-timer', $container).hasClass('qti-timer__warning'), 'The element does not display in warning');
+        assert.ok( ! $('.qti-timer .qti-timer_time', $container).hasClass('txt-warning'), 'The element does not display in warning');
 
         var result = timer.warn();
         assert.equal(typeof result, 'object', 'The warn result is a object');
         assert.equal(result.text, "Warning – You have a minute remaining to complete this item.", 'The warn message is a correct');
         assert.equal(result.type, "warning", 'The warn type is a correct');
-        assert.ok($('.qti-timer', $container).hasClass('qti-timer__warning'), 'The element display in warning');
+        assert.ok($('.qti-timer .qti-timer_time', $container).hasClass('txt-warning'), 'The element display in warning');
     });
 
     QUnit.test('warn - red', function(assert) {
@@ -283,7 +283,7 @@ define([
             remaining: 3 * 60 * 1000,
             warnings: {
                 120: { type: 'warning', showed: false, point: 2 * 60 * 1000 },
-                300: { type: 'error', showed: false, point: 5 * 60 * 1000 }
+                300: { type: 'danger', showed: false, point: 5 * 60 * 1000 }
             }
         };
 
@@ -294,13 +294,13 @@ define([
             .render($container)
             .refresh();
 
-        assert.ok( ! $('.qti-timer', $container).hasClass('qti-timer__warning'), 'The element does not display in warning');
+        assert.ok( ! $('.qti-timer .qti-timer_time', $container).hasClass('txt-danger'), 'The element does not display in warning');
 
         var result = timer.warn();
         assert.equal(typeof result, 'object', 'The warn result is a object');
         assert.equal(result.text, "Warning – You have 3 minutes remaining to complete this item.", 'The warn message is a correct');
-        assert.equal(result.type, "error", 'The warn type is a correct');
-        assert.ok($('.qti-timer', $container).hasClass('qti-timer__warning'), 'The element display in warning');
+        assert.equal(result.type, "danger", 'The warn type is a correct');
+        assert.ok($('.qti-timer .qti-timer_time', $container).hasClass('txt-danger'), 'The element display in warning');
     });
 
     QUnit.test('warn - empty', function(assert) {
@@ -321,7 +321,7 @@ define([
             .render($container)
             .refresh();
 
-        assert.ok( ! $('.qti-timer', $container).hasClass('qti-timer__warning'), 'The element does not display in warning');
+        assert.ok( ! $('.qti-timer .qti-timer_time', $container).hasClass('txt-warning'), 'The element does not display in warning');
 
         var result = timer.warn();
         assert.equal(typeof result, 'object', 'The warn result is a object');

views/scss/test-runner.scss

@@ -196,6 +196,7 @@
     .content-panel {
         height: auto !important;
         #qti-content{
+            -webkit-overflow-scrolling: touch; // enable scrolling in iFrame on iOS devices
             overflow-y:auto;
             font-size: 0; //avoid white spaces to screw the height
             #qti-rubrics {

views/templates/test_runner.tpl

@@ -3,7 +3,7 @@ use oat\tao\helpers\Template;
 use oat\tao\helpers\Layout;
 use oat\tao\model\theme\Theme;
 ?><!doctype html>
-<html class="no-js" lang="<?= tao_helpers_I18n::getLangCode() ?>">
+<html lang="<?= tao_helpers_I18n::getLangCode() ?>">
 <head>
     <meta charset="utf-8">
     <meta http-equiv="X-UA-Compatible" content="IE=edge">