Commit e68b22b1 authored by Kristian Tan's avatar Kristian Tan

refactor

parent 6a14b698
...@@ -114,18 +114,6 @@ for pin in pins: ...@@ -114,18 +114,6 @@ for pin in pins:
labels, values, max = generate_graph_data() labels, values, max = generate_graph_data()
# Create data for chart
# count = 0
# records = DailyUsage.query.order_by(asc(DailyUsage.date)).all()
# for record in records:
# labels.append(date(record.date.year, record.date.month, record.date.day))
# values.append(record.kwhUsed)
# if record.kwhUsed > max:
# max = record.kwhUsed
# count += 1
# if count >= 7:
# break
@app.route("/") @app.route("/")
def main(): def main():
# For each pin, read the pin state and store it in the pins dictionary: # For each pin, read the pin state and store it in the pins dictionary:
...@@ -158,6 +146,7 @@ def toggle_pin(change_pin): ...@@ -158,6 +146,7 @@ def toggle_pin(change_pin):
if GPIO.input(change_pin) == 0: if GPIO.input(change_pin) == 0:
if pins[change_pin]['on_time'] is not None: if pins[change_pin]['on_time'] is not None:
create_entry(change_pin) create_entry(change_pin)
else: else:
pins[change_pin]['on_time'] = datetime.now() pins[change_pin]['on_time'] = datetime.now()
pins[change_pin]['on_date'] = date.today() pins[change_pin]['on_date'] = date.today()
...@@ -165,6 +154,7 @@ def toggle_pin(change_pin): ...@@ -165,6 +154,7 @@ def toggle_pin(change_pin):
for pin in pins: for pin in pins:
pins[pin]['state'] = GPIO.input(pin) pins[pin]['state'] = GPIO.input(pin)
labels, values, max = generate_graph_data()
template_data = { template_data = {
'pins': pins, 'pins': pins,
'daily_total': get_todays_usage(), 'daily_total': get_todays_usage(),
......
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