Index: lams_tool_task/db/model/taskList.clay =================================================================== diff -u -ra370ee2f7fe049337ac7b342e0218bdde3f3ee68 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/db/model/taskList.clay (.../taskList.clay) (revision a370ee2f7fe049337ac7b342e0218bdde3f3ee68) +++ lams_tool_task/db/model/taskList.clay (.../taskList.clay) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -9,7 +9,7 @@ - + @@ -96,7 +96,7 @@
- + @@ -212,6 +212,126 @@
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 @@ -220,7 +340,7 @@ - + @@ -318,7 +438,7 @@
- + @@ -466,7 +586,7 @@
- + @@ -649,7 +769,7 @@
- + @@ -737,7 +857,7 @@
- + @@ -829,7 +949,7 @@
- + Index: lams_tool_task/db/sql/create_lams_tool_taskList.sql =================================================================== diff -u -ra370ee2f7fe049337ac7b342e0218bdde3f3ee68 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/db/sql/create_lams_tool_taskList.sql (.../create_lams_tool_taskList.sql) (revision a370ee2f7fe049337ac7b342e0218bdde3f3ee68) +++ lams_tool_task/db/sql/create_lams_tool_taskList.sql (.../create_lams_tool_taskList.sql) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -1,5 +1,7 @@ SET FOREIGN_KEY_CHECKS=0; drop table if exists tl_latask10_attachment; +drop table if exists tl_latask10_condition; +drop table if exists tl_latask10_condition_taskList_item; drop table if exists tl_latask10_taskList; drop table if exists tl_latask10_taskList_item; drop table if exists tl_latask10_taskList_item_visit_log; @@ -17,6 +19,18 @@ taskList_uid bigint, primary key (uid) ); +create table tl_latask10_condition ( + condition_uid bigint not null auto_increment, + sequence_id integer, + taskList_uid bigint, + name varchar(255), + primary key (condition_uid) +); +create table tl_latask10_condition_taskList_item ( + uid bigint not null, + condition_uid bigint not null, + primary key (uid, condition_uid) +); create table tl_latask10_taskList ( uid bigint not null auto_increment, create_date datetime, @@ -108,6 +122,9 @@ primary key (uid) ); alter table tl_latask10_attachment add index FK_NEW_174079138_1E7009430E79035 (taskList_uid), add constraint FK_NEW_174079138_1E7009430E79035 foreign key (taskList_uid) references tl_latask10_taskList (uid); +alter table tl_latask10_condition add index FK_tl_latask10_condition_1 (taskList_uid), add constraint FK_tl_latask10_condition_1 foreign key (taskList_uid) references tl_latask10_taskList (uid); +alter table tl_latask10_condition_taskList_item add index FK_tl_latask10_taskList_item_condition_1 (condition_uid), add constraint FK_tl_latask10_taskList_item_condition_1 foreign key (condition_uid) references tl_latask10_condition (condition_uid); +alter table tl_latask10_condition_taskList_item add index FK_tl_latask10_taskList_item_condition_2 (uid), add constraint FK_tl_latask10_taskList_item_condition_2 foreign key (uid) references tl_latask10_taskList (uid); alter table tl_latask10_taskList add index FK_NEW_174079138_89093BF758092FB (create_by), add constraint FK_NEW_174079138_89093BF758092FB foreign key (create_by) references tl_latask10_user (uid); alter table tl_latask10_taskList_item add index FK_NEW_174079138_F52D1F93758092FB (create_by), add constraint FK_NEW_174079138_F52D1F93758092FB foreign key (create_by) references tl_latask10_user (uid); alter table tl_latask10_taskList_item add index FK_NEW_174079138_F52D1F9330E79035 (taskList_uid), add constraint FK_NEW_174079138_F52D1F9330E79035 foreign key (taskList_uid) references tl_latask10_taskList (uid); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListAttachmentDAO.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListAttachmentDAO.java (.../TaskListAttachmentDAO.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListAttachmentDAO.java (.../TaskListAttachmentDAO.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -23,6 +23,12 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.taskList.dao; +/** + * DAO interface for TaskListAttachment. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.model.TaskListItemAttachment + */ public interface TaskListAttachmentDAO extends DAO { } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListConditionDAO.java =================================================================== diff -u --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListConditionDAO.java (revision 0) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListConditionDAO.java (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -0,0 +1,35 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.tool.taskList.dao; + +/** + * DAO interface for TaskListCondition. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.model.TaskListCondition + */ +public interface TaskListConditionDAO extends DAO { + +} + \ No newline at end of file Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListDAO.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListDAO.java (.../TaskListDAO.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListDAO.java (.../TaskListDAO.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -25,12 +25,35 @@ import org.lamsfoundation.lams.tool.taskList.model.TaskList; +/** + * DAO interface for TaskList. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.model.TaskList + */ public interface TaskListDAO extends DAO { + /** + * Returns TaskList with the specified contentId. + * + * @param contentId specified contentId + * @return TaskList with the specified contentId + */ TaskList getByContentId(Long contentId); + /** + * Returns TaskList with the specified taskListUid. + * + * @param taskListUid specified taskListUid + * @return TaskList with the specified taskListUid + */ TaskList getByUid(Long taskListUid); + /** + * Delete specified taskList. + * + * @param taskList specified taskList + */ void delete(TaskList taskList); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemAttachmentDAO.java =================================================================== diff -u -re12e54b34d1312f79a1c8b1fb3662fb5a6da9676 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemAttachmentDAO.java (.../TaskListItemAttachmentDAO.java) (revision e12e54b34d1312f79a1c8b1fb3662fb5a6da9676) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemAttachmentDAO.java (.../TaskListItemAttachmentDAO.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -22,7 +22,13 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.taskList.dao; - + +/** + * DAO interface for TaskListItemAttachment. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.model.TaskListItemAttachment + */ public interface TaskListItemAttachmentDAO extends DAO { } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemCommentDAO.java =================================================================== diff -u -re12e54b34d1312f79a1c8b1fb3662fb5a6da9676 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemCommentDAO.java (.../TaskListItemCommentDAO.java) (revision e12e54b34d1312f79a1c8b1fb3662fb5a6da9676) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemCommentDAO.java (.../TaskListItemCommentDAO.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -23,6 +23,12 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.taskList.dao; +/** + * DAO interface for TaskListItemComment. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.model.TaskListItemComment + */ public interface TaskListItemCommentDAO extends DAO { } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemDAO.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemDAO.java (.../TaskListItemDAO.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemDAO.java (.../TaskListItemDAO.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -27,15 +27,28 @@ import org.lamsfoundation.lams.tool.taskList.model.TaskListItem; +/** + * DAO interface for TaskListItem. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.model.TaskListItem + */ public interface TaskListItemDAO extends DAO { /** * Return all taskList items which is uploaded by author in given taskListUid. + * * @param taskListUid - * @return + * @return all taskList items which is uploaded by author in given taskListUid */ List getAuthoringItems(Long taskListUid); + /** + * Return taskListItem with the specified taskListItemUid. + * + * @param taskListItemUid specified taskListItemUid + * @return taskListItem with the specified taskListItemUid + */ TaskListItem getByUid(Long taskListItemUid); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java (.../TaskListItemVisitDAO.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListItemVisitDAO.java (.../TaskListItemVisitDAO.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -28,20 +28,30 @@ import org.lamsfoundation.lams.tool.taskList.model.TaskListItemVisitLog; +/** + * DAO interface for TaskListItemVisit. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.model.TaskListItemVisit + */ public interface TaskListItemVisitDAO extends DAO { - - public TaskListItemVisitLog getTaskListItemLog(Long itemUid,Long userId); - - public int getUserViewLogCount(Long sessionId, Long userUid); /** - * Return list which contains key pair which key is taskList item uid, value is number view. + * Returns TaskListItemVisitLog which corresponds to specified taskListItemUid and userId. * - * @param contentId - * @return + * @param itemUid specified taskListItemUid + * @param userId specified userId + * @return TaskListItemVisitLog wich corresponds to specified taskListItemUid and userId */ - public Map getSummary(Long contentId); + public TaskListItemVisitLog getTaskListItemLog(Long itemUid,Long userId); + /** + * Return list of taskListItemVisitLogs which corresponds to specified sessionId and itemUid + * + * @param sessionId specified sessionId + * @param itemUid specified itemUid + * @return list of taskListItemVisitLogs which corresponds to specified sessionId and itemUid + */ public List getTaskListItemLogBySession(Long sessionId,Long itemUid); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListSessionDAO.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListSessionDAO.java (.../TaskListSessionDAO.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListSessionDAO.java (.../TaskListSessionDAO.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -27,15 +27,42 @@ import org.lamsfoundation.lams.tool.taskList.model.TaskListSession; +/** + * DAO interface for TaskListSession. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.model.TaskListSession + */ public interface TaskListSessionDAO extends DAO { + /** + * Returns TaskListSession with the specified sessionId + * + * @param sessionId specified sessionId + * @return TaskListSession with the specified sessionId + */ TaskListSession getSessionBySessionId(Long sessionId); + /** + * Returns TaskListSession wich corresponds to the tool with the specified toolContentId + * + * @param toolContentId specified toolContentId + * @return TaskListSession wich corresponds to the tool with the specified toolContentId + */ List getByContentId(Long toolContentId); + /** + * Delete specified session. + * + * @param session specified session + */ void delete(TaskListSession session); + /** + * Delete session with the specified toolSessionId. + * + * @param toolSessionId specified toolSessionId + */ void deleteBySessionId(Long toolSessionId); - } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListUserDAO.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListUserDAO.java (.../TaskListUserDAO.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/TaskListUserDAO.java (.../TaskListUserDAO.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -27,11 +27,37 @@ import org.lamsfoundation.lams.tool.taskList.model.TaskListUser; +/** + * DAO interface for TaskListUser. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.model.TaskListUser + */ public interface TaskListUserDAO extends DAO { + /** + * Returns user with the specified userID and sessionId. + * + * @param userID specified userID + * @param sessionId specified sessionId + * @return user with the specified userID and sessionId + */ TaskListUser getUserByUserIDAndSessionID(Long userID, Long sessionId); + /** + * Returns user with the specified userID and contentId. + * + * @param userId specified userID + * @param contentId specified contentId + * @return user with the specified userID and contentId + */ TaskListUser getUserByUserIDAndContentID(Long userId, Long contentId); + /** + * Returns list of users corresponds to specified sessionId. + * + * @param sessionId specified sessionId + * @return list of users corresponds to specified sessionId + */ List getBySessionID(Long sessionId); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/BaseDAOHibernate.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/BaseDAOHibernate.java (.../BaseDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -42,29 +42,29 @@ protected final Log log = LogFactory.getLog(getClass()); /** - * @see com.edgenius.paradise.dao.DAO#saveObject(java.lang.Object) + * {@inheritDoc} */ public void saveObject(Object o) { getHibernateTemplate().saveOrUpdate(o); } /** - * @see com.edgenius.paradise.dao.DAO#getObject(java.lang.Class, java.io.Serializable) + * {@inheritDoc} */ public Object getObject(Class clazz, Serializable id) { Object o = getHibernateTemplate().get(clazz, id); return o; } /** - * @see com.edgenius.paradise.dao.DAO#getObjects(java.lang.Class) + * {@inheritDoc} */ public List getObjects(Class clazz) { return getHibernateTemplate().loadAll(clazz); } /** - * @see com.edgenius.paradise.dao.DAO#removeObject(java.lang.Class, java.io.Serializable) + * {@inheritDoc} */ public void removeObject(Class clazz, Serializable id) { getHibernateTemplate().delete(getObject(clazz, id)); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListAttachmentDAOHibernate.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListAttachmentDAOHibernate.java (.../TaskListAttachmentDAOHibernate.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListAttachmentDAOHibernate.java (.../TaskListAttachmentDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -25,6 +25,13 @@ import org.lamsfoundation.lams.tool.taskList.dao.TaskListAttachmentDAO; +/** + * Hibernate implementation of TaskListAttachmentDAO. + * + * @author Steve.Ni + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListAttachmentDAO + */ public class TaskListAttachmentDAOHibernate extends BaseDAOHibernate implements TaskListAttachmentDAO{ } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListConditionDAOHibernate.java =================================================================== diff -u --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListConditionDAOHibernate.java (revision 0) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListConditionDAOHibernate.java (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -0,0 +1,38 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.tool.taskList.dao.hibernate; + +import org.lamsfoundation.lams.tool.taskList.dao.TaskListAttachmentDAO; +import org.lamsfoundation.lams.tool.taskList.dao.TaskListConditionDAO; + +/** + * Hibernate implementation of TaskListConditionDAO. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListConditionDAO + */ +public class TaskListConditionDAOHibernate extends BaseDAOHibernate implements TaskListConditionDAO{ + +} + \ No newline at end of file Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java (.../TaskListDAOHibernate.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListDAOHibernate.java (.../TaskListDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -29,14 +29,18 @@ import org.lamsfoundation.lams.tool.taskList.model.TaskList; /** - * + * Hibernate implementation of TaskListDAO. + * * @author Steve.Ni - * - * @version $Revision$ + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListDAO */ public class TaskListDAOHibernate extends BaseDAOHibernate implements TaskListDAO{ private static final String GET_RESOURCE_BY_CONTENTID = "from "+TaskList.class.getName()+" as r where r.contentId=?"; + /** + * {@inheritDoc} + */ public TaskList getByContentId(Long contentId) { List list = getHibernateTemplate().find(GET_RESOURCE_BY_CONTENTID,contentId); if(list.size() > 0) @@ -45,10 +49,16 @@ return null; } + /** + * {@inheritDoc} + */ public TaskList getByUid(Long taskListUid) { return (TaskList) getObject(TaskList.class,taskListUid); } + /** + * {@inheritDoc} + */ public void delete(TaskList taskList) { this.getHibernateTemplate().delete(taskList); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemAttachmentDAOHibernate.java =================================================================== diff -u -re12e54b34d1312f79a1c8b1fb3662fb5a6da9676 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemAttachmentDAOHibernate.java (.../TaskListItemAttachmentDAOHibernate.java) (revision e12e54b34d1312f79a1c8b1fb3662fb5a6da9676) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemAttachmentDAOHibernate.java (.../TaskListItemAttachmentDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -25,6 +25,12 @@ import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemAttachmentDAO; +/** + * Hibernate implementation of TaskListItemAttachmentDAO. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListItemAttachmentDAO + */ public class TaskListItemAttachmentDAOHibernate extends BaseDAOHibernate implements TaskListItemAttachmentDAO{ } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemCommentDAOHibernate.java =================================================================== diff -u -re12e54b34d1312f79a1c8b1fb3662fb5a6da9676 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemCommentDAOHibernate.java (.../TaskListItemCommentDAOHibernate.java) (revision e12e54b34d1312f79a1c8b1fb3662fb5a6da9676) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemCommentDAOHibernate.java (.../TaskListItemCommentDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -25,6 +25,12 @@ import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemCommentDAO; +/** + * Hibernate implementation of TaskListItemCommentDAO. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListItemCommentDAO + */ public class TaskListItemCommentDAOHibernate extends BaseDAOHibernate implements TaskListItemCommentDAO{ Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemDAOHibernate.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemDAOHibernate.java (.../TaskListItemDAOHibernate.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemDAOHibernate.java (.../TaskListItemDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -28,15 +28,26 @@ import org.lamsfoundation.lams.tool.taskList.dao.TaskListItemDAO; import org.lamsfoundation.lams.tool.taskList.model.TaskListItem; +/** + * Hibernate implementation of TaskListItemDAO. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListItemDAO + */ public class TaskListItemDAOHibernate extends BaseDAOHibernate implements TaskListItemDAO{ private static final String FIND_AUTHORING_ITEMS = "from " + TaskListItem.class.getName() + " where taskList_uid = ? order by sequence_Id asc"; + /** + * {@inheritDoc} + */ public List getAuthoringItems(Long taskListUid) { - return this.getHibernateTemplate().find(FIND_AUTHORING_ITEMS,taskListUid); } + /** + * {@inheritDoc} + */ 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 -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java (.../TaskListItemVisitDAOHibernate.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListItemVisitDAOHibernate.java (.../TaskListItemVisitDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -32,6 +32,12 @@ import org.lamsfoundation.lams.tool.taskList.model.TaskListItemVisitLog; import org.lamsfoundation.lams.tool.taskList.model.TaskListSession; +/** + * Hibernate implementation of TaskListItemVisitDAO. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListItemVisitDAO + */ public class TaskListItemVisitDAOHibernate extends BaseDAOHibernate implements TaskListItemVisitDAO{ private static final String FIND_BY_ITEM_AND_USER = "from " + TaskListItemVisitLog.class.getName() @@ -40,46 +46,52 @@ private static final String FIND_BY_ITEM_BYSESSION = "from " + TaskListItemVisitLog.class.getName() + " as r where r.sessionId = ? and r.taskListItem.uid=?"; - private static final String FIND_VIEW_COUNT_BY_USER = "select count(*) from " + TaskListItemVisitLog.class.getName() - + " as r where r.sessionId=? and r.user.userId =?"; - - private static final String FIND_SUMMARY = "select v.taskListItem.uid, count(v.taskListItem) from " - + TaskListItemVisitLog.class.getName() + " as v , " - + TaskListSession.class.getName() + " as s, " - + TaskList.class.getName() + " as r " - +" where v.sessionId = s.sessionId " - +" and s.taskList.uid = r.uid " - +" and r.contentId =? " - +" group by v.sessionId, v.taskListItem.uid "; +// private static final String FIND_VIEW_COUNT_BY_USER = "select count(*) from " + TaskListItemVisitLog.class.getName() +// + " as r where r.sessionId=? and r.user.userId =?"; +// +// private static final String FIND_SUMMARY = "select v.taskListItem.uid, count(v.taskListItem) from " +// + TaskListItemVisitLog.class.getName() + " as v , " +// + TaskListSession.class.getName() + " as s, " +// + TaskList.class.getName() + " as r " +// +" where v.sessionId = s.sessionId " +// +" and s.taskList.uid = r.uid " +// +" and r.contentId =? " +// +" group by v.sessionId, v.taskListItem.uid "; + /** + * {@inheritDoc} + */ public TaskListItemVisitLog getTaskListItemLog(Long itemUid,Long userId){ List list = getHibernateTemplate().find(FIND_BY_ITEM_AND_USER,new Object[]{userId,itemUid}); if(list == null || list.size() ==0) return null; return (TaskListItemVisitLog) list.get(0); } - public int getUserViewLogCount(Long toolSessionId ,Long userUid) { - List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_USER,new Object[]{toolSessionId, userUid}); - if(list == null || list.size() ==0) - return 0; - return ((Number) list.get(0)).intValue(); - } +// public int getUserViewLogCount(Long toolSessionId ,Long userUid) { +// List list = getHibernateTemplate().find(FIND_VIEW_COUNT_BY_USER,new Object[]{toolSessionId, userUid}); +// if(list == null || list.size() ==0) +// return 0; +// return ((Number) list.get(0)).intValue(); +// } +// +// public Map getSummary(Long contentId) { +// +// // Note: Hibernate 3.1 query.uniqueResult() returns Integer, Hibernate 3.2 query.uniqueResult() returns Long +// List result = getHibernateTemplate().find(FIND_SUMMARY,contentId); +// Map summaryList = new HashMap (result.size()); +// for(Object[] list : result){ +// if ( list[1] != null ) { +// summaryList.put((Long)list[0],new Integer(((Number)list[1]).intValue())); +// } +// } +// return summaryList; +// +// } - public Map getSummary(Long contentId) { - - // Note: Hibernate 3.1 query.uniqueResult() returns Integer, Hibernate 3.2 query.uniqueResult() returns Long - List result = getHibernateTemplate().find(FIND_SUMMARY,contentId); - Map summaryList = new HashMap (result.size()); - for(Object[] list : result){ - if ( list[1] != null ) { - summaryList.put((Long)list[0],new Integer(((Number)list[1]).intValue())); - } - } - return summaryList; - - } - + /** + * {@inheritDoc} + */ public List getTaskListItemLogBySession(Long sessionId, Long itemUid) { return getHibernateTemplate().find(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 -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListSessionDAOHibernate.java (.../TaskListSessionDAOHibernate.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListSessionDAOHibernate.java (.../TaskListSessionDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -28,25 +28,44 @@ import org.lamsfoundation.lams.tool.taskList.dao.TaskListSessionDAO; import org.lamsfoundation.lams.tool.taskList.model.TaskListSession; - +/** + * Hibernate implementation of TaskListSessionDAO. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListSessionDAO + */ public class TaskListSessionDAOHibernate extends BaseDAOHibernate implements TaskListSessionDAO{ private static final String FIND_BY_SESSION_ID = "from " + TaskListSession.class.getName() + " as p where p.sessionId=?"; private static final String FIND_BY_CONTENT_ID = "from " + TaskListSession.class.getName() + " as p where p.taskList.contentId=?"; + /** + * {@inheritDoc} + */ public TaskListSession getSessionBySessionId(Long sessionId) { List list = getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId); if(list == null || list.size() == 0) return null; return (TaskListSession) list.get(0); } + + /** + * {@inheritDoc} + */ public List getByContentId(Long toolContentId) { return getHibernateTemplate().find(FIND_BY_CONTENT_ID,toolContentId); } + /** + * {@inheritDoc} + */ public void delete(TaskListSession session) { this.getHibernateTemplate().delete(session); } + + /** + * {@inheritDoc} + */ 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 -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java (.../TaskListUserDAOHibernate.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/dao/hibernate/TaskListUserDAOHibernate.java (.../TaskListUserDAOHibernate.java) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -28,30 +28,43 @@ import org.lamsfoundation.lams.tool.taskList.dao.TaskListUserDAO; import org.lamsfoundation.lams.tool.taskList.model.TaskListUser; - +/** + * Hibernate implementation of TaskListUserDAO. + * + * @author Andrey Balan + * @see org.lamsfoundation.lams.tool.taskList.dao.TaskListUserDAO + */ public class TaskListUserDAOHibernate extends BaseDAOHibernate implements TaskListUserDAO{ private static final String FIND_BY_USER_ID_CONTENT_ID = "from " + TaskListUser.class.getName() + " as u where u.userId =? and u.taskList.contentId=?"; private static final String FIND_BY_USER_ID_SESSION_ID = "from " + TaskListUser.class.getName() + " as u where u.userId =? and u.session.sessionId=?"; private static final String FIND_BY_SESSION_ID = "from " + TaskListUser.class.getName() + " as u where u.session.sessionId=?"; + /** + * {@inheritDoc} + */ public TaskListUser getUserByUserIDAndSessionID(Long userID, Long sessionId) { List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_SESSION_ID,new Object[]{userID,sessionId}); if(list == null || list.size() == 0) return null; return (TaskListUser) list.get(0); } + /** + * {@inheritDoc} + */ public TaskListUser getUserByUserIDAndContentID(Long userId, Long contentId) { List list = this.getHibernateTemplate().find(FIND_BY_USER_ID_CONTENT_ID,new Object[]{userId,contentId}); if(list == null || list.size() == 0) return null; return (TaskListUser) list.get(0); } + /** + * {@inheritDoc} + */ public List getBySessionID(Long sessionId) { return this.getHibernateTemplate().find(FIND_BY_SESSION_ID,sessionId); } - - + } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml =================================================================== diff -u --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml (revision 0) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -0,0 +1,74 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java =================================================================== diff -u --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java (revision 0) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -0,0 +1,260 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +/* $Id$ */ +package org.lamsfoundation.lams.tool.taskList.model; + +import java.util.ArrayList; +import java.util.Date; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Set; + +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.builder.EqualsBuilder; +import org.apache.commons.lang.builder.HashCodeBuilder; +import org.apache.log4j.Logger; +import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; +import org.lamsfoundation.lams.tool.taskList.util.TaskListToolContentHandler; + +/** + * The main entity class of TaskList tool. Contains all the data related to the whole tool. + * + * @author Andrey Balan + * + * @hibernate.class table="tl_latask10_condition" + */ +public class TaskListCondition implements Cloneable{ + + private static final Logger log = Logger.getLogger(TaskListCondition.class); + + //key + private Long uid; + +// private TaskList taskList; + //unique name + private String name; + private int sequenceId; + + //taskList Items + private Set taskListItems; + + /** + * Default contruction method. + */ + public TaskListCondition(){ + taskListItems = new HashSet(); + } + + // ********************************************************** + // Function method for TaskList + // ********************************************************** + + /** + * {@Override} + */ + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((name == null) ? 0 : name.hashCode()); + result = prime * result + sequenceId; + result = prime * result + ((taskListItems == null) ? 0 : taskListItems.hashCode()); + result = prime * result + ((uid == null) ? 0 : uid.hashCode()); + return result; + } + + /** + * {@Override} + */ + public boolean equals(Object obj) { + if (this == obj) return true; + if (obj == null) return false; + if (getClass() != obj.getClass()) return false; + final TaskListCondition other = (TaskListCondition) obj; + if (name == null) { + if (other.name != null) + return false; + } else if (!name.equals(other.name)) + return false; + if (sequenceId != other.sequenceId) + return false; + if (taskListItems == null) { + if (other.taskListItems != null) + return false; + } else if (!taskListItems.equals(other.taskListItems)) + return false; + if (uid == null) { + if (other.uid != null) + return false; + } else if (!uid.equals(other.uid)) + return false; + return true; + } + + /** + * {@Override} + */ + public Object clone(){ + + TaskListCondition taskList = null; + try{ + taskList = (TaskListCondition) super.clone(); + taskList.setUid(null); + //clone taskListItems + if(taskListItems != null){ + Iterator iter = taskListItems.iterator(); + Set set = new HashSet(); + while(iter.hasNext()){ + TaskListItem item = (TaskListItem)iter.next(); + TaskListItem newItem = (TaskListItem) item.clone(); + //just clone old file without duplicate it in repository + set.add(newItem); + } + taskList.taskListItems = set; + } + } catch (CloneNotSupportedException e) { + log.error("When clone " + TaskListCondition.class + " failed"); + } + + return taskList; + } + + //********************************************************** + // Get/set methods + //********************************************************** + + /** + * Returns TaskList id. + * + * @return tasklist id + * + * @hibernate.id column="condition_uid" generator-class="native" + */ + public Long getUid() { + return uid; + } + + /** + * Sets TaskList id. + * + * @param uid tasklist id + */ + public void setUid(Long uid) { + this.uid = uid; + } + + /** + * Returns condition's name. + * + * @return condition's name. + * + * @hibernate.property + * column="name" + * + */ + public String getName() { + return name; + } + /** + * Sets the condition's name. Should be unique for the parent tasklist. + * + * @param title condition's name + */ + public void setName(String name) { + this.name = name; + } + + /** + * Return set of TaskListItems + * + * @return set of TaskListItems + * + * @hibernate.set lazy="true" + * inverse="true" + * cascade="none" + * order-by="sequence_id asc" + * table = "tl_latask10_condition_taskList_item" + * @hibernate.collection-key column="uid" + * @hibernate.collection-many-to-many class="org.lamsfoundation.lams.tool.taskList.model.TaskListItem" + */ + public Set getTaskListItems() { + return taskListItems; + } + + /** + * Sets set of TaskListItems. + * + * @param taskListItems set of TaskListItems + */ + public void setTaskListItems(Set taskListItems) { + this.taskListItems= taskListItems; + } + +// +// /** +// * Returns taskList to which this condition applies. +// * +// * @return taskList to which this condition applies +// * +// * @hibernate.many-to-one +// * cascade="none" +// * column="taskList_uid" +// */ +// 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 + * screen. + * + * @return condition's sequence number + * + * @hibernate.property column="sequence_id" + */ + public int getSequenceId() { + return sequenceId; + } + /** + * Sets condition's sequence number. Order is very important for + * conditions as the conditions will be tested in the order shown on the + * screen. + * + * @param sequenceId condition's sequence number + */ + public void setSequenceId(int sequenceId) { + this.sequenceId = sequenceId; + } + +} + + \ No newline at end of file Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml =================================================================== diff -u -r182743b20b3ea04f99193cdce3a176f04d055641 -r0e7e464ded505f35e6ade3811f3f74658668e13a --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml (.../TaskListItem.hbm.xml) (revision 182743b20b3ea04f99193cdce3a176f04d055641) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.hbm.xml (.../TaskListItem.hbm.xml) (revision 0e7e464ded505f35e6ade3811f3f74658668e13a) @@ -134,7 +134,7 @@ /> + +