Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties
===================================================================
diff -u -reb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8 -r09c9fa0ac21227610deb68479356ca37513ae74e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties (.../SbmtResources.properties) (revision eb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties (.../SbmtResources.properties) (revision 09c9fa0ac21227610deb68479356ca37513ae74e)
@@ -24,6 +24,7 @@
label.learner.uploadMessage = Only one file can be uploaded at a time - Maximum file size is 1.0 MB
#-------------------------Monitoring Labels-----------------#
+page.title.mark1.userlist=Report Marking
label.monitoring.needMarking = File(s) need marking
#-------------------------Exception Labels-----------------#
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java
===================================================================
diff -u -r8963d36c9f7c8f1b45bb677ea73a3b4b7bbdc0cd -r09c9fa0ac21227610deb68479356ca37513ae74e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision 8963d36c9f7c8f1b45bb677ea73a3b4b7bbdc0cd)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java (.../ISubmitFilesService.java) (revision 09c9fa0ac21227610deb68479356ca37513ae74e)
@@ -118,8 +118,12 @@
* @return List The list of required objects.
*/
public List getFilesUploadedByUser(Long userID, Long contentID);
-
/**
+ * Get information of all users who have submitted file.
+ * @return The user information list
+ */
+ public List getUsers(Long contentID);
+ /**
* This method is required in the monitoring enviornment
* when the teacher wants to view all the learners who have
* uploaded one file or the other for marking purposes. *
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r8963d36c9f7c8f1b45bb677ea73a3b4b7bbdc0cd -r09c9fa0ac21227610deb68479356ca37513ae74e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 8963d36c9f7c8f1b45bb677ea73a3b4b7bbdc0cd)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 09c9fa0ac21227610deb68479356ca37513ae74e)
@@ -493,6 +493,21 @@
}
/**
* (non-Javadoc)
+ * @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#getUsers(java.lang.Long)
+ */
+ public List getUsers(Long contentID){
+ List users = submissionDetailsDAO.getUsersForContent(contentID);
+ Iterator iterator = users.iterator();
+ List table = new ArrayList();
+ while(iterator.hasNext()){
+ Long userID = (Long)iterator.next();
+ User user = userDAO.getUserById(new Integer(userID.intValue()));
+ table.add(user.getUserDTO());
+ }
+ return table;
+ }
+ /**
+ * (non-Javadoc)
* @see org.lamsfoundation.lams.tool.sbmt.service.ISubmitFilesService#generateReport(java.lang.Long)
*/
public Hashtable generateReport(Long contentID){
@@ -596,4 +611,5 @@
throw new SubmitFilesException("ItemNotFoundException occured while trying to download file " + ie.getMessage());
}
}
+
}
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java
===================================================================
diff -u -ra8637bbd49b901ff6a00b2d6fb048d94429aba3f -r09c9fa0ac21227610deb68479356ca37513ae74e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision a8637bbd49b901ff6a00b2d6fb048d94429aba3f)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java (.../LearnerAction.java) (revision 09c9fa0ac21227610deb68479356ca37513ae74e)
@@ -41,6 +41,23 @@
public ISubmitFilesService submitFilesService;
public static Logger logger = Logger.getLogger(LearnerAction.class);
+ public ActionForward listFiles(ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response){
+
+ DynaActionForm authForm= (DynaActionForm)form;
+
+ Long contentID =(Long) authForm.get("contentID");
+ Long userID = (Long)authForm.get("userID");
+
+ submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext());
+ List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,contentID);
+ authForm.set("filesUploaded",filesUploaded);
+ return mapping.getInputForward();
+
+ }
+
public ActionForward uploadFile(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -reb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8 -r09c9fa0ac21227610deb68479356ca37513ae74e
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision eb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 09c9fa0ac21227610deb68479356ca37513ae74e)
@@ -46,6 +46,7 @@
* scope="request"
* name="emptyForm"
*
+ * @struts.action-forward name="userlist" path="/userlist.jsp"
* @struts.action-forward name="report" path="/allLearners.jsp"
* @struts.action-forward name="status" path="/Status.jsp"
* @struts.action-forward name="userReport" path="/userReport.jsp"
@@ -61,6 +62,27 @@
.getSubmitFilesService(this.getServlet()
.getServletContext());
}
+ /**
+ * List all user for monitor staff choose which user need to do report marking.
+ * It is first step to do report marking.
+ * @param mapping
+ * @param form
+ * @param request
+ * @param response
+ * @return
+ */
+ public ActionForward userList(ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response){
+ Long contentID =new Long(WebUtil.readLongParam(request,"contentID"));
+ submitFilesService = getSubmitFilesService();
+ List userList = submitFilesService.getUsers(contentID);
+ request.getSession().setAttribute("contentID",contentID);
+ request.getSession().setAttribute("USERLIST",userList);
+ return mapping.findForward("userlist");
+ }
+
public ActionForward generateReport(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
Index: lams_tool_sbmt/web/Login.jsp
===================================================================
diff -u -ra8637bbd49b901ff6a00b2d6fb048d94429aba3f -r09c9fa0ac21227610deb68479356ca37513ae74e
--- lams_tool_sbmt/web/Login.jsp (.../Login.jsp) (revision a8637bbd49b901ff6a00b2d6fb048d94429aba3f)
+++ lams_tool_sbmt/web/Login.jsp (.../Login.jsp) (revision 09c9fa0ac21227610deb68479356ca37513ae74e)
@@ -7,6 +7,24 @@
session.setAttribute("title","Submission Upload");
session.setAttribute("instructions","Upload you file by this tool");
%>
- learner logon
+
+
+
+
+