fix: log correct time and duration for video subsections

If a subsection of a video is added to a course using advanced settings, show and log correct start and end times to the users.
openedx · Dec 11, 2024 · 2762cfc · 2762cfc
1 parent aeddb8a
commit 2762cfc
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 5 deletions.
diff --git a/xmodule/js/src/video/04_video_control.js b/xmodule/js/src/video/04_video_control.js
@@ -152,10 +152,17 @@
             }
 
             function updateVcrVidTime(params) {
-                var endTime = (this.config.endTime !== null) ? this.config.endTime : params.duration;
+                var endTime = (this.config.endTime !== null) ? this.config.endTime : params.duration,
+                    startTime, currentTime;
                 // in case endTime is accidentally specified as being greater than the video
                 endTime = Math.min(endTime, params.duration);
-                this.videoControl.vidTimeEl.text(Time.format(params.time) + ' / ' + Time.format(endTime));
+                startTime = this.config.startTime > 0 ? this.config.startTime : 0;
+                // if it's a subsection of video, use the clip duration as endTime
+                if (startTime && this.config.endTime) {
+                    endTime = this.config.endTime - startTime;
+                }
+                currentTime = startTime ? params.time - startTime : params.time;
+                this.videoControl.vidTimeEl.text(Time.format(currentTime) + ' / ' + Time.format(endTime));
             }
         }
     );

diff --git a/xmodule/js/src/video/09_events_plugin.js b/xmodule/js/src/video/09_events_plugin.js
@@ -143,8 +143,15 @@
             },
 
             getCurrentTime: function() {
-                var player = this.state.videoPlayer;
-                return player ? player.currentTime : 0;
+                var player = this.state.videoPlayer,
+                    startTime = this.state.config.startTime,
+                    currentTime;
+                currentTime = player ? player.currentTime : 0;
+                // if video didn't start from 0(it's a subsection of video), subtract the additional time at start
+                if (startTime) {
+                    currentTime = currentTime ? currentTime - startTime : 0;
+                }
+                return currentTime;
             },
 
             getCurrentLanguage: function() {
@@ -153,11 +160,15 @@
             },
 
             log: function(eventName, data) {
+                // use startTime and endTime to calculate the duration to handle the case where only a subsection of video is used
+                var endTime = this.state.config.endTime || this.state.duration,
+                    startTime = this.state.config.startTime;
+
                 var logInfo = _.extend({
                     id: this.state.id,
                     // eslint-disable-next-line no-nested-ternary
                     code: this.state.isYoutubeType() ? this.state.youtubeId() : this.state.canPlayHLS ? 'hls' : 'html5',
-                    duration: this.state.duration
+                    duration: endTime - startTime
                 }, data, this.options.data);
                 Logger.log(eventName, logInfo);
             }