Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java,v
diff -u -r1.18 -r1.19
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java 26 Jul 2009 22:17:33 -0000 1.18
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/GmapService.java 10 Feb 2011 22:47:56 -0000 1.19
@@ -590,6 +590,10 @@
GmapService.logger.debug("MarkerXML string was empty");
}
}
+
+ public boolean isGroupedActivity(long toolContentID) {
+ return toolService.isGroupedActivity(toolContentID);
+ }
/**
* This method verifies the credentials of the SubmitFiles Tool and gives it the Ticket
to login and
Index: lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java,v
diff -u -r1.8 -r1.9
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java 18 Sep 2008 01:41:10 -0000 1.8
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/service/IGmapService.java 10 Feb 2011 22:47:56 -0000 1.9
@@ -202,4 +202,12 @@
*/
public void saveOrUpdateGmapConfigItem(GmapConfigItem item);
+ /**
+ * 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_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java,v
diff -u -r1.11 -r1.12
--- lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java 2 Jul 2009 08:19:16 -0000 1.11
+++ lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/MonitoringAction.java 10 Feb 2011 22:47:56 -0000 1.12
@@ -117,6 +117,8 @@
request.setAttribute(GmapConstants.ATTR_GMAP_KEY, gmapKey.getConfigValue());
}
+ boolean isGroupedActivity = gmapService.isGroupedActivity(toolContentID);
+ request.setAttribute("isGroupedActivity", isGroupedActivity);
request.setAttribute("gmapDTO", gmapDT0);
request.setAttribute("contentFolderID", contentFolderID);
return mapping.findForward("success");
Index: lams_tool_gmap/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_gmap/web/pages/monitoring/summary.jsp,v
diff -u -r1.22 -r1.23
--- lams_tool_gmap/web/pages/monitoring/summary.jsp 13 Nov 2009 03:14:00 -0000 1.22
+++ lams_tool_gmap/web/pages/monitoring/summary.jsp 10 Feb 2011 22:47:56 -0000 1.23
@@ -259,8 +259,16 @@
-
${session.sessionName}
+
+
+ ${session.sessionName}
+
+
+
+
+
+
Index: lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java,v
diff -u -r1.14 -r1.15
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java 25 Dec 2008 14:28:02 -0000 1.14
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/ImageGalleryConstants.java 10 Feb 2011 22:52:58 -0000 1.15
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java,v
diff -u -r1.16 -r1.17
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java 19 Dec 2008 17:13:36 -0000 1.16
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/IImageGalleryService.java 10 Feb 2011 22:52:58 -0000 1.17
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java,v
diff -u -r1.21 -r1.22
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java 6 Aug 2009 09:27:26 -0000 1.21
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java 10 Feb 2011 22:52:58 -0000 1.22
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java,v
diff -u -r1.7 -r1.8
--- lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java 25 Dec 2008 14:28:02 -0000 1.7
+++ lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/MonitoringAction.java 10 Feb 2011 22:52:58 -0000 1.8
@@ -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
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_images/web/pages/monitoring/summary.jsp,v
diff -u -r1.9 -r1.10
--- lams_tool_images/web/pages/monitoring/summary.jsp 25 Dec 2008 14:28:01 -0000 1.9
+++ lams_tool_images/web/pages/monitoring/summary.jsp 10 Feb 2011 22:52:58 -0000 1.10
@@ -177,9 +177,12 @@
-
- ${group[0].sessionName}
-
+
+
+ ${group[0].sessionName}
+
+
+