Index: lams_tool_task/db/model/taskList.clay =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r98c5d28841932a01a986591dd46c12881c9a8b7b --- lams_tool_task/db/model/taskList.clay (.../taskList.clay) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/db/model/taskList.clay (.../taskList.clay) (revision 98c5d28841932a01a986591dd46c12881c9a8b7b) @@ -384,6 +384,12 @@ + + + + + + Index: lams_tool_task/db/sql/create_lams_tool_taskList.sql =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r98c5d28841932a01a986591dd46c12881c9a8b7b --- lams_tool_task/db/sql/create_lams_tool_taskList.sql (.../create_lams_tool_taskList.sql) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/db/sql/create_lams_tool_taskList.sql (.../create_lams_tool_taskList.sql) (revision 98c5d28841932a01a986591dd46c12881c9a8b7b) @@ -49,6 +49,7 @@ is_hide tinyint, is_required tinyint, is_comments_allowed tinyint, + show_comments_to_all tinyint, is_child_task tinyint, parent_task_name varchar(255), taskList_uid bigint, @@ -103,7 +104,7 @@ `lock_when_finished`, `is_sequential_order`, `allow_contribute_tasks`, `is_monitor_verification_required`, `reflect_on_activity`) VALUES (1,NULL,NULL,NULL,'TaskList','0','Instructions ',null,null,0,0,${default_content_id},0,0,0,0,0); -INSERT INTO `tl_latask10_taskList_item` (`uid`, `sequence_id`, `description`, `init_item`, `organization_xml`, `title`, `create_by`, `create_date`, `create_by_author`, `is_hide`, `is_required`, `is_comments_allowed`, `is_child_task`, `parent_task_name`, `taskList_uid`, `session_uid`) VALUES - (1,1,NULL,NULL,NULL,'Task number 1',null,NOW(),1,0,0,0,0,NULL,1,NULL); +INSERT INTO `tl_latask10_taskList_item` (`uid`, `sequence_id`, `description`, `init_item`, `organization_xml`, `title`, `create_by`, `create_date`, `create_by_author`, `is_hide`, `is_required`, `is_comments_allowed`, `show_comments_to_all`, `is_child_task`, `parent_task_name`, `taskList_uid`, `session_uid`) VALUES + (1,1,NULL,NULL,NULL,'Task number 1',null,NOW(),1,0,0,0,0,0,NULL,1,NULL); SET FOREIGN_KEY_CHECKS=1; Index: lams_tool_task/db/sql/table-schema.sql =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r98c5d28841932a01a986591dd46c12881c9a8b7b --- lams_tool_task/db/sql/table-schema.sql (.../table-schema.sql) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/db/sql/table-schema.sql (.../table-schema.sql) (revision 98c5d28841932a01a986591dd46c12881c9a8b7b) @@ -20,7 +20,7 @@ create table tl_latask10_item_log (uid bigint not null auto_increment, access_date datetime, taskList_item_uid bigint, user_uid bigint, complete bit, session_id bigint, primary key (uid)); create table tl_latask10_session (uid bigint not null auto_increment, session_end_date datetime, session_start_date datetime, status integer, taskList_uid bigint, session_id bigint, session_name varchar(250), primary key (uid)); create table tl_latask10_taskList (uid bigint not null auto_increment, create_date datetime, update_date datetime, create_by bigint, title varchar(255), run_offline bit, instructions text, online_instructions text, offline_instructions text, content_in_use bit, define_later bit, content_id bigint unique, lock_when_finished bit, allow_contribute_tasks bit, is_monitor_verification_required bit, is_sequential_order bit, reflect_instructions varchar(255), reflect_on_activity bit, primary key (uid)); -create table tl_latask10_taskList_item (uid bigint not null auto_increment, description varchar(255), init_item varchar(255), organization_xml text, title varchar(255), create_by bigint, create_date datetime, create_by_author bit, is_hide bit, sequence_id integer, is_required bit, is_comments_allowed bit, is_child_task bit, parent_task_name varchar(255), taskList_uid bigint, session_uid bigint, primary key (uid)); +create table tl_latask10_taskList_item (uid bigint not null auto_increment, description varchar(255), init_item varchar(255), organization_xml text, title varchar(255), create_by bigint, create_date datetime, create_by_author bit, is_hide bit, sequence_id integer, is_required bit, is_comments_allowed bit, show_comments_to_all bit, is_child_task bit, parent_task_name varchar(255), taskList_uid bigint, session_uid bigint, primary key (uid)); create table tl_latask10_user (uid bigint not null auto_increment, user_id bigint, last_name varchar(255), first_name varchar(255), login_name varchar(255), session_uid bigint, taskList_uid bigint, session_finished bit, primary key (uid)); alter table tl_latask10_attachment add index FK281134C2994F51CE (taskList_uid), add constraint FK281134C2994F51CE foreign key (taskList_uid) references tl_latask10_taskList (uid); alter table tl_latask10_item_log add index FK6CFEC3773324488D (taskList_item_uid), add constraint FK6CFEC3773324488D foreign key (taskList_item_uid) references tl_latask10_taskList_item (uid); Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r98c5d28841932a01a986591dd46c12881c9a8b7b --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java (.../TaskListItem.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListItem.java (.../TaskListItem.java) (revision 98c5d28841932a01a986591dd46c12881c9a8b7b) @@ -56,6 +56,7 @@ private boolean isRequired; private boolean isCommentsAllowed; + private boolean showCommentsToAll; private boolean isChildTask; private String parentTaskName; @@ -219,6 +220,17 @@ } /** + * @hibernate.property column="show_comments_to_all" + * @return + */ + public boolean getShowCommentsToAll() { + return showCommentsToAll; + } + public void setShowCommentsToAll(boolean showCommentsToAll) { + this.showCommentsToAll = showCommentsToAll; + } + + /** * @hibernate.property column="is_comments_allowed" * @return */ Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r98c5d28841932a01a986591dd46c12881c9a8b7b --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 98c5d28841932a01a986591dd46c12881c9a8b7b) @@ -809,6 +809,7 @@ form.setItemIndex(new Integer(itemIdx).toString()); form.setRequired(item.isRequired()); form.setCommentsAllowed(item.isCommentsAllowed()); + form.setShowCommentsToAll(item.getShowCommentsToAll()); form.setChildTask(item.isChildTask()); form.setParentTaskName(item.getParentTaskName()); @@ -870,6 +871,7 @@ item.setRequired(itemForm.isRequired()); item.setCommentsAllowed(itemForm.isCommentsAllowed()); + item.setShowCommentsToAll(itemForm.getShowCommentsToAll()); item.setChildTask(itemForm.isChildTask()); item.setParentTaskName(itemForm.getParentTaskName()); } Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListItemForm.java =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r98c5d28841932a01a986591dd46c12881c9a8b7b --- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListItemForm.java (.../TaskListItemForm.java) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListItemForm.java (.../TaskListItemForm.java) (revision 98c5d28841932a01a986591dd46c12881c9a8b7b) @@ -43,6 +43,7 @@ private boolean isRequired; private boolean isCommentsAllowed; + private boolean showCommentsToAll; private boolean isChildTask; private String parentTaskName; @@ -91,6 +92,13 @@ public void setCommentsAllowed(boolean isCommentsAllowed) { this.isCommentsAllowed = isCommentsAllowed; } + + public boolean getShowCommentsToAll() { + return showCommentsToAll; + } + public void setShowCommentsToAll(boolean showCommentsToAll) { + this.showCommentsToAll = showCommentsToAll; + } public boolean isChildTask() { return isChildTask; Index: lams_tool_task/web/pages/authoring/parts/addtask.jsp =================================================================== diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -r98c5d28841932a01a986591dd46c12881c9a8b7b --- lams_tool_task/web/pages/authoring/parts/addtask.jsp (.../addtask.jsp) (revision 875f56cb6917d1a52bed0545f2933c3b55497a02) +++ lams_tool_task/web/pages/authoring/parts/addtask.jsp (.../addtask.jsp) (revision 98c5d28841932a01a986591dd46c12881c9a8b7b) @@ -1,9 +1,7 @@ - <%@ include file="/common/taglibs.jsp"%> - <%@ include file="/common/header.jsp"%> @@ -49,11 +47,15 @@ + + + +
+ onclick="document.taskListItemForm.showCommentsToAll[0].disabled = !document.taskListItemForm.showCommentsToAll[0].disabled; + document.taskListItemForm.showCommentsToAll[1].disabled = !document.taskListItemForm.showCommentsToAll[1].disabled">