Finally update is visible

nko · Aug 30, 2010 · 0d0a39f · 0d0a39f
1 parent eff73d3
commit 0d0a39f
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 14 deletions.
diff --git a/pagetalk.js b/pagetalk.js
@@ -51,12 +51,17 @@ http_server.post('/voting-room', function(req, res) {
     voting_room_id = create_random_id(10);
   var vr = poorsman_mongodb.voting_rooms[voting_room_id] = {
     'voting_room_id': voting_room_id,
-    'options': {}
+    'options': {},
   };
   for(var i = 0, len = voting_room_data.options.length; i < len; i++) {
-    vr.options[voting_room_data.options[i].title] = {'votes': 0};
+    vr.options[voting_room_data.options[i].title] = {
+      'votes': 0,
+      'title': voting_room_data.options[i].title,
+      'colors': voting_room_data.options[i].colors
+    };
   }
   vr.voting_room_id = voting_room_id;
+  console.log('poorsman_mongodb.voting_rooms[voting_room_id]: ' + poorsman_mongodb.voting_rooms[voting_room_id]);
   res.redirect('/voting-room/' + voting_room_id);
 });
 
@@ -70,7 +75,7 @@ socket_server.on('connection', function(client) {
     if(message.pick) {
       poorsman_mongodb.voting_rooms[voting_room_id].options[message.pick].votes++; 
     }
-    client.broadcast({'options': poorsman_mongodb.voting_rooms[voting_room_id]});  
+    client.broadcast(poorsman_mongodb.voting_rooms[voting_room_id]);  
   });
   client.on('disconnect', function() {
     var message = poorsman_mongodb.connected_clients[client.sessionId];
@@ -81,7 +86,7 @@ socket_server.on('connection', function(client) {
     client.broadcast(poorsman_mongodb.voting_rooms[voting_room_id]);
   });
   for(var voting_room_id in poorsman_mongodb.voting_rooms) {
-    socket_server.broadcast({'options': poorsman_mongodb.voting_rooms[voting_room_id]});
+    socket_server.broadcast(poorsman_mongodb.voting_rooms[voting_room_id]);
   }
 });
 

diff --git a/static/js/index.js b/static/js/index.js
@@ -2,7 +2,7 @@ nodevote = {'ui': {'handlers': {}}};
 nodevote.ui.handlers['create'] = {
   'click': function() {
     var options = [];
-    var bars = $('.bar');
+    var bars = $('.voting-option');
     for(var option, i = 0, len = bars.length; i < len; i++) {
       option = {};
       option.title = $(bars[i]).find('input').val();
@@ -79,7 +79,7 @@ nodevote.ui.next_random_color = function() {
 }
 nodevote.ui.create_bar = function(height, color) {
   return $(
-    '<div class="bar" style="height: ' + height + 'px; background-color: #' + color + ';">' +
+    '<div class="bar voting-option" style="height: ' + height + 'px; background-color: #' + color + ';">' +
     '<input type="input"></input>' +
     '</div>'
   );

diff --git a/static/js/voting-room.js b/static/js/voting-room.js
@@ -4,27 +4,45 @@ nodevote.ui.handlers = {};
 
 nodevote.ui.create_bar = function(height, color) {
   return $(
-    '<div class="bar" style="height: ' + height + 'px; background-color: #' + color + ';">' +
+    '<div class="bar" style="height: ' + height + 'px; background-color: ' + color + ';">' +
     '</div>'
   );
 }
 
 $(document).ready(function() {
   socket_client = new io.Socket(null, {port: 80});
   socket_client.connect();
-  var on_message = function(options) {
-    var total_height = $(window).height();
-    var bar;
-    for(var i = 0, len = options.options.length; i < len; i++) {
-      bar = nodevote.ui.create_bar(60, options.options.fore);
-      bar
+  var on_message = function(voting_room) {
+    console.log(voting_room.options);
+    var total_height = $(window).height()-60;
+    var total_votes = 0;
+    for(var option in voting_room.options) {
+      total_votes += voting_room.options[option].votes;
+    }
+    for(var option in voting_room.options) {
+      voting_room.options[option].votePercentage = voting_room.options[option].votes*100/total_votes;
+    }
+    var votePercentage;
+    $('#column-b > div').remove();
+    for(var option in voting_room.options) {
+      console.log('option: ' + option);
+      votePercentage = voting_room.options[option].votePercentage;
+      if(votePercentage == 0) {
+        bar = nodevote.ui.create_bar(30, voting_room.options[option].colors.back);
+        bar.text(voting_room.options[option].title + ": 0 votes")
+      } else {
+        console.log('total_height*100/votePercentage: ' + total_height*100/votePercentage);
+        bar = nodevote.ui.create_bar(votePercentage*100/total_height, voting_room.options[option].colors.back);
+        bar.text(voting_room.options[option].title + ": " + voting_room.options[option].votes + " votes")
+      }
+      bar.css('color', '' + voting_room.options[option].colors.fore);
+      $('#column-b').append(bar);
     }
   }
   socket_client.on('message', on_message);
   nodevote.ui.handlers['freeze'] = {
     'click': function() {
     }
   }
-  socket_client.send({'voting_room_id': nodevote.voting_room_id});
   $('#freeze').click(nodevote.ui.handlers['freeze'].click);
 });