Index: lams_tool_task/.classpath =================================================================== diff -u -rbe86c0bc220914398d3ce8ec9ae9cab91b47353a -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/.classpath (.../.classpath) (revision be86c0bc220914398d3ce8ec9ae9cab91b47353a) +++ lams_tool_task/.classpath (.../.classpath) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -19,5 +19,6 @@ + Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/conf/hibernate/mappings/org/lamsfoundation/lams/tool/taskList/model/TaskListUser.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListConditionDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemAttachmentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemCommentDAO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListConditionDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java (.../TaskListDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java (.../TaskListDAOHibernate.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -33,7 +33,6 @@ /** * Hibernate implementation of TaskListDAO. * - * @author Steve.Ni * @author Andrey Balan * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListDAO */ @@ -42,9 +41,6 @@ private static final String GET_RESOURCE_BY_CONTENTID = "from " + TaskList.class.getName() + " as r where r.contentId=?"; - /** - * {@inheritDoc} - */ @Override public TaskList getByContentId(Long contentId) { List list = doFind(GET_RESOURCE_BY_CONTENTID, contentId); @@ -55,17 +51,11 @@ } } - /** - * {@inheritDoc} - */ @Override public TaskList getByUid(Long taskListUid) { return (TaskList) getObject(TaskList.class, taskListUid); } - /** - * {@inheritDoc} - */ @Override public void delete(TaskList taskList) { getSession().delete(taskList); Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemAttachmentDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 0b3631fb6cd93265967ec5d314313e15999d9061 refers to a dead (removed) revision in file `lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemCommentDAOHibernate.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemDAOHibernate.java (.../TaskListItemDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemDAOHibernate.java (.../TaskListItemDAOHibernate.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -42,17 +42,11 @@ private static final String FIND_AUTHORING_ITEMS = "from " + TaskListItem.class.getName() + " where taskList_uid = ? order by sequence_Id asc"; - /** - * {@inheritDoc} - */ @Override public List getAuthoringItems(Long taskListUid) { return this.doFind(FIND_AUTHORING_ITEMS, taskListUid); } - /** - * {@inheritDoc} - */ @Override public TaskListItem getByUid(Long taskListItemUid) { return (TaskListItem) this.getObject(TaskListItem.class, taskListItemUid); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java (.../TaskListItemVisitDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java (.../TaskListItemVisitDAOHibernate.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -87,7 +87,6 @@ @Override @SuppressWarnings("unchecked") public List getTaskListItemLogBySession(Long sessionId, Long itemUid) { - return (List) doFind(FIND_BY_ITEM_BYSESSION, new Object[] { sessionId, itemUid }); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListSessionDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListSessionDAOHibernate.java (.../TaskListSessionDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListSessionDAOHibernate.java (.../TaskListSessionDAOHibernate.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -44,9 +44,6 @@ private static final String FIND_BY_CONTENT_ID = "from " + TaskListSession.class.getName() + " as p where p.taskList.contentId=?"; - /** - * {@inheritDoc} - */ @Override public TaskListSession getSessionBySessionId(Long sessionId) { List list = doFind(FIND_BY_SESSION_ID, sessionId); @@ -56,26 +53,17 @@ return (TaskListSession) list.get(0); } - /** - * {@inheritDoc} - */ @Override @SuppressWarnings("unchecked") public List getByContentId(Long toolContentId) { return (List) doFind(FIND_BY_CONTENT_ID, toolContentId); } - /** - * {@inheritDoc} - */ @Override public void delete(TaskListSession session) { getSession().delete(session); } - /** - * {@inheritDoc} - */ @Override public void deleteBySessionId(Long toolSessionId) { this.removeObject(TaskListSession.class, toolSessionId); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java (.../TaskListUserDAOHibernate.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java (.../TaskListUserDAOHibernate.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -92,12 +92,11 @@ + " AND (CONCAT(user.last_name, ' ', user.first_name) LIKE CONCAT('%', :searchString, '%')) " + " ORDER BY CONCAT(user.last_name, ' ', user.first_name) "; - @SuppressWarnings("unchecked") @Override + @SuppressWarnings({ "unchecked", "rawtypes", "deprecation" }) public Collection getPagedUsersBySession(Long sessionId, int page, int size, String sortBy, String sortOrder, String searchString, IUserManagementService userManagementService) { - String[] portraitStrings = userManagementService.getPortraitSQL("user.user_id"); StringBuilder bldr = new StringBuilder(LOAD_USERS_SELECT) @@ -143,6 +142,7 @@ } @Override + @SuppressWarnings({ "unchecked", "rawtypes", "deprecation" }) public Collection getPagedUsersBySessionAndItem(Long sessionId, Long taskListItemUid, int page, int size, String sortBy, String sortOrder, String searchString) { @@ -195,6 +195,7 @@ } @Override + @SuppressWarnings({ "rawtypes", "deprecation" }) public int getCountPagedUsersBySession(Long sessionId, String searchString) { String LOAD_USERS_ORDERED_BY_NAME = "SELECT COUNT(*) FROM " + TaskListUser.class.getName() + " user" Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java (.../TaskList.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -29,69 +29,104 @@ 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; /** * The main entity class of TaskList tool. Contains all the data related to the whole tool. * - * @author Dapeng Ni * @author Andrey Balan - * - * */ +@Entity +@Table(name = "tl_latask10_tasklist") public class TaskList implements Cloneable { private static final Logger log = Logger.getLogger(TaskList.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 = "lock_when_finished") private boolean lockWhenFinished; + + @Column(name = "is_sequential_order") private boolean sequentialOrder; + + @Column(name = "minimum_number_tasks") private int minimumNumberTasks; + + @Column(name = "allow_contribute_tasks") private boolean allowContributeTasks; + + @Column(name = "is_monitor_verification_required") private boolean monitorVerificationRequired; + @Column(name = "define_later") private boolean defineLater; + + @Column(name = "content_in_use") private boolean contentInUse; + + @Column(name = "submission_deadline") private Date submissionDeadline; - //conditions - private Set conditions; + @OneToMany(cascade = CascadeType.ALL) + @OrderBy("sequence_id ASC") + @JoinColumn(name = "taskList_uid") + private Set conditions = new HashSet(); - //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 TaskListUser createdBy; - //taskList Items - private Set taskListItems; + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "taskList_uid") + @OrderBy("sequence_id ASC") + private Set taskListItems = new HashSet(); + @Column(name = "reflect_on_activity") private boolean reflectOnActivity; + + @Column(name = "reflect_instructions") private String reflectInstructions; //*************** NON Persist Fields ******************** + @Transient private String minimumNumberTasksErrorStr; - /** - * Default contructor. - */ - public TaskList() { - conditions = new HashSet(); - taskListItems = new HashSet(); - } - - // ********************************************************** - // Function method for TaskList - // ********************************************************** - public static TaskList newInstance(TaskList defaultContent, Long contentId) { TaskList toContent = new TaskList(); toContent = (TaskList) defaultContent.clone(); @@ -118,10 +153,10 @@ //clone taskListItems if (taskListItems != null) { - Iterator iter = taskListItems.iterator(); - Set set = new HashSet(); + Iterator iter = taskListItems.iterator(); + Set set = new HashSet(); while (iter.hasNext()) { - TaskListItem item = (TaskListItem) iter.next(); + TaskListItem item = iter.next(); TaskListItem newItem = (TaskListItem) item.clone(); //just clone old file without duplicate it in repository set.add(newItem); @@ -141,20 +176,19 @@ taskListItemsSeq.put(item.getSequenceId(), item); } - Set newConditions = new HashSet(); - Iterator conds = conditions.iterator(); + Set newConditions = new HashSet(); + Iterator conds = conditions.iterator(); while (conds.hasNext()) { - TaskListCondition condition = (TaskListCondition) conds.next(); + TaskListCondition condition = conds.next(); TaskListCondition newCondition = (TaskListCondition) condition.clone(); //picking up all the taskListItems that condition had if (condition.getTaskListItems() != null) { - Set condTaskListItems = new HashSet(); + Set condTaskListItems = new HashSet(); - Iterator iterCondItems = condition.getTaskListItems().iterator(); + Iterator iterCondItems = condition.getTaskListItems().iterator(); while (iterCondItems.hasNext()) { - TaskListItem item = (TaskListItem) iterCondItems.next(); - + TaskListItem item = iterCondItems.next(); condTaskListItems.add(taskListItemsSeq.get(item.getSequenceId())); } newCondition.setTaskListItems(condTaskListItems); @@ -255,11 +289,6 @@ * Returns id of a user created the taskList. * * @return id of a user - * - * - * - * - * */ public TaskListUser getCreatedBy() { return createdBy; @@ -279,8 +308,6 @@ * Returns TaskList id. * * @return tasklist id - * - * */ public Long getUid() { return uid; @@ -300,10 +327,6 @@ * Returns the tasklist title. * * @return tasklist title. - * - * - * - * */ public String getTitle() { return title; @@ -323,10 +346,6 @@ * Returns tasklist instructions set by teacher. * * @return tasklist instructions set by teacher - * - * - * - * */ public String getInstructions() { return instructions; @@ -346,15 +365,8 @@ * Returns a set of conditions belong to this tasklist. * * @return a set of conditions belong to this tasklist. - * - * - * - * - * - * - * */ - public Set getConditions() { + public Set getConditions() { return conditions; } @@ -364,23 +376,16 @@ * @param conditions * set of conditions to set */ - public void setConditions(Set conditions) { + public void setConditions(Set conditions) { this.conditions = conditions; } /** * Return set of TaskListItems * * @return set of TaskListItems - * - * - * - * - * - * - * */ - public Set getTaskListItems() { + public Set getTaskListItems() { return taskListItems; } @@ -390,7 +395,7 @@ * @param taskListItems * set of TaskListItems */ - public void setTaskListItems(Set taskListItems) { + public void setTaskListItems(Set taskListItems) { this.taskListItems = taskListItems; } @@ -461,9 +466,6 @@ * Returns if the tasklist should be locked after being finished or not. * * @return if the tasklist should be locked after being finished or not - * - * - * */ public boolean getLockWhenFinished() { return lockWhenFinished; Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java (.../TaskListCondition.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java (.../TaskListCondition.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -26,44 +26,51 @@ import java.util.HashSet; 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.JoinTable; +import javax.persistence.ManyToMany; +import javax.persistence.OneToMany; +import javax.persistence.OrderBy; +import javax.persistence.Table; + import org.apache.log4j.Logger; /** * The main entity class of TaskList tool. Contains all the data related to the whole tool. * * @author Andrey Balan - * - * */ +@Entity +@Table(name = "tl_latask10_condition") public class TaskListCondition implements Cloneable { private static final Logger log = Logger.getLogger(TaskListCondition.class); - //key + @Id + @Column(name = "condition_uid") + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; -// private TaskList taskList; - //unique name + @Column private String name; + + @Column(name = "sequence_id") private int sequenceId; + + @ManyToMany + @JoinTable( + name = "tl_latask10_condition_tl_item", + joinColumns = { @JoinColumn(name = "condition_uid") }, + inverseJoinColumns = { @JoinColumn(name = "uid") } + ) + private Set taskListItems = new HashSet(); - //taskList Items - private Set taskListItems; - - /** - * Default contruction method. - */ - public TaskListCondition() { - taskListItems = new HashSet(); - } - - // ********************************************************** - // Function method for TaskList - // ********************************************************** - - /** - * {@Override} - */ @Override public int hashCode() { final int prime = 31; @@ -75,9 +82,6 @@ return result; } - /** - * {@Override} - */ @Override public boolean equals(Object obj) { if (this == obj) { @@ -117,9 +121,6 @@ return true; } - /** - * {@Override} - */ @Override public Object clone() { @@ -163,10 +164,6 @@ * Returns condition's name. * * @return condition's name. - * - * - * - * */ public String getName() { return name; @@ -186,15 +183,8 @@ * Return set of TaskListItems * * @return set of TaskListItems - * - * - * - * - * - * - * */ - public Set getTaskListItems() { + public Set getTaskListItems() { return taskListItems; } @@ -204,32 +194,10 @@ * @param taskListItems * set of TaskListItems */ - public void setTaskListItems(Set taskListItems) { + public void setTaskListItems(Set taskListItems) { this.taskListItems = taskListItems; } -// -// /** -// * Returns taskList to which this condition applies. -// * -// * @return taskList to which this condition applies -// * -// * -// * -// * -// */ -// public TaskList getTaskList() { -// return taskList; -// } -// /** -// * Sets taskList to which this condition applies. -// * -// * @param taskList taskList to which this condition applies -// */ -// public void setTaskList(TaskList taskList) { -// this.taskList = taskList; -// } - /** * Returns condition's sequence number. Order is very important for * conditions as the conditions will be tested in the order shown on the Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java (.../TaskListItem.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java (.../TaskListItem.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -28,6 +28,19 @@ 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; @@ -36,60 +49,85 @@ * TaskList * * @author Andrey Balan - * - * - * */ +@Entity +@Table(name = "tl_latask10_tasklist_item") public class TaskListItem implements Cloneable { - private static final Logger log = Logger.getLogger(TaskListItem.class); - // key + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + @Column private String title; + + @Column private String description; + + @Column(name = "sequence_id") private int sequenceId; + @Column(name = "init_item") private String initialItem; + + @Column(name = "organization_xml") private String organizationXml; + + @Column(name = "create_by_author") private boolean isCreateByAuthor; - // general infomation + @Column(name = "create_date") private Date createDate; + + @ManyToOne + @JoinColumn(name = "create_by") private TaskListUser createBy; - // advanced + + //************ advanced tab *************** + @Column(name = "is_required") private boolean isRequired; + + @Column(name = "is_comments_allowed") private boolean isCommentsAllowed; + + @Column(name = "is_comments_required") private boolean isCommentsRequired; + + @Column(name = "is_files_allowed") private boolean isFilesAllowed; + + @Column(name = "is_files_required") private boolean isFilesRequired; + + @Column(name = "is_child_task") private boolean isChildTask; + + @Column(name = "parent_task_name") private String parentTaskName; + // advanced options that are not used now + @Column(name = "is_comments_files_allowed") private boolean isCommentsFilesAllowed; + + @Column(name = "show_comments_to_all") private boolean showCommentsToAll; - // Set of uploaded files - private Set attachments; - // Set of user comments - private Set comments; + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "taskList_item_uid") + @OrderBy("create_date ASC") + private Set attachments = new HashSet(); + + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "taskList_item_uid") + @OrderBy("create_date ASC") + private Set comments = new HashSet(); // *************** NON Persist Fields ******************** + @Transient private boolean complete; - /** - * Default contruction method. - * - */ - public TaskListItem() { - attachments = new HashSet(); - comments = new HashSet(); - } - - // ********************************************************** - // Function method for TaskList - // ********************************************************** @Override public Object clone() { @@ -100,10 +138,10 @@ // clone set of taskListItemsAttachment if (attachments != null) { - Iterator iter = attachments.iterator(); - Set set = new HashSet(); + Iterator iter = attachments.iterator(); + Set set = new HashSet(); while (iter.hasNext()) { - TaskListItemAttachment file = (TaskListItemAttachment) iter.next(); + TaskListItemAttachment file = iter.next(); TaskListItemAttachment newFile = (TaskListItemAttachment) file.clone(); // just clone old file without duplicate it in repository set.add(newFile); @@ -113,10 +151,10 @@ // clone set of taskListItemsComment if (comments != null) { - Iterator iter = comments.iterator(); - Set set = new HashSet(); + Iterator iter = comments.iterator(); + Set set = new HashSet(); while (iter.hasNext()) { - TaskListItemComment comment = (TaskListItemComment) iter.next(); + TaskListItemComment comment = iter.next(); TaskListItemComment newComment = (TaskListItemComment) comment.clone(); // just clone old file without duplicate it in repository set.add(newComment); @@ -177,10 +215,6 @@ this.uid = userID; } - /** - * - * @return - */ public String getDescription() { return description; } @@ -189,10 +223,6 @@ this.description = description; } - /** - * - * @return - */ public String getInitialItem() { return initialItem; } @@ -201,10 +231,6 @@ this.initialItem = initialItem; } - /** - * - * @return - */ public String getOrganizationXml() { return organizationXml; } @@ -213,10 +239,6 @@ this.organizationXml = organizationXml; } - /** - * - * @return - */ public String getTitle() { return title; } @@ -225,11 +247,6 @@ this.title = title; } - /** - * - * - * @return - */ public TaskListUser getCreateBy() { return createBy; } @@ -238,10 +255,6 @@ this.createBy = createBy; } - /** - * - * @return - */ public Date getCreateDate() { return createDate; } @@ -250,10 +263,6 @@ this.createDate = createDate; } - /** - * - * @return - */ public boolean isCreateByAuthor() { return isCreateByAuthor; } @@ -274,8 +283,6 @@ * Returns taskListItem sequence number. * * @return taskListItem sequence number - * - * */ public int getSequenceId() { return sequenceId; @@ -291,10 +298,6 @@ this.sequenceId = sequenceId; } - /** - * - * @return - */ public boolean isRequired() { return isRequired; } @@ -303,10 +306,6 @@ this.isRequired = isRequired; } - /** - * - * @return - */ public boolean isCommentsAllowed() { return isCommentsAllowed; } @@ -315,10 +314,6 @@ this.isCommentsAllowed = isCommentsAllowed; } - /** - * - * @return - */ public boolean isCommentsRequired() { return isCommentsRequired; } @@ -327,10 +322,6 @@ this.isCommentsRequired = isCommentsRequired; } - /** - * - * @return - */ public boolean isFilesAllowed() { return isFilesAllowed; } @@ -339,10 +330,6 @@ this.isFilesAllowed = isFilesAllowed; } - /** - * - * @return - */ public boolean isFilesRequired() { return isFilesRequired; } @@ -351,10 +338,6 @@ this.isFilesRequired = isFilesRequired; } - /** - * - * @return - */ public boolean isChildTask() { return isChildTask; } @@ -363,10 +346,6 @@ this.isChildTask = isChildTask; } - /** - * - * @return - */ public String getParentTaskName() { return parentTaskName; } @@ -375,10 +354,6 @@ this.parentTaskName = parentTaskName; } - /** - * - * @return - */ public boolean getShowCommentsToAll() { return showCommentsToAll; } @@ -387,10 +362,6 @@ this.showCommentsToAll = showCommentsToAll; } - /** - * - * @return - */ public boolean isCommentsFilesAllowed() { // true bacause we can not set it from the UI // TODO get rid of this later @@ -402,32 +373,24 @@ } /** - * - * - * - * * @return a set of Attachments to this TaskListItem. */ - public Set getAttachments() { + public Set getAttachments() { return attachments; } - public void setAttachments(Set attachments) { + public void setAttachments(Set attachments) { this.attachments = attachments; } /** - * - * - * - * * @return a set of Comments to this TaskListItem. */ - public Set getComments() { + public Set getComments() { return comments; } - public void setComments(Set comments) { + public void setComments(Set comments) { this.comments = comments; } } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.java (.../TaskListItemAttachment.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemAttachment.java (.../TaskListItemAttachment.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -25,34 +25,54 @@ 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; /** + * A Wrapper class for uploaded files. An Attachment cannot exist independently and must belong to a + * TaskListItem. + * * @author Andrey Balan - * - * A Wrapper class for uploaded files. An Attachment cannot exist independently and must belong to a - * TaskListItem. - * - * - * - * */ +@Entity +@Table(name = "tl_latask10_item_attachment") public class TaskListItemAttachment implements Cloneable { private static final Logger log = Logger.getLogger(TaskListItemAttachment.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column(name = "file_uuid") private Long fileUuid; + + @Column(name = "file_version_id") private Long fileVersionId; + + @Column(name = "file_type") private String fileType; + + @Column(name = "file_name") private String fileName; + + @Column(name = "create_date") private Date created; + + @ManyToOne + @JoinColumn(name = "create_by") private TaskListUser createBy; - // ********************************************************** - // Function method for TaskListItemAttachment - // ********************************************************** @Override public Object clone() { TaskListItemAttachment taskListItemAttachment = null; @@ -65,7 +85,7 @@ taskListItemAttachment.setCreateBy((TaskListUser) this.createBy.clone()); } } catch (CloneNotSupportedException e) { - TaskListItemAttachment.log.error("When clone " + TaskListItemAttachment.class + " failed"); + log.error("When clone " + TaskListItemAttachment.class + " failed"); } return taskListItemAttachment; @@ -110,10 +130,6 @@ this.uid = uid; } - /** - * - * - */ public Long getFileVersionId() { return fileVersionId; } @@ -122,9 +138,6 @@ this.fileVersionId = version; } - /** - * - */ public String getFileType() { return fileType; } @@ -133,9 +146,6 @@ this.fileType = type; } - /** - * - */ public String getFileName() { return fileName; } @@ -144,10 +154,6 @@ this.fileName = name; } - /** - * - * @return - */ public Long getFileUuid() { return fileUuid; } @@ -156,10 +162,6 @@ this.fileUuid = uuid; } - /** - * - * @return - */ public Date getCreated() { return created; } @@ -168,10 +170,6 @@ this.created = created; } - /** - * - * @return - */ public TaskListUser getCreateBy() { return createBy; } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.java (.../TaskListItemComment.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemComment.java (.../TaskListItemComment.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -26,31 +26,42 @@ 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; /** - * TaskList - * * @author Andrey Balan - * - * - * */ +@Entity +@Table(name = "tl_latask10_item_comment") public class TaskListItemComment implements Cloneable { - private static final Logger log = Logger.getLogger(TaskListItemComment.class); + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @Column private String comment; + + @ManyToOne + @JoinColumn(name = "create_by") private TaskListUser createBy; + + @Column(name = "create_date") private Date createDate; - // ********************************************************** - // Function method for TaskListItemComment - // ********************************************************** - @Override public Object clone() { TaskListItemComment taskListItemComment = null; @@ -93,10 +104,6 @@ // Get/Set methods // ********************************************************** - /** - * - * @return - */ public Date getCreateDate() { return createDate; } @@ -117,11 +124,6 @@ this.uid = uid; } - /** - * - * - * @return - */ public TaskListUser getCreateBy() { return createBy; } @@ -130,11 +132,6 @@ this.createBy = createBy; } - /** - * - * - * @return - */ public String getComment() { return comment; } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.java (.../TaskListItemVisitLog.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItemVisitLog.java (.../TaskListItemVisitLog.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -26,26 +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; + /** - * TaskList - * * @author Andrey Balan - * - * */ +@Entity +@Table(name = "tl_latask10_item_log") public class TaskListItemVisitLog { + @Id + @Column + @GeneratedValue(strategy = GenerationType.IDENTITY) private Long uid; + + @ManyToOne + @JoinColumn(name = "user_uid") private TaskListUser user; + + @ManyToOne + @JoinColumn(name = "taskList_item_uid") private TaskListItem taskListItem; + + @Column private boolean complete; + + @Column(name = "access_date") private Date accessDate; + + @Column(name = "session_id") private Long sessionId; - /** - * - * @return - */ public Date getAccessDate() { return accessDate; } @@ -54,10 +72,6 @@ this.accessDate = accessDate; } - /** - * - * @return - */ public TaskListItem getTaskListItem() { return taskListItem; } @@ -66,10 +80,6 @@ this.taskListItem = item; } - /** - * - * @return Returns the log Uid. - */ public Long getUid() { return uid; } @@ -78,10 +88,6 @@ this.uid = uid; } - /** - * - * @return - */ public TaskListUser getUser() { return user; } @@ -90,10 +96,6 @@ this.user = user; } - /** - * - * @return - */ public boolean isComplete() { return complete; } @@ -102,10 +104,6 @@ this.complete = complete; } - /** - * - * @return - */ public Long getSessionId() { return sessionId; } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.java (.../TaskListSession.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListSession.java (.../TaskListSession.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -24,32 +24,56 @@ package org.lamsfoundation.lams.tool.taskList.model; import java.util.Date; +import java.util.HashSet; import java.util.Set; -import org.apache.log4j.Logger; +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; /** - * TaskList - * - * @author Dapeng Ni - * - * - * + * @author Andrey Balan */ +@Entity +@Table(name = "tl_latask10_session") public class TaskListSession { - private static Logger log = Logger.getLogger(TaskListSession.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 = "taskList_uid") private TaskList taskList; + + @Column(name = "session_start_date") private Date sessionStartDate; + + @Column(name = "session_end_date") private Date sessionEndDate; - //finish or not + + @Column private int status; - //taskList Items - private Set taskListItems; + + @OneToMany(cascade = CascadeType.ALL) + @JoinColumn(name = "session_uid") + @OrderBy("create_date DESC") + private Set taskListItems = new HashSet<>(); // ********************************************************** // Get/Set methods @@ -66,10 +90,6 @@ this.uid = uuid; } - /** - * - * @return - */ public Date getSessionEndDate() { return sessionEndDate; } @@ -78,11 +98,6 @@ this.sessionEndDate = sessionEndDate; } - /** - * - * - * @return - */ public Date getSessionStartDate() { return sessionStartDate; } @@ -91,10 +106,6 @@ this.sessionStartDate = sessionStartDate; } - /** - * - * @return - */ public int getStatus() { return status; } @@ -103,11 +114,6 @@ this.status = status; } - /** - * - * - * @return - */ public TaskList getTaskList() { return taskList; } @@ -116,10 +122,6 @@ this.taskList = taskList; } - /** - * - * @return - */ public Long getSessionId() { return sessionId; } @@ -145,23 +147,11 @@ this.sessionName = sessionName; } - /** - * - * - * - * - * - * - * - * - * - * @return - */ - public Set getTaskListItems() { + public Set getTaskListItems() { return taskListItems; } - public void setTaskListItems(Set taskListItems) { + public void setTaskListItems(Set taskListItems) { this.taskListItems = taskListItems; } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListUser.java =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListUser.java (.../TaskListUser.java) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListUser.java (.../TaskListUser.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -25,43 +25,70 @@ 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; /** - * TaskList - * - * @author Dapeng Ni - * - * - * + * @author Andrey Balan */ +@Entity +@Table(name = "tl_latask10_user") public class TaskListUser implements Cloneable { - private static final long serialVersionUID = -7043502180037866257L; private static Logger log = Logger.getLogger(TaskListUser.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(name = "is_verified_by_monitor") private boolean isVerifiedByMonitor; + @ManyToOne + @JoinColumn(name = "session_uid") private TaskListSession session; + + @ManyToOne + @JoinColumn(name = "taskList_uid") private TaskList taskList; //=============== NON Persisit value: for display use =========== //the user access some reousrce item date time. Use in monitoring summary page + @Transient private Date accessDate; public TaskListUser() { } public TaskListUser(UserDTO user, TaskListSession 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(); @@ -71,7 +98,7 @@ } public TaskListUser(UserDTO user, TaskList 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(); @@ -80,9 +107,6 @@ this.sessionFinished = false; } - /** - * Clone method from java.lang.Object - */ @Override public Object clone() { @@ -99,45 +123,47 @@ return user; } + @Override + public boolean equals(Object obj) { + if (this == obj) { + return true; + } + if (!(obj instanceof TaskListUser)) { + return false; + } + + final TaskListUser user = (TaskListUser) 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; } @@ -146,10 +172,6 @@ this.lastName = lastName; } - /** - * - * @return - */ public String getFirstName() { return firstName; } @@ -158,10 +180,6 @@ this.firstName = firstName; } - /** - * - * @return - */ public String getLoginName() { return loginName; } @@ -170,11 +188,6 @@ this.loginName = loginName; } - /** - * - * - * @return - */ public TaskListSession getSession() { return session; } @@ -183,11 +196,6 @@ this.session = session; } - /** - * - * - * @return - */ public TaskList getTaskList() { return taskList; } @@ -196,10 +204,6 @@ this.taskList = content; } - /** - * - * @return - */ public boolean isSessionFinished() { return sessionFinished; } @@ -208,27 +212,6 @@ this.sessionFinished = sessionFinished; } - @Override - public boolean equals(Object obj) { - if (this == obj) { - return true; - } - if (!(obj instanceof TaskListUser)) { - return false; - } - - final TaskListUser user = (TaskListUser) 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; } @@ -237,10 +220,6 @@ this.accessDate = accessDate; } - /** - * - * @return - */ public boolean isVerifiedByMonitor() { return isVerifiedByMonitor; } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/service/TaskListServiceImpl.java (.../TaskListServiceImpl.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -58,10 +58,7 @@ import org.lamsfoundation.lams.tool.exception.ToolException; import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.tool.taskList.TaskListConstants; -import org.lamsfoundation.lams.tool.taskList.dao.TaskListConditionDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListDAO; -import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemAttachmentDAO; -import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemCommentDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemVisitDAO; import org.lamsfoundation.lams.tool.taskList.dao.TaskListSessionDAO; @@ -93,12 +90,9 @@ private static Logger log = Logger.getLogger(TaskListServiceImpl.class.getName()); private TaskListDAO taskListDao; private TaskListItemDAO taskListItemDao; - private TaskListConditionDAO taskListConditionDAO; private TaskListUserDAO taskListUserDao; private TaskListSessionDAO taskListSessionDao; private TaskListItemVisitDAO taskListItemVisitDao; - private TaskListItemAttachmentDAO taskListItemAttachmentDao; - private TaskListItemCommentDAO taskListItemCommentDAO; // tool service private IToolContentHandler taskListToolContentHandler; private MessageService messageService; @@ -188,7 +182,7 @@ @Override public void deleteTaskListCondition(Long conditionUid) { - taskListConditionDAO.removeObject(TaskListCondition.class, conditionUid); + taskListItemDao.removeObject(TaskListCondition.class, conditionUid); } @Override @@ -495,14 +489,6 @@ this.taskListOutputFactory = taskListOutputFactory; } - public void setTaskListAttachmentDao(TaskListItemAttachmentDAO taskListItemAttachmentDao) { - this.taskListItemAttachmentDao = taskListItemAttachmentDao; - } - - public void setTaskListConditionDao(TaskListConditionDAO taskListConditionDAO) { - this.taskListConditionDAO = taskListConditionDAO; - } - public void setTaskListDao(TaskListDAO taskListDao) { this.taskListDao = taskListDao; } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml =================================================================== diff -u -r62aaf160878735888d077bf28fac3c1989bb8fbd -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml (.../taskListApplicationContext.xml) (revision 62aaf160878735888d077bf28fac3c1989bb8fbd) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/taskListApplicationContext.xml (.../taskListApplicationContext.xml) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -33,12 +33,6 @@ - - - - - - @@ -71,9 +65,6 @@ - - - Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java =================================================================== diff -u -rc9ee204be2fbc37ed1fd4c7eb8267bc103d98a24 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java (.../LearningController.java) (revision c9ee204be2fbc37ed1fd4c7eb8267bc103d98a24) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/controller/LearningController.java (.../LearningController.java) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -473,7 +473,7 @@ boolean isTestHarness = Boolean.valueOf(request.getParameter("testHarness")); String commentMessage = isTestHarness ? request.getParameter("comment__textarea") : taskListItemForm.getComment(); - if (commentMessage == null || StringUtils.isBlank(commentMessage)) { + if (StringUtils.isBlank(commentMessage)) { return "pages/learning/learning"; } Index: lams_tool_task/web/pages/learning/parts/itemdetails.jsp =================================================================== diff -u -ra76d96d2c8738e06130ab51ea379fe34bea5fbd8 -r0b3631fb6cd93265967ec5d314313e15999d9061 --- lams_tool_task/web/pages/learning/parts/itemdetails.jsp (.../itemdetails.jsp) (revision a76d96d2c8738e06130ab51ea379fe34bea5fbd8) +++ lams_tool_task/web/pages/learning/parts/itemdetails.jsp (.../itemdetails.jsp) (revision 0b3631fb6cd93265967ec5d314313e15999d9061) @@ -14,8 +14,11 @@
- - + + +