Index: lams_tool_spreadsheet/.classpath
===================================================================
diff -u -r0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf -r55a6c39f478a170c3efe15e3749b952fdb6c5710
--- lams_tool_spreadsheet/.classpath (.../.classpath) (revision 0fdf00ad8ffebc0cc6d79de96a216c08ce0d4cdf)
+++ lams_tool_spreadsheet/.classpath (.../.classpath) (revision 55a6c39f478a170c3efe15e3749b952fdb6c5710)
@@ -6,7 +6,7 @@
-
+
@@ -26,5 +26,6 @@
+
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java
===================================================================
diff -u -r8be2bc782a2c7066c8c33f5605962584df7a2f9b -r55a6c39f478a170c3efe15e3749b952fdb6c5710
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 8be2bc782a2c7066c8c33f5605962584df7a2f9b)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 55a6c39f478a170c3efe15e3749b952fdb6c5710)
@@ -34,6 +34,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;
@@ -91,7 +92,9 @@
private IUserManagementService userManagementService;
private IExportToolContentService exportContentService;
private ICoreNotebookService coreNotebookService;
+ private IGradebookService gradebookService;
+
// *******************************************************************************
// Service method
// *******************************************************************************
@@ -410,8 +413,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
@@ -638,6 +648,7 @@
coreNotebookService.deleteEntry(entry);
}
}
+
spreadsheetDao.delete(spreadsheet);
}
@@ -762,6 +773,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 -ra6641bf9262a01d07740a517643f8fe187ec5b1f -r55a6c39f478a170c3efe15e3749b952fdb6c5710
--- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision a6641bf9262a01d07740a517643f8fe187ec5b1f)
+++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision 55a6c39f478a170c3efe15e3749b952fdb6c5710)
@@ -84,6 +84,10 @@
+
+
+
+