Index: lams_build/lib/lams/lams.jar
===================================================================
RCS file: /usr/local/cvsroot/lams_build/lib/lams/lams.jar,v
diff -u -r1.420.2.120 -r1.420.2.121
Binary files differ
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20170411.sql'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java,v
diff -u -r1.2.2.3 -r1.2.2.4
--- lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java	11 May 2016 07:07:30 -0000	1.2.2.3
+++ lams_common/src/java/org/lamsfoundation/lams/logevent/LogEvent.java	11 Apr 2017 18:01:55 -0000	1.2.2.4
@@ -47,6 +47,8 @@
     public static final int TYPE_TEACHER_LESSON_CHANGE_STATE = 4;
     public static final int TYPE_LEARNER_ACTIVITY_START = 5;
     public static final int TYPE_LEARNER_ACTIVITY_FINISH = 6;
+    public static final int TYPE_LEARNER_LESSON_COMPLETE = 7;
+    public static final int TYPE_LEARNER_LESSON_MARK_SUBMIT = 8;
     /** *************************************************************** */
 
     /** identifier field */
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java,v
diff -u -r1.36.2.3 -r1.36.2.4
--- lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	15 Dec 2016 11:48:26 -0000	1.36.2.3
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java	11 Apr 2017 18:02:01 -0000	1.36.2.4
@@ -370,6 +370,11 @@
 	learnerProgress.setCurrentActivity(null);
 	learnerProgress.setNextActivity(null);
 	learnerProgress.setLessonComplete(completionStatus);
+
+	// log learner has completed the current lesson event
+	logEventService.logEvent(LogEvent.TYPE_LEARNER_LESSON_COMPLETE, learnerProgress.getUser().getUserId(), null,
+		learnerProgress.getLesson().getLessonId(), null);
+
 	return learnerProgress;
     }
 
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_learning/src/java/org/lamsfoundation/lams/learning/web/LogLessonMarkPushedToIntegrationsServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_learning/web/lessonComplete.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/lessonComplete.jsp,v
diff -u -r1.26.2.7 -r1.26.2.8
--- lams_learning/web/lessonComplete.jsp	1 Feb 2017 03:12:11 -0000	1.26.2.7
+++ lams_learning/web/lessonComplete.jsp	11 Apr 2017 18:02:01 -0000	1.26.2.8
@@ -19,34 +19,52 @@
   http://www.gnu.org/licenses/gpl.txt
 --%>
 
-<%@ page language="java" pageEncoding="UTF-8"
-	contentType="text/html;charset=utf-8"%>
+<%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8"%>
 <%@ taglib uri="tags-bean" prefix="bean"%>
 <%@ taglib uri="tags-html" prefix="html"%>
 <%@ taglib uri="tags-core" prefix="c"%>
 <%@ taglib uri="tags-fmt" prefix="fmt"%>
 <%@ taglib uri="tags-lams" prefix="lams"%>
+<c:set var="displayPrintButton"><lams:Configuration key="DisplayPrintButton"/></c:set>
+<c:set var="lastName"><lams:user property="lastName"/></c:set>
+<c:set var="firstName"><lams:user property="firstName"/></c:set>
 
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/jquery.js"></script>
 <script type="text/javascript" src="<lams:LAMSURL />includes/javascript/bootstrap.min.js"></script>
-
-<c:set var="displayPrintButton"><lams:Configuration key="DisplayPrintButton"/></c:set>
-
 <script type="text/javascript">
 	function restartLesson(){
 		if (confirm('<fmt:message key="message.learner.progress.restart.confirm"/>')) {
 			window.location.href = "<lams:WebAppURL/>learner.do?method=restartLesson&lessonID=${lessonID}";
 		}
 	}
+	
+	// submit lesson total mark to the integrated server in case request comes from an integrated server
+	if (${not empty lessonFinishUrl}) {
+		$.ajax({ 
+		    url: "${lessonFinishUrl}",
+		    type: "POST",
+		    dataType: 'html',
+			cache: false,
+			async: 'false',
+		    success: function (data) {
+		    	//log mark has been successfullly pushed to the integrated server
+		    	if (data && data == 'OK') {
+		    		$.ajax({ 
+		    		    url: "<lams:WebAppURL/>logLessonMarkPushedToIntegrations",
+		    		    data: {lessonID: "${lessonID}"},
+		    		    type: "POST",
+		    			cache: false
+		    		});		    		
+		    	}
+		    },
+		    error: function (ajaxContext) {
+		        alert("There was an error on trying to submit lesson total mark to the integrated server: " + ajaxContext.responseText)
+		    }
+		});
+	}
 </script>
 
 <lams:Page type="learner">
-	<c:set var="lastName">
-		<lams:user property="lastName"/> 
-	</c:set>
-	<c:set var="firstName">
-	 <lams:user property="firstName"/>
-	</c:set>
 	
 	<div class="lead"><i class="fa fa-lg fa-check-square-o text-success"></i>&nbsp;
 		<fmt:message key="message.lesson.finished">
@@ -95,7 +113,3 @@
 	</c:if>
 	
 </lams:Page>
-
-<c:if test="${not empty lessonFinishUrl}">
-	<img width="0" height="0" style="border: none;" src="${lessonFinishUrl}" />
-</c:if>
Index: lams_learning/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/WEB-INF/Attic/web.xml,v
diff -u -r1.39.2.10 -r1.39.2.11
--- lams_learning/web/WEB-INF/web.xml	15 Mar 2017 07:34:43 -0000	1.39.2.10
+++ lams_learning/web/WEB-INF/web.xml	11 Apr 2017 18:02:01 -0000	1.39.2.11
@@ -103,10 +103,23 @@
 			org.lamsfoundation.lams.learning.web.RepopulateProgressMarksServlet
 		</servlet-class>
 	</servlet>
+	
+	<servlet>
+		<servlet-name>LogLessonMarkPushedToIntegrationsServlet</servlet-name>
+		<servlet-class>
+			org.lamsfoundation.lams.learning.web.LogLessonMarkPushedToIntegrationsServlet
+		</servlet-class>
+	</servlet>	
+	
 	<servlet-mapping>
 		<servlet-name>RepopulateProgressMarksServlet</servlet-name>
 		<url-pattern>/repopulateProgress</url-pattern>
 	</servlet-mapping>
+	
+	<servlet-mapping>
+		<servlet-name>LogLessonMarkPushedToIntegrationsServlet</servlet-name>
+		<url-pattern>/logLessonMarkPushedToIntegrations</url-pattern>
+	</servlet-mapping>
 
 	<!-- Optional Module Placeholder - do not remove -->