Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java,v diff -u -r1.18 -r1.19 --- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java 3 Apr 2006 23:36:53 -0000 1.18 +++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java 21 Apr 2006 02:01:28 -0000 1.19 @@ -22,34 +22,29 @@ /* $$Id$$ */ package org.lamsfoundation.lams.lesson; -import org.lamsfoundation.lams.learningdesign.LearningDesign; -import org.lamsfoundation.lams.lesson.dto.LessonDTO; -import org.lamsfoundation.lams.lesson.dto.LessonDetailsDTO; -import org.lamsfoundation.lams.usermanagement.Organisation; -import org.lamsfoundation.lams.usermanagement.User; import java.io.Serializable; - import java.util.Date; import java.util.HashSet; - import java.util.Set; + 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.learningdesign.LearningDesign; +import org.lamsfoundation.lams.lesson.dto.LessonDTO; +import org.lamsfoundation.lams.lesson.dto.LessonDetailsDTO; +import org.lamsfoundation.lams.usermanagement.Organisation; +import org.lamsfoundation.lams.usermanagement.User; /** * A Lesson is a learning sequence that is assocated with * a number of users for use in learning. A lesson needs a run time copy of * learning design to interact with. - * - * - * Hibernate definition: - * - * @hibernate.class table="tool_lasr10_survey_session" - * */ public class Lesson implements Serializable { - //--------------------------------------------------------------------- + private static final long serialVersionUID = 5733920851084229175L; + + //--------------------------------------------------------------------- // Class level constants //--------------------------------------------------------------------- /** The state for newly created lesson. The learning design has been copied. @@ -72,7 +67,7 @@ * but no longer visible to the learners. */ public static final Integer ARCHIVED_STATE = new Integer(6); /** The state for lesssons that are removed and never can be accessed again */ - public static final Integer DISABLED_STATE = new Integer(7); + public static final Integer REMOVED_STATE = new Integer(7); //--------------------------------------------------------------------- // attributes @@ -442,7 +437,9 @@ return new LessonDTO(this.lessonId, this.getLessonName(), this.getLessonDescription(), - this.lessonStateId); + this.lessonStateId, + this.createDateTime, + this.startDateTime); } public LessonDetailsDTO getLessonDetails(){ return new LessonDetailsDTO(this); Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDTO.java,v diff -u -r1.8 -r1.9 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDTO.java 3 Apr 2006 23:36:56 -0000 1.8 +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDTO.java 21 Apr 2006 02:01:28 -0000 1.9 @@ -22,7 +22,9 @@ /* $$Id$$ */ package org.lamsfoundation.lams.lesson.dto; +import java.util.Date; + /** *

This is a cut down version of Lesson domain object. This data transfer object * is design for the data interaction between flash and java. As the flash and @@ -45,6 +47,8 @@ private String lessonName; private String lessonDescription; private Integer lessonStateID; + private Date createDateTime; + private Date startDateTime; //--------------------------------------------------------------------- // Construtors @@ -55,12 +59,16 @@ public LessonDTO(Long lessonId, String lessonName, String lessonDescription, - Integer lessonStateId) + Integer lessonStateId, + Date createDateTime, + Date startDateTime) { this.lessonID = lessonId; this.lessonName = lessonName; this.lessonDescription = lessonDescription; this.lessonStateID = lessonStateId; + this.createDateTime = createDateTime; + this.startDateTime = startDateTime; } //--------------------------------------------------------------------- @@ -101,6 +109,13 @@ { return lessonStateID; } + + public Date getCreateDateTime() { + return createDateTime; + } + public Date getStartDateTime() { + return startDateTime; + } /** * Returns the String representation of lesson data transfer object. @@ -113,6 +128,8 @@ sb.append("lessonName='" + getLessonName()+"';"); sb.append("lessonDescription='" + getLessonDescription() + "'; "); sb.append("lessonStateID='" + getLessonStateID() + "'; "); + sb.append("createDateTime='" + getCreateDateTime() + "'; "); + sb.append("startDateTime='" + getStartDateTime() + "'; "); return sb.toString(); } }