[virtualcommons-svn] commit/vcweb: alllee: more pruning unnecessary data from json messages

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

1 new commit in vcweb:

https://bitbucket.org/virtualcommons/vcweb/commits/7447523911a3/
Changeset:   7447523911a3
User:        alllee
Date:        2013-04-24 02:36:23
Summary:     more pruning unnecessary data from json messages
Affected #:  4 files

diff -r c83b09da4b5ab40d5c6bd9ee2d45d19c9786a780 -r 7447523911a35f3c026730beebb8432b2ea7899e vcweb/bound/templates/bound/participate.html
--- a/vcweb/bound/templates/bound/participate.html
+++ b/vcweb/bound/templates/bound/participate.html
@@ -67,7 +67,7 @@
     </div><ul class='pager'><li class='next'>
-        <a href='javascript: void()' data-bind='click: participantReady.bind($data, participantHandle() + " finished reading session summary.") '>Ok, I'm ready</a>
+        <a href='javascript: void()' data-bind='click: participantReady.bind($data, participantGroupId() + " finished reading session summary.") '>Ok, I'm ready</a></li></ul></script>
@@ -118,7 +118,7 @@
         <a href='javascript: void()' data-bind='click: activateTemplate.bind($data, "PRACTICE_ROUND_RESULTS")'>Back</a></li><li class='next'>
-        <a href='javascript: void()' data-bind='click: participantReady.bind($data, participantHandle() + " finished paid experiment instructions") '>Ok, I understand</a>
+        <a href='javascript: void()' data-bind='click: participantReady.bind($data, participantGroupId() + " finished paid experiment instructions") '>Ok, I understand</a></li></ul></script>
@@ -158,7 +158,7 @@
 </ul><ul class='pager'><li class='next'>
-    <a href='javascript: void()' data-bind='click: participantReady.bind($data, participantHandle() + " finished treatment A instructions")'>Ok, I am ready to start</a>
+    <a href='javascript: void()' data-bind='click: participantReady.bind($data, participantGroupId() + " finished treatment A instructions")'>Ok, I am ready to start</a></li></ul></script>
@@ -175,7 +175,7 @@
 </ul><ul class='pager'><li class='next'>
-    <a href='javascript: void()' data-bind='click: participantReady.bind($data, participantHandle() + " finished treatment D instructions")'>Ok, I am ready to start</a>
+    <a href='javascript: void()' data-bind='click: participantReady.bind($data, participantGroupId() + " finished treatment D instructions")'>Ok, I am ready to start</a></li></ul></script>
@@ -326,7 +326,7 @@
 <a href='javascript:void();' data-bind='click: activateTemplate.bind($data, "GENERAL_INSTRUCTIONS3")'>Back</a></li><li class='next'>
-<a href='javascript: void();' data-bind='click: participantReady.bind($data, participantHandle() + " finished practice round instructions")'>I have fully read and understand these instructions</a>
+<a href='javascript: void();' data-bind='click: participantReady.bind($data, participantGroupId() + " finished practice round instructions")'>I have fully read and understand these instructions</a></li></ul></script>

diff -r c83b09da4b5ab40d5c6bd9ee2d45d19c9786a780 -r 7447523911a35f3c026730beebb8432b2ea7899e vcweb/bound/views.py
--- a/vcweb/bound/views.py
+++ b/vcweb/bound/views.py
@@ -133,7 +133,6 @@
 # participant data
     experiment_model_dict['participantNumber'] = participant_group_relationship.participant_number
     experiment_model_dict['participantGroupId'] = participant_group_relationship.pk
-    experiment_model_dict['participantHandle'] = participant_group_relationship.participant_handle
     # FIXME: these should only need to be added for playable rounds but KO gets unhappy when we switch templates from
     # instructions rounds to practice rounds.
     own_group = participant_group_relationship.group

diff -r c83b09da4b5ab40d5c6bd9ee2d45d19c9786a780 -r 7447523911a35f3c026730beebb8432b2ea7899e vcweb/core/models.py
--- a/vcweb/core/models.py
+++ b/vcweb/core/models.py
@@ -2011,7 +2011,6 @@
         data.update(
                 group_id=group.pk,
                 group=unicode(group),
-                participant_handle=pgr.participant_handle,
                 participant_number=pgr.participant_number,
                 event_type='chat',
                 )

diff -r c83b09da4b5ab40d5c6bd9ee2d45d19c9786a780 -r 7447523911a35f3c026730beebb8432b2ea7899e vcweb/core/templates/experimenter/monitor.html
--- a/vcweb/core/templates/experimenter/monitor.html
+++ b/vcweb/core/templates/experimenter/monitor.html
@@ -88,7 +88,7 @@
                                 {% for item in group.list %}
                                 <tr><td>{{ item.participant_group_relationship.pk }}</td>
-                                    <td>{{ item.participant_group_relationship.participant_handle}}</td>
+                                    <td>{{ item.participant_group_relationship.participant_number}}</td><td>{{ item.participant_group_relationship.participant.email }}</td></tr>
                                 {% endfor %}
@@ -142,7 +142,7 @@
         <div id='experiment-chat-messages' class='scrollable-messages accordion-body collapse'><div class='alert' data-bind='foreach: chatMessages'><div>
-                    <span data-bind='text: participant_handle'></span>(<span data-bind='text: group'></span>): <strong data-bind='text: value'></strong>
+                    <span data-bind='text: participant_number'></span>(<span data-bind='text: group'></span>): <strong data-bind='text: value'></strong><span class='pull-right' data-bind='text: short_date_created'></span></div></div>

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.