Index: lams_learning/conf/language/lams/ApplicationResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/conf/language/lams/ApplicationResources.properties,v
diff -u -r1.38.4.2.4.3 -r1.38.4.2.4.4
--- lams_learning/conf/language/lams/ApplicationResources.properties 17 Mar 2010 13:48:58 -0000 1.38.4.2.4.3
+++ lams_learning/conf/language/lams/ApplicationResources.properties 11 Apr 2010 08:57:45 -0000 1.38.4.2.4.4
@@ -84,7 +84,7 @@
message.activity.set.options.note =Note: Once you finish any of the above sequences you can revisit them by using the progress bar.
message.activity.set.options.note.maximum =Note: The maximum number of sequences you may attempt is {0}. You can revisit started or finished sequences by using the progress bar.
message.lesson.finished =Congratulations, {0}, you have finished.
-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.
message.progress.broken =An error has occurred and you cannot continue without LAMS recalculating your current activity. A staff member may be editing the lesson.
message.progress.broken.try.resume =Please select "Resume" or close and reopen this window to continue. If this error re-occurs, wait a few minutes and then try again.
message.window.closing =Please close this window.
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.37.4.2.4.3 -r1.37.4.2.4.4
--- lams_learning/conf/language/lams/ApplicationResources_en_AU.properties 17 Mar 2010 13:48:58 -0000 1.37.4.2.4.3
+++ lams_learning/conf/language/lams/ApplicationResources_en_AU.properties 11 Apr 2010 08:57:45 -0000 1.37.4.2.4.4
@@ -84,7 +84,7 @@
message.activity.set.options.note =Note: Once you finish any of the above sequences you can revisit them by using the progress bar.
message.activity.set.options.note.maximum =Note: The maximum number of sequences you may attempt is {0}. You can revisit started or finished sequences by using the progress bar.
message.lesson.finished =Congratulations, {0}, you have finished.
-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.
message.progress.broken =An error has occurred and you cannot continue without LAMS recalculating your current activity. A staff member may be editing the lesson.
message.progress.broken.try.resume =Please select "Resume" or close and reopen this window to continue. If this error re-occurs, wait a few minutes and then try again.
message.window.closing =Please close this window.
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.3.10.1 -r1.3.10.2
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java 17 Mar 2010 13:48:57 -0000 1.3.10.1
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LessonCompleteActivityAction.java 11 Apr 2010 08:57:45 -0000 1.3.10.2
@@ -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.16.10.1 -r1.16.10.2
--- lams_learning/web/lessonComplete.jsp 17 Mar 2010 13:48:57 -0000 1.16.10.1
+++ lams_learning/web/lessonComplete.jsp 11 Apr 2010 08:57:45 -0000 1.16.10.2
@@ -45,8 +45,11 @@
- ${lessonName}
+ ${learnerprogress.lesson.lessonName}
+
+
+