Fisheye: Tag 2b7e3fbbf396542bef8783e204f2f56e8dc7b803 refers to a dead (removed) revision in file `lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2b7e3fbbf396542bef8783e204f2f56e8dc7b803 refers to a dead (removed) revision in file `lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeConfigItem.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2b7e3fbbf396542bef8783e204f2f56e8dc7b803 refers to a dead (removed) revision in file `lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2b7e3fbbf396542bef8783e204f2f56e8dc7b803 refers to a dead (removed) revision in file `lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemInstruction.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2b7e3fbbf396542bef8783e204f2f56e8dc7b803 refers to a dead (removed) revision in file `lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2b7e3fbbf396542bef8783e204f2f56e8dc7b803 refers to a dead (removed) revision in file `lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 2b7e3fbbf396542bef8783e204f2f56e8dc7b803 refers to a dead (removed) revision in file `lams_tool_imscc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/CommonCartridgeItemDAO.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/CommonCartridgeItemDAO.java (.../CommonCartridgeItemDAO.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/CommonCartridgeItemDAO.java (.../CommonCartridgeItemDAO.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) @@ -35,7 +35,7 @@ * @param commonCartridgeUid * @return */ - List getAuthoringItems(Long commonCartridgeUid); + List getAuthoringItems(Long commonCartridgeUid); CommonCartridgeItem getByUid(Long commonCartridgeItemUid); Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemDAOHibernate.java (.../CommonCartridgeItemDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemDAOHibernate.java (.../CommonCartridgeItemDAOHibernate.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) @@ -36,10 +36,10 @@ private static final String FIND_AUTHORING_ITEMS = "from " + CommonCartridgeItem.class.getName() + " where commonCartridge_uid = ? order by create_date asc"; + @SuppressWarnings("unchecked") @Override - public List getAuthoringItems(Long commonCartridgeUid) { - - return this.doFind(FIND_AUTHORING_ITEMS, commonCartridgeUid); + public List getAuthoringItems(Long commonCartridgeUid) { + return (List) this.doFind(FIND_AUTHORING_ITEMS, commonCartridgeUid); } @Override Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java (.../CommonCartridgeItemVisitDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java (.../CommonCartridgeItemVisitDAOHibernate.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) @@ -28,6 +28,7 @@ import java.util.Map; import org.hibernate.SQLQuery; +import org.hibernate.query.NativeQuery; import org.lamsfoundation.lams.dao.hibernate.LAMSBaseDAO; import org.lamsfoundation.lams.tool.commonCartridge.dao.CommonCartridgeItemVisitDAO; import org.lamsfoundation.lams.tool.commonCartridge.model.CommonCartridge; @@ -86,22 +87,22 @@ summaryList.put((Long) list[0], new Integer(((Number) list[1]).intValue())); } } + return summaryList; - } @Override @SuppressWarnings("unchecked") public List getCommonCartridgeItemLogBySession(Long sessionId, Long itemUid) { - return (List) doFind(FIND_BY_ITEM_BYSESSION, new Object[] { sessionId, itemUid }); } @Override public Object[] getDateRangeOfAccesses(Long userUid) { - SQLQuery query = (SQLQuery) getSession().createSQLQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) - .setLong("userUid", userUid); - Object[] values = (Object[]) query.list().get(0); + @SuppressWarnings("unchecked") + NativeQuery query = getSession().createSQLQuery(SQL_QUERY_DATES_BY_USER_SESSION.toString()) + .setParameter("userUid", userUid); + Object[] values = query.list().get(0); return values; } } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java =================================================================== diff -u -r8b5473449dff565aa7166137883b3edf46f8b3ee -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java (.../CommonCartridge.java) (revision 8b5473449dff565aa7166137883b3edf46f8b3ee) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridge.java (.../CommonCartridge.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) @@ -28,65 +28,91 @@ import java.util.Iterator; import java.util.Set; +import javax.persistence.CascadeType; +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.OneToMany; +import javax.persistence.OrderBy; +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.hibernate.annotations.Cascade; /** * CommonCartridge * * @author Andrey Balan */ +@Entity +@Table(name = "tl_laimsc11_commoncartridge") public class CommonCartridge implements Cloneable { - private static final Logger log = Logger.getLogger(CommonCartridge.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 = "allow_auto_run") private boolean runAuto; + @Column(name = "mini_view_commonCartridge_number") private int miniViewCommonCartridgeNumber; + @Column(name = "define_later") private boolean defineLater; + @Column(name = "content_in_use") private boolean contentInUse; // general infomation + + @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 CommonCartridgeUser createdBy; - // commonCartridge Items - private Set commonCartridgeItems; + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "commonCartridge_uid") + @OrderBy("create_date DESC") + private Set commonCartridgeItems = new HashSet<>();; + @Column(name = "reflect_instructions") private boolean reflectOnActivity; + @Column(name = "reflect_on_activity") private String reflectInstructions; // *************** NON Persist Fields ******************** + @Transient private String miniViewNumberStr; - /** - * Default contruction method. - * - */ - public CommonCartridge() { - commonCartridgeItems = new HashSet(); - } - // ********************************************************** // Function method for CommonCartridge // ********************************************************** @@ -108,16 +134,16 @@ @Override public Object clone() { - CommonCartridge commonCartridge = null; + try { commonCartridge = (CommonCartridge) super.clone(); commonCartridge.setUid(null); if (commonCartridgeItems != null) { - Iterator iter = commonCartridgeItems.iterator(); - Set set = new HashSet(); + Iterator iter = commonCartridgeItems.iterator(); + Set set = new HashSet<>(); while (iter.hasNext()) { - CommonCartridgeItem item = (CommonCartridgeItem) iter.next(); + CommonCartridgeItem item = iter.next(); CommonCartridgeItem newItem = (CommonCartridgeItem) item.clone(); // just clone old file without duplicate it in repository set.add(newItem); @@ -129,7 +155,7 @@ commonCartridge.setCreatedBy((CommonCartridgeUser) createdBy.clone()); } } catch (CloneNotSupportedException e) { - CommonCartridge.log.error("When clone " + CommonCartridge.class + " failed"); + log.error("When clone " + CommonCartridge.class + " failed"); } return commonCartridge; @@ -161,7 +187,6 @@ * Updates the modification data for this entity. */ public void updateModificationData() { - long now = System.currentTimeMillis(); if (created == null) { this.setCreated(new Date(now)); @@ -212,9 +237,6 @@ /** * @return Returns the userid of the user who created the Share commonCartridge. - * - * - * */ public CommonCartridgeUser getCreatedBy() { return createdBy; @@ -228,9 +250,6 @@ this.createdBy = createdBy; } - /** - * - */ public Long getUid() { return uid; } @@ -239,28 +258,16 @@ this.uid = uid; } - /** - * @return Returns the title. - * - * - * - */ public String getTitle() { return title; } - - /** - * @param title - * The title to set. - */ + public void setTitle(String title) { this.title = title; } /** * @return Returns the instructions set by the teacher. - * - * */ public String getInstructions() { return instructions; @@ -270,27 +277,14 @@ this.instructions = instructions; } - /** - * - * - * - * - * - * - * @return - */ - public Set getCommonCartridgeItems() { + public Set getCommonCartridgeItems() { return commonCartridgeItems; } - public void setCommonCartridgeItems(Set commonCartridgeItems) { + public void setCommonCartridgeItems(Set commonCartridgeItems) { this.commonCartridgeItems = commonCartridgeItems; } - /** - * - * @return - */ public boolean isContentInUse() { return contentInUse; } @@ -299,10 +293,6 @@ this.contentInUse = contentInUse; } - /** - * - * @return - */ public boolean isDefineLater() { return defineLater; } @@ -311,10 +301,6 @@ this.defineLater = defineLater; } - /** - * - * @return - */ public Long getContentId() { return contentId; } @@ -323,10 +309,6 @@ this.contentId = contentId; } - /** - * - * @return - */ public int getMiniViewCommonCartridgeNumber() { return miniViewCommonCartridgeNumber; } @@ -335,10 +317,6 @@ miniViewCommonCartridgeNumber = minViewCommonCartridgeNumber; } - /** - * - * @return - */ public boolean isRunAuto() { return runAuto; } @@ -360,10 +338,6 @@ miniViewNumberStr = minViewNumber; } - /** - * - * @return - */ public String getReflectInstructions() { return reflectInstructions; } @@ -372,10 +346,6 @@ this.reflectInstructions = reflectInstructions; } - /** - * - * @return - */ public boolean isReflectOnActivity() { return reflectOnActivity; } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeConfigItem.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeConfigItem.java (.../CommonCartridgeConfigItem.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeConfigItem.java (.../CommonCartridgeConfigItem.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) @@ -20,27 +20,34 @@ * **************************************************************** */ - package org.lamsfoundation.lams.tool.commonCartridge.model; -/** - * - */ -public class CommonCartridgeConfigItem 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_laimsc11_configuration") +public class CommonCartridgeConfigItem implements java.io.Serializable { private static final long serialVersionUID = 6360672537352753361L; public static final String KEY_EXPOSE_USER_NAME = "allowExposeUserName"; public static final String KEY_EXPOSE_USER_EMAIL = "allowExposeUserEmail"; + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) Long id; + + @Column(name = "config_key") String configKey; + + @Column(name = "config_value") String configValue; - /** - * - * - */ public Long getId() { return id; } @@ -49,9 +56,6 @@ this.id = id; } - /** - * - */ public String getConfigKey() { return configKey; } @@ -60,9 +64,6 @@ this.configKey = configKey; } - /** - * - */ public String getConfigValue() { return configValue; } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java (.../CommonCartridgeItem.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItem.java (.../CommonCartridgeItem.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) @@ -28,60 +28,116 @@ import java.util.Iterator; import java.util.Set; +import javax.persistence.CascadeType; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.FetchType; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.JoinColumn; +import javax.persistence.ManyToOne; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; +import javax.persistence.Transient; + import org.apache.commons.lang.builder.ToStringBuilder; import org.apache.log4j.Logger; /** - * CommonCartridge + * CommonCartridge Item * * @author Andrey Balan */ +@Entity +@Table(name = "tl_laimsc11_commoncartridge_item") public class CommonCartridgeItem implements Cloneable { private static final Logger log = Logger.getLogger(CommonCartridgeItem.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + // CommonCartridge Type:1=URL,2=File,3=Website,4=Learning Object + @Column(name = "item_type") private short type; + @Column private String title; + @Column private String description; + @Column private String url; + @Column(name = "ims_schema") private String imsSchema; + @Column(name = "init_item") private String initialItem; + @Column(name = "organization_xml") private String organizationXml; + @Column(name = "launch_url") private String launchUrl; + + @Column(name = "secure_launch_url") private String secureLaunchUrl; + + @Column(name = "tool_key") private String key; + + @Column(name = "tool_secret") private String secret; + + @Column(name = "custom_str") private String customStr; + + @Column(name = "frame_height") private int frameHeight; + + @Column(name = "open_url_new_window") private boolean openUrlNewWindow; + + @Column(name = "button_text") private String buttonText; + @Column(name = "file_uuid") private Long fileUuid; + @Column(name = "file_version_id") private Long fileVersionId; + @Column(name = "file_name") private String fileName; + @Column(name = "file_type") private String fileType; - private Set itemInstructions; + @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER, orphanRemoval = true) + @JoinColumn(name = "item_uid") + @OrderBy("sequence_id ASC") + private Set itemInstructions = new HashSet<>(); + @Column(name = "is_hide") private boolean isHide; + + @Column(name = "create_by_author") private boolean isCreateByAuthor; + @Column(name = "create_date") private Date createDate; + + @ManyToOne + @JoinColumn(name = "create_by") private CommonCartridgeUser createBy; - // *********************************************** - // DTO fields: + // *********************************************** DTO fields + @Transient private boolean complete; @Override @@ -91,10 +147,10 @@ obj = (CommonCartridgeItem) super.clone(); // clone attachment if (itemInstructions != null) { - Iterator iter = itemInstructions.iterator(); - Set set = new HashSet(); + Iterator iter = itemInstructions.iterator(); + Set set = new HashSet<>(); while (iter.hasNext()) { - CommonCartridgeItemInstruction instruct = (CommonCartridgeItemInstruction) iter.next(); + CommonCartridgeItemInstruction instruct = iter.next(); CommonCartridgeItemInstruction newInsruct = (CommonCartridgeItemInstruction) instruct.clone(); set.add(newInsruct); } @@ -112,31 +168,24 @@ return obj; } + + @Override + public String toString() { + return new ToStringBuilder(this).append(" uid", uid).append(" type", type).append(" title", title).toString(); + } // ********************************************************** // 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 - */ public Long getFileUuid() { return fileUuid; } @@ -145,10 +194,6 @@ this.fileUuid = crUuid; } - /** - * - * @return - */ public Long getFileVersionId() { return fileVersionId; } @@ -157,10 +202,6 @@ this.fileVersionId = crVersionId; } - /** - * - * @return - */ public String getDescription() { return description; } @@ -169,10 +210,6 @@ this.description = description; } - /** - * - * @return - */ public String getImsSchema() { return imsSchema; } @@ -181,10 +218,6 @@ this.imsSchema = imsSchema; } - /** - * - * @return - */ public String getInitialItem() { return initialItem; } @@ -193,25 +226,14 @@ this.initialItem = initialItem; } - /** - * - * - * - * - * @return - */ - public Set getItemInstructions() { + public Set getItemInstructions() { return itemInstructions; } - public void setItemInstructions(Set itemInstructions) { + public void setItemInstructions(Set itemInstructions) { this.itemInstructions = itemInstructions; } - /** - * - * @return - */ public String getOrganizationXml() { return organizationXml; } @@ -220,10 +242,6 @@ this.organizationXml = organizationXml; } - /** - * - * @return - */ public String getTitle() { return title; } @@ -232,10 +250,6 @@ this.title = title; } - /** - * - * @return - */ public String getUrl() { return url; } @@ -244,11 +258,6 @@ this.url = url; } - /** - * - * - * @return - */ public CommonCartridgeUser getCreateBy() { return createBy; } @@ -257,10 +266,6 @@ this.createBy = createBy; } - /** - * - * @return - */ public Date getCreateDate() { return createDate; } @@ -269,10 +274,6 @@ this.createDate = createDate; } - /** - * - * @return - */ public boolean isCreateByAuthor() { return isCreateByAuthor; } @@ -281,10 +282,6 @@ this.isCreateByAuthor = isCreateByAuthor; } - /** - * - * @return - */ public boolean isHide() { return isHide; } @@ -293,10 +290,6 @@ this.isHide = isHide; } - /** - * - * @return - */ public short getType() { return type; } @@ -305,9 +298,6 @@ this.type = type; } - /** - * - */ public String getFileType() { return fileType; } @@ -316,9 +306,6 @@ this.fileType = type; } - /** - * - */ public String getFileName() { return fileName; } @@ -327,10 +314,6 @@ this.fileName = name; } - /** - * - * @return - */ public boolean isOpenUrlNewWindow() { return openUrlNewWindow; } @@ -339,10 +322,6 @@ this.openUrlNewWindow = openUrlNewWindow; } - /** - * - * @return - */ public String getLaunchUrl() { return launchUrl; } @@ -351,10 +330,6 @@ this.launchUrl = launchUrl; } - /** - * - * @return - */ public String getSecureLaunchUrl() { return secureLaunchUrl; } @@ -363,10 +338,6 @@ this.secureLaunchUrl = secureLaunchUrl; } - /** - * - * @return - */ public String getKey() { return key; } @@ -375,10 +346,6 @@ this.key = key; } - /** - * - * @return - */ public String getSecret() { return secret; } @@ -387,10 +354,6 @@ this.secret = secret; } - /** - * - * @return - */ public String getCustomStr() { return customStr; } @@ -399,10 +362,6 @@ this.customStr = customStr; } - /** - * - * @return - */ public String getButtonText() { return buttonText; } @@ -411,10 +370,6 @@ this.buttonText = buttonText; } - /** - * - * @return - */ public int getFrameHeight() { return frameHeight; } @@ -430,11 +385,5 @@ public boolean isComplete() { return complete; } - - @Override - public String toString() { - return new ToStringBuilder(this).append(" uid", uid).append(" type", type).append(" title", title).toString(); - } - } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemInstruction.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemInstruction.java (.../CommonCartridgeItemInstruction.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemInstruction.java (.../CommonCartridgeItemInstruction.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) @@ -23,17 +23,32 @@ package org.lamsfoundation.lams.tool.commonCartridge.model; +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + import org.apache.log4j.Logger; /** - * * @author Andrey Balan */ +@Entity +@Table(name = "tl_laimsc11_item_instruction") public class CommonCartridgeItemInstruction implements Cloneable { private static final Logger log = Logger.getLogger(CommonCartridgeItemInstruction.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "sequence_id") private int sequenceId; + + @Column private String description; @Override @@ -49,11 +64,11 @@ return obj; } -// ********************************************************** + // ********************************************************** // Get/Set methods -// ********************************************************** + // ********************************************************** + /** - * * @return Returns the uid. */ public Long getUid() { @@ -68,10 +83,6 @@ this.uid = userID; } - /** - * - * @return - */ public String getDescription() { return description; } @@ -80,10 +91,6 @@ this.description = description; } - /** - * - * @return - */ public int getSequenceId() { return sequenceId; } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.java (.../CommonCartridgeItemVisitLog.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeItemVisitLog.java (.../CommonCartridgeItemVisitLog.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) @@ -26,24 +26,44 @@ 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; + /** - * CommonCartridge - * * @author Andrey Balan */ +@Entity +@Table(name = "tl_laimsc11_item_log") public class CommonCartridgeItemVisitLog { + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @ManyToOne + @JoinColumn(name = "user_uid") private CommonCartridgeUser user; + + @ManyToOne + @JoinColumn(name = "commonCartridge_item_uid") private CommonCartridgeItem commonCartridgeItem; + + @Column private boolean complete; + + @Column(name = "access_date") private Date accessDate; + + @Column(name = "session_id") private Long sessionId; - /** - * - * @return - */ public Date getAccessDate() { return accessDate; } @@ -52,11 +72,6 @@ this.accessDate = accessDate; } - /** - * - * - * @return - */ public CommonCartridgeItem getCommonCartridgeItem() { return commonCartridgeItem; } @@ -77,11 +92,6 @@ this.uid = uid; } - /** - * - * - * @return - */ public CommonCartridgeUser getUser() { return user; } @@ -90,10 +100,6 @@ this.user = user; } - /** - * - * @return - */ public boolean isComplete() { return complete; } @@ -102,10 +108,6 @@ this.complete = complete; } - /** - * - * @return - */ public Long getSessionId() { return sessionId; } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.java (.../CommonCartridgeSession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeSession.java (.../CommonCartridgeSession.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) @@ -24,33 +24,54 @@ package org.lamsfoundation.lams.tool.commonCartridge.model; import java.util.Date; -import java.util.Set; -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; /** - * CommonCartridge + * CommonCartridge session * * @author Andrey Balan */ +@Entity +@Table(name = "tl_laimsc11_session") public class CommonCartridgeSession { - private static Logger log = Logger.getLogger(CommonCartridgeSession.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 = "commonCartridge_uid") private CommonCartridge commonCartridge; + + @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; // ********************************************************** // Get/Set methods // ********************************************************** /** - * * @return Returns the learnerID. */ public Long getUid() { @@ -61,10 +82,6 @@ this.uid = uuid; } - /** - * - * @return - */ public Date getSessionEndDate() { return sessionEndDate; } @@ -73,11 +90,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - * @return - */ public Date getSessionStartDate() { return sessionStartDate; } @@ -86,10 +98,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * @return - */ public int getStatus() { return status; } @@ -98,11 +106,6 @@ this.status = status; } - /** - * - * - * @return - */ public CommonCartridge getCommonCartridge() { return commonCartridge; } @@ -111,10 +114,6 @@ this.commonCartridge = commonCartridge; } - /** - * - * @return - */ public Long getSessionId() { return sessionId; } Index: lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r2b7e3fbbf396542bef8783e204f2f56e8dc7b803 --- lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.java (.../CommonCartridgeUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/model/CommonCartridgeUser.java (.../CommonCartridgeUser.java) (revision 2b7e3fbbf396542bef8783e204f2f56e8dc7b803) @@ -25,6 +25,16 @@ 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; @@ -35,29 +45,50 @@ * * @author Andrey Balan */ +@Entity +@Table(name = "tl_laimsc11_user") public class CommonCartridgeUser implements Cloneable { - private static final long serialVersionUID = -7043502180037866257L; private static Logger log = Logger.getLogger(CommonCartridgeUser.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; + @ManyToOne + @JoinColumn(name = "session_uid") private CommonCartridgeSession session; + + @ManyToOne + @JoinColumn(name = "commonCartridge_uid") private CommonCartridge commonCartridge; //=============== NON Persisit value: for display use =========== + //the user access some reousrce item date time. Use in monitoring summary page + @Transient private Date accessDate; public CommonCartridgeUser() { } public CommonCartridgeUser(UserDTO user, CommonCartridgeSession 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(); @@ -67,7 +98,7 @@ } public CommonCartridgeUser(UserDTO user, CommonCartridge 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(); @@ -76,12 +107,8 @@ this.sessionFinished = false; } - /** - * Clone method from java.lang.Object - */ @Override public Object clone() { - CommonCartridgeUser user = null; try { user = (CommonCartridgeUser) super.clone(); @@ -94,10 +121,30 @@ return user; } + + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof CommonCartridgeUser)) { + return false; + } -// ********************************************************** + final CommonCartridgeUser user = (CommonCartridgeUser) 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. @@ -130,10 +177,6 @@ this.userId = userID; } - /** - * - * @return - */ public String getLastName() { return lastName; } @@ -142,10 +185,6 @@ this.lastName = lastName; } - /** - * - * @return - */ public String getFirstName() { return firstName; } @@ -154,10 +193,6 @@ this.firstName = firstName; } - /** - * - * @return - */ public String getLoginName() { return loginName; } @@ -166,11 +201,6 @@ this.loginName = loginName; } - /** - * - * - * @return - */ public CommonCartridgeSession getSession() { return session; } @@ -179,11 +209,6 @@ this.session = session; } - /** - * - * - * @return - */ public CommonCartridge getCommonCartridge() { return commonCartridge; } @@ -192,10 +217,6 @@ this.commonCartridge = content; } - /** - * - * @return - */ public boolean isSessionFinished() { return sessionFinished; } @@ -204,27 +225,6 @@ this.sessionFinished = sessionFinished; } - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof CommonCartridgeUser)) { - return false; - } - - final CommonCartridgeUser user = (CommonCartridgeUser) 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; }