From 017b7922b7f828bf7bf1febc98ae347bd8b93f0d Mon Sep 17 00:00:00 2001
From: Johannes Brachem <37882800+jobrachem@users.noreply.github.com>
Date: Thu, 14 Oct 2021 20:45:12 +0200
Subject: [PATCH] Develop (#74)

---
 CHANGELOG.md                           | 6 ++++++
 src/mortimer/_version.py               | 3 ++-
 src/mortimer/templates/experiment.html | 6 +++---
 src/mortimer/users/routes.py           | 2 ++
 src/mortimer/web_experiments/routes.py | 8 ++++++--
 5 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b15b67..adba7e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## Mortimer v0.8.11 (Released 2021-10-14)
+
+### Changed
+
+- Compatibility patch for alfred3 v2.2.0
+
 ## Mortimer v0.8.10 (Released 2021-06-09)
 
 ### Added
diff --git a/src/mortimer/_version.py b/src/mortimer/_version.py
index a708cc4..27ad00e 100644
--- a/src/mortimer/_version.py
+++ b/src/mortimer/_version.py
@@ -3,4 +3,5 @@
 # 2) we can import it in setup.py for the same reason
 # 3) we can import it into your module module
 
-__version__ = "0.8.10"
+
+__version__ = "0.8.11"
diff --git a/src/mortimer/templates/experiment.html b/src/mortimer/templates/experiment.html
index 5d83694..d0bfedc 100644
--- a/src/mortimer/templates/experiment.html
+++ b/src/mortimer/templates/experiment.html
@@ -101,14 +101,14 @@ <h1 class="card-text"><b>{{ n["fin"] }}</b> / <span class="text-muted">{{ n["tot
       <div class="card-body border-info">
         <span class="text-muted">
           {% if activity["last"] != 'none' %}
-          {{ activity["last"].strftime('%H:%M') }}
+          {{ activity["last"] }}
           {% else %}
           - none -
           {% endif %}
         </span>
         <h3 class="card-text text-info">
           {% if activity["last"] != 'none' %}
-          {{ activity["last"].strftime('%Y-%m-%d') }}
+          {{ activity["last"] }}
           {% else %}
           - none -
           {% endif %}
@@ -118,7 +118,7 @@ <h3 class="card-text text-info">
       <div class="card-footer text-muted border-info">
         First activity on <span class="badge badge-light">
           {% if activity["first"] != 'none' %}
-          {{ activity["first"].strftime('%Y-%m-%d, %H:%M') }}
+          {{ activity["first"] }}
           {% else %}
           - none -
           {% endif %}
diff --git a/src/mortimer/users/routes.py b/src/mortimer/users/routes.py
index e20c681..e0deb8a 100644
--- a/src/mortimer/users/routes.py
+++ b/src/mortimer/users/routes.py
@@ -43,7 +43,9 @@ def register():
         # save user
         user.save()
         flash("Account created for %s." % form.username.data, "success")
+        
         send_register_email(user)
+
         return redirect(url_for("users.login"))
 
     password_hint = "This is a password hint"
diff --git a/src/mortimer/web_experiments/routes.py b/src/mortimer/web_experiments/routes.py
index 092fc8c..8376c65 100644
--- a/src/mortimer/web_experiments/routes.py
+++ b/src/mortimer/web_experiments/routes.py
@@ -190,8 +190,12 @@ def experiment(username, exp_title):
 
     activity = {}
     if times:
-        activity["first"] = datetime.fromtimestamp(times[0]["first"])
-        activity["last"] = datetime.fromtimestamp(times[0]["last"])
+        try:
+            activity["first"] = datetime.fromtimestamp(times[0]["first"]).strftime('%Y-%m-%d, %H:%M')
+            activity["last"] = datetime.fromtimestamp(times[0]["last"]).strftime('%H:%M')
+        except TypeError:
+            activity["first"] = times[0]["first"]
+            activity["last"] = times[0]["last"]
     else:
         activity["first"] = "none"
         activity["last"] = "none"