Index: lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java =================================================================== diff -u -r0d96122b75237f61d8280741601bc350953d6b90 -r6055275ce3f55b5d0f1ad4c4778f0316d9bd365f --- lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java (.../ToolSession.java) (revision 0d96122b75237f61d8280741601bc350953d6b90) +++ lams_common/src/java/org/lamsfoundation/lams/tool/ToolSession.java (.../ToolSession.java) (revision 6055275ce3f55b5d0f1ad4c4778f0316d9bd365f) @@ -20,6 +20,13 @@ public static final int GROUPED_TYPE = 1; /** Tool session type id for non-grouped */ public static final int NON_GROUPED_TYPE = 2; + + /** Tool session state id for not attempted */ + public static final int NON_ATTEMPTED_STATE = 1; + /** Tool session state id for attempted */ + public static final int ATTEMPTED_STATE = 2; + /** Tool session state id for completed */ + public static final int COMPLETED_STATE = 3; /** identifier field */ private Long toolSessionId; @@ -34,17 +41,17 @@ private Date createDateTime; /** persistent field */ - private org.lamsfoundation.lams.tool.ToolSessionState toolSessionState; + private int toolSessionStateId; private int toolSessionTypeId; /** full constructor */ - public ToolSession(Long toolSessionId, long activityId, long toolSessionKey, Date createDateTime, Group group, org.lamsfoundation.lams.tool.ToolSessionState toolSessionState, Set userToolSessions) { + public ToolSession(Long toolSessionId, long activityId, long toolSessionKey, Date createDateTime, Group group, int toolSessionStateId, Set userToolSessions) { this.toolSessionId = toolSessionId; this.activityId = activityId; this.toolSessionKey = toolSessionKey; this.createDateTime = createDateTime; - this.toolSessionState = toolSessionState; + this.toolSessionStateId = toolSessionStateId; } /** default constructor */ @@ -117,12 +124,12 @@ * @hibernate.column name="tool_session_state_id" * */ - public org.lamsfoundation.lams.tool.ToolSessionState getToolSessionState() { - return this.toolSessionState; + public int getToolSessionStateId() { + return this.toolSessionStateId; } - public void setToolSessionState(org.lamsfoundation.lams.tool.ToolSessionState toolSessionState) { - this.toolSessionState = toolSessionState; + public void setToolSessionStateId(int toolSessionStateId) { + this.toolSessionStateId = toolSessionStateId; } public String toString() { Fisheye: Tag 6055275ce3f55b5d0f1ad4c4778f0316d9bd365f refers to a dead (removed) revision in file `lams_common/src/java/org/lamsfoundation/lams/tool/ToolSessionState.java'. Fisheye: No comparison available. Pass `N' to diff?