Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java =================================================================== diff -u -r2e74831fe18a4d0bf8a93c3a900851f98cfe3241 -r1d27fd72f4b362847b7b9778fdc6dcb4a869a078 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java (.../McMonitoredUserDTO.java) (revision 2e74831fe18a4d0bf8a93c3a900851f98cfe3241) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McMonitoredUserDTO.java (.../McMonitoredUserDTO.java) (revision 1d27fd72f4b362847b7b9778fdc6dcb4a869a078) @@ -20,18 +20,22 @@ */ package org.lamsfoundation.lams.tool.mc; -import java.util.List; +import java.util.Map; +import org.apache.commons.lang.builder.ToStringBuilder; + /** - *
DTO that holds monitored user data for jsp purposes + *
DTO that holds users attempt history data for jsp purposes *
* * @author Ozgur Demirtas */ -public class McMonitoredUserDTO +public class McMonitoredUserDTO implements Comparable { - private String uid; + private String queUsrId; + + private String uid; private String attemptTime; @@ -42,7 +46,50 @@ private String isCorrect; private String response; + + private Map usersAttempts; + /** + * @return Returns the queUsrId. + */ + public String getQueUsrId() { + return queUsrId; + } + /** + * @param queUsrId The queUsrId to set. + */ + public void setQueUsrId(String queUsrId) { + this.queUsrId = queUsrId; + } + + public String toString() { + return new ToStringBuilder(this) + .append("queUsrId and username", getQueUsrId() + " and " + getUserName()) + .toString(); + } + /** + * @return Returns the usersAttempts. + */ + public Map getUsersAttempts() { + return usersAttempts; + } + /** + * @param usersAttempts The usersAttempts to set. + */ + public void setUsersAttempts(Map usersAttempts) { + this.usersAttempts = usersAttempts; + } + + public int compareTo(Object o) + { + McMonitoredUserDTO mcMonitoredUserDTO = (McMonitoredUserDTO) o; + + if (mcMonitoredUserDTO == null) + return 1; + else + return (int) (new Long(queUsrId).longValue() - new Long(mcMonitoredUserDTO.queUsrId).longValue()); + } + /** * @return Returns the attemptTime. */ public String getAttemptTime() {