From 9f9975bce841e531709a71401e9cf413524139f7 Mon Sep 17 00:00:00 2001 From: memphis-tools Date: Sun, 9 Feb 2025 09:07:05 +0000 Subject: [PATCH] resolves bug/flask-category_selection-no_quotes-books_templates --- .../flask_app/project/book_routes_blueprint.py | 7 +++---- .../project/shared_functions_and_decorators.py | 2 +- .../flask_app/project/templates/books.html | 2 ++ .../project/templates/user_any_books.html | 17 +++++++++++++++-- .../flask_app/project/user_routes_blueprint.py | 1 + 5 files changed, 22 insertions(+), 7 deletions(-) diff --git a/app/packages/flask_app/project/book_routes_blueprint.py b/app/packages/flask_app/project/book_routes_blueprint.py index 862610b..95a4e08 100644 --- a/app/packages/flask_app/project/book_routes_blueprint.py +++ b/app/packages/flask_app/project/book_routes_blueprint.py @@ -145,15 +145,14 @@ def add_book(): Description: the add book Flask route. """ session = session_commands.get_a_database_session() - books_categories_query = session.query(BookCategory).all() - books_categories = [(i.id, i.title) for i in books_categories_query] + books_categories = get_books_categories(session) form = forms.BookForm(books_categories=books_categories) if form.validate_on_submit(): title = form.title.data summary = form.summary.data content = form.content.data author = form.author.data - category_id_from_form = int(form.categories.data[0]) + category_id_from_form = int(form.categories.data) try: category_id = ( session.query(BookCategory) @@ -162,7 +161,7 @@ def add_book(): .id ) except Exception: - flash("Saisie invalide, categorie livre non prevue.", "error") + flash(f"Saisie invalide, categorie livre non prevue {category_id}.", "error") return render_template( "add_book.html", form=form, diff --git a/app/packages/flask_app/project/shared_functions_and_decorators.py b/app/packages/flask_app/project/shared_functions_and_decorators.py index e357cfb..f06e75b 100644 --- a/app/packages/flask_app/project/shared_functions_and_decorators.py +++ b/app/packages/flask_app/project/shared_functions_and_decorators.py @@ -57,7 +57,7 @@ def return_random_quote(): quotes = session.query(Quote).all() session.close() total_quotes_indexes = len(quotes) - 1 - random_quote = quotes[random.randint(0, total_quotes_indexes)] + random_quote = quotes[random.randint(0, total_quotes_indexes)] if len(quotes) > 0 else "" return random_quote diff --git a/app/packages/flask_app/project/templates/books.html b/app/packages/flask_app/project/templates/books.html index ab2f884..7bf6bed 100644 --- a/app/packages/flask_app/project/templates/books.html +++ b/app/packages/flask_app/project/templates/books.html @@ -5,6 +5,7 @@ {% block content %}
+ {% if random_quote != "" %}

"{{ random_quote.quote }}" @@ -13,6 +14,7 @@ {{ random_quote.author }} - {{ random_quote.book_title }}

+ {% endif %}

DUMMY BLOG - LES LIVRES

diff --git a/app/packages/flask_app/project/templates/user_any_books.html b/app/packages/flask_app/project/templates/user_any_books.html index bfe264f..fc26cf4 100644 --- a/app/packages/flask_app/project/templates/user_any_books.html +++ b/app/packages/flask_app/project/templates/user_any_books.html @@ -19,12 +19,25 @@

DUMMY BLOG - LIVRES DE {{ user_name|upper }}

Auteur: {{ book.author }}
- Commentaires: {{ book.nb_comments }} - Favoris: {{ book.nb_starred }} + Commentaires: {{ book.book_comments | length }} + Favoris: {{ book.starred | length }}


{% endfor %}
+ {% if total_books > per_page %} +
+ Premiers + {% if page > 1 %} + Précédents + {% endif %} + Page {{ page }} sur {{ total_pages }} + {% if page < total_pages %} + Prochains + {% endif %} + Derniers +
+ {% endif %} {% endblock content %} diff --git a/app/packages/flask_app/project/user_routes_blueprint.py b/app/packages/flask_app/project/user_routes_blueprint.py index c4ac440..a4e976f 100644 --- a/app/packages/flask_app/project/user_routes_blueprint.py +++ b/app/packages/flask_app/project/user_routes_blueprint.py @@ -223,6 +223,7 @@ def user_books(user_id): per_page=per_page, total_pages=total_pages, user_name=user.username, + user_id=user.id, is_authenticated=current_user.is_authenticated, )