diff --git a/app.py b/app.py index a4e9335..40a3538 100644 --- a/app.py +++ b/app.py @@ -69,12 +69,12 @@ def create_entry(user_id, entry_type, client_timestamp=None, comments=None): cursor.execute(""" INSERT INTO entries (user_id, entrytype, ts, paid, comments) VALUES (?, ?, ?, ?, ?) - """, (user_id, entrytype, timestamp.isoformat(), False, comments)) + """, (user_id, entry_type, timestamp.isoformat(), False, comments)) else: cursor.execute(""" INSERT INTO entries (user_id, entrytype, ts, paid) VALUES (?, ?, ?, ?) - """, (user_id, entrytype, timestamp.isoformat(), False)) + """, (user_id, entry_type, timestamp.isoformat(), False)) conn.commit() conn.close() @@ -188,7 +188,7 @@ def index(): default_end = parse_iso_datetime(end_date) else: for user in users: - total_hours, paid_hours = generate_report( + total_hours, paid_hours, actions = generate_report( user["id"], default_begin.isoformat(), default_end.isoformat() @@ -246,7 +246,7 @@ def api_create_entry(): }), 400 create_entry( user_id, - entrytype, + entry_type, client_timestamp, paid, comments diff --git a/templates/index.html b/templates/index.html index 032b486..8342746 100644 --- a/templates/index.html +++ b/templates/index.html @@ -162,9 +162,9 @@