From 0c3d8f408b8fd090db8ac2880bb995b027949011 Mon Sep 17 00:00:00 2001 From: Sander Roosendaal Date: Mon, 27 Dec 2021 12:34:36 +0100 Subject: [PATCH] adding time and dsitance --- rowers/templates/list_workouts.html | 4 +++- rowers/templatetags/rowerfilters.py | 8 ++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/rowers/templates/list_workouts.html b/rowers/templates/list_workouts.html index 2e430538..b2591943 100644 --- a/rowers/templates/list_workouts.html +++ b/rowers/templates/list_workouts.html @@ -179,9 +179,11 @@ {{ workout.date|date:"Y-m-d" }} {{ workout.starttime|date:"H:i" }}
- {{ workout.distance }}m + Distance
+ {{ workout.distance|distanceprint }}
+ Time
{{ workout.duration |durationprint:"%H:%M:%S.%f" }}
diff --git a/rowers/templatetags/rowerfilters.py b/rowers/templatetags/rowerfilters.py index d51f18ac..05f6edde 100644 --- a/rowers/templatetags/rowerfilters.py +++ b/rowers/templatetags/rowerfilters.py @@ -375,6 +375,14 @@ def ddays(ddelta): def spacetohtml(t): return t.replace(" ","%20") +@register.filter +def distanceprint(d): + if d<10000: + return "{d} m".format(d=d) + + d2 = d/1000. + return "%.2f km" % d2 + @register.filter def durationprint(d,dstring): if (d == None): # pragma: no cover