Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/GeneralLearnerFlowDTO.java,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java 28 Jul 2006 20:18:48 -0000 1.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/GeneralLearnerFlowDTO.java 29 Jul 2006 21:37:20 -0000 1.5 @@ -80,9 +80,24 @@ protected List listMonitoredAnswersContainerDTO; + protected String currentMonitoredToolSession; + /** + * @return Returns the currentMonitoredToolSession. + */ + public String getCurrentMonitoredToolSession() { + return currentMonitoredToolSession; + } + /** + * @param currentMonitoredToolSession The currentMonitoredToolSession to set. + */ + public void setCurrentMonitoredToolSession( + String currentMonitoredToolSession) { + this.currentMonitoredToolSession = currentMonitoredToolSession; + } + /** * @return Returns the currentAnswer. */ public String getCurrentAnswer() { @@ -214,6 +229,7 @@ .append("mapQuestions: ", mapQuestions) .append("mapQuestionContentLearner: ", mapQuestionContentLearner) .append("listMonitoredAnswersContainerDTO: ", listMonitoredAnswersContainerDTO) + .append("currentMonitoredToolSession: ", currentMonitoredToolSession) .toString(); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/Attic/QaUtils.java,v diff -u -r1.44 -r1.45 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 28 Jul 2006 20:18:48 -0000 1.44 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java 29 Jul 2006 21:37:20 -0000 1.45 @@ -245,7 +245,7 @@ return (DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG).format(date)); } - public static void persistTimeZone(HttpServletRequest request) + public static void saveTimeZone(HttpServletRequest request) { TimeZone timeZone=TimeZone.getDefault(); logger.debug("current timezone: " + timeZone.getDisplayName()); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java,v diff -u -r1.4 -r1.5 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java 28 Jul 2006 20:18:48 -0000 1.4 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/ExportServlet.java 29 Jul 2006 21:37:20 -0000 1.5 @@ -31,6 +31,7 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.ToolAccessMode; +import org.lamsfoundation.lams.tool.qa.GeneralLearnerFlowDTO; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaApplicationException; import org.lamsfoundation.lams.tool.qa.QaContent; @@ -54,7 +55,7 @@ public String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) { logger.debug("dispathcing doExport"); - request.getSession().setAttribute(IS_PORTFOLIO_EXPORT, new Boolean(true).toString()); + //request.setAttribute(IS_PORTFOLIO_EXPORT, new Boolean(true).toString()); String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+request.getContextPath(); logger.debug("basePath:" + basePath); @@ -72,8 +73,7 @@ public void learner(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) { logger.debug("starting learner mode..."); - request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "learner"); - + IQaService qaService = QaServiceProxy.getQaService(getServletContext()); logger.debug("userID:" + userID); @@ -112,15 +112,25 @@ logger.debug("calling learning mode toolSessionID:" + toolSessionID + " userID: " + userID ); QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); logger.debug("start refreshSummaryData for learner mode."); - qaMonitoringAction.refreshSummaryData(request, content, qaService, true, true, toolSessionID.toString(), userID.toString(), null); + + GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(content); + logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO); + qaMonitoringAction.refreshSummaryData(request, content, qaService, true, true, toolSessionID.toString(), userID.toString(), generalLearnerFlowDTO); logger.debug("end refreshSummaryData for learner mode."); + + generalLearnerFlowDTO =(GeneralLearnerFlowDTO)request.getAttribute(GENERAL_LEARNER_FLOW_DTO); + logger.debug("final generalLearnerFlowDTO: " + generalLearnerFlowDTO); + + logger.debug("for the special case of export portfolio we place generalLearnerFlowDTO into session scope"); + request.getSession().setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); + + request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "learner"); logger.debug("ending learner mode: "); } public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) { logger.debug("starting teacher mode..."); - request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "teacher"); IQaService qaService = QaServiceProxy.getQaService(getServletContext()); @@ -143,10 +153,20 @@ QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); logger.debug("start refreshSummaryData for teacher mode."); - qaMonitoringAction.refreshSummaryData(request, content, qaService, true, false, null, null, null); + + GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(content); + logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO); + qaMonitoringAction.refreshSummaryData(request, content, qaService, true, false, null, null, generalLearnerFlowDTO); logger.debug("end refreshSummaryData for teacher mode."); logger.debug("teacher uses content id: " + content.getQaContentId()); + + generalLearnerFlowDTO =(GeneralLearnerFlowDTO)request.getAttribute(GENERAL_LEARNER_FLOW_DTO); + logger.debug("final generalLearnerFlowDTO: " + generalLearnerFlowDTO); + + logger.debug("for the special case of export portfolio we place generalLearnerFlowDTO into session scope"); + request.getSession().setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); + + request.getSession().setAttribute(PORTFOLIO_EXPORT_MODE, "teacher"); logger.debug("ending teacher mode: "); } - } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java,v diff -u -r1.45 -r1.46 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 28 Jul 2006 20:18:48 -0000 1.45 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java 29 Jul 2006 21:37:20 -0000 1.46 @@ -388,7 +388,8 @@ generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString()); generalLearnerFlowDTO.setRequestLearningReportProgress(new Boolean(true).toString()); - qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, true, true, toolSessionID, learnerProgressUserId, generalLearnerFlowDTO); + qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, true, true, toolSessionID, learnerProgressUserId, + generalLearnerFlowDTO); logger.debug("fwd'ing to for learner progress" + INDIVIDUAL_LEARNER_REPORT); return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT)); } @@ -426,7 +427,7 @@ if ((qaQueUsr != null) && (qaQueUsr.isResponseFinalized())) { - logger.debug("is current user's response finalized: " + qaQueUsr.isResponseFinalized()); + logger.debug("is current user's response finalised: " + qaQueUsr.isResponseFinalized()); QaSession checkSession=qaQueUsr.getQaSession(); logger.debug("checkSession:" + checkSession); @@ -437,19 +438,22 @@ if (checkQaSessionId.toString().equals(currentToolSessionID.toString())) { logger.debug("the learner is in the same session and has already responsed to this content, just generate a read-only report."); - Boolean isUserNamesVisibleBoolean=(Boolean)request.getSession().getAttribute(IS_USERNAME_VISIBLE); + + logger.debug("isUserNamesVisible: " + qaContent.isUsernameVisible()); + Boolean isUserNamesVisibleBoolean=new Boolean(qaContent.isUsernameVisible()); boolean isUserNamesVisible=isUserNamesVisibleBoolean.booleanValue(); - logger.debug("isUserNamesVisible: " + isUserNamesVisible); - + QaMonitoringAction qaMonitoringAction= new QaMonitoringAction(); /*the report should have all the users' entries OR * the report should have only the current session's entries*/ - - qaLearningForm.setRequestLearningReportViewOnly(new Boolean(true).toString()); - qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, currentToolSessionID.toString(), null, null); - qaLearningForm.setRequestLearningReport(new Boolean(true).toString()); + generalLearnerFlowDTO.setRequestLearningReport(new Boolean(true).toString()); + generalLearnerFlowDTO.setRequestLearningReportViewOnly(new Boolean(true).toString()); + + logger.debug("using generalLearnerFlowDTO: " + generalLearnerFlowDTO); + qaMonitoringAction.refreshSummaryData(request, qaContent, qaService, isUserNamesVisible, true, currentToolSessionID.toString(), null, generalLearnerFlowDTO); + logger.debug("final generalLearnerFlowDTO: " + generalLearnerFlowDTO); logger.debug("fwd'ing to." + INDIVIDUAL_LEARNER_REPORT); return (mapping.findForward(INDIVIDUAL_LEARNER_REPORT)); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v diff -u -r1.40 -r1.41 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 28 Jul 2006 20:18:48 -0000 1.40 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java 29 Jul 2006 21:37:20 -0000 1.41 @@ -490,6 +490,9 @@ ServletException { logger.debug("dispatching submitSession..."); + + IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); + logger.debug("qaService: " + qaService); request.getSession().setAttribute(EDIT_RESPONSE, new Boolean(false)); QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; @@ -508,11 +511,21 @@ logger.debug("SELECTION_CASE: " + request.getSession().getAttribute(SELECTION_CASE)); - //request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); - //logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); - request.setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); + request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); + logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); + Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); + logger.debug("toolContentId: " + toolContentId); + + QaContent qaContent=qaService.loadQa(toolContentId.longValue()); + logger.debug("existing qaContent:" + qaContent); + + GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent); + logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO); + + refreshSummaryData(request, qaContent, qaService, true, false, null, null, generalLearnerFlowDTO); + logger.debug("final USER_EXCEPTION_NO_TOOL_SESSIONS: " + request.getSession().getAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS)); return (mapping.findForward(LOAD_MONITORING)); } @@ -540,16 +553,30 @@ ServletException { logger.debug("dispatching editResponse..."); - + + IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); + logger.debug("qaService: " + qaService); + QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; String responseId=qaMonitoringForm.getResponseId(); logger.debug("responseId: " + responseId); request.getSession().setAttribute(EDIT_RESPONSE, new Boolean(true)); request.getSession().setAttribute(EDITABLE_RESPONSE_ID, responseId); - + + QaUsrResp qaUsrResp= qaService.retrieveQaUsrResp(new Long(responseId).longValue()); + logger.debug("qaUsrResp: " + qaUsrResp); + refreshUserInput(request); + + QaContent qaContent=qaUsrResp.getQaQueContent().getQaContent(); + logger.debug("qaContent: " + qaContent); + GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent); + logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO); + + refreshSummaryData(request, qaContent, qaService, true, false, null, null, generalLearnerFlowDTO); + return (mapping.findForward(LOAD_MONITORING)); } @@ -604,6 +631,14 @@ request.getSession().setAttribute(EDIT_RESPONSE, new Boolean(false)); refreshUserInput(request); + + QaContent qaContent=qaUsrResp.getQaQueContent().getQaContent(); + logger.debug("qaContent: " + qaContent); + + GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent); + logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO); + + refreshSummaryData(request, qaContent, qaService, true, false, null, null, generalLearnerFlowDTO); return (mapping.findForward(LOAD_MONITORING)); } @@ -646,9 +681,15 @@ qaService.removeUserResponse(qaUsrResp); logger.debug("response deleted."); - //logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); - refreshUserInput(request); + + QaContent qaContent=qaUsrResp.getQaQueContent().getQaContent(); + logger.debug("qaContent: " + qaContent); + + GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent); + logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO); + + refreshSummaryData(request, qaContent, qaService, true, false, null, null, generalLearnerFlowDTO); return (mapping.findForward(LOAD_MONITORING)); } @@ -776,12 +817,10 @@ ServletException, ToolException { logger.debug("dispatching proxy endLearning to learnng module..."); - //IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); IQaService qaService = QaServiceProxy.getQaService(getServlet().getServletContext()); logger.debug("qaService: " + qaService); QaLearningAction qaLearningAction= new QaLearningAction(); - //qaLearningAction.endLearning(request, qaService, response); return null; } @@ -832,16 +871,6 @@ logger.debug("summaryToolSessionsId: " + summaryToolSessionsId); request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS_ID, summaryToolSessionsId); - /* SELECTION_CASE == 2 indicates start up */ - request.getSession().setAttribute(SELECTION_CASE, new Long(2)); - logger.debug("SELECTION_CASE: " + request.getSession().getAttribute(SELECTION_CASE)); - - /* Default to All for tool Sessions so that all tool sessions' summary information gets displayed when the module starts up */ - //request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, "All"); - //logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); - - request.setAttribute(CURRENT_MONITORED_TOOL_SESSION, "All"); - logger.debug("using allUsersData to retrieve data: " + isUserNamesVisible); List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, qaContent, qaService, isUserNamesVisible, isLearnerRequest, currentSessionId, userId); @@ -850,8 +879,16 @@ if (generalLearnerFlowDTO != null) { - logger.debug("placing LIST_MONITORED_ANSWERS_CONTAINER_DTO within generalLearnerFlowDTO."); + logger.debug("final generalLearnerFlowDTO: " + generalLearnerFlowDTO); + logger.debug("placing LIST_MONITORED_ANSWERS_CONTAINER_DTO within generalLearnerFlowDTO"); generalLearnerFlowDTO.setListMonitoredAnswersContainerDTO(listMonitoredAnswersContainerDTO); + + if (isLearnerRequest) + { + logger.debug("isLearnerRequest is true."); + generalLearnerFlowDTO.setRequestLearningReportProgress(new Boolean(true).toString()); + } + request.setAttribute(GENERAL_LEARNER_FLOW_DTO, generalLearnerFlowDTO); } @@ -882,7 +919,6 @@ QaContent qaContent=qaService.loadQa(toolContentId.longValue()); logger.debug("existing qaContent:" + qaContent); - //int countAllUsers=qaService.getTotalNumberOfUsers(); int countAllUsers=qaService.getTotalNumberOfUsers(qaContent); logger.debug("countAllUsers: " + countAllUsers); @@ -894,7 +930,6 @@ request.getSession().setAttribute(COUNT_ALL_USERS, new Integer(countAllUsers).toString()); - //int countSessionComplete=qaService.countSessionComplete(); int countSessionComplete=qaService.countSessionComplete(qaContent); logger.debug("countSessionComplete: " + countSessionComplete); request.getSession().setAttribute(COUNT_SESSION_COMPLETE, new Integer(countSessionComplete).toString()); @@ -935,7 +970,6 @@ QaContent qaContent=qaService.loadQa(toolContentId.longValue()); logger.debug("existing qaContent:" + qaContent); - String currentMonitoredToolSession=voteMonitoringForm.getSelectedToolSessionId(); logger.debug("currentMonitoredToolSession: " + currentMonitoredToolSession); @@ -944,7 +978,9 @@ currentMonitoredToolSession="All"; } - refreshSummaryData(request, qaContent, qaService, true, false, null, null, null); + GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent); + logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO); + refreshSummaryData(request, qaContent, qaService, true, false, null, null, generalLearnerFlowDTO); if (currentMonitoredToolSession.equals("All")) @@ -957,9 +993,8 @@ } logger.debug("SELECTION_CASE: " + request.getSession().getAttribute(SELECTION_CASE)); - //request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); - //logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); - request.setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); + request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); + logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); logger.debug("submitting session to refresh the data from the database: "); return (mapping.findForward(LOAD_MONITORING)); @@ -1003,14 +1038,16 @@ String currentMonitoredToolSession=voteMonitoringForm.getSelectedToolSessionId(); logger.debug("currentMonitoredToolSession: " + currentMonitoredToolSession); + if (currentMonitoredToolSession.equals("")) { currentMonitoredToolSession="All"; } - refreshSummaryData(request, qaContent, qaService, true, false, null, null, null); + GeneralLearnerFlowDTO generalLearnerFlowDTO= LearningUtil.buildGeneralLearnerFlowDTO(qaContent); + logger.debug("generalLearnerFlowDTO: " + generalLearnerFlowDTO); + refreshSummaryData(request, qaContent, qaService, true, false, null, null, generalLearnerFlowDTO); - if (currentMonitoredToolSession.equals("All")) { request.getSession().setAttribute(SELECTION_CASE, new Long(2)); @@ -1021,10 +1058,9 @@ } logger.debug("SELECTION_CASE: " + request.getSession().getAttribute(SELECTION_CASE)); - //request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); - //logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); - request.setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); - + request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, currentMonitoredToolSession); + logger.debug("CURRENT_MONITORED_TOOL_SESSION: " + request.getSession().getAttribute(CURRENT_MONITORED_TOOL_SESSION)); + logger.debug("submitting session to refresh the data from the database: "); return (mapping.findForward(LOAD_MONITORING)); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v diff -u -r1.38 -r1.39 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 28 Jul 2006 20:18:47 -0000 1.38 +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java 29 Jul 2006 21:37:20 -0000 1.39 @@ -174,7 +174,9 @@ } logger.debug("final USER_EXCEPTION_NO_TOOL_SESSIONS: " + request.getSession().getAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS)); - + + request.getSession().setAttribute(CURRENT_MONITORED_TOOL_SESSION, "All"); + request.getSession().setAttribute(SELECTION_CASE, new Long(2)); request.getSession().setAttribute(ACTIVE_MODULE, MONITORING); qaMonitoringForm.setActiveModule(MONITORING); return (mapping.findForward(LOAD_MONITORING)); @@ -201,10 +203,8 @@ request.getSession().setAttribute(EDIT_RESPONSE, new Boolean(false)); request.getSession().setAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS, new Boolean(true).toString()); - /* - * persist time zone information to session scope. - */ - QaUtils.persistTimeZone(request); + /* save time zone information to session scope. */ + QaUtils.saveTimeZone(request); /* we have made sure TOOL_CONTENT_ID is passed */ Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); @@ -221,8 +221,6 @@ return false; } - - if (qaContent.getTitle() == null) { request.getSession().setAttribute(ACTIVITY_TITLE, "Questions and Answers"); Fisheye: Tag 1.4 refers to a dead (removed) revision in file `lams_tool_laqa/web/export/ExportContent.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_laqa/web/export/exportportfolio.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/export/exportportfolio.jsp,v diff -u -r1.7 -r1.8 --- lams_tool_laqa/web/export/exportportfolio.jsp 6 Jul 2006 04:37:26 -0000 1.7 +++ lams_tool_laqa/web/export/exportportfolio.jsp 29 Jul 2006 21:37:19 -0000 1.8 @@ -29,8 +29,8 @@ - - + + @@ -60,13 +60,52 @@ - - - + + + + + + + + + + + + + + + + +
   
: + +
+ + + + + + + + + + + + + + + + + + + + +
+
+ + + - - Index: lams_tool_laqa/web/learning/LearnerRep.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/learning/LearnerRep.jsp,v diff -u -r1.2 -r1.3 --- lams_tool_laqa/web/learning/LearnerRep.jsp 28 Jul 2006 20:18:47 -0000 1.2 +++ lams_tool_laqa/web/learning/LearnerRep.jsp 29 Jul 2006 21:37:19 -0000 1.3 @@ -119,23 +119,11 @@ - - - - - - - - - - - - @@ -207,23 +195,11 @@ - - - - - - - - - - - - Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/SummaryContent.jsp,v diff -u -r1.18 -r1.19 --- lams_tool_laqa/web/monitoring/SummaryContent.jsp 28 Jul 2006 20:18:47 -0000 1.18 +++ lams_tool_laqa/web/monitoring/SummaryContent.jsp 29 Jul 2006 21:37:19 -0000 1.19 @@ -50,10 +50,10 @@ - + - + @@ -97,12 +97,12 @@ - + - - + +