Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java,v diff -u -r1.4 -r1.5 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java 21 May 2006 19:43:02 -0000 1.4 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/ExportServlet.java 22 May 2006 21:18:50 -0000 1.5 @@ -113,8 +113,8 @@ MonitoringUtil.prepareChartDataForExportLearner(request, voteService, null, content.getVoteContentId(), voteSession.getUid()); logger.debug("post prepareChartDataForExport"); - - logger.debug("ending learner mode: "); + + logger.debug("ending learner mode: "); } public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java,v diff -u -r1.21 -r1.22 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java 16 May 2006 17:39:26 -0000 1.21 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteAction.java 22 May 2006 21:18:50 -0000 1.22 @@ -317,7 +317,6 @@ logger.debug("returning back to from to fix errors:"); request.getSession().setAttribute(EDITACTIVITY_EDITMODE, new Boolean(true)); request.setAttribute(VALIDATION_ERROR, new Boolean(true).toString()); - //return mapping.findForward(destination); return false; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v diff -u -r1.19 -r1.20 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 18 May 2006 22:11:08 -0000 1.19 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java 22 May 2006 21:18:50 -0000 1.20 @@ -466,16 +466,38 @@ logger.debug("USER_EXCEPTION_NO_TOOL_SESSIONS is set to true"); } - refreshInstructionsData(request, voteContent); + refreshInstructionsData(request, voteContent, voteService); request.getSession().setAttribute(CURRENT_MONITORING_TAB, "instructions"); logger.debug("ending initInstructionsContent..."); } - public void refreshInstructionsData(HttpServletRequest request, VoteContent voteContent) + public void refreshInstructionsData(HttpServletRequest request, VoteContent voteContent, IVoteService voteService) { request.getSession().setAttribute(RICHTEXT_ONLINEINSTRUCTIONS,voteContent.getOnlineInstructions()); request.getSession().setAttribute(RICHTEXT_OFFLINEINSTRUCTIONS,voteContent.getOfflineInstructions()); + + /*process offline files metadata*/ + List listOfflineFilesMetaData=voteService.getOfflineFilesMetaData(voteContent.getUid()); + logger.debug("existing listOfflineFilesMetaData, to be structured as VoteAttachmentDTO: " + listOfflineFilesMetaData); + listOfflineFilesMetaData=AuthoringUtil.populateMetaDataAsAttachments(listOfflineFilesMetaData); + logger.debug("populated listOfflineFilesMetaData: " + listOfflineFilesMetaData); + request.getSession().setAttribute(LIST_OFFLINEFILES_METADATA, listOfflineFilesMetaData); + + List listUploadedOfflineFileNames=AuthoringUtil.populateMetaDataAsFilenames(listOfflineFilesMetaData); + logger.debug("returned from db listUploadedOfflineFileNames: " + listUploadedOfflineFileNames); + request.getSession().setAttribute(LIST_UPLOADED_OFFLINE_FILENAMES, listUploadedOfflineFileNames); + + /*process online files metadata*/ + List listOnlineFilesMetaData=voteService.getOnlineFilesMetaData(voteContent.getUid()); + logger.debug("existing listOnlineFilesMetaData, to be structured as VoteAttachmentDTO: " + listOnlineFilesMetaData); + listOnlineFilesMetaData=AuthoringUtil.populateMetaDataAsAttachments(listOnlineFilesMetaData); + logger.debug("populated listOnlineFilesMetaData: " + listOnlineFilesMetaData); + request.getSession().setAttribute(LIST_ONLINEFILES_METADATA, listOnlineFilesMetaData); + + List listUploadedOnlineFileNames=AuthoringUtil.populateMetaDataAsFilenames(listOnlineFilesMetaData); + logger.debug("returned from db listUploadedOnlineFileNames: " + listUploadedOnlineFileNames); + request.getSession().setAttribute(LIST_UPLOADED_ONLINE_FILENAMES, listUploadedOnlineFileNames); } @@ -603,7 +625,7 @@ public ActionForward submitAllContent(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { logger.debug("dispatching proxy submitAllContent..."); - request.getSession().setAttribute(ACTIVE_MODULE, DEFINE_LATER); + request.getSession().setAttribute(ACTIVE_MODULE, MONITORING); request.setAttribute(SOURCE_VOTE_STARTER, "monitoring"); logger.debug("SOURCE_VOTE_STARTER: monitoring"); @@ -628,7 +650,8 @@ if (isContentSubmitted == true) voteMonitoringForm.setSbmtSuccess(new Boolean(true).toString()); - + + request.getSession().setAttribute(DEFINE_LATER_IN_EDIT_MODE, new Boolean(false)); logger.debug("final submit status :" +voteMonitoringForm.getSbmtSuccess()); return (mapping.findForward(destination)); } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java,v diff -u -r1.17 -r1.18 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java 18 May 2006 10:21:19 -0000 1.17 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringStarterAction.java 22 May 2006 21:18:50 -0000 1.18 @@ -243,7 +243,7 @@ voteMonitoringAction.refreshStatsData(request); logger.debug("refreshing instructions data..."); - voteMonitoringAction.refreshInstructionsData(request, voteContent); + voteMonitoringAction.refreshInstructionsData(request, voteContent, voteService); logger.debug("end initializing monitoring data..."); return true; Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/AuthoringMaincontent.jsp,v diff -u -r1.11 -r1.12 --- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp 16 May 2006 23:47:08 -0000 1.11 +++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp 22 May 2006 21:18:50 -0000 1.12 @@ -186,10 +186,6 @@ - - - Index: lams_tool_vote/web/authoring/BasicContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/web/authoring/BasicContent.jsp,v diff -u -r1.18 -r1.19 --- lams_tool_vote/web/authoring/BasicContent.jsp 16 May 2006 05:13:25 -0000 1.18 +++ lams_tool_vote/web/authoring/BasicContent.jsp 22 May 2006 21:18:50 -0000 1.19 @@ -150,7 +150,15 @@ + +
+

+ + +

+ +