technicie/MarietjeDjango
1
0
Fork 0
mirror of https://gitlab.science.ru.nl/technicie/MarietjeDjango.git synced 2025-12-10 00:22:21 +01:00
Code Issues Packages Projects Releases Wiki Activity

split uploads in 2 columns

Browse Source
This commit is contained in:
oslomp
2019-01-10 20:51:54 +01:00
parent 264ec991e5
commit 6a86cf1c0a
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
marietje/stats/utils.py
View File

@ -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,
}