c4patino/csmb-housewars
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove null activities from form options

Browse source
This commit is contained in:
Ceferino Patino 2022-08-31 22:52:21 -05:00
commit 8d2ca26860
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
housewars/views.py
View file

@ -37,9 +37,9 @@ class EntryCreateView(SessionWizardView):
if step == 'activity':
cd = self.storage.get_step_data('user')
filtered1 = Activity.objects.annotate(count=Count(
filtered1 = Activity.objects.filter(time__isnull=False).annotate(count=Count(
'activity1', filter=Q(activity1__house=cd.get('user-house')))).filter(quota__gt=F('count'))
filtered2 = Activity.objects.annotate(count=Count(
filtered2 = Activity.objects.filter(time__isnull=False).annotate(count=Count(
'activity2', filter=Q(activity2__house=cd.get('user-house')))).filter(quota__gt=F('count'), time=30)
form.fields['activity1'].queryset = filtered1