Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java,v
diff -u -r1.65 -r1.66
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	17 Aug 2007 03:32:05 -0000	1.65
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	15 Feb 2011 17:17:48 -0000	1.66
@@ -258,6 +258,14 @@
      * @return top mark, lowest mark, average mark in that order
      */
     public Integer[] getMarkStatistics(McSession mcSession);
+    
+    /**
+     * 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_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java,v
diff -u -r1.105 -r1.106
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	26 Jul 2009 22:21:24 -0000	1.105
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	15 Feb 2011 17:17:48 -0000	1.106
@@ -1560,6 +1560,10 @@
 	mcUploadedFileDAO.saveUploadFile(mcUploadedFile);
 	McServicePOJO.logger.debug("persisted mcUploadedFile: " + mcUploadedFile);
     }
+    
+    public boolean isGroupedActivity(long toolContentID) {
+	return toolService.isGroupedActivity(toolContentID);
+    }
 
     /**
      * @return Returns the logger.
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java,v
diff -u -r1.44 -r1.45
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	4 Jun 2008 04:19:29 -0000	1.44
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringAction.java	15 Feb 2011 17:17:48 -0000	1.45
@@ -254,8 +254,10 @@
 		mcGeneralMonitoringDTO.setSummaryToolSessions(populateToolSessions(mcContent));
 		mcGeneralMonitoringDTO.setDisplayAnswers(new Boolean(mcContent.isDisplayAnswers()).toString());
 		logger.debug("existing mcContent:" + mcContent);
+		
+		boolean isGroupedActivity = mcService.isGroupedActivity(new Long(toolContentID));
+		request.setAttribute("isGroupedActivity", isGroupedActivity);
 
-
 		/*setting editable screen properties*/
 		McGeneralAuthoringDTO mcGeneralAuthoringDTO= new McGeneralAuthoringDTO();
 		mcGeneralAuthoringDTO.setActivityTitle(mcContent.getTitle());
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java,v
diff -u -r1.43 -r1.44
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	21 Jul 2008 06:05:27 -0000	1.43
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/McMonitoringStarterAction.java	15 Feb 2011 17:17:48 -0000	1.44
@@ -23,7 +23,6 @@
 package org.lamsfoundation.lams.tool.mc.web;
 
 import java.io.IOException;
-import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.LinkedList;
 import java.util.List;
@@ -42,7 +41,6 @@
 import org.apache.struts.action.ActionMapping;
 import org.apache.struts.action.ActionMessage;
 import org.apache.struts.action.ActionMessages;
-import org.lamsfoundation.lams.tool.mc.EditActivityDTO;
 import org.lamsfoundation.lams.tool.mc.McAppConstants;
 import org.lamsfoundation.lams.tool.mc.McApplicationException;
 import org.lamsfoundation.lams.tool.mc.McComparator;
@@ -258,6 +256,9 @@
 	    request.setAttribute("reflect", mcContent.isReflect());
 	    request.setAttribute("reflectionSubject", mcContent.getReflectionSubject());
 	    request.setAttribute("passMark", mcContent.getPassMark());
+	    
+	    boolean isGroupedActivity = mcService.isGroupedActivity(new Long(toolContentID));
+	    request.setAttribute("isGroupedActivity", isGroupedActivity);
 
 	    // The edit activity code needs a session map
 	    SessionMap sessionMap = new SessionMap();
Index: lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/AllSessionsSummary.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp	28 Oct 2008 05:10:19 -0000	1.5
+++ lams_tool_lamc/web/monitoring/AllSessionsSummary.jsp	15 Feb 2011 17:17:48 -0000	1.6
@@ -28,12 +28,13 @@
 			  	 		<c:set var="currentSessionId" scope="request" value="${sessionMarksDto.sessionId}"/>
 			  	 		<c:set var="mapUserMarksDto" scope="request" value="${sessionMarksDto.userMarks}"/>
 
-						<tr>
-					 		<td NOWRAP colspan=2 > <b> <fmt:message key="group.label"/> : </b>
-					 		<c:out value="${sessionMarksDto.sessionName}"/>  </td>
-						</tr>
+						<c:if test="${isGroupedActivity}">
+							<tr>
+						 		<td NOWRAP colspan=2 > <b> <fmt:message key="group.label"/> : </b>
+						 		<c:out value="${sessionMarksDto.sessionName}"/>  </td>
+							</tr>
+						</c:if>
 
-
 			  	 		<tr>
 							 <td NOWRAP valign=top class="align-left"> <b> <fmt:message key="label.user"/> </b> </td>  
 							 <td NOWRAP valign=top class="align-left"> <b> <fmt:message key="label.attemptTime"/>  </b> </td>
Index: lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/IndividualSessionSummary.jsp,v
diff -u -r1.5 -r1.6
--- lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp	28 Oct 2008 05:10:19 -0000	1.5
+++ lams_tool_lamc/web/monitoring/IndividualSessionSummary.jsp	15 Feb 2011 17:17:48 -0000	1.6
@@ -34,10 +34,12 @@
 
 						<c:if test="${currentSessionId == currentMonitoredToolSession}"> 			
 						
-				  	 		<tr>
-						 		<td NOWRAP colspan=2 > <b>  <fmt:message key="group.label"/>: </b>
-						 		<c:out value="${currentSessionName}"/>  </td>
-							</tr>
+							<c:if test="${isGroupedActivity}">
+					  	 		<tr>
+							 		<td NOWRAP colspan=2 > <b>  <fmt:message key="group.label"/>: </b>
+							 		<c:out value="${currentSessionName}"/>  </td>
+								</tr>
+							</c:if>
 						
 				  	 		<tr>
 								 <td NOWRAP valign=top class="align-left"> <b> <fmt:message key="label.user"/>  </b> </td>
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java,v
diff -u -r1.54 -r1.55
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	19 Feb 2009 04:25:02 -0000	1.54
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/IQaService.java	15 Feb 2011 17:16:01 -0000	1.55
@@ -356,4 +356,12 @@
     public void deleteAllWizardCategories();
 
     public void removeQuestionsFromCache(QaContent qaContent);
+    
+    /**
+     * 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_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java,v
diff -u -r1.90 -r1.91
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	26 Jul 2009 22:17:15 -0000	1.90
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaServicePOJO.java	15 Feb 2011 17:16:01 -0000	1.91
@@ -1441,6 +1441,10 @@
 	    return list.get(0);
 	}
     }
+    
+    public boolean isGroupedActivity(long toolContentID) {
+	return toolService.isGroupedActivity(toolContentID);
+    }
 
     /**
      * @return Returns the cred.
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java,v
diff -u -r1.63 -r1.64
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	2 Nov 2010 15:26:36 -0000	1.63
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringAction.java	15 Feb 2011 17:16:01 -0000	1.64
@@ -817,6 +817,9 @@
 
 	MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent);
 	MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
+	
+	boolean isGroupedActivity = qaService.isGroupedActivity(new Long(strToolContentID));
+	request.setAttribute("isGroupedActivity", isGroupedActivity);
 
 	return mapping.findForward(QaAppConstants.LOAD_MONITORING);
     }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java,v
diff -u -r1.55 -r1.56
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	2 Nov 2010 15:26:36 -0000	1.55
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	15 Feb 2011 17:16:01 -0000	1.56
@@ -219,6 +219,9 @@
 	}
 
 	MonitoringUtil.buildQaStatsDTO(request, qaService, qaContent);
+	
+	boolean isGroupedActivity = qaService.isGroupedActivity(new Long(toolContentID));
+	request.setAttribute("isGroupedActivity", isGroupedActivity);
 
 	request.setAttribute("currentMonitoredToolSession", "All");
 	MonitoringUtil.generateGroupsSessionData(request, qaService, qaContent, false);
Index: lams_tool_laqa/web/monitoring/AllSessionsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/AllSessionsSummary.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/web/monitoring/AllSessionsSummary.jsp	21 May 2008 00:52:43 -0000	1.8
+++ lams_tool_laqa/web/monitoring/AllSessionsSummary.jsp	15 Feb 2011 17:16:01 -0000	1.9
@@ -25,10 +25,11 @@
 			  	 		<c:set var="sessionName" scope="request" value="${groupDto.sessionName}"/>
 			  	 		<c:set var="groupData" scope="request" value="${groupDto.groupData}"/>
 			  	 		
-			  	 		<tr>
-			  	 			<td> <b> <fmt:message key="group.label"/> : </b> <c:out value="${sessionName}"/> </td>
-			  	 		</tr>
-			  	 		
+			  	 		<c:if test="${isGroupedActivity}">
+				  	 		<tr>
+				  	 			<td> <b> <fmt:message key="group.label"/> : </b> <c:out value="${sessionName}"/> </td>
+				  	 		</tr>
+			  	 		</c:if>
 									  	 		
 			  	 		
 			  	 		
Index: lams_tool_laqa/web/monitoring/IndividualSessionSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_laqa/web/monitoring/Attic/IndividualSessionSummary.jsp,v
diff -u -r1.8 -r1.9
--- lams_tool_laqa/web/monitoring/IndividualSessionSummary.jsp	21 May 2008 00:52:43 -0000	1.8
+++ lams_tool_laqa/web/monitoring/IndividualSessionSummary.jsp	15 Feb 2011 17:16:01 -0000	1.9
@@ -20,11 +20,12 @@
 
 <%@ include file="/common/taglibs.jsp"%>
 
+					<c:if test="${isGroupedActivity}">
 			  	 		<tr>
 			  	 			<td> <b> <fmt:message key="group.label"/> : </b> <c:out value="${currentSessionName}"/> </td>
 			  	 		</tr>
+					</c:if>
 
-
 					<c:forEach var="currentDto" items="${generalLearnerFlowDTO.listMonitoredAnswersContainerDTO}">
 			  	 		<c:set var="currentQuestionId" scope="request" value="${currentDto.questionUid}"/>
 			  	 		
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java,v
diff -u -r1.16 -r1.17
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	22 Oct 2008 00:11:48 -0000	1.16
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/SurveyConstants.java	15 Feb 2011 17:19:18 -0000	1.17
@@ -165,7 +165,9 @@
     public static final String ATTR_SURVEY = "survey";
 
     public static final String ATTR_USER_FINISHED = "userFinished";
-
+    
+    public static final String ATTR_IS_GROUPED_ACTIVITY = "isGroupedActivity";
+    
     // POSITION
     public static int POSITION_INSIDE = 0;
 
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java,v
diff -u -r1.17 -r1.18
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	27 Oct 2008 00:49:15 -0000	1.17
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/ISurveyService.java	15 Feb 2011 17:19:18 -0000	1.18
@@ -322,4 +322,12 @@
     public String createConditionName(Collection<SurveyCondition> existingConditions);
 
     public void deleteCondition(SurveyCondition condition);
+    
+    /**
+     * 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_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java,v
diff -u -r1.28 -r1.29
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	26 Jul 2009 22:19:46 -0000	1.28
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/service/SurveyServiceImpl.java	15 Feb 2011 17:19:18 -0000	1.29
@@ -547,6 +547,10 @@
 
 	return summary;
     }
+    
+    public boolean isGroupedActivity(long toolContentID) {
+	return toolService.isGroupedActivity(toolContentID);
+    }
 
     // *****************************************************************************
     // private methods
Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java,v
diff -u -r1.18 -r1.19
--- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	22 Oct 2008 04:47:07 -0000	1.18
+++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/MonitoringAction.java	15 Feb 2011 17:19:18 -0000	1.19
@@ -151,7 +151,8 @@
 	sessionMap.put(SurveyConstants.ATTR_SURVEY, survey);
 	sessionMap.put(AttributeNames.PARAM_TOOL_CONTENT_ID, contentId);
 	sessionMap.put(SurveyConstants.ATTR_REFLECT_LIST, relectList);
-
+	sessionMap.put(SurveyConstants.ATTR_IS_GROUPED_ACTIVITY, service.isGroupedActivity(contentId));
+	
 	return mapping.findForward(SurveyConstants.SUCCESS);
     }
 
Index: lams_tool_survey/web/pages/monitoring/summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/summary.jsp,v
diff -u -r1.10 -r1.11
--- lams_tool_survey/web/pages/monitoring/summary.jsp	3 Sep 2008 02:11:20 -0000	1.10
+++ lams_tool_survey/web/pages/monitoring/summary.jsp	15 Feb 2011 17:19:18 -0000	1.11
@@ -134,12 +134,14 @@
 			<%-- display group name on first row--%>
 			<c:if test="${queStatus.first}">
 				<table cellpadding="0"  class="alternative-color">
-				<tr>
-					<td colspan="2">
-						<B><fmt:message key="monitoring.label.group" /> ${surveySession.sessionName}</B> 
-					</td>
-				</tr>
-				<%-- End group title display --%>
+					<c:if test="${sessionMap.isGroupedActivity}">
+						<tr>
+							<td colspan="2">
+								<B><fmt:message key="monitoring.label.group" /> ${surveySession.sessionName}</B> 
+							</td>
+						</tr>
+					</c:if>
+					<%-- End group title display --%>
 			</c:if>
 			<tr>
 				<th class="first" colspan="2">