Index: lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties,v diff -u -r1.5 -r1.6 --- lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties 14 Jul 2008 06:03:01 -0000 1.5 +++ lams_tool_spreadsheet/conf/language/lams/ApplicationResources_en_AU.properties 23 Jul 2008 04:46:02 -0000 1.6 @@ -98,6 +98,7 @@ label.description =Description: authoring.exception =There is a problem in shared resources authoring page, the reason is {0} error.summary.marks.blank =Marks can not be blank. +error.summary.marks.invalid.number =Mark is in invalid number format. error.summary.comments.blank =Comments can not be blank. error.resource.item.file.blank =File can not be blank. error.upload.failed =Upload file failed: {0} Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java,v diff -u -r1.2 -r1.3 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java 11 Jul 2008 08:19:58 -0000 1.2 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/SpreadsheetConstants.java 23 Jul 2008 04:46:03 -0000 1.3 @@ -73,6 +73,7 @@ //error message keys public static final String ERROR_MSG_MARKS_BLANK = "error.summary.marks.blank"; + public static final String ERROR_MSG_MARKS_INVALID_NUMBER = "error.summary.marks.invalid.number"; public static final String ERROR_MSG_COMMENTS_BLANK = "error.summary.comments.blank"; public static final String ERROR_MSG_INVALID_URL = "error.resource.item.invalid.url"; public static final String ERROR_MSG_UPLOAD_FAILED = "error.upload.failed"; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/UserModifiedSpreadsheetDAO.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/UserModifiedSpreadsheetDAO.java,v diff -u -r1.1 -r1.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/UserModifiedSpreadsheetDAO.java 11 Jul 2008 08:19:57 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dao/UserModifiedSpreadsheetDAO.java 23 Jul 2008 04:46:03 -0000 1.2 @@ -23,11 +23,7 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.spreadsheet.dao; -import java.util.List; -import java.util.Map; -import org.lamsfoundation.lams.tool.spreadsheet.dto.Summary; - public interface UserModifiedSpreadsheetDAO extends DAO { } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dto/Summary.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dto/Summary.java,v diff -u -r1.3 -r1.4 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dto/Summary.java 14 Jul 2008 04:32:53 -0000 1.3 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/dto/Summary.java 23 Jul 2008 04:46:03 -0000 1.4 @@ -26,12 +26,10 @@ import java.util.ArrayList; import java.util.List; -import java.util.Set; import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetSession; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser; -import org.lamsfoundation.lams.tool.spreadsheet.util.SpreadsheetWebUtils; /** * List contains following element:
Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java,v diff -u -r1.1 -r1.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java 4 Jul 2008 07:40:25 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/Spreadsheet.java 23 Jul 2008 04:46:03 -0000 1.2 @@ -34,9 +34,6 @@ import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; -import org.lamsfoundation.lams.contentrepository.NodeKey; -import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.tool.spreadsheet.util.SpreadsheetToolContentHandler; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.java,v diff -u -r1.1 -r1.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.java 4 Jul 2008 07:40:25 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/SpreadsheetSession.java 23 Jul 2008 04:46:03 -0000 1.2 @@ -24,7 +24,6 @@ package org.lamsfoundation.lams.tool.spreadsheet.model; import java.util.Date; -import java.util.Set; import org.apache.log4j.Logger; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.java,v diff -u -r1.1 -r1.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.java 11 Jul 2008 08:19:55 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/model/UserModifiedSpreadsheet.java 23 Jul 2008 04:46:03 -0000 1.2 @@ -24,7 +24,6 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.spreadsheet.model; -import java.util.Date; /** * Spreadsheet * @author Andrey Balan Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java,v diff -u -r1.3 -r1.4 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java 14 Jul 2008 04:32:53 -0000 1.3 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/ISpreadsheetService.java 23 Jul 2008 04:46:03 -0000 1.4 @@ -26,10 +26,8 @@ import java.util.List; import java.util.Map; import java.util.Set; -import java.util.SortedSet; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.contentrepository.IVersionedNode; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.spreadsheet.dto.ReflectDTO; import org.lamsfoundation.lams.tool.spreadsheet.dto.StatisticDTO; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java,v diff -u -r1.3 -r1.4 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 14 Jul 2008 04:32:53 -0000 1.3 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/service/SpreadsheetServiceImpl.java 23 Jul 2008 04:46:03 -0000 1.4 @@ -26,22 +26,17 @@ import java.io.FileFilter; import java.io.FileNotFoundException; import java.io.IOException; -import java.io.InputStream; -import java.sql.Timestamp; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.HashSet; import java.util.Hashtable; import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; import java.util.SortedMap; -import java.util.SortedSet; import java.util.TreeMap; import java.util.TreeSet; -import java.util.Vector; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; @@ -55,7 +50,6 @@ import org.lamsfoundation.lams.contentrepository.NodeKey; import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; import org.lamsfoundation.lams.contentrepository.WorkspaceNotFoundException; -import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.contentrepository.service.IRepositoryService; import org.lamsfoundation.lams.contentrepository.service.SimpleCredentials; import org.lamsfoundation.lams.learning.service.ILearnerService; @@ -74,35 +68,30 @@ import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.SessionDataExistsException; import org.lamsfoundation.lams.tool.exception.ToolException; +import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetAttachmentDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetMarkDAO; -import org.lamsfoundation.lams.tool.spreadsheet.dao.UserModifiedSpreadsheetDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetSessionDAO; import org.lamsfoundation.lams.tool.spreadsheet.dao.SpreadsheetUserDAO; +import org.lamsfoundation.lams.tool.spreadsheet.dao.UserModifiedSpreadsheetDAO; import org.lamsfoundation.lams.tool.spreadsheet.dto.ReflectDTO; import org.lamsfoundation.lams.tool.spreadsheet.dto.StatisticDTO; import org.lamsfoundation.lams.tool.spreadsheet.dto.Summary; import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetAttachment; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetMark; -import org.lamsfoundation.lams.tool.spreadsheet.model.UserModifiedSpreadsheet; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetSession; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser; +import org.lamsfoundation.lams.tool.spreadsheet.model.UserModifiedSpreadsheet; import org.lamsfoundation.lams.tool.spreadsheet.util.ReflectDTOComparator; import org.lamsfoundation.lams.tool.spreadsheet.util.SpreadsheetToolContentHandler; -import org.lamsfoundation.lams.tool.service.ILamsToolService; import org.lamsfoundation.lams.usermanagement.User; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.usermanagement.service.IUserManagementService; import org.lamsfoundation.lams.util.MessageService; -import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.util.audit.IAuditService; -import org.lamsfoundation.lams.util.wddx.WDDXProcessor; -import org.lamsfoundation.lams.util.wddx.WDDXProcessorConversionException; -import org.lamsfoundation.lams.util.zipfile.ZipFileUtil; -import org.lamsfoundation.lams.util.zipfile.ZipFileUtilException; /** * Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/util/SpreadsheetBundler.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/util/SpreadsheetBundler.java,v diff -u -r1.1 -r1.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/util/SpreadsheetBundler.java 23 Jul 2008 04:19:15 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/util/SpreadsheetBundler.java 23 Jul 2008 04:46:03 -0000 1.2 @@ -28,25 +28,18 @@ import java.io.IOException; import java.net.MalformedURLException; import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collection; import java.util.HashMap; import java.util.List; import java.util.Map; import javax.servlet.http.Cookie; import javax.servlet.http.HttpServletRequest; -import org.apache.commons.lang.ArrayUtils; -import org.apache.log4j.Logger; import org.lamsfoundation.lams.learning.export.web.action.Bundler; -import org.lamsfoundation.lams.learning.export.web.action.ImageBundler; -import org.lamsfoundation.lams.themes.CSSThemeVisualElement; import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants; import org.lamsfoundation.lams.util.Configuration; import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.HttpUrlConnectionUtil; -import org.lamsfoundation.lams.web.filter.LocaleFilter; public class SpreadsheetBundler extends Bundler { @@ -58,8 +51,6 @@ * @param request the request for the export * @param cookies cookies for the request * @param outputDirectory the location where the files should be written - * @param toolImageUrlDir the url location of the images directory - * @param fileNames an array of file-names (not paths) you wish to include in the bundle * @throws Exception */ public void bundle(HttpServletRequest request, Cookie[] cookies, String outputDirectory) throws Exception @@ -73,16 +64,12 @@ * @param request * @param cookies * @param outputDirectory - * @param toolImageUrlDir - * @param fileNames * @throws MalformedURLException * @throws FileNotFoundException * @throws IOException */ private void bundleViaHTTP(HttpServletRequest request, Cookie[] cookies, String outputDirectory) throws MalformedURLException, FileNotFoundException, IOException{ -// String toolImageUrlDir = getImagesUrlDir(); - String[] directoriesNames = { "translations", "tinymce" + File.separator + "langs", @@ -113,20 +100,12 @@ filesNames.put(File.separator + "tinymce" + File.separator + "plugins" + File.separator + "paste" + File.separator + "images", new String [] {"pastetext.gif", "pasteword.gif", "selectall.gif"}); filesNames.put(File.separator + "tinymce" + File.separator + "plugins" + File.separator + "paste" + File.separator + "jscripts", new String [] {"pastetext.js", "pasteword.js"}); filesNames.put(File.separator + "tinymce" + File.separator + "plugins" + File.separator + "paste" + File.separator + "langs", new String [] {"en.js"}); - filesNames.put(File.separator + "tinymce" + File.separator + "themes" + File.separator + "advanced", new String [] {"about.htm", "anchor.htm", "charmap.htm", "color_picker.htm", "editor_template.js", "image.htm", "link.htm", "source_editor.htm"}); - filesNames.put(File.separator + "tinymce" + File.separator + "themes" + File.separator + "advanced" + File.separator + "css", new String [] {"editor_content.css", "editor_popup.css", "editor_ui.css"}); filesNames.put(File.separator + "tinymce" + File.separator + "themes" + File.separator + "advanced" + File.separator + "images", new String [] {"anchor.gif", "anchor_symbol.gif", "backcolor.gif", "bold.gif", "bold_de_se.gif", "bold_es.gif", "bold_fr.gif", "bold_ru.gif", "bold_tw.gif", "browse.gif", "bullist.gif", "button_menu.gif", "buttons.gif", "cancel_button_bg.gif", "charmap.gif", "cleanup.gif", "close.gif", "code.gif", "color.gif", "copy.gif", "custom_1.gif", "cut.gif", "forecolor.gif", "help.gif", "hr.gif", "image.gif", "indent.gif", "insert_button_bg.gif", "italic.gif", "italic_de_se.gif", "italic_es.gif", "italic_ru.gif", "italic_tw.gif", "justifycenter.gif", "justifyfull.gif", "justifyleft.gif", "justifyright.gif", "link.gif", "menu_check.gif", "newdocument.gif", "numlist.gif", "opacity.png", "outdent.gif", "paste.gif", "redo.gif", "removeformat.gif", "separator.gif", "spacer.gif", "statusbar_resize.gif", "strikethrough.gif", "sub.gif", "sup.gif", "underline.gif", "underline_es.gif", "underline_fr.gif", "underline_ru.gif", "underline_tw.gif", "undo.gif", "unlink.gif", "visualaid.gif"}); filesNames.put(File.separator + "tinymce" + File.separator + "themes" + File.separator + "advanced" + File.separator + "jscripts", new String [] {"about.js", "anchor.js", "charmap.js", "color_picker.js", "image.js", "link.js", "source_editor.js"}); filesNames.put(File.separator + "tinymce" + File.separator + "themes" + File.separator + "advanced" + File.separator + "langs", new String [] {"en.js"}); - - - - - - for (String filePath: filesNames.keySet()) { for(String fileName : filesNames.get(filePath)) { @@ -152,5 +131,4 @@ } } - \ No newline at end of file Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java,v diff -u -r1.1 -r1.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java 4 Jul 2008 07:40:25 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java 23 Jul 2008 04:46:02 -0000 1.2 @@ -23,20 +23,13 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.spreadsheet.web.action; -import java.io.UnsupportedEncodingException; -import java.net.URLDecoder; import java.sql.Timestamp; import java.util.ArrayList; import java.util.Date; -import java.util.HashMap; import java.util.HashSet; import java.util.Iterator; -import java.util.LinkedHashSet; import java.util.List; -import java.util.Map; import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -45,14 +38,11 @@ import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang.StringUtils; -import org.apache.commons.lang.math.NumberUtils; import org.apache.log4j.Logger; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.authoring.web.AuthoringConstants; @@ -63,9 +53,7 @@ import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetAttachment; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser; import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService; -import org.lamsfoundation.lams.tool.spreadsheet.service.SpreadsheetApplicationException; import org.lamsfoundation.lams.tool.spreadsheet.service.UploadSpreadsheetFileException; -import org.lamsfoundation.lams.tool.spreadsheet.util.SpreadsheetWebUtils; import org.lamsfoundation.lams.tool.spreadsheet.web.form.SpreadsheetForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; import org.lamsfoundation.lams.util.FileValidatorUtil; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java,v diff -u -r1.1 -r1.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java 4 Jul 2008 07:40:25 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java 23 Jul 2008 04:46:03 -0000 1.2 @@ -28,8 +28,6 @@ import org.lamsfoundation.lams.authoring.web.LamsAuthoringFinishAction; import org.lamsfoundation.lams.tool.ToolAccessMode; -import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants; -import org.lamsfoundation.lams.web.util.AttributeNames; /** * This class give a chance to clear HttpSession when user save/close authoring page. Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java,v diff -u -r1.3 -r1.4 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java 13 Jul 2008 08:53:49 -0000 1.3 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java 23 Jul 2008 04:46:02 -0000 1.4 @@ -25,50 +25,34 @@ package org.lamsfoundation.lams.tool.spreadsheet.web.action; import java.io.IOException; -import java.sql.Timestamp; -import java.util.ArrayList; import java.util.Date; -import java.util.HashSet; -import java.util.Iterator; -import java.util.List; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; -import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.action.Action; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; import org.apache.struts.action.ActionRedirect; import org.apache.struts.config.ForwardConfig; 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.spreadsheet.SpreadsheetConstants; import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet; -import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetAttachment; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetSession; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser; import org.lamsfoundation.lams.tool.spreadsheet.model.UserModifiedSpreadsheet; import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService; import org.lamsfoundation.lams.tool.spreadsheet.service.SpreadsheetApplicationException; -import org.lamsfoundation.lams.tool.spreadsheet.service.UploadSpreadsheetFileException; import org.lamsfoundation.lams.tool.spreadsheet.web.form.ReflectionForm; import org.lamsfoundation.lams.tool.spreadsheet.web.form.SpreadsheetForm; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; -import org.lamsfoundation.lams.util.FileUtil; -import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java,v diff -u -r1.3 -r1.4 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java 14 Jul 2008 04:32:53 -0000 1.3 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/MonitoringAction.java 23 Jul 2008 04:46:02 -0000 1.4 @@ -27,16 +27,11 @@ import java.io.ByteArrayOutputStream; import java.io.IOException; import java.io.PrintWriter; -import java.sql.Timestamp; import java.text.NumberFormat; import java.util.ArrayList; -import java.util.Date; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; -import java.util.SortedSet; -import java.util.TreeMap; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; @@ -56,8 +51,6 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.action.ActionMessage; import org.apache.struts.action.ActionMessages; -import org.apache.struts.action.ActionRedirect; -import org.apache.struts.config.ForwardConfig; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants; @@ -70,7 +63,6 @@ import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser; import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService; import org.lamsfoundation.lams.tool.spreadsheet.web.form.MarkForm; -import org.lamsfoundation.lams.tool.spreadsheet.web.form.SpreadsheetForm; import org.lamsfoundation.lams.util.WebUtil; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; @@ -341,8 +333,41 @@ public ActionForward saveMark(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { MarkForm markForm = (MarkForm)form; - ActionErrors errors = validateTaskListItem(markForm); +// ActionMessages errors = new ActionMessages(); +// //check whether the mark is validate +// String markStr = request.getParameter("marks"); +// Long marks = null; +// try { +// marks = Long.parseLong(markStr); +// } catch (Exception e) { +// errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.mark.invalid.number")); +// } +// +// String comments = WebUtil.readStrParam(request,"comments",true); +// if(!errors.isEmpty()){ +// submitFilesService = getSubmitFilesService(); +// List report = new ArrayList(); +// FileDetailsDTO fileDetail = submitFilesService.getFileDetails(detailID); +// //echo back the input, even they are wrong. +// fileDetail.setComments(comments); +// fileDetail.setMarks(markStr); +// report.add(fileDetail); +// +// request.setAttribute("report",report); +// request.setAttribute("updateMode", updateMode); +// request.setAttribute(AttributeNames.PARAM_TOOL_SESSION_ID,sessionID); +// +// +// saveErrors(request,errors); +// return mapping.findForward("updateMark"); +// } + + + + + ActionErrors errors = validateSpreadsheetMark(markForm); + if(!errors.isEmpty()){ this.addErrors(request,errors); return mapping.findForward("editMark"); @@ -450,13 +475,24 @@ * @param itemForm * @return */ - private ActionErrors validateTaskListItem(MarkForm markForm) { + private ActionErrors validateSpreadsheetMark(MarkForm markForm) { ActionErrors errors = new ActionErrors(); - if(StringUtils.isBlank(markForm.getMarks())) + + String mark = markForm.getMarks(); + if(StringUtils.isBlank(mark)) { errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SpreadsheetConstants.ERROR_MSG_MARKS_BLANK)); - if(StringUtils.isBlank(markForm.getComments())) - errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SpreadsheetConstants.ERROR_MSG_COMMENTS_BLANK)); + } + try { + Long.parseLong(mark); + } catch (Exception e) { + errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SpreadsheetConstants.ERROR_MSG_MARKS_INVALID_NUMBER)); + } + + if(StringUtils.isBlank(markForm.getComments())) { + errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage(SpreadsheetConstants.ERROR_MSG_COMMENTS_BLANK)); + } + return errors; } } Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ViewItemAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ViewItemAction.java,v diff -u -r1.3 -r1.4 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ViewItemAction.java 23 Jul 2008 04:19:15 -0000 1.3 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ViewItemAction.java 23 Jul 2008 04:46:02 -0000 1.4 @@ -25,37 +25,20 @@ package org.lamsfoundation.lams.tool.spreadsheet.web.action; import java.io.IOException; -import java.io.UnsupportedEncodingException; -import java.net.URLEncoder; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; -import java.util.SortedSet; -import java.util.TreeSet; -import java.util.regex.Matcher; -import java.util.regex.Pattern; import javax.servlet.ServletException; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import org.apache.commons.lang.math.NumberUtils; import org.apache.log4j.Logger; import org.apache.struts.action.Action; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.tool.ToolAccessMode; import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants; import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser; import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService; -import org.lamsfoundation.lams.tool.spreadsheet.util.SpreadsheetWebUtils; -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.web.context.WebApplicationContext; import org.springframework.web.context.support.WebApplicationContextUtils; Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/MarkForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/MarkForm.java,v diff -u -r1.2 -r1.3 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/MarkForm.java 11 Jul 2008 08:19:56 -0000 1.2 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/MarkForm.java 23 Jul 2008 04:46:03 -0000 1.3 @@ -23,19 +23,7 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.spreadsheet.web.form; -import javax.servlet.http.HttpServletRequest; - -import org.apache.commons.lang.StringUtils; -import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionMapping; -import org.apache.struts.action.ActionMessage; -import org.apache.struts.action.ActionMessages; -import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.tool.spreadsheet.SpreadsheetConstants; -import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet; -import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetUser; /** * Mark Form. Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/ReflectionForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/ReflectionForm.java,v diff -u -r1.1 -r1.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/ReflectionForm.java 4 Jul 2008 07:40:27 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/ReflectionForm.java 23 Jul 2008 04:46:03 -0000 1.2 @@ -24,12 +24,7 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.spreadsheet.web.form; -import org.apache.commons.lang.StringUtils; 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.action.ActionMessages; import org.apache.struts.validator.ValidatorForm; /** Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/SpreadsheetForm.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/SpreadsheetForm.java,v diff -u -r1.1 -r1.2 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/SpreadsheetForm.java 4 Jul 2008 07:40:27 -0000 1.1 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/form/SpreadsheetForm.java 23 Jul 2008 04:46:03 -0000 1.2 @@ -23,21 +23,14 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.spreadsheet.web.form; -import java.util.ArrayList; -import java.util.Iterator; -import java.util.List; -import java.util.Set; - import javax.servlet.http.HttpServletRequest; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.contentrepository.client.IToolContentHandler; import org.lamsfoundation.lams.tool.spreadsheet.model.Spreadsheet; -import org.lamsfoundation.lams.tool.spreadsheet.model.SpreadsheetAttachment; /** * Index: lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/servlet/ExportServlet.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/servlet/ExportServlet.java,v diff -u -r1.4 -r1.5 --- lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/servlet/ExportServlet.java 23 Jul 2008 04:19:15 -0000 1.4 +++ lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/servlet/ExportServlet.java 23 Jul 2008 04:46:04 -0000 1.5 @@ -26,12 +26,8 @@ package org.lamsfoundation.lams.tool.spreadsheet.web.servlet; import java.io.File; -import java.util.ArrayList; import java.util.HashMap; import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; import javax.servlet.ServletException; import javax.servlet.http.Cookie; @@ -40,7 +36,6 @@ import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.lamsfoundation.lams.learning.export.web.action.CustomToolImageBundler; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -53,11 +48,8 @@ import org.lamsfoundation.lams.tool.spreadsheet.service.ISpreadsheetService; import org.lamsfoundation.lams.tool.spreadsheet.service.SpreadsheetApplicationException; import org.lamsfoundation.lams.tool.spreadsheet.service.SpreadsheetServiceProxy; -import org.lamsfoundation.lams.tool.spreadsheet.util.ReflectDTOComparator; import org.lamsfoundation.lams.tool.spreadsheet.util.SpreadsheetBundler; import org.lamsfoundation.lams.tool.spreadsheet.util.SpreadsheetToolContentHandler; -import org.lamsfoundation.lams.util.Configuration; -import org.lamsfoundation.lams.util.ConfigurationKeys; import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.web.servlet.AbstractExportPortfolioServlet; import org.lamsfoundation.lams.web.util.AttributeNames;