Commit b8b5df21 authored by Kristian Tan's avatar Kristian Tan

Fix not tracking usage

parent aa690e2c
...@@ -37,7 +37,6 @@ class DailyUsage(db.Model): ...@@ -37,7 +37,6 @@ class DailyUsage(db.Model):
def get_todays_usage(): def get_todays_usage():
latest_entry = DailyUsage.query.order_by(desc(DailyUsage.date)).first() latest_entry = DailyUsage.query.order_by(desc(DailyUsage.date)).first()
print(latest_entry)
# latest_entry = db.session.query(DailyUsage).order_by(DailyUsage.date.asc()).first() # latest_entry = db.session.query(DailyUsage).order_by(DailyUsage.date.asc()).first()
if latest_entry: if latest_entry:
latest_entry_date = date(latest_entry.date.year, latest_entry.date.month, latest_entry.date.day) latest_entry_date = date(latest_entry.date.year, latest_entry.date.month, latest_entry.date.day)
...@@ -76,7 +75,7 @@ def create_entry(change_pin): ...@@ -76,7 +75,7 @@ def create_entry(change_pin):
db.create_all() db.create_all()
db.session.commit()
daily_total = get_todays_usage() daily_total = get_todays_usage()
todays_cost = get_todays_cost() todays_cost = get_todays_cost()
...@@ -99,12 +98,17 @@ labels = [] ...@@ -99,12 +98,17 @@ labels = []
values = [] values = []
max = 0 max = 0
# Create data for chart
count = 0
records = DailyUsage.query.order_by(asc(DailyUsage.date)).all() records = DailyUsage.query.order_by(asc(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)
if record.kwhUsed > max: if record.kwhUsed > max:
max = record.kwhUsed max = record.kwhUsed
count += 1
if count >= 7:
break
@app.route("/") @app.route("/")
def main(): def main():
......
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