Index: lams_tool_assessment/.classpath
===================================================================
diff -u -re59bc835a5ec91886980d67af70c0f05a0f7ae73 -rcabd1e5deca9e19bb9739e37e823195a38f512a6
--- lams_tool_assessment/.classpath	(.../.classpath)	(revision e59bc835a5ec91886980d67af70c0f05a0f7ae73)
+++ lams_tool_assessment/.classpath	(.../.classpath)	(revision cabd1e5deca9e19bb9739e37e823195a38f512a6)
@@ -18,5 +18,6 @@
 			<attribute name="javadoc_location" value="http://docs.jboss.org/hibernate/orm/3.3/api/"/>
 		</attributes>
 	</classpathentry>
+	<classpathentry combineaccessrules="false" kind="src" path="/lams_gradebook"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml
===================================================================
diff -u -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 -rcabd1e5deca9e19bb9739e37e823195a38f512a6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml	(.../assessmentApplicationContext.xml)	(revision cabd1e5deca9e19bb9739e37e823195a38f512a6)
@@ -97,15 +97,15 @@
    		<property name="learnerService">
    			<ref bean="learnerService"/>
    		</property>
-   		<property name="auditService">
-   			<ref bean="auditService"/>
-   		</property>
    		<property name="userManagementService">
    			<ref bean="userManagementService"/>
    		</property>
    		<property name="exportContentService">
    			<ref bean="exportToolContentService"/>
    		</property>
+   		<property name="gradebookService">
+   			<ref bean="gradebookService" />
+   		</property>
    		<property name="messageService">
    			<ref bean="laasseMessageService"/>
    		</property>
Index: lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java
===================================================================
diff -u -rb6ddefd42c5660f90bd1da67f25e44d65ee21e30 -rcabd1e5deca9e19bb9739e37e823195a38f512a6
--- lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision b6ddefd42c5660f90bd1da67f25e44d65ee21e30)
+++ lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java	(.../AssessmentServiceImpl.java)	(revision cabd1e5deca9e19bb9739e37e823195a38f512a6)
@@ -56,6 +56,7 @@
 import org.lamsfoundation.lams.contentrepository.service.IRepositoryService;
 import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials;
 import org.lamsfoundation.lams.events.IEventNotificationService;
+import org.lamsfoundation.lams.gradebook.service.IGradebookService;
 import org.lamsfoundation.lams.learning.service.ILearnerService;
 import org.lamsfoundation.lams.learningdesign.service.ExportToolContentException;
 import org.lamsfoundation.lams.learningdesign.service.IExportToolContentService;
@@ -107,7 +108,6 @@
 import org.lamsfoundation.lams.usermanagement.dto.UserDTO;
 import org.lamsfoundation.lams.usermanagement.service.IUserManagementService;
 import org.lamsfoundation.lams.util.MessageService;
-import org.lamsfoundation.lams.util.audit.IAuditService;
 
 /**
  * 
@@ -146,11 +146,11 @@
 
     private ILearnerService learnerService;
 
-    private IAuditService auditService;
-
     private IUserManagementService userManagementService;
 
     private IExportToolContentService exportContentService;
+    
+    private IGradebookService gradebookService;
 
     private ICoreNotebookService coreNotebookService;
 
@@ -779,8 +779,14 @@
 	assessmentQuestionResultDao.saveObject(questionResult);
 
 	AssessmentResult result = questionResult.getAssessmentResult();
-	result.setGrade(result.getGrade() - oldMark + newMark);
+	float totalMark = result.getGrade() - oldMark + newMark;
+	result.setGrade(totalMark);
 	assessmentResultDao.saveObject(result);
+
+	// propagade changes to Gradebook
+	Integer userId = result.getUser().getUserId().intValue();
+	Long toolSessionId = result.getUser().getSession().getSessionId();
+	gradebookService.updateActivityMark(new Double(totalMark), null, userId, toolSessionId, true);
     }
 
     @Override
@@ -930,9 +936,6 @@
     // *****************************************************************************
     // set methods for Spring Bean
     // *****************************************************************************
-    public void setAuditService(IAuditService auditService) {
-	this.auditService = auditService;
-    }
 
     public void setLearnerService(ILearnerService learnerService) {
 	this.learnerService = learnerService;
@@ -1218,6 +1221,10 @@
     public void setExportContentService(IExportToolContentService exportContentService) {
 	this.exportContentService = exportContentService;
     }
+    
+    public void setGradebookService(IGradebookService gradebookService) {
+	this.gradebookService = gradebookService;
+    }
 
     public IUserManagementService getUserManagementService() {
 	return userManagementService;