Commit b93bf231 authored by Kristian Tan's avatar Kristian Tan

Display todays cost

parent d2aea06a
...@@ -77,13 +77,10 @@ def toggle_pin(change_pin): ...@@ -77,13 +77,10 @@ def toggle_pin(change_pin):
# Toggle the selected pin # Toggle the selected pin
GPIO.output(change_pin, not GPIO.input(change_pin)) GPIO.output(change_pin, not GPIO.input(change_pin))
message = "Turned " + device_name
if GPIO.input(change_pin) == 0: if GPIO.input(change_pin) == 0:
message += " off."
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:
message += " on."
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()
...@@ -98,11 +95,12 @@ def toggle_pin(change_pin): ...@@ -98,11 +95,12 @@ def toggle_pin(change_pin):
else: else:
daily_total = 0 daily_total = 0
todays_cost = 0.1622 * daily_total
template_data = { template_data = {
'message': message,
'pins': pins, 'pins': pins,
'daily_total': daily_total 'daily_total': daily_total,
'todays_cost': todays_cost
} }
return render_template('main.html', **template_data) return render_template('main.html', **template_data)
......
...@@ -24,9 +24,6 @@ ...@@ -24,9 +24,6 @@
{% endfor %} {% endfor %}
{# {% if message %}#}
{# <h2>{{ message }}</h2>#}
{# {% endif %}#}
</div> </div>
<div class="smart_meter"> <div class="smart_meter">
...@@ -40,6 +37,7 @@ ...@@ -40,6 +37,7 @@
</p> </p>
{# Implement some way to display "No devices" message if none are in use#} {# Implement some way to display "No devices" message if none are in use#}
<p> Total energy used today: {{ daily_total }} kWh.</p> <p> Total energy used today: {{ daily_total }} kWh.</p>
<p> Total cost of today's energy usage: £{{ todays_cost }}</p>
</div> </div>
</div> </div>
</div> </div>
......
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