Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java =================================================================== diff -u -rc125a5450d5e6766f697382a1e5c1abb5c7e933e -r1031a7fe932a67f63f9606370fb1a35adcb9731a --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision c125a5450d5e6766f697382a1e5c1abb5c7e933e) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision 1031a7fe932a67f63f9606370fb1a35adcb9731a) @@ -66,18 +66,24 @@ HttpServletRequest request, HttpServletResponse response){ + DynaActionForm authForm= (DynaActionForm)form; if(!isTokenValid(request,true)){ + Long sessionID =(Long) authForm.get("toolSessionID"); + Long userID = (Long)authForm.get("userID"); + submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext()); + List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID); + authForm.set("filesUploaded",filesUploaded); return returnErrors(mapping,request,"submit.upload.twice","upload"); } - DynaActionForm authForm= (DynaActionForm)form; - Long sessionID =(Long) authForm.get("toolSessionID"); + Long userID = (Long)authForm.get("userID"); String filePath = (String) authForm.get("filePath"); String fileDescription = (String) authForm.get("fileDescription"); - Long userID = (Long)authForm.get("userID"); - submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext()); + submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext()); + //to avoid user without patience click "upload" button too fast + saveToken(request); try{ submitFilesService.uploadFile(sessionID,filePath,fileDescription,userID); List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java =================================================================== diff -u -r8ad8873eb5b2b790da1c136795b0fdc9ac89027c -r1031a7fe932a67f63f9606370fb1a35adcb9731a --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 8ad8873eb5b2b790da1c136795b0fdc9ac89027c) +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 1031a7fe932a67f63f9606370fb1a35adcb9731a) @@ -162,6 +162,4 @@ return mapping.findForward("report"); } - - } Index: lams_tool_sbmt/web/updateMarks.jsp =================================================================== diff -u -r8ad8873eb5b2b790da1c136795b0fdc9ac89027c -r1031a7fe932a67f63f9606370fb1a35adcb9731a --- lams_tool_sbmt/web/updateMarks.jsp (.../updateMarks.jsp) (revision 8ad8873eb5b2b790da1c136795b0fdc9ac89027c) +++ lams_tool_sbmt/web/updateMarks.jsp (.../updateMarks.jsp) (revision 1031a7fe932a67f63f9606370fb1a35adcb9731a) @@ -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 =================================================================== diff -u -r8ad8873eb5b2b790da1c136795b0fdc9ac89027c -r1031a7fe932a67f63f9606370fb1a35adcb9731a --- lams_tool_sbmt/web/userReport.jsp (.../userReport.jsp) (revision 8ad8873eb5b2b790da1c136795b0fdc9ac89027c) +++ lams_tool_sbmt/web/userReport.jsp (.../userReport.jsp) (revision 1031a7fe932a67f63f9606370fb1a35adcb9731a) @@ -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 =================================================================== diff -u -r8ad8873eb5b2b790da1c136795b0fdc9ac89027c -r1031a7fe932a67f63f9606370fb1a35adcb9731a --- lams_tool_sbmt/web/userlist.jsp (.../userlist.jsp) (revision 8ad8873eb5b2b790da1c136795b0fdc9ac89027c) +++ lams_tool_sbmt/web/userlist.jsp (.../userlist.jsp) (revision 1031a7fe932a67f63f9606370fb1a35adcb9731a) @@ -20,7 +20,7 @@
- + @@ -31,9 +31,9 @@ - - - + + +