Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== diff -u -rcc025cd2b501eb8acd8f17b3246660f8f53d493a -r1598e600333d72b66e28f425f09ffa59c4b3fb31 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision cc025cd2b501eb8acd8f17b3246660f8f53d493a) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 1598e600333d72b66e28f425f09ffa59c4b3fb31) @@ -670,17 +670,22 @@ return null; } - /** Calls the server to bring up the learner progress page. Assumes destination is a new window */ + /** Calls the server to bring up the learner progress page. + * Assumes destination is a new window. The userid that comes from + * Flash is the user id of the learner for which we are calculating + * the url. This is different to all the other calls. + */ public ActionForward getLearnerActivityURL(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response)throws IOException,LamsToolServiceException{ + IMonitoringService monitoringService = MonitoringServiceProxy.getMonitoringService(getServlet().getServletContext()); - Integer userID = getUserId(); + Integer learnerUserID = new Integer(WebUtil.readIntParam(request,"userID")); Long activityID = new Long(WebUtil.readLongParam(request,"activityID")); Long lessonID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_LESSON_ID)); - String url = monitoringService.getLearnerActivityURL(lessonID,activityID,userID); + String url = monitoringService.getLearnerActivityURL(lessonID,activityID,learnerUserID); return redirectToURL(mapping, response, url); } /** Calls the server to bring up the activity's monitoring page. Assumes destination is a new window */