From af434f0bc00a161462847069ff6a61e809ddd090 Mon Sep 17 00:00:00 2001
From: Joakim Hulthe <joakim@hulthe.net>
Date: Thu, 12 Nov 2020 14:43:44 +0100
Subject: [PATCH] Fix formatting of /stats

---
 src/handlebars_util.rs |  8 +++++---
 templates/stats.hbs    | 11 +++++++----
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/handlebars_util.rs b/src/handlebars_util.rs
index f5f5e82..eae09f3 100644
--- a/src/handlebars_util.rs
+++ b/src/handlebars_util.rs
@@ -14,10 +14,12 @@ pub fn register_helpers(engines: &mut Engines) {
     handlebars_helper!(pretty_seconds: |secs: u64| {
         let hours = secs / 60 / 60;
         let minutes = secs / 60 % 60;
-        if hours > 0 {
-            format!("{}h {}m", hours, minutes)
-        } else {
+        if hours == 0 {
             format!("{}m", minutes)
+        } else if minutes == 0 {
+            format!("{}h", hours)
+        } else {
+            format!("{}h {}m", hours, minutes)
         }
     });
     engines
diff --git a/templates/stats.hbs b/templates/stats.hbs
index 7f210a2..a691ac4 100644
--- a/templates/stats.hbs
+++ b/templates/stats.hbs
@@ -19,6 +19,11 @@
         {{#each categories_stats}}
             {{#if this.last_session_start}}
             <div class="hline"></div>
+            <h2>
+                <span>Kategori:</span>
+                <span>{{this.category.name}}</span>
+                <span style="color: {{this.category.color}};">●</span>
+            </h2>
             <h2>
                 <span>Senaste session:</span>
                 <span class="history_entry_started">{{pretty_datetime this.last_session_start}}</span>
@@ -26,11 +31,9 @@
                 <span class="history_entry_duration">{{pretty_seconds this.secs_last_session}}</span>
             </h2>
             <h2>
-                <span>Denna veckan:</span>
+                <span>Senaste veckan:</span>
                 <span class="history_entry_duration">{{pretty_seconds this.secs_last_week}}</span>
-            </h2>
-            <h2>
-                <span>Denna månaden:</span>
+                <span>Senaste månaden:</span>
                 <span class="history_entry_duration">{{pretty_seconds this.secs_last_month}}</span>
             </h2>
             <h2>Andel per timme:</h2>