Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java =================================================================== diff -u -r5523969e2d7fc452301bf0a8403e5afbbae6c92a -r716e8f6d2a43093e93f1a0e8b96894e9535e96d7 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 5523969e2d7fc452301bf0a8403e5afbbae6c92a) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringController.java (.../MonitoringController.java) (revision 716e8f6d2a43093e93f1a0e8b96894e9535e96d7) @@ -32,6 +32,7 @@ import org.lamsfoundation.lams.authoring.IAuthoringService; import org.lamsfoundation.lams.flux.FluxMap; import org.lamsfoundation.lams.flux.FluxRegistry; +import org.lamsfoundation.lams.integration.ExtCourseClassMap; import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learningdesign.*; import org.lamsfoundation.lams.learningdesign.dao.IActivityDAO; @@ -1042,7 +1043,9 @@ request.setAttribute(AttributeNames.PARAM_CONTENT_FOLDER_ID, learningDesign.getContentFolderID()); - request.setAttribute("isIntegrationLogin", ss.getAttribute("isIntegrationLogin")); + boolean isIntegrationOrganisation = !userManagementService.findByProperty(ExtCourseClassMap.class, + "organisation", organisation).isEmpty(); + request.setAttribute("isIntegrationOrganisation", isIntegrationOrganisation); return "monitor"; } @@ -1196,8 +1199,6 @@ completedJSON.put("raw", completedLearnersCount); responseJSON.withArray("data").add(completedJSON); - - response.setContentType("application/json;charset=utf-8"); return responseJSON.toString(); } Index: lams_monitoring/web/monitor.jsp =================================================================== diff -u -r5523969e2d7fc452301bf0a8403e5afbbae6c92a -r716e8f6d2a43093e93f1a0e8b96894e9535e96d7 --- lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 5523969e2d7fc452301bf0a8403e5afbbae6c92a) +++ lams_monitoring/web/monitor.jsp (.../monitor.jsp) (revision 716e8f6d2a43093e93f1a0e8b96894e9535e96d7) @@ -190,12 +190,12 @@
- + - +