Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
IoTSmartMeter
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
kristian.tan
IoTSmartMeter
Commits
406103df
Commit
406103df
authored
Nov 18, 2019
by
Kristian Tan
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
test
parent
86e3f733
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
13 deletions
+3
-13
__init__.py
__init__.py
+1
-1
app.py
app.py
+2
-2
daily_usage_service.py
services/daily_usage_service.py
+0
-10
No files found.
__init__.py
View file @
406103df
from
.daily_usage
import
DailyUsage
\ No newline at end of file
from
.services.daily_usage_service
import
DailyUsageService
\ No newline at end of file
app.py
View file @
406103df
...
...
@@ -4,7 +4,7 @@ from flask_sqlalchemy import SQLAlchemy
from
sqlalchemy
import
asc
,
desc
import
os
from
datetime
import
datetime
,
date
,
timedelta
from
services.daily_usage_service
import
test
from
.
import
DailyUsageService
# from daily_usage import DailyUsage
app
=
Flask
(
__name__
)
...
...
@@ -100,7 +100,7 @@ db.create_all()
daily_total
=
get_todays_usage
()
todays_cost
=
get_todays_cost
()
print
(
get_todays_usage
())
print
(
test
.
get_todays_usage
())
print
(
DailyUsageService
.
get_todays_usage
())
print
(
get_todays_cost
())
# Create dictionary to store pin info
...
...
services/daily_usage_service.py
View file @
406103df
...
...
@@ -19,13 +19,3 @@ class DailyUsageService:
if
latest_entry_date
==
datetime
.
today
()
.
date
():
return
format
(
latest_entry
.
kwhUsed
,
'.7f'
)
return
0
class
test
:
def
get_todays_usage
(
self
):
latest_entry
=
DailyUsage
.
query
.
order_by
(
desc
(
DailyUsage
.
date
))
.
first
()
# latest_entry = db.session.query(DailyUsage).order_by(DailyUsage.date.asc()).first()
if
latest_entry
:
latest_entry_date
=
date
(
latest_entry
.
date
.
year
,
latest_entry
.
date
.
month
,
latest_entry
.
date
.
day
)
if
latest_entry_date
==
datetime
.
today
()
.
date
():
return
format
(
latest_entry
.
kwhUsed
,
'.7f'
)
return
0
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment