Index: lams_tool_task/db/model/taskList.clay
===================================================================
diff -u -rece51c9aa41df42fe691659f524e98e84dd7a668 -rfe31f08d68bebdde45fb5597de931d532ce7aace
--- lams_tool_task/db/model/taskList.clay	(.../taskList.clay)	(revision ece51c9aa41df42fe691659f524e98e84dd7a668)
+++ lams_tool_task/db/model/taskList.clay	(.../taskList.clay)	(revision fe31f08d68bebdde45fb5597de931d532ce7aace)
@@ -279,7 +279,7 @@
 </foreign-key-list>
 <index-list/>
 </table>
-<table alias="" name="tl_latask10_condition_taskList_item" remarks="" uid="e0dfc7:1190824a25d:-7eff">
+<table alias="" name="tl_latask10_condition_tl_item" remarks="" uid="e0dfc7:1190824a25d:-7eff">
 <table-description/>
 <table-figure-bounds height="-1" width="-1" x="880" y="762"/>
 <column-list>
@@ -310,7 +310,7 @@
 </data-type>
 </column>
 </column-list>
-<primary-key alias="" name="PK_TL_LATASK10_CONDITION_TASKLIST_ITEM" remarks="" uid="e0dfc7:1190824a25d:-7efe">
+<primary-key alias="" name="PK_TL_LATASK10_CONDITION_TL_ITEM" remarks="" uid="e0dfc7:1190824a25d:-7efe">
 <primary-key-description/>
 </primary-key>
 <unique-key-list/>
Index: lams_tool_task/db/sql/create_lams_tool_taskList.sql
===================================================================
diff -u -rece51c9aa41df42fe691659f524e98e84dd7a668 -rfe31f08d68bebdde45fb5597de931d532ce7aace
--- lams_tool_task/db/sql/create_lams_tool_taskList.sql	(.../create_lams_tool_taskList.sql)	(revision ece51c9aa41df42fe691659f524e98e84dd7a668)
+++ lams_tool_task/db/sql/create_lams_tool_taskList.sql	(.../create_lams_tool_taskList.sql)	(revision fe31f08d68bebdde45fb5597de931d532ce7aace)
@@ -1,7 +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_condition_tl_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;
@@ -26,7 +26,7 @@
    name varchar(255),
    primary key (condition_uid)
 );
-create table tl_latask10_condition_taskList_item (
+create table tl_latask10_condition_tl_item (
    uid bigint not null,
    condition_uid bigint not null,
    primary key (uid, condition_uid)
@@ -123,8 +123,8 @@
 );
 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_item (uid);
+alter table tl_latask10_condition_tl_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_tl_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_item (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/model/TaskList.hbm.xml
===================================================================
diff -u -r875f56cb6917d1a52bed0545f2933c3b55497a02 -rfe31f08d68bebdde45fb5597de931d532ce7aace
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml	(.../TaskList.hbm.xml)	(revision 875f56cb6917d1a52bed0545f2933c3b55497a02)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.hbm.xml	(.../TaskList.hbm.xml)	(revision fe31f08d68bebdde45fb5597de931d532ce7aace)
@@ -112,6 +112,26 @@
         </set>
 
         <set
+            name="conditions"
+            lazy="true"
+            inverse="false"
+            cascade="all"
+            sort="unsorted"
+            order-by="sequence_id asc"
+        >
+
+            <key
+                column="taskList_uid"
+            >
+            </key>
+
+            <one-to-many
+                  class="org.lamsfoundation.lams.tool.taskList.model.TaskListCondition"
+            />
+
+        </set>
+
+        <set
             name="taskListItems"
             lazy="true"
             inverse="false"
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java
===================================================================
diff -u -rece51c9aa41df42fe691659f524e98e84dd7a668 -rfe31f08d68bebdde45fb5597de931d532ce7aace
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	(.../TaskList.java)	(revision ece51c9aa41df42fe691659f524e98e84dd7a668)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskList.java	(.../TaskList.java)	(revision fe31f08d68bebdde45fb5597de931d532ce7aace)
@@ -45,10 +45,6 @@
  *
  * @hibernate.class  table="tl_latask10_taskList"
  */
-/**
- * @author Administrator
- *
- */
 public class TaskList implements Cloneable{
 	
 	private static final Logger log = Logger.getLogger(TaskList.class);
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml
===================================================================
diff -u -rece51c9aa41df42fe691659f524e98e84dd7a668 -rfe31f08d68bebdde45fb5597de931d532ce7aace
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml	(.../TaskListCondition.hbm.xml)	(revision ece51c9aa41df42fe691659f524e98e84dd7a668)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.hbm.xml	(.../TaskListCondition.hbm.xml)	(revision fe31f08d68bebdde45fb5597de931d532ce7aace)
@@ -35,7 +35,7 @@
 
         <set
             name="taskListItems"
-            table="tl_latask10_condition_taskList_item"
+            table="tl_latask10_condition_tl_item"
             lazy="true"
             inverse="true"
             cascade="none"
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java
===================================================================
diff -u -rece51c9aa41df42fe691659f524e98e84dd7a668 -rfe31f08d68bebdde45fb5597de931d532ce7aace
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java	(.../TaskListCondition.java)	(revision ece51c9aa41df42fe691659f524e98e84dd7a668)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/model/TaskListCondition.java	(.../TaskListCondition.java)	(revision fe31f08d68bebdde45fb5597de931d532ce7aace)
@@ -144,9 +144,9 @@
 	//**********************************************************
 
 	/**
-	 * Returns <code>TaskList</code> id.
+	 * Returns <code>TaskListCondition</code> id.
 	 * 
-	 * @return tasklist id
+	 * @return tasklistCondition id
 	 * 
 	 * @hibernate.id column="condition_uid" generator-class="native"
 	 */
@@ -157,7 +157,7 @@
 	/**
 	 * Sets <code>TaskList</code> id.
 	 * 
-	 * @param uid tasklist id
+	 * @param uid tasklistCondition id
 	 */
 	public void setUid(Long uid) {
 		this.uid = uid;
@@ -192,7 +192,7 @@
 	 * @hibernate.set lazy="true"
 	 * 				  inverse="true"
 	 * 				  cascade="none"
-     * 				  table = "tl_latask10_condition_taskList_item"
+     * 				  table = "tl_latask10_condition_tl_item"
      * @hibernate.collection-key column="condition_uid"
      * @hibernate.collection-many-to-many class="org.lamsfoundation.lams.tool.taskList.model.TaskListItem"
 	 */
Index: lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListConditionForm.java
===================================================================
diff -u -r1ef27bf016b647ea0c2803d22f2bb4d4b3cde650 -rfe31f08d68bebdde45fb5597de931d532ce7aace
--- lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListConditionForm.java	(.../TaskListConditionForm.java)	(revision 1ef27bf016b647ea0c2803d22f2bb4d4b3cde650)
+++ lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListConditionForm.java	(.../TaskListConditionForm.java)	(revision fe31f08d68bebdde45fb5597de931d532ce7aace)
@@ -48,14 +48,6 @@
 	
 	public TaskListConditionForm() {
 		super();
-	    LabelValueBean[] lvBeans = new LabelValueBean[4];
-
-	    lvBeans[0] = new LabelValueBean("Alpha", "A");
-	    lvBeans[1] = new LabelValueBean("Beta", "B");
-	    lvBeans[2] = new LabelValueBean("Charlie", "C");
-	    lvBeans[3] = new LabelValueBean("Delta", "D");
-	    
-		this.possibleItems = lvBeans;
 	}
 	
 	/**