Fisheye: Tag ae5ca71cff855dcaa48d5b4f2989e5411fcaac04 refers to a dead (removed) revision in file `lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ae5ca71cff855dcaa48d5b4f2989e5411fcaac04 refers to a dead (removed) revision in file `lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ae5ca71cff855dcaa48d5b4f2989e5411fcaac04 refers to a dead (removed) revision in file `lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ae5ca71cff855dcaa48d5b4f2989e5411fcaac04 refers to a dead (removed) revision in file `lams_tool_doku/conf/hibernate/mappings/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DAO.java (.../DAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/DAO.java (.../DAO.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) @@ -35,16 +35,6 @@ public interface DAO { /** - * Generic method used to get all objects of a particular type. This - * is the same as lookup up all rows in a table. - * - * @param clazz - * the type of objects (a.k.a. while table) to get data from - * @return List of populated objects - */ - public List getObjects(Class clazz); - - /** * Generic method to get an object based on class and identifier. An * ObjectRetrievalFailureException Runtime Exception is thrown if * nothing is found. Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java =================================================================== diff -u -r8846e87b362ce07b580e3750128c5826e667f7e5 -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java (.../DokumaranConfigItemDAOHibernate.java) (revision 8846e87b362ce07b580e3750128c5826e667f7e5) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java (.../DokumaranConfigItemDAOHibernate.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) @@ -12,7 +12,7 @@ @Override public DokumaranConfigItem getConfigItemByKey(final String configKey) { - return (DokumaranConfigItem) getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY).setParameter("key", configKey) + return getSession().createQuery(LOAD_CONFIG_ITEM_BY_KEY, DokumaranConfigItem.class).setParameter("key", configKey) .uniqueResult(); } Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranDAOHibernate.java (.../DokumaranDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranDAOHibernate.java (.../DokumaranDAOHibernate.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) @@ -32,9 +32,7 @@ /** * - * @author Steve.Ni - * - * @version $Revision$ + * @author Andrey Balan */ @Repository public class DokumaranDAOHibernate extends LAMSBaseDAO implements DokumaranDAO { @@ -43,7 +41,7 @@ @Override public Dokumaran getByContentId(Long contentId) { - List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); + List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); if (list.size() > 0) { return (Dokumaran) list.get(0); } else { Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranSessionDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranSessionDAOHibernate.java (.../DokumaranSessionDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranSessionDAOHibernate.java (.../DokumaranSessionDAOHibernate.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) @@ -40,7 +40,7 @@ @Override public DokumaranSession getSessionBySessionId(Long sessionId) { - List list = doFind(FIND_BY_SESSION_ID, sessionId); + List list = doFind(FIND_BY_SESSION_ID, sessionId); if (list == null || list.size() == 0) { return null; } Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java (.../DokumaranUserDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dao/hibernate/DokumaranUserDAOHibernate.java (.../DokumaranUserDAOHibernate.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) @@ -44,7 +44,7 @@ @Override public DokumaranUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { - List list = this.doFind(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); + List list = this.doFind(FIND_BY_USER_ID_SESSION_ID, new Object[] { userID, sessionId }); if (list == null || list.size() == 0) { return null; } @@ -53,7 +53,7 @@ @Override public DokumaranUser getUserByUserIDAndContentID(Long userId, Long contentId) { - List list = this.doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); + List list = this.doFind(FIND_BY_USER_ID_CONTENT_ID, new Object[] { userId, contentId }); if (list == null || list.size() == 0) { return null; } Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/Dokumaran.java (.../Dokumaran.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) @@ -25,64 +25,97 @@ import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cascade; /** * Dokumaran * * @author Andrey Balan */ +@Entity +@Table(name = "tl_ladoku11_dokumaran") public class Dokumaran implements Cloneable { - private static final Logger log = Logger.getLogger(Dokumaran.class); - // key + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; - // tool contentID + @Column(name = "content_id") private Long contentId; + @Column private String title; + @Column private String instructions; // advance + @Column(name = "use_select_leader_tool_ouput") private boolean useSelectLeaderToolOuput; + @Column(name = "allow_multiple_leaders") private boolean allowMultipleLeaders; + @Column(name = "time_limit") private int timeLimit; //date when teacher has started time counter (pressed start button) + @Column(name = "time_limit_launched_date") private Date timeLimitLaunchedDate; + @Column(name = "show_chat") private boolean showChat; + @Column(name = "show_line_numbers") private boolean showLineNumbers; + @Column(name = "shared_pad_id") private String sharedPadId; + @Column(name = "lock_on_finished") private boolean lockWhenFinished; + @Column(name = "define_later") private boolean defineLater; + @Column(name = "content_in_use") private boolean contentInUse; - // general infomation + @Column(name = "reflect_on_activity") + private boolean reflectOnActivity; + + @Column(name = "reflect_instructions") + private String reflectInstructions; + + // general information + + @Column(name = "create_date") private Date created; + @Column(name = "update_date") private Date updated; + @ManyToOne + @Cascade(org.hibernate.annotations.CascadeType.SAVE_UPDATE) + @JoinColumn(name = "create_by") private DokumaranUser createdBy; - private boolean reflectOnActivity; - - private String reflectInstructions; - // ********************************************************** // Function method for Dokumaran // ********************************************************** @@ -100,7 +133,6 @@ @Override public Object clone() { - Dokumaran dokumaran = null; try { dokumaran = (Dokumaran) super.clone(); @@ -176,7 +208,6 @@ * Returns the object's date of last update * * @return date updated - * */ public Date getUpdated() { return updated; @@ -193,9 +224,6 @@ /** * @return Returns the userid of the user who created the Share dokumaran. - * - * - * */ public DokumaranUser getCreatedBy() { return createdBy; @@ -209,9 +237,6 @@ this.createdBy = createdBy; } - /** - * - */ public Long getUid() { return uid; } @@ -222,9 +247,6 @@ /** * @return Returns the title. - * - * - * */ public String getTitle() { return title; @@ -240,9 +262,6 @@ /** * @return Returns the lockWhenFinish. - * - * - * */ public boolean getLockWhenFinished() { return lockWhenFinished; @@ -258,8 +277,6 @@ /** * @return Returns the instructions set by the teacher. - * - * */ public String getInstructions() { return instructions; @@ -269,10 +286,6 @@ this.instructions = instructions; } - /** - * - * @return - */ public boolean isContentInUse() { return contentInUse; } @@ -281,10 +294,6 @@ this.contentInUse = contentInUse; } - /** - * - * @return - */ public boolean isDefineLater() { return defineLater; } @@ -293,10 +302,6 @@ this.defineLater = defineLater; } - /** - * - * @return - */ public Long getContentId() { return contentId; } @@ -321,7 +326,6 @@ } /** - * * @return date when teacher has started time counter (pressed start button) */ public Date getTimeLimitLaunchedDate() { @@ -332,10 +336,6 @@ this.timeLimitLaunchedDate = timeLimitLaunchedDate; } - /** - * - * @return - */ public boolean isShowChat() { return showChat; } @@ -344,22 +344,14 @@ this.showChat = showChat; } - /** - * - * @return - */ public boolean isShowLineNumbers() { return showLineNumbers; } public void setShowLineNumbers(boolean showLineNumbers) { this.showLineNumbers = showLineNumbers; } - - /** - * - * @return - */ + public String getSharedPadId() { return sharedPadId; } @@ -372,22 +364,14 @@ return StringUtils.isNotEmpty(sharedPadId); } - /** - * - * @return - */ public boolean isUseSelectLeaderToolOuput() { return useSelectLeaderToolOuput; } public void setUseSelectLeaderToolOuput(boolean useSelectLeaderToolOuput) { this.useSelectLeaderToolOuput = useSelectLeaderToolOuput; } - - /** - * - * @return - */ + public boolean isAllowMultipleLeaders() { return allowMultipleLeaders; } @@ -396,10 +380,6 @@ this.allowMultipleLeaders = allowMultipleLeaders; } - /** - * - * @return - */ public String getReflectInstructions() { return reflectInstructions; } @@ -408,10 +388,6 @@ this.reflectInstructions = reflectInstructions; } - /** - * - * @return - */ public boolean isReflectOnActivity() { return reflectOnActivity; } Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.java (.../DokumaranConfigItem.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranConfigItem.java (.../DokumaranConfigItem.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) @@ -1,24 +1,31 @@ package org.lamsfoundation.lams.tool.dokumaran.model; -/** - * - */ -public class DokumaranConfigItem implements java.io.Serializable { +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +@Entity +@Table(name = "tl_ladoku11_configuration") +public class DokumaranConfigItem implements java.io.Serializable { private static final long serialVersionUID = 930482766653472631L; public static final String KEY_ETHERPAD_URL = "EtherpadUrl"; - public static final String KEY_API_KEY = "ApiKey"; + @Id + @Column(name = "uid") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long id; + + @Column(name = "config_key") private String configKey; + + @Column(name = "config_value") private String configValue; - /** - * - * - */ public Long getId() { return id; } @@ -27,10 +34,6 @@ this.id = id; } - /** - * - * - */ public String getConfigKey() { return configKey; } @@ -39,10 +42,6 @@ this.configKey = configKey; } - /** - * - * - */ public String getConfigValue() { return configValue; } Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java (.../DokumaranSession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranSession.java (.../DokumaranSession.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) @@ -25,28 +25,59 @@ import java.util.Date; -import org.apache.log4j.Logger; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; + import org.lamsfoundation.lams.tool.dokumaran.DokumaranConstants; /** - * Dokumaran + * Dokumaran session * * @author Andrey Balan */ +@Entity +@Table(name = "tl_ladoku11_session") public class DokumaranSession { - private static Logger log = Logger.getLogger(DokumaranSession.class); - + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "session_id") private Long sessionId; + + @Column(name = "session_name") private String sessionName; + + @ManyToOne + @JoinColumn(name = "dokumaran_uid") private Dokumaran dokumaran; + + @Column(name = "session_start_date") private Date sessionStartDate; + + @Column(name = "session_end_date") private Date sessionEndDate; - // finish or not + + // finished or not + @Column private int status; + + @ManyToOne + @JoinColumn(name = "group_leader_uid") private DokumaranUser groupLeader; + + @Column(name = "etherpad_group_id") private String etherpadGroupId; + + @Column(name = "etherpad_read_only_id") private String etherpadReadOnlyId; // ********************************************************** @@ -63,9 +94,6 @@ this.uid = uuid; } - /** - * @return - */ public Date getSessionEndDate() { return sessionEndDate; } @@ -74,9 +102,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * @return - */ public Date getSessionStartDate() { return sessionStartDate; } @@ -85,9 +110,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * @return - */ public int getStatus() { return status; } @@ -96,9 +118,6 @@ this.status = status; } - /** - * @return - */ public Dokumaran getDokumaran() { return dokumaran; } @@ -107,9 +126,6 @@ this.dokumaran = dokumaran; } - /** - * @return - */ public Long getSessionId() { return sessionId; } Index: lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rae5ca71cff855dcaa48d5b4f2989e5411fcaac04 --- lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java (.../DokumaranUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/model/DokumaranUser.java (.../DokumaranUser.java) (revision ae5ca71cff855dcaa48d5b4f2989e5411fcaac04) @@ -25,44 +25,81 @@ import java.util.Date; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.Table; +import javax.persistence.Transient; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; /** - * Dokumaran + * Dokumaran user * * @author Andrey Balan */ +@Entity +@Table(name = "tl_ladoku11_user") public class DokumaranUser implements Cloneable { - private static final long serialVersionUID = -7043502180037866257L; private static Logger log = Logger.getLogger(DokumaranUser.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "user_id") private Long userId; + + @Column(name = "first_name") private String firstName; + + @Column(name = "last_name") private String lastName; + + @Column(name = "login_name") private String loginName; + + @Column(name = "session_finished") private boolean sessionFinished; + + @Column private boolean leader; + @ManyToOne + @JoinColumn(name = "session_uid") private DokumaranSession session; + + @ManyToOne + @JoinColumn(name = "dokumaran_uid") private Dokumaran dokumaran; // =============== NON Persisit value: for display use =========== + // the user access some reousrce item date time. Use in monitoring summary page + @Transient private Date accessDate; + // dokumaran item complete date. Use in monitoring summary page + @Transient private Date completeDate; + // difference between completeDate and accessDate + @Transient private Date timeTaken; public DokumaranUser() { } public DokumaranUser(UserDTO user, DokumaranSession session) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = user.getUserID().longValue(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); @@ -73,7 +110,7 @@ } public DokumaranUser(UserDTO user, Dokumaran content) { - this.userId = new Long(user.getUserID().intValue()); + this.userId = user.getUserID().longValue(); this.firstName = user.getFirstName(); this.lastName = user.getLastName(); this.loginName = user.getLogin(); @@ -83,12 +120,8 @@ this.leader = false; } - /** - * Clone method from java.lang.Object - */ @Override public Object clone() { - DokumaranUser user = null; try { user = (DokumaranUser) super.clone(); @@ -102,45 +135,46 @@ return user; } + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof DokumaranUser)) { + return false; + } + + final DokumaranUser user = (DokumaranUser) obj; + + return new EqualsBuilder().append(this.uid, user.uid).append(this.firstName, user.firstName) + .append(this.lastName, user.lastName).append(this.loginName, user.loginName).isEquals(); + } + + @Override + public int hashCode() { + return new HashCodeBuilder().append(uid).append(firstName).append(lastName).append(loginName).toHashCode(); + } + // ********************************************************** // Get/Set methods // ********************************************************** - /** - * - * @return Returns the uid. - */ + public Long getUid() { return uid; } - /** - * @param uid - * The uid to set. - */ public void setUid(Long userID) { this.uid = userID; } - /** - * - * @return Returns the userId. - */ public Long getUserId() { return userId; } - /** - * @param userId - * The userId to set. - */ public void setUserId(Long userID) { this.userId = userID; } - /** - * - * @return - */ public String getLastName() { return lastName; } @@ -149,10 +183,6 @@ this.lastName = lastName; } - /** - * - * @return - */ public String getFirstName() { return firstName; } @@ -161,10 +191,6 @@ this.firstName = firstName; } - /** - * - * @return - */ public String getLoginName() { return loginName; } @@ -173,10 +199,6 @@ this.loginName = loginName; } - /** - * - * @return - */ public DokumaranSession getSession() { return session; } @@ -185,10 +207,6 @@ this.session = session; } - /** - * - * @return - */ public Dokumaran getDokumaran() { return dokumaran; } @@ -197,22 +215,14 @@ this.dokumaran = content; } - /** - * - * @return - */ public boolean isSessionFinished() { return sessionFinished; } public void setSessionFinished(boolean sessionFinished) { this.sessionFinished = sessionFinished; } - - /** - * - * @return - */ + public boolean isLeader() { return leader; } @@ -221,27 +231,6 @@ this.leader = leader; } - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof DokumaranUser)) { - return false; - } - - final DokumaranUser user = (DokumaranUser) obj; - - return new EqualsBuilder().append(this.uid, user.uid).append(this.firstName, user.firstName) - .append(this.lastName, user.lastName).append(this.loginName, user.loginName).isEquals(); - - } - - @Override - public int hashCode() { - return new HashCodeBuilder().append(uid).append(firstName).append(lastName).append(loginName).toHashCode(); - } - public Date getAccessDate() { return accessDate; }