[virtualcommons-developer] commit/vcweb: dieg...@gmail.com: displaying payoff on the view

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

1 new commit in vcweb:

https://bitbucket.org/virtualcommons/vcweb/commits/ea01e7b153a2/
Changeset:   ea01e7b153a2
User:        di...@gm...
Date:        2013-03-27 20:25:44
Summary:     displaying payoff on the view
Affected #:  2 files

diff -r ac8883ef68fd2650fcf5004feb132b277e4eb4c5 -r ea01e7b153a264aefe8f002de660457b999226d2 vcweb/broker/models.py
--- a/vcweb/broker/models.py
+++ b/vcweb/broker/models.py
@@ -61,6 +61,12 @@
     prdv.int_value = value
     prdv.save()
 
+def get_payoff_dv(participant_group_relationship, round_data=None, default=0):
+    return participant_group_relationship.get_data_value(round_data=round_data, parameter=get_payoff_parameter(), default=default)
+
+def get_payoff(participant_group_relationship, round_data=None, default=0):
+    return get_payoff_dv(participant_group_relationship, round_data, default).int_value
+
 def get_group_local_bonus_threshold(round_configuration):
     return round_configuration.get_parameter_value(parameter=get_group_local_bonus_parameter(), default=5).int_value
 

diff -r ac8883ef68fd2650fcf5004feb132b277e4eb4c5 -r ea01e7b153a264aefe8f002de660457b999226d2 vcweb/broker/views.py
--- a/vcweb/broker/views.py
+++ b/vcweb/broker/views.py
@@ -9,13 +9,14 @@
 
 from vcweb.broker.models import (get_max_harvest_hours, get_harvest_decision_parameter,
         get_conservation_decision_parameter, set_harvest_decision, set_conservation_decision, get_harvest_decision,
-        get_conservation_decision)
+        get_conservation_decision, get_payoff)
 
 import random
 
 import logging
 
 logger = logging.getLogger(__name__)
+totalEarning =
 
 @participant_required
 def submit_decision(request, experiment_id=None):
@@ -105,7 +106,7 @@
     experiment_model_dict['lastRoundGlobalConservation'] = 10
     experiment_model_dict['lastRoundGroupLocalBonus'] = 10
     experiment_model_dict['lastRoundGroupGlobalBonus'] = 10
-    experiment_model_dict['lastRoundHarvestPayOff'] = 5
+    experiment_model_dict['lastRoundHarvestPayOff'] = get_payoff(participant_group_relationship, round_data=previous_round_data)
     experiment_model_dict['totalEarning'] = 100
     number_of_connected_groups = round_configuration.get_parameter_value(name='number_of_connected_groups', default=2).int_value
     experiment_model_dict['participantsPerSubGroup'] = group.max_size

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

--

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