Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java =================================================================== diff -u -r616336eff87580ecb6f13770899bc9af7eff4fa8 -r99e285ee1203e9036b58bf84cfce0a37a0386406 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision 616336eff87580ecb6f13770899bc9af7eff4fa8) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java (.../ImageGalleryConstants.java) (revision 99e285ee1203e9036b58bf84cfce0a37a0386406) @@ -81,6 +81,7 @@ public static final String ATTR_CONTENT_FOLDER_ID = "contentFolderID"; public static final String ATTR_MEDIUM_IMAGE_DIMENSIONS = "mediumImageDimensions"; public static final String ATTR_THUMBNAIL_IMAGE_DIMENSIONS = "thumbnailImageDimensions"; + public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity"; // error message keys public static final String ERROR_MSG_NOT_ALLOWED_FORMAT = "error.resource.image.not.alowed.format"; Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java =================================================================== diff -u -r8e512e5f28ad5c247d577c7189e2b7908f506240 -r99e285ee1203e9036b58bf84cfce0a37a0386406 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java (.../IImageGalleryService.java) (revision 8e512e5f28ad5c247d577c7189e2b7908f506240) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java (.../IImageGalleryService.java) (revision 99e285ee1203e9036b58bf84cfce0a37a0386406) @@ -391,4 +391,12 @@ IEventNotificationService getEventNotificationService(); public List getMonitorsByToolSessionId(Long sessionId); + + /** + * Returns whether activity is grouped and therefore it is expected more than one tool session. + * + * @param toolContentID + * @return + */ + boolean isGroupedActivity(long toolContentID); } Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java =================================================================== diff -u -rcad57a4662bff477efacb0a00fe41d485e4e92e1 -r99e285ee1203e9036b58bf84cfce0a37a0386406 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision cad57a4662bff477efacb0a00fe41d485e4e92e1) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java (.../ImageGalleryServiceImpl.java) (revision 99e285ee1203e9036b58bf84cfce0a37a0386406) @@ -705,6 +705,10 @@ } return node; } + + public boolean isGroupedActivity(long toolContentID) { + return toolService.isGroupedActivity(toolContentID); + } // ***************************************************************************** // set methods for Spring Bean Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java =================================================================== diff -u -r616336eff87580ecb6f13770899bc9af7eff4fa8 -r99e285ee1203e9036b58bf84cfce0a37a0386406 --- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 616336eff87580ecb6f13770899bc9af7eff4fa8) +++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java (.../MonitoringAction.java) (revision 99e285ee1203e9036b58bf84cfce0a37a0386406) @@ -50,7 +50,6 @@ import org.apache.struts.upload.FormFile; 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.imageGallery.ImageGalleryConstants; import org.lamsfoundation.lams.tool.imageGallery.dto.ReflectDTO; import org.lamsfoundation.lams.tool.imageGallery.dto.Summary; @@ -146,8 +145,10 @@ imageGallery.toDTO(); Map> reflectList = service.getReflectList(contentId, false); + boolean isGroupedActivity = service.isGroupedActivity(contentId); - // cache into sessionMap + // cache into sessionMap + sessionMap.put(ImageGalleryConstants.ATTR_IS_GROUPED_ACTIVITY, isGroupedActivity); sessionMap.put(ImageGalleryConstants.ATTR_SUMMARY_LIST, groupList); sessionMap.put(ImageGalleryConstants.PAGE_EDITABLE, imageGallery.isContentInUse()); sessionMap.put(ImageGalleryConstants.ATTR_RESOURCE, imageGallery); Index: lams_tool_images/web/pages/monitoring/summary.jsp =================================================================== diff -u -r616336eff87580ecb6f13770899bc9af7eff4fa8 -r99e285ee1203e9036b58bf84cfce0a37a0386406 --- lams_tool_images/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 616336eff87580ecb6f13770899bc9af7eff4fa8) +++ lams_tool_images/web/pages/monitoring/summary.jsp (.../summary.jsp) (revision 99e285ee1203e9036b58bf84cfce0a37a0386406) @@ -177,9 +177,12 @@ -

- ${group[0].sessionName} -

+ +

+ ${group[0].sessionName} +

+
+