Fisheye: Tag c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 refers to a dead (removed) revision in file `lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 refers to a dead (removed) revision in file `lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetMark.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 refers to a dead (removed) revision in file `lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 refers to a dead (removed) revision in file `lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 refers to a dead (removed) revision in file `lams_tool_spreadsheet/conf/hibernate/mappings/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/SpreadsheetMarkDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/UserModifiedSpreadsheetDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetMarkDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java =================================================================== diff -u -rceb74e3b4097cf6461280448f904fa21a176aaa4 -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java (.../SpreadsheetUserDAOHibernate.java) (revision ceb74e3b4097cf6461280448f904fa21a176aaa4) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/SpreadsheetUserDAOHibernate.java (.../SpreadsheetUserDAOHibernate.java) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) @@ -73,7 +73,6 @@ } @Override - @SuppressWarnings("unchecked") /** * Will return List<[SpreadsheetUser, String], [SpreadsheetUser, String], ... , [SpreadsheetUser, String]> * where the String is the notebook entry. No notebook entries needed? Will return in their place. @@ -136,6 +135,7 @@ // Now specify the sort based on the switch statement above. queryText.append(" ORDER BY " + sortingOrder); + @SuppressWarnings("unchecked") NativeQuery query = getSession().createNativeQuery(queryText.toString()); query.addEntity("user", SpreadsheetUser.class).addScalar("notebookEntry", StringType.INSTANCE) .addScalar("portraitId", IntegerType.INSTANCE) @@ -156,14 +156,13 @@ } @Override - @SuppressWarnings("rawtypes") public int getCountUsersBySession(final Long sessionId, String searchString) { - StringBuilder queryText = new StringBuilder("SELECT count(*) FROM tl_lasprd10_user user "); queryText.append( " JOIN tl_lasprd10_session session ON user.session_uid = session.uid and session.session_id = :sessionId"); buildNameSearch(searchString, queryText); + @SuppressWarnings("rawtypes") List list = getSession().createNativeQuery(queryText.toString()).setParameter("sessionId", sessionId).list(); if (list == null || list.size() == 0) { return 0; Fisheye: Tag c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 refers to a dead (removed) revision in file `lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/hibernate/UserModifiedSpreadsheetDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java (.../Spreadsheet.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java (.../Spreadsheet.java) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) @@ -25,46 +25,83 @@ 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.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; +import org.hibernate.annotations.Cascade; /** * Spreadsheet * * @author Andrey Balan - * - * - * */ +@Entity +@Table(name = "tl_lasprd10_spreadsheet") public class Spreadsheet implements Cloneable { - private static final Logger log = Logger.getLogger(Spreadsheet.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; + + @Column private String code; // advance + + @Column(name = "is_learner_allowed_to_save") private boolean isLearnerAllowedToSave; + + @Column(name = "is_marking_enabled") private boolean isMarkingEnabled; + @Column(name = "lock_on_finished") private boolean lockWhenFinished; + + @Column(name = "define_later") private boolean defineLater; + + @Column(name = "content_in_use") private boolean contentInUse; + @Column(name = "reflect_on_activity") + private boolean reflectOnActivity; + + @Column(name = "reflect_instructions") + private String reflectInstructions; + // 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 SpreadsheetUser createdBy; - private boolean reflectOnActivity; - private String reflectInstructions; - // ********************************************************** // Function method for Spreadsheet // ********************************************************** @@ -176,8 +213,6 @@ /** * @return Returns the userid of the user who created the Share spreadsheet. - * - * */ public SpreadsheetUser getCreatedBy() { return createdBy; @@ -191,9 +226,6 @@ this.createdBy = createdBy; } - /** - * - */ public Long getUid() { return uid; } @@ -204,8 +236,6 @@ /** * @return Returns the title. - * - * */ public String getTitle() { return title; @@ -221,8 +251,6 @@ /** * @return Returns whether learner is allowed to save spreadsheet. - * - * */ public boolean isLearnerAllowedToSave() { return isLearnerAllowedToSave; @@ -238,8 +266,6 @@ /** * @return Returns whether the marking is enabled. - * - * */ public boolean isMarkingEnabled() { return isMarkingEnabled; @@ -255,8 +281,6 @@ /** * @return Returns the lockWhenFinish. - * - * */ public boolean getLockWhenFinished() { return lockWhenFinished; @@ -272,8 +296,6 @@ /** * @return Returns the instructions set by the teacher. - * - * */ public String getInstructions() { return instructions; @@ -285,8 +307,6 @@ /** * @return Returns spreadsheet code. - * - * */ public String getCode() { return code; @@ -297,10 +317,6 @@ // this.code = javaScriptEscape(code);; } - /** - * - * @return - */ public boolean isContentInUse() { return contentInUse; } @@ -309,10 +325,6 @@ this.contentInUse = contentInUse; } - /** - * - * @return - */ public boolean isDefineLater() { return defineLater; } @@ -321,10 +333,6 @@ this.defineLater = defineLater; } - /** - * - * @return - */ public Long getContentId() { return contentId; } @@ -333,10 +341,6 @@ this.contentId = contentId; } - /** - * - * @return - */ public String getReflectInstructions() { return reflectInstructions; } @@ -345,10 +349,6 @@ this.reflectInstructions = reflectInstructions; } - /** - * - * @return - */ public boolean isReflectOnActivity() { return reflectOnActivity; } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetMark.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetMark.java (.../SpreadsheetMark.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetMark.java (.../SpreadsheetMark.java) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) @@ -25,6 +25,13 @@ 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.Table; + import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; @@ -34,20 +41,24 @@ * SpreadsheetMark * * @author Andrey Balan - * - * */ +@Entity +@Table(name = "tl_lasprd10_spreadsheet_mark") public class SpreadsheetMark { - - private static final long serialVersionUID = -3415065437595925246L; - private static Logger log = Logger.getLogger(SpreadsheetMark.class); - /** identifier field */ + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column private Float marks; + + @Column private String comments; + + @Column(name = "date_marks_released") private Date dateMarksReleased; /** default constructor */ @@ -61,9 +72,6 @@ this.dateMarksReleased = dateMarksReleased; } - /** - * - */ public Long getUid() { return this.uid; } @@ -72,9 +80,6 @@ this.uid = uid; } - /** - * - */ public Float getMarks() { return this.marks; } @@ -83,9 +88,6 @@ this.marks = marks; } - /** - * - */ public String getComments() { return this.comments; } @@ -94,9 +96,6 @@ this.comments = comments; } - /** - * - */ public Date getDateMarksReleased() { return this.dateMarksReleased; } @@ -111,11 +110,6 @@ .append("marks", getMarks()).append("dateMarksReleased", getDateMarksReleased()).toString(); } - /* - * (non-Javadoc) - * - * @see java.lang.Object#clone() - */ @Override public Object clone() { Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.java (.../SpreadsheetSession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.java (.../SpreadsheetSession.java) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) @@ -25,36 +25,53 @@ 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; /** - * Spreadsheet + * Spreadsheet session * * @author Andrey Balan - * - * - * */ +@Entity +@Table(name = "tl_lasprd10_session") public class SpreadsheetSession { - private static Logger log = Logger.getLogger(SpreadsheetSession.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 = "spreadsheet_uid") private Spreadsheet spreadsheet; + + @Column(name = "session_start_date") private Date sessionStartDate; + + @Column(name = "session_end_date") private Date sessionEndDate; + //finish or not + @Column private int status; -// ********************************************************** + // ********************************************************** // Get/Set methods -// ********************************************************** - /** - * - * @return Returns the learnerID. - */ + // ********************************************************** + public Long getUid() { return uid; } @@ -63,10 +80,6 @@ this.uid = uuid; } - /** - * - * @return - */ public Date getSessionEndDate() { return sessionEndDate; } @@ -75,11 +88,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - * @return - */ public Date getSessionStartDate() { return sessionStartDate; } @@ -88,10 +96,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * @return - */ public int getStatus() { return status; } @@ -100,11 +104,6 @@ this.status = status; } - /** - * - * - * @return - */ public Spreadsheet getSpreadsheet() { return spreadsheet; } @@ -113,10 +112,6 @@ this.spreadsheet = spreadsheet; } - /** - * - * @return - */ public Long getSessionId() { return sessionId; } @@ -125,19 +120,10 @@ this.sessionId = sessionId; } - /** - * - * @return Returns the session name - */ public String getSessionName() { return sessionName; } - /** - * - * @param sessionName - * The session name to set. - */ public void setSessionName(String sessionName) { this.sessionName = sessionName; } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.java (.../SpreadsheetUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetUser.java (.../SpreadsheetUser.java) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) @@ -26,43 +26,76 @@ import java.io.Serializable; import java.util.Date; +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.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; /** - * Spreadsheet + * Spreadsheet user * * @author Andrey Balan - * - * - * */ +@Entity +@Table(name = "tl_lasprd10_user") public class SpreadsheetUser implements Cloneable, Serializable { private static final long serialVersionUID = -7043502180037866257L; private static Logger log = Logger.getLogger(SpreadsheetUser.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 SpreadsheetSession session; + + @ManyToOne + @JoinColumn(name = "spreadsheet_uid") private Spreadsheet spreadsheet; + + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "user_modified_spreadsheet_uid") private UserModifiedSpreadsheet userModifiedSpreadsheet; //=============== NON Persisit value: for display use =========== + //the user access some reousrce item date time. Use in monitoring summary page + @Transient private Date accessDate; public SpreadsheetUser() { } public SpreadsheetUser(UserDTO user, SpreadsheetSession 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(); @@ -72,7 +105,7 @@ } public SpreadsheetUser(UserDTO user, Spreadsheet 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(); @@ -81,12 +114,8 @@ this.sessionFinished = false; } - /** - * Clone method from java.lang.Object - */ @Override public Object clone() { - SpreadsheetUser user = null; try { user = (SpreadsheetUser) super.clone(); @@ -100,45 +129,46 @@ return user; } -// ********************************************************** + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof SpreadsheetUser)) { + return false; + } + + final SpreadsheetUser user = (SpreadsheetUser) 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; } @@ -147,10 +177,6 @@ this.lastName = lastName; } - /** - * - * @return - */ public String getFirstName() { return firstName; } @@ -159,10 +185,6 @@ this.firstName = firstName; } - /** - * - * @return - */ public String getLoginName() { return loginName; } @@ -171,11 +193,6 @@ this.loginName = loginName; } - /** - * - * - * @return - */ public SpreadsheetSession getSession() { return session; } @@ -184,11 +201,6 @@ this.session = session; } - /** - * - * - * @return - */ public Spreadsheet getSpreadsheet() { return spreadsheet; } @@ -197,12 +209,6 @@ this.spreadsheet = spreadsheet; } - /** - * - * - * - * @return - */ public UserModifiedSpreadsheet getUserModifiedSpreadsheet() { return userModifiedSpreadsheet; } @@ -211,10 +217,6 @@ this.userModifiedSpreadsheet = userModifiedSpreadsheet; } - /** - * - * @return - */ public boolean isSessionFinished() { return sessionFinished; } @@ -223,27 +225,6 @@ this.sessionFinished = sessionFinished; } - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof SpreadsheetUser)) { - return false; - } - - final SpreadsheetUser user = (SpreadsheetUser) 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; } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.java (.../UserModifiedSpreadsheet.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.java (.../UserModifiedSpreadsheet.java) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) @@ -24,23 +24,35 @@ package org.lamsfoundation.lams.tool.spreadsheet.model; +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.Table; + /** - * Spreadsheet - * * @author Andrey Balan - * - * - * */ +@Entity +@Table(name = "tl_lasprd10_user_modified_spreadsheet") public class UserModifiedSpreadsheet { + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "user_modified_spreadsheet") private String userModifiedSpreadsheet; + + @ManyToOne(cascade = CascadeType.ALL) + @JoinColumn(name = "mark_id") private SpreadsheetMark mark; - /** - * - */ public Long getUid() { return uid; } @@ -49,11 +61,6 @@ this.uid = uid; } - /** - * - * - * @return - */ public String getUserModifiedSpreadsheet() { return userModifiedSpreadsheet; } @@ -62,10 +69,6 @@ this.userModifiedSpreadsheet = userModifiedSpreadsheet; } - /** - * - * - */ public SpreadsheetMark getMark() { return mark; } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java (.../SpreadsheetServiceImpl.java) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) @@ -53,10 +53,8 @@ import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetDAO; -import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetMarkDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetSessionDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetUserDAO; -import org.lamsfoundation.lams.tool.spreadsheet.dao.UserModifiedSpreadsheetDAO; import org.lamsfoundation.lams.tool.spreadsheet.dto.ReflectDTO; import org.lamsfoundation.lams.tool.spreadsheet.dto.StatisticDTO; import org.lamsfoundation.lams.tool.spreadsheet.dto.Summary; @@ -72,17 +70,13 @@ import org.lamsfoundation.lams.util.MessageService; /** - * * @author Andrey Balan - * */ public class SpreadsheetServiceImpl implements ISpreadsheetService, ToolContentManager, ToolSessionManager { private static Logger log = Logger.getLogger(SpreadsheetServiceImpl.class.getName()); private SpreadsheetDAO spreadsheetDao; private SpreadsheetUserDAO spreadsheetUserDao; private SpreadsheetSessionDAO spreadsheetSessionDao; - private UserModifiedSpreadsheetDAO userModifiedSpreadsheetDao; - private SpreadsheetMarkDAO spreadsheetMarkDao; // tool service private IToolContentHandler spreadsheetToolContentHandler; private MessageService messageService; @@ -98,15 +92,14 @@ @Override public Spreadsheet getSpreadsheetByContentId(Long contentId) { - Spreadsheet rs = spreadsheetDao.getByContentId(contentId); - return rs; + return spreadsheetDao.getByContentId(contentId); } @Override public Spreadsheet getDefaultContent(Long contentId) throws SpreadsheetApplicationException { if (contentId == null) { String error = messageService.getMessage("error.msg.default.content.not.find"); - SpreadsheetServiceImpl.log.error(error); + log.error(error); throw new SpreadsheetApplicationException(error); } @@ -124,7 +117,7 @@ @Override public void saveOrUpdateUserModifiedSpreadsheet(UserModifiedSpreadsheet userModifiedSpreadsheet) { - userModifiedSpreadsheetDao.saveObject(userModifiedSpreadsheet); + spreadsheetDao.saveObject(userModifiedSpreadsheet); } @Override @@ -139,8 +132,7 @@ @Override public List getUserListBySessionId(Long sessionId) { - List userList = spreadsheetUserDao.getBySessionID(sessionId); - return userList; + return spreadsheetUserDao.getBySessionID(sessionId); } @Override @@ -294,9 +286,6 @@ } } - /** - * @param notebookEntry - */ @Override public void updateEntry(NotebookEntry notebookEntry) { coreNotebookService.updateEntry(notebookEntry); @@ -314,17 +303,16 @@ if ((user.getUserModifiedSpreadsheet() != null) && (user.getUserModifiedSpreadsheet().getMark() != null)) { SpreadsheetMark mark = user.getUserModifiedSpreadsheet().getMark(); mark.setDateMarksReleased(new Date()); - spreadsheetMarkDao.saveObject(mark); + spreadsheetDao.saveObject(mark); // send marks to gradebook where applicable if (mark.getMarks() != null) { - Double doubleMark = new Double(mark.getMarks()); + Double doubleMark = mark.getMarks().doubleValue(); toolService.updateActivityMark(doubleMark, null, user.getUserId().intValue(), sessionId, false); } } } - } @Override @@ -345,19 +333,18 @@ Spreadsheet defaultSpreadsheet = getSpreadsheetByContentId(defaultSpreadsheetId); if (defaultSpreadsheet == null) { String error = messageService.getMessage("error.msg.default.content.not.find"); - SpreadsheetServiceImpl.log.error(error); + log.error(error); throw new SpreadsheetApplicationException(error); } return defaultSpreadsheet; } private Long getToolDefaultContentIdBySignature(String toolSignature) throws SpreadsheetApplicationException { - Long contentId = null; - contentId = new Long(toolService.getToolDefaultContentIdBySignature(toolSignature)); + Long contentId = toolService.getToolDefaultContentIdBySignature(toolSignature); if (contentId == null) { String error = messageService.getMessage("error.msg.default.content.not.find"); - SpreadsheetServiceImpl.log.error(error); + log.error(error); throw new SpreadsheetApplicationException(error); } return contentId; @@ -395,14 +382,6 @@ this.toolService = toolService; } - public void setUserModifiedSpreadsheetDao(UserModifiedSpreadsheetDAO userModifiedSpreadsheetDao) { - this.userModifiedSpreadsheetDao = userModifiedSpreadsheetDao; - } - - public void setSpreadsheetMarkDao(SpreadsheetMarkDAO spreadsheetMarkDao) { - this.spreadsheetMarkDao = spreadsheetMarkDao; - } - // ******************************************************************************* // ToolContentManager, ToolSessionManager methods // ******************************************************************************* @@ -449,15 +428,15 @@ // reset it to new toolContentId toolContentObj.setContentId(toolContentId); - SpreadsheetUser user = spreadsheetUserDao.getUserByUserIDAndContentID(new Long(newUserUid.longValue()), + SpreadsheetUser user = spreadsheetUserDao.getUserByUserIDAndContentID(newUserUid.longValue(), toolContentId); if (user == null) { user = new SpreadsheetUser(); UserDTO sysUser = ((User) userManagementService.findById(User.class, newUserUid)).getUserDTO(); user.setFirstName(sysUser.getFirstName()); user.setLastName(sysUser.getLastName()); user.setLoginName(sysUser.getLogin()); - user.setUserId(new Long(newUserUid.longValue())); + user.setUserId(newUserUid.longValue()); user.setSpreadsheet(toolContentObj); } toolContentObj.setCreatedBy(user); @@ -531,8 +510,7 @@ public void removeToolContent(Long toolContentId) throws ToolException { Spreadsheet spreadsheet = spreadsheetDao.getByContentId(toolContentId); if (spreadsheet == null) { - SpreadsheetServiceImpl.log - .warn("Can not remove the tool content as it does not exist, ID: " + toolContentId); + log.warn("Can not remove the tool content as it does not exist, ID: " + toolContentId); return; } @@ -543,7 +521,7 @@ UserModifiedSpreadsheet modified = user.getUserModifiedSpreadsheet(); if (modified != null) { user.setUserModifiedSpreadsheet(null); - userModifiedSpreadsheetDao.removeObject(UserModifiedSpreadsheet.class, modified.getUid()); + spreadsheetDao.removeObject(UserModifiedSpreadsheet.class, modified.getUid()); } } @@ -558,9 +536,8 @@ @Override public void removeLearnerContent(Long toolContentId, Integer userId) throws ToolException { - if (SpreadsheetServiceImpl.log.isDebugEnabled()) { - SpreadsheetServiceImpl.log.debug( - "Removing Spreadsheet contents for user ID " + userId + " and toolContentId " + toolContentId); + if (log.isDebugEnabled()) { + log.debug("Removing Spreadsheet contents for user ID " + userId + " and toolContentId " + toolContentId); } List sessions = spreadsheetSessionDao.getByContentId(toolContentId); @@ -570,7 +547,7 @@ if (user != null) { user.setSessionFinished(false); if (user.getUserModifiedSpreadsheet() != null) { - userModifiedSpreadsheetDao.removeObject(UserModifiedSpreadsheet.class, + spreadsheetDao.removeObject(UserModifiedSpreadsheet.class, user.getUserModifiedSpreadsheet().getUid()); } @@ -598,11 +575,11 @@ @Override public String leaveToolSession(Long toolSessionId, Long learnerId) throws DataMissingException, ToolException { if (toolSessionId == null) { - SpreadsheetServiceImpl.log.error("Fail to leave tool Session based on null tool session id."); + log.error("Fail to leave tool Session based on null tool session id."); throw new ToolException("Fail to remove tool Session based on null tool session id."); } if (learnerId == null) { - SpreadsheetServiceImpl.log.error("Fail to leave tool Session based on null learner."); + log.error("Fail to leave tool Session based on null learner."); throw new ToolException("Fail to remove tool Session based on null learner."); } @@ -611,8 +588,8 @@ session.setStatus(SpreadsheetConstants.COMPLETED); spreadsheetSessionDao.saveObject(session); } else { - SpreadsheetServiceImpl.log.error("Fail to leave tool Session.Could not find shared spreadsheet " - + "session by given session id: " + toolSessionId); + log.error("Fail to leave tool Session.Could not find shared spreadsheet " + "session by given session id: " + + toolSessionId); throw new DataMissingException("Fail to leave tool Session." + "Could not find shared spreadsheet session by given session id: " + toolSessionId); } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -rc8d42fdc11b1c7cf274fafac0319b4a2c3bdd505 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/spreadsheetApplicationContext.xml (.../spreadsheetApplicationContext.xml) (revision c8d42fdc11b1c7cf274fafac0319b4a2c3bdd505) @@ -19,18 +19,6 @@ - - - - - - - - - - - - @@ -57,12 +45,6 @@ - - - - - -