Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v
diff -u -r1.35 -r1.36
--- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	13 May 2008 00:54:45 -0000	1.35
+++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java	21 May 2008 05:52:51 -0000	1.36
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/export/exportportfolio.jsp,v
diff -u -r1.22 -r1.23
--- lams_tool_forum/web/jsps/export/exportportfolio.jsp	20 May 2008 00:33:06 -0000	1.22
+++ lams_tool_forum/web/jsps/export/exportportfolio.jsp	21 May 2008 05:52:33 -0000	1.23
@@ -95,7 +95,7 @@
 											<fmt:message key="message.not.avaliable"/>
 										</c:when>
 										<c:otherwise>
-											<fmt:formatNumber value="${msgDto.mark}"  maxFractionDigits="1"/>
+											<fmt:formatNumber value="${msgDto.mark}"  maxFractionDigits="2"/>
 										</c:otherwise>
 									</c:choose>
 								</td>
Index: lams_tool_forum/web/jsps/learning/message/topicview.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/learning/message/topicview.jsp,v
diff -u -r1.30 -r1.31
--- lams_tool_forum/web/jsps/learning/message/topicview.jsp	21 May 2008 00:57:56 -0000	1.30
+++ lams_tool_forum/web/jsps/learning/message/topicview.jsp	21 May 2008 05:52:32 -0000	1.31
@@ -73,7 +73,7 @@
 								key="lable.topic.title.mark" />
 						</span>
 						<BR>
-						<fmt:formatNumber value="${msgDto.mark}"  maxFractionDigits="1"/>
+						<fmt:formatNumber value="${msgDto.mark}"  maxFractionDigits="2"/>
 					</td>
 				</tr>
 				<tr>
Index: lams_tool_forum/web/jsps/monitoring/statisticpart.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/statisticpart.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_forum/web/jsps/monitoring/statisticpart.jsp	13 May 2008 01:05:49 -0000	1.3
+++ lams_tool_forum/web/jsps/monitoring/statisticpart.jsp	21 May 2008 05:52:32 -0000	1.4
@@ -50,7 +50,7 @@
 								<c:out value="${topic.message.replyNumber+1}" />
 							</td>
 							<td>
-								<fmt:formatNumber value="${topic.mark}"  maxFractionDigits="1"/>
+								<fmt:formatNumber value="${topic.mark}"  maxFractionDigits="2"/>
 							</td>
 						</tr>
 					</c:forEach>
@@ -71,7 +71,7 @@
 				<fmt:message key="label.monitoring.statistic.average.mark" />
 			</td>
 			<td>
-				<fmt:formatNumber value="${sessionMarkAverage}"  maxFractionDigits="1"/>
+				<fmt:formatNumber value="${sessionMarkAverage}"  maxFractionDigits="2"/>
 			</td>
 		</tr>
 	</table>
Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/updatemarks.jsp,v
diff -u -r1.22 -r1.23
--- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	13 May 2008 01:46:50 -0000	1.22
+++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp	21 May 2008 05:52:32 -0000	1.23
@@ -58,10 +58,10 @@
 			</td>
 		<tr>
 			<td class="field-name" width="100">
-				<fmt:message key="lable.topic.title.mark" />* 
+				<fmt:message key="lable.topic.title.mark" />*
 			</td>
 			<td>
-				<html:text property="mark"><fmt:formatNumber value="${topic.message.report.mark}"  maxFractionDigits="1"/></html:text>
+				<html:text property="mark"/>
 			</td>
 		</tr>
 		<tr>
Index: lams_tool_forum/web/jsps/monitoring/viewmarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/viewmarks.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	13 May 2008 01:46:50 -0000	1.8
+++ lams_tool_forum/web/jsps/monitoring/viewmarks.jsp	21 May 2008 05:52:32 -0000	1.9
@@ -77,7 +77,7 @@
 							<fmt:message key="message.not.avaliable" />
 						</c:when>
 						<c:otherwise>
-							<fmt:formatNumber value="${topic.message.report.mark}"  maxFractionDigits="1"/>
+							<fmt:formatNumber value="${topic.message.report.mark}"  maxFractionDigits="2"/>
 						</c:otherwise>
 					</c:choose>
 				</td>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java,v
diff -u -r1.15 -r1.16
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	13 May 2008 00:54:17 -0000	1.15
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/dto/FileDetailsDTO.java	21 May 2008 05:52:10 -0000	1.16
@@ -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) : "";
 		}
 	}