From 76e464a9e9673b18990db32e5989be059ed0e57b Mon Sep 17 00:00:00 2001 From: Max Duval Date: Wed, 12 Jun 2024 08:44:27 +0100 Subject: [PATCH 1/2] fix: order Euro spider chart correctly add visual documentation so future travellers can understand how the ordering maps to the actual wall chart --- .../football/model/CompetitionStages.scala | 70 +++++++++++++++---- sport/app/football/model/model.scala | 1 + 2 files changed, 56 insertions(+), 15 deletions(-) diff --git a/sport/app/football/model/CompetitionStages.scala b/sport/app/football/model/CompetitionStages.scala index 8fc67e7924a..8e9bca7e178 100644 --- a/sport/app/football/model/CompetitionStages.scala +++ b/sport/app/football/model/CompetitionStages.scala @@ -205,21 +205,61 @@ object KnockoutSpider { // Euro 2024 // https://www.uefa.com/euro2024/news/0275-151eb1c333ea-d30deec67b13-1000--uefa-euro-2024-fixtures-when-and-where-are-the-matches/ "750" -> List( - ZonedDateTime.of(2024, 6, 30, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Round of 16 // Match 40 - ZonedDateTime.of(2024, 6, 29, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Round of 16 // Match 38 - ZonedDateTime.of(2024, 7, 1, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Round of 16 // Match 42 - ZonedDateTime.of(2024, 7, 1, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Round of 16 // Match 41 - ZonedDateTime.of(2024, 7, 2, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Round of 16 // Match 44 - ZonedDateTime.of(2024, 7, 2, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Round of 16 // Match 43 - ZonedDateTime.of(2024, 6, 30, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Round of 16 // Match 39 - ZonedDateTime.of(2024, 6, 29, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Round of 16 // Match 37 - ZonedDateTime.of(2024, 7, 5, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Quarter Final // Match 46 - ZonedDateTime.of(2024, 7, 5, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Quarter Final // Match 45 - ZonedDateTime.of(2024, 7, 6, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Quarter Final // Match 48 - ZonedDateTime.of(2024, 7, 6, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Quarter Final // Match 47 - ZonedDateTime.of(2024, 7, 9, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Semi-Final // Match 49 - ZonedDateTime.of(2024, 7, 10, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Semi-Final // Match 50 - ZonedDateTime.of(2024, 7, 14, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Final // Match 51 + // Round of 16 + // + // 1 ━┓ ┏━ 5 + // ┣━━━┓ ┏━━━┫ + // 2 ━┛ ┃ ┃ ┗━ 6 + // ┣━━━┫ + // 3 ━┓ ┃ ┃ ┏━ 7 + // ┣━━━┛ ┗━━━┫ + // 4 ━┛ ┗━ 8 + ZonedDateTime.of(2024, 6, 29, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 38 + ZonedDateTime.of(2024, 6, 30, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 40 + ZonedDateTime.of(2024, 7, 1, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 41 + ZonedDateTime.of(2024, 7, 1, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 42 + + ZonedDateTime.of(2024, 6, 30, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 39 + ZonedDateTime.of(2024, 6, 29, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 37 + ZonedDateTime.of(2024, 7, 2, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 43 + ZonedDateTime.of(2024, 7, 2, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 44 + + // Quarter Final + // + // ━┓ ┏━ + // ┣━ 1 ━┓ ┏━ 3 ━┫ + // ━┛ ┃ ┃ ┗━ + // ┣━━━┫ + // ━┓ ┃ ┃ ┏━ + // ┣━ 2 ━┛ ┗━ 4 ━┫ + // ━┛ ┗━ + ZonedDateTime.of(2024, 7, 6, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 48 + ZonedDateTime.of(2024, 7, 5, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 46 + ZonedDateTime.of(2024, 7, 5, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 45 + ZonedDateTime.of(2024, 7, 6, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 47 + + // Semi-Final + // + // ━┓ ┏━ + // ┣━━┓ ┏━━┫ + // ━┛ ┃ ┃ ┗━ + // ┣━ 1 ━━ 2 ━┫ + // ━┓ ┃ ┃ ┏━ + // ┣━━┛ ┗━━┫ + // ━┛ ┗━ + ZonedDateTime.of(2024, 7, 10, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 50 + ZonedDateTime.of(2024, 7, 9, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 49 + + // Final + // + // ━┓ ┏━ + // ┣━━┓ ┏━━┫ + // ━┛ ┃ ┃ ┗━ + // ┣━━ 1 ━━┫ + // ━┓ ┃ ┃ ┏━ + // ┣━━┛ ┗━━┫ + // ━┛ ┗━ + ZonedDateTime.of(2024, 7, 14, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 51 ), // Womens Euro 2022 "423" -> List( diff --git a/sport/app/football/model/model.scala b/sport/app/football/model/model.scala index 70bbf711f8a..9d07c1764c8 100644 --- a/sport/app/football/model/model.scala +++ b/sport/app/football/model/model.scala @@ -181,6 +181,7 @@ object CompetitionDisplayHelpers { teamName .replace("Czech Republic", "Czech Rep.") .replace("Holland", "Netherlands") + .replace("Winner of Match", "Winner match") } // We do not currently support scores above 10 so we default to a max From 779b471896f46e2a8ed10a2bb68cabcb35d017df Mon Sep 17 00:00:00 2001 From: Max Duval Date: Wed, 12 Jun 2024 09:00:23 +0100 Subject: [PATCH 2/2] chore: apply formatting --- sport/app/football/model/CompetitionStages.scala | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/sport/app/football/model/CompetitionStages.scala b/sport/app/football/model/CompetitionStages.scala index 8e9bca7e178..0d8e4a55a3d 100644 --- a/sport/app/football/model/CompetitionStages.scala +++ b/sport/app/football/model/CompetitionStages.scala @@ -218,7 +218,6 @@ object KnockoutSpider { ZonedDateTime.of(2024, 6, 30, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 40 ZonedDateTime.of(2024, 7, 1, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 41 ZonedDateTime.of(2024, 7, 1, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 42 - ZonedDateTime.of(2024, 6, 30, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 39 ZonedDateTime.of(2024, 6, 29, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 37 ZonedDateTime.of(2024, 7, 2, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 43 @@ -233,10 +232,10 @@ object KnockoutSpider { // ━┓ ┃ ┃ ┏━ // ┣━ 2 ━┛ ┗━ 4 ━┫ // ━┛ ┗━ - ZonedDateTime.of(2024, 7, 6, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 48 - ZonedDateTime.of(2024, 7, 5, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 46 - ZonedDateTime.of(2024, 7, 5, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 45 - ZonedDateTime.of(2024, 7, 6, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 47 + ZonedDateTime.of(2024, 7, 6, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 48 + ZonedDateTime.of(2024, 7, 5, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 46 + ZonedDateTime.of(2024, 7, 5, 17, 0, 0, 0, ZoneId.of("Europe/London")), // Match 45 + ZonedDateTime.of(2024, 7, 6, 20, 0, 0, 0, ZoneId.of("Europe/London")), // Match 47 // Semi-Final //