Colorize coffee machine cleaning event box when cleaning is due

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

diff --git a/app.py b/app.py
index 9c6f6d168b0c0cacd3fe5562b19253c96c21e5de..f9785b87d4fadb2ec753b9f14115e3d14060e0b7 100644 (file)
--- a/app.py
+++ b/app.py
@@ -25,18 +25,21 @@ app.secret_key = b'_5#y2L"F4Q8z\n\xec]/'
 
 # Inspired by https://shubhamjain.co/til/how-to-render-human-readable-time-in-jinja/,
 # updated to our needs
-def humanize_ts(time):
-    """
-    Convert date in ISO format to relative, human readable string
-    like 'an hour ago', 'Yesterday', '3 months ago',
-    'just now', etc
+def humanize_ts(time, max_interval="years"):
+    """Convert date/time in ISO format to relative, human readable string.
+
+    Example return values: 'an hour ago', 'Yesterday', '3 months ago',
+    'just now', etc.
+
+    When optional max_interval is set to "days", the return value will
+    report at most the number of days ago, not week, months or years.
     """
     if jinja2.is_undefined(time):
         return time
-    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)
+    if max_interval not in ["years", "days"]:
+        raise ValueError
+
+    diff = datetime.now(timezone.utc) - time
     second_diff = diff.seconds
     day_diff = diff.days
 
@@ -58,7 +61,7 @@ def humanize_ts(time):
             return str(int(second_diff / 3600)) + " hours ago"
     if day_diff == 1:
         return "Yesterday"
-    if day_diff < 7:
+    if day_diff < 7 or max_interval == "days":
         return str(day_diff) + " days ago"
     if day_diff < 31:
         return str(int(day_diff / 7)) + " weeks ago"
@@ -70,14 +73,31 @@ def humanize_ts(time):
 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:
-        uid = session["uid"]
-        return render_template('hello.html', name=db.get_name(uid))
     return render_template('hello.html')
 
 
+@app.route('/home')
+def home():
+    # TODO: Replace stamp parameter with proper cache control HTTP
+    # headers in response
+    return render_template('home.html',
+                           stamp=time.time(),
+                           last_events=db.last_events())
+
+
 @app.route('/login', methods=["POST"])
 @app.route('/login/<iid>')
 def login(iid=None):
@@ -101,7 +121,7 @@ def login(iid=None):
 def logout():
     session.pop('uid', None)
     session.pop('iid', None)
-    return redirect(url_for('user'))
+    return redirect(url_for('home'))
 
 
 @app.route('/user')
@@ -118,11 +138,7 @@ def user():
                                stamp=time.time(),
                                last_events=db.last_events()
                                )
-    # TODO: Replace stamp parameter with proper cache control HTTP
-    # headers in response
-    return render_template('user.html', stamp=time.time(),
-                           last_events=db.last_events(),
-                           )
+    return redirect(url_for('home'))
 
 
 @app.route('/user/rename')
@@ -276,14 +292,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'))