Index: lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml
===================================================================
diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rdce43fe439e061162b09d833a06aac330d70f6a6
--- lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951)
+++ lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision dce43fe439e061162b09d833a06aac330d70f6a6)
@@ -42,15 +42,6 @@
>
-
-
-
-
-
Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/db/model/lams_tool_mc.clay
===================================================================
diff -u -ra5aa6499fcb35b0979189ec62458c1096883724e -rdce43fe439e061162b09d833a06aac330d70f6a6
--- lams_tool_lamc/db/model/lams_tool_mc.clay (.../lams_tool_mc.clay) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
+++ lams_tool_lamc/db/model/lams_tool_mc.clay (.../lams_tool_mc.clay) (revision dce43fe439e061162b09d833a06aac330d70f6a6)
@@ -413,7 +413,7 @@
-
+
@@ -564,6 +564,105 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
Index: lams_tool_lamc/db/sql/create_lams_tool_lamc.sql
===================================================================
diff -u -ra5aa6499fcb35b0979189ec62458c1096883724e -rdce43fe439e061162b09d833a06aac330d70f6a6
--- lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
+++ lams_tool_lamc/db/sql/create_lams_tool_lamc.sql (.../create_lams_tool_lamc.sql) (revision dce43fe439e061162b09d833a06aac330d70f6a6)
@@ -32,7 +32,7 @@
, 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_lamc11_que_content_2 FOREIGN KEY (mc_content_id)
REFERENCES lams.tl_lamc11_content (uid)
)TYPE=InnoDB;
@@ -49,6 +49,18 @@
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
+ , mc_session_id BIGINT(20) NOT NULL
+ , username VARCHAR(100)
+ , fullname VARCHAR(100)
+ , PRIMARY KEY (uid)
+ , INDEX (mc_session_id)
+ , CONSTRAINT FK_tl_lamc_tool_usr_2 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
@@ -57,19 +69,21 @@
, 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)
+ , 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_que_usr (
+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
- , mc_session_id BIGINT(20) NOT NULL
- , username VARCHAR(100)
- , fullname VARCHAR(100)
+ , 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 (mc_session_id)
- , CONSTRAINT FK_tl_lamc_tool_usr_1 FOREIGN KEY (mc_session_id)
- REFERENCES lams.tl_lamc11_session (uid)
+ , INDEX (que_usr_id)
+ , CONSTRAINT FK_tl_lamc11_usr_attempt_2 FOREIGN KEY (que_usr_id)
+ REFERENCES lams.tl_lamc11_que_usr (uid)
)TYPE=InnoDB;
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml
===================================================================
diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rdce43fe439e061162b09d833a06aac330d70f6a6
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision dce43fe439e061162b09d833a06aac330d70f6a6)
@@ -42,15 +42,6 @@
>
-
-
-
-
-
Index: lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java
===================================================================
diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rdce43fe439e061162b09d833a06aac330d70f6a6
--- lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java (.../McQueUsr.java) (revision 392ad1409cb86320a40ab332d496a4b527119951)
+++ lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueUsr.java (.../McQueUsr.java) (revision dce43fe439e061162b09d833a06aac330d70f6a6)
@@ -22,10 +22,8 @@
/** nullable persistent field */
private String fullname;
+
/** nullable persistent field */
- private Long mcSessionId;
-
- /** nullable persistent field */
private org.lamsfoundation.lams.tool.mc.McSession mcSession;
/** persistent field */
@@ -82,14 +80,7 @@
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;
}
Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml
===================================================================
diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rdce43fe439e061162b09d833a06aac330d70f6a6
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McQueUsr.hbm.xml (.../McQueUsr.hbm.xml) (revision dce43fe439e061162b09d833a06aac330d70f6a6)
@@ -42,15 +42,6 @@
>
-
-
-
-
-
Fisheye: Tag 392ad1409cb86320a40ab332d496a4b527119951 refers to a dead (removed) revision in file `lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java
===================================================================
diff -u -ra5aa6499fcb35b0979189ec62458c1096883724e -rdce43fe439e061162b09d833a06aac330d70f6a6
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java (.../TestMcContent.java) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java (.../TestMcContent.java) (revision dce43fe439e061162b09d833a06aac330d70f6a6)
@@ -44,7 +44,7 @@
super(name);
}
- /*
+
public void testCreateNewMcContent()
{
//create new mc content
@@ -74,7 +74,7 @@
mcContentDAO.saveMcContent(mc);
assertNotNull(mc);
}
- */
+
public void testCreateNewMcContentOther()
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java
===================================================================
diff -u -ra5aa6499fcb35b0979189ec62458c1096883724e -rdce43fe439e061162b09d833a06aac330d70f6a6
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java (.../TestMcOptionsContent.java) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcOptionsContent.java (.../TestMcOptionsContent.java) (revision dce43fe439e061162b09d833a06aac330d70f6a6)
@@ -38,11 +38,14 @@
public void testCreateMcOptionsContent()
{
McQueContent mcQueContent = mcQueContentDAO.findMcQueContentById(TEST_QUE_ID1);
- McOptsContent mcOptionsContent= new McOptsContent(new Long(777), true, "which", mcQueContent);
+ McOptsContent mcOptionsContent= new McOptsContent(new Long(777), true, "red", mcQueContent);
mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent);
McOptsContent mcOptionsContent2= new McOptsContent(new Long(888), false, "blue", mcQueContent);
mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent2);
+
+ McOptsContent mcOptionsContent3= new McOptsContent(new Long(999), false, "yellow", mcQueContent);
+ mcOptionsContentDAO.saveMcOptionsContent(mcOptionsContent3);
}
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java
===================================================================
diff -u -ra5aa6499fcb35b0979189ec62458c1096883724e -rdce43fe439e061162b09d833a06aac330d70f6a6
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java (.../TestMcQueContent.java) (revision a5aa6499fcb35b0979189ec62458c1096883724e)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcQueContent.java (.../TestMcQueContent.java) (revision dce43fe439e061162b09d833a06aac330d70f6a6)
@@ -50,6 +50,7 @@
);
mcQueContentDAO.saveMcQueContent(mcQueContent);
+
McContent mcContent2 = mcContentDAO.findMcContentById(new Long(3));
@@ -62,15 +63,16 @@
);
mcQueContentDAO.saveMcQueContent(mcQueContent2);
+
}
-
+ /*
public void testRetrieveMcQueContent()
{
McQueContent mcQueContent= mcQueContentDAO.findMcQueContentById(new Long(20));
mcQueContent.setDisplayOrder(new Integer(88));
mcQueContentDAO.saveMcQueContent(mcQueContent);
}
-
+ */
}
\ No newline at end of file
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml
===================================================================
diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rdce43fe439e061162b09d833a06aac330d70f6a6
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml (.../testmcApplicationContext.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/testmcApplicationContext.xml (.../testmcApplicationContext.xml) (revision dce43fe439e061162b09d833a06aac330d70f6a6)
@@ -35,14 +35,12 @@
-
/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
+ /org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml