From 1d69d9fe8ac845e525044bdf21dbddd78f9fc5e7 Mon Sep 17 00:00:00 2001 From: Christian Wolf Date: Fri, 6 Oct 2023 18:17:37 +0200 Subject: [PATCH] Fix filtering w.r.t finalists in web styling Mutiple rows were colored similarly of some are hidden --- src/main.py | 3 ++- src/solo_turnier/flask.py | 6 +++++- src/solo_turnier/templates/index.html | 2 ++ 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/src/main.py b/src/main.py index 0ce475a..be449ad 100644 --- a/src/main.py +++ b/src/main.py @@ -23,7 +23,8 @@ def main(): solo_turnier.flask.startFlask( batchWorker, debug=cli.getLogLevel() > 0, - port=cli.getPort() + port=cli.getPort(), + showOnlyFinalists=not cli.showAllParticipants() ) else: combinedData = batchWorker.run( diff --git a/src/solo_turnier/flask.py b/src/solo_turnier/flask.py index 84c977b..9c64bd1 100644 --- a/src/solo_turnier/flask.py +++ b/src/solo_turnier/flask.py @@ -1,5 +1,8 @@ import flask import solo_turnier +import logging + +_l = logging.getLogger(__name__) def startFlask( batchWorker: solo_turnier.batch.BatchWorker, @@ -12,8 +15,9 @@ def startFlask( @app.route('/') def index(): combinedData = batchWorker.run(False) + _l.debug('Show only finalists %s', showOnlyFinalists) - return flask.render_template('index.html', data=combinedData) + return flask.render_template('index.html', data=combinedData, onlyFinalists=showOnlyFinalists) @app.get('/custom.css') def css(): diff --git a/src/solo_turnier/templates/index.html b/src/solo_turnier/templates/index.html index 055b30a..67f77bb 100644 --- a/src/solo_turnier/templates/index.html +++ b/src/solo_turnier/templates/index.html @@ -28,6 +28,7 @@ {% if not participant.finalist %} {% set rowCls = "no-finalist" %} {% endif %} + {% if participant.finalist or not onlyFinalists %} {{ participant.name }} ({{ participant.id }}) {% for dance in data.results[group].dances %} @@ -47,6 +48,7 @@ {% endblock %} {% endfor %} + {% endif %} {% endblock %} {% endfor %}