Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java
===================================================================
diff -u -re7b376ab647cc34726cd1dc3c572d3fd82e967c9 -rb767cd01abafe96e9ba61d83ba88cacb5a622558
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision e7b376ab647cc34726cd1dc3c572d3fd82e967c9)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaUtils.java	(.../QaUtils.java)	(revision b767cd01abafe96e9ba61d83ba88cacb5a622558)
@@ -10,6 +10,7 @@
 import java.text.DateFormat;
 import java.util.Date;
 import java.util.Random;
+import java.util.TimeZone;
 
 import javax.servlet.http.HttpServletRequest;
 
@@ -341,7 +342,13 @@
 		return (DateFormat.getDateTimeInstance(DateFormat.LONG, DateFormat.LONG).format(date));
 	}
 	
+	public static void persistTimeZone(HttpServletRequest request)
+	{
+		TimeZone timeZone=TimeZone.getDefault();
+	    logger.debug("current timezone: " + timeZone.getDisplayName());
+	    request.getSession().setAttribute(TIMEZONE, timeZone.getDisplayName());
+	    logger.debug("current timezone id: " + timeZone.getID());
+	    request.getSession().setAttribute(TIMEZONE_ID, timeZone.getID());
+	}
 	
-	
-	
 }
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java
===================================================================
diff -u -re7b376ab647cc34726cd1dc3c572d3fd82e967c9 -rb767cd01abafe96e9ba61d83ba88cacb5a622558
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision e7b376ab647cc34726cd1dc3c572d3fd82e967c9)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/LearningUtil.java	(.../LearningUtil.java)	(revision b767cd01abafe96e9ba61d83ba88cacb5a622558)
@@ -226,12 +226,12 @@
                 logger.debug("iterationg question-answers: displayOrder: " + displayOrder + 
          													 " question: " + question + " answer: " + answer);
         		
-                String timezone=(String)request.getSession().getAttribute(TIMEZONE);
-                if (timezone == null) timezone="";
+                String timezoneId=(String)request.getSession().getAttribute(TIMEZONE_ID);
+                if (timezoneId == null) timezoneId="";
                 
             	QaUsrResp qaUsrResp= new QaUsrResp(answer,false,
 						new Date(System.currentTimeMillis()),
-						timezone,
+						timezoneId,
 						qaQueContent,
 						qaQueUsr); 
 
@@ -432,6 +432,7 @@
 		    			request.getSession().setAttribute(FULLNAME + toolSessionId + "" + questionIndex +""+ responseIndex, qaQueUsr.getFullname());	
 		    			request.getSession().setAttribute(ANSWER + toolSessionId + "" + questionIndex +""+ responseIndex, qaUsrResp.getAnswer());
 		    			request.getSession().setAttribute(ATIME + toolSessionId + "" + questionIndex +""+ responseIndex, qaUsrResp.getAttemptTime());
+		    			request.getSession().setAttribute(TIMEZONE_ID + questionIndex + "" + responseIndex, qaUsrResp.getTimezone());
 		    			request.getSession().setAttribute(RESPONSE_ID + toolSessionId + "" + questionIndex +""+ responseIndex, qaUsrResp.getResponseId());
 		    			
 		    			boolean isResponseHidden=qaUsrResp.isHidden();
@@ -539,7 +540,7 @@
 			    			request.getSession().setAttribute(ATIME + questionIndex +""+ responseIndex, qaUsrResp.getAttemptTime());
 			    			request.getSession().setAttribute(FORMATTED_ATIME + questionIndex +""+ responseIndex, QaUtils.getFormattedDateString(qaUsrResp.getAttemptTime()));
 			    			logger.debug("setting formattedDatetime");
-			    			request.getSession().setAttribute(TIMEZONE + questionIndex +""+ responseIndex, qaUsrResp.getTimezone());
+			    			request.getSession().setAttribute(TIMEZONE_ID + questionIndex +""+ responseIndex, qaUsrResp.getTimezone());
 						    			
 		    	    		if (qaQueUsr.getUsername().equalsIgnoreCase(toolUser.getLogin()))
 		    	    		{
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java
===================================================================
diff -u -r5ba75a338c76b23778bf80ab835209d38e2316cb -rb767cd01abafe96e9ba61d83ba88cacb5a622558
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	(.../QAction.java)	(revision 5ba75a338c76b23778bf80ab835209d38e2316cb)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QAction.java	(.../QAction.java)	(revision b767cd01abafe96e9ba61d83ba88cacb5a622558)
@@ -46,6 +46,12 @@
 
 /**
  * 
+ * change the logic about completion status
+ *
+ */
+
+/**
+ * 
  * once lams_learning is ready and appContext file is src/ then FINISH toool session will work.
  * 
  */
@@ -529,10 +535,17 @@
                 IQaService qaService =QaUtils.getToolService(request);
                 QaSession qaSession=qaService.retrieveQaSessionOrNullById(toolSessionId.longValue());
                 qaSession.setSession_end_date(new Date(System.currentTimeMillis()));
-                qaSession.setSession_status(COMPLETED);
-                qaService.updateQaSession(qaSession);
-                logger.debug("tool session has been marked COMPLETE: " + qaSession);
+                
                 /*
+                 * change the logic about completion status 
+                 */
+                
+                /* qaSession.setSession_status(COMPLETED); 
+                   qaService.updateQaSession(qaSession);
+                   logger.debug("tool session has been marked COMPLETE: " + qaSession);
+                */
+                
+                /*
                 ILearnerService learnerService =LearnerServiceProxy.getLearnerService(getServlet().getServletContext());
                 logger.debug(logger + " " + this.getClass().getName() +  "learnerService: " + learnerService);
                 learnerService.completeToolSession(toolSessionId, user);
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java
===================================================================
diff -u -re7b376ab647cc34726cd1dc3c572d3fd82e967c9 -rb767cd01abafe96e9ba61d83ba88cacb5a622558
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision e7b376ab647cc34726cd1dc3c572d3fd82e967c9)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaLearningStarterAction.java	(.../QaLearningStarterAction.java)	(revision b767cd01abafe96e9ba61d83ba88cacb5a622558)
@@ -7,7 +7,6 @@
 import java.io.IOException;
 import java.util.Iterator;
 import java.util.Map;
-import java.util.TimeZone;
 import java.util.TreeMap;
 
 import javax.servlet.ServletException;
@@ -146,7 +145,7 @@
 	    /**
 	     * persist time zone information to session scope. 
 	     */
-	    persistTimeZone(request);
+	    QaUtils.persistTimeZone(request);
 	    
 	    /**
 	     * obtain and setup the current user's data 
@@ -355,14 +354,4 @@
 		logger.debug("add " + message +"  to ActionMessages:");
 		saveErrors(request,errors);	    	    
 	}
-	
-	public void persistTimeZone(HttpServletRequest request)
-	{
-		TimeZone timeZone=TimeZone.getDefault();
-	    logger.debug("current timezone: " + timeZone.getDisplayName());
-	    request.getSession().setAttribute(TIMEZONE, timeZone.getDisplayName());
-	    logger.debug("current timezone id: " + timeZone.getID());
-	    request.getSession().setAttribute(TIMEZONE_ID, timeZone.getID());
-	}
-	
 }  
Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java
===================================================================
diff -u -re7b376ab647cc34726cd1dc3c572d3fd82e967c9 -rb767cd01abafe96e9ba61d83ba88cacb5a622558
--- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	(.../QaMonitoringStarterAction.java)	(revision e7b376ab647cc34726cd1dc3c572d3fd82e967c9)
+++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/QaMonitoringStarterAction.java	(.../QaMonitoringStarterAction.java)	(revision b767cd01abafe96e9ba61d83ba88cacb5a622558)
@@ -69,7 +69,12 @@
     	    request.getSession().setAttribute(TOOL_SERVICE, qaService);	
     	}
     	logger.debug("retrieved qaService: " + qaService);
-	    
+    	
+    	/**
+	     * persist time zone information to session scope. 
+	     */
+	    QaUtils.persistTimeZone(request);
+    	
 	    /**
 	     * mark the http session as an authoring activity 
 	     */
Index: lams_tool_laqa/web/MonitoringSummaryScreen.jsp
===================================================================
diff -u -r16e844de3f7c34b44baee1b28e67e708f42d00bf -rb767cd01abafe96e9ba61d83ba88cacb5a622558
--- lams_tool_laqa/web/MonitoringSummaryScreen.jsp	(.../MonitoringSummaryScreen.jsp)	(revision 16e844de3f7c34b44baee1b28e67e708f42d00bf)
+++ lams_tool_laqa/web/MonitoringSummaryScreen.jsp	(.../MonitoringSummaryScreen.jsp)	(revision b767cd01abafe96e9ba61d83ba88cacb5a622558)
@@ -81,24 +81,31 @@
 				  				 	<tr> 
 										 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.user"/>	</td>  
 				  						 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.attemptTime"/></td>
+			  	  						 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.timezone"/></td>
 				  						 <td> &nbsp&nbsp&nbsp <fmt:message key="label.learning.response"/> 	</td>
 						  			</tr>				 
 						  			
 										<c:set var="ansIndex" scope="request" value="0"/>
 								  		<c:forEach var="subEntry" items="${mainEntry.value}">
 											<c:set var="ansIndex" scope="request" value="${ansIndex +1}"/>
 										  	<%
-										  	  String sectionSessionId=(String)request.getAttribute("sectionSessionId");
-										  	  String fullName="fullName" + sectionSessionId + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
-										  	  String aTime="aTime" + sectionSessionId + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
-											  String answer="answer" + sectionSessionId + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
-		  									  String responseId="responseId" + sectionSessionId + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
-		  									  String responseHidden="responseHidden" + sectionSessionId + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+										  	  String sectionSessionId	=(String)request.getAttribute("sectionSessionId");
+										  	  String fullName			="fullName" + sectionSessionId + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+										  	  String aTime				="aTime" + sectionSessionId + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+										  	  String timeZoneId			="timeZoneId" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+											  String answer				="answer" + sectionSessionId + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+		  									  String responseId			="responseId" + sectionSessionId + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+		  									  String responseHidden		="responseHidden" + sectionSessionId + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
 											  
-											  fullName= (String) request.getSession().getAttribute(fullName);
+											  fullName = (String) request.getSession().getAttribute(fullName);
 											  request.setAttribute("fullName", fullName);
+
 									 	   	  java.util.Date attemptTime= (java.util.Date) request.getSession().getAttribute(aTime);
 									 	   	  request.setAttribute("attemptTime", attemptTime);
+
+	  	    						 	   	  timeZoneId= (String) request.getSession().getAttribute(timeZoneId);
+						 	   	  			  request.setAttribute("timeZoneId", timeZoneId);									 	   	  
+						 	   	  			  
 									 	   	  answer= (String) request.getSession().getAttribute(answer);
 									 	   	  request.setAttribute("answer", answer);
 									 	   	  Long longResponseId= (Long) request.getSession().getAttribute(responseId);
@@ -120,7 +127,13 @@
 															  		&nbsp&nbsp&nbsp  <c:out value="${requestScope.attemptTime}"/>
 														</td>  
 													</c:if>							  													
-													
+
+													<c:if test="${requestScope.timeZoneId != ''}"> 														
+														<td>  
+															  		&nbsp&nbsp&nbsp  <c:out value="${requestScope.timeZoneId}"/>
+														</td>  
+													</c:if>							  													
+
 													<c:if test="${requestScope.responseId == sessionScope.dataMapEditableResponseId}"> 			
 															<td>  
 																	&nbsp&nbsp&nbsp <html:text property="updatedResponse" value="${requestScope.answer}" 
Index: lams_tool_laqa/web/learnerReport.jsp
===================================================================
diff -u -rdbc459a54a0eb6961b4c331f3174cc1fa4661f02 -rb767cd01abafe96e9ba61d83ba88cacb5a622558
--- lams_tool_laqa/web/learnerReport.jsp	(.../learnerReport.jsp)	(revision dbc459a54a0eb6961b4c331f3174cc1fa4661f02)
+++ lams_tool_laqa/web/learnerReport.jsp	(.../learnerReport.jsp)	(revision b767cd01abafe96e9ba61d83ba88cacb5a622558)
@@ -40,20 +40,20 @@
 							  	<%String fullName	="fullName" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
 							  	  String aTime		="aTime" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
 							  	  String formattedAtime="formattedAtime" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
-							  	  String timeZone	="timeZone" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
+							  	  String timeZoneId	="timeZoneId" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
 								  String answer		="answer" + request.getAttribute("queIndex") + request.getAttribute("ansIndex");
 							   	  String currentLearnerFullname=(String) request.getSession().getAttribute("currentLearnerFullname");
 							   	  								  
 								  fullName			= (String) request.getSession().getAttribute(fullName);
 						 	   	  java.util.Date attemptTime= (java.util.Date) request.getSession().getAttribute(aTime);
 						 	   	  formattedAtime 	=(String) request.getSession().getAttribute(formattedAtime);
-  						 	   	  timeZone			= (String) request.getSession().getAttribute(timeZone);
+  						 	   	  timeZoneId		= (String) request.getSession().getAttribute(timeZoneId);
 						 	   	  answer			= (String) request.getSession().getAttribute(answer);
 						 	   	  
 								  request.setAttribute("fullName", fullName);
 						 	   	  request.setAttribute("attemptTime", attemptTime);
 						 	   	  request.setAttribute("formattedAtime", formattedAtime);
-						 	   	  request.setAttribute("timeZone", timeZone);
+						 	   	  request.setAttribute("timeZoneId", timeZoneId);
 						 	   	  request.setAttribute("answer", answer);
 						 	   	  request.setAttribute("currentLearnerFullname", currentLearnerFullname);
 								%>
@@ -111,11 +111,11 @@
 											</td>  
 										<%}%>					
 
-										 <% if (timeZone != null)
+										 <% if (timeZoneId != null)
 										 	{
 										 %>
 											<td>  
-												&nbsp&nbsp&nbsp  <c:out value="${requestScope.timeZone}"/> 
+												&nbsp&nbsp&nbsp  <c:out value="${requestScope.timeZoneId}"/> 
 											</td>  
 										<%}%>