Index: lams_tool_sbmt/conf/xdoclet/validation-forms.xml
===================================================================
diff -u -r7ce5a98708f5a561d46682de26ae44541ab23d20 -r279fcb721d30c71b3d61cb67351348a41a9709de
--- lams_tool_sbmt/conf/xdoclet/validation-forms.xml (.../validation-forms.xml) (revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
+++ lams_tool_sbmt/conf/xdoclet/validation-forms.xml (.../validation-forms.xml) (revision 279fcb721d30c71b3d61cb67351348a41a9709de)
@@ -1,6 +1,6 @@
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties
===================================================================
diff -u -rc125a5450d5e6766f697382a1e5c1abb5c7e933e -r279fcb721d30c71b3d61cb67351348a41a9709de
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties (.../SbmtResources.properties) (revision c125a5450d5e6766f697382a1e5c1abb5c7e933e)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties (.../SbmtResources.properties) (revision 279fcb721d30c71b3d61cb67351348a41a9709de)
@@ -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=
errors.prefix=-
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -r1031a7fe932a67f63f9606370fb1a35adcb9731a -r279fcb721d30c71b3d61cb67351348a41a9709de
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision 1031a7fe932a67f63f9606370fb1a35adcb9731a)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision 279fcb721d30c71b3d61cb67351348a41a9709de)
@@ -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
===================================================================
diff -u -r1031a7fe932a67f63f9606370fb1a35adcb9731a -r279fcb721d30c71b3d61cb67351348a41a9709de
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 1031a7fe932a67f63f9606370fb1a35adcb9731a)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 279fcb721d30c71b3d61cb67351348a41a9709de)
@@ -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/WEB-INF/struts/struts-config.xml
===================================================================
diff -u -r7ce5a98708f5a561d46682de26ae44541ab23d20 -r279fcb721d30c71b3d61cb67351348a41a9709de
--- lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 7ce5a98708f5a561d46682de26ae44541ab23d20)
+++ lams_tool_sbmt/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision 279fcb721d30c71b3d61cb67351348a41a9709de)
@@ -65,7 +65,7 @@
input="/sbmtLearner.jsp"
parameter="method"
unknown="false"
- validate="true"
+ validate="false"
>
Index: lams_tool_sbmt/web/updateMarks.jsp
===================================================================
diff -u -r1031a7fe932a67f63f9606370fb1a35adcb9731a -r279fcb721d30c71b3d61cb67351348a41a9709de
--- lams_tool_sbmt/web/updateMarks.jsp (.../updateMarks.jsp) (revision 1031a7fe932a67f63f9606370fb1a35adcb9731a)
+++ lams_tool_sbmt/web/updateMarks.jsp (.../updateMarks.jsp) (revision 279fcb721d30c71b3d61cb67351348a41a9709de)
@@ -34,6 +34,7 @@