Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040040.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040040.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch02040040.sql (revision 350e490840216cd99021791b2c6de5be0f2a13a3) @@ -0,0 +1,12 @@ +-- Turn off autocommit, so nothing is committed if there is an error + +SET AUTOCOMMIT = 0; +SET FOREIGN_KEY_CHECKS=0; + +-- LDEV-3420 Add date column to Gradebook marks +ALTER TABLE lams_gradebook_user_activity ADD COLUMN update_date DATETIME DEFAULT NULL; + +-- If there were no errors, commit and restore autocommit to on +SET FOREIGN_KEY_CHECKS=0; +COMMIT; +SET AUTOCOMMIT = 1; Index: lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java =================================================================== diff -u -rdaf00a52f630e4b979227c958b7d1e70e0a9b466 -r350e490840216cd99021791b2c6de5be0f2a13a3 --- lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java (.../GradebookUserActivity.java) (revision daf00a52f630e4b979227c958b7d1e70e0a9b466) +++ lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java (.../GradebookUserActivity.java) (revision 350e490840216cd99021791b2c6de5be0f2a13a3) @@ -23,6 +23,8 @@ /* $Id$ */ package org.lamsfoundation.lams.gradebook; +import java.util.Date; + import org.lamsfoundation.lams.learningdesign.ToolActivity; import org.lamsfoundation.lams.usermanagement.User; @@ -41,15 +43,18 @@ private Double mark; private String feedback; private Boolean markedInGradebook; + private Date updateDate; public GradebookUserActivity() { markedInGradebook = false; + updateDate = new Date(); } public GradebookUserActivity(ToolActivity activity, User learner){ this.activity = activity; this.learner = learner; markedInGradebook = false; + updateDate = new Date(); } /** @@ -120,5 +125,15 @@ this.markedInGradebook = markedInGradebook; } - + /** + * @hibernate.property column="update_date" + * @return + */ + public Date getUpdateDate() { + return updateDate; + } + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } } Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java =================================================================== diff -u -rda9d623352f3964daa5fe12f81a683b9377d286a -r350e490840216cd99021791b2c6de5be0f2a13a3 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision da9d623352f3964daa5fe12f81a683b9377d286a) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java (.../ToolActivity.java) (revision 350e490840216cd99021791b2c6de5be0f2a13a3) @@ -152,6 +152,7 @@ newGradebookAct.setActivity(newToolActivity); newGradebookAct.setLearner(gradebookAct.getLearner()); newGradebookAct.setMark(gradebookAct.getMark()); + newGradebookAct.setUpdateDate(gradebookAct.getUpdateDate()); } } newToolActivity.setGradebookUserActivities(newGradebookUserActivities); Index: lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java =================================================================== diff -u -r39f26ae59d9865f852b62d5f1759b4c9fe6efb24 -r350e490840216cd99021791b2c6de5be0f2a13a3 --- lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 39f26ae59d9865f852b62d5f1759b4c9fe6efb24) +++ lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java (.../GradebookService.java) (revision 350e490840216cd99021791b2c6de5be0f2a13a3) @@ -401,6 +401,7 @@ .toString(); gradebookUserActivity.setMark(mark); + gradebookUserActivity.setUpdateDate(new Date()); gradebookUserActivity.setMarkedInGradebook(markedInGradebook); gradebookDAO.insertOrUpdate(gradebookUserActivity); @@ -451,6 +452,7 @@ } gradebookUserActivity.setFeedback(feedback); + gradebookUserActivity.setUpdateDate(new Date()); gradebookDAO.insertOrUpdate(gradebookUserActivity); }