From 2d721bf51a122a1f38f02bea664f819432c21b7d Mon Sep 17 00:00:00 2001
From: Olaf Slomp <osslomp@gmail.com>
Date: Thu, 28 Feb 2019 17:22:40 +0100
Subject: [PATCH] Percentages

---
 marietje/stats/templates/stats/stats.html | 6 +++---
 marietje/stats/utils.py                   | 4 +++-
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/marietje/stats/templates/stats/stats.html b/marietje/stats/templates/stats/stats.html
index d388541..bdaa8e6 100644
--- a/marietje/stats/templates/stats/stats.html
+++ b/marietje/stats/templates/stats/stats.html
@@ -35,7 +35,7 @@
                         <th>{{ forloop.counter }}</th>
                         <td>{{ stat.user__name }}</td>
                         <td style="text-align: right;">{{ stat.total }}</td>
-                        <td>({% widthratio stat.total stats.total_uploads 100 %}%)</td>
+                        <td>({% widthratio stat.total stats.total_uploads_perc 100 %}%)</td>
                     </tr>
                     {% endfor %}
                 </tbody>
@@ -61,7 +61,7 @@
                         <th>{{ forloop.counter }}</th>
                         <td>{{ stat.user__name }}</td>
                         <td style="text-align: right;">{{ stat.total }}</td>
-                        <td>({% widthratio stat.total stats.total_requests 100 %}%)</td>
+                        <td>({% widthratio stat.total stats.total_requests_perc 100 %}%)</td>
                     </tr>
                     {% endfor %}
                 </tbody>
@@ -98,7 +98,7 @@
     </div>
     <div class="col-md-6">
         <h2>Unique requests</h2>
-        <p>In total <strong> {{stats.total_unique_requests.total}}</strong> different songs
+        <p>In total <strong> {{stats.total_unique_requests}}</strong> different songs
         have been requested. The {{ stats.stats_top_count }} people that have requested the largest number of
         different songs are shown below.
         <div class="table-responsive">
diff --git a/marietje/stats/utils.py b/marietje/stats/utils.py
index 519c0d9..61f26b1 100644
--- a/marietje/stats/utils.py
+++ b/marietje/stats/utils.py
@@ -155,11 +155,13 @@ def compute_stats():
     return {
         'last_updated': last_updated,
         'total_uploads': "{0:,.0f}".format(stats['total_uploads']),
+        'total_uploads_perc': stats['total_uploads'],
         'upload_stats': list(stats['upload_stats']),
         'total_requests': "{0:,.0f}".format(stats['total_requests']),
+        'total_requests_perc': stats['total_requests'],
         'request_stats': list(stats['request_stats']),
         'unique_request_stats': list(stats['unique_request_stats']),
-        'total_unique_requests': stats['total_unique_requests'],
+        'total_unique_requests': "{0:,.0f}".format(stats['total_unique_requests']['total']),
         'most_played_songs': list(stats['most_played_songs']),
         'most_played_songs_14_days': list(stats['most_played_songs_14_days']),
         'time_requested': stats['time_requested'],