[virtualcommons-svn] commit/foraging: alllee: re-enabling voting on imposed condition, participants will first see the vote screen and then be sent to the imposed screen after the votes are tallied

[Bitbucket <com...@bi...>]

1 new commit in foraging:


https://bitbucket.org/virtualcommons/foraging/changeset/3c1fc2c5a4b6/
changeset:   3c1fc2c5a4b6
user:        alllee
date:        2012-02-28 07:43:39
summary:     re-enabling voting on imposed condition, participants will first see the vote screen and then be sent to the imposed screen after the votes are tallied
affected #:  5 files

diff -r 399e682aa7def771a90bda0b926eb4a901d1b2ab -r 3c1fc2c5a4b6a82787547c25e48157d52c33effb src/main/java/edu/asu/commons/foraging/client/ForagingClient.java
--- a/src/main/java/edu/asu/commons/foraging/client/ForagingClient.java
+++ b/src/main/java/edu/asu/commons/foraging/client/ForagingClient.java
@@ -449,7 +449,7 @@
 
     public void sendRuleVoteRequest(ForagingStrategy selectedRule) {
         transmit(new RuleVoteRequest(getId(), selectedRule));
-        getGameWindow2D().ruleVoteSubmitted();
+        getGameWindow2D().strategyNominationSubmitted();
     }
 
 


diff -r 399e682aa7def771a90bda0b926eb4a901d1b2ab -r 3c1fc2c5a4b6a82787547c25e48157d52c33effb src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
--- a/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
+++ b/src/main/java/edu/asu/commons/foraging/conf/RoundConfiguration.java
@@ -553,6 +553,10 @@
     public boolean isVotingEnabled() {
         return getBooleanProperty("voting-enabled");
     }
+    
+    public boolean isImposedStrategyEnabled() {
+    	return getBooleanProperty("imposed-strategy-enabled");
+    }
 
     public String getVotingInstructions() {
         return getProperty("voting-instructions");


diff -r 399e682aa7def771a90bda0b926eb4a901d1b2ab -r 3c1fc2c5a4b6a82787547c25e48157d52c33effb src/main/java/edu/asu/commons/foraging/ui/GameWindow2D.java
--- a/src/main/java/edu/asu/commons/foraging/ui/GameWindow2D.java
+++ b/src/main/java/edu/asu/commons/foraging/ui/GameWindow2D.java
@@ -882,7 +882,7 @@
         showInstructionsPanel();
     }
 
-    public void ruleVoteSubmitted() {
+    public void strategyNominationSubmitted() {
         setInstructions(dataModel.getRoundConfiguration().getSubmittedVoteInstructions());
         showInstructionsPanel();
     }


diff -r 399e682aa7def771a90bda0b926eb4a901d1b2ab -r 3c1fc2c5a4b6a82787547c25e48157d52c33effb src/main/resources/configuration/iu/2011/imposed/round4.xml
--- a/src/main/resources/configuration/iu/2011/imposed/round4.xml
+++ b/src/main/resources/configuration/iu/2011/imposed/round4.xml
@@ -12,7 +12,8 @@
 <entry key='max-cell-occupancy'>1</entry><entry key="initial-distribution">.25</entry>
-<entry key='imposed-strategy'>true</entry>
+<entry key='voting-enabled'>true</entry>
+<entry key='imposed-strategy-enabled'>true</entry><entry key="instructions"><![CDATA[
     <h1>Round {self.roundNumber} Instructions</h1>


diff -r 399e682aa7def771a90bda0b926eb4a901d1b2ab -r 3c1fc2c5a4b6a82787547c25e48157d52c33effb src/main/resources/configuration/iu/2011/imposed/server.xml
--- a/src/main/resources/configuration/iu/2011/imposed/server.xml
+++ b/src/main/resources/configuration/iu/2011/imposed/server.xml
@@ -17,6 +17,7 @@
 <entry key="wait-for-participants">true</entry><entry key="number-of-rounds">10</entry><entry key='external-survey-enabled'>true</entry>
+<entry key='imposed-strategy-enabled'>true</entry><entry key='survey-id-enabled'>true</entry><entry key='survey-instructions'><![CDATA[

Repository URL: https://bitbucket.org/virtualcommons/foraging/

--

This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.