Index: lams_tool_lamc/build.xml =================================================================== diff -u -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/build.xml (.../build.xml) (revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c) +++ lams_tool_lamc/build.xml (.../build.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -296,7 +296,7 @@ - + @@ -417,8 +417,13 @@ - - + + + + + + + Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McOptionsContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McQueContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McQueUsr.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McSession.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/McUsrAttempt.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== diff -u -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -192,6 +192,16 @@ /> + + + + Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml =================================================================== diff -u --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (revision 0) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml =================================================================== diff -u -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -4,7 +4,13 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > + + @@ -41,34 +47,23 @@ length="5" > - + - - + + - - - - - - - - - - Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml =================================================================== diff -u -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -64,12 +64,13 @@ + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (.../McSession.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (.../McSession.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -26,7 +26,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
@@ -272,8 +193,8 @@ - + @@ -330,9 +251,9 @@
- +
- + @@ -347,7 +268,7 @@ - + @@ -360,15 +281,28 @@ - + - + + + + + + + + + + + + + + @@ -380,33 +314,26 @@ - - - - - - - - + - + - +
- +
- + @@ -421,7 +348,7 @@ - + @@ -434,28 +361,21 @@ - + - - - + + + + + + + + + - + - - - - - - - - - - - - - @@ -467,26 +387,33 @@ + + + + + + + - + - + - +
- +
- + @@ -501,19 +428,6 @@ - - - - - - - - - - - - - @@ -527,7 +441,7 @@ - + @@ -540,66 +454,40 @@ - + - - - - - - - - - + + + - + - - - - - - - + - + - + - - - - - - - - - - - - - -
- +
- + @@ -614,7 +502,7 @@ - + @@ -627,21 +515,27 @@ - + - - - - - - - - - + + - + + + + + + + + + + + + + + @@ -653,26 +547,19 @@ - - - - - - - - + - + - + Index: lams_tool_lamc/db/sql/create_lams_tool_lamc.sql =================================================================== diff -u -rd5c5282b3010b7ca8605cfa64012c5ecff95880e -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision d5c5282b3010b7ca8605cfa64012c5ecff95880e) +++ lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -24,40 +24,28 @@ , PRIMARY KEY (uid) )TYPE=InnoDB; -CREATE TABLE lams.tl_lamc11_session ( +CREATE TABLE lams.tl_lamc11_que_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT - , mc_session_id BIGINT(20) NOT NULL - , session_start_date DATETIME - , session_end_date DATETIME - , session_status VARCHAR(100) + , mc_que_content_id BIGINT(20) NOT NULL + , question VARCHAR(255) + , display_order INT(5) , mc_content_id BIGINT(20) NOT NULL , PRIMARY KEY (uid) , INDEX (mc_content_id) - , CONSTRAINT FK_tl_laqa11_session_1 FOREIGN KEY (mc_content_id) + , CONSTRAINT FK_tl_lamc11_que_content_1 FOREIGN KEY (mc_content_id) REFERENCES lams.tl_lamc11_content (uid) )TYPE=InnoDB; -CREATE TABLE lams.tl_lamc11_que_usr ( +CREATE TABLE lams.tl_lamc11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT - , que_usr_id BIGINT(20) NOT NULL - , username VARCHAR(100) , mc_session_id BIGINT(20) NOT NULL - , fullname VARCHAR(100) - , PRIMARY KEY (uid) - , INDEX (mc_session_id) - , CONSTRAINT FK_tl_laqa11_que_usr_1 FOREIGN KEY (mc_session_id) - REFERENCES lams.tl_lamc11_session (uid) -)TYPE=InnoDB; - -CREATE TABLE lams.tl_lamc11_que_content ( - uid BIGINT(20) NOT NULL AUTO_INCREMENT - , mc_que_content_id BIGINT(20) NOT NULL - , question VARCHAR(255) - , display_order INT(5) + , session_start_date DATETIME + , session_end_date DATETIME + , session_status VARCHAR(100) , mc_content_id BIGINT(20) NOT NULL , PRIMARY KEY (uid) , INDEX (mc_content_id) - , CONSTRAINT FK_tl_lamc11_que_content_1 FOREIGN KEY (mc_content_id) + , CONSTRAINT FK_tl_lamc_session_2 FOREIGN KEY (mc_content_id) REFERENCES lams.tl_lamc11_content (uid) )TYPE=InnoDB; @@ -73,23 +61,15 @@ REFERENCES lams.tl_lamc11_que_content (uid) )TYPE=InnoDB; -CREATE TABLE lams.tl_lamc11_usr_attempt ( +CREATE TABLE lams.tl_lamc11_tool_usr ( uid BIGINT(20) NOT NULL AUTO_INCREMENT - , attempt_id BIGINT(20) NOT NULL , que_usr_id BIGINT(20) NOT NULL - , mc_que_content_id BIGINT(20) NOT NULL - , mc_que_option_id BIGINT(20) NOT NULL - , attempt_time DATETIME - , time_zone VARCHAR(255) + , mc_session_id BIGINT(20) NOT NULL + , username VARCHAR(100) + , fullname VARCHAR(100) , PRIMARY KEY (uid) - , INDEX (que_usr_id) - , CONSTRAINT FK_tl_lamc11_usr_attempt_3 FOREIGN KEY (que_usr_id) - REFERENCES lams.tl_lamc11_que_usr (uid) - , INDEX (mc_que_content_id) - , CONSTRAINT FK_tl_lamc11_usr_attempt_5 FOREIGN KEY (mc_que_content_id) - REFERENCES lams.tl_lamc11_que_content (uid) - , INDEX (mc_que_option_id) - , CONSTRAINT FK_tl_lamc11_usr_attempt_4 FOREIGN KEY (mc_que_option_id) - REFERENCES lams.tl_lamc11_options_content (uid) + , INDEX (mc_session_id) + , CONSTRAINT FK_tl_lamc_tool_usr_1 FOREIGN KEY (mc_session_id) + REFERENCES lams.tl_lamc11_session (uid) )TYPE=InnoDB; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== diff -u -r44ebdc79af2b77d9f5ae22774c552279633f866a -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 44ebdc79af2b77d9f5ae22774c552279633f866a) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -237,7 +237,7 @@ lazy="false" inverse="true" cascade="all-delete-orphan" - sort="natural" + sort="unsorted" > + + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java =================================================================== diff -u -r44ebdc79af2b77d9f5ae22774c552279633f866a -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java (.../McContent.java) (revision 44ebdc79af2b77d9f5ae22774c552279633f866a) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java (.../McContent.java) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -2,8 +2,9 @@ import java.io.Serializable; import java.util.Date; +import java.util.HashSet; import java.util.Set; -import java.util.SortedSet; + import org.apache.commons.lang.builder.ToStringBuilder; @@ -67,18 +68,7 @@ /** nullable persistent field */ private boolean retries; - /** - * @return Returns the retries. - */ - public boolean isRetries() { - return retries; - } - /** - * @param retries The retries to set. - */ - public void setRetries(boolean retries) { - this.retries = retries; - } + /** nullable persistent field */ private Integer passMark; @@ -89,13 +79,13 @@ private boolean showTopUsers; /** persistent field */ - private SortedSet mcQueContents; + private Set mcQueContents; /** persistent field */ private Set mcSessions; /** full constructor */ - public McContent(Long mcContentId, String title, String instructions, boolean defineLater, boolean runOffline, String creationDate, Date updateDate, boolean questionsSequenced, boolean usernameVisible, String reportTitle, String monitoringReportTitle, long createdBy, boolean synchInMonitor, boolean contentInUse, String offlineInstructions, String onlineInstructions, String endLearningMessage, Integer passMark, boolean showFeedback, boolean retries, boolean showTopUsers, SortedSet mcQueContents, Set mcSessions) { + public McContent(Long mcContentId, String title, String instructions, boolean defineLater, boolean runOffline, String creationDate, Date updateDate, boolean questionsSequenced, boolean usernameVisible, String reportTitle, String monitoringReportTitle, long createdBy, boolean synchInMonitor, boolean contentInUse, String offlineInstructions, String onlineInstructions, String endLearningMessage, Integer passMark, boolean showFeedback, boolean retries, boolean showTopUsers, Set mcQueContents, Set mcSessions) { this.mcContentId = mcContentId; this.title = title; this.instructions = instructions; @@ -126,7 +116,7 @@ } /** minimal constructor */ - public McContent(Long mcContentId, SortedSet mcQueContents, Set mcSessions) { + public McContent(Long mcContentId, Set mcQueContents, Set mcSessions) { this.mcContentId = mcContentId; this.mcQueContents = mcQueContents; this.mcSessions = mcSessions; @@ -300,15 +290,21 @@ this.showTopUsers = showTopUsers; } - public SortedSet getMcQueContents() { + + public Set getMcQueContents() { + if (this.mcQueContents == null) + setMcQueContents(new HashSet()); return this.mcQueContents; } - public void setMcQueContents(SortedSet mcQueContents) { + + public void setMcQueContents(Set mcQueContents) { this.mcQueContents = mcQueContents; } public Set getMcSessions() { + if (this.mcSessions == null) + setMcSessions(new HashSet()); return this.mcSessions; } @@ -321,5 +317,18 @@ .append("uid", getUid()) .toString(); } + + /** + * @return Returns the retries. + */ + public boolean isRetries() { + return retries; + } + /** + * @param retries The retries to set. + */ + public void setRetries(boolean retries) { + this.retries = retries; + } } Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml =================================================================== diff -u --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (revision 0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java =================================================================== diff -u --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java (revision 0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -0,0 +1,120 @@ +package org.lamsfoundation.lams.tool.mc; + +import java.io.Serializable; +import java.util.HashSet; +import java.util.Set; + +import org.apache.commons.lang.builder.ToStringBuilder; + + +/** @author Hibernate CodeGenerator */ +public class McOptsContent implements Serializable { + + /** identifier field */ + private Long uid; + + private Long mcQueOptionId; + + /** nullable persistent field */ + private boolean correctOption; + + /** nullable persistent field */ + private String mcQueOptionText; + + /** persistent field */ + private org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent; + + /** persistent field */ + private Set mcUsrAttempts; + + + /** full constructor */ + public McOptsContent(Long mcQueOptionId, boolean correctOption, String mcQueOptionText, org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent) { + this.mcQueOptionId=mcQueOptionId; + this.correctOption = correctOption; + this.mcQueOptionText = mcQueOptionText; + this.mcQueContent = mcQueContent; + } + + public McOptsContent(Long mcQueOptionId, boolean correctOption, String mcQueOptionText, org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent, Set mcUsrAttempts) { + this.mcQueOptionId=mcQueOptionId; + this.correctOption = correctOption; + this.mcQueOptionText = mcQueOptionText; + this.mcQueContent = mcQueContent; + this.mcUsrAttempts=mcUsrAttempts; + } + + + /** default constructor */ + public McOptsContent() { + } + + public Long getUid() { + return this.uid; + } + + public void setUid(Long uid) { + this.uid = uid; + } + + + public boolean isCorrectOption() { + return this.correctOption; + } + + public void setCorrectOption(boolean correctOption) { + this.correctOption = correctOption; + } + + public String getMcQueOptionText() { + return this.mcQueOptionText; + } + + public void setMcQueOptionText(String mcQueOptionText) { + this.mcQueOptionText = mcQueOptionText; + } + + public org.lamsfoundation.lams.tool.mc.McQueContent getMcQueContent() { + return this.mcQueContent; + } + + public void setMcQueContent(org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent) { + this.mcQueContent = mcQueContent; + } + + + public String toString() { + return new ToStringBuilder(this) + .append("uid", getUid()) + .toString(); + } + + /** + * @return Returns the mcQueOptionId. + */ + public Long getMcQueOptionId() { + return mcQueOptionId; + } + /** + * @param mcQueOptionId The mcQueOptionId to set. + */ + public void setMcQueOptionId(Long mcQueOptionId) { + this.mcQueOptionId = mcQueOptionId; + } + /** + * @return Returns the mcUsrAttempts. + */ + + + public Set getMcUsrAttempts() { + if (this.mcUsrAttempts == null) + setMcUsrAttempts(new HashSet()); + return this.mcUsrAttempts; + } + /** + * @param mcUsrAttempts The mcUsrAttempts to set. + */ + public void setMcUsrAttempts(Set mcUsrAttempts) { + this.mcUsrAttempts = mcUsrAttempts; + } +} Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml =================================================================== diff -u -ra4a6e7505e6a9de8913dd1fe62a678d3c00dbf56 -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision a4a6e7505e6a9de8913dd1fe62a678d3c00dbf56) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -4,7 +4,13 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > + + - - - - - - + + - - - - - - - - - - Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java =================================================================== diff -u -r44ebdc79af2b77d9f5ae22774c552279633f866a -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java (.../McQueContent.java) (revision 44ebdc79af2b77d9f5ae22774c552279633f866a) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java (.../McQueContent.java) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -1,6 +1,7 @@ package org.lamsfoundation.lams.tool.mc; import java.io.Serializable; +import java.util.HashSet; import java.util.Set; import org.apache.commons.lang.builder.ToStringBuilder; @@ -23,23 +24,32 @@ /** persistent field */ private org.lamsfoundation.lams.tool.mc.McContent mcContent; - private Long mcContentId; - + /** persistent field */ private Set mcUsrAttempts; /** persistent field */ private Set mcOptionsContents; /** full constructor */ - public McQueContent(Long mcQueContentId, String question, Integer displayOrder, org.lamsfoundation.lams.tool.mc.McContent mcContent, Set mcUsrAttempts, Set mcOptionsContents) { + public McQueContent(Long mcQueContentId, String question, Integer displayOrder, McContent mcContent, Set mcUsrAttempts, Set mcOptionsContents) { this.mcQueContentId = mcQueContentId; this.question = question; this.displayOrder = displayOrder; - this.mcContent = mcContent; + this.mcContent=mcContent; this.mcUsrAttempts = mcUsrAttempts; this.mcOptionsContents = mcOptionsContents; } + + public McQueContent(Long mcQueContentId, String question, Integer displayOrder, Set mcUsrAttempts, Set mcOptionsContents) { + this.mcQueContentId = mcQueContentId; + this.question = question; + this.displayOrder = displayOrder; + this.mcUsrAttempts = mcUsrAttempts; + this.mcOptionsContents = mcOptionsContents; + } + + /** default constructor */ public McQueContent() { @@ -94,14 +104,20 @@ } public Set getMcUsrAttempts() { + if (this.mcUsrAttempts == null) + setMcUsrAttempts(new HashSet()); return this.mcUsrAttempts; } + public void setMcUsrAttempts(Set mcUsrAttempts) { this.mcUsrAttempts = mcUsrAttempts; } + public Set getMcOptionsContents() { + if (this.mcOptionsContents == null) + setMcOptionsContents(new HashSet()); return this.mcOptionsContents; } @@ -114,17 +130,5 @@ .append("uid", getUid()) .toString(); } - - /** - * @return Returns the mcContentId. - */ - public Long getMcContentId() { - return mcContentId; - } - /** - * @param mcContentId The mcContentId to set. - */ - public void setMcContentId(Long mcContentId) { - this.mcContentId = mcContentId; - } + } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml =================================================================== diff -u -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -64,12 +64,13 @@ + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java =================================================================== diff -u -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java (.../McQueUsr.java) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java (.../McQueUsr.java) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -1,7 +1,9 @@ package org.lamsfoundation.lams.tool.mc; import java.io.Serializable; -import java.util.SortedSet; +import java.util.HashSet; +import java.util.Set; + import org.apache.commons.lang.builder.ToStringBuilder; @@ -27,14 +29,13 @@ private org.lamsfoundation.lams.tool.mc.McSession mcSession; /** persistent field */ - private SortedSet mcUsrAttempts; + private Set mcUsrAttempts; /** full constructor */ - public McQueUsr(Long queUsrId, String username, String fullname, Long mcSessionId, org.lamsfoundation.lams.tool.mc.McSession mcSession, SortedSet mcUsrAttempts) { + public McQueUsr(Long queUsrId, String username, String fullname, org.lamsfoundation.lams.tool.mc.McSession mcSession, Set mcUsrAttempts) { this.queUsrId = queUsrId; this.username = username; this.fullname = fullname; - this.mcSessionId = mcSessionId; this.mcSession = mcSession; this.mcUsrAttempts = mcUsrAttempts; } @@ -44,7 +45,7 @@ } /** minimal constructor */ - public McQueUsr(Long queUsrId, SortedSet mcUsrAttempts) { + public McQueUsr(Long queUsrId, Set mcUsrAttempts) { this.queUsrId = queUsrId; this.mcUsrAttempts = mcUsrAttempts; } @@ -97,11 +98,14 @@ this.mcSession = mcSession; } - public SortedSet getMcUsrAttempts() { + public Set getMcUsrAttempts() { + if (this.mcUsrAttempts == null) + setMcUsrAttempts(new HashSet()); return this.mcUsrAttempts; } - - public void setMcUsrAttempts(SortedSet mcUsrAttempts) { + + + public void setMcUsrAttempts(Set mcUsrAttempts) { this.mcUsrAttempts = mcUsrAttempts; } Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (.../McSession.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (.../McSession.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -26,7 +26,7 @@ - /WEB-INF/McQueContent.hbm.xml /WEB-INF/McQueUsr.hbm.xml /WEB-INF/McUsrAttempt.hbm.xml - /WEB-INF/McOptionsContent.hbm.xml + /WEB-INF/McOptContent.hbm.xml Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/qa/QaContent.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== diff -u -r44ebdc79af2b77d9f5ae22774c552279633f866a -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 44ebdc79af2b77d9f5ae22774c552279633f866a) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -237,7 +237,7 @@ lazy="false" inverse="true" cascade="all-delete-orphan" - sort="natural" + sort="unsorted" > + + Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java =================================================================== diff -u -rca5b61179fb4a48b6d02a869fdcd515f0335ea3c -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java (.../McDataAccessTestCase.java) (revision ca5b61179fb4a48b6d02a869fdcd515f0335ea3c) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java (.../McDataAccessTestCase.java) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -2,6 +2,7 @@ import org.lamsfoundation.lams.test.AbstractLamsTestCase; import org.lamsfoundation.lams.tool.mc.dao.hibernate.McContentDAO; +import org.lamsfoundation.lams.tool.mc.dao.hibernate.McOptionsContentDAO; import org.lamsfoundation.lams.tool.mc.dao.hibernate.McQueContentDAO; import org.lamsfoundation.lams.tool.mc.dao.hibernate.McSessionDAO; import org.lamsfoundation.lams.tool.mc.dao.hibernate.McUserDAO; @@ -20,7 +21,13 @@ protected final Long TEST_SESSION_ID = new Long(20); protected final Long TEST_SESSION_ID_OTHER = new Long(21); + protected final Long TEST_QUE_ID1 = new Long(1); + protected final Long TEST_QUE_OPTION_ID1 = new Long(1); + protected final Long TEST_QUE_OPTION_ID2 = new Long(2); + protected final Long TEST_QUE_OPTION_ID3 = new Long(3); + protected final Long TEST_NEW_USER_ID = new Long(100); + protected final long ONE_DAY = 60 * 60 * 1000 * 24; public final String NOT_ATTEMPTED = "NOT_ATTEMPTED"; @@ -31,6 +38,7 @@ protected McSessionDAO mcSessionDAO; protected McUserDAO mcUserDAO; protected McQueContentDAO mcQueContentDAO; + protected McOptionsContentDAO mcOptionsContentDAO; protected McUsrAttemptDAO mcUsrAttemptDAO; @@ -50,6 +58,7 @@ mcSessionDAO = (McSessionDAO) this.context.getBean("mcSessionDAO"); mcUserDAO = (McUserDAO) this.context.getBean("mcUserDAO"); mcQueContentDAO = (McQueContentDAO) this.context.getBean("mcQueContentDAO"); + mcOptionsContentDAO =(McOptionsContentDAO) this.context.getBean("mcOptionsContentDAO"); mcUsrAttemptDAO = (McUsrAttemptDAO) this.context.getBean("mcUsrAttemptDAO"); } Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml =================================================================== diff -u --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (revision 0) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml =================================================================== diff -u -ra4a6e7505e6a9de8913dd1fe62a678d3c00dbf56 -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision a4a6e7505e6a9de8913dd1fe62a678d3c00dbf56) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -4,7 +4,13 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > + + - - - - - - + + - - - - - - - - - - Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml =================================================================== diff -u -rfdfde70a60685ba9b6aff901a9792542afd45fbb -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision fdfde70a60685ba9b6aff901a9792542afd45fbb) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -64,12 +64,13 @@ + Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml =================================================================== diff -u -rfdfde70a60685ba9b6aff901a9792542afd45fbb -r392ad1409cb86320a40ab332d496a4b527119951 --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (.../McSession.hbm.xml) (revision fdfde70a60685ba9b6aff901a9792542afd45fbb) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (.../McSession.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) @@ -26,7 +26,7 @@ - ${jdbc.password} + - /org/lamsfoundation/lams/tool/mc/McContent.hbm.xml - /org/lamsfoundation/lams/tool/mc/McSession.hbm.xml - /org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml - /org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml - /org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml + + /org/lamsfoundation/lams/tool/mc/McContent.hbm.xml + /org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml + /org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml + /org/lamsfoundation/lams/tool/mc/McSession.hbm.xml + /org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml @@ -61,6 +64,8 @@ + +