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
064cabf6
Unverified
Commit
064cabf6
authored
Nov 18, 2019
by
Kristian Tan
Committed by
GitHub
Nov 18, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Issue (#5)
Fixed database logic for creating new entries
parent
674a0a97
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
9 deletions
+9
-9
app.py
app.py
+9
-9
No files found.
app.py
View file @
064cabf6
...
...
@@ -59,14 +59,15 @@ def create_entry(change_pin):
# Formula to calculate kWh based on time and wattage
kwh
=
pins
[
change_pin
][
'wattage'
]
*
(
elapsed
/
3600
)
/
1000
# If there is already an entry for today, update on time
if
latest_entry
:
latest_entry_date
=
date
(
latest_entry
.
date
.
year
,
latest_entry
.
date
.
month
,
latest_entry
.
date
.
day
)
if
latest_entry_date
==
start_date
:
latest_entry
.
kwhUsed
+=
kwh
else
:
# If no entry for today, make one
entry
=
DailyUsage
(
date
=
start_date
,
kwhUsed
=
kwh
)
db
.
session
.
add
(
entry
)
print
(
latest_entry
)
if
latest_entry
and
date
(
latest_entry
.
date
.
year
,
latest_entry
.
date
.
month
,
latest_entry
.
date
.
day
)
==
start_date
:
# latest_entry_date = date(latest_entry.date.year, latest_entry.date.month, latest_entry.date.day)
# if latest_entry_date == start_date:
latest_entry
.
kwhUsed
+=
kwh
else
:
# If no entry for today, make one
entry
=
DailyUsage
(
date
=
start_date
,
kwhUsed
=
kwh
)
db
.
session
.
add
(
entry
)
db
.
session
.
commit
()
pins
[
change_pin
][
'on_time'
]
=
None
pins
[
change_pin
][
'on_date'
]
=
None
...
...
@@ -140,7 +141,6 @@ def main():
@
app
.
route
(
"/toggle/<change_pin>"
)
def
toggle_pin
(
change_pin
):
change_pin
=
int
(
change_pin
)
device_name
=
pins
[
change_pin
][
'name'
]
# Toggle the selected pin
GPIO
.
output
(
change_pin
,
not
GPIO
.
input
(
change_pin
))
...
...
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