Index: lams_tool_spreadsheet/.classpath
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/.classpath,v
diff -u -r1.9 -r1.10
--- lams_tool_spreadsheet/.classpath 22 Dec 2015 09:37:56 -0000 1.9
+++ lams_tool_spreadsheet/.classpath 24 Feb 2016 03:31:34 -0000 1.10
@@ -6,7 +6,7 @@
-
+
@@ -20,5 +20,6 @@
+
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml,v
diff -u -r1.8 -r1.9
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml 10 Aug 2015 15:08:07 -0000 1.8
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml 24 Feb 2016 03:31:34 -0000 1.9
@@ -83,6 +83,10 @@
+
+
+
+
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java,v
diff -u -r1.19 -r1.20
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 30 Dec 2015 19:08:23 -0000 1.19
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 24 Feb 2016 03:31:34 -0000 1.20
@@ -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;