Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java,v diff -u -r1.85.4.1 -r1.85.4.2 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 11 May 2009 07:22:02 -0000 1.85.4.1 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java 30 Jun 2009 03:15:05 -0000 1.85.4.2 @@ -42,6 +42,7 @@ import org.lamsfoundation.lams.usermanagement.Organisation; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.exception.UserAccessDeniedException; +import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; /** @@ -876,5 +877,8 @@ /** Open Time Chart */ public Boolean openTimeChart(long lessonId, Integer userId) throws UserAccessDeniedException; + + /** Get Organisation Name */ + public String getOrganisationName(Integer organisationId); } Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java,v diff -u -r1.149.2.7 -r1.149.2.8 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 25 May 2009 05:51:37 -0000 1.149.2.7 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java 30 Jun 2009 03:15:04 -0000 1.149.2.8 @@ -2880,4 +2880,9 @@ group.setGroupName(name); groupDAO.saveGroup(group); } + + public String getOrganisationName(Integer organisationId) { + Organisation org = (Organisation) baseDAO.find(Organisation.class, organisationId); + return org.getName(); + } } \ No newline at end of file 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.64.2.7 -r1.64.2.8 --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 13 May 2009 09:34:56 -0000 1.64.2.7 +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java 30 Jun 2009 03:15:04 -0000 1.64.2.8 @@ -677,6 +677,11 @@ MessageService messageService = monitoringService.getMessageService(); String module = WebUtil.readStrParam(request,"module",false); + Integer orgId = WebUtil.readIntParam(request,"orgId",true); + + String orgName = null; + if(orgId != null) orgName = monitoringService.getOrganisationName(orgId); + ArrayList languageCollection = new ArrayList(); if(module.equals("wizard")) { @@ -769,6 +774,9 @@ idx++; } + if(orgName != null) { + languageOutput += "" + orgName + ""; + } } languageOutput += ""; Index: lams_monitoring/web/CloudWizard.swf =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/CloudWizard.swf,v diff -u -r1.6.2.7 -r1.6.2.8 Binary files differ Index: lams_monitoring/web/addLesson.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_monitoring/web/Attic/addLesson.jsp,v diff -u -r1.17.2.1 -r1.17.2.2 --- lams_monitoring/web/addLesson.jsp 11 May 2009 07:22:03 -0000 1.17.2.1 +++ lams_monitoring/web/addLesson.jsp 30 Jun 2009 03:15:04 -0000 1.17.2.2 @@ -49,7 +49,7 @@ <% String clientVersion = Configuration.get(ConfigurationKeys.MONITOR_CLIENT_VERSION); %> - organisationID=&orgName=&serverUrl=&userID=&tz=&buildID=<%= clientVersion %> + organisationID=&serverUrl=&userID=&tz=&buildID=<%= clientVersion %>