Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml =================================================================== diff -u -r7ec5fb1ceecbc55268fd3a8cc5ce950eaef7e3bb -r7936e8f7de045aea09aaa715f3027061f05a1c15 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision 7ec5fb1ceecbc55268fd3a8cc5ce950eaef7e3bb) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision 7936e8f7de045aea09aaa715f3027061f05a1c15) @@ -70,9 +70,16 @@ + + org.lamsfoundation.lams.tool.mc.ApplicationResources + + + + + + - - org.lamsfoundation.lams.tool.mc.ApplicationResources + @@ -93,7 +100,8 @@ - + + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java =================================================================== diff -u -r3ff06f3f26058ef66d171ad6673eab70e76cd662 -r7936e8f7de045aea09aaa715f3027061f05a1c15 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 3ff06f3f26058ef66d171ad6673eab70e76cd662) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java (.../McServicePOJO.java) (revision 7936e8f7de045aea09aaa715f3027061f05a1c15) @@ -85,6 +85,7 @@ import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; import org.lamsfoundation.lams.util.wddx.WDDXProcessor; @@ -130,7 +131,9 @@ private IExportToolContentService exportContentService; private ICoreNotebookService coreNotebookService; - + + private MessageService messageService; + public McServicePOJO(){} public void configureContentRepository() throws McApplicationException { @@ -2442,5 +2445,18 @@ public void setAuditService(IAuditService auditService) { this.auditService = auditService; } + + /** + * @return Returns the MessageService. + */ + public MessageService getMessageService() { + return messageService; + } + /** + * @param messageService The MessageService to set. + */ + public void setMessageService(MessageService messageService) { + this.messageService = messageService; + } } \ No newline at end of file Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServiceProxy.java =================================================================== diff -u -r08950e1090443c3423a3d1c587416a2fccd8bbdf -r7936e8f7de045aea09aaa715f3027061f05a1c15 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServiceProxy.java (.../McServiceProxy.java) (revision 08950e1090443c3423a3d1c587416a2fccd8bbdf) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServiceProxy.java (.../McServiceProxy.java) (revision 7936e8f7de045aea09aaa715f3027061f05a1c15) @@ -26,6 +26,7 @@ import org.lamsfoundation.lams.tool.ToolContentManager; import org.lamsfoundation.lams.tool.ToolSessionManager; +import org.lamsfoundation.lams.util.MessageService; import org.springframework.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; @@ -63,11 +64,21 @@ { return (ToolContentManager)getMcDomainService(servletContext); } + + public static final MessageService getMessageService(ServletContext servletContext) + { + return (MessageService) getMcMessageService(servletContext); + } private static Object getMcDomainService(ServletContext servletContext) { WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext); return wac.getBean("mcService"); } + private static Object getMcMessageService(ServletContext servletContext) + { + WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext); + return wac.getBean("lamcMessageService"); + } } \ No newline at end of file Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java =================================================================== diff -u -r29a58046461b9cdde9a4884f6e4b0ff4e9e55425 -r7936e8f7de045aea09aaa715f3027061f05a1c15 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision 29a58046461b9cdde9a4884f6e4b0ff4e9e55425) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java (.../McMonitoringAction.java) (revision 7936e8f7de045aea09aaa715f3027061f05a1c15) @@ -72,6 +72,7 @@ import org.lamsfoundation.lams.tool.mc.pojos.McUploadedFile; import org.lamsfoundation.lams.tool.mc.service.IMcService; import org.lamsfoundation.lams.tool.mc.service.McServiceProxy; +import org.lamsfoundation.lams.util.MessageService; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -4663,6 +4664,8 @@ public ActionForward downloadMarks(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException,ServletException { + MessageService messageService = getMessageService(); + String currentMonitoredToolSession=request.getParameter("monitoredToolSessionId"); McMonitoringForm mcMonitoringForm = (McMonitoringForm) form; @@ -4737,16 +4740,17 @@ cell = row.createCell((short) 0); cell.setEncoding(HSSFCell.ENCODING_UTF_16); - cell.setCellValue("Group"); + cell.setCellValue(messageService.getMessage("group.label")); cell = row.createCell((short) 1); cell.setEncoding(HSSFCell.ENCODING_UTF_16); cell.setCellValue(currentSessionName); + idx++; row = sheet.createRow(idx++); cell = row.createCell((short) 0); cell.setEncoding(HSSFCell.ENCODING_UTF_16); - cell.setCellValue("User"); + cell.setCellValue(messageService.getMessage("label.user")); Iterator answersIterator = listMonitoredAnswersContainerDTO.iterator(); int count = 1; @@ -4755,12 +4759,12 @@ cell = row.createCell((short) count++); cell.setEncoding(HSSFCell.ENCODING_UTF_16); - cell.setCellValue("Question " + count + "(Mark:" + mcMonitoredAnswersDTO.getMark() + ")"); + cell.setCellValue(messageService.getMessage("label.monitoring.downloadMarks.question.mark", new Object[] {count-1, mcMonitoredAnswersDTO.getMark()})); } cell = row.createCell((short) count++); cell.setEncoding(HSSFCell.ENCODING_UTF_16); - cell.setCellValue("Total"); + cell.setCellValue(messageService.getMessage("label.total")); Iterator userMarkIterator = usersMarksMap.values().iterator(); @@ -4786,7 +4790,10 @@ cell.setEncoding(HSSFCell.ENCODING_UTF_16); cell.setCellValue(userMark.getTotalMark()); } - } + + idx++; + } + } ByteArrayOutputStream bos = new ByteArrayOutputStream(); @@ -4819,6 +4826,12 @@ return null; } - + + /** + * Return ResourceService bean. + */ + private MessageService getMessageService() { + return (MessageService) McServiceProxy.getMessageService(getServlet().getServletContext()); + } } \ No newline at end of file