Skip to content

Commit

Permalink
Develop (#74)
Browse files Browse the repository at this point in the history
  • Loading branch information
jobrachem authored Oct 14, 2021
1 parent 77e1361 commit 017b792
Show file tree
Hide file tree
Showing 5 changed files with 19 additions and 6 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
3 changes: 2 additions & 1 deletion src/mortimer/_version.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
6 changes: 3 additions & 3 deletions src/mortimer/templates/experiment.html
Original file line number Diff line number Diff line change
Expand Up @@ -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 %}
Expand All @@ -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 %}
Expand Down
2 changes: 2 additions & 0 deletions src/mortimer/users/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
8 changes: 6 additions & 2 deletions src/mortimer/web_experiments/routes.py
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit 017b792

Please sign in to comment.