Index: lams_build/lib/lams/lams-central.jar =================================================================== diff -u -r602145a2b0b9e23fb86cbc5d0a1b25b967bff68b -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 Binary files differ Index: lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishController.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishController.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishController.java (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -0,0 +1,183 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +package org.lamsfoundation.lams.authoring.web; + +import java.io.IOException; +import java.net.URLEncoder; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.apache.commons.lang.StringUtils; +import org.apache.log4j.Logger; +import org.lamsfoundation.lams.tool.IToolVO; +import org.lamsfoundation.lams.tool.ToolAccessMode; +import org.lamsfoundation.lams.tool.ToolContentManager; +import org.lamsfoundation.lams.tool.service.ILamsToolService; +import org.lamsfoundation.lams.util.Configuration; +import org.lamsfoundation.lams.util.ConfigurationKeys; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.util.audit.IAuditService; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.beans.factory.NoSuchBeanDefinitionException; +import org.springframework.context.ApplicationContext; + +/** + * This controller class does some process when author try to save/cancel/close authoring tool pages. If author try to + * save + * tool page, this action will redirects tool page to confirm page and execute clearSession() method. If author try to + * cancel/close window, this action will execute clearSession(). + * + * @author Steve.Ni + */ +public abstract class LamsAuthoringFinishController { + private static Logger log = Logger.getLogger(LamsAuthoringFinishController.class); + + private static final String ACTION_NAME = "action"; + private static final String ACTION_MODE = "mode"; + private static final String CUSTOMISE_SESSION_ID = "customiseSessionID"; + private static final String TOOL_SIGNATURE = "signature"; + + private static final String CONFIRM_ACTION = "confirm"; + private static final String CANCEL_ACTION = "cancel"; + private static final String DEFINE_LATER_ACTION = "defineLater"; + + private static final String RE_EDIT_URL = "reEditUrl"; + + private static IAuditService auditService; + + /** + * Action method, will handle save/cancel action. + */ + public void execute(HttpServletRequest request, HttpServletResponse response, ApplicationContext applicationContext) + throws IOException { + String action = request.getParameter(ACTION_NAME); + ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, ACTION_MODE, false); + String cSessionID = request.getParameter(CUSTOMISE_SESSION_ID); + String notifyCloseURL = (String) request.getSession().getAttribute(AttributeNames.PARAM_NOTIFY_CLOSE_URL); + Long toolContentId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID)); + + // clear session according to the ToolAccessMode. + clearSession(cSessionID, request.getSession(), mode); + + //CONFIRM_ACTION got fired only for general authoring and not for define later one + if (StringUtils.equals(action, CONFIRM_ACTION)) { + String nextUrl = getLamsUrl() + "authoringConfirm.jsp"; + String signature = request.getParameter(TOOL_SIGNATURE); + + String contentFolderID = "TODO_remove-change_optional_to_false"; + contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID, true); + + // check whether it use on define it later page + IToolVO tool = getToolService(applicationContext).getToolBySignature(signature); + + //add reeditUrl parameter + String reeditUrl = WebUtil.appendParameterToURL(getLamsUrl() + tool.getAuthorUrl(), + AttributeNames.PARAM_TOOL_CONTENT_ID, toolContentId.toString()); + reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_CONTENT_FOLDER_ID, + contentFolderID); + if (notifyCloseURL != null && notifyCloseURL.length() > 0) { + reeditUrl = WebUtil.appendParameterToURL(reeditUrl, AttributeNames.PARAM_NOTIFY_CLOSE_URL, + notifyCloseURL); + } + nextUrl = WebUtil.appendParameterToURL(nextUrl, RE_EDIT_URL, URLEncoder.encode(reeditUrl, "UTF-8")); + + if (!StringUtils.isBlank(notifyCloseURL)) { + nextUrl = WebUtil.appendParameterToURL(nextUrl, AttributeNames.PARAM_NOTIFY_CLOSE_URL, notifyCloseURL); + } + response.sendRedirect(nextUrl); + } + + //audit log content has been finished being edited + if (StringUtils.equals(action, DEFINE_LATER_ACTION)) { + getAuditService(applicationContext).logFinishEditingActivityInMonitor(toolContentId); + } + + //reset defineLater task + if (StringUtils.equals(action, CANCEL_ACTION) && mode.isTeacher()) { + String signature = request.getParameter(TOOL_SIGNATURE); + + ToolContentManager contentManager = (ToolContentManager) findToolService(applicationContext, signature); + contentManager.resetDefineLater(toolContentId); + + getAuditService(applicationContext).logCancelEditingActivityInMonitor(toolContentId); + } + } + + /** + * All subclass will implements this method and execute clear HttpSession action to remove obsolete + * session values. + * + * @param customiseSessionID + * customised session ID. + * @param session + * @param mode + * ToolAccessMode to decide which role's session will be clear. + */ + abstract protected void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode); + + // --------------------------------------------------------------------- + // Helper Methods + // --------------------------------------------------------------------- + + private String getLamsUrl() { + String serverURL = Configuration.get(ConfigurationKeys.SERVER_URL); + + if (StringUtils.isBlank(serverURL)) { + log.warn("ServerURLTag unable to write out server URL as it is missing from the configuration file."); + } + + return serverURL; + } + + private ILamsToolService getToolService(ApplicationContext applicationContext) { + return (ILamsToolService) applicationContext.getBean(AuthoringConstants.TOOL_SERVICE_BEAN_NAME); + } + + /** + * Get AuditService bean + */ + private IAuditService getAuditService(ApplicationContext applicationContext) { + if (auditService == null) { + auditService = (IAuditService) applicationContext.getBean("auditService"); + } + return auditService; + } + + /** + * Find a tool's service registered inside lams. + * + * @param signature + * the tool signature. + * @return the service object from tool. + * @throws NoSuchBeanDefinitionException + * if the tool is not the classpath or the supplied service name is wrong. + */ + private Object findToolService(ApplicationContext applicationContext, String signature) + throws NoSuchBeanDefinitionException { + IToolVO tool = getToolService(applicationContext).getToolBySignature(signature); + return applicationContext.getBean(tool.getServiceName()); + } +} Index: lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java =================================================================== diff -u --- lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java (revision 0) +++ lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivitySpringForm.java (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -0,0 +1,108 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +package org.lamsfoundation.lams.web.planner; + +import org.apache.struts.action.ActionMessages; + +/** + * The base for any Pedagogical Planner Action Forms that other activities. All Java forms need to inherit from this + * class and forms on JSP pages need to have these properties declared as hidden elements. + * + * @author Marcin Cieslak + * + */ +public abstract class PedagogicalPlannerActivitySpringForm { + /** + * Set when opening a Learning Design. + */ + private Integer activityOrderNumber; + private Long toolContentID; + /** + * Set in {@link #validate()} method. + */ + private Boolean valid = true; + /** + * Set when submitting form in base.jsp page. + */ + private Integer callID; + + /** + * Only to save. It is loaded straight from the tool. + */ + private String editingAdvice; + + public Long getToolContentID() { + return toolContentID; + } + + public void setToolContentID(Long toolContentID) { + this.toolContentID = toolContentID; + } + + public Boolean getValid() { + return valid; + } + + public void setValid(Boolean valid) { + this.valid = valid; + } + + public Integer getCallID() { + return callID; + } + + public void setCallID(Integer callID) { + this.callID = callID; + } + + public void reset() { + setValid(true); + } + + /** + * Validates form. Must set {@link #valid} property. Can be overriden by inheriting classes, although call to this + * method is only in activities themselves (and not on a higher level like lams_central). + * + * @return + */ + public ActionMessages validate() { + setValid(true); + return new ActionMessages(); + } + + public Integer getActivityOrderNumber() { + return activityOrderNumber; + } + + public void setActivityOrderNumber(Integer activityOrderNumber) { + this.activityOrderNumber = activityOrderNumber; + } + + public String getEditingAdvice() { + return editingAdvice; + } + + public void setEditingAdvice(String editingAdvice) { + this.editingAdvice = editingAdvice; + } +} \ No newline at end of file Index: lams_tool_vote/.classpath =================================================================== diff -u -r9218936edd87260de73e773054cb605a336133b1 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/.classpath (.../.classpath) (revision 9218936edd87260de73e773054cb605a336133b1) +++ lams_tool_vote/.classpath (.../.classpath) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -1,30 +1,30 @@ - - - - - - - - - - - - - - - - > - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== diff -u -r83ca314c18ea866bb79570b6e7da25eb8729b3b4 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 83ca314c18ea866bb79570b6e7da25eb8729b3b4) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java (.../VoteAppConstants.java) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -143,39 +143,6 @@ public static final String ATTR_ATTEMPT_TIME = "attemptTime"; public static final String ATTR_ATTEMPT_TIME_TIMEAGO = "attemptTimeTimeago"; - /* - * exception constants - */ - public static final String USER_EXCEPTION_WRONG_FORMAT = "userExceptionWrongFormat"; - public static final String USER_EXCEPTION_INCOMPATIBLE_IDS = "userExceptionIncompatibleIds"; - public static final String USER_EXCEPTION_NUMBERFORMAT = "userExceptionNumberFormat"; - public static final String USER_EXCEPTION_CONTENT_DOESNOTEXIST = "userExceptionContentDoesNotExist"; - public static final String USER_EXCEPTION_TOOLSESSION_DOESNOTEXIST = "userExceptionToolSessionDoesNotExist"; - public static final String USER_EXCEPTION_TOOLCONTENT_DOESNOTEXIST = "userExceptionToolContentDoesNotExist"; - public static final String USER_EXCEPTION_LEARNER_REQUIRED = "userExceptionLearnerRequired"; - public static final String USER_EXCEPTION_CONTENTID_REQUIRED = "userExceptionContentIdRequired"; - public static final String USER_EXCEPTION_TOOLSESSIONID_REQUIRED = "userExceptionToolSessionIdRequired"; - public static final String USER_EXCEPTION_TOOLSESSIONID_INCONSISTENT = "userExceptionToolSessionIdInconsistent"; - public static final String USER_EXCEPTION_USERID_NOTAVAILABLE = "userExceptionUserIdNotAvailable"; - public static final String USER_EXCEPTION_USERID_NOTNUMERIC = "userExceptionUserIdNotNumeric"; - public static final String USER_EXCEPTION_ONLYCONTENT_ANDNOSESSIONS = "userExceptionOnlyContentAndNoSessions"; - public static final String USER_EXCEPTION_USERID_EXISTING = "userExceptionUserIdExisting"; - public static final String USER_EXCEPTION_USER_DOESNOTEXIST = "userExceptionUserDoesNotExist"; - public static final String USER_EXCEPTION_MONITORINGTAB_CONTENTID_REQUIRED = "userExceptionMonitoringTabContentIdRequired"; - public static final String USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP = "userExceptionDefaultContentNotSetup"; - public static final String USER_EXCEPTION_NO_TOOL_SESSIONS = "userExceptionNoToolSessions"; - public static final String USER_EXCEPTION_MODE_REQUIRED = "userExceptionModeRequired"; - public static final String USER_EXCEPTION_CONTENT_IN_USE = "userExceptionContentInUse"; - public static final String USER_EXCEPTION_CONTENT_BEING_MODIFIED = "userExceptionContentBeingModified"; - public static final String USER_EXCEPTION_MODE_INVALID = "userExceptionModeInvalid"; - public static final String USER_EXCEPTION_QUESTION_EMPTY = "userExceptionQuestionEmpty"; - public static final String USER_EXCEPTION_ANSWER_EMPTY = "userExceptionAnswerEmpty"; - public static final String USER_EXCEPTION_ANSWERS_DUPLICATE = "userExceptionAnswersDuplicate"; - public static final String USER_EXCEPTION_OPTIONS_COUNT_ZERO = "userExceptionOptionsCountZero"; - public static final String USER_EXCEPTION_CHKBOXES_EMPTY = "userExceptionChkboxesEmpty"; - public static final String USER_EXCEPTION_SUBMIT_NONE = "userExceptionSubmitNone"; - public static final String USER_EXCEPTION_WEIGHT_MUST_EQUAL100 = "userExceptionWeightMustEqual100"; - public static final String USER_EXCEPTION_SINGLE_OPTION = "userExceptionSingleOption"; public static final String SUCCESS = "success"; public static final Integer DATA_FLOW_OBJECT_ASSIGMENT_ID = 0; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java =================================================================== diff -u -rbdb4be0c50cd46304d96bc83f11283866445f1c0 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision bdb4be0c50cd46304d96bc83f11283866445f1c0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java (.../VoteService.java) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -90,7 +90,7 @@ import org.lamsfoundation.lams.tool.vote.util.VoteApplicationException; import org.lamsfoundation.lams.tool.vote.util.VoteComparator; import org.lamsfoundation.lams.tool.vote.util.VoteUtils; -import org.lamsfoundation.lams.tool.vote.web.action.MonitoringAction; +import org.lamsfoundation.lams.tool.vote.web.action.MonitoringController; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; @@ -656,7 +656,7 @@ } if (monitoredUserContainerDTOs.size() > 0) { - Map mapMonitoredUserContainerDTO = MonitoringAction + Map mapMonitoredUserContainerDTO = MonitoringController .convertToVoteMonitoredUserDTOMap(monitoredUserContainerDTOs); voteMonitoredAnswersDTO.setQuestionAttempts(mapMonitoredUserContainerDTO); Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteUtils.java =================================================================== diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteUtils.java (.../VoteUtils.java) (revision 5773f84ed608838de3521ecde87c52f3c72d478c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/util/VoteUtils.java (.../VoteUtils.java) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -84,43 +84,6 @@ return noHtmlNoNewLineStr; } - /** - * removes attributes except USER_EXCEPTION_NO_STUDENT_ACTIVITY - */ - public static void cleanUpUserExceptions(HttpServletRequest request) { - request.getSession().removeAttribute(USER_EXCEPTION_WRONG_FORMAT); - request.getSession().removeAttribute(USER_EXCEPTION_INCOMPATIBLE_IDS); - request.getSession().removeAttribute(USER_EXCEPTION_NUMBERFORMAT); - request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_DOESNOTEXIST); - request.getSession().removeAttribute(USER_EXCEPTION_TOOLSESSION_DOESNOTEXIST); - request.getSession().removeAttribute(USER_EXCEPTION_TOOLCONTENT_DOESNOTEXIST); - request.getSession().removeAttribute(USER_EXCEPTION_LEARNER_REQUIRED); - request.getSession().removeAttribute(USER_EXCEPTION_CONTENTID_REQUIRED); - request.getSession().removeAttribute(USER_EXCEPTION_TOOLSESSIONID_REQUIRED); - request.getSession().removeAttribute(USER_EXCEPTION_TOOLSESSIONID_INCONSISTENT); - request.getSession().removeAttribute(USER_EXCEPTION_USERID_NOTAVAILABLE); - request.getSession().removeAttribute(USER_EXCEPTION_USERID_NOTNUMERIC); - request.getSession().removeAttribute(USER_EXCEPTION_ONLYCONTENT_ANDNOSESSIONS); - request.getSession().removeAttribute(USER_EXCEPTION_USERID_EXISTING); - request.getSession().removeAttribute(USER_EXCEPTION_USER_DOESNOTEXIST); - request.getSession().removeAttribute(USER_EXCEPTION_MONITORINGTAB_CONTENTID_REQUIRED); - request.getSession().removeAttribute(USER_EXCEPTION_DEFAULTCONTENT_NOTSETUP); - request.getSession().removeAttribute(USER_EXCEPTION_NO_TOOL_SESSIONS); - request.getSession().removeAttribute(USER_EXCEPTION_MODE_REQUIRED); - request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_IN_USE); - request.getSession().removeAttribute(USER_EXCEPTION_CONTENT_BEING_MODIFIED); - request.getSession().removeAttribute(USER_EXCEPTION_MODE_INVALID); - request.getSession().removeAttribute(USER_EXCEPTION_QUESTION_EMPTY); - request.getSession().removeAttribute(USER_EXCEPTION_ANSWER_EMPTY); - request.getSession().removeAttribute(USER_EXCEPTION_ANSWERS_DUPLICATE); - request.getSession().removeAttribute(USER_EXCEPTION_OPTIONS_COUNT_ZERO); - request.getSession().removeAttribute(USER_EXCEPTION_CHKBOXES_EMPTY); - request.getSession().removeAttribute(USER_EXCEPTION_SUBMIT_NONE); - request.getSession().removeAttribute(USER_EXCEPTION_NUMBERFORMAT); - request.getSession().removeAttribute(USER_EXCEPTION_WEIGHT_MUST_EQUAL100); - request.getSession().removeAttribute(USER_EXCEPTION_SINGLE_OPTION); - } - public static void setDefineLater(HttpServletRequest request, boolean value, String strToolContentID, IVoteService voteService) { Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringController.java =================================================================== diff -u --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringController.java (revision 0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringController.java (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -0,0 +1,1231 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + +package org.lamsfoundation.lams.tool.vote.web.action; + +import java.util.ArrayList; +import java.util.Date; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TreeMap; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.apache.log4j.Logger; +import org.lamsfoundation.lams.authoring.web.AuthoringConstants; +import org.lamsfoundation.lams.learningdesign.DataFlowObject; +import org.lamsfoundation.lams.tool.ToolAccessMode; +import org.lamsfoundation.lams.tool.vote.VoteAppConstants; +import org.lamsfoundation.lams.tool.vote.dto.VoteGeneralAuthoringDTO; +import org.lamsfoundation.lams.tool.vote.dto.VoteQuestionDTO; +import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; +import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; +import org.lamsfoundation.lams.tool.vote.service.IVoteService; +import org.lamsfoundation.lams.tool.vote.util.VoteComparator; +import org.lamsfoundation.lams.tool.vote.util.VoteUtils; +import org.lamsfoundation.lams.tool.vote.web.form.VoteAuthoringForm; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.lamsfoundation.lams.web.util.SessionMap; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Controller; +import org.springframework.validation.Errors; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/authoring") +public class AuthoringController implements VoteAppConstants { + private static Logger logger = Logger.getLogger(AuthoringController.class.getName()); + + @Autowired + @Qualifier("voteService") + private IVoteService voteService; + + /** + * repopulateRequestParameters reads and saves request parameters + */ + private static void repopulateRequestParameters(HttpServletRequest request, VoteAuthoringForm voteAuthoringForm, + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO) { + + String toolContentID = request.getParameter(VoteAppConstants.TOOL_CONTENT_ID); + voteAuthoringForm.setToolContentID(toolContentID); + voteGeneralAuthoringDTO.setToolContentID(toolContentID); + + String httpSessionID = request.getParameter(VoteAppConstants.HTTP_SESSION_ID); + voteAuthoringForm.setHttpSessionID(httpSessionID); + voteGeneralAuthoringDTO.setHttpSessionID(httpSessionID); + + String lockOnFinish = request.getParameter(VoteAppConstants.LOCK_ON_FINISH); + voteAuthoringForm.setLockOnFinish(lockOnFinish); + voteGeneralAuthoringDTO.setLockOnFinish(lockOnFinish); + + String useSelectLeaderToolOuput = request.getParameter(VoteAppConstants.USE_SELECT_LEADER_TOOL_OUTPUT); + voteAuthoringForm.setUseSelectLeaderToolOuput(useSelectLeaderToolOuput); + voteGeneralAuthoringDTO.setUseSelectLeaderToolOuput(useSelectLeaderToolOuput); + + String allowText = request.getParameter(VoteAppConstants.ALLOW_TEXT); + voteAuthoringForm.setAllowText(allowText); + voteGeneralAuthoringDTO.setAllowText(allowText); + + String showResults = request.getParameter(VoteAppConstants.SHOW_RESULTS); + voteAuthoringForm.setShowResults(showResults); + voteGeneralAuthoringDTO.setShowResults(showResults); + + String maxNominationCount = request.getParameter(VoteAppConstants.MAX_NOMINATION_COUNT); + voteAuthoringForm.setMaxNominationCount(maxNominationCount); + voteGeneralAuthoringDTO.setMaxNominationCount(maxNominationCount); + + String minNominationCount = request.getParameter(MIN_NOMINATION_COUNT); + voteAuthoringForm.setMinNominationCount(minNominationCount); + voteGeneralAuthoringDTO.setMinNominationCount(minNominationCount); + + String reflect = request.getParameter("reflect"); + voteAuthoringForm.setReflect(reflect); + voteGeneralAuthoringDTO.setReflect(reflect); + + String reflectionSubject = request.getParameter("reflectionSubject"); + voteAuthoringForm.setReflectionSubject(reflectionSubject); + voteGeneralAuthoringDTO.setReflectionSubject(reflectionSubject); + + String maxInputs = request.getParameter(VoteAppConstants.MAX_INPUTS); + if (maxInputs == null) { + logger.info("Since minNomcount is equal to null hence setting it to '0'"); + maxInputs = "0"; + } + voteAuthoringForm.setMaxInputs(new Short(maxInputs)); + + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); + } + + /** + * moves a nomination down in the authoring list + */ + @RequestMapping("/moveNominationDown") + @SuppressWarnings("unchecked") + public String moveNominationDown(VoteAuthoringForm voteAuthoringForm, HttpServletRequest request) { + String httpSessionID = voteAuthoringForm.getHttpSessionID(); + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(httpSessionID); + + String questionIndex = request.getParameter("questionIndex"); + + List questionDTOs = (List) sessionMap.get(VoteAppConstants.LIST_QUESTION_DTO); + + questionDTOs = AuthoringController.swapQuestions(questionDTOs, questionIndex, "down"); + + questionDTOs = AuthoringController.reorderQuestionDTOs(questionDTOs); + sessionMap.put(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + + String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + voteAuthoringForm.setContentFolderID(contentFolderID); + + String richTextTitle = request.getParameter(VoteAppConstants.TITLE); + + String richTextInstructions = request.getParameter(VoteAppConstants.INSTRUCTIONS); + + sessionMap.put(VoteAppConstants.ACTIVITY_TITLE_KEY, richTextTitle); + sessionMap.put(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions); + + String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); + + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + voteGeneralAuthoringDTO.setContentFolderID(contentFolderID); + + AuthoringController.repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); + + voteGeneralAuthoringDTO.setActivityTitle(richTextTitle); + voteAuthoringForm.setTitle(richTextTitle); + + voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions); + + request.getSession().setAttribute(httpSessionID, sessionMap); + + voteGeneralAuthoringDTO.setToolContentID(strToolContentID); + voteGeneralAuthoringDTO.setHttpSessionID(httpSessionID); + voteAuthoringForm.setToolContentID(strToolContentID); + voteAuthoringForm.setHttpSessionID(httpSessionID); + voteAuthoringForm.setCurrentTab("1"); + + request.setAttribute(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + + return "/authoring/AuthoringMaincontent"; + } + + /** + * moves a nomination up in the authoring list + */ + @RequestMapping("/moveNominationUp") + @SuppressWarnings("unchecked") + public String moveNominationUp(VoteAuthoringForm voteAuthoringForm, HttpServletRequest request) { + String httpSessionID = voteAuthoringForm.getHttpSessionID(); + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(httpSessionID); + + String questionIndex = request.getParameter("questionIndex"); + + List questionDTOs = (List) sessionMap.get(VoteAppConstants.LIST_QUESTION_DTO); + + questionDTOs = AuthoringController.swapQuestions(questionDTOs, questionIndex, "up"); + + questionDTOs = AuthoringController.reorderQuestionDTOs(questionDTOs); + + sessionMap.put(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + + String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + voteAuthoringForm.setContentFolderID(contentFolderID); + + String richTextTitle = request.getParameter(VoteAppConstants.TITLE); + + String richTextInstructions = request.getParameter(VoteAppConstants.INSTRUCTIONS); + + sessionMap.put(VoteAppConstants.ACTIVITY_TITLE_KEY, richTextTitle); + sessionMap.put(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions); + + String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); + + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + voteGeneralAuthoringDTO.setContentFolderID(contentFolderID); + + AuthoringController.repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); + + voteGeneralAuthoringDTO.setActivityTitle(richTextTitle); + voteAuthoringForm.setTitle(richTextTitle); + + voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions); + + request.getSession().setAttribute(httpSessionID, sessionMap); + + voteGeneralAuthoringDTO.setToolContentID(strToolContentID); + voteGeneralAuthoringDTO.setHttpSessionID(httpSessionID); + voteAuthoringForm.setToolContentID(strToolContentID); + voteAuthoringForm.setHttpSessionID(httpSessionID); + voteAuthoringForm.setCurrentTab("1"); + + request.setAttribute(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + return "/authoring/AuthoringMaincontent"; + } + + /** + * removes a nomination from the authoring list + */ + @RequestMapping("/removeNomination") + @SuppressWarnings("unchecked") + public String removeNomination(VoteAuthoringForm voteAuthoringForm, HttpServletRequest request) { + String httpSessionID = voteAuthoringForm.getHttpSessionID(); + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(httpSessionID); + + String questionIndexToDelete = request.getParameter("questionIndex"); + logger.info("Question Index to delete" + questionIndexToDelete); + List questionDTOs = (List) sessionMap.get(VoteAppConstants.LIST_QUESTION_DTO); + + List listFinalQuestionDTO = new LinkedList<>(); + int queIndex = 0; + for (VoteQuestionDTO questionDTO : questionDTOs) { + + String questionText = questionDTO.getNomination(); + String displayOrder = questionDTO.getDisplayOrder(); + + if (questionText != null && !questionText.equals("") && (!displayOrder.equals(questionIndexToDelete))) { + + ++queIndex; + questionDTO.setDisplayOrder(new Integer(queIndex).toString()); + listFinalQuestionDTO.add(questionDTO); + } + if ((questionText != null) && (!questionText.isEmpty()) && displayOrder.equals(questionIndexToDelete)) { + List deletedQuestionDTOs = (List) sessionMap + .get(LIST_DELETED_QUESTION_DTOS); + ; + deletedQuestionDTOs.add(questionDTO); + sessionMap.put(LIST_DELETED_QUESTION_DTOS, deletedQuestionDTOs); + } + } + + sessionMap.put(VoteAppConstants.LIST_QUESTION_DTO, listFinalQuestionDTO); + request.setAttribute(VoteAppConstants.LIST_QUESTION_DTO, listFinalQuestionDTO); + + String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + voteAuthoringForm.setContentFolderID(contentFolderID); + + String richTextTitle = request.getParameter(VoteAppConstants.TITLE); + String richTextInstructions = request.getParameter(VoteAppConstants.INSTRUCTIONS); + + sessionMap.put(VoteAppConstants.ACTIVITY_TITLE_KEY, richTextTitle); + sessionMap.put(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions); + + String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); + + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + voteGeneralAuthoringDTO.setContentFolderID(contentFolderID); + + AuthoringController.repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); + + voteGeneralAuthoringDTO.setActivityTitle(richTextTitle); + voteAuthoringForm.setTitle(richTextTitle); + + voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions); + + request.getSession().setAttribute(httpSessionID, sessionMap); + + voteGeneralAuthoringDTO.setToolContentID(strToolContentID); + voteGeneralAuthoringDTO.setHttpSessionID(httpSessionID); + voteAuthoringForm.setToolContentID(strToolContentID); + voteAuthoringForm.setHttpSessionID(httpSessionID); + voteAuthoringForm.setCurrentTab("1"); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + + return "/authoring/AuthoringMaincontent"; + } + + /** + * enables editing a nomination + */ + @RequestMapping("/newEditableNominationBox") + @SuppressWarnings("unchecked") + public String newEditableNominationBox(VoteAuthoringForm voteAuthoringForm, HttpServletRequest request) { + + String httpSessionID = voteAuthoringForm.getHttpSessionID(); + + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(httpSessionID); + + String questionIndex = request.getParameter("questionIndex"); + logger.info("Question Index" + questionIndex); + voteAuthoringForm.setEditableNominationIndex(questionIndex); + + List questionDTOs = (List) sessionMap.get(VoteAppConstants.LIST_QUESTION_DTO); + + String editableNomination = ""; + Iterator iter = questionDTOs.iterator(); + while (iter.hasNext()) { + VoteQuestionDTO voteQuestionDTO = iter.next(); + // String question = voteQuestionDTO.getNomination(); + String displayOrder = voteQuestionDTO.getDisplayOrder(); + + if (displayOrder != null && !displayOrder.equals("")) { + if (displayOrder.equals(questionIndex)) { + editableNomination = voteQuestionDTO.getNomination(); + break; + } + + } + } + String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + voteAuthoringForm.setContentFolderID(contentFolderID); + + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + voteGeneralAuthoringDTO.setContentFolderID(contentFolderID); + + AuthoringController.repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); + + String richTextTitle = request.getParameter(VoteAppConstants.TITLE); + String richTextInstructions = request.getParameter(VoteAppConstants.INSTRUCTIONS); + + voteGeneralAuthoringDTO.setActivityTitle(richTextTitle); + voteAuthoringForm.setTitle(richTextTitle); + voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions); + + voteGeneralAuthoringDTO.setEditableNominationText(editableNomination); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + + return "/authoring/editNominationBox"; + } + + /** + * enables adding a new nomination + */ + @RequestMapping("/newNominationBox") + public String newNominationBox(VoteAuthoringForm voteAuthoringForm, HttpServletRequest request) { + String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + voteAuthoringForm.setContentFolderID(contentFolderID); + + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + voteGeneralAuthoringDTO.setContentFolderID(contentFolderID); + + AuthoringController.repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); + + String richTextTitle = request.getParameter(VoteAppConstants.TITLE); + String richTextInstructions = request.getParameter(VoteAppConstants.INSTRUCTIONS); + + voteGeneralAuthoringDTO.setActivityTitle(richTextTitle); + voteAuthoringForm.setTitle(richTextTitle); + + voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + + return "/authoring/newNominationBox"; + } + + /** + * enables adding a new nomination to the authoring nominations list + */ + @RequestMapping("/addSingleNomination") + @SuppressWarnings("unchecked") + public String addSingleNomination(VoteAuthoringForm voteAuthoringForm, HttpServletRequest request) { + String httpSessionID = voteAuthoringForm.getHttpSessionID(); + + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(httpSessionID); + String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + voteAuthoringForm.setContentFolderID(contentFolderID); + + String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); + + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + voteGeneralAuthoringDTO.setContentFolderID(contentFolderID); + + AuthoringController.repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); + + List questionDTOs = (List) sessionMap.get(VoteAppConstants.LIST_QUESTION_DTO); + + String newNomination = request.getParameter("newNomination"); + + int listSize = questionDTOs.size(); + + if (newNomination != null && newNomination.length() > 0) { + boolean duplicates = AuthoringController.checkDuplicateNominations(questionDTOs, newNomination); + + if (!duplicates) { + VoteQuestionDTO voteQuestionDTO = new VoteQuestionDTO(); + voteQuestionDTO.setDisplayOrder(new Long(listSize + 1).toString()); + voteQuestionDTO.setNomination(newNomination); + + questionDTOs.add(voteQuestionDTO); + } + } + + request.setAttribute(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + sessionMap.put(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + + String richTextTitle = (String) sessionMap.get(VoteAppConstants.ACTIVITY_TITLE_KEY); + String richTextInstructions = (String) sessionMap.get(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY); + + voteGeneralAuthoringDTO.setActivityTitle(richTextTitle); + voteAuthoringForm.setTitle(richTextTitle); + voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions); + + request.getSession().setAttribute(httpSessionID, sessionMap); + + voteGeneralAuthoringDTO.setToolContentID(strToolContentID); + voteGeneralAuthoringDTO.setHttpSessionID(httpSessionID); + + voteAuthoringForm.setToolContentID(strToolContentID); + voteAuthoringForm.setHttpSessionID(httpSessionID); + voteAuthoringForm.setCurrentTab("1"); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + + request.getSession().setAttribute(httpSessionID, sessionMap); + + return "/authoring/itemlist"; + } + + /** + * saves a new or updated nomination in the authoring nominations list + */ + @RequestMapping("/saveSingleNomination") + @SuppressWarnings("unchecked") + public String saveSingleNomination(VoteAuthoringForm voteAuthoringForm, HttpServletRequest request) { + String httpSessionID = voteAuthoringForm.getHttpSessionID(); + + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(httpSessionID); + + String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + voteAuthoringForm.setContentFolderID(contentFolderID); + + String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); + + String editNominationBoxRequest = request.getParameter("editNominationBoxRequest"); + + logger.info("Edit nomination box request" + editNominationBoxRequest); + + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + + voteGeneralAuthoringDTO.setContentFolderID(contentFolderID); + + AuthoringController.repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); + + List questionDTOs = (List) sessionMap.get(VoteAppConstants.LIST_QUESTION_DTO); + + String newNomination = request.getParameter("newNomination"); + + String editableNominationIndex = request.getParameter("editableNominationIndex"); + + if (newNomination != null && newNomination.length() > 0) { + if (editNominationBoxRequest != null && editNominationBoxRequest.equals("false")) { + boolean duplicates = AuthoringController.checkDuplicateNominations(questionDTOs, newNomination); + + if (!duplicates) { + VoteQuestionDTO voteQuestionDTO = null; + Iterator iter = questionDTOs.iterator(); + while (iter.hasNext()) { + voteQuestionDTO = iter.next(); + + //String question = voteQuestionDTO.getNomination(); + String displayOrder = voteQuestionDTO.getDisplayOrder(); + + if (displayOrder != null && !displayOrder.equals("")) { + if (displayOrder.equals(editableNominationIndex)) { + break; + } + + } + } + + voteQuestionDTO.setQuestion(newNomination); + voteQuestionDTO.setDisplayOrder(editableNominationIndex); + + questionDTOs = AuthoringController.reorderUpdateListQuestionDTO(questionDTOs, voteQuestionDTO, + editableNominationIndex); + } else { + logger.info("Duplicate question entry therefore not adding"); + //duplicate question entry, not adding + } + } else { + logger.info("In Request for Save and Edit"); + //request for edit and save + VoteQuestionDTO voteQuestionDTO = null; + Iterator iter = questionDTOs.iterator(); + while (iter.hasNext()) { + voteQuestionDTO = iter.next(); + + // String question = voteQuestionDTO.getNomination(); + String displayOrder = voteQuestionDTO.getDisplayOrder(); + + if (displayOrder != null && !displayOrder.equals("")) { + if (displayOrder.equals(editableNominationIndex)) { + break; + } + + } + } + + voteQuestionDTO.setNomination(newNomination); + voteQuestionDTO.setDisplayOrder(editableNominationIndex); + + questionDTOs = AuthoringController.reorderUpdateListQuestionDTO(questionDTOs, voteQuestionDTO, + editableNominationIndex); + } + } else { + logger.info("newNomination entry is blank,therefore not adding"); + //entry blank, not adding + } + + request.setAttribute(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + sessionMap.put(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + + String richTextTitle = (String) sessionMap.get(VoteAppConstants.ACTIVITY_TITLE_KEY); + String richTextInstructions = (String) sessionMap.get(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY); + + voteGeneralAuthoringDTO.setActivityTitle(richTextTitle); + voteAuthoringForm.setTitle(richTextTitle); + voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions); + + request.getSession().setAttribute(httpSessionID, sessionMap); + + voteGeneralAuthoringDTO.setToolContentID(strToolContentID); + voteGeneralAuthoringDTO.setHttpSessionID(httpSessionID); + + voteAuthoringForm.setToolContentID(strToolContentID); + voteAuthoringForm.setHttpSessionID(httpSessionID); + voteAuthoringForm.setCurrentTab("1"); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + + request.getSession().setAttribute(httpSessionID, sessionMap); + + return "/authoring/itemlist"; + } + + /** + * persists the nominations list and other user selections in the db. + */ + @RequestMapping("/submitAllContent") + @SuppressWarnings("unchecked") + public String submitAllContent(VoteAuthoringForm voteAuthoringForm, Errors errors, HttpServletRequest request) { + String httpSessionID = voteAuthoringForm.getHttpSessionID(); + + SessionMap sessionMap = (SessionMap) request.getSession() + .getAttribute(httpSessionID); + + String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + voteAuthoringForm.setContentFolderID(contentFolderID); + + String strToolContentID = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); + + List questionDTOs = (List) sessionMap.get(VoteAppConstants.LIST_QUESTION_DTO); + + if (questionDTOs.isEmpty() && (voteAuthoringForm.getAssignedDataFlowObject() == null + || voteAuthoringForm.getAssignedDataFlowObject() == 0)) { + errors.rejectValue("nominations", "nominations.none.submitted"); + logger.error("Nominations not submitted"); + } + + String maxNomCount = voteAuthoringForm.getMaxNominationCount(); + if (maxNomCount != null) { + if (maxNomCount.equals("0") || maxNomCount.contains("-")) { + errors.rejectValue("maxNominationCount", "maxNomination.invalid"); + logger.error("Maximum votes in Advance tab is invalid"); + } + + try { + //int intMaxNomCount = new Integer(maxNomCount).intValue(); + } catch (NumberFormatException e) { + errors.rejectValue("maxNominationCount", "maxNomination.invalid"); + logger.error("Maximum votes in Advance tab is invalid"); + } + } + + //verifyDuplicateNominations + Map mapQuestion = AuthoringController.extractMapQuestion(questionDTOs); + int optionCount = 0; + boolean isNominationsDuplicate = false; + for (long i = 1; i <= VoteAppConstants.MAX_OPTION_COUNT; i++) { + String currentOption = mapQuestion.get(new Long(i).toString()); + + optionCount = 0; + for (long j = 1; j <= VoteAppConstants.MAX_OPTION_COUNT; j++) { + String backedOption = mapQuestion.get(new Long(j).toString()); + + if (currentOption != null && backedOption != null) { + if (currentOption.equals(backedOption)) { + optionCount++; + } + + if (optionCount > 1) { + isNominationsDuplicate = true; + } + } + } + } + + if (isNominationsDuplicate == true) { + errors.rejectValue("nominations", "nominations.duplicate"); + logger.error("There are duplicate nomination entries."); + } + + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + AuthoringController.repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); + + DataFlowObject assignedDataFlowObject = null; + + List dataFlowObjects = voteService.getDataFlowObjects(new Long(strToolContentID)); + List dataFlowObjectNames = null; + if (dataFlowObjects != null) { + dataFlowObjectNames = new ArrayList<>(dataFlowObjects.size()); + int objectIndex = 1; + for (DataFlowObject dataFlowObject : dataFlowObjects) { + dataFlowObjectNames.add(dataFlowObject.getDisplayName()); + if (VoteAppConstants.DATA_FLOW_OBJECT_ASSIGMENT_ID.equals(dataFlowObject.getToolAssigmentId())) { + voteAuthoringForm.setAssignedDataFlowObject(objectIndex); + } + objectIndex++; + + } + } + voteGeneralAuthoringDTO.setDataFlowObjectNames(dataFlowObjectNames); + + if (voteAuthoringForm.getAssignedDataFlowObject() != null + && voteAuthoringForm.getAssignedDataFlowObject() != 0) { + assignedDataFlowObject = dataFlowObjects.get(voteAuthoringForm.getAssignedDataFlowObject() - 1); + } + + voteGeneralAuthoringDTO.setContentFolderID(contentFolderID); + + String richTextTitle = request.getParameter(VoteAppConstants.TITLE); + String richTextInstructions = request.getParameter(VoteAppConstants.INSTRUCTIONS); + + voteGeneralAuthoringDTO.setActivityTitle(richTextTitle); + voteAuthoringForm.setTitle(richTextTitle); + + voteGeneralAuthoringDTO.setActivityInstructions(richTextInstructions); + + sessionMap.put(VoteAppConstants.ACTIVITY_TITLE_KEY, richTextTitle); + sessionMap.put(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY, richTextInstructions); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + + VoteContent voteContentTest = voteService.getVoteContent(new Long(strToolContentID)); + + if (!errors.hasErrors()) { + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); + + List deletedQuestionDTOs = (List) sessionMap + .get(LIST_DELETED_QUESTION_DTOS); + + // in case request is from monitoring module - recalculate User Answers + if (mode.isTeacher()) { + Set oldQuestions = voteContentTest.getVoteQueContents(); + voteService.removeQuestionsFromCache(voteContentTest); + VoteUtils.setDefineLater(request, false, strToolContentID, voteService); + + // audit log the teacher has started editing activity in monitor + voteService.auditLogStartEditingActivityInMonitor(new Long(strToolContentID)); + + // recalculate User Answers + voteService.recalculateUserAnswers(voteContentTest, oldQuestions, questionDTOs, deletedQuestionDTOs); + } + + // remove deleted questions + for (VoteQuestionDTO deletedQuestionDTO : deletedQuestionDTOs) { + VoteQueContent removeableQuestion = voteService.getVoteQueContentByUID(deletedQuestionDTO.getUid()); + if (removeableQuestion != null) { +// Set attempts = removeableQuestion.getMcUsrAttempts(); +// Iterator iter = attempts.iterator(); +// while (iter.hasNext()) { +// McUsrAttempt attempt = iter.next(); +// iter.remove(); +// } +// mcService.updateQuestion(removeableQuestion); + voteContentTest.getVoteQueContents().remove(removeableQuestion); + voteService.removeVoteQueContent(removeableQuestion); + } + } + + // store content + VoteContent voteContent = saveOrUpdateVoteContent(voteAuthoringForm, request, voteContentTest, + strToolContentID); + + //store questions + voteContent = voteService.createQuestions(questionDTOs, voteContent); + + //store DataFlowObjectAssigment + voteService.saveDataFlowObjectAssigment(assignedDataFlowObject); + + //reOrganizeDisplayOrder + List sortedQuestions = voteService.getAllQuestionsSorted(voteContent.getUid().longValue()); + Iterator iter = sortedQuestions.iterator(); + while (iter.hasNext()) { + VoteQueContent question = iter.next(); + + VoteQueContent existingQuestion = voteService.getQuestionByUid(question.getUid()); + voteService.saveOrUpdateVoteQueContent(existingQuestion); + } + + // standard authoring close + request.setAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG, Boolean.TRUE); + + } + + voteAuthoringForm.resetUserAction(); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + + request.setAttribute(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + sessionMap.put(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + request.getSession().setAttribute(httpSessionID, sessionMap); + + voteGeneralAuthoringDTO.setToolContentID(strToolContentID); + voteGeneralAuthoringDTO.setHttpSessionID(httpSessionID); + + voteAuthoringForm.setToolContentID(strToolContentID); + voteAuthoringForm.setHttpSessionID(httpSessionID); + voteAuthoringForm.setCurrentTab("1"); + + return "/authoring/AuthoringMaincontent"; + } + + @RequestMapping("/start") + public String start(VoteAuthoringForm voteAuthoringForm, Errors errors, HttpServletRequest request) { + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + // model.addAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + + String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + voteAuthoringForm.setContentFolderID(contentFolderID); + + AuthoringController.repopulateRequestParameters(request, voteAuthoringForm, voteGeneralAuthoringDTO); + + voteGeneralAuthoringDTO.setContentFolderID(contentFolderID); + + SessionMap sessionMap = new SessionMap<>(); + voteAuthoringForm.setHttpSessionID(sessionMap.getSessionID()); + voteGeneralAuthoringDTO.setHttpSessionID(sessionMap.getSessionID()); + request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); + + voteAuthoringForm.resetRadioBoxes(); + voteAuthoringForm.setExceptionMaxNominationInvalid(new Boolean(false).toString()); + voteGeneralAuthoringDTO.setExceptionMaxNominationInvalid(new Boolean(false).toString()); + + boolean validateSignature = validateDefaultContent(voteAuthoringForm, errors); + if (!validateSignature) { + return "/VoteErrorBox"; + } + + //no problems getting the default content, will render authoring screen + + /* the authoring url must be passed a tool content id */ + String strToolContentId = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); + voteAuthoringForm.setToolContentID(new Long(strToolContentId).toString()); + voteGeneralAuthoringDTO.setToolContentID(new Long(strToolContentId).toString()); + + if (strToolContentId == null || strToolContentId.equals("")) { + errors.reject("error.contentId.required"); + return "/VoteErrorBox"; + } + + ToolAccessMode mode = WebUtil.readToolAccessModeAuthorDefaulted(request); + // request is from monitoring module + if (mode.isTeacher()) { + VoteUtils.setDefineLater(request, true, strToolContentId, voteService); + } + request.setAttribute(AttributeNames.ATTR_MODE, mode.toString()); + + VoteContent voteContent = voteService.getVoteContent(new Long(strToolContentId)); + + // if mcContent does not exist, try to use default content instead. + if (voteContent == null) { + long defaultContentID = voteService.getToolDefaultContentIdBySignature(VoteAppConstants.MY_SIGNATURE); + voteContent = voteService.getVoteContent(defaultContentID); + voteContent = VoteContent.newInstance(voteContent, new Long(strToolContentId)); + } + + AuthoringController.prepareDTOandForm(request, voteContent, voteAuthoringForm, voteGeneralAuthoringDTO); + if (voteContent.getTitle() == null) { + voteGeneralAuthoringDTO.setActivityTitle(VoteAppConstants.DEFAULT_VOTING_TITLE); + voteAuthoringForm.setTitle(VoteAppConstants.DEFAULT_VOTING_TITLE); + } else { + voteGeneralAuthoringDTO.setActivityTitle(voteContent.getTitle()); + voteAuthoringForm.setTitle(voteContent.getTitle()); + } + + if (voteContent.getInstructions() == null) { + voteGeneralAuthoringDTO.setActivityInstructions(VoteAppConstants.DEFAULT_VOTING_INSTRUCTIONS); + voteAuthoringForm.setInstructions(VoteAppConstants.DEFAULT_VOTING_INSTRUCTIONS); + } else { + voteGeneralAuthoringDTO.setActivityInstructions(voteContent.getInstructions()); + voteAuthoringForm.setInstructions(voteContent.getInstructions()); + } + + sessionMap.put(VoteAppConstants.ACTIVITY_TITLE_KEY, voteGeneralAuthoringDTO.getActivityTitle()); + sessionMap.put(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY, voteGeneralAuthoringDTO.getActivityInstructions()); + + voteAuthoringForm.setReflectionSubject(voteContent.getReflectionSubject()); + voteGeneralAuthoringDTO.setReflectionSubject(voteContent.getReflectionSubject()); + + List dataFlowObjects = voteService.getDataFlowObjects(new Long(strToolContentId)); + if (dataFlowObjects != null) { + List dataFlowObjectNames = new ArrayList<>(dataFlowObjects.size()); + int objectIndex = 1; + for (DataFlowObject dataFlowObject : dataFlowObjects) { + dataFlowObjectNames.add(dataFlowObject.getDisplayName()); + if (VoteAppConstants.DATA_FLOW_OBJECT_ASSIGMENT_ID.equals(dataFlowObject.getToolAssigmentId())) { + voteAuthoringForm.setAssignedDataFlowObject(objectIndex); + } + objectIndex++; + + } + voteGeneralAuthoringDTO.setDataFlowObjectNames(dataFlowObjectNames); + } + + List questionDTOs = new LinkedList<>(); + + for (VoteQueContent question : voteContent.getVoteQueContents()) { + VoteQuestionDTO questionDTO = new VoteQuestionDTO(); + + questionDTO.setUid(question.getUid()); + questionDTO.setQuestion(question.getQuestion()); + questionDTO.setDisplayOrder(new Integer(question.getDisplayOrder()).toString()); + questionDTOs.add(questionDTO); + } + + request.setAttribute(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + sessionMap.put(VoteAppConstants.LIST_QUESTION_DTO, questionDTOs); + + Short maxInputs = voteContent.getMaxExternalInputs(); + if (maxInputs == null) { + maxInputs = 0; + } + voteAuthoringForm.setMaxInputs(maxInputs); + voteAuthoringForm.resetUserAction(); + + List listDeletedQuestionDTOs = new ArrayList<>(); + sessionMap.put(VoteAppConstants.LIST_DELETED_QUESTION_DTOS, listDeletedQuestionDTOs); + + voteAuthoringForm.resetUserAction(); + voteAuthoringForm.setCurrentTab("1"); + + return "/authoring/AuthoringMaincontent"; + } + + /** + * each tool has a signature. Voting tool's signature is stored in MY_SIGNATURE. The default tool content id and + * other depending content ids are obtained in this method. if all the default content has been setup properly the + * method saves DEFAULT_CONTENT_ID in the session. + * + * @param request + * @param mapping + * @return ActionForward + */ + private boolean validateDefaultContent(VoteAuthoringForm voteAuthoringForm, Errors errors) { + /* + * retrieve the default content id based on tool signature + */ + long defaultContentID = 0; + try { + defaultContentID = voteService.getToolDefaultContentIdBySignature(VoteAppConstants.MY_SIGNATURE); + if (defaultContentID == 0) { + logger.error("Exception occured: No default content"); + errors.reject("error.defaultContent.notSetup"); + return false; + } + } catch (Exception e) { + logger.error("error getting the default content id: " + e.getMessage()); + errors.reject("error.defaultContent.notSetup"); + return false; + } + + try { + //retrieve uid of the content based on default content id determined above defaultContentID + VoteContent voteContent = voteService.getVoteContent(new Long(defaultContentID)); + if (voteContent == null) { + logger.error("Exception occured: No default content"); + errors.reject("error.defaultContent.notSetup"); + return false; + } + } catch (Exception e) { + logger.error("other problems: " + e); + logger.error("Exception occured: No default question content"); + errors.reject("error.defaultContent.notSetup"); + return false; + } + + return true; + } + + private static void prepareDTOandForm(HttpServletRequest request, VoteContent voteContent, + VoteAuthoringForm voteAuthoringForm, VoteGeneralAuthoringDTO voteGeneralAuthoringDTO) { + + voteGeneralAuthoringDTO.setActivityTitle(voteContent.getTitle()); + voteGeneralAuthoringDTO.setActivityInstructions(voteContent.getInstructions()); + + voteAuthoringForm.setUseSelectLeaderToolOuput(voteContent.isUseSelectLeaderToolOuput() ? "1" : "0"); + voteAuthoringForm.setAllowText(voteContent.isAllowText() ? "1" : "0"); + voteAuthoringForm.setAllowTextEntry(voteContent.isAllowText() ? "1" : "0"); + + voteAuthoringForm.setShowResults(voteContent.isShowResults() ? "1" : "0"); + + voteAuthoringForm.setLockOnFinish(voteContent.isLockOnFinish() ? "1" : "0"); + voteAuthoringForm.setReflect(voteContent.isReflect() ? "1" : "0"); + + voteGeneralAuthoringDTO.setUseSelectLeaderToolOuput(voteContent.isUseSelectLeaderToolOuput() ? "1" : "0"); + voteGeneralAuthoringDTO.setAllowText(voteContent.isAllowText() ? "1" : "0"); + voteGeneralAuthoringDTO.setLockOnFinish(voteContent.isLockOnFinish() ? "1" : "0"); + voteAuthoringForm.setReflect(voteContent.isReflect() ? "1" : "0"); + + String maxNomcount = voteContent.getMaxNominationCount(); + if (maxNomcount.equals("")) { + logger.info("Since minNomcount is equal to null hence setting it to '0'"); + maxNomcount = "0"; + } + voteAuthoringForm.setMaxNominationCount(maxNomcount); + voteGeneralAuthoringDTO.setMaxNominationCount(maxNomcount); + + String minNomcount = voteContent.getMinNominationCount(); + if ((minNomcount == null) || minNomcount.equals("")) { + logger.info("Since minNomcount is equal to null hence setting it to '0'"); + minNomcount = "0"; + } + voteAuthoringForm.setMinNominationCount(minNomcount); + voteGeneralAuthoringDTO.setMinNominationCount(minNomcount); + } + + private static List swapQuestions(List questionDTOs, String questionIndex, + String direction) { + + int intQuestionIndex = new Integer(questionIndex).intValue(); + int intOriginalQuestionIndex = intQuestionIndex; + + int replacedQuestionIndex = 0; + if (direction.equals("down")) { + replacedQuestionIndex = ++intQuestionIndex; + } else { + replacedQuestionIndex = --intQuestionIndex; + } + + VoteQuestionDTO mainQuestion = AuthoringController.getQuestionAtDisplayOrder(questionDTOs, + intOriginalQuestionIndex); + + VoteQuestionDTO replacedQuestion = AuthoringController.getQuestionAtDisplayOrder(questionDTOs, + replacedQuestionIndex); + + List newQuestionDtos = new LinkedList(); + + Iterator iter = questionDTOs.iterator(); + while (iter.hasNext()) { + VoteQuestionDTO questionDTO = iter.next(); + VoteQuestionDTO tempQuestion = new VoteQuestionDTO(); + + if (!questionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString()) + && !questionDTO.getDisplayOrder().equals(new Integer(replacedQuestionIndex).toString())) { + logger.info("Normal Copy"); + // normal copy + tempQuestion = questionDTO; + + } else if (questionDTO.getDisplayOrder().equals(new Integer(intOriginalQuestionIndex).toString())) { + // move type 1 + logger.info("Move type 1"); + tempQuestion = replacedQuestion; + + } else if (questionDTO.getDisplayOrder().equals(new Integer(replacedQuestionIndex).toString())) { + // move type 1 + logger.info("Move type 1"); + tempQuestion = mainQuestion; + } + + newQuestionDtos.add(tempQuestion); + } + + return newQuestionDtos; + } + + private static VoteQuestionDTO getQuestionAtDisplayOrder(List questionDTOs, + int intOriginalQuestionIndex) { + + Iterator iter = questionDTOs.iterator(); + while (iter.hasNext()) { + VoteQuestionDTO voteQuestionDTO = iter.next(); + + if (new Integer(intOriginalQuestionIndex).toString().equals(voteQuestionDTO.getDisplayOrder())) { + return voteQuestionDTO; + } + } + return null; + } + + private static List reorderQuestionDTOs(List listQuestionDTO) { + List listFinalQuestionDTO = new LinkedList(); + + int queIndex = 0; + Iterator iter = listQuestionDTO.iterator(); + while (iter.hasNext()) { + VoteQuestionDTO voteQuestionDTO = iter.next(); + + String question = voteQuestionDTO.getNomination(); + + // String displayOrder = voteQuestionDTO.getDisplayOrder(); + + if (question != null && !question.equals("")) { + ++queIndex; + + voteQuestionDTO.setNomination(question); + voteQuestionDTO.setDisplayOrder(new Integer(queIndex).toString()); + + listFinalQuestionDTO.add(voteQuestionDTO); + } + } + + return listFinalQuestionDTO; + } + + @SuppressWarnings("rawtypes") + private static boolean checkDuplicateNominations(List listQuestionDTO, String newQuestion) { + if (logger.isDebugEnabled()) { + logger.debug("New Question" + newQuestion); + } + + Map mapQuestion = AuthoringController.extractMapQuestion(listQuestionDTO); + + Iterator itMap = mapQuestion.entrySet().iterator(); + while (itMap.hasNext()) { + Map.Entry pairs = (Map.Entry) itMap.next(); + if (pairs.getValue() != null && !pairs.getValue().equals("")) { + + if (pairs.getValue().equals(newQuestion)) { + return true; + } + } + } + return false; + } + + private static Map extractMapQuestion(List listQuestionDTO) { + Map mapQuestion = new TreeMap(new VoteComparator()); + + Iterator iter = listQuestionDTO.iterator(); + int queIndex = 0; + while (iter.hasNext()) { + VoteQuestionDTO voteQuestionDTO = iter.next(); + + queIndex++; + mapQuestion.put(new Integer(queIndex).toString(), voteQuestionDTO.getNomination()); + } + return mapQuestion; + } + + private static List reorderUpdateListQuestionDTO(List listQuestionDTO, + VoteQuestionDTO voteQuestionDTONew, String editableQuestionIndex) { + + List listFinalQuestionDTO = new LinkedList(); + + Iterator iter = listQuestionDTO.iterator(); + while (iter.hasNext()) { + VoteQuestionDTO voteQuestionDTO = iter.next(); + + String question = voteQuestionDTO.getNomination(); + + String displayOrder = voteQuestionDTO.getDisplayOrder(); + + if (displayOrder.equals(editableQuestionIndex)) { + voteQuestionDTO.setNomination(voteQuestionDTONew.getNomination()); + voteQuestionDTO.setDisplayOrder(voteQuestionDTONew.getDisplayOrder()); + + listFinalQuestionDTO.add(voteQuestionDTO); + } else { + voteQuestionDTO.setNomination(question); + voteQuestionDTO.setDisplayOrder(displayOrder); + + listFinalQuestionDTO.add(voteQuestionDTO); + } + } + + return listFinalQuestionDTO; + } + + private VoteContent saveOrUpdateVoteContent(VoteAuthoringForm voteAuthoringForm, HttpServletRequest request, + VoteContent voteContent, String strToolContentID) { + if (logger.isDebugEnabled()) { + logger.debug("ToolContentID" + strToolContentID); + } + UserDTO toolUser = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER); + + String richTextTitle = request.getParameter(VoteAppConstants.TITLE); + String richTextInstructions = request.getParameter(VoteAppConstants.INSTRUCTIONS); + + String lockOnFinish = request.getParameter("lockOnFinish"); + + String allowTextEntry = request.getParameter("allowText"); + + String showResults = request.getParameter("showResults"); + + String maxInputs = request.getParameter("maxInputs"); + + String useSelectLeaderToolOuput = request.getParameter("useSelectLeaderToolOuput"); + + String reflect = request.getParameter(VoteAppConstants.REFLECT); + + String reflectionSubject = voteAuthoringForm.getReflectionSubject(); + + String maxNomcount = voteAuthoringForm.getMaxNominationCount(); + + String minNomcount = voteAuthoringForm.getMinNominationCount(); + + boolean lockOnFinishBoolean = false; + boolean allowTextEntryBoolean = false; + boolean useSelectLeaderToolOuputBoolean = false; + boolean reflectBoolean = false; + boolean showResultsBoolean = false; + short maxInputsShort = 0; + + if (lockOnFinish != null && lockOnFinish.equalsIgnoreCase("1")) { + lockOnFinishBoolean = true; + } + + if (allowTextEntry != null && allowTextEntry.equalsIgnoreCase("1")) { + allowTextEntryBoolean = true; + } + + if (useSelectLeaderToolOuput != null && useSelectLeaderToolOuput.equalsIgnoreCase("1")) { + useSelectLeaderToolOuputBoolean = true; + } + + if (reflect != null && reflect.equalsIgnoreCase("1")) { + reflectBoolean = true; + } + + if (showResults != null && showResults.equalsIgnoreCase("1")) { + showResultsBoolean = true; + } + + if (maxInputs != null && !"0".equals(maxInputs)) { + maxInputsShort = Short.parseShort(maxInputs); + } + + long userId = 0; + if (toolUser != null) { + userId = toolUser.getUserID().longValue(); + } else { + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + if (user != null) { + userId = user.getUserID().longValue(); + } else { + userId = 0; + } + } + + boolean newContent = false; + if (voteContent == null) { + voteContent = new VoteContent(); + newContent = true; + } + + voteContent.setVoteContentId(new Long(strToolContentID)); + voteContent.setTitle(richTextTitle); + voteContent.setInstructions(richTextInstructions); + voteContent.setUpdateDate(new Date(System.currentTimeMillis())); + /** keep updating this one */ + voteContent.setCreatedBy(userId); + /** make sure we are setting the userId from the User object above */ + + voteContent.setLockOnFinish(lockOnFinishBoolean); + voteContent.setAllowText(allowTextEntryBoolean); + voteContent.setShowResults(showResultsBoolean); + voteContent.setUseSelectLeaderToolOuput(useSelectLeaderToolOuputBoolean); + voteContent.setReflect(reflectBoolean); + voteContent.setMaxNominationCount(maxNomcount); + voteContent.setMinNominationCount(minNomcount); + + voteContent.setReflectionSubject(reflectionSubject); + + voteContent.setMaxExternalInputs(maxInputsShort); + + if (newContent) { + logger.info("In New Content"); + voteService.saveVoteContent(voteContent); + } else { + voteService.updateVote(voteContent); + } + + voteContent = voteService.getVoteContent(new Long(strToolContentID)); + + return voteContent; + } +} \ No newline at end of file Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionController.java =================================================================== diff -u --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionController.java (revision 0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionController.java (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -0,0 +1,67 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +package org.lamsfoundation.lams.tool.vote.web.action; + +import java.io.IOException; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + +import org.apache.log4j.Logger; +import org.lamsfoundation.lams.authoring.web.AuthoringConstants; +import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishController; +import org.lamsfoundation.lams.tool.ToolAccessMode; +import org.lamsfoundation.lams.tool.vote.VoteAppConstants; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.context.WebApplicationContext; + +/** + * This class give a chance to clear HttpSession when user save/close authoring page. + * + * @author Steve.Ni, Ozgur Demirtas + */ +@Controller +public class ClearSessionController extends LamsAuthoringFinishController implements VoteAppConstants { + private static Logger logger = Logger.getLogger(ClearSessionController.class.getName()); + + @Autowired + private WebApplicationContext applicationContext; + + @RequestMapping("/clearsession") + public void execute(HttpServletRequest request, HttpServletResponse response) throws IOException { + super.execute(request, response, applicationContext); + } + + @Override + public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode) { + session.removeAttribute(AuthoringConstants.LAMS_AUTHORING_SUCCESS_FLAG); + if (mode.isAuthor()) { + ClearSessionController.logger.debug("In Author mode"); + session.removeAttribute(customiseSessionID); + } + } +} Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningController.java =================================================================== diff -u --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningController.java (revision 0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningController.java (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -0,0 +1,1002 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + +package org.lamsfoundation.lams.tool.vote.web.action; + +import java.io.IOException; +import java.util.Collection; +import java.util.Date; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TimeZone; +import java.util.TreeMap; +import java.util.TreeSet; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.apache.log4j.Logger; +import org.lamsfoundation.lams.learning.web.util.LearningWebUtil; +import org.lamsfoundation.lams.notebook.model.NotebookEntry; +import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; +import org.lamsfoundation.lams.tool.ToolAccessMode; +import org.lamsfoundation.lams.tool.exception.DataMissingException; +import org.lamsfoundation.lams.tool.exception.ToolException; +import org.lamsfoundation.lams.tool.vote.VoteAppConstants; +import org.lamsfoundation.lams.tool.vote.dto.VoteGeneralLearnerFlowDTO; +import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; +import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; +import org.lamsfoundation.lams.tool.vote.pojos.VoteQueUsr; +import org.lamsfoundation.lams.tool.vote.pojos.VoteSession; +import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt; +import org.lamsfoundation.lams.tool.vote.service.IVoteService; +import org.lamsfoundation.lams.tool.vote.util.VoteApplicationException; +import org.lamsfoundation.lams.tool.vote.util.VoteComparator; +import org.lamsfoundation.lams.tool.vote.web.form.VoteLearningForm; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.DateUtil; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.validation.Errors; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; +import org.springframework.web.context.WebApplicationContext; + +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; + +/** + * @author Ozgur Demirtas + */ +@Controller +@RequestMapping("/learning") +public class LearningController implements VoteAppConstants { + private static Logger logger = Logger.getLogger(LearningController.class.getName()); + + @Autowired + private WebApplicationContext applicationContext; + + @Autowired + @Qualifier("voteService") + private IVoteService voteService; + + @RequestMapping("/viewAllResults") + public String viewAllResults(VoteLearningForm voteLearningForm, HttpServletRequest request) { + VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); + + voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); + voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); + voteLearningForm.setMinNominationCountReached(new Boolean(false).toString()); + + voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMinNominationCountReached(new Boolean(false).toString()); + + LearningController.repopulateRequestParameters(request, voteLearningForm); + + String toolSessionID = request.getParameter(TOOL_SESSION_ID); + logger.info("Tool session ID" + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + + String userID = request.getParameter(USER_ID); + voteLearningForm.setUserID(userID); + + VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + VoteContent voteContent = voteSession.getVoteContent(); + + voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); + voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); + + Long toolContentID = voteContent.getVoteContentId(); + + Long toolSessionUid = voteSession.getUid(); + + VoteQueUsr existingVoteQueUsr = voteService.getVoteUserBySession(new Long(userID), voteSession.getUid()); + + existingVoteQueUsr.setFinalScreenRequested(true); + voteService.updateVoteUser(existingVoteQueUsr); + + Set userAttempts = voteService.getAttemptsForUserAndSession(existingVoteQueUsr.getUid(), + toolSessionUid); + request.setAttribute(LIST_GENERAL_CHECKED_OPTIONS_CONTENT, userAttempts); + + voteService.prepareChartData(request, toolContentID, toolSessionUid, voteGeneralLearnerFlowDTO); + + voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString()); + //String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject()); + voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject()); + + voteLearningForm.resetCommands(); + + request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); + + LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, + applicationContext.getServletContext()); + + return "/learning/AllNominations"; + } + + @RequestMapping("/viewAnswers") + public String viewAnswers(VoteLearningForm voteLearningForm, HttpServletRequest request) { + VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); + + voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); + voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); + voteLearningForm.setMinNominationCountReached(new Boolean(false).toString()); + + voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMinNominationCountReached(new Boolean(false).toString()); + + LearningController.repopulateRequestParameters(request, voteLearningForm); + + String toolSessionID = request.getParameter(TOOL_SESSION_ID); + logger.info("Tool session id :" + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + + String userID = request.getParameter(USER_ID); + logger.info("User id :" + userID); + voteLearningForm.setUserID(userID); + + String revisitingUser = request.getParameter(REVISITING_USER); + voteLearningForm.setRevisitingUser(revisitingUser); + + VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + VoteContent voteContent = voteSession.getVoteContent(); + + voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); + voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); + + if (revisitingUser.equals("true")) { + /* get back login user DTO */ + HttpSession ss = SessionManager.getSession(); + UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); + long userId = toolUser.getUserID().longValue(); + VoteQueUsr voteQueUsr = voteService.getUserByUserId(userId); + + List attempts = voteService.getAttemptsForUser(voteQueUsr.getUid()); + + Map mapQuestionsContent = new TreeMap(new VoteComparator()); + Iterator listIterator = attempts.iterator(); + int order = 0; + while (listIterator.hasNext()) { + VoteUsrAttempt attempt = listIterator.next(); + VoteQueContent voteQueContent = attempt.getVoteQueContent(); + order++; + if (voteQueContent != null) { + mapQuestionsContent.put(new Integer(order).toString(), voteQueContent.getQuestion()); + } + } + request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapQuestionsContent); + } else { + //this is not a revisiting user + logger.info("If not a revisiting user"); + } + + voteLearningForm.resetCommands(); + + request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); + LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, + applicationContext.getServletContext()); + return "/learning/ViewAnswers"; + } + + @RequestMapping("/redoQuestionsOk") + public String redoQuestionsOk(VoteLearningForm voteLearningForm, HttpServletRequest request) { + + VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); + + LearningController.repopulateRequestParameters(request, voteLearningForm); + + String toolSessionID = request.getParameter(TOOL_SESSION_ID); + logger.info("Tool session id:" + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + + String userID = request.getParameter(USER_ID); + logger.info("User id:" + userID); + voteLearningForm.setUserID(userID); + + String revisitingUser = request.getParameter(REVISITING_USER); + voteLearningForm.setRevisitingUser(revisitingUser); + + voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); + voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); + voteLearningForm.setMinNominationCountReached(new Boolean(false).toString()); + + voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMinNominationCountReached(new Boolean(false).toString()); + + VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + VoteContent voteContent = voteSession.getVoteContent(); + voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); + voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); + + voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString()); + //String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject()); + voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject()); + + voteLearningForm.resetCommands(); + + request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); + return redoQuestions(voteLearningForm, request); + } + + @RequestMapping("/learnerFinished") + public String learnerFinished(VoteLearningForm voteLearningForm, HttpServletRequest request) { + VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); + + voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); + voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); + voteLearningForm.setMinNominationCountReached(new Boolean(false).toString()); + + voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMinNominationCountReached(new Boolean(false).toString()); + + LearningController.repopulateRequestParameters(request, voteLearningForm); + + String toolSessionID = request.getParameter(TOOL_SESSION_ID); + logger.info("Tool Session id :" + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + + VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + String userID = request.getParameter(USER_ID); + logger.info("User id:" + userID); + voteLearningForm.setUserID(userID); + + VoteQueUsr voteQueUsr = voteService.getVoteUserBySession(new Long(userID), voteSession.getUid()); + + voteQueUsr.setResponseFinalised(true); + if (!voteSession.getVoteContent().isShowResults()) { + // if not isShowResults then we will have skipped the final screen. + voteQueUsr.setFinalScreenRequested(true); + } + voteService.updateVoteUser(voteQueUsr); + + String revisitingUser = request.getParameter(REVISITING_USER); + voteLearningForm.setRevisitingUser(revisitingUser); + + VoteContent voteContent = voteSession.getVoteContent(); + + voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); + voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); + + voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString()); + //String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject()); + voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject()); + + request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); + + String nextUrl = null; + try { + nextUrl = voteService.leaveToolSession(new Long(toolSessionID), new Long(userID)); + } catch (DataMissingException e) { + logger.error("failure getting nextUrl: " + e); + voteLearningForm.resetCommands(); + //throw new ServletException(e); + return "/learningIndex"; + } catch (ToolException e) { + logger.error("failure getting nextUrl: " + e); + voteLearningForm.resetCommands(); + //throw new ServletException(e); + return "/learningIndex"; + } catch (Exception e) { + logger.error("unknown exception getting nextUrl: " + e); + voteLearningForm.resetCommands(); + //throw new ServletException(e); + return "/learningIndex"; + } + + voteLearningForm.resetCommands(); + + /* pay attention here */ + return "redirect:" + nextUrl; + } + + @RequestMapping("/continueOptionsCombined") + public String continueOptionsCombined(VoteLearningForm voteLearningForm, Errors errors, + HttpServletRequest request) { + + VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); + + LearningController.repopulateRequestParameters(request, voteLearningForm); + + String toolSessionID = request.getParameter(TOOL_SESSION_ID); + logger.info("Tool session id:" + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + + String userID = request.getParameter(USER_ID); + logger.info("User id:" + userID); + voteLearningForm.setUserID(userID); + + String maxNominationCount = request.getParameter(MAX_NOMINATION_COUNT); + voteLearningForm.setMaxNominationCount(maxNominationCount); + + String minNominationCount = request.getParameter(MIN_NOMINATION_COUNT); + voteLearningForm.setMinNominationCount(minNominationCount); + + String userEntry = request.getParameter(USER_ENTRY); + voteLearningForm.setUserEntry(userEntry); + + VoteSession session = voteService.getSessionBySessionId(new Long(toolSessionID)); + voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); + voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); + voteLearningForm.setMinNominationCountReached(new Boolean(false).toString()); + + voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMinNominationCountReached(new Boolean(false).toString()); + + Collection voteDisplayOrderIds = voteLearningForm.votesAsCollection(); + + // check number of votes + int castVoteCount = voteDisplayOrderIds != null ? voteDisplayOrderIds.size() : 0; + if ((userEntry != null) && (userEntry.length() > 0)) { + ++castVoteCount; + } + + int intMaxNominationCount = 0; + if (maxNominationCount != null) { + intMaxNominationCount = new Integer(maxNominationCount).intValue(); + } + + if (castVoteCount > intMaxNominationCount) { + voteLearningForm.setMaxNominationCountReached(new Boolean(true).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(true).toString()); + errors.reject("error.maxNominationCount.reached"); + logger.error("You have selected too many nominations."); + return "/learning/AnswersContent"; + } + + VoteContent voteContent = session.getVoteContent(); + + voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); + voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); + + Long toolContentID = voteContent.getVoteContentId(); + Long voteContentUid = voteContent.getUid(); + + boolean userEntryAvailable = false; + if ((userEntry != null) && (userEntry.length() > 0)) { + userEntryAvailable = true; + } + + Long toolSessionUid = session.getUid(); + + VoteQueUsr user = voteService.getVoteUserBySession(new Long(userID), session.getUid()); + if (user == null) { + throw new VoteApplicationException( + "User with userId= " + userID + " and sessionUid= " + session.getUid() + " doesn't exist."); + } + + voteService.removeAttemptsForUserandSession(user.getUid(), session.getUid()); + + /* + * to minimize changes to working code, convert the String[] array to the mapGeneralCheckedOptionsContent + * structure + */ + Map mapGeneralCheckedOptionsContent = voteService.buildQuestionMap(voteContent, + voteDisplayOrderIds); + + if (mapGeneralCheckedOptionsContent.size() > 0) { + voteService.createAttempt(user, mapGeneralCheckedOptionsContent, "", session, voteContentUid); + } + + if ((mapGeneralCheckedOptionsContent.size() == 0 && (userEntryAvailable == true))) { + Map mapLeanerCheckedOptionsContent = new TreeMap(new VoteComparator()); + + if (userEntry.length() > 0) { + voteService.createAttempt(user, mapLeanerCheckedOptionsContent, userEntry, session, voteContentUid); + } + } + + if ((mapGeneralCheckedOptionsContent.size() > 0) && (userEntryAvailable == true)) { + Map mapLeanerCheckedOptionsContent = new TreeMap(new VoteComparator()); + + if (userEntry.length() > 0) { + voteService.createAttempt(user, mapLeanerCheckedOptionsContent, userEntry, session, voteContentUid); + } + } + + /* put the map in the request ready for the next screen */ + request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent); + voteLearningForm.setMapGeneralCheckedOptionsContent(mapGeneralCheckedOptionsContent); + voteGeneralLearnerFlowDTO.setMapGeneralCheckedOptionsContent(mapGeneralCheckedOptionsContent); + + voteLearningForm.setNominationsSubmited(new Boolean(true).toString()); + voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(true).toString()); + + voteService.prepareChartData(request, toolContentID, toolSessionUid, voteGeneralLearnerFlowDTO); + + voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString()); + voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject()); + + voteLearningForm.resetCommands(); + request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); + + return "/learning/IndividualLearnerResults"; + } + + @RequestMapping("/redoQuestions") + public String redoQuestions(VoteLearningForm voteLearningForm, HttpServletRequest request) { + + VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); + + LearningController.repopulateRequestParameters(request, voteLearningForm); + + String toolSessionID = request.getParameter(TOOL_SESSION_ID); + voteLearningForm.setToolSessionID(toolSessionID); + + String userID = request.getParameter(USER_ID); + voteLearningForm.setUserID(userID); + + String revisitingUser = request.getParameter(REVISITING_USER); + voteLearningForm.setRevisitingUser(revisitingUser); + + VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + + VoteContent voteContent = voteSession.getVoteContent(); + + voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); + voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); + + voteLearningForm.setNominationsSubmited(new Boolean(false).toString()); + voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); + + voteGeneralLearnerFlowDTO.setNominationsSubmited(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); + + Map mapQuestionsContent = voteService.buildQuestionMap(voteContent, null); + request.setAttribute(MAP_QUESTION_CONTENT_LEARNER, mapQuestionsContent); + + Map mapGeneralCheckedOptionsContent = new TreeMap(new VoteComparator()); + request.setAttribute(MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent); + + voteLearningForm.setUserEntry(""); + + voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString()); + voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject()); + voteLearningForm.resetCommands(); + request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); + + return "/learning/AnswersContent"; + } + + @RequestMapping(path = "/checkLeaderProgress", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ResponseBody + public String checkLeaderProgress(HttpServletRequest request) throws IOException { + + Long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); + + VoteSession session = voteService.getSessionBySessionId(toolSessionId); + VoteQueUsr leader = session.getGroupLeader(); + logger.info("Leader :" + leader); + + boolean isLeaderResponseFinalized = leader.isResponseFinalised(); + + ObjectNode objectNode = JsonNodeFactory.instance.objectNode(); + objectNode.put("isLeaderResponseFinalized", isLeaderResponseFinalized); + return objectNode.toString(); + } + + @RequestMapping("/submitReflection") + public String submitReflection(VoteLearningForm voteLearningForm, HttpServletRequest request) { + + LearningController.repopulateRequestParameters(request, voteLearningForm); + + String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); + logger.info("Tool Session Id" + toolSessionID); + voteLearningForm.setToolSessionID(toolSessionID); + + String userID = request.getParameter("userID"); + logger.info("User Id:" + userID); + voteLearningForm.setUserID(userID); + + String reflectionEntry = request.getParameter(ENTRY_TEXT); + logger.info("reflection entry: " + reflectionEntry); + + voteService.createNotebookEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL, MY_SIGNATURE, + new Integer(userID), reflectionEntry); + + voteLearningForm.resetUserActions(); /* resets all except submitAnswersContent */ + return learnerFinished(voteLearningForm, request); + } + + @RequestMapping("/forwardtoReflection") + public String forwardtoReflection(VoteLearningForm voteLearningForm, HttpServletRequest request) { + String toolSessionID = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); + logger.info("toolSessionID:" + toolSessionID); + VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + + VoteContent voteContent = voteSession.getVoteContent(); + VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); + voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); + + voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject()); + + String userID = request.getParameter("userID"); + logger.info("User Id :" + userID); + voteLearningForm.setUserID(userID); + + NotebookEntry notebookEntry = voteService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL, + MY_SIGNATURE, new Integer(userID)); + + if (notebookEntry != null) { + String notebookEntryPresentable = notebookEntry.getEntry(); + voteGeneralLearnerFlowDTO.setNotebookEntry(notebookEntryPresentable); + voteLearningForm.setEntryText(notebookEntryPresentable); + } + + request.setAttribute(VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); + + voteLearningForm.resetCommands(); + + LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, + applicationContext.getServletContext()); + + return "/learning/Notebook"; + } + + private static void repopulateRequestParameters(HttpServletRequest request, VoteLearningForm voteLearningForm) { + String toolSessionID = request.getParameter(TOOL_SESSION_ID); + voteLearningForm.setToolSessionID(toolSessionID); + + String userID = request.getParameter(USER_ID); + voteLearningForm.setUserID(userID); + + String revisitingUser = request.getParameter(REVISITING_USER); + voteLearningForm.setRevisitingUser(revisitingUser); + + String previewOnly = request.getParameter(PREVIEW_ONLY); + voteLearningForm.setPreviewOnly(previewOnly); + + String maxNominationCount = request.getParameter(MAX_NOMINATION_COUNT); + voteLearningForm.setMaxNominationCount(maxNominationCount); + + String minNominationCount = request.getParameter(MIN_NOMINATION_COUNT); + voteLearningForm.setMinNominationCount(minNominationCount); + + String useSelectLeaderToolOuput = request.getParameter(USE_SELECT_LEADER_TOOL_OUTPUT); + voteLearningForm.setUseSelectLeaderToolOuput(useSelectLeaderToolOuput); + + String allowTextEntry = request.getParameter(ALLOW_TEXT_ENTRY); + voteLearningForm.setAllowTextEntry(allowTextEntry); + + String showResults = request.getParameter(SHOW_RESULTS); + voteLearningForm.setShowResults(showResults); + + String lockOnFinish = request.getParameter(LOCK_ON_FINISH); + voteLearningForm.setLockOnFinish(lockOnFinish); + + String reportViewOnly = request.getParameter(REPORT_VIEW_ONLY); + voteLearningForm.setReportViewOnly(reportViewOnly); + + String userEntry = request.getParameter(USER_ENTRY); + voteLearningForm.setUserEntry(userEntry); + + String groupLeaderName = request.getParameter(ATTR_GROUP_LEADER_NAME); + voteLearningForm.setGroupLeaderName(groupLeaderName); + + String groupLeaderUserId = request.getParameter(ATTR_GROUP_LEADER_USER_ID); + voteLearningForm.setGroupLeaderUserId(groupLeaderUserId); + + boolean isUserLeader = WebUtil.readBooleanParam(request, "userLeader"); + voteLearningForm.setIsUserLeader(isUserLeader); + } + + /* + * By now, the passed tool session id MUST exist in the db through the calling of: public void + * createToolSession(Long toolSessionID, Long toolContentId) by the container. + * + * + * make sure this session exists in tool's session table by now. + */ + @RequestMapping("/start") + public String start(VoteLearningForm voteLearningForm, Errors errors, HttpServletRequest request) { + + VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); + + voteLearningForm.setRevisitingUser(new Boolean(false).toString()); + voteLearningForm.setUserEntry(""); + voteLearningForm.setCastVoteCount(0); + voteLearningForm.setMaxNominationCountReached(new Boolean(false).toString()); + + voteGeneralLearnerFlowDTO.setRevisitingUser(new Boolean(false).toString()); + voteGeneralLearnerFlowDTO.setUserEntry(""); + voteGeneralLearnerFlowDTO.setCastVoteCount("0"); + voteGeneralLearnerFlowDTO.setMaxNominationCountReached(new Boolean(false).toString()); + + boolean validateParameters = LearningController.validateParameters(request, voteLearningForm); + if (!validateParameters) { + return "/VoteErrorBox"; + } + + String toolSessionID = voteLearningForm.getToolSessionID(); + + /* + * by now, we made sure that the passed tool session id exists in the db as a new record Make sure we can + * retrieve it and the relavent content + */ + + VoteSession voteSession = voteService.getSessionBySessionId(new Long(toolSessionID)); + + if (voteSession == null) { + + logger.error("error: The tool expects voteSession."); + return "/VoteErrorBox"; + } + + /* + * find out what content this tool session is referring to get the content for this tool session Each passed + * tool session id points to a particular content. Many to one mapping. + */ + VoteContent voteContent = voteSession.getVoteContent(); + if (voteContent == null) { + + logger.error("error: The tool expects voteContent."); + errors.reject("error.content.doesNotExist"); + return "/VoteErrorBox"; + } + + /* + * The content we retrieved above must have been created before in Authoring time. And the passed tool session + * id already refers to it. + */ + LearningController.setupAttributes(request, voteContent, voteLearningForm, voteGeneralLearnerFlowDTO); + + voteLearningForm.setToolContentID(voteContent.getVoteContentId().toString()); + voteGeneralLearnerFlowDTO.setToolContentID(voteContent.getVoteContentId().toString()); + + voteLearningForm.setToolContentUID(voteContent.getUid().toString()); + voteGeneralLearnerFlowDTO.setToolContentUID(voteContent.getUid().toString()); + + voteGeneralLearnerFlowDTO.setReflection(new Boolean(voteContent.isReflect()).toString()); + //String reflectionSubject = VoteUtils.replaceNewLines(voteContent.getReflectionSubject()); + voteGeneralLearnerFlowDTO.setReflectionSubject(voteContent.getReflectionSubject()); + + String mode = voteLearningForm.getLearningMode(); + voteGeneralLearnerFlowDTO.setLearningMode(mode); + + String userId = voteLearningForm.getUserID(); + NotebookEntry notebookEntry = voteService.getEntry(new Long(toolSessionID), CoreNotebookConstants.NOTEBOOK_TOOL, + VoteAppConstants.MY_SIGNATURE, new Integer(userId)); + if (notebookEntry != null) { + //String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry()); + voteGeneralLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry()); + } + + Map mapQuestions = voteService.buildQuestionMap(voteContent, null); + request.setAttribute(VoteAppConstants.MAP_QUESTION_CONTENT_LEARNER, mapQuestions); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); + + VoteQueUsr user = null; + if ((mode != null) && mode.equals(ToolAccessMode.TEACHER.toString())) { + // monitoring mode - user is specified in URL + // user may be null if the user was force completed. + user = getSpecifiedUser(toolSessionID, WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false)); + } else { + user = getCurrentUser(toolSessionID); + } + + // check if there is submission deadline + Date submissionDeadline = voteContent.getSubmissionDeadline(); + + if (submissionDeadline != null) { + + request.setAttribute(VoteAppConstants.ATTR_SUBMISSION_DEADLINE, submissionDeadline); + HttpSession ss = SessionManager.getSession(); + UserDTO learnerDto = (UserDTO) ss.getAttribute(AttributeNames.USER); + TimeZone learnerTimeZone = learnerDto.getTimeZone(); + Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, submissionDeadline); + Date currentLearnerDate = DateUtil.convertToTimeZoneFromDefault(learnerTimeZone, new Date()); + voteGeneralLearnerFlowDTO.setSubmissionDeadline(tzSubmissionDeadline); + + // calculate whether deadline has passed, and if so forward to "submissionDeadline" + if (currentLearnerDate.after(tzSubmissionDeadline)) { + return "/learning/submissionDeadline"; + } + } + + LearningWebUtil.putActivityPositionInRequestByToolSessionId(new Long(toolSessionID), request, + applicationContext.getServletContext()); + + /* find out if the content is being modified at the moment. */ + if (voteContent.isDefineLater()) { + + return "/learning/defineLater"; + } + + //process group leader + VoteQueUsr groupLeader = null; + if (voteContent.isUseSelectLeaderToolOuput()) { + groupLeader = voteService.checkLeaderSelectToolForSessionLeader(user, new Long(toolSessionID)); + + // forwards to the leaderSelection page + if (groupLeader == null && !mode.equals(ToolAccessMode.TEACHER.toString())) { + + Set groupUsers = voteSession.getVoteQueUsers(); + request.setAttribute(ATTR_GROUP_USERS, groupUsers); + request.setAttribute(TOOL_SESSION_ID, toolSessionID); + request.setAttribute(ATTR_CONTENT, voteContent); + + return "/learning/WaitForLeader"; + } + + // check if leader has submitted all answers + if (groupLeader.isResponseFinalised() && !mode.equals(ToolAccessMode.TEACHER.toString())) { + + // in case user joins the lesson after leader has answers some answers already - we need to make sure + // he has the same scratches as leader + voteService.copyAnswersFromLeader(user, groupLeader); + + user.setFinalScreenRequested(true); + user.setResponseFinalised(true); + voteService.updateVoteUser(user); + } + + // store group leader information + voteLearningForm.setGroupLeaderName(groupLeader.getFullname()); + voteLearningForm.setGroupLeaderUserId( + groupLeader.getQueUsrId() != null ? groupLeader.getQueUsrId().toString() : ""); + boolean isUserLeader = voteService.isUserGroupLeader(user, new Long(toolSessionID)); + voteLearningForm.setIsUserLeader(isUserLeader); + } + + if (mode.equals("teacher")) { + + Long sessionUid = user.getVoteSessionId(); + putMapQuestionsContentIntoRequest(request, voteService, user); + Set userAttempts = voteService.getAttemptsForUserAndSessionUseOpenAnswer(user.getUid(), sessionUid); + request.setAttribute(VoteAppConstants.LIST_GENERAL_CHECKED_OPTIONS_CONTENT, userAttempts); + + // since this is progress view, present a screen which can not be edited + voteLearningForm.setReportViewOnly(new Boolean(true).toString()); + voteGeneralLearnerFlowDTO.setReportViewOnly(new Boolean(true).toString()); + + voteService.prepareChartData(request, voteContent.getVoteContentId(), voteSession.getUid(), + voteGeneralLearnerFlowDTO); + + boolean isGroupedActivity = voteService.isGroupedActivity(new Long(voteLearningForm.getToolContentID())); + request.setAttribute("isGroupedActivity", isGroupedActivity); + + return "/learning/ExitLearning"; + } + + /* + * the user's session id AND user id exists in the tool tables goto this screen if the OverAll Results scren has + * been already called up by this user + */ + if (user.isFinalScreenRequested()) { + Long sessionUid = user.getVoteSessionId(); + VoteSession voteUserSession = voteService.getVoteSessionByUID(sessionUid); + String userSessionId = voteUserSession.getVoteSessionId().toString(); + + if (toolSessionID.toString().equals(userSessionId)) { + // the learner has already responsed to this content, just generate a read-only report. Use redo + // questions for this + putMapQuestionsContentIntoRequest(request, voteService, user); + + boolean isResponseFinalised = user.isResponseFinalised(); + if (isResponseFinalised) { + // since the response is finalised present a screen which can not be edited + voteLearningForm.setReportViewOnly(new Boolean(true).toString()); + voteGeneralLearnerFlowDTO.setReportViewOnly(new Boolean(true).toString()); + } + + Set userAttempts = voteService.getAttemptsForUserAndSessionUseOpenAnswer(user.getUid(), + sessionUid); + request.setAttribute(VoteAppConstants.LIST_GENERAL_CHECKED_OPTIONS_CONTENT, userAttempts); + + voteService.prepareChartData(request, voteContent.getVoteContentId(), voteSession.getUid(), + voteGeneralLearnerFlowDTO); + + String isContentLockOnFinish = voteLearningForm.getLockOnFinish(); + if (isContentLockOnFinish.equals(new Boolean(true).toString()) && isResponseFinalised == true) { + // user with session id: userSessionId should not redo votes. session is locked + return "/learning/ExitLearning"; + } + + voteLearningForm.setRevisitingUser(new Boolean(true).toString()); + voteGeneralLearnerFlowDTO.setRevisitingUser(new Boolean(true).toString()); + request.setAttribute(VoteAppConstants.VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); + + if (isContentLockOnFinish.equals(new Boolean(false).toString()) && isResponseFinalised == true) { + // isContentLockOnFinish is false, enable redo of votes + return "/learning/RevisitedAllNominations"; + } + + return "/learning/AllNominations"; + } + } + // presenting standard learner screen.. + return "/learning/AnswersContent"; + } + + /** + * Build the attempts map and put it in the request, based on the supplied user. If the user is null then the map + * will be set but it will be empty TODO This shouldn't go in the request, it should go in our special session map. + */ + private void putMapQuestionsContentIntoRequest(HttpServletRequest request, IVoteService voteService, + VoteQueUsr user) { + List attempts = null; + if (user != null) { + attempts = voteService.getAttemptsForUser(user.getUid()); + } + Map localMapQuestionsContent = new TreeMap(new VoteComparator()); + + if (attempts != null) { + + Iterator listIterator = attempts.iterator(); + int order = 0; + while (listIterator.hasNext()) { + VoteUsrAttempt attempt = listIterator.next(); + VoteQueContent voteQueContent = attempt.getVoteQueContent(); + order++; + if (voteQueContent != null) { + String entry = voteQueContent.getQuestion(); + + String questionUid = attempt.getVoteQueContent().getUid().toString(); + if (entry != null) { + if (entry.equals("sample nomination") && questionUid.equals("1")) { + localMapQuestionsContent.put(new Integer(order).toString(), attempt.getUserEntry()); + } else { + localMapQuestionsContent.put(new Integer(order).toString(), voteQueContent.getQuestion()); + } + } + } + } + } + + request.setAttribute(VoteAppConstants.MAP_GENERAL_CHECKED_OPTIONS_CONTENT, localMapQuestionsContent); + } + + /** + * sets up session scope attributes based on content linked to the passed tool session id + * setupAttributes(HttpServletRequest request, VoteContent voteContent) + * + * @param request + * @param voteContent + */ + private static void setupAttributes(HttpServletRequest request, VoteContent voteContent, + VoteLearningForm voteLearningForm, VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO) { + + Map mapGeneralCheckedOptionsContent = new TreeMap(new VoteComparator()); + request.setAttribute(VoteAppConstants.MAP_GENERAL_CHECKED_OPTIONS_CONTENT, mapGeneralCheckedOptionsContent); + + voteLearningForm.setActivityTitle(voteContent.getTitle()); + voteLearningForm.setActivityInstructions(voteContent.getInstructions()); + voteLearningForm.setMaxNominationCount(voteContent.getMaxNominationCount()); + voteLearningForm.setMinNominationCount(voteContent.getMinNominationCount()); + voteLearningForm.setUseSelectLeaderToolOuput(new Boolean(voteContent.isUseSelectLeaderToolOuput()).toString()); + voteLearningForm.setAllowTextEntry(new Boolean(voteContent.isAllowText()).toString()); + voteLearningForm.setShowResults(new Boolean(voteContent.isShowResults()).toString()); + voteLearningForm.setLockOnFinish(new Boolean(voteContent.isLockOnFinish()).toString()); + + voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); + voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); + voteGeneralLearnerFlowDTO.setMaxNominationCount(voteContent.getMaxNominationCount()); + voteGeneralLearnerFlowDTO.setMinNominationCount(voteContent.getMinNominationCount()); + voteGeneralLearnerFlowDTO + .setUseSelectLeaderToolOuput(new Boolean(voteContent.isUseSelectLeaderToolOuput()).toString()); + voteGeneralLearnerFlowDTO.setAllowTextEntry(new Boolean(voteContent.isAllowText()).toString()); + voteGeneralLearnerFlowDTO.setLockOnFinish(new Boolean(voteContent.isLockOnFinish()).toString()); + voteGeneralLearnerFlowDTO.setActivityTitle(voteContent.getTitle()); + voteGeneralLearnerFlowDTO.setActivityInstructions(voteContent.getInstructions()); + } + + private static boolean validateParameters(HttpServletRequest request, VoteLearningForm voteLearningForm) { + /* + * obtain and setup the current user's data + */ + + String userID = ""; + HttpSession ss = SessionManager.getSession(); + + if (ss != null) { + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + if (user != null && user.getUserID() != null) { + userID = user.getUserID().toString(); + logger.info("User Id : " + userID); + voteLearningForm.setUserID(userID); + } + } + + /* + * process incoming tool session id and later derive toolContentId from it. + */ + String strToolSessionId = request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID); + long toolSessionID = 0; + if (strToolSessionId == null || strToolSessionId.length() == 0) { + + // persistInRequestError(request, "error.toolSessionId.required"); + logger.error("error.toolSessionId.required"); + return false; + } else { + try { + toolSessionID = new Long(strToolSessionId).longValue(); + voteLearningForm.setToolSessionID(new Long(toolSessionID).toString()); + } catch (NumberFormatException e) { + + // persistInRequestError(request, "error.sessionId.numberFormatException"); + logger.error("add error.sessionId.numberFormatException to ActionMessages."); + return false; + } + } + + /* mode can be learner, teacher or author */ + String mode = request.getParameter(VoteAppConstants.MODE); + + if (mode == null || mode.length() == 0) { + + logger.error("mode missing: "); + return false; + } + + if (!mode.equals("learner") && !mode.equals("teacher") && !mode.equals("author")) { + + logger.error("mode invalid: "); + return false; + } + voteLearningForm.setLearningMode(mode); + + return true; + } + + private VoteQueUsr getCurrentUser(String toolSessionId) { + + // get back login user DTO + HttpSession ss = SessionManager.getSession(); + UserDTO toolUser = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userId = new Long(toolUser.getUserID().longValue()); + + VoteSession session = voteService.getSessionBySessionId(new Long(toolSessionId)); + VoteQueUsr user = voteService.getVoteUserBySession(userId, session.getUid()); + if (user == null) { + String userName = toolUser.getLogin(); + String fullName = toolUser.getFirstName() + " " + toolUser.getLastName(); + + user = new VoteQueUsr(userId, userName, fullName, session, new TreeSet()); + voteService.createVoteQueUsr(user); + } + + return user; + } + + private VoteQueUsr getSpecifiedUser(String toolSessionId, Integer userId) { + VoteSession session = voteService.getSessionBySessionId(new Long(toolSessionId)); + VoteQueUsr user = voteService.getVoteUserBySession(new Long(userId.intValue()), session.getUid()); + if (user == null) { + logger.error("Unable to find specified user for Vote activity. Screens are likely to fail. SessionId=" + + new Long(toolSessionId) + " UserId=" + userId); + } + return user; + } +} \ No newline at end of file Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringController.java =================================================================== diff -u --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringController.java (revision 0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/MonitoringController.java (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -0,0 +1,514 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + +package org.lamsfoundation.lams.tool.vote.web.action; + +import java.util.Date; +import java.util.Iterator; +import java.util.LinkedList; +import java.util.List; +import java.util.Map; +import java.util.SortedSet; +import java.util.TimeZone; +import java.util.TreeMap; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.apache.commons.lang.StringEscapeUtils; +import org.apache.log4j.Logger; +import org.lamsfoundation.lams.tool.vote.VoteAppConstants; +import org.lamsfoundation.lams.tool.vote.dto.OpenTextAnswerDTO; +import org.lamsfoundation.lams.tool.vote.dto.SummarySessionDTO; +import org.lamsfoundation.lams.tool.vote.dto.VoteGeneralAuthoringDTO; +import org.lamsfoundation.lams.tool.vote.dto.VoteGeneralMonitoringDTO; +import org.lamsfoundation.lams.tool.vote.dto.VoteMonitoredUserDTO; +import org.lamsfoundation.lams.tool.vote.dto.VoteQuestionDTO; +import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; +import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; +import org.lamsfoundation.lams.tool.vote.pojos.VoteUsrAttempt; +import org.lamsfoundation.lams.tool.vote.service.IVoteService; +import org.lamsfoundation.lams.tool.vote.util.VoteComparator; +import org.lamsfoundation.lams.tool.vote.web.form.VoteMonitoringForm; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.DateUtil; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.lamsfoundation.lams.web.util.SessionMap; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.fasterxml.jackson.databind.node.ArrayNode; +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; + +/** + * @author Ozgur Demirtas + */ +@Controller +@RequestMapping("/monitoring") +public class MonitoringController implements VoteAppConstants { + private static Logger logger = Logger.getLogger(MonitoringController.class.getName()); + + @Autowired + @Qualifier("voteService") + private IVoteService voteService; + + @RequestMapping(path = "/hideOpenVote", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ResponseBody + public String hideOpenVote(HttpServletRequest request) { + return toggleHideShow(request, false); + } + + @RequestMapping(path = "/showOpenVote", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ResponseBody + public String showOpenVote(HttpServletRequest request) { + return toggleHideShow(request, true); + } + + private String toggleHideShow(HttpServletRequest request, boolean show) { + Long currentUid = WebUtil.readLongParam(request, "currentUid"); + logger.info("Current Uid" + currentUid); + + VoteUsrAttempt voteUsrAttempt = voteService.getAttemptByUID(currentUid); + + voteUsrAttempt.setVisible(show); + voteService.updateVoteUsrAttempt(voteUsrAttempt); + String nextActionMethod; + if (show) { + nextActionMethod = "hideOptionVote"; + voteService.showOpenVote(voteUsrAttempt); + } else { + nextActionMethod = "showOpenVote"; + voteService.hideOpenVote(voteUsrAttempt); + } + + ObjectNode responseJSON = JsonNodeFactory.instance.objectNode(); + responseJSON.put("currentUid", currentUid); + responseJSON.put("nextActionMethod", nextActionMethod); + return responseJSON.toString(); + } + + @RequestMapping("/getVoteNomination") + public String getVoteNomination(VoteMonitoringForm voteMonitoringForm, HttpServletRequest request) { + + voteMonitoringForm.setVoteService(voteService); + + VoteGeneralMonitoringDTO voteGeneralMonitoringDTO = new VoteGeneralMonitoringDTO(); + MonitoringController.repopulateRequestParameters(request, voteMonitoringForm, voteGeneralMonitoringDTO); + + Long questionUid = WebUtil.readLongParam(request, VoteAppConstants.ATTR_QUESTION_UID, false); + Long sessionUid = WebUtil.readLongParam(request, VoteAppConstants.ATTR_SESSION_UID, true); + + VoteQueContent nomination = voteService.getQuestionByUid(questionUid); + request.setAttribute("nominationText", nomination.getQuestion()); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO); + request.setAttribute(VoteAppConstants.ATTR_QUESTION_UID, questionUid); + if (sessionUid != null) { + request.setAttribute(VoteAppConstants.ATTR_SESSION_UID, sessionUid); + } + return "/monitoring/VoteNominationViewer"; + } + + @RequestMapping(path = "/getVoteNominationsJSON", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ResponseBody + public String getVoteNominationsJSON(HttpServletRequest request) { + + Long sessionUid = WebUtil.readLongParam(request, VoteAppConstants.ATTR_SESSION_UID, true); + if (sessionUid == 0L) { + sessionUid = null; + logger.info("Setting sessionUid to null"); + } + + Long questionUid = WebUtil.readLongParam(request, VoteAppConstants.ATTR_QUESTION_UID, false); + + // paging parameters of tablesorter + int size = WebUtil.readIntParam(request, "size"); + int page = WebUtil.readIntParam(request, "page"); + Integer sortByName = WebUtil.readIntParam(request, "column[0]", true); + Integer sortByDate = WebUtil.readIntParam(request, "column[1]", true); + String searchString = request.getParameter("fcol[0]"); + + int sorting = VoteAppConstants.SORT_BY_DEFAULT; + if (sortByName != null) { + sorting = sortByName.equals(0) ? VoteAppConstants.SORT_BY_NAME_ASC : VoteAppConstants.SORT_BY_NAME_DESC; + } else if (sortByDate != null) { + sorting = sortByDate.equals(0) ? VoteAppConstants.SORT_BY_DATE_ASC : VoteAppConstants.SORT_BY_DATE_DESC; + } + + //return user list according to the given sessionID + List users = voteService.getUserAttemptsForTablesorter(sessionUid, questionUid, page, size, sorting, + searchString); + + ArrayNode rows = JsonNodeFactory.instance.arrayNode(); + ObjectNode responseJSON = JsonNodeFactory.instance.objectNode(); + responseJSON.put("total_rows", voteService.getCountUsersBySession(sessionUid, questionUid, searchString)); + + for (Object[] userAndAnswers : users) { + + ObjectNode responseRow = JsonNodeFactory.instance.objectNode(); + responseRow.put(VoteAppConstants.ATTR_USER_ID, (Integer) userAndAnswers[0]); + responseRow.put(VoteAppConstants.ATTR_USER_NAME, StringEscapeUtils.escapeHtml((String) userAndAnswers[2])); + responseRow.put(VoteAppConstants.ATTR_ATTEMPT_TIME, + DateUtil.convertToStringForJSON((Date) userAndAnswers[3], request.getLocale())); + responseRow.put(VoteAppConstants.ATTR_ATTEMPT_TIME_TIMEAGO, + DateUtil.convertToStringForTimeagoJSON((Date) userAndAnswers[3])); + responseRow.put(VoteAppConstants.ATTR_PORTRAIT_ID, (Integer) userAndAnswers[4]); + rows.add(responseRow); + } + responseJSON.set("rows", rows); + return responseJSON.toString(); + } + + @RequestMapping(path = "/getReflectionsJSON", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ResponseBody + public String getReflectionsJSON(HttpServletRequest request) { + + Long sessionUid = WebUtil.readLongParam(request, VoteAppConstants.ATTR_SESSION_UID, true); + + // paging parameters of tablesorter + int size = WebUtil.readIntParam(request, "size"); + int page = WebUtil.readIntParam(request, "page"); + Integer sortByName = WebUtil.readIntParam(request, "column[0]", true); + String searchString = request.getParameter("fcol[0]"); + + int sorting = VoteAppConstants.SORT_BY_DEFAULT; + if (sortByName != null) { + sorting = sortByName.equals(0) ? VoteAppConstants.SORT_BY_NAME_ASC : VoteAppConstants.SORT_BY_NAME_DESC; + } + + //return user list according to the given sessionID + List users = voteService.getUserReflectionsForTablesorter(sessionUid, page, size, sorting, + searchString); + + ArrayNode rows = JsonNodeFactory.instance.arrayNode(); + ObjectNode responseJSON = JsonNodeFactory.instance.objectNode(); + responseJSON.put("total_rows", voteService.getCountUsersBySession(sessionUid, null, searchString)); + + for (Object[] userAndReflection : users) { + ObjectNode responseRow = JsonNodeFactory.instance.objectNode(); + responseRow.put(VoteAppConstants.ATTR_USER_ID, (Integer) userAndReflection[0]); + responseRow.put(VoteAppConstants.ATTR_USER_NAME, + StringEscapeUtils.escapeHtml((String) userAndReflection[2])); + if (userAndReflection.length > 3 && userAndReflection[3] != null) { + String reflection = StringEscapeUtils.escapeHtml((String) userAndReflection[3]); + responseRow.put(VoteAppConstants.NOTEBOOK, reflection.replaceAll("\n", "
")); + } + if (userAndReflection.length > 4) { + responseRow.put(VoteAppConstants.ATTR_PORTRAIT_ID, (Integer) userAndReflection[4]); + } + rows.add(responseRow); + } + responseJSON.set("rows", rows); + return responseJSON.toString(); + } + + @RequestMapping("/statistics") + public String statistics(HttpServletRequest request) { + Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); + + request.setAttribute("isGroupedActivity", voteService.isGroupedActivity(toolContentID)); + request.setAttribute(VoteAppConstants.VOTE_STATS_DTO, voteService.getStatisticsBySession(toolContentID)); + return "/monitoring/Stats"; + } + + @RequestMapping(path = "/getOpenTextNominationsJSON", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ResponseBody + public String getOpenTextNominationsJSON(HttpServletRequest request) { + + Long sessionUid = WebUtil.readLongParam(request, VoteAppConstants.ATTR_SESSION_UID, true); + if (sessionUid == 0L) { + logger.info("Setting sessionUid to null"); + sessionUid = null; + } + + Long contentUid = WebUtil.readLongParam(request, VoteAppConstants.TOOL_CONTENT_UID, false); + + // paging parameters of tablesorter + int size = WebUtil.readIntParam(request, "size"); + int page = WebUtil.readIntParam(request, "page"); + Integer sortByEntry = WebUtil.readIntParam(request, "column[0]", true); + Integer sortByName = WebUtil.readIntParam(request, "column[1]", true); + Integer sortByDate = WebUtil.readIntParam(request, "column[2]", true); + Integer sortByVisible = WebUtil.readIntParam(request, "column[3]", true); + String searchStringVote = request.getParameter("fcol[0]"); + String searchStringUsername = request.getParameter("fcol[1]"); + + int sorting = VoteAppConstants.SORT_BY_DEFAULT; + if (sortByEntry != null) { + sorting = sortByEntry.equals(0) ? VoteAppConstants.SORT_BY_ENTRY_ASC : VoteAppConstants.SORT_BY_ENTRY_DESC; + } + if (sortByName != null) { + sorting = sortByName.equals(0) ? VoteAppConstants.SORT_BY_NAME_ASC : VoteAppConstants.SORT_BY_NAME_DESC; + } else if (sortByDate != null) { + sorting = sortByDate.equals(0) ? VoteAppConstants.SORT_BY_DATE_ASC : VoteAppConstants.SORT_BY_DATE_DESC; + } else if (sortByVisible != null) { + sorting = sortByVisible.equals(0) ? VoteAppConstants.SORT_BY_VISIBLE_ASC + : VoteAppConstants.SORT_BY_VISIBLE_DESC; + } + + //return user list according to the given sessionID + List users = voteService.getUserOpenTextAttemptsForTablesorter(sessionUid, contentUid, page, + size, sorting, searchStringVote, searchStringUsername); + + ArrayNode rows = JsonNodeFactory.instance.arrayNode(); + ObjectNode responseJSON = JsonNodeFactory.instance.objectNode(); + responseJSON.put("total_rows", voteService.getCountUsersForOpenTextEntries(sessionUid, contentUid, + searchStringVote, searchStringUsername)); + + for (OpenTextAnswerDTO userAndAttempt : users) { + ObjectNode responseRow = JsonNodeFactory.instance.objectNode(); + + responseRow.put("uid", userAndAttempt.getUserUid()); + responseRow.put(VoteAppConstants.ATTR_USER_NAME, + StringEscapeUtils.escapeHtml(userAndAttempt.getFullName())); + + responseRow.put("userEntryUid", userAndAttempt.getUserEntryUid()); + responseRow.put("userEntry", StringEscapeUtils.escapeHtml(userAndAttempt.getUserEntry())); + responseRow.put(VoteAppConstants.ATTR_ATTEMPT_TIME, + DateUtil.convertToStringForJSON(userAndAttempt.getAttemptTime(), request.getLocale())); + responseRow.put(VoteAppConstants.ATTR_ATTEMPT_TIME_TIMEAGO, + DateUtil.convertToStringForTimeagoJSON(userAndAttempt.getAttemptTime())); + responseRow.put("visible", userAndAttempt.isVisible()); + responseRow.put("portraitId", userAndAttempt.getPortraitId()); + + rows.add(responseRow); + } + responseJSON.set("rows", rows); + return responseJSON.toString(); + } + + /* + * Possible error: forward "learnerNotebook" is not listed in Struts + * + * @RequestMapping("/openNotebook") + * public ActionForward openNotebook(HttpServletRequest request) throws IOException, ServletException, ToolException + * { + * String userId = request.getParameter("userId"); + * + * String userName = request.getParameter("userName"); + * + * String sessionId = request.getParameter("sessionId"); + * + * NotebookEntry notebookEntry = voteService.getEntry(new Long(sessionId), CoreNotebookConstants.NOTEBOOK_TOOL, + * VoteAppConstants.MY_SIGNATURE, new Integer(userId)); + * + * VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = new VoteGeneralLearnerFlowDTO(); + * if (notebookEntry != null) { + * //String notebookEntryPresentable = VoteUtils.replaceNewLines(notebookEntry.getEntry()); + * voteGeneralLearnerFlowDTO.setNotebookEntry(notebookEntry.getEntry()); + * voteGeneralLearnerFlowDTO.setUserName(userName); + * } + * request.setAttribute(VoteAppConstants.VOTE_GENERAL_LEARNER_FLOW_DTO, voteGeneralLearnerFlowDTO); + * + * return mapping.findForward(VoteAppConstants.LEARNER_NOTEBOOK); + * } + */ + @RequestMapping(path = "/setSubmissionDeadline", produces = MediaType.TEXT_PLAIN_VALUE) + @ResponseBody + public String setSubmissionDeadline(HttpServletRequest request) { + Long contentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); + VoteContent voteContent = voteService.getVoteContent(contentID); + + Long dateParameter = WebUtil.readLongParam(request, VoteAppConstants.ATTR_SUBMISSION_DEADLINE, true); + Date tzSubmissionDeadline = null; + String formattedDate = ""; + if (dateParameter != null) { + Date submissionDeadline = new Date(dateParameter); + HttpSession ss = SessionManager.getSession(); + org.lamsfoundation.lams.usermanagement.dto.UserDTO teacher = (org.lamsfoundation.lams.usermanagement.dto.UserDTO) ss + .getAttribute(AttributeNames.USER); + TimeZone teacherTimeZone = teacher.getTimeZone(); + tzSubmissionDeadline = DateUtil.convertFromTimeZoneToDefault(teacherTimeZone, submissionDeadline); + formattedDate = DateUtil.convertToStringForJSON(tzSubmissionDeadline, request.getLocale()); + } + voteContent.setSubmissionDeadline(tzSubmissionDeadline); + voteService.updateVote(voteContent); + return formattedDate; + } + + @RequestMapping("/start") + public String start(VoteMonitoringForm voteMonitoringForm, HttpServletRequest request) { + + VoteGeneralAuthoringDTO voteGeneralAuthoringDTO = new VoteGeneralAuthoringDTO(); + VoteGeneralMonitoringDTO voteGeneralMonitoringDTO = new VoteGeneralMonitoringDTO(); + request.setAttribute(VoteAppConstants.VOTE_GENERAL_AUTHORING_DTO, voteGeneralAuthoringDTO); + request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO); + + boolean validateParameters = validateParameters(request, voteMonitoringForm); + if (!validateParameters) { + return "/VoteErrorBox"; + } + + // initialiseMonitoringData + voteGeneralMonitoringDTO.setRequestLearningReport(Boolean.FALSE.toString()); + + /* we have made sure TOOL_CONTENT_ID is passed */ + String toolContentID = voteMonitoringForm.getToolContentID(); + logger.warn("Make sure ToolContentId is passed" + toolContentID); + VoteContent voteContent = voteService.getVoteContent(new Long(toolContentID)); + + if (voteContent == null) { + + logger.error("Vote Content does not exist"); + voteGeneralMonitoringDTO.setUserExceptionContentDoesNotExist(Boolean.TRUE.toString()); + return "/VoteErrorBox"; + } + + voteGeneralMonitoringDTO.setActivityTitle(voteContent.getTitle()); + voteGeneralMonitoringDTO.setActivityInstructions(voteContent.getInstructions()); + + /* this section is related to summary tab. Starts here. */ + + SortedSet sessionDTOs = voteService.getMonitoringSessionDTOs(new Long(toolContentID)); + request.setAttribute("sessionDTOs", sessionDTOs); + + request.setAttribute(VoteAppConstants.VOTE_GENERAL_MONITORING_DTO, voteGeneralMonitoringDTO); + + // setting up the advanced summary for LDEV-1662 + request.setAttribute("useSelectLeaderToolOuput", voteContent.isUseSelectLeaderToolOuput()); + request.setAttribute("lockOnFinish", voteContent.isLockOnFinish()); + request.setAttribute("allowText", voteContent.isAllowText()); + request.setAttribute("maxNominationCount", voteContent.getMaxNominationCount()); + request.setAttribute("minNominationCount", voteContent.getMinNominationCount()); + request.setAttribute("showResults", voteContent.isShowResults()); + request.setAttribute("reflect", voteContent.isReflect()); + request.setAttribute("reflectionSubject", voteContent.getReflectionSubject()); + request.setAttribute("toolContentID", voteContent.getVoteContentId()); + + // setting up the SubmissionDeadline + if (voteContent.getSubmissionDeadline() != null) { + Date submissionDeadline = voteContent.getSubmissionDeadline(); + HttpSession ss = SessionManager.getSession(); + UserDTO teacher = (UserDTO) ss.getAttribute(AttributeNames.USER); + TimeZone teacherTimeZone = teacher.getTimeZone(); + Date tzSubmissionDeadline = DateUtil.convertToTimeZoneFromDefault(teacherTimeZone, submissionDeadline); + request.setAttribute(VoteAppConstants.ATTR_SUBMISSION_DEADLINE, tzSubmissionDeadline.getTime()); + // use the unconverted time, as convertToStringForJSON() does the timezone conversion if needed + request.setAttribute(VoteAppConstants.ATTR_SUBMISSION_DEADLINE_DATESTRING, + DateUtil.convertToStringForJSON(submissionDeadline, request.getLocale())); + } + + voteMonitoringForm.setCurrentTab("1"); + voteGeneralMonitoringDTO.setCurrentTab("1"); + + if (sessionDTOs.size() > 0) { + + voteGeneralMonitoringDTO.setUserExceptionContentInUse(Boolean.TRUE.toString()); + } + + /* + * get the nominations section is needed for the Edit tab's View Only mode, starts here + */ + SessionMap sessionMap = new SessionMap<>(); + sessionMap.put(VoteAppConstants.ACTIVITY_TITLE_KEY, voteContent.getTitle()); + sessionMap.put(VoteAppConstants.ACTIVITY_INSTRUCTIONS_KEY, voteContent.getInstructions()); + + voteMonitoringForm.setHttpSessionID(sessionMap.getSessionID()); + request.getSession().setAttribute(sessionMap.getSessionID(), sessionMap); + + List listQuestionDTO = new LinkedList(); + + Iterator queIterator = voteContent.getVoteQueContents().iterator(); + while (queIterator.hasNext()) { + VoteQuestionDTO voteQuestionDTO = new VoteQuestionDTO(); + + VoteQueContent voteQueContent = queIterator.next(); + if (voteQueContent != null) { + + voteQuestionDTO.setQuestion(voteQueContent.getQuestion()); + voteQuestionDTO.setDisplayOrder(new Integer(voteQueContent.getDisplayOrder()).toString()); + listQuestionDTO.add(voteQuestionDTO); + } + } + + request.setAttribute(VoteAppConstants.LIST_QUESTION_DTO, listQuestionDTO); + sessionMap.put(VoteAppConstants.LIST_QUESTION_DTO, listQuestionDTO); + + // this section is needed for Edit Activity screen + voteGeneralAuthoringDTO.setActivityTitle(voteGeneralMonitoringDTO.getActivityTitle()); + voteGeneralAuthoringDTO.setActivityInstructions(voteGeneralMonitoringDTO.getActivityInstructions()); + + MonitoringController.repopulateRequestParameters(request, voteMonitoringForm, voteGeneralMonitoringDTO); + + boolean isGroupedActivity = voteService.isGroupedActivity(new Long(toolContentID)); + request.setAttribute("isGroupedActivity", isGroupedActivity); + request.setAttribute("isAllowText", voteContent.isAllowText()); + + return "/monitoring/MonitoringMaincontent"; + } + + private boolean validateParameters(HttpServletRequest request, VoteMonitoringForm voteMonitoringForm) { + String strToolContentId = request.getParameter(AttributeNames.PARAM_TOOL_CONTENT_ID); + + if ((strToolContentId == null) || (strToolContentId.length() == 0)) { + + return false; + } else { + try { + voteMonitoringForm.setToolContentID(strToolContentId); + } catch (NumberFormatException e) { + logger.error("Number Format Exception"); + + return false; + } + } + return true; + } + + public static Map convertToVoteMonitoredUserDTOMap(List list) { + Map map = new TreeMap(new VoteComparator()); + + Iterator listIterator = list.iterator(); + Long mapIndex = new Long(1); + + while (listIterator.hasNext()) { + ; + VoteMonitoredUserDTO data = listIterator.next(); + + map.put(mapIndex.toString(), data); + mapIndex = new Long(mapIndex.longValue() + 1); + } + return map; + } + + public static void repopulateRequestParameters(HttpServletRequest request, VoteMonitoringForm voteMonitoringForm, + VoteGeneralMonitoringDTO voteGeneralMonitoringDTO) { + + String toolContentID = request.getParameter(VoteAppConstants.TOOL_CONTENT_ID); + voteMonitoringForm.setToolContentID(toolContentID); + voteGeneralMonitoringDTO.setToolContentID(toolContentID); + + String responseId = request.getParameter(VoteAppConstants.RESPONSE_ID); + voteMonitoringForm.setResponseId(responseId); + voteGeneralMonitoringDTO.setResponseId(responseId); + + String currentUid = request.getParameter(VoteAppConstants.CURRENT_UID); + voteMonitoringForm.setCurrentUid(currentUid); + } +} Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorController.java =================================================================== diff -u --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorController.java (revision 0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VoteChartGeneratorController.java (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -0,0 +1,111 @@ +/*************************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License version 2.0 + * as published by the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * ***********************************************************************/ + +package org.lamsfoundation.lams.tool.vote.web.action; + +import java.util.HashMap; +import java.util.LinkedList; +import java.util.Map; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang.StringUtils; +import org.lamsfoundation.lams.tool.vote.dto.SessionDTO; +import org.lamsfoundation.lams.tool.vote.dto.VoteGeneralLearnerFlowDTO; +import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; +import org.lamsfoundation.lams.tool.vote.pojos.VoteSession; +import org.lamsfoundation.lams.tool.vote.service.IVoteService; +import org.lamsfoundation.lams.tool.vote.util.VoteUtils; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.http.MediaType; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.ResponseBody; + +import com.fasterxml.jackson.databind.node.JsonNodeFactory; +import com.fasterxml.jackson.databind.node.ObjectNode; + +/** + * Prepares data for charts. + * + * @author Marcin Cieslak + */ +@Controller +public class VoteChartGeneratorController { + @Autowired + @Qualifier("voteService") + private IVoteService voteService; + + @RequestMapping(path = "/chartGenerator", produces = MediaType.APPLICATION_JSON_UTF8_VALUE) + @ResponseBody + public String start(HttpServletRequest request) { + String currentSessionId = request.getParameter("currentSessionId"); + + Map nominationNames = new HashMap<>(); + Map nominationVotes = new HashMap<>(); + + //request for the all session summary + if ("0".equals(currentSessionId)) { + long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); + LinkedList sessionDTOs = voteService.getSessionDTOs(toolContentID); + + // check allSessionsSummary exists + SessionDTO allSessionsSummary = sessionDTOs.getFirst(); + if ("0".equals(allSessionsSummary.getSessionId())) { + nominationNames = allSessionsSummary.getMapStandardNominationsHTMLedContent(); + nominationVotes = allSessionsSummary.getMapStandardRatesContent(); + + //replace all html tags + for (Long index : nominationNames.keySet()) { + String name = nominationNames.get(index); + String noHTMLNomination = VoteUtils.stripHTML(name); + nominationNames.put(index, noHTMLNomination); + } + } + + //sessionId should not be blank + } else if (!StringUtils.isBlank(currentSessionId)) { + VoteSession voteSession = voteService.getSessionBySessionId(new Long(currentSessionId)); + VoteContent voteContent = voteSession.getVoteContent(); + + VoteGeneralLearnerFlowDTO voteGeneralLearnerFlowDTO = voteService.prepareChartData(request, + voteContent.getVoteContentId(), voteSession.getUid(), new VoteGeneralLearnerFlowDTO()); + + nominationNames = voteGeneralLearnerFlowDTO.getMapStandardNominationsContent(); + nominationVotes = voteGeneralLearnerFlowDTO.getMapStandardRatesContent(); + } + + ObjectNode responseJSON = JsonNodeFactory.instance.objectNode(); + for (Long index : nominationNames.keySet()) { + ObjectNode nomination = JsonNodeFactory.instance.objectNode(); + // nominations' names and values go separately + nomination.put("name", nominationNames.get(index)); + nomination.put("value", nominationVotes.get(index)); + responseJSON.withArray("data").add(nomination); + } + + return responseJSON.toString(); + } +} \ No newline at end of file Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerController.java =================================================================== diff -u --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerController.java (revision 0) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/VotePedagogicalPlannerController.java (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -0,0 +1,110 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ + +package org.lamsfoundation.lams.tool.vote.web.action; + +import javax.servlet.http.HttpServletRequest; + +import org.apache.commons.lang.StringUtils; +import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; +import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; +import org.lamsfoundation.lams.tool.vote.service.IVoteService; +import org.lamsfoundation.lams.tool.vote.web.form.VotePedagogicalPlannerForm; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.beans.factory.annotation.Qualifier; +import org.springframework.stereotype.Controller; +import org.springframework.validation.Errors; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/pedagogicalPlanner") +public class VotePedagogicalPlannerController { + @Autowired + @Qualifier("voteService") + private IVoteService voteService; + + @RequestMapping("/initPedagogicalPlannerForm") + public String initPedagogicalPlannerForm(VotePedagogicalPlannerForm plannerForm, HttpServletRequest request) { + Long toolContentID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); + VoteContent voteContent = voteService.getVoteContent(toolContentID); + plannerForm.fillForm(voteContent); + String contentFolderId = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID); + plannerForm.setContentFolderID(contentFolderId); + return "/authoring/pedagogicalPlannerForm"; + } + + @RequestMapping("/saveOrUpdatePedagogicalPlannerForm") + public String saveOrUpdatePedagogicalPlannerForm(VotePedagogicalPlannerForm plannerForm, Errors errors) { + plannerForm.validate(errors); + if (!errors.hasErrors()) { + VoteContent voteContent = voteService.getVoteContent(plannerForm.getToolContentID()); + voteContent.setInstructions(plannerForm.getInstructions()); + + int nominationIndex = 1; + String nomination = null; + + do { + nomination = plannerForm.getNomination(nominationIndex - 1); + if (StringUtils.isEmpty(nomination)) { + plannerForm.removeNomination(nominationIndex - 1); + } else { + if (nominationIndex <= voteContent.getVoteQueContents().size()) { + VoteQueContent voteQueContent = voteService.getQuestionByDisplayOrder((long) nominationIndex, + voteContent.getUid()); + voteQueContent.setQuestion(nomination); + voteService.saveOrUpdateVoteQueContent(voteQueContent); + + } else { + VoteQueContent voteQueContent = new VoteQueContent(); + voteQueContent.setDisplayOrder(nominationIndex); + voteQueContent.setVoteContent(voteContent); + voteQueContent.setVoteContentId(voteContent.getVoteContentId()); + voteQueContent.setQuestion(nomination); + voteService.saveOrUpdateVoteQueContent(voteQueContent); + } + nominationIndex++; + } + } while (nominationIndex <= plannerForm.getNominationCount()); + if (nominationIndex <= voteContent.getVoteQueContents().size()) { + voteService.removeQuestionsFromCache(voteContent); + voteService.removeVoteContentFromCache(voteContent); + for (; nominationIndex <= voteContent.getVoteQueContents().size(); nominationIndex++) { + VoteQueContent voteQueContent = voteService.getQuestionByDisplayOrder((long) nominationIndex, + voteContent.getUid()); + voteService.removeVoteQueContent(voteQueContent); + } + } + } else { + // saveErrors(request, errors); + } + return "/authoring/pedagogicalPlannerForm"; + } + + @RequestMapping("/createPedagogicalPlannerQuestion") + public String createPedagogicalPlannerQuestion(VotePedagogicalPlannerForm plannerForm) { + plannerForm.setNomination(plannerForm.getNominationCount().intValue(), ""); + return "/authoring/pedagogicalPlannerForm"; + } +} \ No newline at end of file Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VoteLearningForm.java =================================================================== diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VoteLearningForm.java (.../VoteLearningForm.java) (revision 839af8b148458fd7202f178fb52274dca01fc090) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VoteLearningForm.java (.../VoteLearningForm.java) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -26,11 +26,7 @@ import java.util.Collection; import java.util.Map; -import javax.servlet.http.HttpServletRequest; - import org.apache.commons.lang.builder.ToStringBuilder; -import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionMapping; import org.lamsfoundation.lams.tool.vote.VoteAppConstants; /** @@ -40,7 +36,7 @@ * * @author Ozgur Demirtas */ -public class VoteLearningForm extends ActionForm implements VoteAppConstants { +public class VoteLearningForm implements VoteAppConstants { /** * */ @@ -129,8 +125,7 @@ /** The check boxes selected on the first voting screen */ protected String[] checkedVotes; - @Override - public void reset(ActionMapping mapping, HttpServletRequest request) { + public void reset() { checkedVotes = new String[0]; } Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java =================================================================== diff -u -rb13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java (.../VotePedagogicalPlannerForm.java) (revision b13b503e2c38f17a4a5f33c24a32e7ea8a6fa2d8) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java (.../VotePedagogicalPlannerForm.java) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -27,17 +27,12 @@ import java.util.Set; import org.apache.commons.lang.StringUtils; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.vote.pojos.VoteContent; import org.lamsfoundation.lams.tool.vote.pojos.VoteQueContent; -import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivityForm; +import org.lamsfoundation.lams.web.planner.PedagogicalPlannerActivitySpringForm; +import org.springframework.validation.Errors; -public class VotePedagogicalPlannerForm extends PedagogicalPlannerActivityForm { - /** - * - */ - private static final long serialVersionUID = 4035785085162811572L; +public class VotePedagogicalPlannerForm extends PedagogicalPlannerActivitySpringForm { private List nomination; private String contentFolderID; private String instructions; @@ -58,9 +53,7 @@ this.contentFolderID = contentFolderID; } - @Override - public ActionMessages validate() { - ActionMessages errors = new ActionMessages(); + public void validate(Errors errors) { boolean valid = true; boolean allEmpty = true; if (nomination != null && !nomination.isEmpty()) { @@ -72,14 +65,12 @@ } } if (allEmpty) { - ActionMessage error = new ActionMessage("nominations.none.submitted"); - errors.add(ActionMessages.GLOBAL_MESSAGE, error); + errors.reject("nominations.none.submitted"); valid = false; nomination = null; } setValid(valid); - return errors; } public void fillForm(VoteContent voteContent) { Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/struts-config.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag =================================================================== diff -u -r6dfff2871fa49eb6d8dcc49ede08552a8d73e8b3 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 6dfff2871fa49eb6d8dcc49ede08552a8d73e8b3) +++ lams_tool_vote/web/WEB-INF/tags/AuthoringButton.tag (.../AuthoringButton.tag) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -32,7 +32,6 @@ <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ attribute name="formID" required="true" rtexprvalue="true" %> @@ -123,11 +122,11 @@ } \ No newline at end of file Index: lams_tool_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag =================================================================== diff -u -r2a3538bcf43afab737a24136399b323e0ef46f8a -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag (.../AuthoringRatingAllStyleCriteria.tag) (revision 2a3538bcf43afab737a24136399b323e0ef46f8a) +++ lams_tool_vote/web/WEB-INF/tags/AuthoringRatingAllStyleCriteria.tag (.../AuthoringRatingAllStyleCriteria.tag) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -8,7 +8,6 @@ <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> Index: lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag =================================================================== diff -u -r5bdde98b1e94d44d239a50549987293714a5bef1 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag (.../AuthoringRatingCriteria.tag) (revision 5bdde98b1e94d44d239a50549987293714a5bef1) +++ lams_tool_vote/web/WEB-INF/tags/AuthoringRatingCriteria.tag (.../AuthoringRatingCriteria.tag) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -8,9 +8,10 @@ <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> + <%@ attribute name="criterias" required="true" rtexprvalue="true" type="java.util.Collection" %> @@ -284,42 +285,42 @@ - - + + - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + - - + + - - 1 - 2 - 3 - 4 - 5 - 6 - 7 - 8 - 9 - 10 - + + 1 + 2 + 3 + 4 + 5 + 6 + 7 + 8 + 9 + 10 + Index: lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag =================================================================== diff -u -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag (.../CommentsAuthor.tag) (revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf) +++ lams_tool_vote/web/WEB-INF/tags/CommentsAuthor.tag (.../CommentsAuthor.tag) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -1,7 +1,7 @@ <%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-html" prefix="html"%> <%@ taglib uri="tags-fmt" prefix="fmt"%> <%@ taglib uri="tags-lams" prefix="lams"%> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ attribute name="allowCommentsVariableName" required="false" rtexprvalue="true"%> <%@ attribute name="allowCommentLabelKey" required="false" rtexprvalue="true"%> @@ -33,15 +33,15 @@
-     -   +     +  
Index: lams_tool_vote/web/WEB-INF/tags/Rating.tag =================================================================== diff -u -rf538e8642dcc9bc6ea8539d9482e3ca4411093b0 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision f538e8642dcc9bc6ea8539d9482e3ca4411093b0) +++ lams_tool_vote/web/WEB-INF/tags/Rating.tag (.../Rating.tag) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -8,7 +8,6 @@ <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> Index: lams_tool_vote/web/WEB-INF/tags/StyledRating.tag =================================================================== diff -u -refa51a5d0464d96fada4e5a70f1fb86c2d726717 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision efa51a5d0464d96fada4e5a70f1fb86c2d726717) +++ lams_tool_vote/web/WEB-INF/tags/StyledRating.tag (.../StyledRating.tag) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -8,7 +8,6 @@ <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-lams" prefix="lams"%> <%@ taglib uri="tags-function" prefix="fn" %> Index: lams_tool_vote/web/WEB-INF/tags/TabBody.tag =================================================================== diff -u -r36e474218e1201198ba926e57e56c7a885db1a9f -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 36e474218e1201198ba926e57e56c7a885db1a9f) +++ lams_tool_vote/web/WEB-INF/tags/TabBody.tag (.../TabBody.tag) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -34,7 +34,6 @@ <%@ attribute name="titleKey" required="false" rtexprvalue="true"%> <%@ attribute name="page" required="false" rtexprvalue="true"%> <%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-bean" prefix="bean"%> Index: lams_tool_vote/web/WEB-INF/tags/TabBodyArea.tag =================================================================== diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/WEB-INF/tags/TabBodyArea.tag (.../TabBodyArea.tag) (revision ff7583ba24a271222b91ab3ecc460b931fe20e37) +++ lams_tool_vote/web/WEB-INF/tags/TabBodyArea.tag (.../TabBodyArea.tag) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -30,7 +30,6 @@ %> <%@ taglib uri="tags-core" prefix="c"%> -<%@ taglib uri="tags-bean" prefix="bean"%>
Index: lams_tool_vote/web/WEB-INF/tags/TextSearch.tag =================================================================== diff -u -r08a45e4407f4200f34653a91d402ac4ad2f43f50 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/WEB-INF/tags/TextSearch.tag (.../TextSearch.tag) (revision 08a45e4407f4200f34653a91d402ac4ad2f43f50) +++ lams_tool_vote/web/WEB-INF/tags/TextSearch.tag (.../TextSearch.tag) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -32,8 +32,8 @@ <%@ tag body-content="scriptless" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> -<%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%-- Required attributes --%> <%@ attribute name="sessionMapID" required="true" rtexprvalue="true" %> @@ -88,39 +88,39 @@
- +

- +
- +
- +
- +
Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tlds/struts/struts-bean-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tlds/struts/struts-bean.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tlds/struts/struts-html-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tlds/struts/struts-html.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tlds/struts/struts-logic-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tlds/struts/struts-logic.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tlds/struts/struts-nested.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tlds/struts/struts-tiles-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/tlds/struts/struts-tiles.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 433c3dff4f4c7961e4f90f7d370a399bedaadaf6 refers to a dead (removed) revision in file `lams_tool_vote/web/WEB-INF/validation.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/web/WEB-INF/web.xml =================================================================== diff -u -r3d2504b68e78a6d0ae55cf6089eed8f8a213ca16 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision 3d2504b68e78a6d0ae55cf6089eed8f8a213ca16) +++ lams_tool_vote/web/WEB-INF/web.xml (.../web.xml) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -150,46 +150,6 @@ - - - - tags-bean - /WEB-INF/tlds/struts/struts-bean.tld - - - - tags-html - /WEB-INF/tlds/struts/struts-html.tld - - - - tags-logic - /WEB-INF/tlds/struts/struts-logic.tld - - - - tags-tiles - /WEB-INF/tlds/struts/struts-tiles.tld - - - - tags-bean-el - /WEB-INF/tlds/struts/struts-bean-el.tld - - - tags-html-el - /WEB-INF/tlds/struts/struts-html-el.tld - - - tags-logic-el - /WEB-INF/tlds/struts/struts-logic-el.tld - - - tags-tiles-el - /WEB-INF/tlds/struts/struts-tiles-el.tld - - - Index: lams_tool_vote/web/authoring/AdvancedContent.jsp =================================================================== diff -u -rd7b8dfc74b0f786d93eb97ff3a351a96be451acf -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision d7b8dfc74b0f786d93eb97ff3a351a96be451acf) +++ lams_tool_vote/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -11,9 +11,8 @@
@@ -23,42 +22,41 @@
- -   + +  
- -   + +  
- - + + - + - ${index} + ${index} - + + +
@@ -68,29 +66,26 @@
- +
Index: lams_tool_vote/web/authoring/AuthoringMaincontent.jsp =================================================================== diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision ff7583ba24a271222b91ab3ecc460b931fe20e37) +++ lams_tool_vote/web/authoring/AuthoringMaincontent.jsp (.../AuthoringMaincontent.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -74,32 +74,32 @@ } function doSubmit(method) { - document.VoteAuthoringForm.dispatch.value=method; - document.VoteAuthoringForm.submit(); + document.forms.voteAuthoringForm.action=method + ".do"; + document.forms.voteAuthoringForm.submit(); } function submitModifyNomination(optionIndexValue, actionMethod) { - document.VoteAuthoringForm.optIndex.value=optionIndexValue; + document.forms.voteAuthoringForm.optIndex.value=optionIndexValue; submitMethod(actionMethod); } function submitModifyAuthoringNomination(questionIndexValue, actionMethod) { - document.VoteAuthoringForm.questionIndex.value=questionIndexValue; + document.forms.voteAuthoringForm.questionIndex.value=questionIndexValue; submitMethod(actionMethod); } function submitMethod(actionMethod) { - document.VoteAuthoringForm.dispatch.value=actionMethod; - document.VoteAuthoringForm.submit(); + document.forms.voteAuthoringForm.action=actionMethod + ".do"; + document.forms.voteAuthoringForm.submit(); } function deleteOption(deletableOptionIndex, actionMethod) { - document.VoteAuthoringForm.deletableOptionIndex.value=deletableOptionIndex; + document.forms.voteAuthoringForm.deletableOptionIndex.value=deletableOptionIndex; submitMethod(actionMethod); } function submitDeleteFile(uuid, actionMethod) { - document.VoteAuthoringForm.uuid.value=uuid; + document.forms.voteAuthoringForm.uuid.value=uuid; submitMethod(actionMethod); } @@ -108,16 +108,13 @@ - - - - - - - + + + + + - @@ -135,20 +132,20 @@ - + - + Index: lams_tool_vote/web/authoring/BasicContent.jsp =================================================================== diff -u -rb91a146c89c8453761fda681274bca06b3fd1e72 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision b91a146c89c8453761fda681274bca06b3fd1e72) +++ lams_tool_vote/web/authoring/BasicContent.jsp (.../BasicContent.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -23,12 +23,12 @@ } function removeNomination(questionIndex){ - document.VoteAuthoringForm.questionIndex.value=questionIndex; + document.forms.voteAuthoringForm.questionIndex.value=questionIndex; submitMethod('removeNomination'); } function removeMonitoringNomination(questionIndex){ - document.VoteMonitoringForm.questionIndex.value=questionIndex; + document.voteMonitoringForm.questionIndex.value=questionIndex; submitMonitoringMethod('removeNomination'); } @@ -49,14 +49,14 @@ - +
- +
- +
@@ -66,19 +66,19 @@

- ');" +   - - + + - ${dataFlowObject} + ${dataFlowObject} - +

Index: lams_tool_vote/web/authoring/editNominationBox.jsp =================================================================== diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/authoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271) +++ lams_tool_vote/web/authoring/editNominationBox.jsp (.../editNominationBox.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -14,16 +14,14 @@
- + + + + + + + - - - - - - - -
 
- +
Index: lams_tool_vote/web/authoring/itemlist.jsp =================================================================== diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/authoring/itemlist.jsp (.../itemlist.jsp) (revision ff7583ba24a271222b91ab3ecc460b931fe20e37) +++ lams_tool_vote/web/authoring/itemlist.jsp (.../itemlist.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -8,8 +8,6 @@ - - @@ -41,7 +39,7 @@ Index: lams_tool_vote/web/authoring/newNominationBox.jsp =================================================================== diff -u -rc43a7c4f1389ad2b5fdc526aa736be11ab5ad271 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/authoring/newNominationBox.jsp (.../newNominationBox.jsp) (revision c43a7c4f1389ad2b5fdc526aa736be11ab5ad271) +++ lams_tool_vote/web/authoring/newNominationBox.jsp (.../newNominationBox.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -16,13 +16,12 @@
- - - - - - - + + + + + +
- +
Index: lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp =================================================================== diff -u -r2fab2e212d7c46f61829635d0834821eb5484837 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 2fab2e212d7c46f61829635d0834821eb5484837) +++ lams_tool_vote/web/authoring/pedagogicalPlannerForm.jsp (.../pedagogicalPlannerForm.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -36,7 +36,7 @@ function createQuestion(){ prepareFormData(); $('#pedagogicalPlannerForm').ajaxSubmit({ - url: "", + url: "", success: function(responseText){ var bodyTag = ' <%@ include file="/common/messages.jsp"%> - - - - - + + + + + -

- - +

" - onclick="javascript:showMessage('');"> + onclick="javascript:showMessage('authoring/newEditableNominationBox.do?questionIndex=${queIndex}&contentFolderID=${voteGeneralAuthoringDTO.contentFolderID}&httpSessionID=${voteGeneralAuthoringDTO.httpSessionID}&toolContentID=${voteGeneralAuthoringDTO.toolContentID}&lockOnFinish=${voteGeneralAuthoringDTO.lockOnFinish}&allowText=${voteGeneralAuthoringDTO.allowText}&maxNominationCount=${voteGeneralAuthoringDTO.maxNominationCount}&minNominationCount=${voteGeneralAuthoringDTO.minNominationCount}&reflect=${voteGeneralAuthoringDTO.reflect}')">
- +
@@ -105,7 +104,7 @@
- + \ No newline at end of file Index: lams_tool_vote/web/common/messages.jsp =================================================================== diff -u -r5f940a9f66e9fc53d5c13d69fc716c4e7675a19e -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/common/messages.jsp (.../messages.jsp) (revision 5f940a9f66e9fc53d5c13d69fc716c4e7675a19e) +++ lams_tool_vote/web/common/messages.jsp (.../messages.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -1,17 +1,12 @@ <%-- Error Messages --%> - - - - - - - + -<%-- Success Messages --%> +<%-- Success Messages - - \ No newline at end of file + +--%> \ No newline at end of file Index: lams_tool_vote/web/common/monitorheader.jsp =================================================================== diff -u -r83ca314c18ea866bb79570b6e7da25eb8729b3b4 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/common/monitorheader.jsp (.../monitorheader.jsp) (revision 83ca314c18ea866bb79570b6e7da25eb8729b3b4) +++ lams_tool_vote/web/common/monitorheader.jsp (.../monitorheader.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -10,8 +10,7 @@ - - + @@ -33,6 +32,6 @@ - + Index: lams_tool_vote/web/common/taglibs.jsp =================================================================== diff -u -r9d26aaf34391eb58df037978365deda31de85c1b -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/common/taglibs.jsp (.../taglibs.jsp) (revision 9d26aaf34391eb58df037978365deda31de85c1b) +++ lams_tool_vote/web/common/taglibs.jsp (.../taglibs.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -1,11 +1,8 @@ <%@ page language="java" pageEncoding="UTF-8" contentType="text/html;charset=utf-8" %> -<%@ taglib uri="tags-bean" prefix="bean" %> -<%@ taglib uri="tags-html" prefix="html" %> -<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-function" prefix="fn" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> <%@ taglib uri="tags-xml" prefix="x" %> <%@ taglib uri="tags-lams" prefix="lams" %> +<%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> - Index: lams_tool_vote/web/learning/AllNominations.jsp =================================================================== diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/learning/AllNominations.jsp (.../AllNominations.jsp) (revision 839af8b148458fd7202f178fb52274dca01fc090) +++ lams_tool_vote/web/learning/AllNominations.jsp (.../AllNominations.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -7,11 +7,10 @@ - - + <fmt:message key="activity.title" /> @@ -23,43 +22,41 @@ - - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - +

@@ -129,16 +126,15 @@
- +
-
- + @@ -182,13 +178,13 @@
- +
- +
@@ -214,7 +210,7 @@ - + @@ -243,7 +239,7 @@ - + \ No newline at end of file Index: lams_tool_vote/web/learning/AnswersContent.jsp =================================================================== diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 839af8b148458fd7202f178fb52274dca01fc090) +++ lams_tool_vote/web/learning/AnswersContent.jsp (.../AnswersContent.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -16,11 +16,11 @@ - - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - + - + - + @@ -92,10 +89,10 @@ - - + @@ -119,7 +116,7 @@ - + Index: lams_tool_vote/web/learning/IndividualLearnerResults.jsp =================================================================== diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 839af8b148458fd7202f178fb52274dca01fc090) +++ lams_tool_vote/web/learning/IndividualLearnerResults.jsp (.../IndividualLearnerResults.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -18,47 +18,45 @@ - - - - + + + - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - + - +
@@ -80,22 +78,21 @@
- +
- +
- - ? - + @@ -106,37 +103,39 @@ - - - - + + - - - - - - - - - - + + + - - - + - + Index: lams_tool_vote/web/learning/Notebook.jsp =================================================================== diff -u -r839af8b148458fd7202f178fb52274dca01fc090 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/learning/Notebook.jsp (.../Notebook.jsp) (revision 839af8b148458fd7202f178fb52274dca01fc090) +++ lams_tool_vote/web/learning/Notebook.jsp (.../Notebook.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -16,40 +16,39 @@ - + - - - - - - - + + + + + +
- + - + - - - - + + + - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + - +
- + - + - - - +
@@ -99,10 +95,10 @@
- - + @@ -125,7 +121,7 @@ - + Index: lams_tool_vote/web/learning/WaitForLeader.jsp =================================================================== diff -u -rfd828b318de3f33f8a10bbd57cb15c2f4e73e2ee -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/learning/WaitForLeader.jsp (.../WaitForLeader.jsp) (revision fd828b318de3f33f8a10bbd57cb15c2f4e73e2ee) +++ lams_tool_vote/web/learning/WaitForLeader.jsp (.../WaitForLeader.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -36,9 +36,9 @@ - + - + \ No newline at end of file Index: lams_tool_vote/web/learning/submissionDeadline.jsp =================================================================== diff -u -r06a6c167950bd4a3bc90be12854509e2a0ac6588 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 06a6c167950bd4a3bc90be12854509e2a0ac6588) +++ lams_tool_vote/web/learning/submissionDeadline.jsp (.../submissionDeadline.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -17,8 +17,8 @@ @@ -32,10 +32,9 @@ - - - - + + + @@ -61,14 +60,13 @@ - - - + class="btn btn-primary voffset10 pull-right" + value='' /> - + Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -rb37f7b42698f0aa6bd5b346a8e9bb4085964c0a7 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision b37f7b42698f0aa6bd5b346a8e9bb4085964c0a7) +++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -17,9 +17,9 @@
- + - +   Index: lams_tool_vote/web/monitoring/Edit.jsp =================================================================== diff -u -r58448aa728e808e025d15546ea5375e6db321ff3 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/monitoring/Edit.jsp (.../Edit.jsp) (revision 58448aa728e808e025d15546ea5375e6db321ff3) +++ lams_tool_vote/web/monitoring/Edit.jsp (.../Edit.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -1,5 +1,4 @@ <%@ include file="/common/taglibs.jsp"%> - @@ -25,11 +24,11 @@
- - - + + + - + - + Index: lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp =================================================================== diff -u -rb91a146c89c8453761fda681274bca06b3fd1e72 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision b91a146c89c8453761fda681274bca06b3fd1e72) +++ lams_tool_vote/web/monitoring/MonitoringMaincontent.jsp (.../MonitoringMaincontent.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -38,39 +38,39 @@ } function doStatistic(){ - var url = '?dispatch=statistics&toolContentID=${toolContentID}'; + var url = '/monitoring/statistics.do?toolContentID=${toolContentID}'; $.ajaxSetup({ cache: true }); $("#statisticArea").load(url); } function doSubmit(method) { - document.VoteMonitoringForm.dispatch.value=method; - document.VoteMonitoringForm.submit(); + document.forms.voteMonitoringForm.action=method + '.do'; + document.forms.voteMonitoringForm.submit(); } function submitMonitoringMethod(actionMethod) { - document.VoteMonitoringForm.dispatch.value=actionMethod; - document.VoteMonitoringForm.submit(); + document.forms.voteMonitoringForm.action=actionMethod + '.do'; + document.forms.voteMonitoringForm.submit(); } function submitAuthoringMethod(actionMethod) { - document.VoteAuthoringForm.dispatch.value=actionMethod; - document.VoteAuthoringForm.submit(); + document.forms.voteAuthoringForm.action=actionMethod + '.do'; + document.forms.voteAuthoringForm.submit(); } function submitModifyQuestion(questionIndexValue, actionMethod) { - document.VoteMonitoringForm.questionIndex.value=questionIndexValue; + document.forms.voteMonitoringForm.questionIndex.value=questionIndexValue; submitMethod(actionMethod); } function submitModifyMonitoringNomination(questionIndexValue, actionMethod) { - document.VoteMonitoringForm.questionIndex.value=questionIndexValue; + document.forms.voteMonitoringForm.questionIndex.value=questionIndexValue; submitMethod(actionMethod); } function submitEditResponse(responseId, actionMethod) { - document.VoteMonitoringForm.responseId.value=responseId; + document.forms.voteMonitoringForm.responseId.value=responseId; submitMethod(actionMethod); } @@ -79,17 +79,17 @@ } function deleteOption(optIndex, actionMethod) { - document.VoteMonitoringForm.optIndex.value=optIndex; + document.forms.voteMonitoringForm.optIndex.value=optIndex; submitMethod(actionMethod); } function submitModifyOption(optionIndexValue, actionMethod) { - document.VoteMonitoringForm.optIndex.value=optionIndexValue; + document.forms.voteMonitoringForm.optIndex.value=optionIndexValue; submitMethod(actionMethod); } function submitModifyNomination(optionIndexValue, actionMethod) { - document.VoteMonitoringForm.optIndex.value=optionIndexValue; + document.forms.voteMonitoringForm.optIndex.value=optionIndexValue; submitMethod(actionMethod); } @@ -98,14 +98,13 @@ - - - - - - - - + + + + + + + @@ -128,7 +127,7 @@ - + Index: lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp =================================================================== diff -u -r83ca314c18ea866bb79570b6e7da25eb8729b3b4 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp (.../OtherTextNominationViewer.jsp) (revision 83ca314c18ea866bb79570b6e7da25eb8729b3b4) +++ lams_tool_vote/web/monitoring/OtherTextNominationViewer.jsp (.../OtherTextNominationViewer.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -14,7 +14,7 @@ var submitUid = currentUid; $.ajax({ - url: '/monitoring.do?dispatch='+actionMethod+'¤tUid='+submitUid, + url: 'monitoring/'+actionMethod+'.do?currentUid='+submitUid, }).done(function( data ) { if ( data.currentUid == submitUid ) { $('#entryTable').trigger('pagerUpdate'); @@ -68,9 +68,9 @@ cssDisabled: 'disabled', - ajaxUrl : "monitoring.do?dispatch=getOpenTextNominationsJSON&page={page}&size={size}&{sortList:column}&{filterList:fcol}&sessionUid=${param.sessionUid}&toolContentUID=${param.toolContentUID}", + ajaxUrl : "monitoring/getOpenTextNominationsJSON.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}&sessionUid=${param.sessionUid}&toolContentUID=${param.toolContentUID}", - ajaxUrl : "monitoring.do?dispatch=getOpenTextNominationsJSON&page={page}&size={size}&{sortList:column}&{filterList:fcol}&toolContentUID=${param.toolContentUID}", + ajaxUrl : "monitoring/getOpenTextNominationsJSON.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}&toolContentUID=${param.toolContentUID}", ajaxProcessing: function (data, table) { Index: lams_tool_vote/web/monitoring/ReflectionViewer.jsp =================================================================== diff -u -r83ca314c18ea866bb79570b6e7da25eb8729b3b4 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/monitoring/ReflectionViewer.jsp (.../ReflectionViewer.jsp) (revision 83ca314c18ea866bb79570b6e7da25eb8729b3b4) +++ lams_tool_vote/web/monitoring/ReflectionViewer.jsp (.../ReflectionViewer.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -36,7 +36,7 @@ cssPageDisplay: '.pagedisplay', cssPageSize: '.pagesize', cssDisabled: 'disabled', - ajaxUrl : "monitoring.do?dispatch=getReflectionsJSON&page={page}&size={size}&{sortList:column}&{filterList:fcol}&sessionUid=" + $(this).attr('data-session-id'), + ajaxUrl : "monitoring/getReflectionsJSON.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}&sessionUid=" + $(this).attr('data-session-id'), ajaxProcessing: function (data, table) { if (data && data.hasOwnProperty('rows')) { var rows = [], Index: lams_tool_vote/web/monitoring/SummaryContent.jsp =================================================================== diff -u -rc6ad8493ef2064430e8783b28258cc9f223a3844 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision c6ad8493ef2064430e8783b28258cc9f223a3844) +++ lams_tool_vote/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -15,7 +15,7 @@ lams: '${lams}', submissionDeadline: '${submissionDeadline}', submissionDateString: '${submissionDateString}', - setSubmissionDeadlineUrl: '', + setSubmissionDeadlineUrl: '', toolContentID: '${toolContentID}', messageNotification: '', messageRestrictionSet: '', Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp =================================================================== diff -u -r83ca314c18ea866bb79570b6e7da25eb8729b3b4 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp (.../VoteNominationViewer.jsp) (revision 83ca314c18ea866bb79570b6e7da25eb8729b3b4) +++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp (.../VoteNominationViewer.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -36,7 +36,7 @@ cssPageDisplay: '.pagedisplay', cssPageSize: '.pagesize', cssDisabled: 'disabled', - ajaxUrl : "monitoring.do?dispatch=getVoteNominationsJSON&page={page}&size={size}&{sortList:column}&{filterList:fcol}&questionUid=${questionUid}&sessionUid=" + $(this).attr('data-session-id'), + ajaxUrl : "monitoring/getVoteNominationsJSON.do?page={page}&size={size}&{sortList:column}&{filterList:fcol}&questionUid=${questionUid}&sessionUid=" + $(this).attr('data-session-id'), ajaxProcessing: function (data, table) { if (data && data.hasOwnProperty('rows')) { var rows = [], Index: lams_tool_vote/web/monitoring/daterestriction.jsp =================================================================== diff -u -rff7583ba24a271222b91ab3ecc460b931fe20e37 -r433c3dff4f4c7961e4f90f7d370a399bedaadaf6 --- lams_tool_vote/web/monitoring/daterestriction.jsp (.../daterestriction.jsp) (revision ff7583ba24a271222b91ab3ecc460b931fe20e37) +++ lams_tool_vote/web/monitoring/daterestriction.jsp (.../daterestriction.jsp) (revision 433c3dff4f4c7961e4f90f7d370a399bedaadaf6) @@ -10,9 +10,9 @@ - + - +
@@ -21,9 +21,9 @@ - + - + \ No newline at end of file