Index: lams_gradebook/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/.classpath,v
diff -u -r1.4.2.6 -r1.4.2.7
--- lams_gradebook/.classpath	18 Nov 2016 07:49:46 -0000	1.4.2.6
+++ lams_gradebook/.classpath	3 Feb 2017 09:40:29 -0000	1.4.2.7
@@ -16,6 +16,6 @@
 			<attribute name="javadoc_location" value="http://commons.apache.org/proper/commons-lang/javadocs/api-2.6/"/>
 		</attributes>
 	</classpathentry>
-	<classpathentry kind="lib" path="/lams_learning/build/lib/lams-learning.jar"/>
+	<classpathentry kind="lib" path="/lams_learning/build/lib/lams-learning.jar" sourcepath="/lams_learning"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml,v
diff -u -r1.4.2.9 -r1.4.2.10
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	15 Jun 2016 08:02:07 -0000	1.4.2.9
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml	3 Feb 2017 09:40:29 -0000	1.4.2.10
@@ -37,6 +37,7 @@
 		<property name="transactionAttributes">
 			<props>
 				<prop key="update*">PROPAGATION_REQUIRED</prop>
+				<prop key="recalculate*">PROPAGATION_REQUIRED</prop>
 				<prop key="toggleMarksReleased">PROPAGATION_REQUIRED</prop>
 				<prop key="get*">PROPAGATION_REQUIRED,readOnly</prop>
 				<prop key="export*">PROPAGATION_REQUIRED,readOnly</prop>
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java,v
diff -u -r1.36.2.22 -r1.36.2.23
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	25 Jan 2017 08:57:40 -0000	1.36.2.22
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java	3 Feb 2017 09:40:29 -0000	1.36.2.23
@@ -469,9 +469,39 @@
 	}
     }
 
+    @Override
+    public void recalculateTotalMarksForLesson(Long lessonId) throws Exception {
+	Lesson lesson = lessonDAO.getLesson(lessonId);
+	if (lesson == null) {
+	    return;
+	}
+	
+	Map<Integer, GradebookUserLesson> userToGradebookUserLessonMap = getUserToGradebookUserLessonMap(lesson, null);
+
+	//update for all users in activity
+	Set<User> users = lesson.getAllLearners();
+	for (User user : users) {
+	    Integer userId = user.getUserId();
+	    GradebookUserLesson gradebookUserLesson = userToGradebookUserLessonMap.get(userId);
+
+	    Double totalMark = gradebookDAO.getGradebookUserActivityMarkSum(lessonId, userId);
+	    if (totalMark != null) {
+		
+		if (totalMark > 0 && gradebookUserLesson == null) {
+		    throw new Exception("An error detected: user (userId:" + userId + ") has total mark that equals to "
+			    + totalMark + " but no assocciated gradebookUserLesson exist ");
+		}
+
+		if (gradebookUserLesson != null) {
+		    gradebookUserLesson.setMark(totalMark);
+		    gradebookDAO.insertOrUpdate(gradebookUserLesson);
+		}
+	    }
+	}
+    }
     
     @Override
-    public void updateUserMarksForActivity(Activity activity) {
+    public void recalculateGradebookMarksForActivity(Activity activity) {
 	Long activityId = activity.getActivityId();
 	Lesson lesson = lessonDAO.getLessonForActivity(activityId);
 
Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java,v
diff -u -r1.10.2.9 -r1.10.2.10
--- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	25 Jan 2017 08:57:41 -0000	1.10.2.9
+++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	3 Feb 2017 09:40:29 -0000	1.10.2.10
@@ -124,7 +124,17 @@
      * 
      * @param activity
      */
-    void updateUserMarksForActivity(Activity activity);
+    void recalculateGradebookMarksForActivity(Activity activity);
+    
+    /**
+     * Recalculates total marks for all users in a lesson. Then stores that mark in a gradebookUserLesson. Doesn't
+     * affect anyhow gradebookUserActivity objects. If total mark is positive but there is no gradebookUserLesson
+     * available - throws exception.
+     * 
+     * @param lessonId
+     * @throws Exception
+     */
+    void recalculateTotalMarksForLesson(Long lessonId) throws Exception;
 
     /**
      * Updates a user's lesson mark, this will make it desynchronised with the aggregated marks from the activities
Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/servlet/RecalculateTotalMarksForLessonServlet.java'.
Fisheye: No comparison available.  Pass `N' to diff?
Index: lams_gradebook/web/WEB-INF/web.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_gradebook/web/WEB-INF/Attic/web.xml,v
diff -u -r1.5.2.4 -r1.5.2.5
--- lams_gradebook/web/WEB-INF/web.xml	25 Nov 2014 09:37:33 -0000	1.5.2.4
+++ lams_gradebook/web/WEB-INF/web.xml	3 Feb 2017 09:40:29 -0000	1.5.2.5
@@ -130,6 +130,11 @@
 		</init-param>
 		<load-on-startup>1</load-on-startup>
 	</servlet>
+	
+	<servlet>
+		<servlet-name>recalculateTotalMarksForLesson</servlet-name>
+		<servlet-class>org.lamsfoundation.lams.gradebook.web.servlet.RecalculateTotalMarksForLessonServlet</servlet-class>
+	</servlet>
 
 	<servlet-mapping>
 		<servlet-name>action</servlet-name>
@@ -140,6 +145,11 @@
 		<servlet-name>Connector</servlet-name>
 		<url-pattern>/ckeditor/filemanager/browser/default/connectors/jsp/connector</url-pattern>
 	</servlet-mapping>
+	
+	<servlet-mapping>
+		<servlet-name>recalculateTotalMarksForLesson</servlet-name>
+		<url-pattern>/recalculateTotalMarksForLesson</url-pattern>
+	</servlet-mapping>
 
 	<error-page>
 		<error-code>500</error-code>