Skip to content

OKRS24-220 fixed datasources duplication, chanded filter from id to external_name value with in lookup #155

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 17, 2024
Merged

OKRS24-220 fixed datasources duplication, chanded filter from id to external_name value with in lookup #155

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4cf46e3
🛠️ forms.py -> Updated source field choices
Jun 14, 2024
75b05f2
OKRS24-220 Fixed Data Source filter.
dmytrotsko Jun 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/signals/filters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,9 @@ class SignalFilter(django_filters.FilterSet):
)
format_type = django_filters.MultipleChoiceFilter(choices=FormatChoices.choices)
severenity_pyramid_rungs = django_filters.MultipleChoiceFilter(choices=SeverityPyramidRungsChoices.choices)
source = django_filters.ModelMultipleChoiceFilter(queryset=SourceSubdivision.objects.all())
source = django_filters.ModelMultipleChoiceFilter(queryset=SourceSubdivision.objects.all(),
field_name="source_id__external_name",
to_field_name='external_name')
time_type = django_filters.MultipleChoiceFilter(choices=TimeTypeChoices.choices)

def __init__(self, data, *args, **kwargs):
Expand Down
5 changes: 4 additions & 1 deletion src/signals/forms.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,10 @@ class SignalFilterForm(forms.ModelForm):
search = forms.CharField(min_length=3)
pathogen = forms.ModelChoiceField(queryset=Pathogen.objects.all(), widget=forms.CheckboxSelectMultiple())
active = forms.TypedMultipleChoiceField(choices=ActiveChoices.choices, coerce=bool, widget=forms.CheckboxSelectMultiple())
source = forms.MultipleChoiceField(choices=SourceSubdivision.objects.values_list('id', 'external_name'), widget=forms.CheckboxSelectMultiple())
source = forms.MultipleChoiceField(
choices=set(SourceSubdivision.objects.values_list('external_name', 'external_name')),
widget=forms.CheckboxSelectMultiple()
)
time_type = forms.ChoiceField(choices=TimeTypeChoices.choices, widget=forms.CheckboxSelectMultiple())
geographic_scope = forms.ModelMultipleChoiceField(queryset=GeographicScope.objects.all(), widget=forms.CheckboxSelectMultiple())
severenity_pyramid_rungs = forms.ChoiceField(choices=SeverityPyramidRungsChoices.choices, widget=forms.CheckboxSelectMultiple())
Expand Down
2 changes: 1 addition & 1 deletion src/signals/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ def get_url_params(self):
"geographic_scope": [el for el in self.request.GET.getlist("geographic_scope")]
if self.request.GET.get("geographic_scope")
else None,
"source": [int(el) for el in self.request.GET.getlist("source")],
"source": [el for el in self.request.GET.getlist("source")],
"time_type": [el for el in self.request.GET.getlist("time_type")],
}
url_params_str = ""
Expand Down