Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java =================================================================== diff -u -r1b117caf4135f53248542cbc97d71aac448f3de9 -rf51eef8d23931e557f48c8896a22aa4cf23d6716 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision 1b117caf4135f53248542cbc97d71aac448f3de9) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java (.../MonitoringAction.java) (revision f51eef8d23931e557f48c8896a22aa4cf23d6716) @@ -743,7 +743,8 @@ } } } - + + response.setContentType("application/json;charset=utf-8"); response.getWriter().write(responseJSON.toString()); return null; } @@ -1273,7 +1274,8 @@ responseJSON.put("startDate", indfm.format(tzStartDate) + " " + user.getTimeZone().getDisplayName(userLocale)); } - + + response.setContentType("application/json;charset=utf-8"); response.getWriter().write(responseJSON.toString()); return null; } @@ -1349,6 +1351,7 @@ responseJSON.put("activities", new JSONArray(activitiesMap.values())); responseJSON.put("numberPossibleLearners", lessonDetails.getNumberPossibleLearners()); + response.setContentType("application/json;charset=utf-8"); response.getWriter().write(responseJSON.toString()); return null; Index: lams_monitoring/web/includes/javascript/monitorLesson.js =================================================================== diff -u -r1b117caf4135f53248542cbc97d71aac448f3de9 -rf51eef8d23931e557f48c8896a22aa4cf23d6716 --- lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision 1b117caf4135f53248542cbc97d71aac448f3de9) +++ lams_monitoring/web/includes/javascript/monitorLesson.js (.../monitorLesson.js) (revision f51eef8d23931e557f48c8896a22aa4cf23d6716) @@ -1255,33 +1255,36 @@ function showLearnerGroupDialog(activityId, dialogTitle, learners, allowForceComplete, allowView) { var learnerGroupList = $('#learnerGroupList').empty(); var learnerGroupDialog = $('#learnerGroupDialog'); - $.each(learners, function(learnerIndex, learner) { - var learnerDiv = $('
').attr({ - 'userId' : learner.id, - 'viewUrl' : learner.url - }) - .addClass('dialogListItem') - .text(getLearnerDisplayName(learner)) - .appendTo(learnerGroupList); - - if (allowForceComplete || allowView) { - learnerDiv.click(function(){ - // select a learner - $(this).addClass('dialogListItemSelected') - .siblings('div.dialogListItem') - .removeClass('dialogListItemSelected'); - // enable buttons - $('button.learnerGroupDialogSelectableButton') - .attr('disabled', null); - }); - if (allowView){ - learnerDiv.dblclick(function(){ - // same as clicking View Learner button - openPopUp(LAMS_URL + learner.url, "LearnActivity", 600, 800, true); - }); + + if (learners) { + $.each(learners, function(learnerIndex, learner) { + var learnerDiv = $('').attr({ + 'userId' : learner.id, + 'viewUrl' : learner.url + }) + .addClass('dialogListItem') + .text(getLearnerDisplayName(learner)) + .appendTo(learnerGroupList); + + if (allowForceComplete || allowView) { + learnerDiv.click(function(){ + // select a learner + $(this).addClass('dialogListItemSelected') + .siblings('div.dialogListItem') + .removeClass('dialogListItemSelected'); + // enable buttons + $('button.learnerGroupDialogSelectableButton') + .attr('disabled', null); + }); + if (allowView){ + learnerDiv.dblclick(function(){ + // same as clicking View Learner button + openPopUp(LAMS_URL + learner.url, "LearnActivity", 600, 800, true); + }); + } } - } - }); + }); + } // show buttons depending on parameters $('button#learnerGroupDialogForceCompleteButton')