Skip to content

Commit acf3a3e

Browse files
committed
๐Ÿ› ๏ธ signals/filters.py -> Added TimeLabelChoices to Signal model filter
๐Ÿ› ๏ธ signals/filters.py -> Added time_label filter to SignalFilter ๐Ÿ› ๏ธ signals/forms.py -> Updated choices to use translated strings ๐Ÿ› ๏ธ signals/forms.py -> Updated search placeholder to use translated string
1 parent 60cecd4 commit acf3a3e

File tree

2 files changed

+13
-6
lines changed

2 files changed

+13
-6
lines changed

โ€Žsrc/signals/filters.py

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
)
1111
from django_filters.widgets import QueryArrayWidget
1212

13-
from signals.models import Signal
13+
from signals.models import Signal, TimeLabelChoices
1414

1515

1616
class NumberInFilter(BaseInFilter, NumberFilter):
@@ -22,7 +22,11 @@ class SignalFilter(django_filters.FilterSet):
2222
FilterSet for the Signal model.
2323
"""
2424

25-
id = NumberInFilter(field_name='id', lookup_expr='in', widget=QueryArrayWidget)
25+
id = NumberInFilter(
26+
field_name='id',
27+
lookup_expr='in',
28+
widget=QueryArrayWidget
29+
)
2630
search = CharFilter(method='filter_search')
2731
order_by = OrderingFilter(
2832
fields=(
@@ -31,6 +35,9 @@ class SignalFilter(django_filters.FilterSet):
3135
('last_updated', 'last_updated'),
3236
)
3337
)
38+
time_label = django_filters.MultipleChoiceFilter(
39+
choices=TimeLabelChoices.choices,
40+
)
3441

3542
class Meta:
3643
model = Signal

โ€Žsrc/signals/forms.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ class SignalFilterForm(forms.ModelForm):
1818
id = forms.ModelMultipleChoiceField(queryset=Signal.objects.all(), widget=forms.MultipleHiddenInput)
1919
order_by = forms.ChoiceField(choices=[
2020
('', '---------'),
21-
('name', 'Name'),
22-
('source__name', 'Source'),
23-
('last_updated', 'Last Updated'),
21+
('name', _('Name')),
22+
('source__name', _('Source')),
23+
('last_updated', _('Last Updated')),
2424
],
2525
required=False,
2626
)
@@ -53,7 +53,7 @@ class Meta:
5353
'id': 'order_by',
5454
'aria-label': 'Order by',
5555
}),
56-
'search': forms.TextInput(attrs={'class': 'form-control', 'placeholder': 'Enter search term'}),
56+
'search': forms.TextInput(attrs={'class': 'form-control', 'placeholder': _('Enter search term')}),
5757
'available_geography': forms.CheckboxSelectMultiple(attrs={
5858
'class': 'form-select',
5959
'data-bs-toggle': 'tooltip',

0 commit comments

Comments
ย (0)