react to a "disable duration" change from the LTI tool

see numbas/numbas-lti-provider#288
numbas · Oct 10, 2023 · e6bcaa1 · e6bcaa1
1 parent 11ba812
commit e6bcaa1
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 2 deletions.
diff --git a/runtime/scripts/exam.js b/runtime/scripts/exam.js
@@ -933,6 +933,10 @@ Exam.prototype = /** @lends Numbas.Exam.prototype */ {
         }
         var data = this.store.getDurationExtension();
         if(data) {
+            if(data.disabled) {
+                this.changeDuration(0);
+                return;
+            }
             var extension = 0;
             switch(data.units) {
                 case 'minutes':
@@ -956,6 +960,15 @@ Exam.prototype = /** @lends Numbas.Exam.prototype */ {
     changeDuration: function(duration) {
         var diff = duration - this.settings.duration;
         this.settings.duration = duration;
+
+        if(diff != 0) {
+            if( this.settings.duration > 0 ) {
+                this.events.trigger('showTiming');
+            } else {
+                this.events.trigger('hideTiming');
+            }
+        }
+
         this.timeRemaining += diff;
         if(this.stopwatch) {
             this.stopwatch.end = new Date(this.stopwatch.end.getTime() + diff*1000);
@@ -972,7 +985,7 @@ Exam.prototype = /** @lends Numbas.Exam.prototype */ {
         var duration = this.settings.duration;
         this.displayDuration = duration>0 ? Numbas.timing.secsToDisplayTime( duration ) : '';
         this.events.trigger('updateDisplayDuration', duration);
-        this.display && this.display.showTiming();
+        this.display && (duration > 0 ? this.display.showTiming() : this.display.hideTiming());
         this.events.trigger('showTiming');
     },
 

diff --git a/runtime/scripts/scorm-storage.js b/runtime/scripts/scorm-storage.js
@@ -312,7 +312,9 @@ SCORMStorage.prototype = /** @lends Numbas.storage.SCORMStorage.prototype */ {
     getDurationExtension: function() {
         var duration_extension = pipwerks.SCORM.get('numbas.duration_extension.amount');
         var duration_extension_units = pipwerks.SCORM.get('numbas.duration_extension.units');
+        var disable_duration = pipwerks.SCORM.get('numbas.disable_duration') == 'true';
         return {
+            disabled: disable_duration,
             amount: duration_extension,
             units: duration_extension_units
         }

diff --git a/themes/default/files/scripts/exam-display.js b/themes/default/files/scripts/exam-display.js
@@ -441,7 +441,7 @@ Numbas.queueScript('exam-display',['display-base','math','util','timing'],functi
         showTiming: function()
         {
             this.duration(this.exam.settings.duration);
-            this.displayTime(Numbas.timing.secsToDisplayTime(this.exam.timeRemaining));
+            this.displayTime(Numbas.timing.secsToDisplayTime(Math.max(0, this.exam.timeRemaining)));
             this.timeSpent(Numbas.timing.secsToDisplayTime(this.exam.timeSpent));
         },
         /** Initialise the question list display.