[virtualcommons-svn] commit/irrigation: alllee: fixing configuration for same as previous round def
Status: Beta
Brought to you by:
alllee
Menu
▾
▴
[virtualcommons-svn] commit/irrigation: alllee: fixing configuration for same as previous round default instructions
|
From: Bitbucket <com...@bi...> - 2012-03-26 19:49:06
|
1 new commit in irrigation: https://bitbucket.org/virtualcommons/irrigation/changeset/7a67c82159e2/ changeset: 7a67c82159e2 user: alllee date: 2012-03-26 21:49:03 summary: fixing configuration for same as previous round default instructions affected #: 11 files diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/RoundConfiguration.java @@ -107,7 +107,6 @@ ST template = createStringTemplate(getProperty("instructions", getParentConfiguration().getSameAsPreviousRoundInstructions())); // FIXME: probably should just lift these out into methods on RoundConfiguration // and refer to them as self.durationInMinutes or self.dollarsPerTokenCurrencyString, etc. - template.add("duration", inMinutes(getDuration()) + " minutes"); template.add("dollarsPerToken", toCurrencyString(getDollarsPerToken())); return template.render(); } diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java --- a/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java +++ b/src/main/java/edu/asu/commons/irrigation/conf/ServerConfiguration.java @@ -194,7 +194,7 @@ } public String getSameAsPreviousRoundInstructions() { - return render(getProperty("same-as-previous-round-instructions")); + return getProperty("same-as-previous-round-instructions"); } public String getClientDebriefingTemplate() { diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/pretest/irrigation.xml --- a/src/main/resources/configuration/asu/2011/pretest/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/pretest/irrigation.xml @@ -428,7 +428,7 @@ <hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> - <p>The length of this round is {duration}.</p> + <p>The length of this round is {self.roundDurationInSeconds} seconds.</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. diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t1/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t1/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t1/irrigation.xml @@ -428,7 +428,7 @@ <hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> - <p>The length of this round is {duration}.</p> + <p>The length of this round is {self.roundDurationInSeconds} seconds.</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. diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t1/round3.xml --- a/src/main/resources/configuration/asu/2011/t1/round3.xml +++ b/src/main/resources/configuration/asu/2011/t1/round3.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 2 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t2/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t2/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t2/irrigation.xml @@ -428,7 +428,7 @@ <hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> - <p>The length of this round is {duration}.</p> + <p>The length of this round is {self.roundDurationInSeconds} seconds.</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. diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t2/round3.xml --- a/src/main/resources/configuration/asu/2011/t2/round3.xml +++ b/src/main/resources/configuration/asu/2011/t2/round3.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 2 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t3/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t3/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t3/irrigation.xml @@ -428,7 +428,7 @@ <hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> - <p>The length of this round is {duration}.</p> + <p>The length of this round is {self.roundDurationInSeconds} seconds.</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. diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t3/round3.xml --- a/src/main/resources/configuration/asu/2011/t3/round3.xml +++ b/src/main/resources/configuration/asu/2011/t3/round3.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 2 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t4/irrigation.xml --- a/src/main/resources/configuration/asu/2011/t4/irrigation.xml +++ b/src/main/resources/configuration/asu/2011/t4/irrigation.xml @@ -428,7 +428,7 @@ <hr><p>Round {self.roundNumber} is the same as the previous round.</p><p>{self.specialInstructions}</p> - <p>The length of this round is {duration}.</p> + <p>The length of this round is {self.roundDurationInSeconds} seconds.</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. diff -r 7de75c20d61a74a3ae8957dd633a305eaaf91ec7 -r 7a67c82159e2af3e2d42173649081dc0f36499fe src/main/resources/configuration/asu/2011/t4/round3.xml --- a/src/main/resources/configuration/asu/2011/t4/round3.xml +++ b/src/main/resources/configuration/asu/2011/t4/round3.xml @@ -2,14 +2,5 @@ <!DOCTYPE properties SYSTEM "http://java.sun.com/dtd/properties.dtd"><properties><comment>Irrigation experiment round configuration</comment> - -<entry key="instructions"> -<![CDATA[ -<h3>Round 2 Instructions</h3> -<p> -This round is the same as the previous round. -</p> - -]]> -</entry> +<entry key='field-of-vision'>1</entry></properties> Repository URL: https://bitbucket.org/virtualcommons/irrigation/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. |
