contentID.
+ *
+ * This method is used in the authoring enviornment for displaying
+ * the files being uploaded by the given session, as the user
+ * uploads them one by one.
+ *
+ * @param sessionID The session_id to be looked up
+ * @return List The list of required objects.
+ * @param sessionID
+ * @return
+ */
+ public Map getFilesUploadedBySession(Long sessionID);
+
+ /**
* Get information of all users who have submitted file.
* @return The user information list
*/
@@ -156,4 +171,5 @@
* @return success return true, otherwise return false.
*/
public boolean releaseMarksForSession(Long sessionID);
+
}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java
===================================================================
diff -u -r75de919817a4bfa05924724631118b092da74cf7 -r935874a247d4ff466784941891be3b56d59d8509
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 75de919817a4bfa05924724631118b092da74cf7)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java (.../SubmitFilesService.java) (revision 935874a247d4ff466784941891be3b56d59d8509)
@@ -29,9 +29,11 @@
import java.util.ArrayList;
import java.util.Calendar;
import java.util.Date;
+import java.util.HashMap;
import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
+import java.util.Map;
import java.util.Set;
import java.util.TreeSet;
@@ -538,6 +540,42 @@
else
return null;
}
+ public Map getFilesUploadedBySession(Long sessionID) {
+ List list = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID);
+ if(list!=null){
+ return getUserFileDetailsMap(list);
+ }
+ else
+ return null;
+ }
+ /**
+ * This method save SubmissionDetails list into a map container: key is user id,
+ * value is a list container, which contains all FileDetailsDTO object belong to
+ * this user.
+ *
+ * @param list
+ * @return
+ */
+ private Map getUserFileDetailsMap(List list) {
+ Map map = new HashMap();
+ Iterator iterator = list.iterator();
+ List element;
+ while(iterator.hasNext()){
+ SubmissionDetails submissionDetails = (SubmissionDetails)iterator.next();
+ SubmitFilesReport report = submissionDetails.getReport();
+ UserDTO user = getUserDetails(submissionDetails.getUserID());
+
+ FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails,report,user);
+ element = (List) map.get(submissionDetails.getUserID());
+ //if it is first time to this user, creating a new ArrayList for this user.
+ if(element == null)
+ element = new ArrayList();
+ element.add(detailDto);
+ map.put(submissionDetails.getUserID(),element);
+ }
+ return map;
+ }
+
/**
* This is a utility method used by getFilesUploadedByUser
* method to generate a list of data transfer objects containing the
@@ -555,8 +593,8 @@
while(iterator.hasNext()){
SubmissionDetails submissionDetails = (SubmissionDetails)iterator.next();
SubmitFilesReport report = submissionDetails.getReport();
- FileDetailsDTO reportDTO = new FileDetailsDTO(submissionDetails,report);
- details.add(reportDTO);
+ FileDetailsDTO detailDto = new FileDetailsDTO(submissionDetails,report);
+ details.add(detailDto);
}
return details;
}
@@ -621,7 +659,6 @@
*/
private LearnerDetailsDTO getLearnerDetailsDTO(SubmissionDetails details,
SubmitFilesReport report){
- Integer userID = new Integer(details.getUserID().intValue());
File file = new File(details.getFilePath());
return new LearnerDetailsDTO(file.getName(),
details.getFileDescription(),
@@ -704,4 +741,8 @@
return true;
}
+
+
+
+
}
\ No newline at end of file
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -r75de919817a4bfa05924724631118b092da74cf7 -r935874a247d4ff466784941891be3b56d59d8509
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 75de919817a4bfa05924724631118b092da74cf7)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 935874a247d4ff466784941891be3b56d59d8509)
@@ -27,6 +27,7 @@
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.List;
+import java.util.Map;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -215,7 +216,17 @@
ActionForm form,
HttpServletRequest request,
HttpServletResponse response){
- return null;
+
+ Long sessionID =new Long(WebUtil.readLongParam(request,"toolSessionID"));
+ submitFilesService = getSubmitFilesService();
+ //return FileDetailsDTO list according to the given sessionID
+ Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID);
+ request.getSession().setAttribute("toolSessionID",sessionID);
+// request.getSession().setAttribute("user",
+// submitFilesService.getUserDetails(userID));
+ request.getSession().setAttribute("report",userFilesMap);
+ return mapping.findForward("report");
+
}
public ActionForward releaseMarks(ActionMapping mapping,
ActionForm form,
Index: lams_tool_sbmt/web/allLearners.jsp
===================================================================
diff -u -reb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8 -r935874a247d4ff466784941891be3b56d59d8509
--- lams_tool_sbmt/web/allLearners.jsp (.../allLearners.jsp) (revision eb8df38a09efc89ecb2524cb7cf70ad9f3ec69d8)
+++ lams_tool_sbmt/web/allLearners.jsp (.../allLearners.jsp) (revision 935874a247d4ff466784941891be3b56d59d8509)
@@ -11,61 +11,81 @@