Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml =================================================================== diff -u -r9368af0f3ffe06c0493ca6b167c0767cb4181bf8 -rafbd2486f479295afe9a177d7bd3f9dcb71927a8 --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (.../Activity.hbm.xml) (revision 9368af0f3ffe06c0493ca6b167c0767cb4181bf8) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/learningdesign/Activity.hbm.xml (.../Activity.hbm.xml) (revision afbd2486f479295afe9a177d7bd3f9dcb71927a8) @@ -63,6 +63,11 @@ @hibernate.property column="offline_instructions" length="65535" + + @hibernate.property column="online_instructions" length="65535" + + + @hibernate.property column="run_offline_flag" length="4" not-null="true" @@ -74,8 +79,6 @@ @hibernate.property column="grouping_ui_id" length="11" - - @hibernate.property column="learning_activity_type_id" length="11" @@ -87,6 +90,9 @@ @hibernate.property column="library_activity_ui_image" length="255" + + + Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java =================================================================== diff -u -r0c87ef82b228f2c4e0593ce7884ea252799a114d -rafbd2486f479295afe9a177d7bd3f9dcb71927a8 --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision 0c87ef82b228f2c4e0593ce7884ea252799a114d) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java (.../Activity.java) (revision afbd2486f479295afe9a177d7bd3f9dcb71927a8) @@ -33,6 +33,7 @@ import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.commons.lang.builder.ToStringBuilder; import org.lamsfoundation.lams.learningdesign.dto.MonitoringActivityDTO; +import org.lamsfoundation.lams.learningdesign.dto.ProgressActivityDTO; import org.lamsfoundation.lams.learningdesign.strategy.SimpleActivityStrategy; import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.usermanagement.User; @@ -669,7 +670,6 @@ { return activityStrategy.getNextActivityByParent(this,currentChild); } - } public Integer getActivityCategoryID() { return activityCategoryID; Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java (revision afbd2486f479295afe9a177d7bd3f9dcb71927a8) @@ -0,0 +1,433 @@ +/* + * Created on Mar 15, 2005 + * + * TODO To change the template for this generated file go to + * Window - Preferences - Java - Code Style - Code Templates + */ +package org.lamsfoundation.lams.learningdesign.dto; + +import java.util.Date; +import org.lamsfoundation.lams.learningdesign.GroupingActivity; +import org.lamsfoundation.lams.util.wddx.WDDXTAGS; +/** + * @author Minhas + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class AuthoringActivityDTO { + + /***************************************************************************** + * Attributes + *****************************************************************************/ + + /** identifier field */ + private Long activityId; + + /** FLASH generated value. Unique per LearningDesign. + * Required by flash only.*/ + private Integer activityUIID; + + /** Description of the activity*/ + private String description; + + /** Title of the activity*/ + private String title; + + /** Help text for the activity*/ + private String helpText; + + /** UI specific attribute indicating the + * position of the activity*/ + private Integer xcoord; + + /** UI specific attribute indicating the + * position of the activity*/ + private Integer ycoord; + + /** The activity that acts as a container/parent for + * this activity. Normally would be one of the + * complex activities which have child activities + * defined inside them. */ + private Long parentActivityID; + + /** the activity_ui_id of the parent activity */ + private Integer parentUIID; + + /** The type of activity */ + private Integer activityTypeId; + + /** The Grouping that applies to this activity*/ + private Long groupingID; + + /** The grouping_ui_id of the Grouping that + * applies that to this activity + * */ + private Integer groupingUIID; + + /** Indicates the order in which the activities + * appear inside complex activities. Starts from + * 0, 1 and so on.*/ + private Integer orderID; + + /** Indicates whether the content of this activity + * would be defined later in the monitoring enviornment or not.*/ + private Boolean defineLater; + + /** The LearningDesign to which this activity belongs*/ + private Long learningDesignID; + + /** The LearningLibrary of which this activity is a part*/ + private Long learningLibraryID; + + /** Date this activity was created */ + private Date createDateTime; + + /** Indicates whether this activity is available offline*/ + private Boolean runOffline; + + /** Offline Instruction for this activity*/ + private String offlineInstructions; + + /** Maximum number of activities to be attempted */ + private Integer maxOptions; + + /** Minimum number of activities to be attempted */ + private Integer minOptions; + + /** Instructions for OptionsActivity*/ + private String optionsInstructions; + + /** The tool_id of the activity */ + private Long toolID; + + /** The tool_content_id of the tool */ + private Long toolContentID; + + /** The category of activity */ + private Integer activityCategoryID; + + private Integer gateActivityLevelID; + + private Boolean gateOpen; + + private Date gateStartTimeOffset; + + private Date gateEndTimeOffset; + + private Date gateStartDateTime; + + private Date gateEndDateTime; + + + /** The image that represents the icon of this + * activity in the UI*/ + private String libraryActivityUiImage; + + private Long createGroupingID; + + private Integer createGroupingUIID; + + + /** Single Library can have one or more activities + * defined inside it. This field indicates which + * activity is this.*/ + private Long libraryActivityID; + + /***************************************************************************** + * Constructors + *****************************************************************************/ + public AuthoringActivityDTO(Long activityId, Integer activityUIID, + String description, String title, String helpText, Integer xcoord, + Integer ycoord, Long parentActivityID, Integer parentUIID, + Integer activityTypeId, Long groupingID, Integer groupingUIID, + Integer orderID, Boolean defineLater, Long learningDesignID, + Long learningLibraryID, Date createDateTime, Boolean runOffline, + String offlineInstructions, Integer maxOptions, Integer minOptions, + String optionsInstructions, Long toolID, Long toolContentID, + Integer activityCategoryID, Integer gateActivityLevelID, + Boolean gateOpen, Date gateStartTimeOffset, Date gateEndTimeOffset, + Date gateStartDateTime, Date gateEndDateTime, + String libraryActivityUiImage, Long createGroupingID, + Integer createGroupingUIID, Long libraryActivityID) { + super(); + this.activityId = activityId; + this.activityUIID = activityUIID; + this.description = description; + this.title = title; + this.helpText = helpText; + this.xcoord = xcoord; + this.ycoord = ycoord; + this.parentActivityID = parentActivityID; + this.parentUIID = parentUIID; + this.activityTypeId = activityTypeId; + this.groupingID = groupingID; + this.groupingUIID = groupingUIID; + this.orderID = orderID; + this.defineLater = defineLater; + this.learningDesignID = learningDesignID; + this.learningLibraryID = learningLibraryID; + this.createDateTime = createDateTime; + this.runOffline = runOffline; + this.offlineInstructions = offlineInstructions; + this.maxOptions = maxOptions; + this.minOptions = minOptions; + this.optionsInstructions = optionsInstructions; + this.toolID = toolID; + this.toolContentID = toolContentID; + this.activityCategoryID = activityCategoryID; + this.gateActivityLevelID = gateActivityLevelID; + this.gateOpen = gateOpen; + this.gateStartTimeOffset = gateStartTimeOffset; + this.gateEndTimeOffset = gateEndTimeOffset; + this.gateStartDateTime = gateStartDateTime; + this.gateEndDateTime = gateEndDateTime; + this.libraryActivityUiImage = libraryActivityUiImage; + this.createGroupingID = createGroupingID; + this.createGroupingUIID = createGroupingUIID; + this.libraryActivityID = libraryActivityID; + } + public AuthoringActivityDTO(Object activity){ + + } + + /***************************************************************************** + * Getters + *****************************************************************************/ + + /** + * @return Returns the activityCategoryID. + */ + public Integer getActivityCategoryID() { + return activityCategoryID!=null?activityCategoryID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the activityId. + */ + public Long getActivityId() { + return activityId!=null?activityId:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the activityTypeId. + */ + public Integer getActivityTypeId() { + return activityTypeId!=null?activityTypeId:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the activityUIID. + */ + public Integer getActivityUIID() { + return activityUIID!=null?activityUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the createDateTime. + */ + public Date getCreateDateTime() { + return createDateTime!=null?createDateTime:WDDXTAGS.DATE_NULL_VALUE; + } + /** + * @return Returns the createGroupingID. + */ + public Long getCreateGroupingID() { + return createGroupingID!=null?createGroupingID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the createGroupingUIID. + */ + public Integer getCreateGroupingUIID() { + return createGroupingUIID!=null?createGroupingUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the defineLater. + */ + public Boolean getDefineLater() { + return defineLater!=null?defineLater:WDDXTAGS.BOOLEAN_NULL_VALUE; + } + /** + * @return Returns the description. + */ + public String getDescription() { + return description!=null?description:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the gateActivityLevelID. + */ + public Integer getGateActivityLevelID() { + return gateActivityLevelID!=null?gateActivityLevelID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the gateEndDateTime. + */ + public Date getGateEndDateTime() { + return gateEndDateTime!=null?gateEndDateTime:WDDXTAGS.DATE_NULL_VALUE; + } + /** + * @return Returns the gateEndTimeOffset. + */ + public Date getGateEndTimeOffset() { + return gateEndTimeOffset!=null?gateEndTimeOffset:WDDXTAGS.DATE_NULL_VALUE; + } + /** + * @return Returns the gateOpen. + */ + public Boolean getGateOpen() { + return gateOpen!=null?gateOpen:WDDXTAGS.BOOLEAN_NULL_VALUE; + } + /** + * @return Returns the gateStartDateTime. + */ + public Date getGateStartDateTime() { + return gateStartDateTime!=null?gateStartTimeOffset:WDDXTAGS.DATE_NULL_VALUE; + } + /** + * @return Returns the gateStartTimeOffset. + */ + public Date getGateStartTimeOffset() { + return gateStartTimeOffset!=null?gateStartTimeOffset:WDDXTAGS.DATE_NULL_VALUE; + } + /** + * @return Returns the groupingID. + */ + public Long getGroupingID() { + return groupingID!=null?groupingID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the groupingUIID. + */ + public Integer getGroupingUIID() { + return groupingUIID!=null?groupingUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the helpText. + */ + public String getHelpText() { + return helpText!=null?helpText:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the learningDesignID. + */ + public Long getLearningDesignID() { + return learningDesignID!=null?learningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the learningLibraryID. + */ + public Long getLearningLibraryID() { + return learningLibraryID!=null?libraryActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the libraryActivityID. + */ + public Long getLibraryActivityID() { + return libraryActivityID!=null?libraryActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the libraryActivityUiImage. + */ + public String getLibraryActivityUiImage() { + return libraryActivityUiImage!=null?libraryActivityUiImage:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the maxOptions. + */ + public Integer getMaxOptions() { + return maxOptions!=null?maxOptions:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the minOptions. + */ + public Integer getMinOptions() { + return minOptions!=null?minOptions:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the offlineInstructions. + */ + public String getOfflineInstructions() { + return offlineInstructions!=null?offlineInstructions:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the optionsInstructions. + */ + public String getOptionsInstructions() { + return optionsInstructions!=null?optionsInstructions:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the orderID. + */ + public Integer getOrderID() { + return orderID!=null?orderID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the parentActivityID. + */ + public Long getParentActivityID() { + return parentActivityID!=null?parentActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the parentUIID. + */ + public Integer getParentUIID() { + return parentUIID!=null?parentUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the runOffline. + */ + public Boolean getRunOffline() { + return runOffline!=null?runOffline:WDDXTAGS.BOOLEAN_NULL_VALUE; + } + /** + * @return Returns the title. + */ + public String getTitle() { + return title!=null?title:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the toolContentID. + */ + public Long getToolContentID() { + return toolContentID!=null?toolContentID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the toolID. + */ + public Long getToolID() { + return toolID!=null?toolID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the xcoord. + */ + public Integer getXcoord() { + return xcoord!=null?xcoord:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the ycoord. + */ + public Integer getYcoord() { + return ycoord!=null?ycoord:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /***************************************************************************** + * Utility Methods + **************************************************************************/ + + private void processActivityType(Object activity){ + String className = activity.getClass().getName(); + if(activity instanceof GroupingActivity) + buildGroupingActivityObject(activity); + /* else if(activity instanceof ToolActivity) + //buildToolActivity(activities,(ToolActivity)activity); + else if(activity instanceof GateActivity) + //buildGateActivityObject(activities,activity); + else + buildComplexActivityObject(activities,activity);*/ + } + private void buildGroupingActivityObject(Object activity){ + + GroupingActivity groupingActivity = (GroupingActivity)activity; + this.createGroupingID = groupingActivity.getCreateGrouping()!=null? + groupingActivity.getCreateGrouping().getGroupingId(): + WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + this.createGroupingUIID = groupingActivity.getCreateGrouping()!=null? + groupingActivity.getCreateGrouping().getGroupingUIID(): + WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } +} Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java (revision afbd2486f479295afe9a177d7bd3f9dcb71927a8) @@ -0,0 +1,310 @@ +/* + * Created on Mar 15, 2005 + * + * TODO To change the template for this generated file go to + * Window - Preferences - Java - Code Style - Code Templates + */ +package org.lamsfoundation.lams.learningdesign.dto; + +import java.util.Date; + +import org.lamsfoundation.lams.learningdesign.LearningDesign; +import org.lamsfoundation.lams.util.wddx.WDDXTAGS; + +/** + * @author Minhas + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class LearningDesignDTO { + + private Long learningDesignId; + private Integer learningDesignUIID; + private String description; + private String title; + private Long firstActivityID; + private Integer maxID; + private Boolean validDesign; + private Boolean readOnly; + private Date dateReadOnly; + private Integer userID; + private String helpText; + private Integer copyTypeID; + private Date createDateTime; + private String version; + private Long parentLearningDesignID; + private Integer workspaceFolderID; + private Long duration; + private String licenseText; + private Long licenseID; + private Long lessonOrgID; + private String lessonOrgName; + private Long lessonID; + private String lessonName; + private Date lessonStartDateTime; + private Date lastModifiedDateTime; + + /** + * @param learningDesignId + * @param learningDesignUIID + * @param description + * @param title + * @param firstActivityID + * @param maxID + * @param validDesign + * @param readOnly + * @param dateReadOnly + * @param userID + * @param helpText + * @param copyTypeID + * @param createDateTime + * @param version + * @param parentLearningDesignID + * @param workspaceFolderID + * @param duration + * @param licenseText + * @param licenseID + * @param lessonOrgID + * @param lessonOrgName + * @param lessonID + * @param lessonName + * @param lessonStartDateTime + * @param lastModifiedDateTime + */ + public LearningDesignDTO(Long learningDesignId, Integer learningDesignUIID, + String description, String title, Long firstActivityID, + Integer maxId, Boolean validDesign, Boolean readOnly, + Date dateReadOnly, Integer userID, String helpText, + Integer copyTypeID, Date createDateTime, String version, + Long parentLearningDesignID, Integer workspaceFolderID, + Long duration, String licenseText, Long licenseID, + Long lessonOrgID, String lessonOrgName, Long lessonID, + String lessonName, Date lessonStartDateTime, + Date lastModifiedDateTime) { + super(); + this.learningDesignId = learningDesignId; + this.learningDesignUIID = learningDesignUIID; + this.description = description; + this.title = title; + this.firstActivityID = firstActivityID; + this.maxID = maxId; + this.validDesign = validDesign; + this.readOnly = readOnly; + this.dateReadOnly = dateReadOnly; + this.userID = userID; + this.helpText = helpText; + this.copyTypeID = copyTypeID; + this.createDateTime = createDateTime; + this.version = version; + this.parentLearningDesignID = parentLearningDesignID; + this.workspaceFolderID = workspaceFolderID; + this.duration = duration; + this.licenseText = licenseText; + this.licenseID = licenseID; + this.lessonOrgID = lessonOrgID; + this.lessonOrgName = lessonOrgName; + this.lessonID = lessonID; + this.lessonName = lessonName; + this.lessonStartDateTime = lessonStartDateTime; + this.lastModifiedDateTime = lastModifiedDateTime; + } + public LearningDesignDTO(){ + + } + public LearningDesignDTO(LearningDesign learningDesign){ + this.learningDesignId = learningDesign.getLearningDesignId(); + this.learningDesignUIID = learningDesign.getLearningDesignUIID(); + this.description = learningDesign.getDescription(); + this.title = learningDesign.getTitle(); + this.firstActivityID = learningDesign.getFirstActivity()!=null? + learningDesign.getFirstActivity().getActivityId(): + WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + this.maxID = learningDesign.getMaxId(); + this.validDesign = learningDesign.getValidDesign(); + this.readOnly = learningDesign.getReadOnly(); + this.dateReadOnly = learningDesign.getDateReadOnly(); + + this.userID = learningDesign.getUser()!=null? + learningDesign.getUser().getUserId(): + WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + + this.helpText = learningDesign.getHelpText(); + this.copyTypeID = learningDesign.getCopyTypeID(); + this.createDateTime = learningDesign.getCreateDateTime(); + this.version = learningDesign.getVersion(); + + this.parentLearningDesignID = learningDesign.getParentLearningDesign()!=null? + learningDesign.getParentLearningDesign().getLearningDesignId(): + WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + + this.workspaceFolderID = learningDesign.getWorkspaceFolder()!=null? + learningDesign.getWorkspaceFolder().getWorkspaceFolderId(): + WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + + this.duration = learningDesign.getDuration(); + this.licenseText = learningDesign.getLicenseText(); + + this.licenseID = learningDesign.getLicense()!=null? + learningDesign.getLicense().getLicenseID(): + WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + + this.lessonOrgID = learningDesign.getLessonOrgID(); + + this.lessonOrgName = learningDesign.getLessonOrgName(); + this.lessonID = learningDesign.getLessonID(); + this.lessonName = learningDesign.getLessonName(); + this.lessonStartDateTime = learningDesign.getLessonStartDateTime(); + this.lastModifiedDateTime = learningDesign.getLastModifiedDateTime(); + } + /** + * @return Returns the copyTypeID. + */ + public Integer getCopyTypeID() { + return copyTypeID!=null?copyTypeID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the createDateTime. + */ + public Date getCreateDateTime() { + return createDateTime!=null?createDateTime:WDDXTAGS.DATE_NULL_VALUE; + } + /** + * @return Returns the dateReadOnly. + */ + public Date getDateReadOnly() { + return dateReadOnly!=null?dateReadOnly:WDDXTAGS.DATE_NULL_VALUE; + } + /** + * @return Returns the description. + */ + public String getDescription() { + return description!=null?description:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the duration. + */ + public Long getDuration() { + return duration!=null?duration:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the firstActivityID. + */ + public Long getFirstActivityID() { + return firstActivityID!=null?firstActivityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the helpText. + */ + public String getHelpText() { + return helpText!=null?helpText:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the lastModifiedDateTime. + */ + public Date getLastModifiedDateTime() { + return lastModifiedDateTime!=null?lastModifiedDateTime:WDDXTAGS.DATE_NULL_VALUE; + } + /** + * @return Returns the learningDesignId. + */ + public Long getLearningDesignId() { + return learningDesignId!=null?learningDesignId:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the learningDesignUIID. + */ + public Integer getLearningDesignUIID() { + return learningDesignUIID!=null?learningDesignUIID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the lessonID. + */ + public Long getLessonID() { + return lessonID!=null?lessonID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the lessonName. + */ + public String getLessonName() { + return lessonName!=null?lessonName:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the lessonOrgID. + */ + public Long getLessonOrgID() { + return lessonOrgID!=null?lessonOrgID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the lessonOrgName. + */ + public String getLessonOrgName() { + return lessonOrgName!=null?lessonOrgName:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the lessonStartDateTime. + */ + public Date getLessonStartDateTime() { + return lessonStartDateTime!=null?lessonStartDateTime:WDDXTAGS.DATE_NULL_VALUE; + } + /** + * @return Returns the licenseID. + */ + public Long getLicenseID() { + return licenseID!=null?licenseID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the licenseText. + */ + public String getLicenseText() { + return licenseText!=null?licenseText:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the maxID. + */ + public Integer getMaxID() { + return maxID!=null?maxID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the parentLearningDesignID. + */ + public Long getParentLearningDesignID() { + return parentLearningDesignID!=null?parentLearningDesignID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the readOnly. + */ + public Boolean getReadOnly() { + return readOnly!=null?readOnly:WDDXTAGS.BOOLEAN_NULL_VALUE; + } + /** + * @return Returns the title. + */ + public String getTitle() { + return title!=null?title:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the userID. + */ + public Integer getUserID() { + return userID!=null?userID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the validDesign. + */ + public Boolean getValidDesign() { + return validDesign!=null?validDesign:WDDXTAGS.BOOLEAN_NULL_VALUE; + } + /** + * @return Returns the version. + */ + public String getVersion() { + return version!=null?version:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the workspaceFolderID. + */ + public Integer getWorkspaceFolderID() { + return workspaceFolderID!=null?workspaceFolderID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } +} Index: lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java =================================================================== diff -u --- lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java (revision 0) +++ lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java (revision afbd2486f479295afe9a177d7bd3f9dcb71927a8) @@ -0,0 +1,79 @@ +/* + * Created on Mar 15, 2005 + * + * TODO To change the template for this generated file go to + * Window - Preferences - Java - Code Style - Code Templates + */ +package org.lamsfoundation.lams.learningdesign.dto; + +import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.util.wddx.WDDXTAGS; + +/** + * @author Minhas + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ +public class MonitoringActivityDTO { + + private String title; + private String description; + private Long activityID; + private Integer activityTypeID; + private Integer contributionTypeID[]; + private Integer orderID; + + public MonitoringActivityDTO(Activity activity){ + this.title = activity.getTitle(); + this.description = activity.getDescription(); + this.activityID = activity.getActivityId(); + this.activityTypeID = activity.getActivityTypeId(); + this.contributionTypeID = new Integer[1]; + this.orderID = activity.getOrderId(); + } + public MonitoringActivityDTO(Activity activity,Integer[] contributionTypeID){ + this.title = activity.getTitle(); + this.description = activity.getDescription(); + this.activityID = activity.getActivityId(); + this.activityTypeID = activity.getActivityTypeId(); + this.contributionTypeID = contributionTypeID; + this.orderID = activity.getOrderId(); + } + /** + * @return Returns the activityID. + */ + public Long getActivityID() { + return activityID!=null?activityID:WDDXTAGS.NUMERIC_NULL_VALUE_LONG; + } + /** + * @return Returns the activityTypeID. + */ + public Integer getActivityTypeID() { + return activityTypeID!=null?activityTypeID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the contributionTypeID. + */ + public Integer[] getContributionTypeID() { + return contributionTypeID!=null?contributionTypeID:new Integer[1]; + } + /** + * @return Returns the description. + */ + public String getDescription() { + return description!=null?description:WDDXTAGS.STRING_NULL_VALUE; + } + /** + * @return Returns the orderID. + */ + public Integer getOrderID() { + return orderID!=null?orderID:WDDXTAGS.NUMERIC_NULL_VALUE_INTEGER; + } + /** + * @return Returns the title. + */ + public String getTitle() { + return title!=null?title:WDDXTAGS.STRING_NULL_VALUE; + } +}