From 6a86cf1c0a0f1feb901a2994bd35689e837b0bf9 Mon Sep 17 00:00:00 2001
From: oslomp <osslomp@gmail.com>
Date: Thu, 10 Jan 2019 20:51:54 +0100
Subject: [PATCH] split uploads in 2 columns

---
 marietje/stats/templates/stats/user.html | 9 ++++++---
 marietje/stats/utils.py                  | 8 ++++++--
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/marietje/stats/templates/stats/user.html b/marietje/stats/templates/stats/user.html
index f0bff7d..d6a877c 100644
--- a/marietje/stats/templates/stats/user.html
+++ b/marietje/stats/templates/stats/user.html
@@ -50,8 +50,9 @@
         </div>
         <div class="row">
         <div class="col-md-6">
-            <h2>Uploads requested by others</h2>
-            <h4>Total: {{stats.total_played_uploads}}</h4>
+            <h2>Uploads requested</h2>
+            <h4>Total played by you: {{stats.total_played_user_uploads}}</h4>
+            <h4>Total played by others: {{stats.total_played_uploads}}</h4>
             <h4>Top {{ stats.stats_top_count }}:</h4>
             <div class="table-responsive">
                 <table class="table table-striped">
@@ -60,7 +61,8 @@
                             <th>#</th>
                             <th>Artist</th>
                             <th>Title</th>
-                            <th># Requests</th>
+                            <th>Others</th>
+                            <th>You</th>
                         </tr>
                     </thead>
                     <tbody>
@@ -70,6 +72,7 @@
                             <td>{{ stat.song__artist }}</td>
                             <td>{{ stat.song__title }}</td>
                             <td>{{ stat.total }}</td>
+                            <td>{{ stat.user_total }}</td>
                         </tr>
                         {% endfor %}
                     </tbody>
diff --git a/marietje/stats/utils.py b/marietje/stats/utils.py
index 79a7542..08730c5 100644
--- a/marietje/stats/utils.py
+++ b/marietje/stats/utils.py
@@ -145,15 +145,18 @@ def user_stats(request):
                         '-total')[:settings.STATS_TOP_COUNT]
 
     most_played_uploads = PlaylistSong.objects.filter(
-        state=2, song_id__in=Song.objects.filter(user__id=request)).exclude(Q(user__id=None)|Q(user__id=request)).values(
+        state=2, song_id__in=Song.objects.filter(user__id=request)).exclude(user__id=None).values(
                     'song__artist',
-                    'song__title').annotate(total=Count('id')).order_by(
+                    'song__title').annotate(total=Count('id', filter=~Q(user__id=request)), user_total=Count('id', filter=Q(user__id=request))).order_by(
                         '-total', 'song__artist',
                         'song__title')[:settings.STATS_TOP_COUNT]
+
     most_played = list(most_played_uploads)
     total_played_uploads = 0
+    total_played_user_uploads = 0
     for x in most_played:
         total_played_uploads += x['total']
+        total_played_user_uploads += x['user_total']
 
     return {
         'last_updated': last_updated,
@@ -165,5 +168,6 @@ def user_stats(request):
         'most_played_uploads': list(most_played_uploads),
         'stats_top_count': settings.STATS_TOP_COUNT,
         'total_played_uploads': total_played_uploads,
+        'total_played_user_uploads': total_played_user_uploads,
     }