Index: lams_tool_sbmt/conf/xdoclet/validation-forms.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/xdoclet/Attic/validation-forms.xml,v
diff -u -r1.1 -r1.2
--- lams_tool_sbmt/conf/xdoclet/validation-forms.xml	19 Jul 2005 00:14:54 -0000	1.1
+++ lams_tool_sbmt/conf/xdoclet/validation-forms.xml	20 Jul 2005 02:00:43 -0000	1.2
@@ -1,6 +1,6 @@
 <form name="SbmtLearnerForm">
 	<field property="filePath" depends="required">
-		<arg key="SbmtLearnerForm.filePath"/>
+		<arg key="learner.form.filepath.displayname"/>
 	</field>
 </form>
 
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Attic/SbmtResources.properties,v
diff -u -r1.4 -r1.5
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	19 Jul 2005 07:22:08 -0000	1.4
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties	20 Jul 2005 02:00:43 -0000	1.5
@@ -33,7 +33,8 @@
 submit.upload.twice=You already upload this file, please waiting for a while.
 
 # Errors
-learner.from.filepath.displayname=Upload file name
+learner.form.filepath.displayname=Upload file name
+monitoring.mark.input.error=Invalidate input: {0}
 # -- standard errors --
 errors.header=<UL>
 errors.prefix=<LI>
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java,v
diff -u -r1.6 -r1.7
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	19 Jul 2005 07:25:48 -0000	1.6
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java	20 Jul 2005 02:00:43 -0000	1.7
@@ -32,7 +32,7 @@
  * 			name="SbmtLearnerForm"
  * 			input="/sbmtLearner.jsp"
  * 			scope="request"
- * 			validate="true"
+ * 			validate="false"
  * 
  * @struts.action-forward name="upload" path="/sbmtLearner.jsp"
  */
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	19 Jul 2005 07:22:08 -0000	1.5
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java	20 Jul 2005 02:00:43 -0000	1.6
@@ -33,7 +33,10 @@
 import org.apache.struts.action.ActionForm;
 import org.apache.struts.action.ActionForward;
 import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
 import org.apache.struts.actions.DispatchAction;
+import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
 import org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService;
 import org.lamsfoundation.lams.tool.sbmt.service.SubmitFilesServiceProxy;
 import org.lamsfoundation.lams.util.WebUtil;
@@ -120,16 +123,36 @@
 							   ActionForm form,
 							   HttpServletRequest request,
 							   HttpServletResponse response){
-		Long sessionID =new Long(WebUtil.readLongParam(request,"toolSessionID"));
+		//check whether the mark is validate
+		Long marks = null;
+		ActionMessages errors = new ActionMessages();  
+		try {
+			marks = new Long(WebUtil.readLongParam(request,"marks"));
+		} catch (IllegalArgumentException e) {
+			errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("monitoring.mark.input.error",e.getMessage()));
+		}
+		//if marks is invalid long, then throw error message directly.
+		String comments = WebUtil.readStrParam(request,"comments",true);
+		if(!errors.isEmpty()){
+			//to echo back to error page.
+			FileDetailsDTO details = (FileDetailsDTO) request.getSession().getAttribute("fileDetails");
+			if(details != null){
+				details.setComments(comments);
+			}
+			saveErrors(request,errors);
+			return mapping.findForward("updateMarks");
+		}
+		
+		//get other request parameters
 		String reportIDStr = request.getParameter("reportID");
 		Long reportID = new Long(-1);
 		if(!StringUtils.isEmpty(reportIDStr))
 			reportID = Long.valueOf(reportIDStr);
 
-		Long marks = new Long(WebUtil.readLongParam(request,"marks"));
-		String comments = WebUtil.readStrParam(request,"comments");
+		Long sessionID =new Long(WebUtil.readLongParam(request,"toolSessionID"));
 		Long userID = new Long(WebUtil.readLongParam(request,"userID"));
 		
+		//get service then update report table
 		submitFilesService = getSubmitFilesService();
 		
 		submitFilesService.updateMarks(reportID,marks,comments);
Index: lams_tool_sbmt/web/updateMarks.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/Attic/updateMarks.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_sbmt/web/updateMarks.jsp	19 Jul 2005 07:22:08 -0000	1.3
+++ lams_tool_sbmt/web/updateMarks.jsp	20 Jul 2005 02:00:43 -0000	1.4
@@ -34,6 +34,7 @@
 					</tr>
 		</table>
 		<table class="forms">
+					<tr><td colspan="2"><html:errors/></td></tr>
 					<form name="commentForm" action="monitoring.do?method=updateMarks"  method="post">	
 							 <input type="hidden" name="toolSessionID" value=<c:out value="${toolSessionID}"/> />						
 							 <input type="hidden" name="reportID" value=<c:out value="${details.reportID}"/> />						
Index: lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/struts/Attic/struts-config.xml,v
diff -u -r1.5 -r1.6
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	19 Jul 2005 00:14:54 -0000	1.5
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml	20 Jul 2005 02:00:43 -0000	1.6
@@ -65,7 +65,7 @@
       input="/sbmtLearner.jsp"
       parameter="method"
       unknown="false"
-      validate="true"
+      validate="false"
     >
       <forward
         name="upload"
Index: lams_tool_sbmt/web/WEB-INF/struts/validation.xml
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/struts/Attic/validation.xml,v
diff -u -r1.2 -r1.3
--- lams_tool_sbmt/web/WEB-INF/struts/validation.xml	19 Jul 2005 05:11:58 -0000	1.2
+++ lams_tool_sbmt/web/WEB-INF/struts/validation.xml	20 Jul 2005 02:00:43 -0000	1.3
@@ -7,7 +7,7 @@
   <formset>
   <form name="SbmtLearnerForm">
 	<field property="filePath" depends="required">
-		<arg key="SbmtLearnerForm.filePath"/>
+		<arg key="learner.form.filepath.displayname"/>
 	</field>
 </form>