Fixed #1273 - xAPI progress not calculated correctly when user was se…

…eking back and forth is special circumstances
thexerteproject · Jan 30, 2024 · 9cd1052 · 9cd1052
1 parent f405ac6
commit 9cd1052
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 5 deletions.
diff --git a/modules/site/xAPI/xttracking_xapi.js b/modules/site/xAPI/xttracking_xapi.js
@@ -2560,8 +2560,9 @@ function XThelperConsolidateSegments(videostate) {
     while (i < segments.length) {
         var segment = $.extend(true, {}, segments[i]);
         i++;
-        while (i < segments.length && parseFloat(segment.end) >= parseFloat(segments[i].start)) {
-            segment.end = segments[i].end;
+        while (i < segments.length && parseFloat(segments[i].start) >= parseFloat(segment.start) && parseFloat(segments[i].start) <= parseFloat(segment.end)) {
+            if (parseFloat(segments[i].end) > parseFloat(segment.end))
+                segment.end = segments[i].end;
             i++;
         }
         csegments.push(segment);

diff --git a/modules/xerte/xAPI/xttracking_xapi.js b/modules/xerte/xAPI/xttracking_xapi.js
@@ -2560,8 +2560,9 @@ function XThelperConsolidateSegments(videostate) {
     while (i < segments.length) {
         var segment = $.extend(true, {}, segments[i]);
         i++;
-        while (i < segments.length && parseFloat(segment.end) >= parseFloat(segments[i].start)) {
-            segment.end = segments[i].end;
+        while (i < segments.length && parseFloat(segments[i].start) >= parseFloat(segment.start) && parseFloat(segments[i].start) <= parseFloat(segment.end)) {
+            if (parseFloat(segments[i].end) > parseFloat(segment.end))
+                segment.end = segments[i].end;
             i++;
         }
         csegments.push(segment);
@@ -2831,7 +2832,7 @@ function XTVideo(page_nr, name, block_name, verb, videostate, set_grouping) {
                 played_segments += videostate.segments[i].start + "[.]" + videostate.segments[i].end;
             }
             var progress = XThelperDetermineProgress(videostate);
-            // 3. Determine whther to use completed or terminated
+            // 3. Determine whether to use completed or terminated
             if (progress >= 99.9) {
                 // Use completed
                 var statement = {