diff options
| author | Daniel Schadt <kingdread@gmx.de> | 2026-11-11 19:25:13 +0100 |
|---|---|---|
| committer | Daniel Schadt <kingdread@gmx.de> | 2026-11-11 19:25:13 +0100 |
| commit | ccb66ca8a6356b1472a08a001106bec29205d030 (patch) | |
| tree | d4e9252152bf16c94c2b33e4962dbd6a0429786d | |
| parent | df2167bd7c781d54683ee52ac81175f1184faa39 (diff) | |
| download | fietsboek-ccb66ca8a6356b1472a08a001106bec29205d030.tar.gz fietsboek-ccb66ca8a6356b1472a08a001106bec29205d030.tar.bz2 fietsboek-ccb66ca8a6356b1472a08a001106bec29205d030.zip | |
implement (most of) climb filtering
| -rw-r--r-- | fietsboek/templates/climb_browse.jinja2 | 78 | ||||
| -rw-r--r-- | fietsboek/util.py | 48 | ||||
| -rw-r--r-- | fietsboek/views/browse.py | 28 | ||||
| -rw-r--r-- | fietsboek/views/climb.py | 43 |
4 files changed, 118 insertions, 79 deletions
diff --git a/fietsboek/templates/climb_browse.jinja2 b/fietsboek/templates/climb_browse.jinja2 index 165ce02..ba345e0 100644 --- a/fietsboek/templates/climb_browse.jinja2 +++ b/fietsboek/templates/climb_browse.jinja2 @@ -8,42 +8,28 @@ <div class="col-12"> <div class="input-group"> <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button> - <input name="search-terms" type="text" class="form-control ui-element" placeholder="{{ _("page.browse.filter.search_terms") }}" value="{{ request.params.get('search-terms', '') }}"> + <input name="search-terms" type="text" class="form-control ui-element" placeholder="{{ _("page.climb_browse.filter.search_terms") }}" value="{{ request.params.get('search-terms', '') }}"> </div> </div> </div> <div class="collapse row g-3 mb-3" id="advancedSearch"> - <div class="col-md-6"> - <div class="input-group"> - <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button> - <input name="tags" type="text" class="form-control ui-element" placeholder="{{ _("page.browse.filter.tags") }}" value="{{ request.params.get('tags', '') }}"> - </div> - </div> - - <div class="col-md-6"> - <div class="input-group"> - <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button> - <input name="tagged-person" type="text" class="form-control ui-element" placeholder="{{ _("page.browse.filter.tagged_person") }}" value="{{ request.params.get('tagged-person', '') }}"> - </div> - </div> - <div class="col-md-4"> <div class="input-group"> <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button> - <input name="min-length" type="number" class="form-control ui-element" placeholder="{{ _("page.browse.filter.length_minimum") }}" value="{{ request.params.get('min-length', '') }}"> + <input name="min-length" type="number" class="form-control ui-element" placeholder="{{ _("page.climb_browse.filter.length_minimum") }}" value="{{ request.params.get('min-length', '') }}"> <span class="input-group-text ui-element">km</span> </div> </div> <div class="col-md-4 fs-5 d-flex align-items-center justify-content-center ui-element"> - {{ _("page.browse.filter.length_boundaries") }} + {{ _("page.climb_browse.filter.length_boundaries") }} </div> <div class="col-md-4"> <div class="input-group"> <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button> - <input name="max-length" type="number" class="form-control ui-element" placeholder="{{ _("page.browse.filter.length_maximum") }}" value="{{ request.params.get('max-length', '') }}"> + <input name="max-length" type="number" class="form-control ui-element" placeholder="{{ _("page.climb_browse.filter.length_maximum") }}" value="{{ request.params.get('max-length', '') }}"> <span class="input-group-text ui-element">km</span> </div> </div> @@ -51,20 +37,20 @@ <div class="col-md-4"> <div class="input-group"> <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button> - <input name="min-uphill" type="number" class="form-control ui-element" placeholder="{{ _("page.browse.filter.uphill_minimum") }}" value="{{ request.params.get('min-uphill', '') }}"> - <span class="input-group-text ui-element">m</span> + <input name="min-grade" type="number" class="form-control ui-element" placeholder="{{ _("page.climb_browse.filter.grade_minimum") }}" value="{{ request.params.get('min-grade', '') }}" step="0.01"> + <span class="input-group-text ui-element">%</span> </div> </div> <div class="col-md-4 fs-5 d-flex align-items-center justify-content-center ui-element"> - {{ _("page.browse.filter.uphill_boundaries") }} + {{ _("page.climb_browse.filter.grade_boundaries") }} </div> <div class="col-md-4"> <div class="input-group"> <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button> - <input name="max-uphill" type="number" class="form-control ui-element" placeholder="{{ _("page.browse.filter.uphill_maximum") }}" value="{{ request.params.get('max-uphill', '') }}"> - <span class="input-group-text ui-element">m</span> + <input name="max-grade" type="number" class="form-control ui-element" placeholder="{{ _("page.climb_browse.filter.grade_maximum") }}" value="{{ request.params.get('max-grade', '') }}" step="0.01"> + <span class="input-group-text ui-element">%</span> </div> </div> @@ -76,7 +62,7 @@ </div> <div class="col-md-4 fs-5 d-flex align-items-center justify-content-center ui-element"> - {{ _("page.browse.filter.date_boundaries") }} + {{ _("page.climb_browse.filter.date_boundaries") }} </div> <div class="col-md-4"> @@ -86,39 +72,19 @@ </div> </div> - <div class="col-md-6"> - <div class="input-group"> - <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button> - <select class="form-select ui-element" size="2" name="type[]" multiple> - <option value="ORGANIC"{% if "ORGANIC" in request.params.getall("type[]") %} selected{% endif %}>{{ _("page.browse.filter.type.organic") }}</option> - <option value="SYNTHETIC"{% if "SYNTHETIC" in request.params.getall("type[]") %} selected{% endif %}>{{ _("page.browse.filter.type.synthetic") }}</option> - </select> - </div> - - {% if request.identity %} - <div class="input-group mt-2"> - <button type="button" class="btn btn-outline-secondary button-clear-input ui-element"><i class="bi bi-eraser-fill"></i></button> - <select class="form-select" name="favourite"> - <option value="">{{ _("page.browse.filter.favourite.all") }}</option> - <option value="true"{% if request.params.get("favourite") == "true" %} selected{% endif %}>{{ _("page.browse.filter.favourite.yes") }}</option> - <option value="false"{% if request.params.get("favourite") == "false" %} selected{% endif %}>{{ _("page.browse.filter.favourite.no") }}</option> - </select> - </div> - {% endif %} - </div> - <div class="col-md-6"> - {% if request.identity %} - {% macro render_switch(id, name, value, text) %} - <div class="form-check form-switch ui-element"> - <input class="form-check-input" type="checkbox" role="switch" id="{{ id }}" name="{{ name }}" value="{{ value }}" {% if value in request.params.getall(name) %}checked{% endif %}> - <label class="form-check-label" for="{{ id }}">{{ text }}</label> + <div class="col-md-12"> + <div class="input-group"> + <button type="button" class="btn btn-outline-secondary button-clear-input"><i class="bi bi-eraser-fill"></i></button> + <select class="form-select ui-element" size="6" name="category[]" multiple> + <option value="0"{% if "0" in request.params.getall("category[]") %} selected{% endif %}>HC</option> + <option value="1"{% if "1" in request.params.getall("category[]") %} selected{% endif %}>1</option> + <option value="2"{% if "2" in request.params.getall("category[]") %} selected{% endif %}>2</option> + <option value="3"{% if "3" in request.params.getall("category[]") %} selected{% endif %}>3</option> + <option value="4"{% if "4" in request.params.getall("category[]") %} selected{% endif %}>4</option> + <option value="-1"{% if "-1" in request.params.getall("category[]") %} selected{% endif %}>{{ _("page.climb_browse.filter.uncategorized") }}</option> + </select> + </div> </div> - {% endmacro %} - {{ render_switch("switchOnlyMyTracks", "show-only[]", "mine", _("page.browse.filter.my_tracks.only")) }} - {{ render_switch("switchOnlyFriendsTracks", "show-only[]", "friends", _("page.browse.filter.friends_tracks_only")) }} - {{ render_switch("switchOnlyMeTagged", "show-only[]", "user-tagged", _("page.browse.filter.me_tagged_only")) }} - {% endif %} - </div> </div> diff --git a/fietsboek/util.py b/fietsboek/util.py index 44ab942..9514315 100644 --- a/fietsboek/util.py +++ b/fietsboek/util.py @@ -295,6 +295,54 @@ def get_enum(enum: type[T], value: str) -> T: raise HTTPBadRequest(f"Invalid enum value {value!r}") from exc +def get_int(request: Request, name: str) -> int: + """Retrieve an integer from a query parameter. + + This raises an HTTP exception if the integer could not be parsed. + + :param request: The HTTP request. + :param name: Name of the query parameter. + :return: The converted integer. + :raises HTTPBadRequest: If the request parameter could not be converted to an integer. + """ + try: + return int(request.params.get(name)) + except ValueError as exc: + raise HTTPBadRequest(f"Invalid integer in {name!r}") from exc + + +def get_float(request: Request, name: str) -> float: + """Retrieve a float from a query parameter. + + This raises an HTTP exception if the float could not be parsed. + + :param request: The HTTP request. + :param name: Name of the query parameter. + :return: The converted float. + :raises HTTPBadRequest: If the request parameter could not be converted to a float. + """ + try: + return float(request.params.get(name)) + except ValueError as exc: + raise HTTPBadRequest(f"Invalid float in {name!r}") from exc + + +def get_date(request: Request, name: str) -> datetime.date: + """Retrieve a date from a query parameter. + + This raises an HTTP exception if the date could not be parsed. + + :param request: The HTTP request. + :param name: Name of the query parameter. + :return: The converted date. + :raises HTTPBadRequest: If the request parameter could not be converted to a date. + """ + try: + return datetime.date.fromisoformat(request.params.get(name)) + except ValueError as exc: + raise HTTPBadRequest(f"Invalid date in {name!r}") from exc + + def check_password_constraints(password: str, repeat_password: Optional[str] = None): """Verifies that the password constraints match for the given password. diff --git a/fietsboek/views/browse.py b/fietsboek/views/browse.py index 18fbc1a..331ee0d 100644 --- a/fietsboek/views/browse.py +++ b/fietsboek/views/browse.py @@ -51,20 +51,6 @@ class Stream(RawIOBase): return b"".join(buf) -def _get_int(request: Request, name: str) -> int: - try: - return int(request.params.get(name)) - except ValueError as exc: - raise HTTPBadRequest(f"Invalid integer in {name!r}") from exc - - -def _get_date(request: Request, name: str) -> datetime.date: - try: - return datetime.date.fromisoformat(request.params.get(name)) - except ValueError as exc: - raise HTTPBadRequest(f"Invalid date in {name!r}") from exc - - def _with_page(url: str, num: int) -> str: parsed = urllib.parse.urlparse(url) query = urllib.parse.parse_qs(parsed.query) @@ -308,7 +294,7 @@ class FilterCollection(Filter): if request.params.get("min-length"): # Value is given in km, so convert it to m - min_length = _get_int(request, "min-length") * 1000 + min_length = util.get_int(request, "min-length") * 1000 filters.append( LambdaFilter( lambda query, track: query.where( @@ -322,7 +308,7 @@ class FilterCollection(Filter): ) if request.params.get("max-length"): - max_length = _get_int(request, "max-length") * 1000 + max_length = util.get_int(request, "max-length") * 1000 filters.append( LambdaFilter( lambda query, track: query.where( @@ -336,7 +322,7 @@ class FilterCollection(Filter): ) if request.params.get("min-uphill"): - min_uphill = _get_int(request, "min-uphill") + min_uphill = util.get_int(request, "min-uphill") filters.append( LambdaFilter( lambda query, track: query.where( @@ -350,7 +336,7 @@ class FilterCollection(Filter): ) if request.params.get("max-uphill"): - max_uphill = _get_int(request, "max-uphill") + max_uphill = util.get_int(request, "max-uphill") filters.append( LambdaFilter( lambda query, track: query.where( @@ -364,7 +350,7 @@ class FilterCollection(Filter): ) if request.params.get("min-date"): - min_date = _get_date(request, "min-date") + min_date = util.get_date(request, "min-date") min_date = datetime.datetime.combine(min_date, datetime.time.min) filters.append( LambdaFilter( @@ -374,7 +360,7 @@ class FilterCollection(Filter): ) if request.params.get("max-date"): - max_date = _get_date(request, "max-date") + max_date = util.get_date(request, "max-date") max_date = datetime.datetime.combine(max_date, datetime.time.max) filters.append( LambdaFilter( @@ -511,7 +497,7 @@ def browse(request: Request) -> Response: query = filters.compile(query, track) if "page" in request.params: - page = _get_int(request, "page") + page = util.get_int(request, "page") else: page = 1 diff --git a/fietsboek/views/climb.py b/fietsboek/views/climb.py index 1278530..af42162 100644 --- a/fietsboek/views/climb.py +++ b/fietsboek/views/climb.py @@ -10,7 +10,7 @@ from pyramid.httpexceptions import ( from pyramid.request import Request from pyramid.response import Response from pyramid.view import view_config -from sqlalchemy import nulls_first, nulls_last, select +from sqlalchemy import nulls_first, nulls_last, or_, select from sqlalchemy.orm import aliased from .. import models, util @@ -53,6 +53,44 @@ def _apply_order(query: Select, order: ResultOrder) -> Select: return query +def _apply_filters(query: Select, request: Request) -> Select: + if request.params.get("min-length"): + min_length = util.get_int(request, "min-length") + query = query.where(models.Climb.length >= min_length * 1000) + + if request.params.get("max-length"): + max_length = util.get_int(request, "max-length") + query = query.where(models.Climb.length <= max_length * 1000) + + if request.params.get("min-grade"): + min_grade = util.get_float(request, "min-grade") + query = query.where(models.Climb.avg_grade >= min_grade / 100) + + if request.params.get("max-grade"): + max_grade = util.get_float(request, "max-grade") + query = query.where(models.Climb.avg_grade <= max_grade / 100) + + if request.params.get("min-date"): + min_date = util.get_date(request, "min-date") + query = query.where(models.Track.date_raw >= min_date) + + if request.params.get("max-date"): + max_date = util.get_date(request, "max-date") + query = query.where(models.Track.date_raw <= max_date) + + if request.params.get("category[]"): + try: + categories = [int(c) for c in request.params.getall("category[]")] + except ValueError: + raise HTTPBadRequest(f"invalid category") + if -1 in categories: + query = query.where(or_(models.Climb.category.in_(categories), models.Climb.category.is_(None))) + else: + query = query.where(models.Climb.category.in_(categories)) + + return query + + @view_config( route_name="climb-browse", renderer="fietsboek:templates/climb_browse.jinja2", @@ -66,7 +104,8 @@ def climb_browse(request: Request): if request.params.get("sort"): order = util.get_enum(ResultOrder, request.params.get("sort")) climbs_qry = _apply_order(climbs_qry, order) - print(climbs_qry) + + climbs_qry = _apply_filters(climbs_qry, request) climbs = list(request.dbsession.execute(climbs_qry).scalars()) return { |
