JSON view format

measurement_viewer.py

@@ -4,6 +4,7 @@ import tornado.ioloop
 import tornado.web
 import models
 from tornado import gen
+import json
 
 
 class MainHandler(tornado.web.RequestHandler):
@@ -12,10 +13,17 @@ class MainHandler(tornado.web.RequestHandler):
         stations = yield models.Station.get_all()
         pollutions = yield models.Type.get_all()
         last_measurements = yield models.Measurement.get_all_last()
-
+        response = dict()
         for measurement in last_measurements:
-            self.write(str(measurement))
-            self.write("\n")
+            data = {
+                "station_name" : measurement.station.name,
+                "type" : measurement.type.shortname,
+                "value" : measurement.value,
+                "time" : measurement.time
+            }
+            response[measurement.id] = data
+        self.set_header('Content-Type', 'application/json')
+        self.write(json.dumps(response))        
 
 
 def make_app():