Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java =================================================================== diff -u -r546af0bf9cb2369c48230aa25670ca4f017f05a8 -r11ee5cc4fa5bb15f77be3f81056a9437c9e7c602 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 546af0bf9cb2369c48230aa25670ca4f017f05a8) +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 11ee5cc4fa5bb15f77be3f81056a9437c9e7c602) @@ -359,7 +359,7 @@ if (dto.getMessage() != null && dto.getMessage().getReport() != null && dto.getMessage().getReport().getMark() != null) - cell.setCellValue(NumberUtil.formatLocalisedNumber(dto.getMessage().getReport().getMark(), request.getLocale(),1)); + cell.setCellValue(NumberUtil.formatLocalisedNumber(dto.getMessage().getReport().getMark(), request.getLocale(),2)); else cell.setCellValue(""); @@ -509,7 +509,7 @@ // summary to total mark totalMsgMarkSum += msgMarkSum; // set average mark to topic message DTO for display use - msgDto.setMark(getAverageFormat(msgMarkSum / (float) msgNum)); + msgDto.setMark(msgMarkSum / (float) msgNum); totalMsg += msgNum; } @@ -521,8 +521,7 @@ sessionDto.setSessionName(session.getSessionName()); sessionTopicsMap.put(sessionDto, topicList); - sessionAvaMarkMap.put(session.getSessionId(), - getAverageFormat(averMark)); + sessionAvaMarkMap.put(session.getSessionId(),averMark); sessionTotalMsgMap.put(session.getSessionId(), new Integer(totalMsg)); } @@ -721,7 +720,7 @@ // echo back to web page if (msg.getReport() != null) { if (msg.getReport().getMark() != null) - markForm.setMark(NumberUtil.formatLocalisedNumber(msg.getReport().getMark(),request.getLocale(),1)); + markForm.setMark(NumberUtil.formatLocalisedNumber(msg.getReport().getMark(),request.getLocale(),2)); else markForm.setMark(""); markForm.setComment(msg.getReport().getComment()); @@ -871,21 +870,6 @@ } /** - * Get formatted average mark. - * - * @param aver - * @return - */ - private Float getAverageFormat(float aver) { - try { - NumberFormat format = NumberFormat.getInstance(); - format.setMaximumFractionDigits(1); - return format.parse(format.format(aver)).floatValue(); - } catch (Exception e) { - return new Float(0); - } - } - /** * Return ResourceService bean. */ private MessageService getMessageService() { Index: lams_tool_forum/web/jsps/export/exportportfolio.jsp =================================================================== diff -u -r09e543ff11a5c1e6749e012cdc0d5983265f60ec -r11ee5cc4fa5bb15f77be3f81056a9437c9e7c602 --- lams_tool_forum/web/jsps/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 09e543ff11a5c1e6749e012cdc0d5983265f60ec) +++ lams_tool_forum/web/jsps/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 11ee5cc4fa5bb15f77be3f81056a9437c9e7c602) @@ -95,7 +95,7 @@ - + Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp =================================================================== diff -u -rfcf7f7b2d6640c2d413411868eeafceef57c82cc -r11ee5cc4fa5bb15f77be3f81056a9437c9e7c602 --- lams_tool_forum/web/jsps/learning/message/topicview.jsp (.../topicview.jsp) (revision fcf7f7b2d6640c2d413411868eeafceef57c82cc) +++ lams_tool_forum/web/jsps/learning/message/topicview.jsp (.../topicview.jsp) (revision 11ee5cc4fa5bb15f77be3f81056a9437c9e7c602) @@ -73,7 +73,7 @@ key="lable.topic.title.mark" />
- + Index: lams_tool_forum/web/jsps/monitoring/statisticpart.jsp =================================================================== diff -u -rd471d73394ccdb149ab1eb537cf10e496e67847f -r11ee5cc4fa5bb15f77be3f81056a9437c9e7c602 --- lams_tool_forum/web/jsps/monitoring/statisticpart.jsp (.../statisticpart.jsp) (revision d471d73394ccdb149ab1eb537cf10e496e67847f) +++ lams_tool_forum/web/jsps/monitoring/statisticpart.jsp (.../statisticpart.jsp) (revision 11ee5cc4fa5bb15f77be3f81056a9437c9e7c602) @@ -50,7 +50,7 @@ - + @@ -71,7 +71,7 @@ - + Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp =================================================================== diff -u -rc1bc8b48b11d16dc8e42ba09be32a1d06633be83 -r11ee5cc4fa5bb15f77be3f81056a9437c9e7c602 --- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp (.../updatemarks.jsp) (revision c1bc8b48b11d16dc8e42ba09be32a1d06633be83) +++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp (.../updatemarks.jsp) (revision 11ee5cc4fa5bb15f77be3f81056a9437c9e7c602) @@ -58,10 +58,10 @@ - * + * - + Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp =================================================================== diff -u -rc1bc8b48b11d16dc8e42ba09be32a1d06633be83 -r11ee5cc4fa5bb15f77be3f81056a9437c9e7c602 --- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp (.../viewmarks.jsp) (revision c1bc8b48b11d16dc8e42ba09be32a1d06633be83) +++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp (.../viewmarks.jsp) (revision 11ee5cc4fa5bb15f77be3f81056a9437c9e7c602) @@ -77,7 +77,7 @@ - + Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java =================================================================== diff -u -r5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5 -r11ee5cc4fa5bb15f77be3f81056a9437c9e7c602 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java (.../FileDetailsDTO.java) (revision 5442c61bdf4d3ddafc69c7ff497be6c1a9a40db5) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java (.../FileDetailsDTO.java) (revision 11ee5cc4fa5bb15f77be3f81056a9437c9e7c602) @@ -98,7 +98,7 @@ this.reportID = report.getReportID(); this.dateMarksReleased = report.getDateMarksReleased(); this.comments = report.getComments(); - this.marks = report.getMarks() != null? NumberUtil.formatLocalisedNumber(report.getMarks(), numberFormat,1) : ""; + this.marks = report.getMarks() != null? NumberUtil.formatLocalisedNumber(report.getMarks(), numberFormat,2) : ""; } }