Index: lams_tool_lamc/conf/hibernate/mappings/McContent.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/conf/hibernate/mappings/McContent.hbm.xml (.../McContent.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/conf/hibernate/mappings/McContent.hbm.xml (.../McContent.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -152,17 +152,15 @@ /> - - - + + + + + + + + - - - - @hibernate.class - table="tl_lamc11_options_content" - - - - @hibernate.id - generator-class="assigned" - type="java.lang.Long" - column="uid" - - - - + - - @hibernate.property - column="qa_que_option_id" - length="20" - not-null="true" - - - - @hibernate.property + + - + /> + - - @hibernate.property - column="qa_que_option_text" - length="250" - - + - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="qa_que_content_id" - - + - + + - - @hibernate.set - lazy="true" - inverse="true" - cascade="none" - - @hibernate.collection-key - column="qa_que_option_id" - - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.tool.mc.TlLamc11UsrAttempt" - - + Index: lams_tool_lamc/conf/hibernate/mappings/McQueContent.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/conf/hibernate/mappings/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/conf/hibernate/mappings/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -4,13 +4,7 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > - - - - - - - - - - + Index: lams_tool_lamc/conf/hibernate/mappings/McQueUsr.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/conf/hibernate/mappings/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/conf/hibernate/mappings/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -63,5 +63,23 @@ + + + + + + + + Index: lams_tool_lamc/conf/hibernate/mappings/McUsrAttempt.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/conf/hibernate/mappings/McUsrAttempt.hbm.xml (.../McUsrAttempt.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/conf/hibernate/mappings/McUsrAttempt.hbm.xml (.../McUsrAttempt.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -4,117 +4,66 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > - - - - @hibernate.class - table="tl_lamc11_usr_attempt" - - - - @hibernate.id - generator-class="assigned" - type="java.lang.Long" - column="uid" - - - - + - - @hibernate.property - column="attempt_id" - length="20" - not-null="true" - + - - @hibernate.property - column="attempt_time" - length="19" - + - - @hibernate.property - column="time_zone" - length="255" - - - - - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="qa_que_content_id" - - + - + - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="que_usr_id" - - + - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="qa_que_option_id" - - + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -152,17 +152,15 @@ /> - - - + + + + + + + + - - - - @hibernate.class - table="tl_lamc11_options_content" - - - - @hibernate.id - generator-class="assigned" - type="java.lang.Long" - column="uid" - - - - + - - @hibernate.property - column="qa_que_option_id" - length="20" - not-null="true" - - - - @hibernate.property + + - + /> + - - @hibernate.property - column="qa_que_option_text" - length="250" - - + - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="qa_que_content_id" - - + - + + - - @hibernate.set - lazy="true" - inverse="true" - cascade="none" - - @hibernate.collection-key - column="qa_que_option_id" - - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.tool.mc.TlLamc11UsrAttempt" - - + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -4,13 +4,7 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > - - - - - - - - - - + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml =================================================================== diff -u -r19d6ab09baf339ddaf00248008f994d2a38f1079 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -63,5 +63,23 @@ + + + + + + + + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml =================================================================== diff -u -r19d6ab09baf339ddaf00248008f994d2a38f1079 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml (.../McUsrAttempt.hbm.xml) (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml (.../McUsrAttempt.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -4,117 +4,66 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > - - - - @hibernate.class - table="tl_lamc11_usr_attempt" - - - - @hibernate.id - generator-class="assigned" - type="java.lang.Long" - column="uid" - - - - + - - @hibernate.property - column="attempt_id" - length="20" - not-null="true" - + - - @hibernate.property - column="attempt_time" - length="19" - + - - @hibernate.property - column="time_zone" - length="255" - - - - - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="qa_que_content_id" - - + - + - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="que_usr_id" - - + - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="qa_que_option_id" - - + Fisheye: Tag 2e8a19211f0b02defbb3623251f97f89ee1c7fc9 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/oldMcContent.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_lamc/conf/middlegen/lams_tool_lamc11-prefs.properties =================================================================== diff -u -r19d6ab09baf339ddaf00248008f994d2a38f1079 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/conf/middlegen/lams_tool_lamc11-prefs.properties (.../lams_tool_lamc11-prefs.properties) (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) +++ lams_tool_lamc/conf/middlegen/lams_tool_lamc11-prefs.properties (.../lams_tool_lamc11-prefs.properties) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -12,6 +12,8 @@ hibernate.tables.tl_lamc11_content.columns.end_learning_message.java-type=java.lang.String hibernate.tables.tl_lamc11_content.columns.instructions.java-name=instructions hibernate.tables.tl_lamc11_content.columns.instructions.java-type=java.lang.String +hibernate.tables.tl_lamc11_content.columns.mc_content_id.java-name=mcContentId +hibernate.tables.tl_lamc11_content.columns.mc_content_id.java-type=long hibernate.tables.tl_lamc11_content.columns.monitoring_report_title.java-name=monitoringReportTitle hibernate.tables.tl_lamc11_content.columns.monitoring_report_title.java-type=java.lang.String hibernate.tables.tl_lamc11_content.columns.offline_instructions.java-name=offlineInstructions @@ -45,6 +47,12 @@ hibernate.tables.tl_lamc11_options_content.base-class-name=TlLamc11OptionsContent hibernate.tables.tl_lamc11_options_content.columns.correct_option.java-name=correctOption hibernate.tables.tl_lamc11_options_content.columns.correct_option.java-type=byte +hibernate.tables.tl_lamc11_options_content.columns.mc_que_content_id.java-name=mcQueContentId +hibernate.tables.tl_lamc11_options_content.columns.mc_que_content_id.java-type=long +hibernate.tables.tl_lamc11_options_content.columns.mc_que_option_id.java-name=mcQueOptionId +hibernate.tables.tl_lamc11_options_content.columns.mc_que_option_id.java-type=long +hibernate.tables.tl_lamc11_options_content.columns.mc_que_option_text.java-name=mcQueOptionText +hibernate.tables.tl_lamc11_options_content.columns.mc_que_option_text.java-type=java.lang.String hibernate.tables.tl_lamc11_options_content.columns.qa_que_content_id.java-name=qaQueContentId hibernate.tables.tl_lamc11_options_content.columns.qa_que_content_id.java-type=long hibernate.tables.tl_lamc11_options_content.columns.qa_que_option_id.java-name=qaQueOptionId @@ -53,9 +61,14 @@ hibernate.tables.tl_lamc11_options_content.columns.qa_que_option_text.java-type=java.lang.String hibernate.tables.tl_lamc11_options_content.columns.uid.java-name=uid hibernate.tables.tl_lamc11_options_content.columns.uid.java-type=java.lang.Long +hibernate.tables.tl_lamc11_options_content.keygenerator=native hibernate.tables.tl_lamc11_que_content.base-class-name=TlLamc11QueContent hibernate.tables.tl_lamc11_que_content.columns.display_order.java-name=displayOrder hibernate.tables.tl_lamc11_que_content.columns.display_order.java-type=java.lang.Integer +hibernate.tables.tl_lamc11_que_content.columns.mc_content_id.java-name=mcContentId +hibernate.tables.tl_lamc11_que_content.columns.mc_content_id.java-type=long +hibernate.tables.tl_lamc11_que_content.columns.mc_que_content_id.java-name=mcQueContentId +hibernate.tables.tl_lamc11_que_content.columns.mc_que_content_id.java-type=long hibernate.tables.tl_lamc11_que_content.columns.qa_content_id.java-name=qaContentId hibernate.tables.tl_lamc11_que_content.columns.qa_content_id.java-type=long hibernate.tables.tl_lamc11_que_content.columns.qa_que_content_id.java-name=qaQueContentId @@ -64,9 +77,12 @@ hibernate.tables.tl_lamc11_que_content.columns.question.java-type=java.lang.String hibernate.tables.tl_lamc11_que_content.columns.uid.java-name=uid hibernate.tables.tl_lamc11_que_content.columns.uid.java-type=java.lang.Long +hibernate.tables.tl_lamc11_que_content.keygenerator=assigned hibernate.tables.tl_lamc11_que_usr.base-class-name=TlLamc11QueUsr hibernate.tables.tl_lamc11_que_usr.columns.fullname.java-name=fullname hibernate.tables.tl_lamc11_que_usr.columns.fullname.java-type=java.lang.String +hibernate.tables.tl_lamc11_que_usr.columns.mc_session_id.java-name=mcSessionId +hibernate.tables.tl_lamc11_que_usr.columns.mc_session_id.java-type=long hibernate.tables.tl_lamc11_que_usr.columns.qa_session_id.java-name=qaSessionId hibernate.tables.tl_lamc11_que_usr.columns.qa_session_id.java-type=long hibernate.tables.tl_lamc11_que_usr.columns.que_usr_id.java-name=queUsrId @@ -76,6 +92,10 @@ hibernate.tables.tl_lamc11_que_usr.columns.username.java-name=username hibernate.tables.tl_lamc11_que_usr.columns.username.java-type=java.lang.String hibernate.tables.tl_lamc11_session.base-class-name=TlLamc11Session +hibernate.tables.tl_lamc11_session.columns.mc_content_id.java-name=mcContentId +hibernate.tables.tl_lamc11_session.columns.mc_content_id.java-type=long +hibernate.tables.tl_lamc11_session.columns.mc_session_id.java-name=mcSessionId +hibernate.tables.tl_lamc11_session.columns.mc_session_id.java-type=long hibernate.tables.tl_lamc11_session.columns.qa_content_id.java-name=qaContentId hibernate.tables.tl_lamc11_session.columns.qa_content_id.java-type=long hibernate.tables.tl_lamc11_session.columns.qa_session_id.java-name=qaSessionId @@ -91,10 +111,15 @@ hibernate.tables.tl_lamc11_session.columns.uid.java-name=uid hibernate.tables.tl_lamc11_session.columns.uid.java-type=java.lang.Long hibernate.tables.tl_lamc11_usr_attempt.base-class-name=TlLamc11UsrAttempt +hibernate.tables.tl_lamc11_usr_attempt.columns.attempt_id.columnspecialty=property hibernate.tables.tl_lamc11_usr_attempt.columns.attempt_id.java-name=attemptId hibernate.tables.tl_lamc11_usr_attempt.columns.attempt_id.java-type=long hibernate.tables.tl_lamc11_usr_attempt.columns.attempt_time.java-name=attemptTime hibernate.tables.tl_lamc11_usr_attempt.columns.attempt_time.java-type=java.sql.Timestamp +hibernate.tables.tl_lamc11_usr_attempt.columns.mc_que_content_id.java-name=mcQueContentId +hibernate.tables.tl_lamc11_usr_attempt.columns.mc_que_content_id.java-type=long +hibernate.tables.tl_lamc11_usr_attempt.columns.mc_que_option_id.java-name=mcQueOptionId +hibernate.tables.tl_lamc11_usr_attempt.columns.mc_que_option_id.java-type=long hibernate.tables.tl_lamc11_usr_attempt.columns.qa_que_content_id.java-name=qaQueContentId hibernate.tables.tl_lamc11_usr_attempt.columns.qa_que_content_id.java-type=long hibernate.tables.tl_lamc11_usr_attempt.columns.qa_que_option_id.java-name=qaQueOptionId @@ -137,8 +162,8 @@ tables.tl_lamc11_content.y=50 tables.tl_lamc11_options_content.x=110 tables.tl_lamc11_options_content.y=110 -tables.tl_lamc11_que_content.x=70 -tables.tl_lamc11_que_content.y=70 +tables.tl_lamc11_que_content.x=69 +tables.tl_lamc11_que_content.y=69 tables.tl_lamc11_que_usr.x=90 tables.tl_lamc11_que_usr.y=90 tables.tl_lamc11_session.x=10 Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (.../McContent.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -152,17 +152,15 @@ /> - - - + + + + + + + + - - - - @hibernate.class - table="tl_lamc11_options_content" - - - - @hibernate.id - generator-class="assigned" - type="java.lang.Long" - column="uid" - - - - + - - @hibernate.property - column="qa_que_option_id" - length="20" - not-null="true" - - - - @hibernate.property + + - + /> + - - @hibernate.property - column="qa_que_option_text" - length="250" - - + - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="qa_que_content_id" - - + - + + - - @hibernate.set - lazy="true" - inverse="true" - cascade="none" - - @hibernate.collection-key - column="qa_que_option_id" - - @hibernate.collection-one-to-many - class="org.lamsfoundation.lams.tool.mc.TlLamc11UsrAttempt" - - + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.java =================================================================== diff -u --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.java (revision 0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptionsContent.java (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -0,0 +1,103 @@ +package org.lamsfoundation.lams.tool.mc; + +import java.io.Serializable; +import java.util.Set; +import org.apache.commons.lang.builder.ToStringBuilder; + + +/** @author Hibernate CodeGenerator */ +public class McOptionsContent implements Serializable { + + /** identifier field */ + private Long uid; + + /** persistent field */ + 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 McOptionsContent(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 McOptionsContent() { + } + + /** minimal constructor */ + public McOptionsContent(Long mcQueOptionId, org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent, Set mcUsrAttempts) { + this.mcQueOptionId = mcQueOptionId; + this.mcQueContent = mcQueContent; + this.mcUsrAttempts = mcUsrAttempts; + } + + public Long getUid() { + return this.uid; + } + + public void setUid(Long uid) { + this.uid = uid; + } + + public Long getMcQueOptionId() { + return this.mcQueOptionId; + } + + public void setMcQueOptionId(Long mcQueOptionId) { + this.mcQueOptionId = mcQueOptionId; + } + + 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 Set getMcUsrAttempts() { + return this.mcUsrAttempts; + } + + public void setMcUsrAttempts(Set mcUsrAttempts) { + this.mcUsrAttempts = mcUsrAttempts; + } + + public String toString() { + return new ToStringBuilder(this) + .append("uid", getUid()) + .toString(); + } + +} Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -4,13 +4,7 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > - - - - - - - - - - + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java (.../McQueContent.java) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java (.../McQueContent.java) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -1,6 +1,7 @@ package org.lamsfoundation.lams.tool.mc; import java.io.Serializable; +import java.util.Set; import org.apache.commons.lang.builder.ToStringBuilder; @@ -22,22 +23,32 @@ /** persistent field */ private org.lamsfoundation.lams.tool.mc.McContent mcContent; + /** persistent field */ + private Set mcUsrAttempts; + + /** persistent field */ + private Set mcOptionsContents; + /** full constructor */ - public McQueContent(Long qaQueContentId, String question, Integer displayOrder, org.lamsfoundation.lams.tool.mc.McContent mcContent) { + public McQueContent(Long qaQueContentId, String question, Integer displayOrder, org.lamsfoundation.lams.tool.mc.McContent mcContent, Set mcUsrAttempts, Set mcOptionsContents) { this.qaQueContentId = qaQueContentId; this.question = question; this.displayOrder = displayOrder; this.mcContent = mcContent; + this.mcUsrAttempts = mcUsrAttempts; + this.mcOptionsContents = mcOptionsContents; } /** default constructor */ public McQueContent() { } /** minimal constructor */ - public McQueContent(Long qaQueContentId, org.lamsfoundation.lams.tool.mc.McContent mcContent) { + public McQueContent(Long qaQueContentId, org.lamsfoundation.lams.tool.mc.McContent mcContent, Set mcUsrAttempts, Set mcOptionsContents) { this.qaQueContentId = qaQueContentId; this.mcContent = mcContent; + this.mcUsrAttempts = mcUsrAttempts; + this.mcOptionsContents = mcOptionsContents; } public Long getUid() { @@ -80,6 +91,22 @@ this.mcContent = mcContent; } + public Set getMcUsrAttempts() { + return this.mcUsrAttempts; + } + + public void setMcUsrAttempts(Set mcUsrAttempts) { + this.mcUsrAttempts = mcUsrAttempts; + } + + public Set getMcOptionsContents() { + return this.mcOptionsContents; + } + + public void setMcOptionsContents(Set mcOptionsContents) { + this.mcOptionsContents = mcOptionsContents; + } + public String toString() { return new ToStringBuilder(this) .append("uid", getUid()) Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -63,5 +63,23 @@ + + + + + + + + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java =================================================================== diff -u -r19d6ab09baf339ddaf00248008f994d2a38f1079 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java (.../McQueUsr.java) (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java (.../McQueUsr.java) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -1,6 +1,7 @@ package org.lamsfoundation.lams.tool.mc; import java.io.Serializable; +import java.util.SortedSet; import org.apache.commons.lang.builder.ToStringBuilder; @@ -25,22 +26,27 @@ /** nullable persistent field */ private org.lamsfoundation.lams.tool.mc.McSession mcSession; + /** persistent field */ + private SortedSet mcUsrAttempts; + /** full constructor */ - public McQueUsr(Long queUsrId, String username, String fullname, Long mcSessionId, org.lamsfoundation.lams.tool.mc.McSession mcSession) { + public McQueUsr(Long queUsrId, String username, String fullname, Long mcSessionId, org.lamsfoundation.lams.tool.mc.McSession mcSession, SortedSet mcUsrAttempts) { this.queUsrId = queUsrId; this.username = username; this.fullname = fullname; this.mcSessionId = mcSessionId; this.mcSession = mcSession; + this.mcUsrAttempts = mcUsrAttempts; } /** default constructor */ public McQueUsr() { } /** minimal constructor */ - public McQueUsr(Long queUsrId) { + public McQueUsr(Long queUsrId, SortedSet mcUsrAttempts) { this.queUsrId = queUsrId; + this.mcUsrAttempts = mcUsrAttempts; } public Long getUid() { @@ -91,6 +97,14 @@ this.mcSession = mcSession; } + public SortedSet getMcUsrAttempts() { + return this.mcUsrAttempts; + } + + public void setMcUsrAttempts(SortedSet mcUsrAttempts) { + this.mcUsrAttempts = mcUsrAttempts; + } + public String toString() { return new ToStringBuilder(this) .append("uid", getUid()) Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml (.../McUsrAttempt.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml (.../McUsrAttempt.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -4,117 +4,66 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > - - - - @hibernate.class - table="tl_lamc11_usr_attempt" - - - - @hibernate.id - generator-class="assigned" - type="java.lang.Long" - column="uid" - - - - + - - @hibernate.property - column="attempt_id" - length="20" - not-null="true" - + - - @hibernate.property - column="attempt_time" - length="19" - + - - @hibernate.property - column="time_zone" - length="255" - - - - - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="qa_que_content_id" - - + - + - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="que_usr_id" - - + - - @hibernate.many-to-one - not-null="true" - @hibernate.column name="qa_que_option_id" - - + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.java =================================================================== diff -u --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.java (revision 0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.java (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -0,0 +1,116 @@ +package org.lamsfoundation.lams.tool.mc; + +import java.io.Serializable; +import java.util.Date; +import org.apache.commons.lang.builder.ToStringBuilder; + + +/** @author Hibernate CodeGenerator */ +public class McUsrAttempt implements Serializable { + + /** identifier field */ + private Long uid; + + /** persistent field */ + private Long attemptId; + + /** nullable persistent field */ + private Date attemptTime; + + /** nullable persistent field */ + private String timeZone; + + /** persistent field */ + private org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent; + + /** persistent field */ + private org.lamsfoundation.lams.tool.mc.McQueUsr mcQueUsr; + + /** persistent field */ + private org.lamsfoundation.lams.tool.mc.McOptionsContent mcOptionsContent; + + /** full constructor */ + public McUsrAttempt(Long attemptId, Date attemptTime, String timeZone, org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent, org.lamsfoundation.lams.tool.mc.McQueUsr mcQueUsr, org.lamsfoundation.lams.tool.mc.McOptionsContent mcOptionsContent) { + this.attemptId = attemptId; + this.attemptTime = attemptTime; + this.timeZone = timeZone; + this.mcQueContent = mcQueContent; + this.mcQueUsr = mcQueUsr; + this.mcOptionsContent = mcOptionsContent; + } + + /** default constructor */ + public McUsrAttempt() { + } + + /** minimal constructor */ + public McUsrAttempt(Long attemptId, org.lamsfoundation.lams.tool.mc.McQueContent mcQueContent, org.lamsfoundation.lams.tool.mc.McQueUsr mcQueUsr, org.lamsfoundation.lams.tool.mc.McOptionsContent mcOptionsContent) { + this.attemptId = attemptId; + this.mcQueContent = mcQueContent; + this.mcQueUsr = mcQueUsr; + this.mcOptionsContent = mcOptionsContent; + } + + public Long getUid() { + return this.uid; + } + + public void setUid(Long uid) { + this.uid = uid; + } + + public Long getAttemptId() { + return this.attemptId; + } + + public void setAttemptId(Long attemptId) { + this.attemptId = attemptId; + } + + public Date getAttemptTime() { + return this.attemptTime; + } + + public void setAttemptTime(Date attemptTime) { + this.attemptTime = attemptTime; + } + + public String getTimeZone() { + return this.timeZone; + } + + public void setTimeZone(String timeZone) { + this.timeZone = timeZone; + } + + 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 org.lamsfoundation.lams.tool.mc.McQueUsr getMcQueUsr() { + return this.mcQueUsr; + } + + public void setMcQueUsr(org.lamsfoundation.lams.tool.mc.McQueUsr mcQueUsr) { + this.mcQueUsr = mcQueUsr; + } + + public org.lamsfoundation.lams.tool.mc.McOptionsContent getMcOptionsContent() { + return this.mcOptionsContent; + } + + public void setMcOptionsContent(org.lamsfoundation.lams.tool.mc.McOptionsContent mcOptionsContent) { + this.mcOptionsContent = mcOptionsContent; + } + + public String toString() { + return new ToStringBuilder(this) + .append("uid", getUid()) + .toString(); + } + +} Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -21,6 +21,8 @@ /WEB-INF/McSession.hbm.xml /WEB-INF/McQueContent.hbm.xml /WEB-INF/McQueUsr.hbm.xml + /WEB-INF/McUsrAttempt.hbm.xml + /WEB-INF/McOptionsContent.hbm.xml Index: lams_tool_lamc/web/WEB-INF/McContent.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/web/WEB-INF/McContent.hbm.xml (.../McContent.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/web/WEB-INF/McContent.hbm.xml (.../McContent.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -152,17 +152,15 @@ /> - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_lamc/web/WEB-INF/McQueContent.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/web/WEB-INF/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/web/WEB-INF/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -4,13 +4,7 @@ "http://hibernate.sourceforge.net/hibernate-mapping-2.0.dtd" > - - - - - - - - - - + Index: lams_tool_lamc/web/WEB-INF/McQueUsr.hbm.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/web/WEB-INF/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/web/WEB-INF/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -63,5 +63,23 @@ + + + + + + + + Index: lams_tool_lamc/web/WEB-INF/McUsrAttempt.hbm.xml =================================================================== diff -u --- lams_tool_lamc/web/WEB-INF/McUsrAttempt.hbm.xml (revision 0) +++ lams_tool_lamc/web/WEB-INF/McUsrAttempt.hbm.xml (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -0,0 +1,70 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_lamc/web/WEB-INF/mcApplicationContext.xml =================================================================== diff -u -r48c973dcec3754f35dce1f2468a5739067b47179 -r2e8a19211f0b02defbb3623251f97f89ee1c7fc9 --- lams_tool_lamc/web/WEB-INF/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision 48c973dcec3754f35dce1f2468a5739067b47179) +++ lams_tool_lamc/web/WEB-INF/mcApplicationContext.xml (.../mcApplicationContext.xml) (revision 2e8a19211f0b02defbb3623251f97f89ee1c7fc9) @@ -21,6 +21,8 @@ /WEB-INF/McSession.hbm.xml /WEB-INF/McQueContent.hbm.xml /WEB-INF/McQueUsr.hbm.xml + /WEB-INF/McUsrAttempt.hbm.xml + /WEB-INF/McOptionsContent.hbm.xml