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 @@
-