Merge branch 'master' of https://gitlab.telemabk.pl/dominik/smogonet

measurement_viewer.py

@@ -3,21 +3,12 @@ import sys
 import tornado.ioloop
 import tornado.web
 import models
-import json
-import decimal
-
-#import boto.dynamodb2
-#from boto.dynamodb2.table import Table
-#from time import sleep
 from tornado import gen
 
 
 class MainHandler(tornado.web.RequestHandler):
     @gen.coroutine
     def get(self):
-        #stations = self.get_stations()
-        #stations = models.Station.get_all()
-        #stations = models.Station.getall()
         stations = yield models.Station.get_all()
         pollutions = yield models.Type.get_all()
 
@@ -26,39 +17,6 @@ class MainHandler(tornado.web.RequestHandler):
                 measurement = yield models.Measurement.get_last(station, pollution)
                 self.write(str(measurement))
 
-        # measurement = models.Measurement.getlast(station=s.id)
-        # self.write("".format())
-
-
-        #measurements = self.get_measurements()
-
-      
-    def get_stations(self):
-        c = boto.dynamodb2.connect_to_region(aws_access_key_id="AKIAI6N5UWFTE5HR3FWQ",aws_secret_access_key="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",region_name="eu-central-1")
-        tab = Table("stations",connection=c)
-        return tab.scan()
-        #a = tab.get_item(station_id='1')
-        #print x
-        #self.write("fdskfds")
-        #for i in x:
-       # 	self.write(i['station_id'])
-       # return a
-        
-'''        tab.put_item(data={
-        	'station_id':'3',
-        	'city':'krakow',
-        	'longitude':12,
-        	'latitude':1,
-        	'name':'nazwa'
-        	})
-'''
-        
-        #a = tab.get_item(station_id='1')
-        #x = tab.scan()
-#        print x
-#        for i in x:
-#            print(json.dumps(i, cls=DecimalEncoder))
-
 
 def make_app():
     return tornado.web.Application([