Skip to content

I
IoTSmartMeter
Commit fe057870 authored by Kristian Tan's avatar Kristian Tan
Browse files
Options

Order chart by date

parent f699038b
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 6 deletions
app.py
View file @ fe057870
from flask import Flask, render_template, request from flask import Flask, render_template, request
import RPi.GPIO as GPIO import RPi.GPIO as GPIO
from flask_sqlalchemy import SQLAlchemy from flask_sqlalchemy import SQLAlchemy
from sqlalchemy import desc
import os import os
from datetime import datetime, date, timedelta from datetime import datetime, date, timedelta
# from daily_usage import DailyUsage # from daily_usage import DailyUsage
...@@ -74,10 +74,6 @@ def create_entry(change_pin): ...@@ -74,10 +74,6 @@ def create_entry(change_pin):
db.create_all() db.create_all()
db.session.add(DailyUsage(date=date(2019, 11, 11), kwhUsed=6.7))
db.session.add(DailyUsage(date=date(2019, 11, 10), kwhUsed=9.2))
db.session.add(DailyUsage(date=date(2019, 11, 9), kwhUsed=8.4))
db.session.add(DailyUsage(date=date(2019, 11, 8), kwhUsed=9))
db.session.commit() db.session.commit()
daily_total = get_todays_usage() daily_total = get_todays_usage()
todays_cost = get_todays_cost() todays_cost = get_todays_cost()
...@@ -107,7 +103,7 @@ def main(): ...@@ -107,7 +103,7 @@ def main():
values = [] values = []
max = 0 max = 0
records = DailyUsage.query.all() records = DailyUsage.query.order_by(desc(DailyUsage.date)).all()
for record in records: for record in records:
labels.append(date(record.date.year, record.date.month, record.date.day)) labels.append(date(record.date.year, record.date.month, record.date.day))
values.append(record.kwhUsed) values.append(record.kwhUsed)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment