Commit 7fc114e2 authored by Kristian Tan's avatar Kristian Tan

imports

parent 162a31ff
...@@ -4,7 +4,7 @@ from flask_sqlalchemy import SQLAlchemy ...@@ -4,7 +4,7 @@ from flask_sqlalchemy import SQLAlchemy
from sqlalchemy import asc, desc from sqlalchemy import asc, desc
import os import os
from datetime import datetime, date, timedelta from datetime import datetime, date, timedelta
from services import daily_usage_service from services import daily_usage_service.daily_usage_service
# from daily_usage import DailyUsage # from daily_usage import DailyUsage
app = Flask(__name__) app = Flask(__name__)
......
...@@ -5,12 +5,12 @@ from app import DailyUsage, db ...@@ -5,12 +5,12 @@ from app import DailyUsage, db
db.session.create_all() db.session.create_all()
class DailyUsageService: class DailyUsageService:
@staticmethod @staticmethod
def test_me(msg): def test_me(msg):
print(msg) print(msg)
def get_todays_usage(self): def get_todays_usage(self):
latest_entry = DailyUsage.query.order_by(desc(DailyUsage.date)).first() latest_entry = DailyUsage.query.order_by(desc(DailyUsage.date)).first()
# latest_entry = db.session.query(DailyUsage).order_by(DailyUsage.date.asc()).first() # latest_entry = db.session.query(DailyUsage).order_by(DailyUsage.date.asc()).first()
...@@ -18,4 +18,4 @@ class DailyUsageService: ...@@ -18,4 +18,4 @@ class DailyUsageService:
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)
if latest_entry_date == datetime.today().date(): if latest_entry_date == datetime.today().date():
return format(latest_entry.kwhUsed, '.7f') return format(latest_entry.kwhUsed, '.7f')
return 0 return 0
\ No newline at end of file
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