Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java,v diff -u -r1.1 -r1.2 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java 12 Sep 2006 04:15:19 -0000 1.1 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java 12 Sep 2006 04:35:47 -0000 1.2 @@ -143,7 +143,7 @@ //save toolContentID into HTTPSession ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, true); - Long sessionId = new Long(request.getParameter(SurveyConstants.PARAM_TOOL_SESSION_ID)); + Long sessionId = new Long(request.getParameter(AttributeNames.PARAM_TOOL_SESSION_ID)); request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); request.setAttribute(AttributeNames.ATTR_MODE,mode); @@ -161,22 +161,6 @@ //check whehter finish lock is on/off boolean lock = survey.getLockWhenFinished() && surveyUser.isSessionFinished(); - - //check whether there is only one survey item and run auto flag is true or not. - boolean runAuto = false; - int itemsNumber = 0; - if(survey.getSurveyItems() != null){ - itemsNumber = survey.getSurveyItems().size(); - if(survey.isRunAuto() && itemsNumber == 1){ - SurveyQuestion item = (SurveyQuestion) survey.getSurveyItems().iterator().next(); - //only visible item can be run auto. - if(!item.isHide()){ - runAuto = true; - request.setAttribute(SurveyConstants.ATTR_RESOURCE_ITEM_UID,item.getUid()); - } - } - } - //basic information sessionMap.put(SurveyConstants.ATTR_TITLE,survey.getTitle()); sessionMap.put(SurveyConstants.ATTR_RESOURCE_INSTRUCTION,survey.getInstructions()); @@ -187,7 +171,6 @@ //reflection information sessionMap.put(SurveyConstants.ATTR_REFLECTION_ON,survey.isReflectOnActivity()); sessionMap.put(SurveyConstants.ATTR_REFLECTION_INSTRUCTION,survey.getReflectInstructions()); - sessionMap.put(SurveyConstants.ATTR_RUN_AUTO,new Boolean(runAuto)); //add define later support if(survey.isDefineLater()){ @@ -264,16 +247,6 @@ ToolAccessMode mode = (ToolAccessMode) sessionMap.get(AttributeNames.ATTR_MODE); Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); - //auto run mode, when use finish the only one survey item, mark it as complete then finish this activity as well. - String surveyItemUid = request.getParameter(SurveyConstants.PARAM_RESOURCE_ITEM_UID); - if(surveyItemUid != null){ - doComplete(request); - //NOTE:So far this flag is useless(31/08/2006). - //set flag, then finish page can know redir target is parent(AUTO_RUN) or self(normal) - request.setAttribute(SurveyConstants.ATTR_RUN_AUTO,true); - }else - request.setAttribute(SurveyConstants.ATTR_RUN_AUTO,false); - if(!validateBeforeFinish(request, sessionMapID)) return mapping.getInputForward(); @@ -310,7 +283,7 @@ SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMapID); - Long sessionId = (Long) sessionMap.get(SurveyConstants.ATTR_TOOL_SESSION_ID); + Long sessionId = (Long) sessionMap.get(AttributeNames.PARAM_TOOL_SESSION_ID); String mode = request.getParameter(AttributeNames.ATTR_MODE); SurveyItemForm itemForm = (SurveyItemForm)form; @@ -434,17 +407,6 @@ Long userID = new Long(user.getUserID().longValue()); ISurveyService service = getSurveyService(); - int miniViewFlag = service.checkMiniView(sessionId,userID); - //if current user view less than reqired view count number, then just return error message. - //if it is runOffline content, then need not check minimum view count - Boolean runOffline = (Boolean) sessionMap.get(SurveyConstants.PARAM_RUN_OFFLINE); - if(miniViewFlag > 0 && !runOffline){ - ActionErrors errors = new ActionErrors(); - errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("lable.learning.minimum.view.number.less",miniViewFlag)); - this.addErrors(request,errors); - return false; - } - return true; } private ISurveyService getSurveyService() { @@ -480,33 +442,6 @@ return list; } - /** - * Return ActionForward according to survey item type. - * @param type - * @param mapping - * @return - */ - private ActionForward findForward(short type, ActionMapping mapping) { - ActionForward forward; - switch (type) { - case SurveyConstants.RESOURCE_TYPE_URL: - forward = mapping.findForward("url"); - break; - case SurveyConstants.RESOURCE_TYPE_FILE: - forward = mapping.findForward("file"); - break; - case SurveyConstants.RESOURCE_TYPE_WEBSITE: - forward = mapping.findForward("website"); - break; - case SurveyConstants.RESOURCE_TYPE_LEARNING_OBJECT: - forward = mapping.findForward("learningobject"); - break; - default: - forward = null; - break; - } - return forward; - } private SurveyUser getCurrentUser(ISurveyService service, Long sessionId) { //try to get form system session @@ -531,56 +466,10 @@ if(StringUtils.isBlank(itemForm.getTitle())) errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_TITLE_BLANK)); - if(itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_URL){ - if(StringUtils.isBlank(itemForm.getUrl())) - errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_URL_BLANK)); - //URL validation: Commom URL validate(1.3.0) work not very well: it can not support http://address:port format!!! -// UrlValidator validator = new UrlValidator(); -// if(!validator.isValid(itemForm.getUrl())) -// errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_INVALID_URL)); - } -// if(itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_WEBSITE -// ||itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_LEARNING_OBJECT){ - if(StringUtils.isBlank(itemForm.getDescription())) - errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_DESC_BLANK)); -// } - if(itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_WEBSITE - ||itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_LEARNING_OBJECT - ||itemForm.getItemType() == SurveyConstants.RESOURCE_TYPE_FILE){ - //for edit validate: file already exist - if(!itemForm.isHasFile() && - (itemForm.getFile() == null || StringUtils.isEmpty(itemForm.getFile().getFileName()))) - errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_FILE_BLANK)); - } + if(StringUtils.isBlank(itemForm.getDescription())) + errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SurveyConstants.ERROR_MSG_DESC_BLANK)); return errors; } - /** - * Set complete flag for given survey item. - * @param request - * @param sessionId - */ - private void doComplete(HttpServletRequest request) { - //get back sessionMap - String sessionMapID = request.getParameter(SurveyConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - - Long surveyItemUid = new Long(request.getParameter(SurveyConstants.PARAM_RESOURCE_ITEM_UID)); - ISurveyService service = getSurveyService(); - HttpSession ss = SessionManager.getSession(); - //get back login user DTO - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - - Long sessionId = (Long) sessionMap.get(SurveyConstants.ATTR_TOOL_SESSION_ID); - service.setItemComplete(surveyItemUid,new Long(user.getUserID().intValue()),sessionId); - - //set survey item complete tag - SortedSet surveyItemList = getSurveyItemList(sessionMap); - for(SurveyQuestion item:surveyItemList){ - if(item.getUid().equals(surveyItemUid)){ - item.setComplete(true); - break; - } - } - } + } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java,v diff -u -r1.1 -r1.2 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java 12 Sep 2006 04:15:19 -0000 1.1 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java 12 Sep 2006 04:35:47 -0000 1.2 @@ -25,7 +25,6 @@ package org.lamsfoundation.lams.tool.survey.web.action; import java.io.IOException; -import java.util.List; import java.util.Map; import java.util.Set; @@ -42,12 +41,9 @@ import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.survey.SurveyConstants; import org.lamsfoundation.lams.tool.survey.dto.ReflectDTO; -import org.lamsfoundation.lams.tool.survey.dto.Summary; -import org.lamsfoundation.lams.tool.survey.model.Survey; import org.lamsfoundation.lams.tool.survey.model.SurveySession; import org.lamsfoundation.lams.tool.survey.model.SurveyUser; import org.lamsfoundation.lams.tool.survey.service.ISurveyService; -import org.lamsfoundation.lams.tool.survey.util.SurveyWebUtils; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; @@ -69,12 +65,7 @@ if (param.equals("listuser")) { return listuser(mapping, form, request, response); } - if (param.equals("showitem")) { - return showitem(mapping, form, request, response); - } - if (param.equals("hideitem")) { - return hideitem(mapping, form, request, response); - } + if (param.equals("viewReflection")) { return viewReflection(mapping, form, request, response); } @@ -84,57 +75,6 @@ } - private ActionForward hideitem(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { - Long itemUid = WebUtil.readLongParam(request, SurveyConstants.PARAM_RESOURCE_ITEM_UID); - ISurveyService service = getSurveyService(); - service.setItemVisible(itemUid,false); - - //get back SessionMap - String sessionMapID = request.getParameter(SurveyConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); - - //update session value - List groupList = (List) sessionMap.get(SurveyConstants.ATTR_SUMMARY_LIST); - if(groupList != null) - for(List group : groupList){ - for(Summary sum: group){ - if(itemUid.equals(sum.getItemUid())){ - sum.setItemHide(true); - break; - } - } - } - - return mapping.findForward(SurveyConstants.SUCCESS); - } - - private ActionForward showitem(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { - Long itemUid = WebUtil.readLongParam(request, SurveyConstants.PARAM_RESOURCE_ITEM_UID); - ISurveyService service = getSurveyService(); - service.setItemVisible(itemUid,true); - - //get back SessionMap - String sessionMapID = request.getParameter(SurveyConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - request.setAttribute(SurveyConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); - - //update session value - List groupList = (List) sessionMap.get(SurveyConstants.ATTR_SUMMARY_LIST); - if(groupList != null) - for(List group : groupList){ - for(Summary sum: group){ - if(itemUid.equals(sum.getItemUid())){ - sum.setItemHide(false); - break; - } - } - } - return mapping.findForward(SurveyConstants.SUCCESS); - } - private ActionForward summary(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { //initial Session Map @@ -144,18 +84,18 @@ Long contentId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID); ISurveyService service = getSurveyService(); - List> groupList = service.getSummary(contentId); - - Survey survey = service.getSurveyByContentId(contentId); - survey.toDTO(); - +// List> groupList = service.getSummary(contentId); +// +// Survey survey = service.getSurveyByContentId(contentId); +// survey.toDTO(); +// Map >relectList = service.getReflectList(contentId); - - //cache into sessionMap - sessionMap.put(SurveyConstants.ATTR_SUMMARY_LIST, groupList); - sessionMap.put(SurveyConstants.PAGE_EDITABLE, new Boolean(SurveyWebUtils.isSurveyEditable(survey))); - sessionMap.put(SurveyConstants.ATTR_RESOURCE, survey); - sessionMap.put(SurveyConstants.ATTR_TOOL_CONTENT_ID, contentId); +// +// //cache into sessionMap +// sessionMap.put(SurveyConstants.ATTR_SUMMARY_LIST, groupList); +// sessionMap.put(SurveyConstants.PAGE_EDITABLE, new Boolean(SurveyWebUtils.isSurveyEditable(survey))); +// sessionMap.put(SurveyConstants.ATTR_RESOURCE, survey); +// sessionMap.put(SurveyConstants.ATTR_TOOL_CONTENT_ID, contentId); sessionMap.put(SurveyConstants.ATTR_REFLECT_LIST, relectList); return mapping.findForward(SurveyConstants.SUCCESS); @@ -168,10 +108,10 @@ //get user list by given item uid ISurveyService service = getSurveyService(); - List list = service.getUserListBySessionItem(sessionId, itemUid); +// List list = service.getUserListBySessionItem(sessionId, itemUid); //set to request - request.setAttribute(SurveyConstants.ATTR_USER_LIST, list); +// request.setAttribute(SurveyConstants.ATTR_USER_LIST, list); return mapping.findForward(SurveyConstants.SUCCESS); } Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/servlet/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/servlet/ExportServlet.java,v diff -u -r1.1 -r1.2 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/servlet/ExportServlet.java 12 Sep 2006 04:15:20 -0000 1.1 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/servlet/ExportServlet.java 12 Sep 2006 04:35:46 -0000 1.2 @@ -25,9 +25,7 @@ package org.lamsfoundation.lams.tool.survey.web.servlet; -import java.util.ArrayList; import java.util.HashMap; -import java.util.List; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; @@ -36,8 +34,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.ToolAccessMode; -import org.lamsfoundation.lams.tool.survey.SurveyConstants; -import org.lamsfoundation.lams.tool.survey.dto.Summary; import org.lamsfoundation.lams.tool.survey.model.Survey; import org.lamsfoundation.lams.tool.survey.model.SurveyUser; import org.lamsfoundation.lams.tool.survey.service.ISurveyService; @@ -116,13 +112,13 @@ } - List group = service.exportBySessionId(toolSessionID,true); - - List groupList = new ArrayList(); - if(group.size() > 0) - groupList.add(group); - sessionMap.put(SurveyConstants.ATTR_TITLE, content.getTitle()); - sessionMap.put(SurveyConstants.ATTR_SUMMARY_LIST, groupList); +// List group = service.exportBySessionId(toolSessionID,true); +// +// List groupList = new ArrayList(); +// if(group.size() > 0) +// groupList.add(group); +// sessionMap.put(SurveyConstants.ATTR_TITLE, content.getTitle()); +// sessionMap.put(SurveyConstants.ATTR_SUMMARY_LIST, groupList); } public void teacher(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies, HashMap sessionMap) @@ -143,11 +139,11 @@ logger.error(error); throw new SurveyApplicationException(error); } - List> groupList = service.exportByContentId(toolContentID); - - // put it into HTTPSession - sessionMap.put(SurveyConstants.ATTR_TITLE, content.getTitle()); - sessionMap.put(SurveyConstants.ATTR_SUMMARY_LIST, groupList); +// List> groupList = service.exportByContentId(toolContentID); +// +// // put it into HTTPSession +// sessionMap.put(SurveyConstants.ATTR_TITLE, content.getTitle()); +// sessionMap.put(SurveyConstants.ATTR_SUMMARY_LIST, groupList); } }