Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml =================================================================== diff -u -r434a2aec5c62876edcb6dc8908896939080f1cf2 -r2228652cfb59ec7c0fcbb1914a94f65d22815911 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision 434a2aec5c62876edcb6dc8908896939080f1cf2) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml (.../imageGalleryApplicationContext.xml) (revision 2228652cfb59ec7c0fcbb1914a94f65d22815911) @@ -133,7 +133,7 @@ PROPAGATION_REQUIRED, -java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception - PROPAGATION_REQUIRED,-java.lang.Exception + PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception PROPAGATION_REQUIRED,-java.lang.Exception Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java =================================================================== diff -u -r3399163940c61c9132223c758d274486e57ff9b7 -r2228652cfb59ec7c0fcbb1914a94f65d22815911 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java (.../IImageGalleryService.java) (revision 3399163940c61c9132223c758d274486e57ff9b7) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java (.../IImageGalleryService.java) (revision 2228652cfb59ec7c0fcbb1914a94f65d22815911) @@ -231,13 +231,11 @@ List getUserListBySessionId(Long sessionId); /** - * Set a imageGallery item visible or not. + * Toggle image visibility, i.e. set its hide field to the opposite of the current value * * @param itemUid - * @param visible - * true, item is visible. False, item is invisible. */ - void setItemVisible(Long itemUid, boolean visible); + void toggleImageVisibility(Long itemUid); /** * Create refection entry into notebook tool. @@ -284,15 +282,13 @@ ImageGalleryUser getUser(Long uid); /** - * Gets a message from imageGallery bundle. Same as in JSP pages. + * Returns localized next image title. * - * @param key - * key of the message - * @param args - * arguments for the message - * @return message content + * @param nextImageTitleNumber + * + * @return */ - String getLocalisedMessage(String key, Object[] args); + String generateNextImageTitle(Long nextImageTitleNumber); /** * Get the ImageGallery config item by key Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -rd1d97d8c7da9ec5a96332afba14fa04970882bf9 -r2228652cfb59ec7c0fcbb1914a94f65d22815911 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision d1d97d8c7da9ec5a96332afba14fa04970882bf9) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 2228652cfb59ec7c0fcbb1914a94f65d22815911) @@ -303,23 +303,21 @@ } @Override - public void setItemVisible(Long itemUid, boolean visible) { - ImageGalleryItem item = imageGalleryItemDao.getByUid(itemUid); - if (item != null) { - // createBy should be null for system default value. - Long userId = 0L; - String loginName = "No user"; - if (item.getCreateBy() != null) { - userId = item.getCreateBy().getUserId(); - loginName = item.getCreateBy().getLoginName(); - } - if (visible) { - auditService.logShowEntry(ImageGalleryConstants.TOOL_SIGNATURE, userId, loginName, item.toString()); + public void toggleImageVisibility(Long itemUid) { + ImageGalleryItem image = imageGalleryItemDao.getByUid(itemUid); + if (image != null) { + boolean isHidden = image.isHide(); + image.setHide(!isHidden); + imageGalleryItemDao.saveObject(image); + + // audit log + Long userId = image.getCreateBy() == null ? 0L : image.getCreateBy().getUserId(); + String loginName = image.getCreateBy() == null ? "No user" : image.getCreateBy().getLoginName(); + if (isHidden) { + auditService.logShowEntry(ImageGalleryConstants.TOOL_SIGNATURE, userId, loginName, image.toString()); } else { - auditService.logHideEntry(ImageGalleryConstants.TOOL_SIGNATURE, userId, loginName, item.toString()); + auditService.logHideEntry(ImageGalleryConstants.TOOL_SIGNATURE, userId, loginName, image.toString()); } - item.setHide(!visible); - imageGalleryItemDao.saveObject(item); } } @@ -645,7 +643,7 @@ @Override public void notifyTeachersOnImageSumbit(Long sessionId, ImageGalleryUser imageGalleryUser) { String userName = imageGalleryUser.getLastName() + " " + imageGalleryUser.getFirstName(); - String message = getLocalisedMessage("event.imagesubmit.body", new Object[] { userName }); + String message = messageService.getMessage("event.imagesubmit.body", new Object[] { userName }); eventNotificationService.notifyLessonMonitors(sessionId, message, false); } @@ -1131,8 +1129,9 @@ } @Override - public String getLocalisedMessage(String key, Object[] args) { - return messageService.getMessage(key, args); + public String generateNextImageTitle(Long nextImageTitleNumber) { + String imageWord = messageService.getMessage("label.authoring.image"); + return imageWord + " " + nextImageTitleNumber; } public ImageGalleryOutputFactory getImageGalleryOutputFactory() { Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java =================================================================== diff -u -r661382308b57fd9a03aff100cb8d2f59be57fbd9 -r2228652cfb59ec7c0fcbb1914a94f65d22815911 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 661382308b57fd9a03aff100cb8d2f59be57fbd9) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java (.../AuthoringAction.java) (revision 2228652cfb59ec7c0fcbb1914a94f65d22815911) @@ -743,7 +743,7 @@ private void extractFormToImageGalleryItem(HttpServletRequest request, ImageGalleryItemForm imageForm) throws Exception { /* - * BE CAREFUL: This method will copy nessary info from request form to a old or new ImageGalleryItem instance. + * BE CAREFUL: This method will copy necessary info from request form to an old or new ImageGalleryItem instance. * It gets all info EXCEPT ImageGalleryItem.createDate and ImageGalleryItem.createBy, which need be set when * persisting this imageGallery item. */ @@ -802,10 +802,9 @@ String title = imageForm.getTitle(); if (StringUtils.isBlank(title)) { - Long nextConsecutiveImageTitle = (Long) sessionMap.get(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE); - sessionMap.put(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE, nextConsecutiveImageTitle + 1); - String imageLocalized = getImageGalleryService().getLocalisedMessage("label.authoring.image", null); - title = imageLocalized + " " + nextConsecutiveImageTitle; + Long nextImageTitleNumber = (Long) sessionMap.get(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE); + sessionMap.put(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE, nextImageTitleNumber + 1); + title = getImageGalleryService().generateNextImageTitle(nextImageTitleNumber); } image.setTitle(title); @@ -851,10 +850,9 @@ throw e; } - Long nextConsecutiveImageTitle = (Long) sessionMap.get(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE); - sessionMap.put(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE, nextConsecutiveImageTitle + 1); - String imageLocalized = getImageGalleryService().getLocalisedMessage("label.authoring.image", null); - String title = imageLocalized + " " + nextConsecutiveImageTitle; + Long nextImageTitleNumber = (Long) sessionMap.get(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE); + sessionMap.put(ImageGalleryConstants.ATTR_NEXT_IMAGE_TITLE, nextImageTitleNumber + 1); + String title = getImageGalleryService().generateNextImageTitle(nextImageTitleNumber); image.setTitle(title); image.setDescription(""); Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java =================================================================== diff -u -r63dc15ba7570a120b319ef389ff05fe05988e2d2 -r2228652cfb59ec7c0fcbb1914a94f65d22815911 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision 63dc15ba7570a120b319ef389ff05fe05988e2d2) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java (.../LearningAction.java) (revision 2228652cfb59ec7c0fcbb1914a94f65d22815911) @@ -657,11 +657,10 @@ String title = imageForm.getTitle(); if (StringUtils.isBlank(title)) { - Long nextConsecutiveImageTitle = imageGallery.getNextImageTitle(); - imageGallery.setNextImageTitle(nextConsecutiveImageTitle + 1); + Long nextImageTitleNumber = imageGallery.getNextImageTitle(); + imageGallery.setNextImageTitle(nextImageTitleNumber + 1); - String imageLocalized = service.getLocalisedMessage("label.authoring.image", null); - title = imageLocalized + " " + nextConsecutiveImageTitle; + title = service.generateNextImageTitle(nextImageTitleNumber); } image.setTitle(title); Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java =================================================================== diff -u -rc022c18db5de76344466905b76929dd951481994 -r2228652cfb59ec7c0fcbb1914a94f65d22815911 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision c022c18db5de76344466905b76929dd951481994) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 2228652cfb59ec7c0fcbb1914a94f65d22815911) @@ -80,12 +80,9 @@ if (param.equals("updateImage")) { return updateImage(mapping, form, request, response); } - if (param.equals("showitem")) { - return showitem(mapping, form, request, response); + if (param.equals("toggleImageVisibility")) { + return toggleImageVisibility(mapping, form, request, response); } - if (param.equals("hideitem")) { - return hideitem(mapping, form, request, response); - } if (param.equals("viewReflection")) { return viewReflection(mapping, form, request, response); } @@ -169,24 +166,14 @@ } /** - * This method will get necessary information from imageGallery item form and save or update into - * HttpSession ImageGalleryItemList. Notice, this save is not persist them into database, just save - * HttpSession temporarily. Only they will be persist when the entire authoring page is being - * persisted. - * - * @param mapping - * @param form - * @param request - * @param response - * @return - * @throws ServletException + * Update image's title and description set by monitor */ private ActionForward updateImage(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { IImageGalleryService service = getImageGalleryService(); + ImageGalleryItemForm imageForm = (ImageGalleryItemForm) form; // get back sessionMAP - ImageGalleryItemForm imageForm = (ImageGalleryItemForm) form; String sessionMapID = imageForm.getSessionMapID(); request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMapID); SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(imageForm.getSessionMapID()); @@ -198,11 +185,11 @@ String title = imageForm.getTitle(); if (StringUtils.isBlank(title)) { - Long nextConsecutiveImageTitle = imageGallery.getNextImageTitle(); - imageGallery.setNextImageTitle(nextConsecutiveImageTitle + 1); + Long nextImageTitleNumber = imageGallery.getNextImageTitle(); + imageGallery.setNextImageTitle(nextImageTitleNumber + 1); service.saveOrUpdateImageGallery(imageGallery); - String imageLocalized = getImageGalleryService().getLocalisedMessage("label.authoring.image", null); - title = imageLocalized + " " + nextConsecutiveImageTitle; + + title = getImageGalleryService().generateNextImageTitle(nextImageTitleNumber); } image.setTitle(title); @@ -217,58 +204,17 @@ return redirect; } - private ActionForward showitem(ActionMapping mapping, ActionForm form, HttpServletRequest request, + /** + * Toggle image visibility, i.e. set its hide field to the opposite of the current value + */ + private ActionForward toggleImageVisibility(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - Long itemUid = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_IMAGE_UID); - IImageGalleryService service = getImageGalleryService(); - service.setItemVisible(itemUid, true); - // get back SessionMap - String sessionMapID = request.getParameter(ImageGalleryConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); - - // update session value - List groupList = (List) sessionMap.get(ImageGalleryConstants.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(ImageGalleryConstants.SUCCESS); - } - - private ActionForward hideitem(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { - Long itemUid = WebUtil.readLongParam(request, ImageGalleryConstants.PARAM_IMAGE_UID); IImageGalleryService service = getImageGalleryService(); - service.setItemVisible(itemUid, false); + service.toggleImageVisibility(itemUid); - // get back SessionMap - String sessionMapID = request.getParameter(ImageGalleryConstants.ATTR_SESSION_MAP_ID); - SessionMap sessionMap = (SessionMap) request.getSession().getAttribute(sessionMapID); - request.setAttribute(ImageGalleryConstants.ATTR_SESSION_MAP_ID, sessionMap.getSessionID()); - - // update session value - List groupList = (List) sessionMap.get(ImageGalleryConstants.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(ImageGalleryConstants.SUCCESS); + return null; } private ActionForward viewReflection(ActionMapping mapping, ActionForm form, HttpServletRequest request, Index: lams_tool_images/web/WEB-INF/struts-config.xml =================================================================== diff -u -r412fe7a30d27bd7402ae872029af8dd655d4a638 -r2228652cfb59ec7c0fcbb1914a94f65d22815911 --- lams_tool_images/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 412fe7a30d27bd7402ae872029af8dd655d4a638) +++ lams_tool_images/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 2228652cfb59ec7c0fcbb1914a94f65d22815911) @@ -244,16 +244,10 @@ validate="false"> - - + parameter="toggleImageVisibility" > - - - Index: lams_tool_images/web/pages/monitoring/monitoring.jsp =================================================================== diff -u -r661382308b57fd9a03aff100cb8d2f59be57fbd9 -r2228652cfb59ec7c0fcbb1914a94f65d22815911 --- lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 661382308b57fd9a03aff100cb8d2f59be57fbd9) +++ lams_tool_images/web/pages/monitoring/monitoring.jsp (.../monitoring.jsp) (revision 2228652cfb59ec7c0fcbb1914a94f65d22815911) @@ -98,7 +98,7 @@ function checkNew(){ location.reload(); - } + } $(document).ready(function(){ @@ -113,6 +113,30 @@ } }); + + $(".toggle-image-visibility").click(function() { + var imageToggleLink = $(this); + var imageUid = $(this).data("image-uid"); + + $.ajax({ + type: 'POST', + url: "", + data : { + 'imageUid' : imageUid + }, + success: function(data) { + var isHidden = imageToggleLink.data("is-hidden"); + imageToggleLink.data("is-hidden", !isHidden); + + var imageToggleLinkText = isHidden ? "" : ""; + imageToggleLink.html(imageToggleLinkText); + }, + error: function(jqXHR, textStatus, errorMessage) { + alert(errorMessage); + } + }); + + }); function resizeIframe() { if (document.getElementById('TB_iframeContent') != null) { @@ -131,7 +155,6 @@ } }; window.onresize = resizeIframe; - }); Index: lams_tool_images/web/pages/monitoring/summary.jsp =================================================================== diff -u -r50551b789065b93152949df172cb9c718962697e -r2228652cfb59ec7c0fcbb1914a94f65d22815911 --- lams_tool_images/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 50551b789065b93152949df172cb9c718962697e) +++ lams_tool_images/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 2228652cfb59ec7c0fcbb1914a94f65d22815911) @@ -152,19 +152,17 @@ - - - - - - - - - - - - - + + + + + + + + + +