Index: lams_tool_forum/conf/language/ApplicationResources.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/Attic/ApplicationResources.properties,v diff -u -r1.11 -r1.12 --- lams_tool_forum/conf/language/ApplicationResources.properties 24 Jul 2006 08:40:31 -0000 1.11 +++ lams_tool_forum/conf/language/ApplicationResources.properties 3 Aug 2006 04:50:13 -0000 1.12 @@ -143,3 +143,4 @@ #======= End labels: Exported 134 labels for en AU ===== +button.close=Close \ No newline at end of file Index: lams_tool_forum/conf/xdoclet/struts-actions.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/xdoclet/struts-actions.xml,v diff -u -r1.33 -r1.34 --- lams_tool_forum/conf/xdoclet/struts-actions.xml 13 Jun 2006 06:26:23 -0000 1.33 +++ lams_tool_forum/conf/xdoclet/struts-actions.xml 3 Aug 2006 04:50:12 -0000 1.34 @@ -266,7 +266,7 @@ @@ -277,7 +277,7 @@ input="tiles:/monitoring/forum/editUserMark" name="markForm" scope="request" - validate="true" + validate="false" parameter="updateMark" > Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java,v diff -u -r1.30 -r1.31 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 2 Aug 2006 06:36:30 -0000 1.30 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java 3 Aug 2006 04:50:13 -0000 1.31 @@ -85,5 +85,9 @@ public static final String FORUM_TITLE = "forum_title"; public static final String ATTR_TOOL_CONTENT_TOPICS = "ToolContentTopicList"; + public static final String ATTR_TOPIC = "topic"; + public static final String ATTR_USER= "user"; + public static final String ATTR_TOPIC_LIST = "topicList"; + } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java,v diff -u -r1.19 -r1.20 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java 3 Aug 2006 01:35:02 -0000 1.19 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java 3 Aug 2006 04:50:13 -0000 1.20 @@ -40,6 +40,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; +import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang.math.NumberUtils; import org.apache.log4j.Logger; import org.apache.poi.hssf.usermodel.HSSFCell; import org.apache.poi.hssf.usermodel.HSSFRow; @@ -336,8 +338,8 @@ ForumUser user = forumService.getUser(userUid); // each back to web page - request.setAttribute("topicList", messageList); - request.setAttribute("user", user); + request.setAttribute(ForumConstants.ATTR_TOPIC_LIST, messageList); + request.setAttribute(ForumConstants.ATTR_USER, user); request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId); return mapping.findForward("success"); } @@ -374,9 +376,12 @@ markForm.setMark(""); markForm.setComment(msg.getReport().getComment()); } - markForm.setUser(user); - markForm.setMessageDto(MessageDTO.getMessageDTO(msg)); - markForm.setSessionId(sessionId); + + // each back to web page + request.setAttribute(ForumConstants.ATTR_TOPIC, MessageDTO.getMessageDTO(msg)); + request.setAttribute(ForumConstants.ATTR_USER, user); + request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId); + return mapping.findForward("success"); } @@ -391,36 +396,61 @@ */ private ActionForward updateMark(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + MarkForm markForm = (MarkForm) form; Long messageId = new Long(WebUtil.readLongParam(request, ForumConstants.MESSAGE_UID)); Long userUid = new Long(WebUtil.readLongParam(request, ForumConstants.USER_UID)); Long sessionId = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID)); + String mark = markForm.getMark(); + ActionErrors errors = new ActionErrors(); + if (StringUtils.isBlank(mark)) { + ActionMessage error = new ActionMessage("error.valueReqd"); + errors.add("report.mark", error); + }else if(!NumberUtils.isNumber(mark)){ + ActionMessage error = new ActionMessage("error.mark.needNumber"); + errors.add("report.mark", error); + }else { + try{ + Float.parseFloat(mark); + }catch(Exception e){ + ActionMessage error = new ActionMessage("error.mark.invalid.number"); + errors.add("report.mark", error); + } + } + forumService = getForumService(); + // echo back to web page + List messageList = forumService.getMessagesByUserUid(userUid, sessionId); + ForumUser user = forumService.getUser(userUid); Message msg = forumService.getMessage(messageId); + + request.setAttribute(ForumConstants.ATTR_USER, user); + request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId); + if(!errors.isEmpty()){ + // each back to web page + request.setAttribute(ForumConstants.ATTR_TOPIC, MessageDTO.getMessageDTO(msg)); + saveMessages(request, errors); + return mapping.getInputForward(); + } - // save it into database - MarkForm markForm = (MarkForm) form; + //update message report + forumService = getForumService(); ForumReport report = msg.getReport(); if (report == null) { report = new ForumReport(); msg.setReport(report); } - report.setMark(new Float(Float.parseFloat(markForm.getMark()))); + report.setMark(new Float(Float.parseFloat(mark))); report.setComment(markForm.getComment()); + + //echo back to topic list page + request.setAttribute(ForumConstants.ATTR_TOPIC_LIST, messageList); forumService.updateTopic(msg); - // echo back to web page - forumService = getForumService(); - List messageList = forumService - .getMessagesByUserUid(userUid, sessionId); - ForumUser user = forumService.getUser(userUid); - request.setAttribute("topicList", messageList); - request.setAttribute("user", user); - request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID, sessionId); return mapping.findForward("success"); } Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java,v diff -u -r1.4 -r1.5 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java 6 Apr 2006 06:40:39 -0000 1.4 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/MarkForm.java 3 Aug 2006 04:50:12 -0000 1.5 @@ -25,58 +25,19 @@ package org.lamsfoundation.lams.tool.forum.web.forms; -import org.apache.commons.lang.math.NumberUtils; import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.validator.ValidatorForm; -import org.lamsfoundation.lams.tool.forum.dto.MessageDTO; -import org.lamsfoundation.lams.tool.forum.persistence.ForumUser; +import org.apache.struts.action.ActionForm; /** * @struts.form name="markForm" * @author Steve.Ni * * @version $Revision$ */ -public class MarkForm extends ValidatorForm{ +public class MarkForm extends ActionForm{ private static final long serialVersionUID = -4967675292027554366L; - private static Logger logger = Logger.getLogger(MarkForm.class.getName()); private String mark; private String comment; - private ForumUser user; - private MessageDTO messageDto; - private Long sessionId; - - /** - * MessageForm validation method from STRUCT interface. - * - */ - public ActionErrors validate(ActionMapping mapping, - javax.servlet.http.HttpServletRequest request) { - ActionErrors errors = super.validate(mapping, request); - try{ - if ("".equals(mark)) { - ActionMessage error = new ActionMessage("error.valueReqd"); - errors.add("report.mark", error); - }else if(!NumberUtils.isNumber(mark)){ - ActionMessage error = new ActionMessage("error.mark.needNumber"); - errors.add("report.mark", error); - }else { - try{ - Float.parseFloat(mark); - }catch(Exception e){ - ActionMessage error = new ActionMessage("error.mark.invalid.number"); - errors.add("report.mark", error); - } - } - } catch (Exception e) { - logger.error("", e); - } - return errors; - } - public String getComment() { return comment; } @@ -89,27 +50,4 @@ public void setMark(String mark) { this.mark = mark; } - - public MessageDTO getMessageDto() { - return messageDto; - } - - public void setMessageDto(MessageDTO message) { - this.messageDto = message; - } - - public ForumUser getUser() { - return user; - } - - public void setUser(ForumUser user) { - this.user = user; - } - public Long getSessionId() { - return sessionId; - } - - public void setSessionId(Long sessionId) { - this.sessionId = sessionId; - } } Index: lams_tool_forum/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/struts-config.xml,v diff -u -r1.38 -r1.39 --- lams_tool_forum/web/WEB-INF/struts-config.xml 3 Aug 2006 01:19:33 -0000 1.38 +++ lams_tool_forum/web/WEB-INF/struts-config.xml 3 Aug 2006 04:50:13 -0000 1.39 @@ -295,7 +295,7 @@ @@ -305,7 +305,7 @@ input="tiles:/monitoring/forum/editUserMark" name="markForm" scope="request" - validate="true" + validate="false" parameter="updateMark" > Index: lams_tool_forum/web/jsps/monitoring/updatemarks.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/updatemarks.jsp,v diff -u -r1.10 -r1.11 --- lams_tool_forum/web/jsps/monitoring/updatemarks.jsp 3 Jul 2006 07:10:26 -0000 1.10 +++ lams_tool_forum/web/jsps/monitoring/updatemarks.jsp 3 Aug 2006 04:50:12 -0000 1.11 @@ -1,82 +1,71 @@ <%@ include file="/includes/taglibs.jsp"%> - " />
- + , - - + +
- + - + - + "> - + - + - - + +
- - - + + + - - + - - - - - - - - - - -
- - * : + + <%@ include file="/common/messages.jsp"%> - +
+ * - +
+ +
- -
- -
+ " class="button" /> +    + ">
Index: lams_tool_forum/web/jsps/monitoring/usermarklist.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/usermarklist.jsp,v diff -u -r1.8 -r1.9 --- lams_tool_forum/web/jsps/monitoring/usermarklist.jsp 3 Jul 2006 07:10:26 -0000 1.8 +++ lams_tool_forum/web/jsps/monitoring/usermarklist.jsp 3 Aug 2006 04:50:12 -0000 1.9 @@ -56,7 +56,7 @@ - + @@ -91,5 +91,10 @@ + + + + + Index: lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/viewallmarks.jsp,v diff -u -r1.6 -r1.7 --- lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp 3 Jul 2006 07:10:26 -0000 1.6 +++ lams_tool_forum/web/jsps/monitoring/viewallmarks.jsp 3 Aug 2006 04:50:12 -0000 1.7 @@ -100,4 +100,9 @@ + + + + + Index: lams_tool_forum/web/jsps/monitoring/viewtopic.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/jsps/monitoring/Attic/viewtopic.jsp,v diff -u -r1.3 -r1.4 --- lams_tool_forum/web/jsps/monitoring/viewtopic.jsp 30 Jun 2006 00:20:01 -0000 1.3 +++ lams_tool_forum/web/jsps/monitoring/viewtopic.jsp 3 Aug 2006 04:50:12 -0000 1.4 @@ -4,9 +4,8 @@ -
- close +