Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java,v diff -u -r1.88 -r1.89 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 17 May 2013 09:36:21 -0000 1.88 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 20 May 2013 09:15:24 -0000 1.89 @@ -1152,11 +1152,11 @@ if (activity.getFloating()) { // these are support activities for (ActivityURL childActivity : activity.getChildActivities()) { - responseJSON.append("support", activityToJSON(childActivity, null, lessonId, learnerId, monitorId)); + responseJSON.append("support", activityProgressToJSON(childActivity, null, lessonId, learnerId, monitorId)); } } else { responseJSON.append("activities", - activityToJSON(activity, (Long) ret[1], lessonId, learnerId, monitorId)); + activityProgressToJSON(activity, (Long) ret[1], lessonId, learnerId, monitorId)); } } @@ -1527,7 +1527,7 @@ return userJSON; } - private JSONObject activityToJSON(ActivityURL activity, Long currentActivityId, Long lessonId, Integer learnerId, + private JSONObject activityProgressToJSON(ActivityURL activity, Long currentActivityId, Long lessonId, Integer learnerId, Integer monitorId) throws JSONException, IOException { JSONObject activityJSON = new JSONObject(); activityJSON.put("id", activity.getActivityId()); @@ -1559,7 +1559,7 @@ if (activity.getChildActivities() != null) { for (ActivityURL childActivity : activity.getChildActivities()) { activityJSON.append("childActivities", - activityToJSON(childActivity, currentActivityId, lessonId, learnerId, monitorId)); + activityProgressToJSON(childActivity, currentActivityId, lessonId, learnerId, monitorId)); } } Index: lams_monitoring/web/monitor.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/monitor.jsp,v diff -u -r1.7 -r1.8 --- lams_monitoring/web/monitor.jsp 17 May 2013 09:36:21 -0000 1.7 +++ lams_monitoring/web/monitor.jsp 20 May 2013 09:15:24 -0000 1.8 @@ -278,7 +278,7 @@