Merge pull request #648 from oat-sa/release-5.39.1

Release 5.39.1
oat-sa · Nov 23, 2016 · 42c35ad · 42c35ad
2 parents be35bc7 + 09d3ff3
commit 42c35ad
Show file tree

Hide file tree

Showing 16 changed files with 17 additions and 16 deletions.
diff --git a/manifest.php b/manifest.php
@@ -33,7 +33,7 @@
     'label' => 'QTI test model',
     'description' => 'TAO QTI test implementation',
     'license' => 'GPL-2.0',
-    'version' => '5.38.4',
+    'version' => '5.39.1',
     'author' => 'Open Assessment Technologies',
     'requires' => array(
         'taoTests' => '>=3.7.0',

diff --git a/models/classes/runner/QtiRunnerService.php b/models/classes/runner/QtiRunnerService.php
@@ -223,7 +223,7 @@ public function init(RunnerServiceContext $context)
             }
 
             $session->initItemTimer();
-            if (TestRunnerUtils::isTimeout($session) === false) {
+            if ($session->isTimeout() === false) {
                 TestRunnerUtils::beginCandidateInteraction($session);
             }
         } else {
@@ -1133,7 +1133,7 @@ protected function continueInteraction(RunnerServiceContext $context)
         /* @var TestSession $session */
         $session = $context->getTestSession();
 
-        if ($session->isRunning() === true && TestRunnerUtils::isTimeout($session) === false) {
+        if ($session->isRunning() === true && $session->isTimeout() === false) {
             TestRunnerUtils::beginCandidateInteraction($session);
             $continue = true;
         }

diff --git a/models/classes/runner/time/QtiTimeConstraint.php b/models/classes/runner/time/QtiTimeConstraint.php
@@ -115,7 +115,8 @@ public function getMaximumRemainingTime()
                 // take care of the already consumed extra time under the current constraint
                 // and append the full remaining extra time
                 // the total must correspond to the already elapsed time plus the remaining time
-                $extraTime = $this->timer->getRemainingExtraTime() + $this->timer->getConsumedExtraTime($this->getSource()->getIdentifier());
+                $currentExtraTime = $this->timer->getRemainingExtraTime() + $this->timer->getConsumedExtraTime($this->getSource()->getIdentifier());
+                $extraTime = min($this->timer->getExtraTime(), $currentExtraTime);
                 $remaining->add(new QtiDuration('PT' . $extraTime . 'S'));
             }
             $remaining->sub($this->getDuration());

diff --git a/scripts/update/Updater.php b/scripts/update/Updater.php
@@ -843,6 +843,6 @@ public function update($initialVersion) {
             $this->setVersion('5.38.2');
         }
 
-        $this->skip('5.38.2', '5.38.4');
+        $this->skip('5.38.2', '5.39.1');
     }
 }
diff --git a/views/js/runner/plugins/content/dialog/itemInlineMessage.js b/views/js/runner/plugins/content/dialog/itemInlineMessage.js
@@ -27,7 +27,7 @@ define([
     'i18n',
     'ui/hider',
     'taoTests/runner/plugin',
-    'tpl!taoQtiTest/runner/plugins/navigation/button'
+    'tpl!taoQtiTest/runner/plugins/templates/button'
 ], function($, __, hider, pluginFactory, buttonTpl) {
     'use strict';
 

diff --git a/views/js/runner/plugins/navigation/next.js b/views/js/runner/plugins/navigation/next.js
@@ -32,7 +32,7 @@ define([
     'taoQtiTest/runner/helpers/map',
     'util/shortcut',
     'util/namespace',
-    'tpl!taoQtiTest/runner/plugins/navigation/button'
+    'tpl!taoQtiTest/runner/plugins/templates/button'
 ], function ($, _, __, hider, pluginFactory, nextWarningHelper, messages, mapHelper, shortcut, namespaceHelper, buttonTpl){
     'use strict';
 

diff --git a/views/js/runner/plugins/navigation/nextSection.js b/views/js/runner/plugins/navigation/nextSection.js
@@ -28,7 +28,7 @@ define([
     'ui/hider',
     'taoTests/runner/plugin',
     'taoQtiTest/runner/helpers/messages',
-    'tpl!taoQtiTest/runner/plugins/navigation/button'
+    'tpl!taoQtiTest/runner/plugins/templates/button'
 ], function ($, _, __, hider, pluginFactory, messages, buttonTpl){
     'use strict';
 

diff --git a/views/js/runner/plugins/navigation/previous.js b/views/js/runner/plugins/navigation/previous.js
@@ -29,7 +29,7 @@ define([
     'taoTests/runner/plugin',
     'util/shortcut',
     'util/namespace',
-    'tpl!taoQtiTest/runner/plugins/navigation/button'
+    'tpl!taoQtiTest/runner/plugins/templates/button'
 ], function ($, _, __, hider, pluginFactory, shortcut, namespaceHelper, buttonTpl){
     'use strict';
 

diff --git a/views/js/runner/plugins/navigation/review/review.js b/views/js/runner/plugins/navigation/review/review.js
@@ -31,7 +31,7 @@ define([
     'taoTests/runner/plugin',
     'taoQtiTest/runner/helpers/map',
     'taoQtiTest/runner/plugins/navigation/review/navigator',
-    'tpl!taoQtiTest/runner/plugins/navigation/button'
+    'tpl!taoQtiTest/runner/plugins/templates/button'
 ], function ($, _, __, hider, shortcut, namespaceHelper, pluginFactory, mapHelper, navigatorFactory, buttonTpl) {
     'use strict';
 

diff --git a/views/js/runner/plugins/navigation/skip.js b/views/js/runner/plugins/navigation/skip.js
@@ -27,7 +27,7 @@ define([
     'ui/hider',
     'taoTests/runner/plugin',
     'taoQtiTest/runner/helpers/messages',
-    'tpl!taoQtiTest/runner/plugins/navigation/button'
+    'tpl!taoQtiTest/runner/plugins/templates/button'
 ], function ($, __, hider, pluginFactory, messages, buttonTpl){
     'use strict';
 

diff --git a/...s/js/runner/plugins/navigation/button.tpl → views/js/runner/plugins/templates/button.tpl b/...s/js/runner/plugins/navigation/button.tpl → views/js/runner/plugins/templates/button.tpl
diff --git a/views/js/runner/plugins/tools/areaMasking/areaMasking.js b/views/js/runner/plugins/tools/areaMasking/areaMasking.js
@@ -29,7 +29,7 @@ define([
     'ui/hider',
     'taoTests/runner/plugin',
     'taoQtiTest/runner/plugins/tools/areaMasking/mask',
-    'tpl!taoQtiTest/runner/plugins/navigation/button'
+    'tpl!taoQtiTest/runner/plugins/templates/button'
 ], function ($, _, __, hider, pluginFactory, maskComponent, buttonTpl){
     'use strict';
 

diff --git a/views/js/runner/plugins/tools/calculator.js b/views/js/runner/plugins/tools/calculator.js
@@ -30,7 +30,7 @@ define([
     'util/shortcut',
     'util/namespace',
     'taoTests/runner/plugin',
-    'tpl!taoQtiTest/runner/plugins/navigation/button'
+    'tpl!taoQtiTest/runner/plugins/templates/button'
 ], function ($, _, __, hider, calculatorFactory, shortcut, namespaceHelper, pluginFactory, buttonTpl){
     'use strict';
 

diff --git a/views/js/runner/plugins/tools/comment/comment.js b/views/js/runner/plugins/tools/comment/comment.js
@@ -28,7 +28,7 @@ define([
     'ui/hider',
     'util/shortcut',
     'util/namespace',
-    'tpl!taoQtiTest/runner/plugins/navigation/button',
+    'tpl!taoQtiTest/runner/plugins/templates/button',
     'tpl!taoQtiTest/runner/plugins/tools/comment/comment'
 ], function ($, __, pluginFactory, hider, shortcut, namespaceHelper, buttonTpl, commentTpl) {
     'use strict';

diff --git a/views/js/runner/plugins/tools/itemThemeSwitcher/itemThemeSwitcher.js b/views/js/runner/plugins/tools/itemThemeSwitcher/itemThemeSwitcher.js
@@ -30,7 +30,7 @@ define([
     'ui/themes',
     'util/shortcut',
     'util/namespace',
-    'tpl!taoQtiTest/runner/plugins/navigation/button',
+    'tpl!taoQtiTest/runner/plugins/templates/button',
     'tpl!taoQtiTest/runner/plugins/tools/itemThemeSwitcher/itemThemeSwitcher'
 ], function ($, _, __, pluginFactory, hider, themeHandler, shortcut, namespaceHelper, buttonTpl, itemThemeSwitcherTpl) {
     'use strict';

diff --git a/views/js/runner/plugins/tools/zoom.js b/views/js/runner/plugins/tools/zoom.js
@@ -27,7 +27,7 @@ define([
     'util/shortcut',
     'util/namespace',
     'taoTests/runner/plugin',
-    'tpl!taoQtiTest/runner/plugins/navigation/button'
+    'tpl!taoQtiTest/runner/plugins/templates/button'
 ], function ($, __, hider, transformer, shortcut, namespaceHelper, pluginFactory, buttonTpl){
     'use strict';