Index: lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java =================================================================== diff -u -r1ee503e3d0e0228ea8a45025fddf15d9623c0377 -rb4b4d802a11bccab9ca9de7a0a91097b333c21f4 --- lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java (.../LessonClass.java) (revision 1ee503e3d0e0228ea8a45025fddf15d9623c0377) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/LessonClass.java (.../LessonClass.java) (revision b4b4d802a11bccab9ca9de7a0a91097b333c21f4) @@ -41,6 +41,7 @@ import org.lamsfoundation.lams.learningdesign.Grouping; import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.User; +import org.lamsfoundation.lams.usermanagement.service.UserManagementService; /** * A type of Grouping that represents all the Learners in a Lesson. The @@ -60,9 +61,6 @@ @JoinColumn(name = "staff_group_id") private Group staffGroup; - @OneToOne(fetch = FetchType.LAZY, mappedBy = "lessonClass") - private Lesson lesson; - /** Creates a new instance of LessonClass */ public LessonClass() { } @@ -72,7 +70,6 @@ //don't think lesson class need perform doGrouping. set grouper to null. super(groupingId, groups, activities, null); this.staffGroup = staffGroup; - this.lesson = lesson; } public Group getStaffGroup() { @@ -83,14 +80,6 @@ this.staffGroup = staffGroup; } - public Lesson getLesson() { - return lesson; - } - - public void setLesson(Lesson lesson) { - this.lesson = lesson; - } - /** * @see org.lamsfoundation.lams.learningdesign.Grouping#isLearnerGroup(org.lamsfoundation.lams.learningdesign.Group) * Returns false if group is null @@ -113,7 +102,6 @@ public Grouping createCopy(int uiidOffset) { LessonClass lessonClass = new LessonClass(); lessonClass.staffGroup = this.staffGroup; - lessonClass.lesson = this.lesson; return lessonClass; } @@ -302,4 +290,9 @@ return staffGroup; } + private Lesson getLesson() { + return (Lesson) UserManagementService.getInstance() + .findByProperty(Lesson.class, "lessonClass.groupingId", getGroupingId()).get(0); + } + } \ No newline at end of file Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -r2188972474f8d186d6811e3dea2e4136be669335 -rb4b4d802a11bccab9ca9de7a0a91097b333c21f4 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision 2188972474f8d186d6811e3dea2e4136be669335) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision b4b4d802a11bccab9ca9de7a0a91097b333c21f4) @@ -491,7 +491,6 @@ LessonClass newLessonClass = this.createLessonClass(organisation, learnerGroupName, organizationUsers, staffGroupName, staffs, newLesson); - newLessonClass.setLesson(newLesson); newLesson.setLessonClass(newLessonClass); lessonDAO.updateLesson(newLesson);