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.11 -r1.12 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java 13 Mar 2005 23:22:34 -0000 1.11 +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java 14 Mar 2005 05:06:47 -0000 1.12 @@ -12,8 +12,8 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; -import org.lamsfoundation.lams.util.wddx.WDDXTAGS; + /** * @hibernate.class table="lams_learning_design" * @@ -232,19 +232,19 @@ this.learningDesignId = learningDesignId; } public Integer getLearningDesignUIID() { - return this.learningDesignUIID!=null?this.learningDesignUIID : WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return this.learningDesignUIID; } public void setLearningDesignUIID(Integer id) { this.learningDesignUIID = id; } public String getDescription() { - return this.description!=null?this.description:WDDXTAGS.STRING_NULL_VALUE; + return this.description; } public void setDescription(String description) { this.description = description; } public String getTitle() { - return this.title!=null?this.title:WDDXTAGS.STRING_NULL_VALUE; + return this.title; } public void setTitle(String title) { this.title = title; @@ -256,43 +256,43 @@ this.firstActivity = firstActivity; } public Integer getMaxId() { - return maxId!=null?maxId:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return maxId; } public void setMaxId(Integer maxId) { this.maxId = maxId; } public Boolean getValidDesign() { - return validDesign!=null?validDesign:WDDXTAGS.BOOLEAN_NULL_VALUE; + return validDesign; } public void setValidDesign(Boolean validDesign) { this.validDesign = validDesign; } public Boolean getReadOnly() { - return readOnly!=null?readOnly:WDDXTAGS.BOOLEAN_NULL_VALUE; + return readOnly; } public void setReadOnly(Boolean readOnly) { this.readOnly = readOnly; } public Date getDateReadOnly() { - return dateReadOnly!=null?dateReadOnly:WDDXTAGS.DATE_NULL_VALUE; + return dateReadOnly; } public void setDateReadOnly(Date dateReadOnly) { this.dateReadOnly = dateReadOnly; } public String getHelpText() { - return helpText!=null?helpText:WDDXTAGS.STRING_NULL_VALUE; + return helpText; } public void setHelpText(String helpText) { this.helpText = helpText; } public Date getCreateDateTime() { - return createDateTime!=null?createDateTime:WDDXTAGS.DATE_NULL_VALUE; + return createDateTime; } public void setCreateDateTime(Date createDateTime) { this.createDateTime = createDateTime; } public String getVersion() { - return version!=null?version:WDDXTAGS.STRING_NULL_VALUE; + return version; } public void setVersion(String version) { this.version = version; @@ -380,19 +380,19 @@ this.workspaceFolder = workspaceFolder; } public Long getDuration() { - return duration!=null?duration:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return duration; } public void setDuration(Long duration) { this.duration = duration; } public String getLicenseText() { - return licenseText!=null?licenseText:WDDXTAGS.STRING_NULL_VALUE; + return licenseText; } public void setLicenseText(String licenseText) { this.licenseText = licenseText; } public Integer getCopyTypeID() { - return copyTypeID!=null?copyTypeID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + return copyTypeID; } public void setCopyTypeID(Integer copyTypeID) { this.copyTypeID = copyTypeID; @@ -404,31 +404,31 @@ this.license = license; } public Long getLessonID() { - return lessonID!=null?lessonID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return lessonID; } public void setLessonID(Long lessonID) { this.lessonID = lessonID; } public String getLessonName() { - return lessonName!=null?lessonName:WDDXTAGS.STRING_NULL_VALUE; + return lessonName; } public void setLessonName(String lessonName) { this.lessonName = lessonName; } public Long getLessonOrgID() { - return lessonOrgID!=null?lessonOrgID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + return lessonOrgID; } public void setLessonOrgID(Long lessonOrgID) { this.lessonOrgID = lessonOrgID; } public String getLessonOrgName() { - return lessonOrgName!=null?lessonOrgName:WDDXTAGS.STRING_NULL_VALUE; + return lessonOrgName; } public void setLessonOrgName(String lessonOrgName) { this.lessonOrgName = lessonOrgName; } public Date getLessonStartDateTime() { - return lessonStartDateTime!=null?lessonStartDateTime:WDDXTAGS.DATE_NULL_VALUE; + return lessonStartDateTime; } public void setLessonStartDateTime(Date lessonStartDateTime) { this.lessonStartDateTime = lessonStartDateTime; Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java,v diff -u -r1.5 -r1.6 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java 17 Feb 2005 05:32:58 -0000 1.5 +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/ILessonDAO.java 14 Mar 2005 05:08:38 -0000 1.6 @@ -53,5 +53,14 @@ */ public void updateLesson(Lesson lesson); + /** + * Returns the list of available Lessons for + * a given user. + * + * @param userID The user_id of the user + * @return List The list of Lessons for the given user + */ + public List getLessonsForUser(Integer userID); + } Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java,v diff -u -r1.8 -r1.9 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java 3 Mar 2005 05:38:32 -0000 1.8 +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dao/hibernate/LessonDAO.java 14 Mar 2005 05:08:44 -0000 1.9 @@ -28,6 +28,10 @@ */ public class LessonDAO extends HibernateDaoSupport implements ILessonDAO { + private static final String TABLENAME ="lams_lesson"; + private final static String FIND_BY_USER="from " + TABLENAME + + " in class " + Lesson.class.getName() + + " where user_id=?"; /** * Retrieves the Lesson @@ -113,5 +117,9 @@ { getHibernateTemplate().update(lesson); } + public List getLessonsForUser(Integer userID){ + List lessons = this.getHibernateTemplate().find(FIND_BY_USER,userID); + return lessons; + } } Index: lams_common/src/java/org/lamsfoundation/lams/util/wddx/LDWDDXValueObjectFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/util/wddx/Attic/LDWDDXValueObjectFactory.java,v diff -u -r1.1 -r1.2 --- lams_common/src/java/org/lamsfoundation/lams/util/wddx/LDWDDXValueObjectFactory.java 7 Mar 2005 23:25:53 -0000 1.1 +++ lams_common/src/java/org/lamsfoundation/lams/util/wddx/LDWDDXValueObjectFactory.java 14 Mar 2005 05:08:50 -0000 1.2 @@ -194,7 +194,7 @@ * @param activities * @param activity */ - private void processActivityType(Hashtable activities, Object activity){ + private void processActivityType(Hashtable activities, Object activity){ String className = activity.getClass().getName(); if(activity instanceof GroupingActivity) buildGroupingActivityObject(activities,activity); @@ -214,35 +214,16 @@ * @param objActivity The object to be converted * @return Hashtable */ - private Hashtable buildActivityObject(Object objActivity){ - Hashtable activities = new Hashtable(); + public Hashtable buildActivityObject(Object objActivity){ - activities.put(WDDXTAGS.OBJECT_TYPE,"Activity"); - + Hashtable activities = getCutDownActivityDetails(objActivity); processActivityType(activities,objActivity); - Activity activity =(Activity)objActivity; + Activity activity =(Activity)objActivity; - activities.put(WDDXTAGS.ACTIVITY_ID,activity.getActivityId()); - - activities.put(WDDXTAGS.ACTIVITY_UIID, - (activity.getActivityUIID()!=null?activity.getActivityUIID():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); - - activities.put(WDDXTAGS.DESCRIPTION, - (activity.getDescription()!=null?activity.getDescription():WDDXTAGS.STRING_NULL_VALUE)); - - activities.put(WDDXTAGS.TITLE, - (activity.getTitle()!=null?activity.getTitle():WDDXTAGS.STRING_NULL_VALUE)); - activities.put(WDDXTAGS.HELP_TEXT, - (activity.getHelpText()!=null?activity.getHelpText():WDDXTAGS.STRING_NULL_VALUE)); + (activity.getHelpText()!=null?activity.getHelpText():WDDXTAGS.STRING_NULL_VALUE)); - activities.put(WDDXTAGS.XCOORD, - (activity.getXcoord()!=null?activity.getXcoord():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); - - activities.put(WDDXTAGS.YCOORD, - (activity.getYcoord()!=null?activity.getYcoord():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); - activities.put(WDDXTAGS.PARENT_ACTIVITY_ID, (activity.getParentActivity()!=null?activity.getParentActivity().getActivityId():WDDXTAGS.NUMERIC_NULL_VALUE_LONG)); @@ -291,7 +272,7 @@ * @param activities * @param activity */ - private void buildGroupingActivityObject(Hashtable activities, Object activity){ + private void buildGroupingActivityObject(Hashtable activities, Object activity){ GroupingActivity groupingActivity = (GroupingActivity)activity; Grouping grouping = groupingActivity.getCreateGrouping(); @@ -321,7 +302,7 @@ * populated into the hashtable * @return Hashtable The populated hashtable to be passed on to FLASH */ - private Hashtable addChosenGroupingAttributes(ChosenGrouping chosenGrouping){ + private Hashtable addChosenGroupingAttributes(ChosenGrouping chosenGrouping){ return new Hashtable(); } /** @@ -332,7 +313,7 @@ * populated into the hashtable * @return Hashtable The populated hashtable to be passed on to FLASH */ - private Hashtable addRandomGroupingAttributes(RandomGrouping randomGrouping){ + private Hashtable addRandomGroupingAttributes(RandomGrouping randomGrouping){ Hashtable groupingTable = new Hashtable(); groupingTable.put(WDDXTAGS.NUMBER_OF_GROUPS,randomGrouping.getNumberOfGroups()); groupingTable.put(WDDXTAGS.LEARNERS_PER_GROUP,randomGrouping.getLearnersPerGroup()); @@ -345,7 +326,7 @@ * @param activities * @param toolActivity */ - private void buildToolActivity(Hashtable activities, ToolActivity toolActivity){ + private void buildToolActivity(Hashtable activities, ToolActivity toolActivity){ activities.put(WDDXTAGS.ORDER_ID, (toolActivity.getOrderId()!=null?toolActivity.getOrderId():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); @@ -359,7 +340,7 @@ * @param activities * @param optActivity */ - private void buildOptionsActivityObject(Hashtable activities, OptionsActivity optActivity){ + private void buildOptionsActivityObject(Hashtable activities, OptionsActivity optActivity){ if(optActivity.getMaxNumberOfOptions()!=null) activities.put(WDDXTAGS.MAX_OPTIONS,optActivity.getMaxNumberOfOptions()); @@ -382,7 +363,7 @@ * @param activities * @param sequenceActivity */ - private void buildSequenceActivityObject(Hashtable activities,SequenceActivity sequenceActivity){ + private void buildSequenceActivityObject(Hashtable activities,SequenceActivity sequenceActivity){ } @@ -395,15 +376,15 @@ * @param activities * @param parallelActivity */ - private void buildParallelActivityObject(Hashtable activities,ParallelActivity parallelActivity){ + private void buildParallelActivityObject(Hashtable activities,ParallelActivity parallelActivity){ } /** * Adds ScheduleGateActivity specific attributes * @param activities * @param schActivity */ - private void buildScheduleGateActivityObject(Hashtable activities, ScheduleGateActivity schActivity){ + private void buildScheduleGateActivityObject(Hashtable activities, ScheduleGateActivity schActivity){ if(schActivity.getGateEndTimeOffset()!=null) activities.put(WDDXTAGS.GATE_END_OFFSET,schActivity.getGateEndTimeOffset()); @@ -422,7 +403,7 @@ * @param activities * @param activity */ - private void buildGateActivityObject(Hashtable activities, Object activity){ + private void buildGateActivityObject(Hashtable activities, Object activity){ if(activity instanceof PermissionGateActivity) buildPermissionGateActivityObject(activities,(PermissionGateActivity)activity); @@ -439,10 +420,10 @@ activities.put(WDDXTAGS.GATE_OPEN, (gateActivity.getGateOpen()!=null?gateActivity.getGateOpen():WDDXTAGS.BOOLEAN_NULL_VALUE)); } - private void buildPermissionGateActivityObject(Hashtable activities,PermissionGateActivity permissionGateActivity){ + private void buildPermissionGateActivityObject(Hashtable activities,PermissionGateActivity permissionGateActivity){ } - private void buildSynchGateActivityObject(Hashtable activities,SynchGateActivity synchGateActivity){ + private void buildSynchGateActivityObject(Hashtable activities,SynchGateActivity synchGateActivity){ } @@ -451,7 +432,7 @@ * @param activities * @param activity */ - private void buildComplexActivityObject(Hashtable activities, Object activity){ + private void buildComplexActivityObject(Hashtable activities, Object activity){ if(activity instanceof OptionsActivity) buildOptionsActivityObject(activities,(OptionsActivity)activity); @@ -468,7 +449,7 @@ * @param activities * @param iter */ - private void addChildActivities(Hashtable activities,Iterator iter){ + private void addChildActivities(Hashtable activities,Iterator iter){ Vector childActivities = new Vector(); while(iter.hasNext()){ Object object = iter.next(); @@ -484,7 +465,7 @@ * @param trans * @return Hashtable */ - private Hashtable buildTransitionObject(Transition trans){ + public static Hashtable buildTransitionObject(Transition trans){ Hashtable transitions = new Hashtable(); transitions.put(WDDXTAGS.TRANSITION_ID,trans.getTransitionId()); @@ -506,10 +487,6 @@ transitions.put(WDDXTAGS.LEARNING_DESIGN_ID, (trans.getLearningDesign()!=null?trans.getLearningDesign().getLearningDesignId():WDDXTAGS.NUMERIC_NULL_VALUE_LONG)); - - if(trans.getCreateDateTime()!=null) - transitions.put(WDDXTAGS.CREATION_DATE,trans.getCreateDateTime()); - transitions.put(WDDXTAGS.TO_ACTIVITY_UIID, (trans.getToUIID()!=null?trans.getToUIID():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); @@ -552,31 +529,12 @@ * @return Hashtable */ public Hashtable buildLearningDesignObject(LearningDesign design){ - Hashtable designs = new Hashtable(); + Hashtable designs = getCutDownLearningDesignDetails(design); - designs.put(WDDXTAGS.OBJECT_TYPE,LearningDesign.DESIGN_OBJECT); - designs.put(WDDXTAGS.LEARNING_DESIGN_ID, - (design.getLearningDesignId()!=null?design.getLearningDesignId():WDDXTAGS.NUMERIC_NULL_VALUE_LONG)); - designs.put(WDDXTAGS.LEARNING_DESIGN_UIID, (design.getLearningDesignUIID()!=null?design.getLearningDesignUIID():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); - designs.put(WDDXTAGS.DESCRIPTION, - (design.getDescription()!=null?design.getDescription():WDDXTAGS.STRING_NULL_VALUE)); - - designs.put(WDDXTAGS.TITLE, - (design.getTitle()!=null?design.getTitle():WDDXTAGS.STRING_NULL_VALUE)); - - designs.put(WDDXTAGS.FIRST_ACTIVITY_ID, - (design.getFirstActivity()!=null?design.getFirstActivity().getActivityId():WDDXTAGS.NUMERIC_NULL_VALUE_LONG)); - - designs.put(WDDXTAGS.FIRST_ACTIVITY_UIID, - (design.getFirstActivity()!=null?design.getFirstActivity().getActivityUIID():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); - - designs.put(WDDXTAGS.MAX_ID, - (design.getMaxId()!=null?design.getMaxId():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); - designs.put(WDDXTAGS.VALID_DESIGN,design.getValidDesign()); designs.put(WDDXTAGS.READ_ONLY,design.getReadOnly()); @@ -586,10 +544,6 @@ designs.put(WDDXTAGS.USER_ID,design.getUser().getUserId()); - - designs.put(WDDXTAGS.HELP_TEXT, - (design.getHelpText()!=null?design.getHelpText():WDDXTAGS.STRING_NULL_VALUE)); - designs.put(WDDXTAGS.VERSION, (design.getVersion()!=null?design.getVersion():WDDXTAGS.STRING_NULL_VALUE)); @@ -601,12 +555,6 @@ designs.put(WDDXTAGS.DURATION, (design.getDuration()!=null?design.getDuration():WDDXTAGS.NUMERIC_NULL_VALUE_LONG)); - designs.put(WDDXTAGS.LICENCE_ID, - (design.getLicense()!=null?design.getLicense().getLicenseID():WDDXTAGS.NUMERIC_NULL_VALUE_LONG)); - - designs.put(WDDXTAGS.LICENSE_TEXT, - (design.getLicenseText()!=null?design.getLicenseText():WDDXTAGS.STRING_NULL_VALUE)); - Collection coll = design.getActivities(); HashSet parentActivities = new HashSet(); Iterator iter =null; @@ -641,5 +589,70 @@ designs.put(WDDXTAGS.TRANSITIONS,transitions); return designs; + } + + public static Hashtable getCutDownActivityDetails(Object objActivity){ + Hashtable activities = new Hashtable(); + + activities.put(WDDXTAGS.OBJECT_TYPE,"Activity"); + Activity activity =(Activity)objActivity; + activities.put(WDDXTAGS.ACTIVITY_ID,activity.getActivityId()); + + activities.put(WDDXTAGS.ACTIVITY_TYPE_ID, + (activity.getActivityCategoryID()!=null?activity.getActivityCategoryID():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); + + activities.put(WDDXTAGS.ACTIVITY_UIID, + (activity.getActivityUIID()!=null?activity.getActivityUIID():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); + + activities.put(WDDXTAGS.DESCRIPTION, + (activity.getDescription()!=null?activity.getDescription():WDDXTAGS.STRING_NULL_VALUE)); + + activities.put(WDDXTAGS.TITLE, + (activity.getTitle()!=null?activity.getTitle():WDDXTAGS.STRING_NULL_VALUE)); + + activities.put(WDDXTAGS.XCOORD, + (activity.getXcoord()!=null?activity.getXcoord():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); + + activities.put(WDDXTAGS.YCOORD, + (activity.getYcoord()!=null?activity.getYcoord():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); + + return activities; + } + + public static Hashtable getCutDownLearningDesignDetails(LearningDesign design){ + Hashtable designs = new Hashtable(); + + designs.put(WDDXTAGS.OBJECT_TYPE,LearningDesign.DESIGN_OBJECT); + + designs.put(WDDXTAGS.LEARNING_DESIGN_ID, + (design.getLearningDesignId()!=null?design.getLearningDesignId():WDDXTAGS.NUMERIC_NULL_VALUE_LONG)); + + designs.put(WDDXTAGS.DESCRIPTION, + (design.getDescription()!=null?design.getDescription():WDDXTAGS.STRING_NULL_VALUE)); + + designs.put(WDDXTAGS.TITLE, + (design.getTitle()!=null?design.getTitle():WDDXTAGS.STRING_NULL_VALUE)); + + designs.put(WDDXTAGS.FIRST_ACTIVITY_ID, + (design.getFirstActivity()!=null?design.getFirstActivity().getActivityId():WDDXTAGS.NUMERIC_NULL_VALUE_LONG)); + + designs.put(WDDXTAGS.FIRST_ACTIVITY_UIID, + (design.getFirstActivity()!=null?design.getFirstActivity().getActivityUIID():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); + + designs.put(WDDXTAGS.MAX_ID, + (design.getMaxId()!=null?design.getMaxId():WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER)); + + designs.put(WDDXTAGS.HELP_TEXT, + (design.getHelpText()!=null?design.getHelpText():WDDXTAGS.STRING_NULL_VALUE)); + + designs.put(WDDXTAGS.VERSION, + (design.getVersion()!=null?design.getVersion():WDDXTAGS.STRING_NULL_VALUE)); + + designs.put(WDDXTAGS.LICENCE_ID, + (design.getLicense()!=null?design.getLicense().getLicenseID():WDDXTAGS.NUMERIC_NULL_VALUE_LONG)); + + designs.put(WDDXTAGS.LICENSE_TEXT, + (design.getLicenseText()!=null?design.getLicenseText():WDDXTAGS.STRING_NULL_VALUE)); + return designs; } } Index: lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/test/java/org/lamsfoundation/lams/lesson/dao/Attic/TestLessonDAO.java,v diff -u -r1.10 -r1.11 --- lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java 7 Mar 2005 05:09:03 -0000 1.10 +++ lams_common/test/java/org/lamsfoundation/lams/lesson/dao/TestLessonDAO.java 14 Mar 2005 05:09:10 -0000 1.11 @@ -112,5 +112,4 @@ this.setShouldFlush(false); } } - }