Index: lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties =================================================================== diff -u -r652111fe350d40bff43cee483baef22d8b3b27ae -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 --- lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 652111fe350d40bff43cee483baef22d8b3b27ae) +++ lams_tool_images/conf/language/lams/ApplicationResources_en_AU.properties (.../ApplicationResources_en_AU.properties) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) @@ -85,6 +85,7 @@ label.learning.post =Post label.learning.by =By label.learning.comments =Comments +label.learning.added.by =Added by: monitoring.tab.summary =Summary monitoring.tab.statistics =Statistic monitoring.tab.edit.activity =Edit Activity Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java =================================================================== diff -u -r4b9aac6879339e46cb0a163a8f72400aed80c041 -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision 4b9aac6879339e46cb0a163a8f72400aed80c041) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) @@ -25,140 +25,81 @@ public class ImageGalleryConstants { public static final String TOOL_SIGNATURE = "laimag10"; - public static final String RESOURCE_SERVICE = "imageGalleryService"; - public static final String TOOL_CONTENT_HANDLER_NAME = "imageGalleryToolContentHandler"; - public static final int COMPLETED = 1; // for action forward name public static final String SUCCESS = "success"; - public static final String ERROR = "error"; - public static final String DEFINE_LATER = "definelater"; // for parameters' name public static final String PARAM_TOOL_CONTENT_ID = "toolContentID"; - public static final String PARAM_TOOL_SESSION_ID = "toolSessionID"; - public static final String PARAM_FILE_VERSION_ID = "fileVersionId"; - public static final String PARAM_FILE_UUID = "fileUuid"; - public static final String PARAM_IMAGE_INDEX = "imageIndex"; - public static final String PARAM_IMAGE_UID = "imageUid"; - public static final String PARAM_CURRENT_INSTRUCTION_INDEX = "insIdx"; - public static final String PARAM_RUN_OFFLINE = "runOffline"; - public static final String PARAM_OPEN_URL_POPUP = "popupUrl"; - public static final String PARAM_TITLE = "title"; - public static final String PARAM_COMMENTS = "comments"; - public static final String PARAM_CURRENT_IMAGE = "currentImage"; - public static final String PARAM_CURRENT_RATING = "currentRating"; - public static final String PARAM_VOTED_IMAGE_UID = "votedImageUid"; // for request attribute name public static final String ATTR_TOOL_CONTENT_ID = "toolContentID"; - public static final String ATTR_TOOL_SESSION_ID = "toolSessionID"; - public static final String ATTR_RESOURCE_ITEM_LIST = "imageGalleryList"; - public static final String ATT_ATTACHMENT_LIST = "instructionAttachmentList"; - public static final String ATTR_DELETED_RESOURCE_ITEM_LIST = "deleteImageGalleryList"; - public static final String ATTR_DELETED_ATTACHMENT_LIST = "deletedAttachmmentList"; - public static final String ATTR_DELETED_RESOURCE_ITEM_ATTACHMENT_LIST = "deletedItemAttachmmentList";; - public static final String ATT_LEARNING_OBJECT = "cpPackage"; - public static final String ATTR_RESOURCE_REVIEW_URL = "imageGalleryItemReviewUrl"; - public static final String ATTR_RESOURCE = "imageGallery"; - public static final String ATTR_RESOURCE_ITEM_UID = "itemUid"; - + public static final String ATTR_NEXT_ACTIVITY_URL = "nextActivityUrl"; public static final String ATTR_SUMMARY_LIST = "summaryList"; - public static final String ATTR_USER_LIST = "userList"; - public static final String ATTR_RESOURCE_INSTRUCTION = "instructions"; - public static final String ATTR_FINISH_LOCK = "finishedLock"; - public static final String ATTR_LOCK_ON_FINISH = "lockOnFinish"; - public static final String ATTR_SESSION_MAP_ID = "sessionMapID"; - public static final String ATTR_RESOURCE_FORM = "imageGalleryForm"; - public static final String ATTR_NEXT_IMAGE_TITLE = "nextImageTitle"; - public static final String ATTR_FILE_TYPE_FLAG = "fileTypeFlag"; - public static final String ATTR_TITLE = "title"; - public static final String ATTR_INSTRUCTIONS = "instructions"; - public static final String ATTR_USER_FINISHED = "userFinished"; - public static final String ATTR_COMMENT = "comment"; - public static final String ATTR_CURRENT_IMAGE_UID = "currentImageUid"; - public static final String ATTR_CONTENT_FOLDER_ID = "contentFolderID"; // error message keys public static final String ERROR_MSG_TITLE_BLANK = "error.resource.item.title.blank"; - public static final String ERROR_MSG_NOT_ALLOWED_FORMAT = "error.resource.image.not.alowed.format"; - public static final String ERROR_MSG_URL_BLANK = "error.resource.item.url.blank"; - public static final String ERROR_MSG_DESC_BLANK = "error.resource.item.desc.blank"; - public static final String ERROR_MSG_FILE_BLANK = "error.resource.item.file.blank"; - public static final String ERROR_MSG_COMMENT_BLANK = "error.resource.image.comment.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"; - public static final String ERROR_MSG_REQUIRED_FIELDS_MISSING = "error.required.fields.missing"; - public static final String ERROR_MSG_ENTERED_VALUES_NOT_INTEGERS = "error.entered.values.not.integers"; public static final String PAGE_EDITABLE = "isPageEditable"; - public static final String MODE_AUTHOR_SESSION = "author_session"; - public static final String ATTR_REFLECTION_ON = "reflectOn"; - public static final String ATTR_REFLECTION_INSTRUCTION = "reflectInstructions"; - public static final String ATTR_REFLECTION_ENTRY = "reflectEntry"; - public static final String ATTR_REFLECT_LIST = "reflectList"; - public static final String ATTR_USER_UID = "userUid"; - + public static final String DEFUALT_PROTOCOL_REFIX = "http://"; - public static final String ALLOW_PROTOCOL_REFIX = new String("[http://|https://|ftp://|nntp://]"); - public static final String EVENT_NAME_NOTIFY_TEACHERS_ON_ASSIGMENT_SUBMIT = "notify_teachers_on_assigment_submit"; } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageRating.java =================================================================== diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageRating.java (.../ImageRating.java) (revision 5d9ada1b3b139591dc6f1fffec04990beb727522) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/model/ImageRating.java (.../ImageRating.java) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) @@ -23,8 +23,6 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.imageGallery.model; -import java.util.Date; - import org.apache.commons.lang.builder.EqualsBuilder; import org.apache.commons.lang.builder.HashCodeBuilder; import org.apache.log4j.Logger; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java =================================================================== diff -u -r4b9aac6879339e46cb0a163a8f72400aed80c041 -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java (.../IImageGalleryService.java) (revision 4b9aac6879339e46cb0a163a8f72400aed80c041) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java (.../IImageGalleryService.java) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) @@ -26,7 +26,6 @@ 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.events.IEventNotificationService; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -r4b9aac6879339e46cb0a163a8f72400aed80c041 -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 4b9aac6879339e46cb0a163a8f72400aed80c041) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) @@ -23,11 +23,6 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.imageGallery.service; -import java.awt.Color; -import java.awt.Graphics2D; -import java.awt.RenderingHints; -import java.awt.geom.AffineTransform; -import java.awt.image.BufferedImage; import java.io.FileNotFoundException; import java.io.IOException; import java.io.InputStream; @@ -41,22 +36,17 @@ 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 javax.imageio.ImageIO; - import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; import org.apache.struts.upload.FormFile; import org.lamsfoundation.lams.contentrepository.AccessDeniedException; -import org.lamsfoundation.lams.contentrepository.FileException; import org.lamsfoundation.lams.contentrepository.ICredentials; import org.lamsfoundation.lams.contentrepository.ITicket; import org.lamsfoundation.lams.contentrepository.IVersionedNode; import org.lamsfoundation.lams.contentrepository.InvalidParameterException; -import org.lamsfoundation.lams.contentrepository.ItemNotFoundException; import org.lamsfoundation.lams.contentrepository.LoginException; import org.lamsfoundation.lams.contentrepository.NodeKey; import org.lamsfoundation.lams.contentrepository.RepositoryCheckedException; @@ -101,7 +91,6 @@ import org.lamsfoundation.lams.tool.imageGallery.model.ImageGallerySession; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryUser; import org.lamsfoundation.lams.tool.imageGallery.model.ImageRating; -import org.lamsfoundation.lams.tool.imageGallery.util.CircularByteBuffer; import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryToolContentHandler; import org.lamsfoundation.lams.tool.imageGallery.util.ReflectDTOComparator; import org.lamsfoundation.lams.tool.imageGallery.util.ResizePictureUtil; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ResizePictureUtil.java =================================================================== diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ResizePictureUtil.java (.../ResizePictureUtil.java) (revision 5d9ada1b3b139591dc6f1fffec04990beb727522) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/util/ResizePictureUtil.java (.../ResizePictureUtil.java) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) @@ -34,6 +34,7 @@ import javax.imageio.ImageIO; import org.apache.log4j.Logger; +import org.lamsfoundation.lams.tool.imageGallery.service.UploadImageGalleryFileException; /** * @author Andrey Balan Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java =================================================================== diff -u -r4b9aac6879339e46cb0a163a8f72400aed80c041 -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision 4b9aac6879339e46cb0a163a8f72400aed80c041) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) @@ -24,17 +24,13 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.imageGallery.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.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; @@ -49,7 +45,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.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.notebook.service.CoreNotebookConstants; import org.lamsfoundation.lams.tool.ToolAccessMode; @@ -65,12 +60,10 @@ import org.lamsfoundation.lams.tool.imageGallery.service.UploadImageGalleryFileException; import org.lamsfoundation.lams.tool.imageGallery.util.ImageCommentComparator; import org.lamsfoundation.lams.tool.imageGallery.util.ImageGalleryItemComparator; -import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageCommentForm; import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageGalleryItemForm; import org.lamsfoundation.lams.tool.imageGallery.web.form.ImageRatingForm; import org.lamsfoundation.lams.tool.imageGallery.web.form.ReflectionForm; 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; @@ -258,18 +251,20 @@ 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 imageGallery item, mark it as complete then finish this activity - // // as well. - // String imageGalleryItemUid = request.getParameter(ImageGalleryConstants.PARAM_RESOURCE_ITEM_UID); - // if (imageGalleryItemUid != 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(ImageGalleryConstants.ATTR_IS_ALLOW_VOTE, true); - // } else { - // request.setAttribute(ImageGalleryConstants.ATTR_IS_ALLOW_VOTE, false); - // } + IImageGalleryService service = getImageGalleryService(); + // get sessionId from HttpServletRequest + String nextActivityUrl = null; + try { + HttpSession ss = SessionManager.getSession(); + UserDTO userDTO = (UserDTO) ss.getAttribute(AttributeNames.USER); + Long userID = new Long(userDTO.getUserID().longValue()); + nextActivityUrl = service.finishToolSession(sessionId, userID); + request.setAttribute(ImageGalleryConstants.ATTR_NEXT_ACTIVITY_URL, nextActivityUrl); + } catch (ImageGalleryApplicationException e) { + log.error("Failed get next activity url:" + e.getMessage()); + } + return mapping.findForward(ImageGalleryConstants.SUCCESS); } @@ -353,6 +348,13 @@ ImageGalleryItem image = service.getImageGalleryItemByUid(imageUid); sessionMap.put(ImageGalleryConstants.PARAM_CURRENT_IMAGE, image); + // becuase in webpage will use this login name. Here is just + // initial it to avoid session close error in proxy object. + if (image.getCreateBy() != null) { + image.getCreateBy().getLoginName(); + } + sessionMap.put("aa", image.getUid()); + if (imageGallery.isAllowCommentImages()) { TreeSet comments = new TreeSet(new ImageCommentComparator()); comments.addAll(image.getComments()); @@ -670,8 +672,11 @@ } image.setTitle(title); + Long sessionId = (Long) sessionMap.get(ImageGalleryConstants.ATTR_TOOL_SESSION_ID); + ImageGalleryUser imageGalleryUser = getCurrentUser(service, sessionId); + image.setCreateBy(imageGalleryUser); image.setDescription(imageForm.getDescription()); - image.setCreateByAuthor(true); + image.setCreateByAuthor(false); image.setHide(false); //setting SequenceId Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageCommentForm.java =================================================================== diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageCommentForm.java (.../ImageCommentForm.java) (revision 5d9ada1b3b139591dc6f1fffec04990beb727522) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageCommentForm.java (.../ImageCommentForm.java) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) @@ -23,17 +23,11 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.imageGallery.web.form; -import java.util.Set; -import java.util.TreeSet; - import javax.servlet.http.HttpServletRequest; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionMapping; -import org.apache.struts.upload.FormFile; -import org.lamsfoundation.lams.tool.imageGallery.model.ImageComment; import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem; -import org.lamsfoundation.lams.tool.imageGallery.util.ImageCommentComparator; /** * ImageComment Form. Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java =================================================================== diff -u -r5d9ada1b3b139591dc6f1fffec04990beb727522 -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java (.../ImageRatingForm.java) (revision 5d9ada1b3b139591dc6f1fffec04990beb727522) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/form/ImageRatingForm.java (.../ImageRatingForm.java) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) @@ -23,11 +23,7 @@ /* $Id$ */ package org.lamsfoundation.lams.tool.imageGallery.web.form; -import javax.servlet.http.HttpServletRequest; - import org.apache.struts.action.ActionForm; -import org.apache.struts.action.ActionMapping; -import org.lamsfoundation.lams.tool.imageGallery.model.ImageGalleryItem; /** * Image star rating Form. Index: lams_tool_images/web/pages/learning/finish.jsp =================================================================== diff -u -r8a7c47632a6a93892f015f068d12adb376c0ae2d -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 --- lams_tool_images/web/pages/learning/finish.jsp (.../finish.jsp) (revision 8a7c47632a6a93892f015f068d12adb376c0ae2d) +++ lams_tool_images/web/pages/learning/finish.jsp (.../finish.jsp) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) @@ -5,12 +5,11 @@ <%-- This page just for : redir finish page to parent rather that part of the frame --%> - + - Index: lams_tool_images/web/pages/learning/learning.jsp =================================================================== diff -u -r4b9aac6879339e46cb0a163a8f72400aed80c041 -r6ef6746ff5178819511bb5b9000f3fbc31aaea66 --- lams_tool_images/web/pages/learning/learning.jsp (.../learning.jsp) (revision 4b9aac6879339e46cb0a163a8f72400aed80c041) +++ lams_tool_images/web/pages/learning/learning.jsp (.../learning.jsp) (revision 6ef6746ff5178819511bb5b9000f3fbc31aaea66) @@ -25,10 +25,6 @@