Index: lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java =================================================================== diff -u -r7bf7065d902a3645561f57c779b86721eedc27a5 -r98fd1a25fe48b3eb229c4992f728b0f90f0fa7e0 --- lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 7bf7065d902a3645561f57c779b86721eedc27a5) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/Lesson.java (.../Lesson.java) (revision 98fd1a25fe48b3eb229c4992f728b0f90f0fa7e0) @@ -439,10 +439,12 @@ this.getLessonDescription(), this.lessonStateId, this.organisation!=null?this.organisation.getOrganisationId():null, + this.learningDesign!=null?this.learningDesign.getLearningDesignId():null, this.createDateTime, this.startDateTime); } public LessonDetailsDTO getLessonDetails(){ return new LessonDetailsDTO(this); } + } Index: lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDTO.java =================================================================== diff -u -r7bf7065d902a3645561f57c779b86721eedc27a5 -r98fd1a25fe48b3eb229c4992f728b0f90f0fa7e0 --- lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDTO.java (.../LessonDTO.java) (revision 7bf7065d902a3645561f57c779b86721eedc27a5) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/dto/LessonDTO.java (.../LessonDTO.java) (revision 98fd1a25fe48b3eb229c4992f728b0f90f0fa7e0) @@ -50,6 +50,7 @@ private Integer organisationID; private Date createDateTime; private Date startDateTime; + private Long learningDesignID; //--------------------------------------------------------------------- // Construtors @@ -62,13 +63,15 @@ String lessonDescription, Integer lessonStateId, Integer organisationId, + Long learningDesignId, Date createDateTime, Date startDateTime) { this.lessonID = lessonId; this.lessonName = lessonName; this.lessonDescription = lessonDescription; this.lessonStateID = lessonStateId; + this.learningDesignID = learningDesignId; this.organisationID = organisationId; this.createDateTime = createDateTime; this.startDateTime = startDateTime; @@ -120,6 +123,12 @@ return startDateTime; } + public Integer getOrganisationID() { + return organisationID; + } + public Long getLearningDesignID() { + return learningDesignID; + } /** * Returns the String representation of lesson data transfer object. * @see java.lang.Object#toString() @@ -131,12 +140,10 @@ sb.append("lessonName='" + getLessonName()+"';"); sb.append("lessonDescription='" + getLessonDescription() + "'; "); sb.append("lessonStateID='" + getLessonStateID() + "'; "); + sb.append("learningDesignID='" + getLearningDesignID() + "'; "); sb.append("organisationID='" + getOrganisationID() + "'; "); sb.append("createDateTime='" + getCreateDateTime() + "'; "); sb.append("startDateTime='" + getStartDateTime() + "'; "); return sb.toString(); } - public Integer getOrganisationID() { - return organisationID; - } }