Work

airhorns · Nov 20, 2011 · 7ff43e8 · 7ff43e8
1 parent 915ddcd
commit 7ff43e8
Show file tree

Hide file tree

Showing 7 changed files with 39 additions and 10 deletions.
diff --git a/Gemfile b/Gemfile
@@ -18,15 +18,15 @@ group :http do
   gem 'eventmachine'
   gem "em-http-request"
   gem "hiredis", "~> 0.3.0"
-  gem "em-synchrony", :require => ['em-synchrony', 'em-synchrony/em-http'], :git => "git@github.com:hornairs/em-synchrony.git"
+  gem "em-synchrony", :require => ['em-synchrony', 'em-synchrony/em-http'], :git => "https://github.com/igrigorik/em-synchrony.git"
   gem "redis", :require => ["redis/connection/synchrony", "redis"]
 end
 
 group :server do
   gem 'goliath'
   gem 'eventmachine'
   gem "hiredis", "~> 0.3.0"
-  gem "em-synchrony", :git => "git@github.com:hornairs/em-synchrony.git"
+  gem "em-synchrony", :git => "https://github.com/igrigorik/em-synchrony.git"
   gem "redis", :require => ["redis/connection/synchrony", "redis"]
   gem 'redis-scripted', :require => "redis/scripted"
 end

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -8,7 +8,7 @@ GIT
       uuid
 
 GIT
-  remote: git@github.com:hornairs/em-synchrony.git
+  remote: https://github.com/igrigorik/em-synchrony.git
   revision: f07b2a139ba05a1eaf3559541f3584c73afe05b2
   specs:
     em-synchrony (1.0.0)

diff --git a/lib/stock_manager.rb b/lib/stock_manager.rb
@@ -40,7 +40,7 @@ def filled?(id)
   end
 
   def trade_count
-    $redis.zcard('trades')
+    $redis.zcard("trades_#{@stock_name}")
   end
 
   private

diff --git a/public/janet.jpeg b/public/janet.jpeg
diff --git a/public/screen.css b/public/screen.css
@@ -48,12 +48,22 @@ img {
 	width:100%;
 }
 
-#header p,
-#header h1,
-#header h2 {
+#header p, #header h1, #header h2 {
 	padding:.4em 15px 0 15px;
 	margin:0;
 }
+#header h1 {
+  float: left;
+}
+#header img {
+  display: block;
+  float: left;
+  width: 100px;
+}
+#header h2 {
+  display: block;
+  clear: both;
+}
 #menu ul {
 	clear:left;
 	float:left;

diff --git a/views/application.erb b/views/application.erb
@@ -15,7 +15,8 @@
 <body>
 
 <div id="header">
-	<h1>Janet</h1>
+  <h1>Janet</h1>
+  <img src="/janet.jpeg">
 	<h2></h2>
 	<div id="menu">
 		<ul>

diff --git a/views/graphs.coffee b/views/graphs.coffee
@@ -16,12 +16,31 @@ class ChartView
         renderTo: "graph"
         events:
           load: ->
-            #window.getNewData = setInterval self.getNewData, self.UPDATE_INTERVAL
+            window.getNewData = setInterval self.getNewData, self.UPDATE_INTERVAL
 
       navigator:
         enabled: false
 
       rangeSelector:
+        buttonTheme:
+          fill: 'none'
+          stroke: 'none'
+          style:
+            color: '#039'
+            fontWeight: 'bold'
+          states:
+            hover:
+              fill: 'white'
+            select:
+              style:
+                color: 'white'
+        inputStyle:
+          color: '#039'
+          fontWeight: 'bold'
+        labelStyle:
+          color: 'silver'
+          fontWeight: 'bold'
+        selected: 1
         buttons: [
           count: 1
           type: "second"
@@ -49,7 +68,6 @@ class ChartView
 
       series: [
         name: "#{stock} price"
-        type: "candlestick"
         data: []
         tooltip:
           yDecimals: 2