Index: lams_learning/conf/language/lams/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources.properties,v diff -u -r1.41 -r1.42 --- lams_learning/conf/language/lams/ApplicationResources.properties 17 Mar 2010 13:37:58 -0000 1.41 +++ lams_learning/conf/language/lams/ApplicationResources.properties 14 Apr 2010 12:19:36 -0000 1.42 @@ -6,7 +6,7 @@ #=================== labels for Learner (Java) =================# -message.lesson.finishedCont =You have now completed the {0} lesson. You can return at anytime to this lesson and revisit and review activities by double clicking on the blue icons in the left hand progress bar. You can now close this window. +message.lesson.finishedCont =You have now completed the {0} lesson (completion date: {1}). You can return at anytime to this lesson and revisit and review activities by double clicking on the blue icons in the left hand progress bar. You can now close this window. label.print =Print learner.title =LAMS Learner error.system.learner =An internal error has occured and this function cannot be completed. If reporting this error, please report:
{0} Index: lams_learning/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.40 -r1.41 --- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties 17 Mar 2010 13:37:58 -0000 1.40 +++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties 14 Apr 2010 12:19:36 -0000 1.41 @@ -6,7 +6,7 @@ #=================== labels for Learner (Java) =================# -message.lesson.finishedCont =You have now completed the {0} lesson. You can return at anytime to this lesson and revisit and review activities by double clicking on the blue icons in the left hand progress bar. You can now close this window. +message.lesson.finishedCont =You have now completed the {0} lesson (completion date: {1}). You can return at anytime to this lesson and revisit and review activities by double clicking on the blue icons in the left hand progress bar. You can now close this window. label.print =Print learner.title =LAMS Learner error.system.learner =An internal error has occured and this function cannot be completed. If reporting this error, please report:
{0} Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java,v diff -u -r1.4 -r1.5 --- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java 17 Mar 2010 13:37:58 -0000 1.4 +++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java 14 Apr 2010 12:19:36 -0000 1.5 @@ -50,23 +50,14 @@ */ public class LessonCompleteActivityAction extends ActivityAction { - // --------------------------------------------------------------------- - // Class level constants - session attributes - // --------------------------------------------------------------------- - public static final String PARAM_LESSON_NAME = "lessonName"; - /** * Gets an activity from the request (attribute) and forwards onto a display action using the ActionMappings class. * If no activity is in request then use the current activity in learnerProgress. */ public ActionForward execute(ActionMapping mapping, ActionForm actionForm, HttpServletRequest request, HttpServletResponse response) { - ActivityForm activityForm = (ActivityForm) actionForm; - LearningWebUtil.setupProgressInRequest(activityForm, request, LearningWebUtil.getLearnerProgress(request, + LearningWebUtil.setupProgressInRequest((ActivityForm) actionForm, request, LearningWebUtil.getLearnerProgress(request, getLearnerService())); - Long lessonID = activityForm.getLessonID(); - String lessonName = getLearnerService().getLesson(lessonID).getLessonName(); - request.setAttribute(LessonCompleteActivityAction.PARAM_LESSON_NAME, lessonName); return mapping.findForward("lessonComplete"); } } \ No newline at end of file Index: lams_learning/web/lessonComplete.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_learning/web/lessonComplete.jsp,v diff -u -r1.17 -r1.18 --- lams_learning/web/lessonComplete.jsp 17 Mar 2010 13:37:58 -0000 1.17 +++ lams_learning/web/lessonComplete.jsp 14 Apr 2010 12:19:36 -0000 1.18 @@ -45,8 +45,11 @@

- ${lessonName} + ${learnerprogress.lesson.lessonName} + + +