Merge branch 'master' of github.com:chris-martin/awareoffice

chris-martin · Mar 29, 2012 · 0bd0a6f · 0bd0a6f
2 parents 04e3632 + 8d05561
commit 0bd0a6f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 3 deletions.
diff --git a/python/purple.py b/python/purple.py
@@ -23,13 +23,15 @@ def go(self):
       select tmp from tmp_event
       where ts > ? and id = ?
     """, (
-      int((time.time() - 5) * 1000), self.id),
-    )
+      int((time.time() - 5) * 1000),
+      self.id
+    ))
     count = 0
     sum = 0
     for row in c:
       count += 1
       sum += float(row['tmp'])
+    sum /= 100
     if count:
       avg = sum / count
       if avg < 22.5:

diff --git a/web/graph.js b/web/graph.js
@@ -34,13 +34,18 @@ function update() {
     dataType: 'json',
     /*timeout: 1000,*/
     success: function(data) {
+
+      // the data comes from the server reverse-chronological
+      data.tmp.reverse();
+      data.idle.reverse();
+
       $.each(data.tmp, function(i, event) {
         if (i != data.tmp.length - 1) return;
         getLine(event.id)[0].append(event.ts, event.tmp / 100);
         if ($.grep(data.idle, function(x) {
           return x.id === event.id && Math.abs(x.ts - event.ts) < 0.5;
         }).length)
-          getLine(event.id)[1].append(event.ts, event.tmp / 100);
+        getLine(event.id)[1].append(event.ts, event.tmp / 100);
       });
     },
     complete: function() {