From 323e9ec8bf7e2c8c722032a4c4e2ac2412a2ca33 Mon Sep 17 00:00:00 2001 From: Colin Powell Date: Wed, 8 Mar 2023 13:30:05 -0500 Subject: [PATCH] Fix display of progress in long play --- vrobbler/templates/books/book_detail.html | 5 +++-- vrobbler/templates/videogames/videogame_detail.html | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/vrobbler/templates/books/book_detail.html b/vrobbler/templates/books/book_detail.html index de540a2..91993bd 100644 --- a/vrobbler/templates/books/book_detail.html +++ b/vrobbler/templates/books/book_detail.html @@ -27,6 +27,7 @@

{{object.scrobble_set.count}} scrobbles

+

{{object.scrobble_set.last.book_pages_read}} page read to {% if object.scrobble_set.last.long_play_complete %} and completed{% else %}{% endif %}

{% if object.scrobble_set.last.long_play_complete == True %} Read again @@ -44,7 +45,7 @@ Date Completed - Duration + Page read to Authors @@ -53,7 +54,7 @@ {{scrobble.timestamp}} {% if scrobble.long_play_complete == True %}Yes{% endif %} - {% if scrobble.in_progress %}Now playing{% else %}{{scrobble.long_play_session_seconds|natural_duration}}{% endif %} + {% if scrobble.in_progress %}Now reading{% else %}{{scrobble.book_pages_read}}{% endif %} {% for author in scrobble.book.authors.all %}{{author}}{% if not forloop.last %}, {% endif %}{% endfor %} {% endfor %} diff --git a/vrobbler/templates/videogames/videogame_detail.html b/vrobbler/templates/videogames/videogame_detail.html index f33b72e..a459dfa 100644 --- a/vrobbler/templates/videogames/videogame_detail.html +++ b/vrobbler/templates/videogames/videogame_detail.html @@ -27,7 +27,7 @@

{{object.scrobble_set.count}} scrobbles

-

{{object.scrobble_set.last.playback_position|natural_duration}}{% if object.scrobble_set.last.long_play_complete %} and completed{% else %} spent playing{% endif %}

+

{{object.scrobble_set.last.long_play_seconds|natural_duration}}{% if object.scrobble_set.last.long_play_complete %} and completed{% else %} spent playing{% endif %}

{% if object.scrobble_set.last.long_play_complete == True %} Play again @@ -54,7 +54,7 @@ {{scrobble.timestamp}} {% if scrobble.long_play_complete == True %}Yes{% endif %} - {% if scrobble.in_progress %}Now playing{% else %}{{scrobble.long_play_session_seconds|natural_duration}}{% endif %} + {% if scrobble.in_progress %}Now playing{% else %}{{scrobble.playback_position|natural_duration}}{% endif %} {% for platform in scrobble.video_game.platforms.all %}{{platform}}{% if not forloop.last %}, {% endif %}{% endfor %} {% endfor %}