Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java =================================================================== diff -u -r22789974b076931e27e1e37ed7d91bd17f4f9cb6 -rdb22ea00a9bb00718193230df45bb8078fabb3d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision 22789974b076931e27e1e37ed7d91bd17f4f9cb6) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteMonitoredUserDTO.java (.../VoteMonitoredUserDTO.java) (revision db22ea00a9bb00718193230df45bb8078fabb3d8) @@ -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 =================================================================== diff -u -r5c9c47d5e75fb6d0229862af0f08c84229b6056c -rdb22ea00a9bb00718193230df45bb8078fabb3d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 5c9c47d5e75fb6d0229862af0f08c84229b6056c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision db22ea00a9bb00718193230df45bb8078fabb3d8) @@ -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 =================================================================== diff -u -r5c9c47d5e75fb6d0229862af0f08c84229b6056c -rdb22ea00a9bb00718193230df45bb8078fabb3d8 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision 5c9c47d5e75fb6d0229862af0f08c84229b6056c) +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteMonitoringAction.java (.../VoteMonitoringAction.java) (revision db22ea00a9bb00718193230df45bb8078fabb3d8) @@ -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 =================================================================== diff -u -ra8e5c42d584e4b8b9b67224179acbc53850d279f -rdb22ea00a9bb00718193230df45bb8078fabb3d8 --- lams_tool_vote/web/export/ExportContent.jsp (.../ExportContent.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) +++ lams_tool_vote/web/export/ExportContent.jsp (.../ExportContent.jsp) (revision db22ea00a9bb00718193230df45bb8078fabb3d8) @@ -94,7 +94,7 @@ - + @@ -169,7 +169,8 @@ - + + @@ -291,8 +292,8 @@ - - + + Index: lams_tool_vote/web/learning/LearnerRep.jsp =================================================================== diff -u -ra8e5c42d584e4b8b9b67224179acbc53850d279f -rdb22ea00a9bb00718193230df45bb8078fabb3d8 --- lams_tool_vote/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) +++ lams_tool_vote/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision db22ea00a9bb00718193230df45bb8078fabb3d8) @@ -111,15 +111,15 @@ - + - + @@ -155,7 +155,7 @@ - + Index: lams_tool_vote/web/monitoring/AllSessionsSummary.jsp =================================================================== diff -u -ra8e5c42d584e4b8b9b67224179acbc53850d279f -rdb22ea00a9bb00718193230df45bb8078fabb3d8 --- lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) +++ lams_tool_vote/web/monitoring/AllSessionsSummary.jsp (.../AllSessionsSummary.jsp) (revision db22ea00a9bb00718193230df45bb8078fabb3d8) @@ -308,7 +308,7 @@ - + Index: lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp =================================================================== diff -u -ra8e5c42d584e4b8b9b67224179acbc53850d279f -rdb22ea00a9bb00718193230df45bb8078fabb3d8 --- lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) +++ lams_tool_vote/web/monitoring/IndividualSessionSummary.jsp (.../IndividualSessionSummary.jsp) (revision db22ea00a9bb00718193230df45bb8078fabb3d8) @@ -297,8 +297,9 @@ - + + Index: lams_tool_vote/web/monitoring/UserResponses.jsp =================================================================== diff -u -ra8e5c42d584e4b8b9b67224179acbc53850d279f -rdb22ea00a9bb00718193230df45bb8078fabb3d8 --- lams_tool_vote/web/monitoring/UserResponses.jsp (.../UserResponses.jsp) (revision a8e5c42d584e4b8b9b67224179acbc53850d279f) +++ lams_tool_vote/web/monitoring/UserResponses.jsp (.../UserResponses.jsp) (revision db22ea00a9bb00718193230df45bb8078fabb3d8) @@ -33,7 +33,7 @@ - + Index: lams_tool_vote/web/monitoring/VoteNominationViewer.jsp =================================================================== diff -u -r369b6c2ca857c6b74ee143e081534f50b0b94106 -rdb22ea00a9bb00718193230df45bb8078fabb3d8 --- lams_tool_vote/web/monitoring/VoteNominationViewer.jsp (.../VoteNominationViewer.jsp) (revision 369b6c2ca857c6b74ee143e081534f50b0b94106) +++ lams_tool_vote/web/monitoring/VoteNominationViewer.jsp (.../VoteNominationViewer.jsp) (revision db22ea00a9bb00718193230df45bb8078fabb3d8) @@ -47,7 +47,7 @@ - +