Fix medialesson (if you go back to the page after visiting)

thexerteproject · May 4, 2018 · afbc2c4 · afbc2c4
1 parent f7b0131
commit afbc2c4
Show file tree

Hide file tree

Showing 6 changed files with 230 additions and 167 deletions.
diff --git a/modules/xerte/parent_templates/Nottingham/common_html5/js/xttracking_noop.js b/modules/xerte/parent_templates/Nottingham/common_html5/js/xttracking_noop.js
@@ -1068,6 +1068,10 @@ function XTSetPageScoreJSON(page_nr, score)
 
 function XTSetViewed(page_nr, name, score)
 {
+    if (isNaN(score) || typeof score != "number")
+    {
+        score = 0.0;
+    }
     state.setPageScore(page_nr, score);
 }
 
@@ -1088,15 +1092,6 @@ function XThelperConsolidateSegments(videostate)
         }
         csegments.push(segment);
     }
-    var segstr = "[";
-    for (var i=0; i<csegments.length; i++)
-    {
-        if (i>0)
-            segstr += ", ";
-        segstr += "(" + csegments[i].start + ", " + csegments[i].end + ")";
-    }
-    segstr += "]";
-    console.log("Consolidated segments: " + segstr);
     return csegments;
 }
 
@@ -1108,7 +1103,11 @@ function XThelperDetermineProgress(videostate)
     {
         videoseen += csegments[i].end - csegments[i].start;
     }
-    return Math.round(videoseen / videostate.duration * 10000.0)/100.0;
+    // normalized between 0 and 1
+    if (!isNaN(videostate.duration) && videostate.duration > 0) {
+        return Math.round(videoseen / videostate.duration * 100.0) / 100.0;
+    }
+    return 0.0;
 }
 
 function XTVideo(page_nr, name, block_name, verb, videostate) {