Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java,v
diff -u -r1.41 -r1.42
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	14 Jul 2006 05:04:11 -0000	1.41
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUtils.java	9 Aug 2006 16:50:36 -0000	1.42
@@ -125,7 +125,7 @@
 		return (DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG).format(date));
 	}
 	
-	public static void persistTimeZone(HttpServletRequest request)
+	public static void saveTimeZone(HttpServletRequest request)
 	{
 		TimeZone timeZone=TimeZone.getDefault();
 	    logger.debug("current timezone: " + timeZone.getDisplayName());
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java,v
diff -u -r1.11 -r1.12
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	27 Jun 2006 18:30:29 -0000	1.11
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java	9 Aug 2006 16:50:36 -0000	1.12
@@ -93,5 +93,7 @@
     public int getTotalNumberOfUsers(McContent mcContent);
     
     public int getTotalNumberOfUsers();
+    
+    public int countUserComplete(McContent mcContent);
    
 }
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java,v
diff -u -r1.14 -r1.15
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java	30 Jul 2006 22:27:24 -0000	1.14
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McSessionDAO.java	9 Aug 2006 16:50:36 -0000	1.15
@@ -49,7 +49,7 @@
     
     private static final String GET_SESSIONS_FROM_CONTENT = "select ms.mcSessionId from McSession ms where ms.mcContent=:mcContent";
     
-    private static final String COUNT_SESSION_COMPLETE = "from mcSession in class McSession where mcSession.sessionStatus='COMPLETE'";
+    private static final String COUNT_SESSION_COMPLETE = "from mcSession in class McSession where mcSession.sessionStatus='COMPLETED'";
     
     private static final String COUNT_SESSION_INCOMPLETE = "from mcSession in class McSession where mcSession.sessionStatus='INCOMPLETE'";
     
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java,v
diff -u -r1.16 -r1.17
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java	30 Jul 2006 22:27:24 -0000	1.16
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java	9 Aug 2006 16:50:36 -0000	1.17
@@ -22,6 +22,7 @@
 /* $$Id$$ */
 package org.lamsfoundation.lams.tool.mc.dao.hibernate;
 
+import java.util.Iterator;
 import java.util.List;
 
 import org.hibernate.FlushMode;
@@ -158,22 +159,67 @@
 		List list = getSession().createQuery(strGetUser)
 			.list();
 		logger.debug("strGetUser: " + strGetUser);
+		logger.debug("list: " + list);
 		
+		
 		int totalUserCount=0;
 		if(list != null && list.size() > 0){
-		    McQueUsr usr = (McQueUsr) list.get(0);
-			logger.debug("usr: " + usr);
-			logger.debug("local usr content uid versus incoming content uid: " + 
-			        usr.getMcSession().getMcContent().getUid().intValue() + " versus " + mcContent.getUid().intValue());
-			
-			if (usr.getMcSession().getMcContent().getUid().intValue() == mcContent.getUid().intValue())
-			{
-			    logger.debug("increasing user count");
-			    ++totalUserCount;
-			}
+			Iterator listIterator=list.iterator();
+	    	while (listIterator.hasNext())
+	    	{
+	    	    McQueUsr usr=(McQueUsr)listIterator.next();
+				logger.debug("usr: " + usr);
+				logger.debug("local usr content uid versus incoming content uid: " + 
+				        usr.getMcSession().getMcContent().getUid().intValue() + " versus " + mcContent.getUid().intValue());
+				
+				if (usr.getMcSession().getMcContent().getUid().intValue() == mcContent.getUid().intValue())
+				{
+				    logger.debug("increasing user count");
+				    ++totalUserCount;
+				}	    	    
+	    	}
 		}
+
 		logger.debug("final totalUserCount: " + totalUserCount);
         return totalUserCount;
     }
     
+
+    public int countUserComplete(McContent mcContent)
+    {
+        logger.debug("starting countUserComplete: " + mcContent);
+		String strGetUser = "from mcQueUsr in class McQueUsr";
+        HibernateTemplate templ = this.getHibernateTemplate();
+		List list = getSession().createQuery(strGetUser)
+			.list();
+		logger.debug("strGetUser: " + strGetUser);
+		logger.debug("list: " + list);
+		
+		
+		int totalUserCount=0;
+		if(list != null && list.size() > 0){
+			Iterator listIterator=list.iterator();
+	    	while (listIterator.hasNext())
+	    	{
+	    	    McQueUsr usr=(McQueUsr)listIterator.next();
+				logger.debug("usr: " + usr);
+				logger.debug("local usr content uid versus incoming content uid: " + 
+				        usr.getMcSession().getMcContent().getUid().intValue() + " versus " + mcContent.getUid().intValue());
+				
+				if (usr.getMcSession().getMcContent().getUid().intValue() == mcContent.getUid().intValue())
+				{
+				    if (usr.getMcSession().getSessionStatus().equals("COMPLETED"))
+				    {
+				        logger.debug("this user's session is COMPLETED,  increasing user count");
+					    ++totalUserCount;    
+				    }
+				    
+				}	    	    
+	    	}
+		}
+
+		logger.debug("final totalUserCount: " + totalUserCount);
+        return totalUserCount;
+    }
+    
 }
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.52 -r1.53
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	20 Jul 2006 21:47:08 -0000	1.52
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/IMcService.java	9 Aug 2006 16:50:36 -0000	1.53
@@ -143,6 +143,8 @@
 	
     public void deleteMcQueUsr(McQueUsr mcQueUsr) throws McApplicationException;
     
+    public int countUserComplete(McContent mcContent) throws McApplicationException;
+    
     public List findMcOptionsContentByQueId(Long mcQueContentId) throws McApplicationException;
     
     public void saveMcOptionsContent(McOptsContent mcOptsContent) throws McApplicationException;
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.70 -r1.71
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	20 Jul 2006 21:47:08 -0000	1.70
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McServicePOJO.java	9 Aug 2006 16:50:36 -0000	1.71
@@ -1202,7 +1202,23 @@
         }
 	}
 
+
+    public int countUserComplete(McContent mcContent) throws McApplicationException
+	{
+ 	   try
+       {
+	   		return mcUserDAO.countUserComplete(mcContent);
+       }
+       catch (DataAccessException e)
+       {
+           throw new McApplicationException("Exception occured when lams is retrieving completed user count: "
+                                                        + e.getMessage(),
+														   e);
+       }
+	}
     
+    
+    
     public int getTotalNumberOfUsers(McContent mcContent) throws McApplicationException
 	{
  	   try
Index: lams_tool_lamc/web/monitoring/Summary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/Summary.jsp,v
diff -u -r1.7 -r1.8
--- lams_tool_lamc/web/monitoring/Summary.jsp	30 Jun 2006 00:05:52 -0000	1.7
+++ lams_tool_lamc/web/monitoring/Summary.jsp	9 Aug 2006 16:50:36 -0000	1.8
@@ -78,15 +78,6 @@
 
 
 					
-		  	 		<tr>
-					  	<th scope="col" valign=top> 
-						    <bean:message key="label.mcqSummary"/> 
-					  	</th>
-
-		  	 		</tr>
-		  	 		
-				
-					
 		  	 		<c:set var="queIndex" scope="request" value="0"/>
 					<c:forEach var="currentDto" items="${sessionScope.listMonitoredAnswersContainerDto}">
 					<c:set var="queIndex" scope="request" value="${queIndex +1}"/>
Index: lams_tool_lamc/web/monitoring/SummaryIndividualSession.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_lamc/web/monitoring/Attic/SummaryIndividualSession.jsp,v
diff -u -r1.2 -r1.3
--- lams_tool_lamc/web/monitoring/SummaryIndividualSession.jsp	30 Jun 2006 00:05:52 -0000	1.2
+++ lams_tool_lamc/web/monitoring/SummaryIndividualSession.jsp	9 Aug 2006 16:50:36 -0000	1.3
@@ -32,7 +32,7 @@
 
 				<table class="forms">
 						<tr>
-					 		<td NOWRAP colspan=2 > <b>  <bean:message key="label.groupName"/> </b>
+					 		<td NOWRAP colspan=2 > <b>  <bean:message key="group.label"/>: </b>
 					 		<c:out value="${currentMonitoredToolSessionName}"/>  </td>
 						</tr>