Index: lams_tool_vote/build.properties =================================================================== diff -u -r036a57201d0fd2c383c67e5af4b5ac0b5c9db7c4 -r2e9dc3798ab786dc455c429b78330b253ce8fe49 --- lams_tool_vote/build.properties (.../build.properties) (revision 036a57201d0fd2c383c67e5af4b5ac0b5c9db7c4) +++ lams_tool_vote/build.properties (.../build.properties) (revision 2e9dc3798ab786dc455c429b78330b253ce8fe49) @@ -4,7 +4,7 @@ signature=lavote11 #project version -tool.version=20080108 +tool.version=20080326 # hide tool option hideTool=false Index: lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml =================================================================== diff -u -ra1f83079a0fedc3d6982fde779286d0246847339 -r2e9dc3798ab786dc455c429b78330b253ce8fe49 --- lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml (.../VoteContent.hbm.xml) (revision a1f83079a0fedc3d6982fde779286d0246847339) +++ lams_tool_vote/conf/hibernate/mappings/org/lamsfoundation/lams/tool/vote/VoteContent.hbm.xml (.../VoteContent.hbm.xml) (revision 2e9dc3798ab786dc455c429b78330b253ce8fe49) @@ -151,7 +151,15 @@ length="5" /> + + - - -Voting Tool for Lams 1.1 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - + + + +Voting Tool for Lams 1.1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + + Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql =================================================================== diff -u -r076f681daa99d0471dea9b1f166e5e68e44413ca -r2e9dc3798ab786dc455c429b78330b253ce8fe49 --- lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision 076f681daa99d0471dea9b1f166e5e68e44413ca) +++ lams_tool_vote/db/sql/create_lams_tool_vote.sql (.../create_lams_tool_vote.sql) (revision 2e9dc3798ab786dc455c429b78330b253ce8fe49) @@ -17,6 +17,7 @@ , lock_on_finish TINYINT(1) NOT NULL DEFAULT 1 , retries TINYINT(1) NOT NULL DEFAULT 0 , reflectionSubject TEXT + , show_results TINYINT(1) NOT NULL DEFAULT 1 , PRIMARY KEY (uid) )TYPE=InnoDB; Fisheye: Tag 2e9dc3798ab786dc455c429b78330b253ce8fe49 refers to a dead (removed) revision in file `lams_tool_vote/db/sql/updatescripts/updateTo20080108.sql'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/db/sql/updatescripts/updateTo20080326.sql =================================================================== diff -u --- lams_tool_vote/db/sql/updatescripts/updateTo20080326.sql (revision 0) +++ lams_tool_vote/db/sql/updatescripts/updateTo20080326.sql (revision 2e9dc3798ab786dc455c429b78330b253ce8fe49) @@ -0,0 +1,23 @@ +-- Update the Vote tables to version 20080108 +-- This is for the LAMS 2.1 release. + +UPDATE tl_lavote11_content +SET lock_on_finish = 0 +WHERE content_id = ( + SELECT default_tool_content_id + FROM lams_tool + WHERE tool_signature = 'lavote11' +); + +UPDATE lams_tool SET modified_date_time = NOW() WHERE tool_signature = 'lavote11'; + +update lams_tool set supports_outputs = 1 where tool_signature = "lavote11"; + +ALTER TABLE tl_lavote11_content +ADD COLUMN show_results TINYINT(1) NOT NULL DEFAULT 1; + +UPDATE tl_lavote11_content set show_results = 1; + +-- update the tool version - special code that should only be executed if the upgrade is being done manually. +-- if it is being done via the tool deployer then it will update the version automatically. +-- UPDATE lams_tool SET tool_version = "20080326" WHERE tool_signature = "lavote11"; Index: lams_tool_vote/web/authoring/AdvancedContent.jsp =================================================================== diff -u -r513b1dcc4de597a34c6f4e68bcbc744808c2d473 -r2e9dc3798ab786dc455c429b78330b253ce8fe49 --- lams_tool_vote/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 513b1dcc4de597a34c6f4e68bcbc744808c2d473) +++ lams_tool_vote/web/authoring/AdvancedContent.jsp (.../AdvancedContent.jsp) (revision 2e9dc3798ab786dc455c429b78330b253ce8fe49) @@ -51,6 +51,15 @@

+ + + +

+ + +