cleanup

web/dynamic.py

@@ -223,7 +223,7 @@ class DynamicData(object):
                                                         self.q['end'],
                                                         self.q['granularity'])
         query3 = "ORDER BY time DESC"
-        query = "{} {}".format(query1, query2, query3)
+        query = "{} {} {}".format(query1, query2, query3)
         measures = self.influx_weather_client.query(query)
         # Let's get the data from DB
         header = "time,Pressure\n"
@@ -322,11 +322,11 @@ class DynamicData(object):
             try:
                 cpu_value = float(str(cpu["Cpu"]).strip())
             except:
-                solar_value = ''
+                cpu_value = ''
             try:
                 mem_value = float(str(mem["Mem"]).strip())
             except:
-                cap_value = ''
+                mem_value = ''
             try:
                 disk_value = float(str(disk["Disk"]).strip())
             except: