Skip to content

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

hours field is string

parent 87f9bcd5
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 3 deletions
app.py
View file @ dec6e403
...@@ -22,7 +22,7 @@ class DailyUsage(db.Model): ...@@ -22,7 +22,7 @@ class DailyUsage(db.Model):
__tablename__ = 'daily_usage' __tablename__ = 'daily_usage'
id = db.Column(db.Integer, primary_key=True, autoincrement=True) id = db.Column(db.Integer, primary_key=True, autoincrement=True)
date = db.Column(db.DateTime, unique=True, nullable=False) date = db.Column(db.DateTime, unique=True, nullable=False)
hours = db.Column(db.Integer, unique=False) hours = db.Column(db.String, unique=False)
def __init__(self, date, hours): def __init__(self, date, hours):
self.date = date self.date = date
...@@ -75,8 +75,10 @@ def toggle_pin(change_pin): ...@@ -75,8 +75,10 @@ def toggle_pin(change_pin):
if GPIO.input(change_pin) == 0: if GPIO.input(change_pin) == 0:
message += " off." message += " off."
if pins[change_pin]['on_time'] is not None: if pins[change_pin]['on_time'] is not None:
uptime = datetime.now() - pins[change_pin]['on_time'] uptime = str(datetime.now() - pins[change_pin]['on_time'])
uptime = datetime.strptime(uptime, '%b %d %Y %I:%M%p') print("===========")
print("UPTIME STRING: " + uptime)
print("===========")
date = datetime.strptime(pins[change_pin]['on_time'], '%b %d %Y %I:%M%p') date = datetime.strptime(pins[change_pin]['on_time'], '%b %d %Y %I:%M%p')
d = DailyUsage(date=date, hours=uptime) d = DailyUsage(date=date, hours=uptime)
db.session.add(d) db.session.add(d)
......
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