Index: lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredUserDTO.java =================================================================== diff -u -re9eb408b02e578697e41a0ef7c9b2ea402a50c2a -r880e648324ff3833a40a78c5986d9cc70183c0fa --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredUserDTO.java (.../QaMonitoredUserDTO.java) (revision e9eb408b02e578697e41a0ef7c9b2ea402a50c2a) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/QaMonitoredUserDTO.java (.../QaMonitoredUserDTO.java) (revision 880e648324ff3833a40a78c5986d9cc70183c0fa) @@ -22,6 +22,7 @@ /* $$Id$$ */ package org.lamsfoundation.lams.tool.qa; +import java.util.Date; import java.util.Map; import org.apache.commons.lang.builder.ToStringBuilder; @@ -39,7 +40,9 @@ private String uid; - private String attemptTime; + //private String attemptTime; + + private Date attemptTime; private String timeZone; @@ -97,19 +100,8 @@ else return (int) (new Long(queUsrId).longValue() - new Long(qaMonitoredUserDTO.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() { @@ -205,4 +197,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_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java =================================================================== diff -u -r0e25eab07d7153c61f50deb6332abc0d4ed3ec69 -r880e648324ff3833a40a78c5986d9cc70183c0fa --- lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 0e25eab07d7153c61f50deb6332abc0d4ed3ec69) +++ lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/MonitoringUtil.java (.../MonitoringUtil.java) (revision 880e648324ff3833a40a78c5986d9cc70183c0fa) @@ -373,7 +373,8 @@ if (qaUsrResp != null) { QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO(); - qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString()); + //qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString()); + qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime()); qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone()); qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString()); qaMonitoredUserDTO.setUserName(qaQueUsr.getFullname()); @@ -418,7 +419,8 @@ if (qaUsrResp != null) { QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO(); - qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString()); + //qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString()); + qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime()); qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone()); qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString()); qaMonitoredUserDTO.setUserName(qaQueUsr.getFullname()); @@ -462,7 +464,8 @@ if (qaUsrResp != null) { QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO(); - qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString()); + //qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString()); + qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime()); qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone()); qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString()); @@ -517,7 +520,8 @@ { logger.debug("this is the user requested , include his name for learner progress."); QaMonitoredUserDTO qaMonitoredUserDTO = new QaMonitoredUserDTO(); - qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString()); + //qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime().toString()); + qaMonitoredUserDTO.setAttemptTime(qaUsrResp.getAttemptTime()); qaMonitoredUserDTO.setTimeZone(qaUsrResp.getTimezone()); qaMonitoredUserDTO.setUid(qaUsrResp.getResponseId().toString()); qaMonitoredUserDTO.setUserName(qaQueUsr.getFullname()); Index: lams_tool_laqa/web/export/exportportfolio.jsp =================================================================== diff -u -r57157cef4ee9b4d70e92be83584eb8d10bcea83c -r880e648324ff3833a40a78c5986d9cc70183c0fa --- lams_tool_laqa/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 57157cef4ee9b4d70e92be83584eb8d10bcea83c) +++ lams_tool_laqa/web/export/exportportfolio.jsp (.../exportportfolio.jsp) (revision 880e648324ff3833a40a78c5986d9cc70183c0fa) @@ -90,7 +90,7 @@ - + Index: lams_tool_laqa/web/learning/LearnerRep.jsp =================================================================== diff -u -rfb8def0d68dd0173cbf63822e7711caed05df2e2 -r880e648324ff3833a40a78c5986d9cc70183c0fa --- lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision fb8def0d68dd0173cbf63822e7711caed05df2e2) +++ lams_tool_laqa/web/learning/LearnerRep.jsp (.../LearnerRep.jsp) (revision 880e648324ff3833a40a78c5986d9cc70183c0fa) @@ -121,7 +121,7 @@ - + @@ -206,7 +206,7 @@ - + Index: lams_tool_laqa/web/monitoring/SummaryContent.jsp =================================================================== diff -u -r0e25eab07d7153c61f50deb6332abc0d4ed3ec69 -r880e648324ff3833a40a78c5986d9cc70183c0fa --- lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 0e25eab07d7153c61f50deb6332abc0d4ed3ec69) +++ lams_tool_laqa/web/monitoring/SummaryContent.jsp (.../SummaryContent.jsp) (revision 880e648324ff3833a40a78c5986d9cc70183c0fa) @@ -100,7 +100,7 @@ - + @@ -132,7 +132,7 @@ - + @@ -163,7 +163,7 @@ - + Index: lams_tool_laqa/web/monitoring/UserResponses.jsp =================================================================== diff -u -r0e25eab07d7153c61f50deb6332abc0d4ed3ec69 -r880e648324ff3833a40a78c5986d9cc70183c0fa --- lams_tool_laqa/web/monitoring/UserResponses.jsp (.../UserResponses.jsp) (revision 0e25eab07d7153c61f50deb6332abc0d4ed3ec69) +++ lams_tool_laqa/web/monitoring/UserResponses.jsp (.../UserResponses.jsp) (revision 880e648324ff3833a40a78c5986d9cc70183c0fa) @@ -24,7 +24,7 @@ - + @@ -56,7 +56,7 @@ - + @@ -87,7 +87,7 @@ - +