DTO that holds question and user attempts data for jsp purposes + *
+ * + * @author Ozgur Demirtas + */ +public class QaMonitoredAnswersDTO implements Comparable +{ + private String questionUid; + + private String question; + + private Map questionAttempts; + + + /** + + /** + * @return Returns the question. + */ + public String getQuestion() { + return question; + } + /** + * @param question The question to set. + */ + public void setQuestion(String question) { + this.question = question; + } + /** + * @return Returns the questionUid. + */ + public String getQuestionUid() { + return questionUid; + } + /** + * @param questionUid The questionUid to set. + */ + public void setQuestionUid(String questionUid) { + this.questionUid = questionUid; + } + + /** + * @return Returns the questionAttempts. + */ + public Map getQuestionAttempts() { + return questionAttempts; + } + /** + * @param questionAttempts The questionAttempts to set. + */ + public void setQuestionAttempts(Map questionAttempts) { + this.questionAttempts = questionAttempts; + } + + public String toString() { + return new ToStringBuilder(this) + .append("question", getQuestion()) + .toString(); + } + + public int compareTo(Object o) + { + QaMonitoredAnswersDTO qaMonitoredAnswersDTO = (QaMonitoredAnswersDTO) o; + + if (qaMonitoredAnswersDTO == null) + return 1; + else + return (int) (new Long(questionUid).longValue() - new Long(qaMonitoredAnswersDTO.questionUid).longValue()); + } + +} Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties =================================================================== diff -u -rbb041188ecb180ae9cd8e01428c8f431aa89bd93 -rf81218072afa2e0748b1223fbed3b5b4d0018c87 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision bb041188ecb180ae9cd8e01428c8f431aa89bd93) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaResources.properties (.../QaResources.properties) (revision f81218072afa2e0748b1223fbed3b5b4d0018c87) @@ -144,6 +144,7 @@ error.contentrepository =An error has occurred when saving/deleting instruction file {0}. The files may not be saved correctly. monitoring.feedback.instructionUpdate =The content has been updated successfully. +label.selectGroup =Select Group: group.label =Group button.summary =Summary button.editActivity =Edit Activity Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueContentDAO.java =================================================================== diff -u -rf2b7c28c53bfee9c676b5a836e42b71e0e1bf20f -rf81218072afa2e0748b1223fbed3b5b4d0018c87 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueContentDAO.java (.../IQaQueContentDAO.java) (revision f2b7c28c53bfee9c676b5a836e42b71e0e1bf20f) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/IQaQueContentDAO.java (.../IQaQueContentDAO.java) (revision f81218072afa2e0748b1223fbed3b5b4d0018c87) @@ -45,4 +45,6 @@ public void removeQueContent(long qaQueContentId); public List getQaQueContentsByContentId(long qaContentId); + + public List getAllQuestionEntries(final long qaContentId); } Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java =================================================================== diff -u -rd02bece7bdf9572cacaa891df7b0efceb3096ef5 -rf81218072afa2e0748b1223fbed3b5b4d0018c87 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java (.../QaQueContentDAO.java) (revision d02bece7bdf9572cacaa891df7b0efceb3096ef5) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaQueContentDAO.java (.../QaQueContentDAO.java) (revision f81218072afa2e0748b1223fbed3b5b4d0018c87) @@ -50,7 +50,7 @@ static Logger logger = Logger.getLogger(QaQueContentDAO.class.getName()); private static final String LOAD_QUESTION_CONTENT_BY_CONTENT_ID = "from qaQueContent in class QaQueContent where qaQueContent.qaContentId=:qaContentId"; private static final String GET_QUESTION_IDS_FOR_CONTENT = "select qaQueContent.qaQueContentId from QaQueContent qaQueContent where qaQueContent.qaContentId = :qa"; - + public QaQueContent getToolDefaultQuestionContent(final long qaContentId) { return (QaQueContent) getHibernateTemplate().execute(new HibernateCallback() @@ -91,7 +91,17 @@ return listDefaultQuestionIds; } + public List getAllQuestionEntries(final long qaContentId) + { + HibernateTemplate templ = this.getHibernateTemplate(); + List list = getSession().createQuery(LOAD_QUESTION_CONTENT_BY_CONTENT_ID) + .setLong("qaContentId", qaContentId) + .list(); + + return list; + } + public void createQueContent(QaQueContent queContent) { this.getSession().setFlushMode(FlushMode.AUTO); Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== diff -u -rbb041188ecb180ae9cd8e01428c8f431aa89bd93 -rf81218072afa2e0748b1223fbed3b5b4d0018c87 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision bb041188ecb180ae9cd8e01428c8f431aa89bd93) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision f81218072afa2e0748b1223fbed3b5b4d0018c87) @@ -22,6 +22,7 @@ package org.lamsfoundation.lams.tool.qa.web; import java.util.Iterator; +import java.util.LinkedList; import java.util.List; import java.util.Map; @@ -31,6 +32,8 @@ import org.apache.struts.action.ActionForm; import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; +import org.lamsfoundation.lams.tool.qa.QaMonitoredAnswersDTO; +import org.lamsfoundation.lams.tool.qa.QaQueContent; import org.lamsfoundation.lams.tool.qa.QaSession; import org.lamsfoundation.lams.tool.qa.QaUsrResp; import org.lamsfoundation.lams.tool.qa.QaUtils; @@ -98,80 +101,10 @@ request.getSession().removeAttribute(TARGET_MODE); } - /** - * findSelectedMonitoringTab(ActionForm form, - * HttpServletRequest request) - * return void - * determines which monitoring tabs is the active one. - * - */ - public void findSelectedMonitoringTab(ActionForm form, - HttpServletRequest request) - { - QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; - String choiceTypeMonitoringSummary=qaMonitoringForm.getSummary(); - String choiceTypeMonitoringInstructions=qaMonitoringForm.getInstructions(); - String choiceTypeMonitoringEditActivity=qaMonitoringForm.getEditActivity(); - String choiceTypeMonitoringStats=qaMonitoringForm.getStats(); - - /* make the Summary tab the default one */ - request.getSession().setAttribute(CHOICE_MONITORING,CHOICE_TYPE_MONITORING_SUMMARY); - - if (choiceTypeMonitoringSummary != null) - { - logger.debug("CHOICE_TYPE_MONITORING_SUMMARY"); - request.getSession().setAttribute(CHOICE_MONITORING,CHOICE_TYPE_MONITORING_SUMMARY); - } - else if ((choiceTypeMonitoringInstructions != null) || (qaMonitoringForm.getSubmitMonitoringInstructions() != null)) - { - logger.debug("CHOICE_TYPE_MONITORING_INSTRUCTIONS"); - request.getSession().setAttribute(CHOICE_MONITORING,CHOICE_TYPE_MONITORING_INSTRUCTIONS); - } - else if (choiceTypeMonitoringEditActivity != null) - { - logger.debug("CHOICE_TYPE_MONITORING_EDITACTIVITY"); - request.getSession().setAttribute(CHOICE_MONITORING,CHOICE_TYPE_MONITORING_EDITACTIVITY); - } - else if (choiceTypeMonitoringStats != null) - { - logger.debug("CHOICE_TYPE_MONITORING_STATS"); - request.getSession().setAttribute(CHOICE_MONITORING,CHOICE_TYPE_MONITORING_STATS); - } - logger.debug("CHOICE_MONITORING is:" + request.getSession().getAttribute(CHOICE_MONITORING)); - - /* reset tab controllers */ - qaMonitoringForm.setSummary(null); - qaMonitoringForm.setInstructions(null); - qaMonitoringForm.setEditActivity(null); - qaMonitoringForm.setStats(null); - } + - /** - * boolean isNonDefaultScreensVisited(HttpServletRequest request) - * @param request - * @return boolean - */ - public boolean isNonDefaultScreensVisited(HttpServletRequest request) - { - Boolean monitoringInstructionsVisited = (Boolean) request.getSession().getAttribute(MONITORING_INSTRUCTIONS_VISITED); - Boolean monitoringEditActivityVisited = (Boolean) request.getSession().getAttribute(MONITORING_EDITACTIVITY_VISITED); - Boolean monitoringStatsVisited = (Boolean) request.getSession().getAttribute(MONITORING_STATS_VISITED); - - logger.debug("isNonDefaultScreensVisited:" + monitoringInstructionsVisited + " " + - monitoringEditActivityVisited + " " + monitoringStatsVisited); - - if ((monitoringInstructionsVisited != null) && (monitoringInstructionsVisited.booleanValue())) - return true; - - if ((monitoringEditActivityVisited != null) && (monitoringEditActivityVisited.booleanValue())) - return true; - - if ((monitoringStatsVisited != null) && (monitoringStatsVisited.booleanValue())) - return true; - - return false; - } + /** @@ -254,4 +187,48 @@ logger.debug("final sessionsMap:" + sessionsMap); return sessionsMap; } + + + /** + * ends up populating the attempt history for all the users of all the tool sessions for a content + * buildGroupsQuestionData(HttpServletRequest request, McContent mcContent) + * + * @param request + * @param mcContent + * @return List + */ + public static List buildGroupsQuestionData(HttpServletRequest request, QaContent qaContent) + { + IQaService qaService = (IQaService)request.getSession().getAttribute(TOOL_SERVICE); + logger.debug("qaService: " + qaService); + + logger.debug("will be building groups question data for content:..." + qaContent); + List listQuestions=qaService.getAllQuestionEntries(qaContent.getUid()); + logger.debug("listQuestions:..." + listQuestions); + + List listMonitoredAnswersContainerDTO= new LinkedList(); + + Iterator itListQuestions = listQuestions.iterator(); + while (itListQuestions.hasNext()) + { + QaQueContent qaQueContent =(QaQueContent)itListQuestions.next(); + logger.debug("mcQueContent:..." + qaQueContent); + + if (qaQueContent != null) + { + QaMonitoredAnswersDTO qaMonitoredAnswersDTO= new QaMonitoredAnswersDTO(); + qaMonitoredAnswersDTO.setQuestionUid(qaQueContent.getUid().toString()); + qaMonitoredAnswersDTO.setQuestion(qaQueContent.getQuestion()); + + //Map questionAttemptData= buildGroupsAttemptData(request, qaContent, qaQueContent, qaQueContent.getUid().toString()); + //logger.debug("questionAttemptData:..." + questionAttemptData); + //qaMonitoredAnswersDTO.setQuestionAttempts(questionAttemptData); + listMonitoredAnswersContainerDTO.add(qaMonitoredAnswersDTO); + + } + } + logger.debug("final listMonitoredAnswersContainerDTO:..." + listMonitoredAnswersContainerDTO); + return listMonitoredAnswersContainerDTO; + } } + Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java =================================================================== diff -u -rbb041188ecb180ae9cd8e01428c8f431aa89bd93 -rf81218072afa2e0748b1223fbed3b5b4d0018c87 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision bb041188ecb180ae9cd8e01428c8f431aa89bd93) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java (.../QaMonitoringAction.java) (revision f81218072afa2e0748b1223fbed3b5b4d0018c87) @@ -43,7 +43,6 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaContent; import org.lamsfoundation.lams.tool.qa.service.IQaService; -import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy; import org.lamsfoundation.lams.web.action.LamsDispatchAction; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -170,6 +169,52 @@ return (mapping.findForward(LOAD_MONITORING)); } + /** + * gets called when the user selects a group from dropdown box in the summary tab + * submitSession(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException + * + * @param mapping + * @param form + * @param request + * @param response + * @return + * @throws IOException + * @throws ServletException + */ + public ActionForward submitSession(ActionMapping mapping, + ActionForm form, + HttpServletRequest request, + HttpServletResponse response) throws IOException, + ServletException + { + logger.debug("dispatching submitSession..."); + + QaMonitoringForm qaMonitoringForm = (QaMonitoringForm) form; + String currentMonitoredToolSession=qaMonitoringForm.getSelectedToolSessionId(); + logger.debug("currentMonitoredToolSession: " + currentMonitoredToolSession); + + if (currentMonitoredToolSession.equals("All")) + { + request.getSession().setAttribute(SELECTION_CASE, new Long(2)); + } + else + { + /* SELECTION_CASE == 1 indicates a selected group other than "All" */ + request.getSession().setAttribute(SELECTION_CASE, new Long(1)); + } + 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)); + + return (mapping.findForward(LOAD_MONITORING)); + } + /** * persists error messages to request scope Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringForm.java =================================================================== diff -u -rbb041188ecb180ae9cd8e01428c8f431aa89bd93 -rf81218072afa2e0748b1223fbed3b5b4d0018c87 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringForm.java (.../QaMonitoringForm.java) (revision bb041188ecb180ae9cd8e01428c8f431aa89bd93) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringForm.java (.../QaMonitoringForm.java) (revision f81218072afa2e0748b1223fbed3b5b4d0018c87) @@ -22,7 +22,6 @@ package org.lamsfoundation.lams.tool.qa.web; /* ActionForm for the Monitoring environment */ -import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.lamsfoundation.lams.tool.qa.QaAppConstants; @@ -33,281 +32,39 @@ * Window - Preferences - Java - Code Style - Code Templates */ public class QaMonitoringForm extends ActionForm implements QaAppConstants { - static Logger logger = Logger.getLogger(QaMonitoringForm.class.getName()); - - protected String startLesson; - protected String deleteLesson; - protected String forceComplete; - +// controls which method is called by the Lookup map */ protected String method; - protected String editReport; - protected String updateReport; - protected String hideReport; - protected String unhideReport; - protected String submitMonitoringInstructions; + protected String selectedToolSessionId; - protected String summary; - protected String instructions; - protected String editActivity; - protected String stats; + protected String isToolSessionChanged; - protected String responseId; - protected String hiddenResponseId; - protected String unHiddenResponseId; - protected String updatedResponse; - - protected String offlineInstructions; - protected String onlineInstructions; - - private Long toolContentID; - - public void resetUserAction() - { - this.startLesson=null; - this.deleteLesson=null; - this.forceComplete=null; - - this.summary=null; - this.instructions=null; - this.editActivity=null; - this.stats=null; - - this.editReport=null; - this.updateReport=null; - this.hideReport=null; - this.unhideReport=null; - - this.offlineInstructions=null; - this.onlineInstructions=null; - } /** - * @return Returns the deleteLesson. + * @return Returns the isToolSessionChanged. */ - public String getDeleteLesson() { - return deleteLesson; + public String getIsToolSessionChanged() { + return isToolSessionChanged; } /** - * @param deleteLesson The deleteLesson to set. + * @param isToolSessionChanged The isToolSessionChanged to set. */ - public void setDeleteLesson(String deleteLesson) { - this.deleteLesson = deleteLesson; + public void setIsToolSessionChanged(String isToolSessionChanged) { + this.isToolSessionChanged = isToolSessionChanged; } /** - * @return Returns the startLesson. + * @return Returns the selectedToolSessionId. */ - public String getStartLesson() { - return startLesson; + public String getSelectedToolSessionId() { + return selectedToolSessionId; } /** - * @param startLesson The startLesson to set. + * @param selectedToolSessionId The selectedToolSessionId to set. */ - public void setStartLesson(String startLesson) { - this.startLesson = startLesson; + public void setSelectedToolSessionId(String selectedToolSessionId) { + this.selectedToolSessionId = selectedToolSessionId; } + /** - * @return Returns the forceComplete. - */ - public String getForceComplete() { - return forceComplete; - } - /** - * @param forceComplete The forceComplete to set. - */ - public void setForceComplete(String forceComplete) { - this.forceComplete = forceComplete; - } - /** - * @return Returns the summary. - */ - public String getSummary() { - return summary; - } - /** - * @param summary The summary to set. - */ - public void setSummary(String summary) { - this.summary = summary; - } - /** - * @return Returns the instructions. - */ - public String getInstructions() { - return instructions; - } - /** - * @param instructions The instructions to set. - */ - public void setInstructions(String instructions) { - this.instructions = instructions; - } - /** - * @return Returns the editActivity. - */ - public String getEditActivity() { - return editActivity; - } - /** - * @param editActivity The editActivity to set. - */ - public void setEditActivity(String editActivity) { - this.editActivity = editActivity; - } - /** - * @return Returns the stats. - */ - public String getStats() { - return stats; - } - /** - * @param stats The stats to set. - */ - public void setStats(String stats) { - this.stats = stats; - } - /** - * @return Returns the editReport. - */ - public String getEditReport() { - return editReport; - } - /** - * @param editReport The editReport to set. - */ - public void setEditReport(String editReport) { - this.editReport = editReport; - } - /** - * @return Returns the responseId. - */ - public String getResponseId() { - return responseId; - } - /** - * @param responseId The responseId to set. - */ - public void setResponseId(String responseId) { - this.responseId = responseId; - } - /** - * @return Returns the updateReport. - */ - public String getUpdateReport() { - return updateReport; - } - /** - * @param updateReport The updateReport to set. - */ - public void setUpdateReport(String updateReport) { - this.updateReport = updateReport; - } - /** - * @return Returns the updatedResponse. - */ - public String getUpdatedResponse() { - return updatedResponse; - } - /** - * @param updatedResponse The updatedResponse to set. - */ - public void setUpdatedResponse(String updatedResponse) { - this.updatedResponse = updatedResponse; - } - /** - * @return Returns the hideReport. - */ - public String getHideReport() { - return hideReport; - } - /** - * @param hideReport The hideReport to set. - */ - public void setHideReport(String hideReport) { - this.hideReport = hideReport; - } - /** - * @return Returns the hiddenResponseId. - */ - public String getHiddenResponseId() { - return hiddenResponseId; - } - /** - * @param hiddenResponseId The hiddenResponseId to set. - */ - public void setHiddenResponseId(String hiddenResponseId) { - this.hiddenResponseId = hiddenResponseId; - } - /** - * @return Returns the unhideReport. - */ - public String getUnhideReport() { - return unhideReport; - } - /** - * @param unhideReport The unhideReport to set. - */ - public void setUnhideReport(String unhideReport) { - this.unhideReport = unhideReport; - } - /** - * @return Returns the unHiddenResponseId. - */ - public String getUnHiddenResponseId() { - return unHiddenResponseId; - } - /** - * @param unHiddenResponseId The unHiddenResponseId to set. - */ - public void setUnHiddenResponseId(String unHiddenResponseId) { - this.unHiddenResponseId = unHiddenResponseId; - } - /** - * @return Returns the offlineInstructions. - */ - public String getOfflineInstructions() { - return offlineInstructions; - } - /** - * @param offlineInstructions The offlineInstructions to set. - */ - public void setOfflineInstructions(String offlineInstructions) { - this.offlineInstructions = offlineInstructions; - } - /** - * @return Returns the onlineInstructions. - */ - public String getOnlineInstructions() { - return onlineInstructions; - } - /** - * @param onlineInstructions The onlineInstructions to set. - */ - public void setOnlineInstructions(String onlineInstructions) { - this.onlineInstructions = onlineInstructions; - } - /** - * @return Returns the submitMonitoringInstructions. - */ - public String getSubmitMonitoringInstructions() { - return submitMonitoringInstructions; - } - /** - * @param submitMonitoringInstructions The submitMonitoringInstructions to set. - */ - public void setSubmitMonitoringInstructions( - String submitMonitoringInstructions) { - this.submitMonitoringInstructions = submitMonitoringInstructions; - } - - - public Long getToolContentID() { - return toolContentID; - } - public void setToolContentID(Long toolContentID) { - this.toolContentID = toolContentID; - } - - /** * @return Returns the method. */ public String getMethod() { Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java =================================================================== diff -u -rbb041188ecb180ae9cd8e01428c8f431aa89bd93 -rf81218072afa2e0748b1223fbed3b5b4d0018c87 --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision bb041188ecb180ae9cd8e01428c8f431aa89bd93) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java (.../QaMonitoringStarterAction.java) (revision f81218072afa2e0748b1223fbed3b5b4d0018c87) @@ -2,6 +2,7 @@ package org.lamsfoundation.lams.tool.qa.web; import java.io.IOException; +import java.util.List; import java.util.Map; import javax.servlet.ServletException; @@ -19,6 +20,7 @@ import org.lamsfoundation.lams.tool.qa.QaAppConstants; import org.lamsfoundation.lams.tool.qa.QaApplicationException; import org.lamsfoundation.lams.tool.qa.QaContent; +import org.lamsfoundation.lams.tool.qa.QaUtils; import org.lamsfoundation.lams.tool.qa.service.IQaService; import org.lamsfoundation.lams.tool.qa.service.QaServiceProxy; import org.lamsfoundation.lams.web.util.AttributeNames; @@ -76,6 +78,10 @@ request.getSession().setAttribute(CURRENT_MONITORING_TAB, "summary"); + /* + * persist time zone information to session scope. + */ + QaUtils.persistTimeZone(request); /* we have made sure TOOL_CONTENT_ID is passed */ Long toolContentId =(Long) request.getSession().getAttribute(TOOL_CONTENT_ID); @@ -102,6 +108,20 @@ request.getSession().setAttribute(SUMMARY_TOOL_SESSIONS, summaryToolSessions); logger.debug("SUMMARY_TOOL_SESSIONS: " + request.getSession().getAttribute(SUMMARY_TOOL_SESSIONS)); + + + + /* 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)); + + List listMonitoredAnswersContainerDTO=MonitoringUtil.buildGroupsQuestionData(request, qaContent); + request.getSession().setAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO, listMonitoredAnswersContainerDTO); + logger.debug("LIST_MONITORED_ANSWERS_CONTAINER_DTO: " + request.getSession().getAttribute(LIST_MONITORED_ANSWERS_CONTAINER_DTO)); /* ends here. */ Index: lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -rbb041188ecb180ae9cd8e01428c8f431aa89bd93 -rf81218072afa2e0748b1223fbed3b5b4d0018c87 --- lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision bb041188ecb180ae9cd8e01428c8f431aa89bd93) +++ lams_tool_laqa/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision f81218072afa2e0748b1223fbed3b5b4d0018c87) @@ -52,13 +52,13 @@ // actionMethod: name of the method to be called in the DispatchAction function submitMonitoringMethod(actionMethod) { - document.McMonitoringForm.method.value=actionMethod; - document.McMonitoringForm.submit(); + document.QaMonitoringForm.method.value=actionMethod; + document.QaMonitoringForm.submit(); } function submitModifyQuestion(questionIndexValue, actionMethod) { - document.McMonitoringForm.questionIndex.value=questionIndexValue; + document.QaMonitoringForm.questionIndex.value=questionIndexValue; submitMethod(actionMethod); } @@ -68,13 +68,12 @@ } function deleteOption(deletableOptionIndex, actionMethod) { - document.McMonitoringForm.deletableOptionIndex.value=deletableOptionIndex; + document.QaMonitoringForm.deletableOptionIndex.value=deletableOptionIndex; submitMethod(actionMethod); } - function submitSession(selectedToolSessionId, actionMethod) { - document.McMonitoringForm.selectedToolSessionId.value=selectedToolSessionId; + document.QaMonitoringForm.selectedToolSessionId.value=selectedToolSessionId; submitMonitoringMethod(actionMethod); } Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp =================================================================== diff -u -rbb041188ecb180ae9cd8e01428c8f431aa89bd93 -rf81218072afa2e0748b1223fbed3b5b4d0018c87 --- lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision bb041188ecb180ae9cd8e01428c8f431aa89bd93) +++ lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision f81218072afa2e0748b1223fbed3b5b4d0018c87) @@ -43,10 +43,41 @@| |
+