From c171d839c3cab2c1990dfa457be11f01a39190e2 Mon Sep 17 00:00:00 2001 From: Claude Brisson Date: Mon, 2 Sep 2024 16:36:16 +0200 Subject: [PATCH] Export all bye players in OpenGotha format --- .../kotlin/org/jeudego/pairgoth/ext/OpenGotha.kt | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/ext/OpenGotha.kt b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/ext/OpenGotha.kt index 413a48b..6ad2b47 100644 --- a/api-webapp/src/main/kotlin/org/jeudego/pairgoth/ext/OpenGotha.kt +++ b/api-webapp/src/main/kotlin/org/jeudego/pairgoth/ext/OpenGotha.kt @@ -221,7 +221,7 @@ object OpenGotha { val now = LocalDateTime.now().format(DateTimeFormatter.ofPattern("yyyyMMddHHmmss")) val xml = """ - + ${tournament.pairables.values.map { player -> player as Player @@ -293,16 +293,16 @@ object OpenGotha { ${ (1..tournament.lastRound()).map { round -> - tournament.games(round).values.firstNotNullOfOrNull { g -> - if (g.black == 0 || g.white == 0) g else null - }?.let { + tournament.games(round).values.filter { g -> + g.black == 0 || g.white == 0 + }.map { tournament.pairables[ - if (it.black == 0) it.white - else it.black + if (it.black == 0) it.white + else it.black ] as Player - }?.let { p -> + }.map { p -> "" - } + }.joinToString("\n") }.joinToString("\n") }