Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml =================================================================== diff -u --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (revision 0) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -0,0 +1,252 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml =================================================================== diff -u --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml (revision 0) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptionsContent.hbm.xml (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -0,0 +1,123 @@ + + + + + + + + + @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 + column="correct_option" + length="1" + not-null="true" + + + + + @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 --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (revision 0) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -0,0 +1,147 @@ + + + + + + + + + @hibernate.class + table="tl_lamc11_que_content" + + + + + @hibernate.id + generator-class="assigned" + type="java.lang.Long" + column="uid" + + + + + + + + + @hibernate.property + column="qa_que_content_id" + length="20" + not-null="true" + + + + + @hibernate.property + column="question" + length="255" + + + + + @hibernate.property + column="display_order" + length="5" + + + + + + + + + @hibernate.many-to-one + not-null="true" + @hibernate.column name="qa_content_id" + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="qa_que_content_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.tool.mc.TlLamc11UsrAttempt" + + + + + + + + + + @hibernate.set + lazy="true" + inverse="true" + cascade="none" + + @hibernate.collection-key + column="qa_que_content_id" + + @hibernate.collection-one-to-many + class="org.lamsfoundation.lams.tool.mc.TlLamc11OptionsContent" + + + + + + + + + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml =================================================================== diff -u --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (revision 0) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -0,0 +1,67 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml =================================================================== diff -u --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (revision 0) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -0,0 +1,100 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml =================================================================== diff -u --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml (revision 0) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -0,0 +1,121 @@ + + + + + + + + + @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/middlegen/lams_tool_lamc11-prefs.properties =================================================================== diff -u --- lams_tool_lamc/conf/middlegen/lams_tool_lamc11-prefs.properties (revision 0) +++ lams_tool_lamc/conf/middlegen/lams_tool_lamc11-prefs.properties (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -0,0 +1,147 @@ +# Middlegen Preferences +hibernate.tables.tl_lamc11_content.base-class-name=TlLamc11Content +hibernate.tables.tl_lamc11_content.columns.content_in_use.java-name=contentInUse +hibernate.tables.tl_lamc11_content.columns.content_in_use.java-type=byte +hibernate.tables.tl_lamc11_content.columns.created_by.java-name=createdBy +hibernate.tables.tl_lamc11_content.columns.created_by.java-type=long +hibernate.tables.tl_lamc11_content.columns.creation_date.java-name=creationDate +hibernate.tables.tl_lamc11_content.columns.creation_date.java-type=java.lang.String +hibernate.tables.tl_lamc11_content.columns.define_later.java-name=defineLater +hibernate.tables.tl_lamc11_content.columns.define_later.java-type=byte +hibernate.tables.tl_lamc11_content.columns.end_learning_message.java-name=endLearningMessage +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.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 +hibernate.tables.tl_lamc11_content.columns.offline_instructions.java-type=java.lang.String +hibernate.tables.tl_lamc11_content.columns.online_instructions.java-name=onlineInstructions +hibernate.tables.tl_lamc11_content.columns.online_instructions.java-type=java.lang.String +hibernate.tables.tl_lamc11_content.columns.pass_mark.java-name=passMark +hibernate.tables.tl_lamc11_content.columns.pass_mark.java-type=java.lang.Integer +hibernate.tables.tl_lamc11_content.columns.qa_content_id.java-name=qaContentId +hibernate.tables.tl_lamc11_content.columns.qa_content_id.java-type=long +hibernate.tables.tl_lamc11_content.columns.questions_sequenced.java-name=questionsSequenced +hibernate.tables.tl_lamc11_content.columns.questions_sequenced.java-type=byte +hibernate.tables.tl_lamc11_content.columns.report_title.java-name=reportTitle +hibernate.tables.tl_lamc11_content.columns.report_title.java-type=java.lang.String +hibernate.tables.tl_lamc11_content.columns.run_offline.java-name=runOffline +hibernate.tables.tl_lamc11_content.columns.run_offline.java-type=byte +hibernate.tables.tl_lamc11_content.columns.show_feedback.java-name=showFeedback +hibernate.tables.tl_lamc11_content.columns.show_feedback.java-type=byte +hibernate.tables.tl_lamc11_content.columns.show_top_users.java-name=showTopUsers +hibernate.tables.tl_lamc11_content.columns.show_top_users.java-type=byte +hibernate.tables.tl_lamc11_content.columns.synch_in_monitor.java-name=synchInMonitor +hibernate.tables.tl_lamc11_content.columns.synch_in_monitor.java-type=byte +hibernate.tables.tl_lamc11_content.columns.title.java-name=title +hibernate.tables.tl_lamc11_content.columns.title.java-type=java.lang.String +hibernate.tables.tl_lamc11_content.columns.uid.java-name=uid +hibernate.tables.tl_lamc11_content.columns.uid.java-type=java.lang.Long +hibernate.tables.tl_lamc11_content.columns.update_date.java-name=updateDate +hibernate.tables.tl_lamc11_content.columns.update_date.java-type=java.sql.Timestamp +hibernate.tables.tl_lamc11_content.columns.username_visible.java-name=usernameVisible +hibernate.tables.tl_lamc11_content.columns.username_visible.java-type=byte +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.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 +hibernate.tables.tl_lamc11_options_content.columns.qa_que_option_id.java-type=long +hibernate.tables.tl_lamc11_options_content.columns.qa_que_option_text.java-name=qaQueOptionText +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_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.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 +hibernate.tables.tl_lamc11_que_content.columns.qa_que_content_id.java-type=long +hibernate.tables.tl_lamc11_que_content.columns.question.java-name=question +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_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.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 +hibernate.tables.tl_lamc11_que_usr.columns.que_usr_id.java-type=long +hibernate.tables.tl_lamc11_que_usr.columns.uid.java-name=uid +hibernate.tables.tl_lamc11_que_usr.columns.uid.java-type=java.lang.Long +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.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 +hibernate.tables.tl_lamc11_session.columns.qa_session_id.java-type=long +hibernate.tables.tl_lamc11_session.columns.session_end_date.columnspecialty=property +hibernate.tables.tl_lamc11_session.columns.session_end_date.java-name=sessionEndDate +hibernate.tables.tl_lamc11_session.columns.session_end_date.java-type=java.sql.Timestamp +hibernate.tables.tl_lamc11_session.columns.session_start_date.java-name=sessionStartDate +hibernate.tables.tl_lamc11_session.columns.session_start_date.java-type=java.sql.Timestamp +hibernate.tables.tl_lamc11_session.columns.session_status.java-name=sessionStatus +hibernate.tables.tl_lamc11_session.columns.session_status.java-type=java.lang.String +hibernate.tables.tl_lamc11_session.columns.uid.columnspecialty=key +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.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.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 +hibernate.tables.tl_lamc11_usr_attempt.columns.qa_que_option_id.java-type=long +hibernate.tables.tl_lamc11_usr_attempt.columns.que_usr_id.java-name=queUsrId +hibernate.tables.tl_lamc11_usr_attempt.columns.que_usr_id.java-type=long +hibernate.tables.tl_lamc11_usr_attempt.columns.time_zone.java-name=timeZone +hibernate.tables.tl_lamc11_usr_attempt.columns.time_zone.java-type=java.lang.String +hibernate.tables.tl_lamc11_usr_attempt.columns.uid.java-name=uid +hibernate.tables.tl_lamc11_usr_attempt.columns.uid.java-type=java.lang.Long +relations.tl_lamc11_content-tl_lamc11_que_content.tl_lamc11_content-has-tl_lamc11_que_content.enabled=true +relations.tl_lamc11_content-tl_lamc11_que_content.tl_lamc11_content-has-tl_lamc11_que_content.target-many=true +relations.tl_lamc11_content-tl_lamc11_que_content.tl_lamc11_que_content-has-tl_lamc11_content.enabled=true +relations.tl_lamc11_content-tl_lamc11_que_content.tl_lamc11_que_content-has-tl_lamc11_content.target-many=false +relations.tl_lamc11_content-tl_lamc11_session.tl_lamc11_content-has-tl_lamc11_session.enabled=true +relations.tl_lamc11_content-tl_lamc11_session.tl_lamc11_content-has-tl_lamc11_session.target-many=true +relations.tl_lamc11_content-tl_lamc11_session.tl_lamc11_session-has-tl_lamc11_content.enabled=true +relations.tl_lamc11_content-tl_lamc11_session.tl_lamc11_session-has-tl_lamc11_content.target-many=false +relations.tl_lamc11_options_content-tl_lamc11_usr_attempt.tl_lamc11_options_content-has-tl_lamc11_usr_attempt.enabled=true +relations.tl_lamc11_options_content-tl_lamc11_usr_attempt.tl_lamc11_options_content-has-tl_lamc11_usr_attempt.target-many=true +relations.tl_lamc11_options_content-tl_lamc11_usr_attempt.tl_lamc11_usr_attempt-has-tl_lamc11_options_content.enabled=true +relations.tl_lamc11_options_content-tl_lamc11_usr_attempt.tl_lamc11_usr_attempt-has-tl_lamc11_options_content.target-many=false +relations.tl_lamc11_que_content-tl_lamc11_options_content.tl_lamc11_options_content-has-tl_lamc11_que_content.enabled=true +relations.tl_lamc11_que_content-tl_lamc11_options_content.tl_lamc11_options_content-has-tl_lamc11_que_content.target-many=false +relations.tl_lamc11_que_content-tl_lamc11_options_content.tl_lamc11_que_content-has-tl_lamc11_options_content.enabled=true +relations.tl_lamc11_que_content-tl_lamc11_options_content.tl_lamc11_que_content-has-tl_lamc11_options_content.target-many=true +relations.tl_lamc11_que_content-tl_lamc11_usr_attempt.tl_lamc11_que_content-has-tl_lamc11_usr_attempt.enabled=true +relations.tl_lamc11_que_content-tl_lamc11_usr_attempt.tl_lamc11_que_content-has-tl_lamc11_usr_attempt.target-many=true +relations.tl_lamc11_que_content-tl_lamc11_usr_attempt.tl_lamc11_usr_attempt-has-tl_lamc11_que_content.enabled=true +relations.tl_lamc11_que_content-tl_lamc11_usr_attempt.tl_lamc11_usr_attempt-has-tl_lamc11_que_content.target-many=false +relations.tl_lamc11_que_usr-tl_lamc11_usr_attempt.tl_lamc11_que_usr-has-tl_lamc11_usr_attempt.enabled=true +relations.tl_lamc11_que_usr-tl_lamc11_usr_attempt.tl_lamc11_que_usr-has-tl_lamc11_usr_attempt.target-many=true +relations.tl_lamc11_que_usr-tl_lamc11_usr_attempt.tl_lamc11_usr_attempt-has-tl_lamc11_que_usr.enabled=true +relations.tl_lamc11_que_usr-tl_lamc11_usr_attempt.tl_lamc11_usr_attempt-has-tl_lamc11_que_usr.target-many=false +relations.tl_lamc11_session-tl_lamc11_que_usr.tl_lamc11_que_usr-has-tl_lamc11_session.enabled=true +relations.tl_lamc11_session-tl_lamc11_que_usr.tl_lamc11_que_usr-has-tl_lamc11_session.target-many=false +relations.tl_lamc11_session-tl_lamc11_que_usr.tl_lamc11_session-has-tl_lamc11_que_usr.enabled=true +relations.tl_lamc11_session-tl_lamc11_que_usr.tl_lamc11_session-has-tl_lamc11_que_usr.target-many=true +tables.tl_lamc11_content.x=50 +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_usr.x=90 +tables.tl_lamc11_que_usr.y=90 +tables.tl_lamc11_session.x=10 +tables.tl_lamc11_session.y=10 +tables.tl_lamc11_usr_attempt.x=30 +tables.tl_lamc11_usr_attempt.y=30 Index: lams_tool_lamc/db/model/lams_tool_mc.clay =================================================================== diff -u -r94beec8280aeef9f5ad671285bd6dcecf8012687 -r19d6ab09baf339ddaf00248008f994d2a38f1079 --- lams_tool_lamc/db/model/lams_tool_mc.clay (.../lams_tool_mc.clay) (revision 94beec8280aeef9f5ad671285bd6dcecf8012687) +++ lams_tool_lamc/db/model/lams_tool_mc.clay (.../lams_tool_mc.clay) (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -14,8 +14,8 @@ - + @@ -24,7 +24,7 @@ - + @@ -56,11 +56,11 @@ - + - + @@ -81,7 +81,7 @@ - + @@ -93,8 +93,8 @@ - + @@ -103,7 +103,7 @@ - + @@ -146,8 +146,8 @@ - + @@ -199,8 +199,8 @@ - + @@ -259,8 +259,8 @@ - + @@ -285,8 +285,8 @@ - + @@ -298,8 +298,8 @@ - + @@ -324,8 +324,8 @@ - + @@ -337,8 +337,8 @@ - + @@ -354,11 +354,11 @@ - + - + @@ -386,7 +386,7 @@ - + @@ -398,8 +398,8 @@ - + @@ -408,7 +408,7 @@ - + @@ -441,11 +441,11 @@ - + - + @@ -461,12 +461,12 @@ - + - + @@ -478,8 +478,8 @@ - + @@ -491,8 +491,8 @@ - + @@ -514,11 +514,11 @@ - + - + @@ -527,7 +527,7 @@ - + @@ -567,19 +567,19 @@ - + - + - + @@ -591,8 +591,8 @@ - + @@ -601,7 +601,7 @@ - + @@ -617,8 +617,8 @@ - + @@ -627,7 +627,7 @@ - + @@ -640,7 +640,7 @@ - + @@ -654,12 +654,12 @@ - + - + Index: lams_tool_lamc/db/sql/create_lams_tool_lamc.sql =================================================================== diff -u -r178606a4aa93f09db1297061c8165ebe14ad9776 -r19d6ab09baf339ddaf00248008f994d2a38f1079 --- lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision 178606a4aa93f09db1297061c8165ebe14ad9776) +++ lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -1,6 +1,6 @@ CREATE TABLE lams.tl_lamc11_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT - , qa_content_id BIGINT(20) NOT NULL + , mc_content_id BIGINT(20) NOT NULL , title VARCHAR(250) NOT NULL DEFAULT 'Multiple Choice' , instructions VARCHAR(250) NOT NULL DEFAULT 'Please answer the questions until you reach the passmark.' , creation_date VARCHAR(100) @@ -25,70 +25,70 @@ CREATE TABLE lams.tl_lamc11_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT - , qa_session_id BIGINT(20) NOT NULL + , mc_session_id BIGINT(20) NOT NULL , session_start_date DATETIME , session_end_date DATETIME , session_status VARCHAR(100) - , qa_content_id BIGINT(20) NOT NULL + , mc_content_id BIGINT(20) NOT NULL , PRIMARY KEY (uid) - , INDEX (qa_content_id) - , CONSTRAINT FK_tl_laqa11_session_1 FOREIGN KEY (qa_content_id) + , INDEX (mc_content_id) + , CONSTRAINT FK_tl_laqa11_session_1 FOREIGN KEY (mc_content_id) REFERENCES lams.tl_lamc11_content (uid) )TYPE=InnoDB; CREATE TABLE lams.tl_lamc11_que_usr ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , que_usr_id BIGINT(20) NOT NULL , username VARCHAR(100) - , qa_session_id BIGINT(20) NOT NULL + , mc_session_id BIGINT(20) NOT NULL , fullname VARCHAR(100) , PRIMARY KEY (uid) - , INDEX (qa_session_id) - , CONSTRAINT FK_tl_laqa11_que_usr_1 FOREIGN KEY (qa_session_id) + , 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 - , qa_que_content_id BIGINT(20) NOT NULL + , mc_que_content_id BIGINT(20) NOT NULL , question VARCHAR(255) , display_order INT(5) - , qa_content_id BIGINT(20) NOT NULL + , mc_content_id BIGINT(20) NOT NULL , PRIMARY KEY (uid) - , INDEX (qa_content_id) - , CONSTRAINT FK_tl_laqa11_que_content_1 FOREIGN KEY (qa_content_id) + , INDEX (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_options_content ( uid BIGINT(20) NOT NULL AUTO_INCREMENT - , qa_que_option_id BIGINT(20) NOT NULL + , mc_que_option_id BIGINT(20) NOT NULL , correct_option TINYINT(1) NOT NULL DEFAULT 0 - , qa_que_content_id BIGINT(20) NOT NULL - , qa_que_option_text VARCHAR(250) + , mc_que_content_id BIGINT(20) NOT NULL + , mc_que_option_text VARCHAR(250) , PRIMARY KEY (uid) - , INDEX (qa_que_content_id) - , CONSTRAINT FK_tl_laqa11_options_content_1 FOREIGN KEY (qa_que_content_id) + , INDEX (mc_que_content_id) + , CONSTRAINT FK_tl_lamc11_options_content_1 FOREIGN KEY (mc_que_content_id) REFERENCES lams.tl_lamc11_que_content (uid) )TYPE=InnoDB; CREATE TABLE lams.tl_lamc11_usr_attempt ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , attempt_id BIGINT(20) NOT NULL , que_usr_id BIGINT(20) NOT NULL - , qa_que_content_id BIGINT(20) NOT NULL - , qa_que_option_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) , 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 (qa_que_content_id) - , CONSTRAINT FK_tl_lamc11_usr_attempt_2 FOREIGN KEY (qa_que_content_id) + , 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 (qa_que_option_id) - , CONSTRAINT FK_tl_lamc11_usr_attempt_4 FOREIGN KEY (qa_que_option_id) + , 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) )TYPE=InnoDB; Index: lams_tool_lamc/db/sql/tl_lamc11_session.sql =================================================================== diff -u --- lams_tool_lamc/db/sql/tl_lamc11_session.sql (revision 0) +++ lams_tool_lamc/db/sql/tl_lamc11_session.sql (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -0,0 +1,13 @@ +CREATE TABLE lams.tl_lamc11_session ( + 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_content_id BIGINT(20) NOT NULL + , PRIMARY KEY (uid) + , INDEX (mc_content_id) + , CONSTRAINT FK_tl_laqa11_session_1 FOREIGN KEY (mc_content_id) + REFERENCES lams.tl_lamc11_content (uid) +)TYPE=InnoDB; + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java =================================================================== diff -u --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java (revision 0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.java (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -0,0 +1,308 @@ +package org.lamsfoundation.lams.tool.mc; + +import java.io.Serializable; +import java.util.Date; +import java.util.Set; +import org.apache.commons.lang.builder.ToStringBuilder; + + +/** @author Hibernate CodeGenerator */ +public class McContent implements Serializable { + + /** identifier field */ + private Long uid; + + /** persistent field */ + private Long mcContentId; + + /** nullable persistent field */ + private String title; + + /** nullable persistent field */ + private String instructions; + + /** nullable persistent field */ + private String creationDate; + + /** nullable persistent field */ + private Date updateDate; + + /** nullable persistent field */ + private boolean questionsSequenced; + + /** nullable persistent field */ + private boolean usernameVisible; + + /** nullable persistent field */ + private long createdBy; + + /** nullable persistent field */ + private String monitoringReportTitle; + + /** nullable persistent field */ + private String reportTitle; + + /** nullable persistent field */ + private boolean runOffline; + + /** nullable persistent field */ + private boolean defineLater; + + /** nullable persistent field */ + private boolean synchInMonitor; + + /** nullable persistent field */ + private String offlineInstructions; + + /** nullable persistent field */ + private String onlineInstructions; + + /** nullable persistent field */ + private String endLearningMessage; + + /** nullable persistent field */ + private boolean contentInUse; + + /** nullable persistent field */ + private Integer passMark; + + /** nullable persistent field */ + private boolean showFeedback; + + /** nullable persistent field */ + private boolean showTopUsers; + + /** persistent field */ + private Set mcSessions; + + /** persistent field */ + private Set mcQueContents; + + /** full constructor */ + public McContent(Long mcContentId, String title, String instructions, String creationDate, Date updateDate, boolean questionsSequenced, boolean usernameVisible, long createdBy, String monitoringReportTitle, String reportTitle, boolean runOffline, boolean defineLater, boolean synchInMonitor, String offlineInstructions, String onlineInstructions, String endLearningMessage, boolean contentInUse, Integer passMark, boolean showFeedback, boolean showTopUsers, Set mcSessions, Set mcQueContents) { + this.mcContentId = mcContentId; + this.title = title; + this.instructions = instructions; + this.creationDate = creationDate; + this.updateDate = updateDate; + this.questionsSequenced = questionsSequenced; + this.usernameVisible = usernameVisible; + this.createdBy = createdBy; + this.monitoringReportTitle = monitoringReportTitle; + this.reportTitle = reportTitle; + this.runOffline = runOffline; + this.defineLater = defineLater; + this.synchInMonitor = synchInMonitor; + this.offlineInstructions = offlineInstructions; + this.onlineInstructions = onlineInstructions; + this.endLearningMessage = endLearningMessage; + this.contentInUse = contentInUse; + this.passMark = passMark; + this.showFeedback = showFeedback; + this.showTopUsers = showTopUsers; + this.mcSessions = mcSessions; + this.mcQueContents = mcQueContents; + } + + /** default constructor */ + public McContent() { + } + + /** minimal constructor */ + public McContent(Long mcContentId, Set mcSessions, Set mcQueContents) { + this.mcContentId = mcContentId; + this.mcSessions = mcSessions; + this.mcQueContents = mcQueContents; + } + + public Long getUid() { + return this.uid; + } + + public void setUid(Long uid) { + this.uid = uid; + } + + public Long getMcContentId() { + return this.mcContentId; + } + + public void setMcContentId(Long mcContentId) { + this.mcContentId = mcContentId; + } + + public String getTitle() { + return this.title; + } + + public void setTitle(String title) { + this.title = title; + } + + public String getInstructions() { + return this.instructions; + } + + public void setInstructions(String instructions) { + this.instructions = instructions; + } + + public String getCreationDate() { + return this.creationDate; + } + + public void setCreationDate(String creationDate) { + this.creationDate = creationDate; + } + + public Date getUpdateDate() { + return this.updateDate; + } + + public void setUpdateDate(Date updateDate) { + this.updateDate = updateDate; + } + + public boolean isQuestionsSequenced() { + return this.questionsSequenced; + } + + public void setQuestionsSequenced(boolean questionsSequenced) { + this.questionsSequenced = questionsSequenced; + } + + public boolean isUsernameVisible() { + return this.usernameVisible; + } + + public void setUsernameVisible(boolean usernameVisible) { + this.usernameVisible = usernameVisible; + } + + public long getCreatedBy() { + return this.createdBy; + } + + public void setCreatedBy(long createdBy) { + this.createdBy = createdBy; + } + + public String getMonitoringReportTitle() { + return this.monitoringReportTitle; + } + + public void setMonitoringReportTitle(String monitoringReportTitle) { + this.monitoringReportTitle = monitoringReportTitle; + } + + public String getReportTitle() { + return this.reportTitle; + } + + public void setReportTitle(String reportTitle) { + this.reportTitle = reportTitle; + } + + public boolean isRunOffline() { + return this.runOffline; + } + + public void setRunOffline(boolean runOffline) { + this.runOffline = runOffline; + } + + public boolean isDefineLater() { + return this.defineLater; + } + + public void setDefineLater(boolean defineLater) { + this.defineLater = defineLater; + } + + public boolean isSynchInMonitor() { + return this.synchInMonitor; + } + + public void setSynchInMonitor(boolean synchInMonitor) { + this.synchInMonitor = synchInMonitor; + } + + public String getOfflineInstructions() { + return this.offlineInstructions; + } + + public void setOfflineInstructions(String offlineInstructions) { + this.offlineInstructions = offlineInstructions; + } + + public String getOnlineInstructions() { + return this.onlineInstructions; + } + + public void setOnlineInstructions(String onlineInstructions) { + this.onlineInstructions = onlineInstructions; + } + + public String getEndLearningMessage() { + return this.endLearningMessage; + } + + public void setEndLearningMessage(String endLearningMessage) { + this.endLearningMessage = endLearningMessage; + } + + public boolean isContentInUse() { + return this.contentInUse; + } + + public void setContentInUse(boolean contentInUse) { + this.contentInUse = contentInUse; + } + + public Integer getPassMark() { + return this.passMark; + } + + public void setPassMark(Integer passMark) { + this.passMark = passMark; + } + + public boolean isShowFeedback() { + return this.showFeedback; + } + + public void setShowFeedback(boolean showFeedback) { + this.showFeedback = showFeedback; + } + + public boolean isShowTopUsers() { + return this.showTopUsers; + } + + public void setShowTopUsers(boolean showTopUsers) { + this.showTopUsers = showTopUsers; + } + + public Set getMcSessions() { + return this.mcSessions; + } + + public void setMcSessions(Set mcSessions) { + this.mcSessions = mcSessions; + } + + public Set getMcQueContents() { + return this.mcQueContents; + } + + public void setMcQueContents(Set mcQueContents) { + this.mcQueContents = mcQueContents; + } + + public String toString() { + return new ToStringBuilder(this) + .append("uid", getUid()) + .toString(); + } + +} Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java =================================================================== diff -u --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java (revision 0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -0,0 +1,100 @@ +package org.lamsfoundation.lams.tool.mc; + +import java.io.Serializable; +import org.apache.commons.lang.builder.ToStringBuilder; + + +/** @author Hibernate CodeGenerator */ +public class McQueUsr implements Serializable { + + /** identifier field */ + private Long uid; + + /** persistent field */ + private Long queUsrId; + + /** nullable persistent field */ + private String username; + + /** nullable persistent field */ + private String fullname; + + /** nullable persistent field */ + private Long mcSessionId; + + /** nullable persistent field */ + private org.lamsfoundation.lams.tool.mc.McSession mcSession; + + /** full constructor */ + public McQueUsr(Long queUsrId, String username, String fullname, Long mcSessionId, org.lamsfoundation.lams.tool.mc.McSession mcSession) { + this.queUsrId = queUsrId; + this.username = username; + this.fullname = fullname; + this.mcSessionId = mcSessionId; + this.mcSession = mcSession; + } + + /** default constructor */ + public McQueUsr() { + } + + /** minimal constructor */ + public McQueUsr(Long queUsrId) { + this.queUsrId = queUsrId; + } + + public Long getUid() { + return this.uid; + } + + public void setUid(Long uid) { + this.uid = uid; + } + + public Long getQueUsrId() { + return this.queUsrId; + } + + public void setQueUsrId(Long queUsrId) { + this.queUsrId = queUsrId; + } + + public String getUsername() { + return this.username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getFullname() { + return this.fullname; + } + + public void setFullname(String fullname) { + this.fullname = fullname; + } + + public Long getMcSessionId() { + return this.mcSessionId; + } + + public void setMcSessionId(Long mcSessionId) { + this.mcSessionId = mcSessionId; + } + + public org.lamsfoundation.lams.tool.mc.McSession getMcSession() { + return this.mcSession; + } + + public void setMcSession(org.lamsfoundation.lams.tool.mc.McSession mcSession) { + this.mcSession = mcSession; + } + + public String toString() { + return new ToStringBuilder(this) + .append("uid", getUid()) + .toString(); + } + +} Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.java =================================================================== diff -u --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.java (revision 0) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.java (revision 19d6ab09baf339ddaf00248008f994d2a38f1079) @@ -0,0 +1,128 @@ +package org.lamsfoundation.lams.tool.mc; + +import java.io.Serializable; +import java.util.Date; +import java.util.Set; +import org.lamsfoundation.lams.tool.mc.McContent; +import org.apache.commons.lang.builder.ToStringBuilder; + + +/** @author Hibernate CodeGenerator */ +public class McSession implements Serializable { + + /** identifier field */ + private Long uid; + + /** persistent field */ + private Long mcSessionId; + + /** nullable persistent field */ + private Date session_start_date; + + /** nullable persistent field */ + private Date session_end_date; + + /** nullable persistent field */ + private String session_status; + + /** nullable persistent field */ + private Long mcContentId; + + /** nullable persistent field */ + private McContent mcContent; + + /** persistent field */ + private Set mcQueUsers; + + /** full constructor */ + public McSession(Long mcSessionId, Date session_start_date, Date session_end_date, String session_status, Long mcContentId, McContent mcContent, Set mcQueUsers) { + this.mcSessionId = mcSessionId; + this.session_start_date = session_start_date; + this.session_end_date = session_end_date; + this.session_status = session_status; + this.mcContentId = mcContentId; + this.mcContent = mcContent; + this.mcQueUsers = mcQueUsers; + } + + /** default constructor */ + public McSession() { + } + + /** minimal constructor */ + public McSession(Long mcSessionId, Set mcQueUsers) { + this.mcSessionId = mcSessionId; + this.mcQueUsers = mcQueUsers; + } + + public Long getUid() { + return this.uid; + } + + public void setUid(Long uid) { + this.uid = uid; + } + + public Long getMcSessionId() { + return this.mcSessionId; + } + + public void setMcSessionId(Long mcSessionId) { + this.mcSessionId = mcSessionId; + } + + public Date getSession_start_date() { + return this.session_start_date; + } + + public void setSession_start_date(Date session_start_date) { + this.session_start_date = session_start_date; + } + + public Date getSession_end_date() { + return this.session_end_date; + } + + public void setSession_end_date(Date session_end_date) { + this.session_end_date = session_end_date; + } + + public String getSession_status() { + return this.session_status; + } + + public void setSession_status(String session_status) { + this.session_status = session_status; + } + + public Long getMcContentId() { + return this.mcContentId; + } + + public void setMcContentId(Long mcContentId) { + this.mcContentId = mcContentId; + } + + public McContent getMcContent() { + return this.mcContent; + } + + public void setMcContent(McContent mcContent) { + this.mcContent = mcContent; + } + + public Set getMcQueUsers() { + return this.mcQueUsers; + } + + public void setMcQueUsers(Set mcQueUsers) { + this.mcQueUsers = mcQueUsers; + } + + public String toString() { + return new ToStringBuilder(this) + .append("uid", getUid()) + .toString(); + } + +}