Remove unused function

[coffee/coffee-flask.git] / app.py

diff --git a/app.py b/app.py
index 9301ced0d64b9823e778b94fdd5ae060ceb7fc09..4f3c791a20fbe6233ab69908740f660de3863bf6 100644 (file)
--- a/app.py
+++ b/app.py
@@ -39,10 +39,7 @@ def humanize_ts(time, max_interval="years"):
     if max_interval not in ["years", "days"]:
         raise ValueError
 
-    now = datetime.now(timezone.utc)
-    if time[-1] == 'Z':     # Convert Zulu time zone to datetime compatible format
-        time = time[0:-1] + '+00:00'
-    diff = now - datetime.fromisoformat(time)
+    diff = datetime.now(timezone.utc) - time
     second_diff = diff.seconds
     day_diff = diff.days
 
@@ -76,6 +73,17 @@ def humanize_ts(time, max_interval="years"):
 app.jinja_env.filters['humanize'] = humanize_ts
 
 
+def days_filter(time):
+    """Return the number of days elapsed since time."""
+    if jinja2.is_undefined(time):
+        return time
+    diff = datetime.now(timezone.utc) - time
+    return diff.days
+
+
+app.jinja_env.filters['days'] = days_filter
+
+
 @app.route('/')
 def hello():
     if "uid" in session:
@@ -282,14 +290,6 @@ def event_add():
     return redirect(url_for('user'))
 
 
-# TODO: Remove me - unused
-@app.route("/coffee/count")
-def coffee_count():
-    start = request.args.get("start")
-    stop = request.args.get("stop")
-    return str(dict(db.drink_count(session.get("uid"), start, stop)).get("coffee", 0))
-
-
 @app.route('/js')
 def js():
     response = make_response(render_template('main.js'))