Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -raa9051146a2c7e16c12ccb68a00595bc79fb2e78 -r664113e5a7f816094b983d8c601e0de4a4b2d19d Binary files differ Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml =================================================================== diff -u -r463716d6023591c9c35eeb5057a16c903289029e -r664113e5a7f816094b983d8c601e0de4a4b2d19d --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (.../Activity.hbm.xml) (revision 463716d6023591c9c35eeb5057a16c903289029e) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (.../Activity.hbm.xml) (revision 664113e5a7f816094b983d8c601e0de4a4b2d19d) @@ -224,6 +224,8 @@ + + @hibernate.class Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180329.sql =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180329.sql (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180329.sql (revision 664113e5a7f816094b983d8c601e0de4a4b2d19d) @@ -0,0 +1,13 @@ +SET AUTOCOMMIT = 0; +set FOREIGN_KEY_CHECKS = 0; + +-- LDEV-4538 Add columns to gate activity to track user and time of opening + +ALTER TABLE lams_learning_activity ADD COLUMN gate_open_user BIGINT(20) AFTER gate_open_flag, + ADD COLUMN gate_open_time DATETIME AFTER gate_open_user, + ADD CONSTRAINT FK_lams_learning_activity_17 FOREIGN KEY (gate_open_user) + REFERENCES lams_user (user_id) ON DELETE SET NULL ON UPDATE CASCADE; + +COMMIT; +SET AUTOCOMMIT = 1; +set FOREIGN_KEY_CHECKS = 1; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java =================================================================== diff -u -r51fb2a37254f24bb2a805d4ffd54482c779f43fa -r664113e5a7f816094b983d8c601e0de4a4b2d19d --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java (.../GateActivity.java) (revision 51fb2a37254f24bb2a805d4ffd54482c779f43fa) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GateActivity.java (.../GateActivity.java) (revision 664113e5a7f816094b983d8c601e0de4a4b2d19d) @@ -24,6 +24,7 @@ package org.lamsfoundation.lams.learningdesign; import java.io.Serializable; +import java.util.Date; import java.util.Set; import org.apache.commons.lang.builder.ToStringBuilder; @@ -35,7 +36,6 @@ * */ public abstract class GateActivity extends SimpleActivity implements Serializable, ISystemToolActivity { - public static final int LEARNER_GATE_LEVEL = 1; public static final int GROUP_GATE_LEVEL = 2; @@ -51,6 +51,10 @@ /** persistent field */ private Boolean gateOpen; + private User gateOpenUser; + + private Date gateOpenTime; + /** * The learners who passed the gate. */ @@ -107,6 +111,21 @@ this.gateOpen = gateOpen; } + public User getGateOpenUser() { + return gateOpenUser; + } + + public void setGateOpenUser(User gateOpenUser) { + this.gateOpenUser = gateOpenUser; + } + + public Date getGateOpenTime() { + return gateOpenTime; + } + + public void setGateOpenTime(Date gateOpenTime) { + this.gateOpenTime = gateOpenTime; + } // --------------------------------------------------------------------- // Domain service methods // ---------------------------------------------------------------------