Index: lams_central/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -r3282e8325662ca873b88ceb07e627315d415a2c6 -rc35736891f6e9fdb9d4be4e0358ce303e7aad5ff --- lams_central/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 3282e8325662ca873b88ceb07e627315d415a2c6) +++ lams_central/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision c35736891f6e9fdb9d4be4e0358ce303e7aad5ff) @@ -6,6 +6,7 @@ <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refresh" required="false" rtexprvalue="true"%> +<%@ attribute name="lessonID" required="false" rtexprvalue="true"%> @@ -55,7 +56,9 @@ decoderDiv = $('
'); $(document).ready(function (){ - initLearnerPage(${toolSessionID}); + const toolSessionID = ${empty lessonID ? toolSessionID : 'null'}, + lessonID = ${lessonID}; + initLearnerPage(toolSessionID, lessonID); }); function preventLearnerAutosaveFromMultipleTabs(autosaveInterval) { @@ -75,56 +78,73 @@
- - -
+
Skip to main content Index: lams_learning/web/WEB-INF/tags/PageLearner.tag =================================================================== diff -u -r955865d255f86a5447f729ec1ce573b2b6f94b27 -rc35736891f6e9fdb9d4be4e0358ce303e7aad5ff --- lams_learning/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision 955865d255f86a5447f729ec1ce573b2b6f94b27) +++ lams_learning/web/WEB-INF/tags/PageLearner.tag (.../PageLearner.tag) (revision c35736891f6e9fdb9d4be4e0358ce303e7aad5ff) @@ -6,6 +6,7 @@ <%@ attribute name="toolSessionID" required="true" rtexprvalue="true"%> <%@ attribute name="title" required="false" rtexprvalue="true"%> <%@ attribute name="refresh" required="false" rtexprvalue="true"%> +<%@ attribute name="lessonID" required="false" rtexprvalue="true"%> @@ -55,7 +56,9 @@ decoderDiv = $('
'); $(document).ready(function (){ - initLearnerPage(${toolSessionID}); + const toolSessionID = ${empty lessonID ? toolSessionID : 'null'}, + lessonID = ${lessonID}; + initLearnerPage(toolSessionID, lessonID); }); function preventLearnerAutosaveFromMultipleTabs(autosaveInterval) { @@ -75,56 +78,73 @@
- - -
+
Skip to main content Index: lams_learning/web/includes/javascript/learnerPage.js =================================================================== diff -u -r9f3a96b9d3fb0e80b3b181c6ec62a1f2e000decc -rc35736891f6e9fdb9d4be4e0358ce303e7aad5ff --- lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision 9f3a96b9d3fb0e80b3b181c6ec62a1f2e000decc) +++ lams_learning/web/includes/javascript/learnerPage.js (.../learnerPage.js) (revision c35736891f6e9fdb9d4be4e0358ce303e7aad5ff) @@ -1,9 +1,10 @@ // refresh progress bar on first/next activity load -function initLearnerPage(toolSessionId, userId) { +function initLearnerPage(toolSessionId, lessonId, userId) { $.ajax({ url: LAMS_URL + 'learning/learner/getLearnerProgress.do', data: { 'toolSessionID': toolSessionId, + 'lessonID': lessonId, 'userID': userId }, cache: false, Index: lams_learning/web/lessonComplete.jsp =================================================================== diff -u -r21f82ef5c6ab672a3ad2848d330824c97b877738 -rc35736891f6e9fdb9d4be4e0358ce303e7aad5ff --- lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision 21f82ef5c6ab672a3ad2848d330824c97b877738) +++ lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision c35736891f6e9fdb9d4be4e0358ce303e7aad5ff) @@ -18,46 +18,23 @@ http://www.gnu.org/licenses/gpl.txt --%> - - <%@ include file="/common/taglibs.jsp"%> + + + + + - - - - <fmt:message key="learner.title" /> - - - - - - - - - - - - - - - - - + + - - - + - +
-
  +
+    
-
+
@@ -184,16 +178,16 @@
-
+
- +
-
+
@@ -203,25 +197,28 @@ -
- +
+
-
-  
- -

:

-

:

- -
-
-
+
+ +
+ +
+
+ :
+ : +
+ +
+
+
+ - - - - +
+