[virtualcommons-svn] commit/foraging: alllee: updating template references to clientsPerGroup and r
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] commit/foraging: alllee: updating template references to clientsPerGroup and roundNumber to refer to this
|
From: Bitbucket <com...@bi...> - 2012-01-19 23:02:23
|
1 new commit in foraging: https://bitbucket.org/virtualcommons/foraging/changeset/d76727cadd78/ changeset: d76727cadd78 user: alllee date: 2012-01-20 00:02:25 summary: updating template references to clientsPerGroup and roundNumber to refer to this round configuration instead of an explicitly injected attribute. affected #: 7 files diff -r b8e59da90fc2c79142c752ca269280bd73ace8f0 -r d76727cadd7803db7bb0425d9b96784779d99a15 src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java --- a/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java +++ b/src/main/java/edu/asu/commons/foraging/conf/ServerConfiguration.java @@ -89,7 +89,7 @@ } public String getGeneralInstructions() { - ST st = createStringTemplate(assistant.getStringProperty("general-instructions", "")); + ST st = createStringTemplate(assistant.getStringProperty("general-instructions")); NumberFormat formatter = NumberFormat.getCurrencyInstance(); st.add("showUpPayment", formatter.format(getShowUpPayment())); st.add("dollarsPerToken", formatter.format(getDollarsPerToken())); diff -r b8e59da90fc2c79142c752ca269280bd73ace8f0 -r d76727cadd7803db7bb0425d9b96784779d99a15 src/main/resources/configuration/asu/2011/t1/round1.xml --- a/src/main/resources/configuration/asu/2011/t1/round1.xml +++ b/src/main/resources/configuration/asu/2011/t1/round1.xml @@ -12,7 +12,7 @@ <entry key='max-cell-occupancy'>1</entry><entry key="instructions"><![CDATA[ -<h1>Round {roundNumber} Instructions</h1> +<h1>Round {self.roundNumber} Instructions</h1><hr><p> This is the first round of the experiment. The length of the round is @@ -26,9 +26,9 @@ In this round the renewable resource will become five times bigger. You will share this larger environment with four other random players in this room. Each participant in the room has been randomly assigned to one of several equal-sized -{clientsPerGroup} person groups and everyone in your group has been randomly -assigned a number from 1 to {clientsPerGroup}. You will stay in the same group for -the entire experiment, and each person's number from 1 to {clientsPerGroup} will +{self.clientsPerGroup} person groups and everyone in your group has been randomly +assigned a number from 1 to {self.clientsPerGroup}. You will stay in the same group for +the entire experiment, and each person's number from 1 to {self.clientsPerGroup} will remain the same throughout the experiment. The other members of your group will appear on the screen as blue dots <img src="@CODEBASE_URL@/images/gem-other.gif"> with a white number embedded in the dot. diff -r b8e59da90fc2c79142c752ca269280bd73ace8f0 -r d76727cadd7803db7bb0425d9b96784779d99a15 src/main/resources/configuration/asu/2011/t2/round1.xml --- a/src/main/resources/configuration/asu/2011/t2/round1.xml +++ b/src/main/resources/configuration/asu/2011/t2/round1.xml @@ -13,7 +13,7 @@ <entry key='max-cell-occupancy'>1</entry><entry key="instructions"><![CDATA[ -<h1>Round {roundNumber} Instructions</h1> +<h1>Round {self.roundNumber} Instructions</h1><hr><p> This is the first round of the experiment. The length of the round is @@ -27,9 +27,9 @@ In this round the renewable resource will become five times bigger. You will share this larger environment with four other random players in this room. Each participant in the room has been randomly assigned to one of several equal-sized -{clientsPerGroup} person groups and everyone in your group has been randomly -assigned a number from 1 to {clientsPerGroup}. You will stay in the same group for -the entire experiment, and each person's number from 1 to {clientsPerGroup} will +{self.clientsPerGroup} person groups and everyone in your group has been randomly +assigned a number from 1 to {self.clientsPerGroup}. You will stay in the same group for +the entire experiment, and each person's number from 1 to {self.clientsPerGroup} will remain the same throughout the experiment. The other members of your group will appear on the screen as blue dots <img src="@CODEBASE_URL@/images/gem-other.gif"> with a white number embedded in the dot. diff -r b8e59da90fc2c79142c752ca269280bd73ace8f0 -r d76727cadd7803db7bb0425d9b96784779d99a15 src/main/resources/configuration/asu/2011/t3/round1.xml --- a/src/main/resources/configuration/asu/2011/t3/round1.xml +++ b/src/main/resources/configuration/asu/2011/t3/round1.xml @@ -14,7 +14,7 @@ <entry key='subjects-field-of-vision'>true</entry><entry key="instructions"><![CDATA[ -<h1>Round {roundNumber} Instructions</h1> +<h1>Round {self.roundNumber} Instructions</h1><hr><p> This is the first round of the experiment. The length of the round is @@ -28,9 +28,9 @@ In this round the renewable resource will become five times bigger. You will share this larger environment with four other random players in this room. Each participant in the room has been randomly assigned to one of several equal-sized -{clientsPerGroup} person groups and everyone in your group has been randomly -assigned a number from 1 to {clientsPerGroup}. You will stay in the same group for -the entire experiment, and each person's number from 1 to {clientsPerGroup} will +{self.clientsPerGroup} person groups and everyone in your group has been randomly +assigned a number from 1 to {self.clientsPerGroup}. You will stay in the same group for +the entire experiment, and each person's number from 1 to {self.clientsPerGroup} will remain the same throughout the experiment. The other members of your group will appear on the screen as blue dots <img src="@CODEBASE_URL@/images/gem-other.gif"> with a white number embedded in the dot. diff -r b8e59da90fc2c79142c752ca269280bd73ace8f0 -r d76727cadd7803db7bb0425d9b96784779d99a15 src/main/resources/configuration/asu/2011/t4/round1.xml --- a/src/main/resources/configuration/asu/2011/t4/round1.xml +++ b/src/main/resources/configuration/asu/2011/t4/round1.xml @@ -15,7 +15,7 @@ <entry key='subjects-field-of-vision'>true</entry><entry key="instructions"><![CDATA[ -<h1>Round {roundNumber} Instructions</h1> +<h1>Round {self.roundNumber} Instructions</h1><hr><p> This is the first round of the experiment. The length of the round is @@ -29,9 +29,9 @@ In this round the renewable resource will become five times bigger. You will share this larger environment with four other random players in this room. Each participant in the room has been randomly assigned to one of several equal-sized -{clientsPerGroup} person groups and everyone in your group has been randomly -assigned a number from 1 to {clientsPerGroup}. You will stay in the same group for -the entire experiment, and each person's number from 1 to {clientsPerGroup} will +{self.clientsPerGroup} person groups and everyone in your group has been randomly +assigned a number from 1 to {self.clientsPerGroup}. You will stay in the same group for +the entire experiment, and each person's number from 1 to {self.clientsPerGroup} will remain the same throughout the experiment. The other members of your group will appear on the screen as blue dots <img src="@CODEBASE_URL@/images/gem-other.gif"> with a white number embedded in the dot. diff -r b8e59da90fc2c79142c752ca269280bd73ace8f0 -r d76727cadd7803db7bb0425d9b96784779d99a15 src/main/resources/configuration/iu/2011/vote-punish/round1.xml --- a/src/main/resources/configuration/iu/2011/vote-punish/round1.xml +++ b/src/main/resources/configuration/iu/2011/vote-punish/round1.xml @@ -13,7 +13,7 @@ <entry key="instructions"><![CDATA[ -<h3>Instructions for Round {roundNumber}</h3> +<h3>Instructions for Round {self.roundNumber}</h3><hr><p> The first round of the experiment will begin in a moment. The length of the @@ -26,10 +26,10 @@ <p> In this round the renewable resource will become five times bigger. You will share this larger environment with three other random players in this room. In particular, -each of you in this room has been randomly assigned to one of several equal-sized {clientsPerGroup} +each of you in this room has been randomly assigned to one of several equal-sized {self.clientsPerGroup} person groups and everyone in your group has been randomly assigned a number from 1 -to {clientsPerGroup}. You will stay in the same group for the entire experiment, and each person's -number from 1 to {clientsPerGroup} will remain the same throughout the experiment. +to {self.clientsPerGroup}. You will stay in the same group for the entire experiment, and each person's +number from 1 to {self.clientsPerGroup} will remain the same throughout the experiment. The other three people in your group will appear on the screen as blue dots <img src="@CODEBASE_URL@/images/gem-other.gif"> with a white number embedded in the dot. </p> diff -r b8e59da90fc2c79142c752ca269280bd73ace8f0 -r d76727cadd7803db7bb0425d9b96784779d99a15 src/main/resources/configuration/iu/2011/vote-punish/server.xml --- a/src/main/resources/configuration/iu/2011/vote-punish/server.xml +++ b/src/main/resources/configuration/iu/2011/vote-punish/server.xml @@ -163,18 +163,18 @@ occurred from the room. </p><p> -You will see other participants labeled as "1", "2","3", "4", or "5" in the chat -box. You can send a chat message by typing into the textfield and pressing the -enter key. + You will see other participants labeled from A to {self.lastChatHandle} in the + chat box. You can send a chat message by typing into the textfield and pressing + the enter key. </p> ]]></entry><entry key="sameRoundAsPreviousInstructions"><![CDATA[ -<h3>Round {roundNumber} Instructions</h3> +<h3>Round {self.roundNumber} Instructions</h3><hr> -<p>Round {roundNumber} is the same as the previous round.</p> +<p>Round {self.roundNumber} is the same as the previous round.</p><p>The length of this round is {duration}.</p><p><b>Do you have any questions?</b> If you have any questions at this time please raise your hand and someone will come over to your station and answer it.</p> ]]> 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. |
