From 022ec6bd5bf5885e25c372dce1ca54b5b56aae6f Mon Sep 17 00:00:00 2001
From: Marie Birner <mb@studiomitte.com>
Date: Tue, 7 Jan 2025 10:52:46 +0100
Subject: [PATCH 1/4] [TASK] make stats more beautiful

---
 templates/stat.people.html.tera | 26 +++++++++++++++++---------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/templates/stat.people.html.tera b/templates/stat.people.html.tera
index 9856dd6..dee4e08 100644
--- a/templates/stat.people.html.tera
+++ b/templates/stat.people.html.tera
@@ -20,6 +20,14 @@
         </div>
         <div id="filter-result-js" class="search-result"></div>
         <div class="border-r border-l border-gray-200 dark:border-primary-600">
+            <div class="border-t border-gray-200 dark:border-primary-600 bg-white dark:bg-primary-900 text-black dark:text-white flex justify-between items-center px-3 py-1"
+                 data-filterable="false"
+                 data-filter="Header">
+                <span class="text-sm text-gray-600 dark:text-gray-100 w-10"><b>#</b></span>
+                <span class="grow"><b>Name</b></span>
+                <span><b>km</b></span>
+                <span class="pl-3 w-20 text-right"><b>Fahrten</b></span>
+            </div>
             {% set_global km = 0 %} {% set_global km = 0 %} {% set_global index = 1 %}
             {% for s in stat %}
                 <div class="border-t border-gray-200 dark:border-primary-600 bg-white dark:bg-primary-900 text-black dark:text-white flex justify-between items-center px-3 py-1"
@@ -34,34 +42,34 @@
                         {% endif %}
                     </span>
                     <span class="grow">{{ s.name }}</span>
-                    <span>{{ s.rowed_km }} km</span>
-                    <span class="pl-3">{{ s.amount_trips }} Fahrt{{ s.amount_trips | pluralize(plural="en") }}</span>
+                    <span>{{ s.rowed_km }}</span>
+                    <span class="pl-3 w-20 text-right">{{ s.amount_trips }}</span>
                     {% set_global km = s.rowed_km %}
                 </div>
             {% endfor %}
-            <div class="border-t border-gray-200 dark:border-primary-600 bg-white dark:bg-primary-900 text-black dark:text-white flex justify-between items-center px-3 py-1"
+            <div class="border-t border-black dark:border-white bg-white dark:bg-primary-900 text-black dark:text-white flex justify-between items-center px-3 py-1"
                  data-filterable="false"
                  data-filter="Summe Vereinsmitglieder">
                 <span class="text-sm text-gray-600 dark:text-gray-100 w-10"></span>
                 <span class="grow"><b>Summe Vereinsmitglieder</b></span>
-                <span><b>{{ club_km }} km</b></span>
-                <span class="pl-3"><b>{{ club_trips }} Fahrt{{ club_trips | pluralize(plural="en") }}</b></span>
+                <span><b>{{ club_km }}</b></span>
+                <span class="pl-3 w-20 text-right"><b>{{ club_trips }}</b></span>
             </div>
             <div class="border-t border-gray-200 dark:border-primary-600 bg-white dark:bg-primary-900 text-black dark:text-white flex justify-between items-center px-3 py-1"
                  data-filterable="false"
                  data-filter="Summe {{ guest_km.name }}">
                 <span class="text-sm text-gray-600 dark:text-gray-100 w-10"></span>
                 <span class="grow"><b>Summe {{ guest_km.name }}</b></span>
-                <span><b>{{ guest_km.rowed_km }} km</b></span>
-                <span class="pl-3"><b>{{ guest_km.amount_trips }} Fahrt{{ guest_km.amount_trips | pluralize(plural="en") }}</b></span>
+                <span><b>{{ guest_km.rowed_km }}</b></span>
+                <span class="pl-3 w-20 text-right"><b>{{ guest_km.amount_trips }}</b></span>
             </div>
             <div class="border-t border-gray-200 dark:border-primary-600 border-b bg-white dark:bg-primary-900 text-black dark:text-white flex justify-between items-center px-3 py-1"
                  data-filterable="false"
                  data-filter="Gesamtsumme">
                 <span class="text-sm text-gray-600 dark:text-gray-100 w-10"></span>
                 <span class="grow"><b>Gesamtsumme</b></span>
-                <span><b>{{ club_km + guest_km.rowed_km }} km</b></span>
-                <span class="pl-3"><b>{{ guest_km.amount_trips + club_trips }} Fahrt{{ guest_km.amount_trips + club_trips | pluralize(plural="en") }}</b></span>
+                <span><b>{{ club_km + guest_km.rowed_km }}</b></span>
+                <span class="pl-3 w-20 text-right"><b>{{ guest_km.amount_trips + club_trips }}</b></span>
             </div>
         </div>
         <div id="container" class="w-full"></div>

From 5b013fe389923b41660a446c0ee8f0a8842fe7c6 Mon Sep 17 00:00:00 2001
From: Marie Birner <mb@studiomitte.com>
Date: Tue, 7 Jan 2025 10:54:15 +0100
Subject: [PATCH 2/4] [TASK] rm unnecessary personal stat

---
 templates/stat.people.html.tera | 39 +--------------------------------
 1 file changed, 1 insertion(+), 38 deletions(-)

diff --git a/templates/stat.people.html.tera b/templates/stat.people.html.tera
index dee4e08..fbc5284 100644
--- a/templates/stat.people.html.tera
+++ b/templates/stat.people.html.tera
@@ -72,42 +72,5 @@
                 <span class="pl-3 w-20 text-right"><b>{{ guest_km.amount_trips + club_trips }}</b></span>
             </div>
         </div>
-        <div id="container" class="w-full"></div>
     </div>
-    <script>
-{% if personal %}
-const data = [
-  {%- for p in personal %}{ date: '{{p.date}}', km: {{p.km}} },{%- endfor %}
-]
-sessionStorage.setItem('userStats', JSON.stringify(data));
-{% endif %}
-
-function getYearFromURL() {
-    var queryParams = new URLSearchParams(window.location.search);
-    return queryParams.get('year');
-}
-
-function populateYears() {
-    var select = document.getElementById('yearSelect');
-    var currentYear = new Date().getFullYear();
-    var selectedYear = getYearFromURL() || currentYear;
-    for (var year = 1977; year <= currentYear; year++) {
-        var option = document.createElement('option');
-        option.value = option.textContent = year;
-	if (year == selectedYear) {
-            option.selected = true;
-        }
-        select.appendChild(option);
-    }
-}
-
-function changeYear() {
-    var selectedYear = document.getElementById('yearSelect').value;
-    window.location.href = '?year=' + selectedYear;
-}
-
-// Call this function when the page loads
-populateYears();
-    </script>
-    <script src="/public/logbook.js"></script>
-{% endblock content %}
+  
\ No newline at end of file

From 6237340f722663a39aa1aa6dd7fb0c1490d83592 Mon Sep 17 00:00:00 2001
From: Philipp Hofer <philipp@hofer.link>
Date: Tue, 7 Jan 2025 11:39:36 +0100
Subject: [PATCH 3/4] fix ci

---
 templates/stat.people.html.tera | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/stat.people.html.tera b/templates/stat.people.html.tera
index fbc5284..de4430a 100644
--- a/templates/stat.people.html.tera
+++ b/templates/stat.people.html.tera
@@ -73,4 +73,4 @@
             </div>
         </div>
     </div>
-  
\ No newline at end of file
+{% endblock content %}

From 0ebcd5a284d3d60c3d2cc3d11687ca1504abadd2 Mon Sep 17 00:00:00 2001
From: Philipp Hofer <philipp@hofer.link>
Date: Tue, 7 Jan 2025 11:44:56 +0100
Subject: [PATCH 4/4] allow changing the year in stats again

---
 templates/stat.people.html.tera | 27 +++++++++++++++++++++++++++
 1 file changed, 27 insertions(+)

diff --git a/templates/stat.people.html.tera b/templates/stat.people.html.tera
index de4430a..cc02d1d 100644
--- a/templates/stat.people.html.tera
+++ b/templates/stat.people.html.tera
@@ -73,4 +73,31 @@
             </div>
         </div>
     </div>
+    <script>
+	function getYearFromURL() {
+	    var queryParams = new URLSearchParams(window.location.search);
+	    return queryParams.get('year');
+	}
+	
+	function populateYears() {
+	    var select = document.getElementById('yearSelect');
+	    var currentYear = new Date().getFullYear();
+	    var selectedYear = getYearFromURL() || currentYear;
+	    for (var year = 1977; year <= currentYear; year++) {
+	        var option = document.createElement('option');
+	        option.value = option.textContent = year;
+		if (year == selectedYear) {
+	            option.selected = true;
+	        }
+	        select.appendChild(option);
+	    }
+	}
+	
+	function changeYear() {
+	    var selectedYear = document.getElementById('yearSelect').value;
+	    window.location.href = '?year=' + selectedYear;
+	}
+	
+	populateYears();
+    </script>
 {% endblock content %}