Index: lams_tool_lamc/build.properties
===================================================================
diff -u -r653f0f0eff40af5e6891c22ef2b8efe9bf2f75af -rb729587d2ebffa80f02239e91bc80352869d311a
--- lams_tool_lamc/build.properties (.../build.properties) (revision 653f0f0eff40af5e6891c22ef2b8efe9bf2f75af)
+++ lams_tool_lamc/build.properties (.../build.properties) (revision b729587d2ebffa80f02239e91bc80352869d311a)
@@ -4,7 +4,7 @@
signature=lamc11
#mc files package definition
-mc.package=org.lamsfoundation.lams.tool.mc
+package=org.lamsfoundation.lams.tool.mc
mc.path=org/lamsfoundation/lams/tool/mc
#configuration files
@@ -13,7 +13,7 @@
conf.resources.dir=${conf.web.dir}/resources
# Build directory
-build.webinf.dir=${build.web}/WEB-INF/resources
+
build.web.includes=${build}/web/includes
build.web.template=${build}/web/template
Index: lams_tool_lamc/build.xml
===================================================================
diff -u -r392ad1409cb86320a40ab332d496a4b527119951 -rb729587d2ebffa80f02239e91bc80352869d311a
--- lams_tool_lamc/build.xml (.../build.xml) (revision 392ad1409cb86320a40ab332d496a4b527119951)
+++ lams_tool_lamc/build.xml (.../build.xml) (revision b729587d2ebffa80f02239e91bc80352869d311a)
@@ -100,7 +100,7 @@
>
@@ -125,7 +125,7 @@
/>
-
+
@@ -284,7 +284,22 @@
todir="${jboss.deploy}"/>
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
Index: lams_tool_lamc/db/sql/init_lams_tool_lamc.sql
===================================================================
diff -u
--- lams_tool_lamc/db/sql/init_lams_tool_lamc.sql (revision 0)
+++ lams_tool_lamc/db/sql/init_lams_tool_lamc.sql (revision b729587d2ebffa80f02239e91bc80352869d311a)
@@ -0,0 +1,103 @@
+USE lams;
+
+-- Ensure an existing table does not exist
+
+DROP TABLE lams.tl_lamc11_usr_attempt;
+DROP TABLE lams.tl_lamc11_options_content;
+DROP TABLE lams.tl_lamc11_que_content;
+DROP TABLE lams.tl_lamc11_que_usr;
+DROP TABLE lams.tl_lamc11_session;
+DROP TABLE lams.tl_lamc11_content;
+
+
+CREATE TABLE lams.tl_lamc11_content (
+ uid BIGINT(20) NOT NULL AUTO_INCREMENT
+ , 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)
+ , update_date DATETIME
+ , questions_sequenced TINYINT(1) NOT NULL DEFAULT 0
+ , username_visible TINYINT(1) NOT NULL DEFAULT 0
+ , created_by BIGINT(20) NOT NULL DEFAULT 0
+ , monitoring_report_title VARCHAR(100) NOT NULL DEFAULT 'Combined Learner Results'
+ , report_title VARCHAR(100) NOT NULL DEFAULT 'Multiple Choice'
+ , run_offline TINYINT(1) NOT NULL DEFAULT 0
+ , define_later TINYINT(1) NOT NULL DEFAULT 0
+ , synch_in_monitor TINYINT(1) NOT NULL DEFAULT 0
+ , offline_instructions VARCHAR(250) NOT NULL DEFAULT 'offline instructions'
+ , online_instructions VARCHAR(250) NOT NULL DEFAULT 'online instructions'
+ , end_learning_message VARCHAR(150) NOT NULL DEFAULT 'Thank you!'
+ , content_in_use TINYINT(1) NOT NULL DEFAULT 0
+ , retries TINYINT(1) NOT NULL DEFAULT 0
+ , pass_mark INTEGER
+ , show_feedback TINYINT(1) NOT NULL DEFAULT 0
+ , PRIMARY KEY (uid)
+)TYPE=InnoDB;
+
+CREATE TABLE lams.tl_lamc11_que_content (
+ uid BIGINT(20) NOT NULL AUTO_INCREMENT
+ , question VARCHAR(255)
+ , display_order INT(5)
+ , 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)
+ REFERENCES lams.tl_lamc11_content (uid)
+)TYPE=InnoDB;
+
+CREATE TABLE lams.tl_lamc11_options_content (
+ uid BIGINT(20) NOT NULL AUTO_INCREMENT
+ , 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
+ , 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_lamc_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
+ , 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_1 FOREIGN KEY (mc_session_id)
+ REFERENCES lams.tl_lamc11_session (uid)
+)TYPE=InnoDB;
+
+CREATE TABLE lams.tl_lamc11_usr_attempt (
+ uid BIGINT(20) NOT NULL AUTO_INCREMENT
+ , que_usr_id BIGINT(20) NOT NULL
+ , mc_que_content_id BIGINT(20) NOT NULL
+ , mc_que_option_id BIGINT(20) NOT NULL
+ , attempt_time DATETIME
+ , time_zone VARCHAR(255)
+ , PRIMARY KEY (uid)
+ , INDEX (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/db/sql/insert_lams_tool_lamc.sql
===================================================================
diff -u -rd3f5cdc5c4923976fb5895eb255a910bea86498b -rb729587d2ebffa80f02239e91bc80352869d311a
--- lams_tool_lamc/db/sql/insert_lams_tool_lamc.sql (.../insert_lams_tool_lamc.sql) (revision d3f5cdc5c4923976fb5895eb255a910bea86498b)
+++ lams_tool_lamc/db/sql/insert_lams_tool_lamc.sql (.../insert_lams_tool_lamc.sql) (revision b729587d2ebffa80f02239e91bc80352869d311a)
@@ -1,75 +1,106 @@
+
+INSERT INTO tl_lamc11_content (
+ uid
+ , content_id
+ , title
+ , instructions
+ , creation_date
+ , questions_sequenced
+ , username_visible
+ , created_by
+ , monitoring_report_title
+ , report_title
+ , run_offline
+ , define_later
+ , synch_in_monitor
+ , offline_instructions
+ , online_instructions
+ , end_learning_message
+ , content_in_use
+ , retries
+ , show_feedback
+)
+VALUES (
+ null,
+ 10,
+ 'Mc Title',
+ 'Mc Instructions',
+ now(),
+ 0,
+ 0,
+ 1,
+ 'Monitoring Report',
+ 'Report',
+ 0,
+ 0,
+ 0,
+ 'offline instructions',
+ 'online instructions',
+ 'End of the activity...',
+ 0,
+ 0,
+ 0);
+
+
+
+INSERT INTO tl_lamc11_que_content (
+ uid,
+ question,
+ display_order,
+ mc_content_id
+)
+VALUES (
+ null,
+ 'a sample question',
+ 1,
+ 1);
+
+
+INSERT INTO tl_lamc11_options_content (
+ uid,
+ correct_option,
+ mc_que_content_id,
+ mc_que_option_text
+)
+VALUES (
+ null,
+ 0,
+ 1,
+ 'sample answer 1');
+
+
+
+INSERT INTO tl_lamc11_options_content (
+ uid,
+ correct_option,
+ mc_que_content_id,
+ mc_que_option_text
+)
+VALUES (
+ null,
+ 0,
+ 1,
+ 'sample answer 2');
+
+
+
+INSERT INTO tl_lamc11_options_content (
+ uid,
+ correct_option,
+ mc_que_content_id,
+ mc_que_option_text
+)
+VALUES (
+ null,
+ 1,
+ 1,
+ 'sample answer 3');
+
+
-
-
-INSERT INTO tl_lamc11_content (mc_content_id,
- creation_date
-)
-VALUES (10,
- NOW());
-
-
-
-
-INSERT INTO tl_lamc11_session (mc_session_id,
- mc_content_id) VALUES (20,LAST_INSERT_ID());
-
-
-
-
-
-INSERT INTO tl_lamc11_que_content (mc_que_content_id,
- question,
- display_order,
- mc_content_id) VALUES (20,'What is the name of this activity?',1,1);
-
-
-
-INSERT INTO tl_lamc11_que_usr (que_usr_id,
- username,
- fullname,
- mc_session_id) VALUES (40,'ozgurd','Ozgur Demirtas',1);
-
-
-
-INSERT INTO tl_lamc11_options_content (mc_que_option_id,
- correct_option,
- mc_que_content_id,
- mc_que_option_text) VALUES (100,0,1,'survey');
-
-
-INSERT INTO tl_lamc11_options_content (mc_que_option_id,
- correct_option,
- mc_que_content_id,
- mc_que_option_text) VALUES (101,0,1,'q/a');
-
-INSERT INTO tl_lamc11_options_content (mc_que_option_id,
- correct_option,
- mc_que_content_id,
- mc_que_option_text) VALUES (102,1,1,'mc');
-
-
-
-INSERT INTO tl_lamc11_usr_attempt (attempt_id,
- que_usr_id,
- mc_que_content_id,
- mc_que_option_id)
- VALUES (200, 1, 1, 1);
-
-
-INSERT INTO tl_lamc11_usr_attempt (attempt_id,
- que_usr_id,
- mc_que_content_id,
- mc_que_option_id)
- VALUES (201, 1, 1, 2);
-
-
-INSERT INTO tl_lamc11_usr_attempt (attempt_id,
- que_usr_id,
- mc_que_content_id,
- mc_que_option_id)
- VALUES (202, 1, 1, 3);
-
-
-
-
-
+
+
+
+
+
+
\ No newline at end of file
Fisheye: Tag b729587d2ebffa80f02239e91bc80352869d311a refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b729587d2ebffa80f02239e91bc80352869d311a refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b729587d2ebffa80f02239e91bc80352869d311a refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b729587d2ebffa80f02239e91bc80352869d311a refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McSession.hbm.xml'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b729587d2ebffa80f02239e91bc80352869d311a 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?
Fisheye: Tag b729587d2ebffa80f02239e91bc80352869d311a refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dbConnection.properties'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b729587d2ebffa80f02239e91bc80352869d311a refers to a dead (removed) revision in file `lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/log4j.properties'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b729587d2ebffa80f02239e91bc80352869d311a refers to a dead (removed) revision in file `lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/AllTests.java'.
Fisheye: No comparison available. Pass `N' to diff?
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java
===================================================================
diff -u -r4336aafba788b801aa78c2dc27f8d07a2f932be7 -rb729587d2ebffa80f02239e91bc80352869d311a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java (.../McDataAccessTestCase.java) (revision 4336aafba788b801aa78c2dc27f8d07a2f932be7)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/McDataAccessTestCase.java (.../McDataAccessTestCase.java) (revision b729587d2ebffa80f02239e91bc80352869d311a)
@@ -80,7 +80,7 @@
super.tearDown();
}
-
+
public void testInitDB()
{
//create new mc content
Index: lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java
===================================================================
diff -u -re641617111e90d02c659127046f06b0f5c8e2845 -rb729587d2ebffa80f02239e91bc80352869d311a
--- lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java (.../TestMcContent.java) (revision e641617111e90d02c659127046f06b0f5c8e2845)
+++ lams_tool_lamc/test/java/org/lamsfoundation/lams/tool/mc/TestMcContent.java (.../TestMcContent.java) (revision b729587d2ebffa80f02239e91bc80352869d311a)
@@ -108,13 +108,6 @@
}
- public void testRetrieveMcContent()
- {
- McContent mcContent = mcContentDAO.findMcContentById(TEST_CONTENT_ID);
- assertNotNull(mcContent);
- assertEquals(mcContent.getMcContentId(), new Long(2));
- }
-
public void testRemoveMcContent()
{
McContent mcContent = mcContentDAO.findMcContentById(TEST_CONTENT_ID);
@@ -128,4 +121,7 @@
mcContentDAO.removeMcById(TEST_CONTENT_ID_OTHER);
}
*/
+
+
+
}
\ No newline at end of file
Fisheye: Tag b729587d2ebffa80f02239e91bc80352869d311a refers to a dead (removed) revision in file `lams_tool_lamc/test/web/authoringMaincontent.jsp'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag b729587d2ebffa80f02239e91bc80352869d311a refers to a dead (removed) revision in file `lams_tool_lamc/test/web/index.jsp'.
Fisheye: No comparison available. Pass `N' to diff?