Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r309a597eada52a4079f2985e0d97beedf9adda42 -rccff89f320766710d4f6e333564ed838d76ca23d Binary files differ Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java =================================================================== diff -u -re76fd654d97033acef2c7bbe4c0def48e37f79f3 -rccff89f320766710d4f6e333564ed838d76ca23d --- lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java (.../ILessonService.java) (revision e76fd654d97033acef2c7bbe4c0def48e37f79f3) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/ILessonService.java (.../ILessonService.java) (revision ccff89f320766710d4f6e333564ed838d76ca23d) @@ -33,6 +33,7 @@ import org.lamsfoundation.lams.learningdesign.Group; import org.lamsfoundation.lams.learningdesign.Grouping; import org.lamsfoundation.lams.learningdesign.GroupingActivity; +import org.lamsfoundation.lams.lesson.LearnerProgress; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.lesson.dto.LessonDTO; import org.lamsfoundation.lams.lesson.dto.LessonDetailsDTO; @@ -267,4 +268,14 @@ * @return map of lesson beans used in the index page */ public Map getLessonsByOrgAndUserWithCompletedFlag(Integer userId, Integer orgId, boolean isStaff); + + /** + * Gets the learner's progress details for a particular lesson. Will return null if the user + * has not started the lesson. + * + * @param learnerId user's id + * @param lessonId lesson's id + * @return learner's progress or null + */ + public LearnerProgress getUserProgressForLesson(Integer learnerId, Long lessonId); } \ No newline at end of file Index: lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java =================================================================== diff -u -re76fd654d97033acef2c7bbe4c0def48e37f79f3 -rccff89f320766710d4f6e333564ed838d76ca23d --- lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision e76fd654d97033acef2c7bbe4c0def48e37f79f3) +++ lams_common/src/java/org/lamsfoundation/lams/lesson/service/LessonService.java (.../LessonService.java) (revision ccff89f320766710d4f6e333564ed838d76ca23d) @@ -661,4 +661,17 @@ } return map; } + + + /** + * Gets the learner's progress details for a particular lesson. Will return null if the user + * has not started the lesson. + * + * @param learnerId user's id + * @param lessonId lesson's id + * @return learner's progress or null + */ + public LearnerProgress getUserProgressForLesson(Integer learnerId, Long lessonId) { + return learnerProgressDAO.getLearnerProgressByLearner(learnerId,lessonId); + } }