Skip to content
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

Set up framework for UI filters, add Performer filter #122

Merged
merged 12 commits into from
Dec 7, 2022
Merged

Set up framework for UI filters, add Performer filter #122

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a37ba56
Accept query params in site evaluations REST function
mvandenburgh Nov 29, 2022
a1f9e7d
Return performer as a vector tile attribute
mvandenburgh Nov 29, 2022
f65fec3
Return list of performers in vector tile endpoint
mvandenburgh Nov 30, 2022
8642f6c
Regenerate openapi types
mvandenburgh Nov 30, 2022
2e9b197
Add `filters` object to store
mvandenburgh Nov 29, 2022
2e1a293
Add type annotation for the store
mvandenburgh Nov 29, 2022
d4144f9
Accept arbitrary filters for MapLibre polygons
mvandenburgh Nov 29, 2022
3ef9515
Install DaisyUI
mvandenburgh Nov 30, 2022
3cd4311
Add UI for filtering by performer
mvandenburgh Nov 30, 2022
4c93455
Merge branch 'phase-ii' into filter-ui
mvandenburgh Nov 30, 2022
c16b9d0
fix linting
mvandenburgh Dec 6, 2022
a754a07
Merge branch 'phase-ii' into filter-ui
mvandenburgh Dec 6, 2022
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
1 change: 1 addition & 0 deletions django/src/rdwatch/serializers/site_evaluation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@ class SiteEvaluationListSerializer(serializers.Serializer):
count = serializers.IntegerField()
timerange = TimeRangeSerializer()
bbox = BoundingBoxSerializer()
performers = serializers.ListField()
results = SiteEvaluationSerializer(many=True)
next = serializers.CharField()
previous = serializers.CharField()
4 changes: 4 additions & 0 deletions django/src/rdwatch/views/site_evaluation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ def site_evaluations(request: HttpRequest):
bbox=BoundingBox(Collect("geom")),
)

overview["performers"] = SiteEvaluation.objects.values_list(
"configuration__performer__slug", flat=True
).distinct()
Comment on lines +67 to +69
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note - this adds another field, "performers", to the response of this endpoint. It's a list of every performer in the system, regardless of the filters and/or pagination applied to the site evaluations themselves. I'm torn on if this is correct, or if it should be its own endpoint, but we need some way for the frontend to know every possible performer.


# Pagination
assert api_settings.PAGE_SIZE, "PAGE_SIZE must be set."
paginator = Paginator(queryset, api_settings.PAGE_SIZE)
Expand Down