Rename XTSetAttendace to XTSetViewed

thexerteproject · Mar 15, 2018 · 90aa489 · 90aa489
1 parent 5e7736d
commit 90aa489
Show file tree

Hide file tree

Showing 6 changed files with 37 additions and 11 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
@@ -578,7 +578,7 @@ function XTSetPageScoreJSON(page_nr, score)
     state.setPageScore(page_nr, score);
 }
 
-function XTSetAttendance(page_nr, name, score)
+function XTSetViewed(page_nr, name, score)
 {
     state.setPageScore(page_nr, score);
 }

diff --git a/modules/xerte/pedit/xttracking_pedit.js b/modules/xerte/pedit/xttracking_pedit.js
@@ -605,7 +605,7 @@ function XTSetPageScoreJSON(page_nr, score)
     state.setPageScore(page_nr, score);
 }
 
-function XTSetAttendance(page_nr, name, score)
+function XTSetViewed(page_nr, name, score)
 {
     state.setPageScore(page_nr, score);
 }

diff --git a/modules/xerte/pedit/xttracking_xapi_pedit.js b/modules/xerte/pedit/xttracking_xapi_pedit.js
@@ -91,7 +91,8 @@ function XApiTrackingState()
 
     function initialise()
     {
-
+        this.ALOConnectionPoint = new ALOConnection();
+        this.ALOConnectionPoint.handshake();
     }
 
     function formatDate(d)
@@ -1891,6 +1892,9 @@ function XTSetPageScore(page_nr, score, page_name)
                 completion: true,
                 success: score >= state.lo_passed,
                 score: {
+                    min: 0.0,
+                    max: 100.0,
+                    raw: score,
                     scaled: score / 100
                 },
                 duration: calcDuration(this.pageStart, this.pageEnd)
@@ -1952,6 +1956,9 @@ function XTSetPageScoreJSON(page_nr, score, JSONGraph, page_name)
                     completion: true,
                     success: score >= state.lo_passed,
                     score: {
+                        min: 0.0,
+                        max: 100.0,
+                        raw: score,
                         scaled: score / 100
                     },
                     duration: calcDuration(this.pageStart, this.pageEnd),
@@ -2160,7 +2167,7 @@ function XTSendScoreToPedIT()
 
 
 function XTTerminate() {
-    XTSendScoreToPedIT();
+
     if (!state.finished) {
         var currentpageid = "";
         state.finished = true;
@@ -2370,6 +2377,7 @@ function XTTerminate() {
         );
         SaveStatement(statement, false);
     }
+    XTSendScoreToPedIT();
     window.opener.innerWidth += 2;
     window.opener.innerWidth -= 2;
 }

diff --git a/modules/xerte/play.php b/modules/xerte/play.php
@@ -99,9 +99,7 @@ function show_template_page($row, $datafile="", $tsugi_enabled = false)
     if($tsugi_enabled) {
         $rlo_object_file = "rloObject.htm";
 
-        if($row["tsugi_xapi_enabled"] == 1) {
-            $tracking_js_file = array($flash_js_dir . "xAPI/xttracking_xapi.js");
-        }
+
         if ($pedit_enabled)
         {
             if($row["tsugi_xapi_enabled"] == 1) {
@@ -112,6 +110,12 @@ function show_template_page($row, $datafile="", $tsugi_enabled = false)
                 $tracking_js_file = array($flash_js_dir . "pedit/ALOConnection.js", $flash_js_dir . "pedit/xttracking_pedit.js");
             }
         }
+        else
+        {
+            if($row["tsugi_xapi_enabled"] == 1) {
+                $tracking_js_file = array($flash_js_dir . "xAPI/xttracking_xapi.js");
+            }
+        }
     }else{
         $rlo_object_file = "rloObject.htm";
     }

diff --git a/modules/xerte/scorm1.2/xttracking_scorm1.2.js b/modules/xerte/scorm1.2/xttracking_scorm1.2.js
@@ -1475,8 +1475,15 @@ function XTSetPageType(page_nr, page_type, nrinteractions, weighting)
     }
 }
 
-function XTSetAttendance(page_nr, name, score, page_name) {
-
+function XTSetViewed(page_nr, name, score, page_name) {
+    if (state.scormmode == 'normal')
+    {
+        var sit = state.findPage(page_nr);
+        if (sit != null && (state.scoremode != 'first' || sit.count < 1))
+        {
+            sit.score = score;
+        }
+    }
 }
 
 function XTSetPageScore(page_nr, score, page_name)

diff --git a/modules/xerte/scorm2004.3rd/xttracking_scorm2004.3rd.js b/modules/xerte/scorm2004.3rd/xttracking_scorm2004.3rd.js
@@ -1457,8 +1457,15 @@ function XTSetPageType(page_nr, page_type, nrinteractions, weighting)
     }
 }
 
-function XTSetAttendance(page_nr, name, score, page_name) {
-
+function XTSetViewed(page_nr, name, score, page_name) {
+    if (state.scormmode == 'normal')
+    {
+        var sit = state.findPage(page_nr);
+        if (sit != null && (state.scoremode != 'first' || sit.count < 1))
+        {
+            sit.score = score;
+        }
+    }
 }
 
 function XTSetPageScore(page_nr, score, page_name)