Skip to content

Commit 3922cb4

Browse files
author
Gerard Casas Saez
committed
fix stats
1 parent 1d48614 commit 3922cb4

1 file changed

Lines changed: 11 additions & 4 deletions

File tree

stats/views.py

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
from django.utils import timezone
77

88
from app.views import TabsView
9+
from applications import models as a_models
910
from applications.models import Application, STATUS, APP_CONFIRMED, GENDERS
1011
from user.mixins import is_organizer, IsOrganizerMixin
1112

@@ -57,11 +58,17 @@ def app_stats_api(request):
5758
gender_count = Application.objects.all().values('gender') \
5859
.annotate(applications=Count('gender'))
5960
gender_count = map(lambda x: dict(gender_name=GENDER_DICT[x['gender']], **x), gender_count)
61+
tshirt_dict = dict(a_models.TSHIRT_SIZES)
62+
shirt_count = map(
63+
lambda x: {'tshirt_size': tshirt_dict.get(x['tshirt_size'], 'Unknown'), 'applications': x['applications']},
64+
Application.objects.values('tshirt_size').annotate(applications=Count('tshirt_size'))
65+
)
6066

61-
shirt_count = Application.objects.values('tshirt_size') \
62-
.annotate(applications=Count('tshirt_size'))
63-
shirt_count_confirmed = Application.objects.filter(status=APP_CONFIRMED).values('tshirt_size') \
64-
.annotate(applications=Count('tshirt_size'))
67+
shirt_count_confirmed = map(
68+
lambda x: {'tshirt_size': tshirt_dict.get(x['tshirt_size'], 'Unknown'), 'applications': x['applications']},
69+
Application.objects.filter(status=APP_CONFIRMED).values('tshirt_size') \
70+
.annotate(applications=Count('tshirt_size'))
71+
)
6572

6673
diet_count = Application.objects.values('diet') \
6774
.annotate(applications=Count('diet'))

0 commit comments

Comments
 (0)