Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml =================================================================== diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -62,6 +62,23 @@ > + + + + + + + + + + Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml =================================================================== diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) +++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -76,5 +76,24 @@ class="org.lamsfoundation.lams.tool.mc.McOptsContent" /> + + + + + + + + + + + + Index: lams_tool_lamc/db/model/lams_tool_mc.clay =================================================================== diff -u -rdce43fe439e061162b09d833a06aac330d70f6a6 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/db/model/lams_tool_mc.clay (.../lams_tool_mc.clay) (revision dce43fe439e061162b09d833a06aac330d70f6a6) +++ lams_tool_lamc/db/model/lams_tool_mc.clay (.../lams_tool_mc.clay) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -660,6 +660,20 @@ + + + + + + + + + + + + + + Index: lams_tool_lamc/db/sql/create_lams_tool_lamc.sql =================================================================== diff -u -rdce43fe439e061162b09d833a06aac330d70f6a6 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision dce43fe439e061162b09d833a06aac330d70f6a6) +++ lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -32,10 +32,22 @@ , mc_content_id BIGINT(20) NOT NULL , PRIMARY KEY (uid) , INDEX (mc_content_id) - , CONSTRAINT FK_tl_lamc11_que_content_2 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_options_content ( + uid BIGINT(20) NOT NULL AUTO_INCREMENT + , mc_que_option_id BIGINT(20) NOT NULL + , correct_option TINYINT(1) NOT NULL DEFAULT 0 + , mc_que_content_id BIGINT(20) NOT NULL + , mc_que_option_text VARCHAR(250) + , PRIMARY KEY (uid) + , 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_session ( uid BIGINT(20) NOT NULL AUTO_INCREMENT , mc_session_id BIGINT(20) NOT NULL @@ -45,7 +57,7 @@ , mc_content_id BIGINT(20) NOT NULL , PRIMARY KEY (uid) , INDEX (mc_content_id) - , CONSTRAINT FK_tl_lamc_session_2 FOREIGN KEY (mc_content_id) + , CONSTRAINT FK_tl_lamc_session_1 FOREIGN KEY (mc_content_id) REFERENCES lams.tl_lamc11_content (uid) )TYPE=InnoDB; @@ -57,22 +69,10 @@ , fullname VARCHAR(100) , PRIMARY KEY (uid) , INDEX (mc_session_id) - , CONSTRAINT FK_tl_lamc_tool_usr_2 FOREIGN KEY (mc_session_id) + , CONSTRAINT FK_tl_lamc_tool_usr_1 FOREIGN KEY (mc_session_id) REFERENCES lams.tl_lamc11_session (uid) )TYPE=InnoDB; -CREATE TABLE lams.tl_lamc11_options_content ( - uid BIGINT(20) NOT NULL AUTO_INCREMENT - , mc_que_option_id BIGINT(20) NOT NULL - , correct_option TINYINT(1) NOT NULL DEFAULT 0 - , mc_que_content_id BIGINT(20) NOT NULL - , mc_que_option_text VARCHAR(250) - , PRIMARY KEY (uid) - , INDEX (mc_que_content_id) - , CONSTRAINT FK_tl_lamc11_options_content_2 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 @@ -83,7 +83,13 @@ , time_zone VARCHAR(255) , PRIMARY KEY (uid) , INDEX (que_usr_id) - , CONSTRAINT FK_tl_lamc11_usr_attempt_2 FOREIGN KEY (que_usr_id) + , CONSTRAINT FK_tl_lamc11_usr_attempt_1 FOREIGN KEY (que_usr_id) REFERENCES lams.tl_lamc11_que_usr (uid) + , INDEX (mc_que_content_id) + , CONSTRAINT FK_tl_lamc11_usr_attempt_2 FOREIGN KEY (mc_que_content_id) + REFERENCES lams.tl_lamc11_que_content (uid) + , INDEX (mc_que_option_id) + , CONSTRAINT FK_tl_lamc11_usr_attempt_3 FOREIGN KEY (mc_que_option_id) + REFERENCES lams.tl_lamc11_options_content (uid) )TYPE=InnoDB; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml =================================================================== diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -62,6 +62,23 @@ > + + + + + + + + + + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java =================================================================== diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java (.../McOptsContent.java) (revision 392ad1409cb86320a40ab332d496a4b527119951) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java (.../McOptsContent.java) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -28,14 +28,6 @@ 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; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml =================================================================== diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -76,5 +76,24 @@ class="org.lamsfoundation.lams.tool.mc.McOptsContent" /> + + + + + + + + + + + + Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.java =================================================================== diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.java (.../McUsrAttempt.java) (revision 392ad1409cb86320a40ab332d496a4b527119951) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.java (.../McUsrAttempt.java) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -30,7 +30,8 @@ private org.lamsfoundation.lams.tool.mc.McOptsContent 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.McOptsContent mcOptionsContent) { + 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.McOptsContent mcOptionsContent) { this.attemptId = attemptId; this.attemptTime = attemptTime; this.timeZone = timeZone; Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java =================================================================== diff -u -ra4a6e7505e6a9de8913dd1fe62a678d3c00dbf56 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java (.../IMcUserDAO.java) (revision a4a6e7505e6a9de8913dd1fe62a678d3c00dbf56) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcUserDAO.java (.../IMcUserDAO.java) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -49,7 +49,7 @@ * @param userId The id of a McQueUsr * @return the persistent instance of a McQueUsr or null if not found. */ - public McQueUsr getMcUserByID(Long userId); + public McQueUsr findMcUserById(Long userId); /** *

Persist the given persistent instance of McQueUsr.

Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java =================================================================== diff -u -ra4a6e7505e6a9de8913dd1fe62a678d3c00dbf56 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision a4a6e7505e6a9de8913dd1fe62a678d3c00dbf56) +++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java (.../McUserDAO.java) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -48,8 +48,10 @@ .get(McQueUsr.class, uid); } + + /** @see org.lamsfoundation.lams.tool.mc.dao.IMcUserDAO#getMcUserByID(java.lang.Long) */ - public McQueUsr getMcUserByID(Long userId) + public McQueUsr findMcUserById(Long userId) { String query = "from McQueUsr user where user.queUsrId=?"; List users = getHibernateTemplate().find(query,userId); Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml =================================================================== diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml (.../McOptsContent.hbm.xml) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -62,6 +62,23 @@ > + + + + + + + + + + Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml =================================================================== diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml (.../McQueContent.hbm.xml) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -76,5 +76,24 @@ class="org.lamsfoundation.lams.tool.mc.McOptsContent" /> + + + + + + + + + + + + Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java =================================================================== diff -u -rdce43fe439e061162b09d833a06aac330d70f6a6 -rbf596255d66a914a1d8176f0b9ec0f7bc7be0d8a --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java (.../TestMcOptionsContent.java) (revision dce43fe439e061162b09d833a06aac330d70f6a6) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java (.../TestMcOptionsContent.java) (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -9,6 +9,8 @@ package org.lamsfoundation.lams.tool.mc; +import java.util.HashSet; + /* * * @author ozgurd @@ -34,17 +36,18 @@ super(name); } + public void testCreateMcOptionsContent() { McQueContent mcQueContent = mcQueContentDAO.findMcQueContentById(TEST_QUE_ID1); - McOptsContent mcOptionsContent= new McOptsContent(new Long(777), true, "red", mcQueContent); + McOptsContent mcOptionsContent= new McOptsContent(new Long(777), true, "red", mcQueContent, new HashSet()); mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent); - McOptsContent mcOptionsContent2= new McOptsContent(new Long(888), false, "blue", mcQueContent); + McOptsContent mcOptionsContent2= new McOptsContent(new Long(888), false, "blue", mcQueContent, new HashSet()); mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent2); - McOptsContent mcOptionsContent3= new McOptsContent(new Long(999), false, "yellow", mcQueContent); + McOptsContent mcOptionsContent3= new McOptsContent(new Long(999), false, "yellow", mcQueContent, new HashSet()); mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent3); } Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java =================================================================== diff -u --- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java (revision 0) +++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcUsrAttempt.java (revision bf596255d66a914a1d8176f0b9ec0f7bc7be0d8a) @@ -0,0 +1,75 @@ +/* ******************************************************************************** + * Copyright Notice + * ================= + * This file contains propriety information of LAMS Foundation. + * Copying or reproduction with prior written permission is prohibited. + * Copyright (c) 2004 + * Created on 2004-12-23 + ******************************************************************************** */ + +package org.lamsfoundation.lams.tool.mc; + +import java.util.Date; + +import org.lamsfoundation.lams.tool.service.ILamsToolService; + + + +/* + * + * @author ozgurd + * + * TODO To change the template for this generated type comment go to + * Window - Preferences - Java - Code Style - Code Templates + */ + + +public class TestMcUsrAttempt extends McDataAccessTestCase +{ + public org.lamsfoundation.lams.tool.dao.IToolDAO toolDAO; + public ILamsToolService lamsToolService; + + protected void setUp() throws Exception + { + super.setUp(); + } + + protected void tearDown() throws Exception + { + super.tearDown(); + } + + public TestMcUsrAttempt(String name) + { + super(name); + } + + + public void testCreateNewMcUsrAttempt() + { + McQueContent mcQueContent = mcQueContentDAO.findMcQueContentById(TEST_QUE_ID1); + + McOptsContent mcOptionsContent=mcOptionsContentDAO.findMcOptionsContentById(new Long(888)); + + McQueUsr mcQueUsr=mcUserDAO.findMcUserById(TEST_NEW_USER_ID); + + McUsrAttempt mcUsrAttempt= new McUsrAttempt(new Long(33), + new Date(System.currentTimeMillis()), + "Sydney", + mcQueContent, + mcQueUsr, + mcOptionsContent + ); + + McUsrAttempt mcUsrAttempt2= new McUsrAttempt(new Long(34), + new Date(System.currentTimeMillis()), + "ACT", + mcQueContent, + mcQueUsr, + mcOptionsContent + ); + + mcUsrAttemptDAO.saveMcUsrAttempt(mcUsrAttempt2); + } + +} \ No newline at end of file