diff --git a/CHANGELOG.md b/CHANGELOG.md index 97c1947..a588cf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,16 @@ # Changes +## 5.8.0 + +### Application Changes + +- Add support for rendering multiple Bluff the Listener segment results for a given show + +### Component Changes + +- Upgrade wwdtm from 2.5.0 to 2.6.0, which requires Wait Wait Stats Database version 4.4 or higher +- Upgrade Markdown from 3.4.3 to 3.5.1 + ## 5.7.2 ### Application Changes diff --git a/app/shows/templates/shows/all_details.html b/app/shows/templates/shows/all_details.html index c25f3b0..adf1c13 100644 --- a/app/shows/templates/shows/all_details.html +++ b/app/shows/templates/shows/all_details.html @@ -132,30 +132,42 @@

+{% if show.bluffs and show.bluffs|length >= 1 %} + {% if show.bluffs[0]["chosen_panelist"] and show.bluffs[0]["correct_panelist"] %} +
-
Bluff
-
-
-
- Correct: - {% if show.bluff.correct_panelist %} - {{ show.bluff.correct_panelist.name }} - {% else %} - N/A - {% endif %} +
+ +
+ {% for bluff in show.bluffs %} +
+
+ #{{ bluff.segment }} +
+
+ Chosen: + {% if bluff.chosen_panelist %} + {{ bluff.chosen_panelist.name }} + {% else %} + N/A + {% endif %} +
+
+ Correct: + {% if bluff.correct_panelist %} + {{ bluff.correct_panelist.name }} + {% else %} + N/A + {% endif %} +
+ {% endfor %}
+ {% endif %} {% endif %} {% if show.description %} diff --git a/app/shows/templates/shows/details.html b/app/shows/templates/shows/details.html index bf73ba4..e9d148f 100644 --- a/app/shows/templates/shows/details.html +++ b/app/shows/templates/shows/details.html @@ -129,30 +129,42 @@

+{% if show.bluffs and show.bluffs|length >= 1 %} + {% if show.bluffs[0]["chosen_panelist"] and show.bluffs[0]["correct_panelist"] %} +
-
Bluff
-
-
-
- Correct: - {% if show.bluff.correct_panelist %} - {{ show.bluff.correct_panelist.name }} - {% else %} - N/A - {% endif %} +
+ +
+ {% for bluff in show.bluffs %} +
+
+ #{{ bluff.segment }} +
+
+ Chosen: + {% if bluff.chosen_panelist %} + {{ bluff.chosen_panelist.name }} + {% else %} + N/A + {% endif %} +
+
+ Correct: + {% if bluff.correct_panelist %} + {{ bluff.correct_panelist.name }} + {% else %} + N/A + {% endif %} +
+ {% endfor %}
+ {% endif %} {% endif %} {% if show.description %} diff --git a/app/static/css/style.css b/app/static/css/style.css index 95bff3c..19c30dd 100644 --- a/app/static/css/style.css +++ b/app/static/css/style.css @@ -50,6 +50,11 @@ .host-guest, .scorekeeper-guest { background-color: #c8e6c9; color: #242f39; font-weight: 500; padding: 0.2rem 0.5rem; margin: 0 0.25rem; } .guest-show-repeat>a, .host-show-repeat>a, .location-show-repeat>a, .panelist-show-repeat>a, .scorekeeper-show-repeat>a { border-bottom: none !important; } .host-appearance-list>ul, .location-appearance-list>ul, .panelist-appearance-list>ul, .scorekeeper-appearance-list>ul { column-count: 3; column-fill: balance; } + .bluff-wrap { margin-bottom: 20px; } + .row.bluff-label { margin-bottom: 0; } + .row.bluff-segment { line-height: 1.75; margin-bottom: 0; } + .bluff-segment-num { font-weight: 600; } + .col.s12.bluff-segment-num { font-weight: 600; margin: 0; } .materialboxed { margin: 0 auto; } .panelist-rank { font-weight: 500; margin-left: 0.25rem; } q.scorekeeper-description { display: inline-block; font-style: italic; } diff --git a/app/version.py b/app/version.py index d92e934..c4977d9 100644 --- a/app/version.py +++ b/app/version.py @@ -4,4 +4,4 @@ # Copyright (c) 2018-2023 Linh Pham # stats.wwdt.me is released under the terms of the Apache License 2.0 """Application Version for Wait Wait Stats Page""" -APP_VERSION = "5.7.2" +APP_VERSION = "5.8.0" diff --git a/requirements-dev.txt b/requirements-dev.txt index 0f1bb70..c923155 100644 --- a/requirements-dev.txt +++ b/requirements-dev.txt @@ -5,6 +5,6 @@ black==23.11.0 Flask==3.0.0 gunicorn==21.2.0 -Markdown==3.4.3 +Markdown==3.5.1 -wwdtm==2.5.0 +wwdtm==2.6.0 diff --git a/requirements.txt b/requirements.txt index 092ed57..8aa0f76 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ Flask==3.0.0 gunicorn==21.2.0 -Markdown==3.4.3 +Markdown==3.5.1 -wwdtm==2.5.0 +wwdtm==2.6.0