Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java,v
diff -u -r1.22 -r1.23
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	18 Jun 2006 13:06:54 -0000	1.22
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java	19 Jun 2006 03:34:58 -0000	1.23
@@ -59,11 +59,12 @@
 		return learnerService;
 	}
 	
+	/** Setup the progress string and the lesson id in the actionForm */
 	public ActionForward setupProgressString(ActionForm actionForm, HttpServletRequest request)  {
 		
 		LearnerProgress learnerProgress = LearningWebUtil.getLearnerProgress(request,getLearnerService());		
 
-		ActivityForm activityForm = (ActivityForm) actionForm;
+		ActivityForm activityForm = (ActivityForm) actionForm; 
 		
 		// Calculate the progress summary. On join this method gets called twice, and we
 		// only want to calculate once
@@ -73,6 +74,11 @@
 			activityForm.setProgressSummary(progressSummary);
 		} 
 		
+		Lesson currentLesson = learnerProgress.getLesson();
+		if(currentLesson != null){
+			activityForm.setLessonID(currentLesson.getLessonId());
+		}
+		
 		if(log.isDebugEnabled())
 		    log.debug("Entering activity: progress summary is "+activityForm.getProgressSummary());
 		
@@ -127,11 +133,6 @@
 				progressSummary.append(currentActivity.getActivityId());
 			}
 			
-			progressSummary.append("&lessonID=");
-			Lesson currentLesson = learnerProgress.getLesson();
-			if(currentLesson != null){
-				progressSummary.append(currentLesson.getLessonId());
-			}
 		}
 		return progressSummary.toString();
 	}
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java,v
diff -u -r1.9 -r1.10
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	18 Jun 2006 13:06:54 -0000	1.9
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java	19 Jun 2006 03:34:58 -0000	1.10
@@ -83,7 +83,7 @@
 
 		OptionsActivity optionsActivity = (OptionsActivity)activity;
 
-		form.setActivityId(activity.getActivityId());
+		form.setActivityID(activity.getActivityId());
 
 		List<ActivityURL> activityURLs = new ArrayList<ActivityURL>();
 		Set subActivities = optionsActivity.getActivities();
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java,v
diff -u -r1.8 -r1.9
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java	11 Jun 2006 02:48:34 -0000	1.8
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java	19 Jun 2006 03:34:58 -0000	1.9
@@ -80,7 +80,7 @@
 
 		ParallelActivity parallelActivity = (ParallelActivity)activity;
 
-		form.setActivityId(activity.getActivityId());
+		form.setActivityID(activity.getActivityId());
 
 		List activityURLs = new ArrayList();
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java,v
diff -u -r1.10 -r1.11
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java	18 Jun 2006 13:06:54 -0000	1.10
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java	19 Jun 2006 03:34:58 -0000	1.11
@@ -78,7 +78,7 @@
 		LearnerProgress learnerProgress = LearningWebUtil.getLearnerProgress(request,learnerService);
 		Activity activity = LearningWebUtil.getActivityFromRequest(request, learnerService);
 				
-		form.setActivityId(activity.getActivityId());
+		form.setActivityID(activity.getActivityId());
 		
 		if (activity.isToolActivity() || activity.isSystemToolActivity() ) {
 
Index: lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java,v
diff -u -r1.7 -r1.8
--- lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java	2 May 2006 05:27:52 -0000	1.7
+++ lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java	19 Jun 2006 03:34:57 -0000	1.8
@@ -45,14 +45,17 @@
 	 * LearnerProgress (or Learner) and Activity. Note that the activity may already
 	 * be complete.
 	 */
-	private Long activityId;
+	private Long activityID;
 		
 	/** List of ActivityURL, will only contain one if a simple activity */
 	private List activityURLs;
 	
 	/** Progress summary suitable for Flash. In the form attempted=13_14&completed=10_11&current=12.*/
 	private String progressSummary;
 
+	/** Lesson to which this activity belongs. Id comes from the learner progress */
+	private Long lessonID;
+	
 	/** 
 	 * Method reset
 	 * @param mapping
@@ -68,11 +71,11 @@
 	public void setActivityURLs(List activityURLs) {
 		this.activityURLs = activityURLs;
 	}
-	public Long getActivityId() {
-		return activityId;
+	public Long getActivityID() {
+		return activityID;
 	}
-	public void setActivityId(Long activityId) {
-		this.activityId = activityId;
+	public void setActivityID(Long activityID) {
+		this.activityID = activityID;
 	}
 	
 	public void addActivityURL(ActivityURL activityUrl)
@@ -89,4 +92,12 @@
 	public void setProgressSummary(String progressSummary) {
 		this.progressSummary = progressSummary;
 	}
+
+	public Long getLessonID() {
+		return lessonID;
+	}
+
+	public void setLessonID(Long lessonID) {
+		this.lessonID = lessonID;
+	}
 }
\ No newline at end of file
Index: lams_learning/web/optionsActivity.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_learning/web/optionsActivity.jsp,v
diff -u -r1.12 -r1.13
--- lams_learning/web/optionsActivity.jsp	14 Jun 2006 23:13:31 -0000	1.12
+++ lams_learning/web/optionsActivity.jsp	19 Jun 2006 03:34:58 -0000	1.13
@@ -160,7 +160,7 @@
 	</html:form>
 	<html:form action="/CompleteActivity" method="POST">
 		<input type="hidden" name="lams_token" value="<c:out value='${lams_token}' />" />
-		<input type="hidden" name="activityID" value="<c:out value="${optionsActivityForm.activityId}" />" />
+		<input type="hidden" name="activityID" value="<c:out value="${optionsActivityForm.activityID}" />" />
 	</html:form>
 </div>