Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/Attic/VoteMonitoredUserDTO.java,v
diff -u -r1.5 -r1.6
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java	23 May 2006 12:48:53 -0000	1.5
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java	26 Aug 2006 16:01:27 -0000	1.6
@@ -21,6 +21,7 @@
  * ***********************************************************************/
 package org.lamsfoundation.lams.tool.vote;
 
+import java.util.Date;
 import java.util.Map;
 
 import org.apache.commons.lang.builder.ToStringBuilder;
@@ -37,8 +38,10 @@
 
     private String uid;
 	
-	private String attemptTime;
+	//private String attemptTime;
 	
+    private Date attemptTime;
+	
 	private String timeZone;
 	
 	private String userName;
@@ -98,18 +101,6 @@
 			return (int) (new Long(queUsrId).longValue() - new Long(VoteMonitoredUserDTO.queUsrId).longValue());
     }
 	/**
-	 * @return Returns the attemptTime.
-	 */
-	public String getAttemptTime() {
-		return attemptTime;
-	}
-	/**
-	 * @param attemptTime The attemptTime to set.
-	 */
-	public void setAttemptTime(String attemptTime) {
-		this.attemptTime = attemptTime;
-	}
-	/**
 	 * @return Returns the isCorrect.
 	 */
 	public String getIsCorrect() {
@@ -217,4 +208,16 @@
     public void setVisible(String visible) {
         this.visible = visible;
     }
+    /**
+     * @return Returns the attemptTime.
+     */
+    public Date getAttemptTime() {
+        return attemptTime;
+    }
+    /**
+     * @param attemptTime The attemptTime to set.
+     */
+    public void setAttemptTime(Date attemptTime) {
+        this.attemptTime = attemptTime;
+    }    
 }
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java,v
diff -u -r1.38 -r1.39
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java	16 Aug 2006 21:34:48 -0000	1.38
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java	26 Aug 2006 16:01:26 -0000	1.39
@@ -280,7 +280,7 @@
 		    	    		if (voteUsrResp != null)
 		    	    		{
 		    	    			VoteMonitoredUserDTO voteMonitoredUserDTO = new VoteMonitoredUserDTO();
-		    	    			voteMonitoredUserDTO.setAttemptTime(voteUsrResp.getAttemptTime().toString());
+		    	    			voteMonitoredUserDTO.setAttemptTime(voteUsrResp.getAttemptTime());
 		    	    			voteMonitoredUserDTO.setTimeZone(voteUsrResp.getTimeZone());
 		    	    			voteMonitoredUserDTO.setUserName(voteQueUsr.getFullname());
 		    	    			voteMonitoredUserDTO.setQueUsrId(voteQueUsr.getUid().toString());
@@ -356,7 +356,7 @@
 			    	    		if (voteUsrResp != null)
 			    	    		{
 			    	    			VoteMonitoredUserDTO voteMonitoredUserDTO = new VoteMonitoredUserDTO();
-			    	    			voteMonitoredUserDTO.setAttemptTime(voteUsrResp.getAttemptTime().toString());
+			    	    			voteMonitoredUserDTO.setAttemptTime(voteUsrResp.getAttemptTime());
 			    	    			voteMonitoredUserDTO.setTimeZone(voteUsrResp.getTimeZone());
 			    	    			voteMonitoredUserDTO.setUid(voteUsrResp.getUid().toString());
 			    	    			voteMonitoredUserDTO.setUserName(voteQueUsr.getFullname());
@@ -431,7 +431,7 @@
 				    	    		if (voteUsrResp != null)
 				    	    		{
 				    	    			VoteMonitoredUserDTO voteMonitoredUserDTO = new VoteMonitoredUserDTO();
-				    	    			voteMonitoredUserDTO.setAttemptTime(voteUsrResp.getAttemptTime().toString());
+				    	    			voteMonitoredUserDTO.setAttemptTime(voteUsrResp.getAttemptTime());
 				    	    			voteMonitoredUserDTO.setTimeZone(voteUsrResp.getTimeZone());
 				    	    			voteMonitoredUserDTO.setUid(voteUsrResp.getUid().toString());
 				    	    			
@@ -520,7 +520,7 @@
 		    	    			{
 		    	    				logger.debug("this is the user requested , include his name for learner progress.");
 			    	    			VoteMonitoredUserDTO voteMonitoredUserDTO = new VoteMonitoredUserDTO();
-			    	    			voteMonitoredUserDTO.setAttemptTime(voteUsrResp.getAttemptTime().toString());
+			    	    			voteMonitoredUserDTO.setAttemptTime(voteUsrResp.getAttemptTime());
 			    	    			voteMonitoredUserDTO.setTimeZone(voteUsrResp.getTimeZone());
 			    	    			voteMonitoredUserDTO.setUid(voteUsrResp.getUid().toString());
 		    	    				voteMonitoredUserDTO.setUserName(voteQueUsr.getFullname());	
Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java,v
diff -u -r1.37 -r1.38
--- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	16 Aug 2006 21:34:47 -0000	1.37
+++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java	26 Aug 2006 16:01:26 -0000	1.38
@@ -452,7 +452,8 @@
 	    	    	    logger.debug("show user  entries  by same content only");
 	    	    	    if (voteContent.getUid().toString().equals(localUserSession.getVoteContentId().toString()))
 	    	    	    {
-			    			voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString());
+			    			//voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString());
+	    	    	        voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime());
 			    			voteMonitoredUserDTO.setTimeZone(voteUsrAttempt.getTimeZone());
 			    			voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getFullname());
 			    			voteMonitoredUserDTO.setQueUsrId(voteUsrAttempt.getVoteQueUsr().getUid().toString());
@@ -480,7 +481,8 @@
 			    	    	        if (userId.equals(localUserId))
 				    	    	    {
 				    	    	        logger.debug("this is requested by user id: "  + userId);
-						    			voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString());
+						    			//voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString());
+				    	    	        voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime());
 						    			voteMonitoredUserDTO.setTimeZone(voteUsrAttempt.getTimeZone());
 						    			voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getFullname());
 						    			voteMonitoredUserDTO.setQueUsrId(voteUsrAttempt.getVoteQueUsr().getUid().toString());
@@ -511,7 +513,8 @@
 			    	    	    if (userSessionId.equals(currentSessionId))
 			    	    	    {
 			    	    	        logger.debug("this is requested by session id: "  + currentSessionId);
-					    			voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString());
+					    			//voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString());
+			    	    	        voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime());
 					    			voteMonitoredUserDTO.setTimeZone(voteUsrAttempt.getTimeZone());
 					    			voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getFullname());
 					    			voteMonitoredUserDTO.setQueUsrId(voteUsrAttempt.getVoteQueUsr().getUid().toString());
@@ -1474,7 +1477,8 @@
     	    VoteUsrAttempt voteUsrAttempt=(VoteUsrAttempt)userIterator.next();
     	    VoteMonitoredUserDTO voteMonitoredUserDTO= new VoteMonitoredUserDTO();
     	    voteMonitoredUserDTO.setUserName(voteUsrAttempt.getVoteQueUsr().getFullname());
-    	    voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString());
+    	    //voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime().toString());
+    	    voteMonitoredUserDTO.setAttemptTime(voteUsrAttempt.getAttemptTime());
     	    listVotedLearnersDTO.add(voteMonitoredUserDTO);
     	}
 		logger.debug("listVoteAllSessionsDTO: " + listVotedLearnersDTO);
Index: lams_tool_vote/web/export/ExportContent.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/export/ExportContent.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_vote/web/export/ExportContent.jsp	20 Aug 2006 14:47:22 -0000	1.11
+++ lams_tool_vote/web/export/ExportContent.jsp	26 Aug 2006 16:01:26 -0000	1.12
@@ -94,7 +94,7 @@
 																				<c:out value="${currentDto.question}" escapeXml="false"/> 
 																		</td>
 																		 <td NOWRAP valign=top align=left>   
-																		 	 <c:out value="${userData.attemptTime}"/>  
+																			<lams:Date value="${userData.attemptTime}"/> 
 																		 </td>
 																</tr>		
 															</c:forEach>		  	
@@ -169,7 +169,8 @@
 																</td>
 																 
 																 <td NOWRAP valign=top align=left>    <c:out value="${userData.userName}"/>   </td>  
-																 <td NOWRAP valign=top align=left>    <c:out value="${userData.attemptTime}"/>  </td>
+																 <td NOWRAP valign=top align=left>    <lams:Date value="${userData.attemptTime}"/>  </td>																 
+																 
 														</tr>		
 													</c:forEach>		  	
 											</c:forEach>		
@@ -291,8 +292,8 @@
 					  							<c:forEach var="questionAttemptData" items="${currentDto.questionAttempts}">
 											  	 		<c:set var="userData" scope="request" value="${questionAttemptData.value}"/>
 																<tr> 
-																		 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
-																		 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/>  </td>
+																	 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
+																	 <td NOWRAP valign=top >    <lams:Date value="${userData.attemptTime}"/>  </td>																		 
 																</tr>		
 												</c:forEach>		  	
 									  			
Index: lams_tool_vote/web/learning/LearnerRep.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/learning/Attic/LearnerRep.jsp,v
diff -u -r1.3 -r1.4
--- lams_tool_vote/web/learning/LearnerRep.jsp	20 Aug 2006 14:47:21 -0000	1.3
+++ lams_tool_vote/web/learning/LearnerRep.jsp	26 Aug 2006 16:01:27 -0000	1.4
@@ -111,15 +111,15 @@
 			  	 									<c:if test="${sessionScope.currentMonitoredToolSession == 'All'}"> 			
 														<tr> 
 																 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
-																 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/>  </td>
+																 <td NOWRAP valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>																 
 														</tr>		
 													</c:if>														  					 									  			
 													
 			  	 									<c:if test="${sessionScope.currentMonitoredToolSession != 'All'}"> 			
 			  	 										<c:if test="${sessionScope.currentMonitoredToolSession == userData.sessionId}"> 			
 															<tr> 
 																	 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
-																	 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/>  </td>
+																	 <td NOWRAP valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>																 
 															</tr>		
 														</c:if>														  					 									  													  			
 													</c:if>														  					 									  													  			
@@ -155,7 +155,7 @@
 									  	 		<c:set var="userData" scope="request" value="${questionAttemptData.value}"/>
 												<tr> 
 														 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
-														 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/>  </td>
+														 <td NOWRAP valign=top>   <lams:Date value="${userData.attemptTime}"/> </td>																 
 												</tr>		
 										</c:forEach>		  	
 							  			
Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/AllSessionsSummary.jsp,v
diff -u -r1.11 -r1.12
--- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	20 Aug 2006 14:47:22 -0000	1.11
+++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp	26 Aug 2006 16:01:26 -0000	1.12
@@ -308,7 +308,7 @@
 																</td>
 																 
 																 <td NOWRAP valign=top align=left>    <c:out value="${userData.userName}"/>   </td>  
-																 <td NOWRAP valign=top align=left>    <c:out value="${userData.attemptTime}"/>  </td>
+																 <td NOWRAP valign=top align=left>    <lams:Date value="${userData.attemptTime}"/>  </td>
 																 
 										 						<c:if test="${statsTabActive != 'true'}"> 							
 																	 <td NOWRAP valign=top align=left>
Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/IndividualSessionSummary.jsp,v
diff -u -r1.12 -r1.13
--- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	20 Aug 2006 14:47:22 -0000	1.12
+++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp	26 Aug 2006 16:01:26 -0000	1.13
@@ -297,8 +297,9 @@
 																</td>
 																 
 																 <td NOWRAP valign=top align=left>    <c:out value="${userData.userName}"/>   </td>  
-																 <td NOWRAP valign=top align=left>    <c:out value="${userData.attemptTime}"/>  </td>
+																 <td NOWRAP valign=top align=left>    <lams:Date value="${userData.attemptTime}"/>  </td>																 
 																 
+																 
 										 						<c:if test="${statsTabActive != 'true'}"> 							
 																	 <td NOWRAP valign=top align=left>
 												 						<c:if test="${userData.visible == 'true' }"> 			
Index: lams_tool_vote/web/monitoring/UserResponses.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/Attic/UserResponses.jsp,v
diff -u -r1.6 -r1.7
--- lams_tool_vote/web/monitoring/UserResponses.jsp	20 Aug 2006 14:47:22 -0000	1.6
+++ lams_tool_vote/web/monitoring/UserResponses.jsp	26 Aug 2006 16:01:26 -0000	1.7
@@ -33,7 +33,7 @@
 
 	<tr> 
 			 <td NOWRAP valign=top>   <c:out value="${userData.userName}"/>   </td>  
-			 <td NOWRAP valign=top>   <c:out value="${userData.attemptTime}"/>  </td>
+			 <td NOWRAP valign=top>    <lams:Date value="${userData.attemptTime}"/>  </td>
 	</tr>		
 	
 
Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp
===================================================================
RCS file: /usr/local/cvsroot/lams_tool_vote/web/monitoring/VoteNominationViewer.jsp,v
diff -u -r1.4 -r1.5
--- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	16 Aug 2006 15:01:35 -0000	1.4
+++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp	26 Aug 2006 16:01:26 -0000	1.5
@@ -47,7 +47,7 @@
 		<c:forEach var="userData" items="${voteGeneralMonitoringDTO.mapStudentsVoted}">
 			<tr>		 
 					 <td NOWRAP valign=top align=center>    <c:out value="${userData.userName}"/>   </td>  
-					 <td NOWRAP valign=top align=center>    <c:out value="${userData.attemptTime}"/>  </td>
+					 <td NOWRAP valign=top align=center>    <lams:Date value="${userData.attemptTime}"/>  </td>					 
 			</tr>				 
 		</c:forEach>		  	
     </table>