Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -re78d88c29d12e8c3ee7a94014cccfadc5f8e64da -r3e839d147e5cb7e2afe7e39acc4b5e4ca928fc6b
--- lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision e78d88c29d12e8c3ee7a94014cccfadc5f8e64da)
+++ lams_learning/conf/language/lams/ApplicationResources.properties (.../ApplicationResources.properties) (revision 3e839d147e5cb7e2afe7e39acc4b5e4ca928fc6b)
@@ -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
===================================================================
diff -u -re78d88c29d12e8c3ee7a94014cccfadc5f8e64da -r3e839d147e5cb7e2afe7e39acc4b5e4ca928fc6b
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision e78d88c29d12e8c3ee7a94014cccfadc5f8e64da)
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 3e839d147e5cb7e2afe7e39acc4b5e4ca928fc6b)
@@ -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
===================================================================
diff -u -re78d88c29d12e8c3ee7a94014cccfadc5f8e64da -r3e839d147e5cb7e2afe7e39acc4b5e4ca928fc6b
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java (.../LessonCompleteActivityAction.java) (revision e78d88c29d12e8c3ee7a94014cccfadc5f8e64da)
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java (.../LessonCompleteActivityAction.java) (revision 3e839d147e5cb7e2afe7e39acc4b5e4ca928fc6b)
@@ -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
===================================================================
diff -u -re78d88c29d12e8c3ee7a94014cccfadc5f8e64da -r3e839d147e5cb7e2afe7e39acc4b5e4ca928fc6b
--- lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision e78d88c29d12e8c3ee7a94014cccfadc5f8e64da)
+++ lams_learning/web/lessonComplete.jsp (.../lessonComplete.jsp) (revision 3e839d147e5cb7e2afe7e39acc4b5e4ca928fc6b)
@@ -45,8 +45,11 @@