From 8d2ca26860326054b67fe546a0b485bc31ddcb1b Mon Sep 17 00:00:00 2001 From: C4 Patino Date: Wed, 31 Aug 2022 22:52:21 -0500 Subject: [PATCH] Remove null activities from form options --- housewars/views.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/housewars/views.py b/housewars/views.py index c1db5c3..d44bbee 100644 --- a/housewars/views.py +++ b/housewars/views.py @@ -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