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.3 -r1.4 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties 19 Jul 2005 00:14:54 -0000 1.3 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties 19 Jul 2005 07:22:08 -0000 1.4 @@ -30,6 +30,7 @@ #-------------------------Exception Labels-----------------# sbmt.web.action.upload.exception = Upload of file failed. +submit.upload.twice=You already upload this file, please waiting for a while. # Errors learner.from.filepath.displayname=Upload file name 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.4 -r1.5 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 15 Jul 2005 05:27:26 -0000 1.4 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 19 Jul 2005 07:22:08 -0000 1.5 @@ -54,6 +54,9 @@ submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext()); List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID); authForm.set("filesUploaded",filesUploaded); + + //to avoid user without patience click "upload" button too fast + saveToken(request); return mapping.getInputForward(); } @@ -63,6 +66,10 @@ HttpServletRequest request, HttpServletResponse response){ + if(!isTokenValid(request,true)){ + return returnErrors(mapping,request,"submit.upload.twice","upload"); + } + DynaActionForm authForm= (DynaActionForm)form; Long sessionID =(Long) authForm.get("toolSessionID"); 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.4 -r1.5 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 19 Jul 2005 05:11:58 -0000 1.4 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 19 Jul 2005 07:22:08 -0000 1.5 @@ -162,6 +162,4 @@ return mapping.findForward("report"); } - - } Index: lams_tool_sbmt/web/updateMarks.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/Attic/updateMarks.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/web/updateMarks.jsp 19 Jul 2005 05:11:58 -0000 1.2 +++ lams_tool_sbmt/web/updateMarks.jsp 19 Jul 2005 07:22:08 -0000 1.3 @@ -1,6 +1,7 @@ <%@ page language="java"%> +<%@ taglib uri="fck-editor" prefix="FCK" %> <%@ taglib uri="tags-bean" prefix="bean" %> <%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-logic" prefix="logic" %> @@ -12,29 +13,56 @@ Files Submitted + Please assign a mark and a comment for the report by , - -

- File Path:
- File Description:
- Date of Submission:
+

+ + + + + + + + + + +
File Path:
File Description:
Date of Submission:
+ /> /> - /> - Marks: >
- Comments:
+ /> + + + + + + + + + + + +
Marks: + > +
Comments: + + + +
+
Index: lams_tool_sbmt/web/userReport.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/Attic/userReport.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/web/userReport.jsp 19 Jul 2005 05:11:58 -0000 1.2 +++ lams_tool_sbmt/web/userReport.jsp 19 Jul 2005 07:22:08 -0000 1.3 @@ -12,47 +12,68 @@ Files Submitted + + Following files have been submitted by , - +

+

- - File Path:
- File Description:
- Date of Submission:
- Comments: - - -
+

+ + + + + + + + + + + + + + + + + + + + +
File Path:
File Description:
Date of Submission:
Marks: + + -
+
- Marks: +
Comments: - -


+ + -


+
+
> > > >
+
Index: lams_tool_sbmt/web/userlist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/Attic/userlist.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_sbmt/web/userlist.jsp 19 Jul 2005 05:11:58 -0000 1.2 +++ lams_tool_sbmt/web/userlist.jsp 19 Jul 2005 07:22:08 -0000 1.3 @@ -20,7 +20,7 @@
- + @@ -31,9 +31,9 @@ - - - + + +