Index: lams_tool_spreadsheet/.classpath
===================================================================
diff -u -r58566cbdbb21e40afd391ee4f7754238697c58f5 -re2301c9c4e462e8d4e30e1b19a6b5e0fd695d53f
--- lams_tool_spreadsheet/.classpath (.../.classpath) (revision 58566cbdbb21e40afd391ee4f7754238697c58f5)
+++ lams_tool_spreadsheet/.classpath (.../.classpath) (revision e2301c9c4e462e8d4e30e1b19a6b5e0fd695d53f)
@@ -6,7 +6,7 @@
-
+
@@ -20,5 +20,6 @@
+
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
===================================================================
diff -u -r9aad33f52b06632e7a8ed3705a7708338bcc00f8 -re2301c9c4e462e8d4e30e1b19a6b5e0fd695d53f
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 9aad33f52b06632e7a8ed3705a7708338bcc00f8)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision e2301c9c4e462e8d4e30e1b19a6b5e0fd695d53f)
@@ -35,6 +35,7 @@
import java.util.TreeSet;
import org.apache.log4j.Logger;
+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;
@@ -94,7 +95,9 @@
private IUserManagementService userManagementService;
private IExportToolContentService exportContentService;
private ICoreNotebookService coreNotebookService;
+ private IGradebookService gradebookService;
+
// *******************************************************************************
// Service method
// *******************************************************************************
@@ -413,8 +416,15 @@
SpreadsheetMark mark = user.getUserModifiedSpreadsheet().getMark();
mark.setDateMarksReleased(new Date());
spreadsheetMarkDao.saveObject(mark);
+
+ // send marks to gradebook where applicable
+ if (mark.getMarks() != null) {
+ Double doubleMark = new Double(mark.getMarks());
+ gradebookService.updateActivityMark(doubleMark, null, user.getUserId().intValue(), sessionId, false);
+ }
}
}
+
}
@Override
@@ -775,6 +785,14 @@
this.coreNotebookService = coreNotebookService;
}
+ public IGradebookService getGradebookService() {
+ return gradebookService;
+ }
+
+ public void setGradebookService(IGradebookService gradebookService) {
+ this.gradebookService = gradebookService;
+ }
+
@Override
public Class[] getSupportedToolOutputDefinitionClasses(int definitionType) {
return null;
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml
===================================================================
diff -u -r73c1472c62db79b6ec21be7a5cba1d901f193013 -re2301c9c4e462e8d4e30e1b19a6b5e0fd695d53f
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision 73c1472c62db79b6ec21be7a5cba1d901f193013)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision e2301c9c4e462e8d4e30e1b19a6b5e0fd695d53f)
@@ -83,6 +83,10 @@
+
+
+
+