Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml,v
diff -u -r1.10 -r1.11
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml 18 Feb 2005 01:14:48 -0000 1.10
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Grouping.hbm.xml 23 Feb 2005 05:14:46 -0000 1.11
@@ -20,6 +20,10 @@
+
+
+ @hibernate.property column="grouping_ui_id" length="11"
+
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java,v
diff -u -r1.11 -r1.12
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java 22 Feb 2005 05:24:15 -0000 1.11
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java 23 Feb 2005 05:17:34 -0000 1.12
@@ -500,7 +500,6 @@
return new NullGroup();
}
-
/**
* Check up whether a is tool activity or not.
* @return
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java,v
diff -u -r1.4 -r1.5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java 17 Feb 2005 04:20:35 -0000 1.4
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java 23 Feb 2005 05:17:34 -0000 1.5
@@ -6,16 +6,15 @@
/**
* @hibernate.class
+ *
+ * A GroupingActivity creates Grouping.
*/
public class GroupingActivity extends SimpleActivity implements Serializable
{
- /** persistent field */
- private Integer groupingUIID;
-
- /** persistent field */
+ /** The grouping_ui_id of the Grouping that this activity creates */
private Integer createGroupingUIID;
- /** persistent field */
+ /** The grouping that this activity creates */
public Grouping createGrouping;
/** full constructor */
@@ -61,8 +60,7 @@
activityTypeId,
transitionTo,
transitionFrom);
- this.createGrouping = createGrouping;
- this.groupingUIID = grouping_ui_id;
+ this.createGrouping = createGrouping;
this.createGroupingUIID = create_grouping_ui_id;
}
@@ -96,8 +94,7 @@
activityTypeId,
transitionTo,
transitionFrom);
- this.createGrouping = createGrouping;
- this.groupingUIID = grouping_ui_id;
+ this.createGrouping = createGrouping;
this.createGroupingUIID = create_grouping_ui_id;
}
@@ -120,12 +117,6 @@
public void setCreateGrouping(Grouping createGrouping) {
this.createGrouping = createGrouping;
}
- public Integer getGroupingUIID() {
- return groupingUIID;
- }
- public void setGroupingUIID(Integer grouping_ui_id) {
- this.groupingUIID = grouping_ui_id;
- }
public Integer getCreateGroupingUIID() {
return createGroupingUIID;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java,v
diff -u -r1.6 -r1.7
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java 16 Feb 2005 23:06:28 -0000 1.6
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java 23 Feb 2005 05:17:34 -0000 1.7
@@ -340,6 +340,19 @@
parentActivities.add(activity);
}
return parentActivities;
+ }
+ public Activity calculateFirstActivity(){
+ Activity firstActivity = null;
+ HashSet parentActivities = this.getParentActivities();
+ Iterator parentIterator = parentActivities.iterator();
+ while(parentIterator.hasNext()){
+ Activity activity = (Activity)parentIterator.next();
+ if(activity.getTransitionTo()==null){
+ firstActivity = activity;
+ break;
+ }
+ }
+ return firstActivity;
}
public WorkspaceFolder getWorkspaceFolder() {
return workspaceFolder;
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java,v
diff -u -r1.6 -r1.7
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java 17 Feb 2005 04:20:35 -0000 1.6
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java 23 Feb 2005 05:17:34 -0000 1.7
@@ -114,7 +114,9 @@
newOptionsActivity.setHelpText(originalActivity.getHelpText());
newOptionsActivity.setXcoord(originalActivity.getXcoord());
newOptionsActivity.setYcoord(originalActivity.getYcoord());
- newOptionsActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+ newOptionsActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+ newOptionsActivity.setGrouping(originalActivity.getGrouping());
+ newOptionsActivity.setGroupingUIID(originalActivity.getGroupingUIID());
newOptionsActivity.setDefineLater(originalActivity.getDefineLater());
newOptionsActivity.setLearningLibrary(originalActivity.getLearningLibrary());
newOptionsActivity.setCreateDateTime(new Date());
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java,v
diff -u -r1.7 -r1.8
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java 17 Feb 2005 04:20:35 -0000 1.7
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java 23 Feb 2005 05:17:34 -0000 1.8
@@ -99,6 +99,8 @@
newParallelActivity.setXcoord(originalActivity.getXcoord());
newParallelActivity.setYcoord(originalActivity.getYcoord());
newParallelActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+ newParallelActivity.setGrouping(originalActivity.getGrouping());
+ newParallelActivity.setGroupingUIID(originalActivity.getGroupingUIID());
newParallelActivity.setDefineLater(originalActivity.getDefineLater());
newParallelActivity.setLearningLibrary(originalActivity.getLearningLibrary());
newParallelActivity.setCreateDateTime(new Date());
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java,v
diff -u -r1.6 -r1.7
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java 17 Feb 2005 04:20:35 -0000 1.6
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java 23 Feb 2005 05:17:34 -0000 1.7
@@ -105,6 +105,8 @@
newPermissionGateActivity.setXcoord(originalActivity.getXcoord());
newPermissionGateActivity.setYcoord(originalActivity.getYcoord());
newPermissionGateActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+ newPermissionGateActivity.setGrouping(originalActivity.getGrouping());
+ newPermissionGateActivity.setGroupingUIID(originalActivity.getGroupingUIID());
newPermissionGateActivity.setLearningLibrary(originalActivity.getLearningLibrary());
newPermissionGateActivity.setDefineLater(originalActivity.getDefineLater());
newPermissionGateActivity.setCreateDateTime(new Date());
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java,v
diff -u -r1.5 -r1.6
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java 17 Feb 2005 04:20:35 -0000 1.5
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java 23 Feb 2005 05:17:34 -0000 1.6
@@ -11,18 +11,19 @@
public class ScheduleGateActivity extends GateActivity implements Serializable {
/** nullable persistent field */
- private Date gateStartTimeOffset;
+ private Long gateStartTimeOffset;
/** nullable persistent field */
- private Date gateEndTimeOffset;
+ private Long gateEndTimeOffset;
/** nullable persistent field */
private Date gateStartDateTime;
/** nullable persistent field */
private Date gateEndDateTime;
- public Date getGateEndDateTime() {
+
+ public Date getGateEndDateTime() {
return gateEndDateTime;
}
public void setGateEndDateTime(Date gateEndDateTime) {
@@ -55,8 +56,8 @@
Transition transitionTo,
Transition transitionFrom,
Integer gateActivityLevelId,
- Date gateStartTimeOffset,
- Date gateEndTimeOffset) {
+ Long gateStartTimeOffset,
+ Long gateEndTimeOffset) {
super(activityId,
id,
description,
@@ -97,8 +98,8 @@
Transition transitionTo,
Transition transitionFrom,
Integer gateActivityLevelId,
- Date gateStartTimeOffset,
- Date gateEndTimeOffset) {
+ Long gateStartTimeOffset,
+ Long gateEndTimeOffset) {
super(activityId,
defineLater,
createDateTime,
@@ -137,6 +138,8 @@
newScheduleGateActivity.setXcoord(originalActivity.getXcoord());
newScheduleGateActivity.setYcoord(originalActivity.getYcoord());
newScheduleGateActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+ newScheduleGateActivity.setGrouping(originalActivity.getGrouping());
+ newScheduleGateActivity.setGroupingUIID(originalActivity.getGroupingUIID());
newScheduleGateActivity.setLearningLibrary(originalActivity.getLearningLibrary());
newScheduleGateActivity.setDefineLater(originalActivity.getDefineLater());
newScheduleGateActivity.setCreateDateTime(new Date());
@@ -148,24 +151,24 @@
}
/**
- * @hibernate.property column="gate_start_date_time" length="19"
+ * @hibernate.property column="gate_start_date_time" length="20"
*/
- public Date getGateStartTimeOffset() {
+ public Long getGateStartTimeOffset() {
return this.gateStartTimeOffset;
}
- public void setGateStartTimeOffset(Date gateStartTimeOffset) {
+ public void setGateStartTimeOffset(Long gateStartTimeOffset) {
this.gateStartTimeOffset = gateStartTimeOffset;
}
/**
- * @hibernate.property column="gate_end_date_time" length="19"
+ * @hibernate.property column="gate_end_date_time" length="20"
*/
- public Date getGateEndTimeOffset() {
+ public Long getGateEndTimeOffset() {
return this.gateEndTimeOffset;
}
- public void setGateEndTimeOffset(Date gateEndTimeOffset) {
+ public void setGateEndTimeOffset(Long gateEndTimeOffset) {
this.gateEndTimeOffset = gateEndTimeOffset;
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java,v
diff -u -r1.6 -r1.7
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java 17 Feb 2005 04:20:35 -0000 1.6
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java 23 Feb 2005 05:17:34 -0000 1.7
@@ -101,6 +101,8 @@
newSequenceActivity.setXcoord(originalActivity.getXcoord());
newSequenceActivity.setYcoord(originalActivity.getYcoord());
newSequenceActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+ newSequenceActivity.setGrouping(originalActivity.getGrouping());
+ newSequenceActivity.setGroupingUIID(originalActivity.getGroupingUIID());
newSequenceActivity.setLearningLibrary(originalActivity.getLearningLibrary());
newSequenceActivity.setDefineLater(originalActivity.getDefineLater());
newSequenceActivity.setCreateDateTime(new Date());
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java,v
diff -u -r1.5 -r1.6
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java 17 Feb 2005 04:20:35 -0000 1.5
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/SynchGateActivity.java 23 Feb 2005 05:17:34 -0000 1.6
@@ -102,6 +102,8 @@
newSynchGateActivity.setXcoord(originalActivity.getXcoord());
newSynchGateActivity.setYcoord(originalActivity.getYcoord());
newSynchGateActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+ newSynchGateActivity.setGrouping(originalActivity.getGrouping());
+ newSynchGateActivity.setGroupingUIID(originalActivity.getGroupingUIID());
newSynchGateActivity.setLearningLibrary(originalActivity.getLearningLibrary());
newSynchGateActivity.setDefineLater(originalActivity.getDefineLater());
newSynchGateActivity.setCreateDateTime(new Date());
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java,v
diff -u -r1.8 -r1.9
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java 22 Feb 2005 05:24:15 -0000 1.8
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/ToolActivity.java 23 Feb 2005 05:17:34 -0000 1.9
@@ -128,6 +128,8 @@
newToolActivity.setXcoord(originalActivity.getXcoord());
newToolActivity.setYcoord(originalActivity.getYcoord());
newToolActivity.setActivityTypeId(originalActivity.getActivityTypeId());
+ newToolActivity.setGrouping(originalActivity.getGrouping());
+ newToolActivity.setGroupingUIID(originalActivity.getGroupingUIID());
newToolActivity.setOrderId(originalActivity.getOrderId());
newToolActivity.setDefineLater(originalActivity.getDefineLater());
newToolActivity.setLearningLibrary(originalActivity.getLearningLibrary());
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java,v
diff -u -r1.4 -r1.5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java 16 Feb 2005 22:12:24 -0000 1.4
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IActivityDAO.java 23 Feb 2005 05:18:37 -0000 1.5
@@ -46,4 +46,18 @@
*/
public List getActivitiesByLearningDesignId(Long learningDesignId);
+ /**
+ * Returns a list of activities associated with the LearningLibrary.
+ * It only returns the template activities and not all activities
+ * with learning_library_id =libraryID. Template activity is one which
+ * is not a part of any learning Design but is used as a blue-print/
+ * template for creating new activities. Single LearningLibrary can
+ * have one or more activities associated with it.
+ *
+ * @param libraryID The learning_library_id of the LearningLibrary
+ * @return List List of activities that belong to
+ * the given LearningLibrary
+ */
+ public List getActivitiesByLibraryID(Long libraryID);
+
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupingDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupingDAO.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupingDAO.java 28 Jan 2005 04:20:46 -0000 1.1
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/IGroupingDAO.java 23 Feb 2005 05:18:37 -0000 1.2
@@ -15,5 +15,11 @@
* @return Grouping populated Grouping object
*/
public Grouping getGroupingById(Long groupingID);
+
+ /**
+ * @param groupingUIID
+ * @return Grouping populated Grouping object
+ */
+ public Grouping getGroupingByUIID(Integer groupingUIID);
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILicenseDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILicenseDAO.java,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/ILicenseDAO.java 23 Feb 2005 05:18:37 -0000 1.1
@@ -0,0 +1,22 @@
+/*
+ * Created on Feb 21, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.learningdesign.dao;
+
+import org.lamsfoundation.lams.learningdesign.License;
+import org.lamsfoundation.lams.learningdesign.dao.IBaseDAO;
+
+/**
+ * @author Minhas
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public interface ILicenseDAO extends IBaseDAO {
+
+ public License getLicenseByID(Long licenseID);
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java,v
diff -u -r1.4 -r1.5
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java 16 Feb 2005 22:13:00 -0000 1.4
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java 23 Feb 2005 05:19:46 -0000 1.5
@@ -28,6 +28,9 @@
private static final String FIND_BY_UI_ID ="from " + TABLENAME +
" in class " + Activity.class.getName() +
" where activity_ui_id=?" + " AND " + " learning_design_id=?" ;
+ private static final String FIND_BY_LIBRARY_ID = "from " + TABLENAME +
+ " in class " + Activity.class.getName() +
+ " where learning_library_id=?" + " AND learning_design_id IS NULL";
/*
@@ -84,12 +87,19 @@
this.getHibernateTemplate().delete(activity);
}
- /* (non-Javadoc)
+ /**
* @see org.lamsfoundation.lams.learningdesign.dao.IActivityDAO#getActivityByID(java.lang.Integer)
*/
public Activity getActivityByUIID(Integer id, LearningDesign design) {
Long designID = design.getLearningDesignId();
List list = this.getHibernateTemplate().find(FIND_BY_UI_ID,new Object[]{id,designID},new Type[]{Hibernate.INTEGER,Hibernate.LONG});
return (Activity) list.get(0);
}
+ /**
+ * @see org.lamsfoundation.lams.learningdesign.dao.IActivityDAO#getActivitiesByLibraryID(java.lang.Long)
+ */
+ public List getActivitiesByLibraryID(Long libraryID){
+ List list = this.getHibernateTemplate().find(FIND_BY_LIBRARY_ID,libraryID);
+ return list;
+ }
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java,v
diff -u -r1.2 -r1.3
--- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java 1 Feb 2005 23:49:28 -0000 1.2
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/GroupingDAO.java 23 Feb 2005 05:19:46 -0000 1.3
@@ -6,6 +6,8 @@
*/
package org.lamsfoundation.lams.learningdesign.dao.hibernate;
+import java.util.List;
+
import org.lamsfoundation.lams.learningdesign.Grouping;
import org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO;
@@ -16,12 +18,29 @@
* Window - Preferences - Java - Code Style - Code Templates
*/
public class GroupingDAO extends BaseDAO implements IGroupingDAO {
+
+ private static final String TABLENAME ="lams_grouping";
- /* (non-Javadoc)
+ private static final String FIND_BY_UI_ID ="from " + TABLENAME +
+ " in class " + Grouping.class.getName() +
+ " where grouping_ui_id=?";
+
+ /**
* @see org.lamsfoundation.lams.learningdesign.dao.interfaces.IGroupingDAO#getGroupingById(java.lang.Long)
*/
public Grouping getGroupingById(Long groupingID) {
return (Grouping)super.find(Grouping.class,groupingID);
}
+ /**
+ * @see org.lamsfoundation.lams.learningdesign.dao.IGroupingDAO#getGroupingByUIID(java.lang.Integer)
+ */
+ public Grouping getGroupingByUIID(Integer groupingUIID) {
+ List list = this.getHibernateTemplate().find(FIND_BY_UI_ID,groupingUIID);
+ if(list!=null)
+ return (Grouping)list.get(0);
+ else
+ return null;
+ }
+
}
Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java,v
diff -u
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dao/hibernate/LicenseDAO.java 23 Feb 2005 05:19:46 -0000 1.1
@@ -0,0 +1,24 @@
+/*
+ * Created on Feb 21, 2005
+ *
+ * TODO To change the template for this generated file go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+package org.lamsfoundation.lams.learningdesign.dao.hibernate;
+
+import org.lamsfoundation.lams.learningdesign.License;
+import org.lamsfoundation.lams.learningdesign.dao.ILicenseDAO;
+
+/**
+ * @author Minhas
+ *
+ * TODO To change the template for this generated type comment go to
+ * Window - Preferences - Java - Code Style - Code Templates
+ */
+public class LicenseDAO extends BaseDAO implements ILicenseDAO{
+
+ public License getLicenseByID(Long licenseID){
+ return(License)super.find(License.class,licenseID);
+ }
+
+}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolDAO.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolDAO.java 8 Feb 2005 06:13:44 -0000 1.1
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/IToolDAO.java 23 Feb 2005 05:20:30 -0000 1.2
@@ -9,6 +9,8 @@
package org.lamsfoundation.lams.tool.dao;
+import java.util.List;
+
import org.lamsfoundation.lams.tool.Tool;
@@ -21,5 +23,6 @@
{
public Tool getToolByID(Long toolID);
+ public List getAllTools();
}
Index: lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java,v
diff -u -r1.1 -r1.2
--- lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java 8 Feb 2005 06:13:44 -0000 1.1
+++ lams_common/src/java/org/lamsfoundation/lams/tool/dao/hibernate/ToolDAO.java 23 Feb 2005 05:20:16 -0000 1.2
@@ -9,6 +9,8 @@
package org.lamsfoundation.lams.tool.dao.hibernate;
+import java.util.List;
+
import org.lamsfoundation.lams.tool.Tool;
import org.lamsfoundation.lams.tool.dao.IToolDAO;
import org.springframework.orm.hibernate.support.HibernateDaoSupport;
@@ -21,6 +23,7 @@
*/
public class ToolDAO extends HibernateDaoSupport implements IToolDAO
{
+ private static final String FIND_ALL = "from obj in class " + Tool.class.getName();
/**
* @see org.lamsfoundation.lams.tool.dao.IToolDAO#getToolByID(java.lang.Long)
@@ -29,5 +32,8 @@
{
return (Tool)getHibernateTemplate().get(Tool.class,toolID);
}
+ public List getAllTools(){
+ return this.getHibernateTemplate().find(FIND_ALL);
+ }
}
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestActivityDAO.java,v
diff -u -r1.5 -r1.6
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java 16 Feb 2005 22:16:56 -0000 1.5
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestActivityDAO.java 23 Feb 2005 05:20:43 -0000 1.6
@@ -1,5 +1,7 @@
package org.lamsfoundation.lams.learningdesign.dao;
+import java.util.List;
+
import org.lamsfoundation.lams.AbstractLamsTestCase;
import org.lamsfoundation.lams.learningdesign.dao.hibernate.ActivityDAO;
import org.lamsfoundation.lams.learningdesign.dao.hibernate.GroupingDAO;
@@ -43,10 +45,10 @@
learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO");
groupingDAO = (GroupingDAO)context.getBean("groupingDAO");
}
- /*public void testGetActivitiesByParentActivityId() {
+ public void testGetActivitiesByParentActivityId() {
List list = activityDAO.getActivitiesByParentActivityId(new Long(14));
System.out.print("SIZE:" + list.size());
- }*/
+ }
public void test(){
activity = activityDAO.getActivityByActivityId(new Long(18));
Transition transition = activity.getTransitionTo();
@@ -66,105 +68,10 @@
return new String[] {"/org/lamsfoundation/lams/learningdesign/learningDesignApplicationContext.xml",
"applicationContext.xml"};
}
-
- /*protected void tearDown() throws Exception {
- super.tearDown();
+ public void testgetActivityByLibraryID(){
+ List activities = activityDAO.getActivitiesByLibraryID(new Long(1));
+ assertNotNull(activities);
+ System.out.println("SIZE:" + activities.size());
}
-
- public void testGetActivityById() {
- }
-
-
-
- public void testGetAllActivities() {
- }
-
- public void testGetActivitiesByLearningDesignId() {
- }*/
-
- /*public void testInsertActivity() {
- OptionsActivity optActivity = new OptionsActivity();
-
- optActivity.setDefineLater(new Boolean(false));
-
- ActivityType activityType = new ActivityType();
- activityType.setLearningActivityTypeId(new Integer(8));
- optActivity.setActivityType(activityType);
-
- optActivity.setDescription("Optional Activity Description");
- optActivity.setTitle("Optional Activity Title");
-
- LearningDesign ld = new LearningDesign();
- ld.setLearningDesignId(new Long(1));
- optActivity.setLearningDesign(ld);
-
- LearningLibrary lb = new LearningLibrary();
- lb.setLearningLibraryId(new Long(1));
- optActivity.setLearningLibrary(lb);
-
- optActivity.setCreateDateTime(new Date());
-
- activityDAO.insertActivity(optActivity);
- //activity.setOrderId(new Integer(2));
- //assertNotNull("Primary Key assigned",optActivity.getActivityId());
- }*/
- /*public void testInsertActivity() {
- OptionsActivity optActivity = new OptionsActivity();
-
- optActivity.setOrderId(new Integer(123));
- optActivity.setDefineLater(new Boolean(false));
- optActivity.setDescription("Optional Activity Description");
- optActivity.setTitle("Optional Activity Title");
- optActivity.setActivityTypeId(new Integer(8));
-
- LearningDesign design = learningDesignDAO.getLearningDesignById(new Long(1));
- optActivity.setLearningDesign(design);
-
- LearningLibrary library = learningLibraryDAO.getLearningLibraryById(new Long(1));
- optActivity.setLearningLibrary(library);
-
- optActivity.setCreateDateTime(new Date());
- optActivity.setParentActivity(activityDAO.getActivityById(new Long(1)));
-
- activityDAO.insertActivity(optActivity);
- //activity.setOrderId(new Integer(2));
- //assertNotNull("Primary Key assigned",optActivity.getActivityId());
- }*/
- /*public void testInsertOptionsActivity(){
- OptionsActivity options = new OptionsActivity();
-
- options.setId(new Integer(26));
- //options.setTitle("Trial Options Activity");
- //options.setDescription("This is an Optional Activity");
- options.setDefineLater(new Boolean(false));
- options.setActivityTypeId(new Integer(8));
- options.setCreateDateTime(new Date());
- options.setMaxNumberOfOptions(new Integer(5));
- options.setMinNumberOfOptions(new Integer(3));
-
- /*LearningDesign design = learningDesignDAO.getLearningDesignById(new Long(1));
- options.setLearningDesign(design);
-
- LearningLibrary library = learningLibraryDAO.getLearningLibraryById(new Long(1));
- options.setLearningLibrary(library);
-
- options.setLibraryActivityUiImage("image");
- options.setOfflineInstructions("Offline Instructions for Optional Activity");
- options.setXcoord(new Integer(0));
- options.setYcoord(new Integer(0));
- options.setOrderId(new Integer(1));
- options.setParentActivity(activityDAO.getActivityById(new Long(1)));
- options.setGrouping(groupingDAO.getGroupingById(new Long(1)));
- activityDAO.insertOptActivity(options);
- //activityDAO.insertActivity(options);
-
- }*/
-
- /*public void testUpdateActivity() {
- }
-
- public void testDeleteActivity() {
- }*/
-
}
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestLearningDesignDAO.java,v
diff -u -r1.5 -r1.6
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java 16 Feb 2005 22:16:56 -0000 1.5
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningDesignDAO.java 23 Feb 2005 05:20:43 -0000 1.6
@@ -5,6 +5,7 @@
import java.util.Date;
import org.lamsfoundation.lams.AbstractLamsTestCase;
+import org.lamsfoundation.lams.learningdesign.Activity;
import org.lamsfoundation.lams.learningdesign.LearningDesign;
import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningDesignDAO;
import org.lamsfoundation.lams.usermanagement.User;
@@ -33,7 +34,7 @@
super.setUp();
learningDesignDAO =(LearningDesignDAO)context.getBean("learningDesignDAO");
userDAO = (UserDAO)context.getBean("userDAO");
- }
+ } /*
public void testInsertLearningDesign(){
LearningDesign design = new LearningDesign();
@@ -43,6 +44,13 @@
design.setCopyTypeID(new Integer(1));
design.setCreateDateTime(new Date());
learningDesignDAO.insert(design);
+ }*/
+ public void testCalculateFirstActivity(){
+ learningDesign = learningDesignDAO.getLearningDesignById(new Long(1));
+ Activity activity = learningDesign.calculateFirstActivity();
+ assertNotNull(activity.getActivityId());
+ long x = 15;
+ assertEquals(activity.getActivityId().longValue(),x);
}
/* (non-Javadoc)
* @see org.lamsfoundation.lams.AbstractLamsTestCase#getContextConfigLocation()
Index: lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/Attic/TestLearningLibraryDAO.java,v
diff -u -r1.4 -r1.5
--- lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java 9 Feb 2005 04:12:54 -0000 1.4
+++ lams_common/test/java/org/lamsfoundation/lams/learningdesign/dao/TestLearningLibraryDAO.java 23 Feb 2005 05:20:43 -0000 1.5
@@ -5,6 +5,10 @@
* Window - Preferences - Java - Code Style - Code Templates
*/
package org.lamsfoundation.lams.learningdesign.dao;
+
+
+import java.util.Set;
+
import org.lamsfoundation.lams.AbstractLamsTestCase;
import org.lamsfoundation.lams.learningdesign.LearningLibrary;
import org.lamsfoundation.lams.learningdesign.dao.hibernate.LearningLibraryDAO;
@@ -29,7 +33,9 @@
public void testGetAllLibraries(){
LearningLibrary lib = libraryDAO.getLearningLibraryById(new Long(8));
assertNotNull(lib.getTitle());
- System.out.println(lib.getTitle());
+ Set set = lib.getActivities();
+ System.out.println(lib.getTitle());
+ System.out.println(set.size());
}
/**
* (non-Javadoc)
Index: lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/tool/dao/Attic/TestToolDAO.java,v
diff -u -r1.2 -r1.3
--- lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java 11 Feb 2005 01:24:22 -0000 1.2
+++ lams_common/test/java/org/lamsfoundation/lams/tool/dao/TestToolDAO.java 23 Feb 2005 05:21:00 -0000 1.3
@@ -9,6 +9,8 @@
package org.lamsfoundation.lams.tool.dao;
+import java.util.List;
+
import org.lamsfoundation.lams.tool.ToolDataAccessTestCase;
@@ -55,5 +57,9 @@
assertTrue("verify support grouping",!testTool.getSupportsGrouping());
assertTrue("verify support define later",!testTool.getSupportsDefineLater());
}
+ public void testGetAllTools(){
+ List list = toolDao.getAllTools();
+ assertNotNull(list);
+ }
}