Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties
===================================================================
diff -u -rbc4150568caa15d2bb1004bc1c73797c95c0205e -re4877b292d485295ac26552e87de062cb761ac18
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties (.../SbmtResources.properties) (revision bc4150568caa15d2bb1004bc1c73797c95c0205e)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SbmtResources.properties (.../SbmtResources.properties) (revision e4877b292d485295ac26552e87de062cb761ac18)
@@ -54,6 +54,9 @@
page.title.mark1.userlist=Report Marking
label.monitoring.needMarking = File(s) need marking
+label.monitoring.edit.activity.edit=Edit activity
+label.monitoring.edit.activity.cancel=Cancel edit
+label.monitoring.edit.activity.update=Update activity
#-------------------------Exception Labels-----------------#
sbmt.web.action.upload.exception = Upload of file failed.
monitoring.download.error = Download failed becuase of this reason: {0}
Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
===================================================================
diff -u -r21677c773e9f0c7e903336013ada9985c2e05800 -re4877b292d485295ac26552e87de062cb761ac18
--- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision 21677c773e9f0c7e903336013ada9985c2e05800)
+++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java (.../MonitoringAction.java) (revision e4877b292d485295ac26552e87de062cb761ac18)
@@ -23,7 +23,6 @@
package org.lamsfoundation.lams.tool.sbmt.web;
import java.io.IOException;
-import java.io.InputStream;
import java.util.ArrayList;
import java.util.Hashtable;
import java.util.Iterator;
@@ -40,7 +39,6 @@
import org.apache.struts.action.ActionMessage;
import org.apache.struts.action.ActionMessages;
import org.apache.struts.actions.DispatchAction;
-import org.lamsfoundation.lams.contentrepository.IVersionedNode;
import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent;
import org.lamsfoundation.lams.tool.sbmt.dto.AuthoringDTO;
import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO;
@@ -62,8 +60,13 @@
* @struts.action-forward name="userMarks" path="/monitoring/usermarkslist.jsp"
* @struts.action-forward name="updateMarks" path="/monitoring/updatemarks.jsp"
* @struts.action-forward name="allUserMarks" path="/monitoring/viewallmarks.jsp"
+ *
* @struts.action-forward name="instructions" path="/monitoring/instructions.jsp"
*
+ * @struts.action-forward name="showActivity" path="/monitoring/showactivity.jsp"
+ * @struts.action-forward name="editActivity" path="/monitoring/editactivity.jsp"
+ * @struts.action-forward name="success" path="/monitoring/success.jsp"
+ *
* @struts.action-forward name="status" path="/Status.jsp"
*
*/
@@ -288,7 +291,63 @@
request.setAttribute(SbmtConstants.AUTHORING_DTO,authorDto);
return mapping.findForward("instructions");
}
- //TODO
+
+ public ActionForward showActivity(ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response){
+
+ getAuthoringActivity(form, request);
+ return mapping.findForward("showActivity");
+ }
+
+ public ActionForward editActivity(ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response){
+
+ getAuthoringActivity(form, request);
+ return mapping.findForward("editActivity");
+ }
+ public ActionForward updateActivity(ActionMapping mapping,
+ ActionForm form,
+ HttpServletRequest request,
+ HttpServletResponse response){
+ Long contentID = new Long(WebUtil.readLongParam(request,"toolContentID"));
+ String title = WebUtil.readStrParam(request,"title");
+ String instructions = WebUtil.readStrParam(request,"instructions");
+
+ //get back the upload file list and display them on page
+ submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this
+ .getServlet().getServletContext());
+ SubmitFilesContent content = submitFilesService.getSubmitFilesContent(contentID);
+ content.setTitle(title);
+ content.setInstruction(instructions);
+ submitFilesService.updateSubmitFilesContent(content);
+
+ return mapping.findForward("success");
+ }
+ /**
+ * @param form
+ * @param request
+ */
+ private void getAuthoringActivity(ActionForm form, HttpServletRequest request) {
+ Long contentID = new Long(WebUtil.readLongParam(request,"toolContentID"));
+
+ //get back the upload file list and display them on page
+ submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this
+ .getServlet().getServletContext());
+
+ SubmitFilesContent persistContent = submitFilesService.getSubmitFilesContent(contentID);
+ //if this content does not exist, then reset the contentID to current value to keep it on HTML page.
+ if(persistContent == null)
+ persistContent = new SubmitFilesContent();
+ persistContent.setContentID(contentID);
+ AuthoringDTO authorDto = new AuthoringDTO(persistContent);
+ request.setAttribute(SbmtConstants.AUTHORING_DTO,authorDto);
+ }
+
+ //TODO: I don't know what will do following code from Mapreet
public ActionForward getStatus(ActionMapping mapping,
ActionForm form,
HttpServletRequest request,
Index: lams_tool_sbmt/web/Login.jsp
===================================================================
diff -u -rc36eb8bba0958f38d26c34d6cd690e60c934a619 -re4877b292d485295ac26552e87de062cb761ac18
--- lams_tool_sbmt/web/Login.jsp (.../Login.jsp) (revision c36eb8bba0958f38d26c34d6cd690e60c934a619)
+++ lams_tool_sbmt/web/Login.jsp (.../Login.jsp) (revision e4877b292d485295ac26552e87de062cb761ac18)
@@ -35,6 +35,10 @@
-
+