nikola/pairgoth
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Team of individuals: initial display of results page ok

Browse Source
This commit is contained in:
Claude Brisson
2025-01-26 18:21:59 +01:00
parent 0ebe3dfbd7
commit 47c729e61a
5 changed files with 42 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
api-webapp/src/main/kotlin/org/jeudego/pairgoth/api/PairingHandler.kt
View File

@@ -31,11 +31,15 @@ object PairingHandler: PairgothApiHandler {
val games = tournament.games(round).values.sortedBy {
if (it.table == 0) Int.MAX_VALUE else it.table
}
return Json.Object(
val ret = Json.MutableObject(
"games" to games.map { it.toJson() }.toCollection(Json.MutableArray()),
"pairables" to pairables,
"unpairables" to unpairables
)
if (tournament is TeamTournament) {
ret["individualGames"] = tournament.individualGames(round).map { it.toJson() }.toJsonArray()
}
return ret
}
override fun post(request: HttpServletRequest, response: HttpServletResponse): Json? {

25
api-webapp/src/main/kotlin/org/jeudego/pairgoth/model/Tournament.kt
View File

@@ -7,6 +7,7 @@ import com.republicate.kson.toJsonArray
import java.time.LocalDate
import org.jeudego.pairgoth.api.ApiHandler.Companion.badRequest
import org.jeudego.pairgoth.api.ApiHandler.Companion.logger
import org.jeudego.pairgoth.store.nextGameId
import org.jeudego.pairgoth.store.nextPlayerId
import org.jeudego.pairgoth.store.nextTournamentId
import kotlin.math.max
@@ -241,6 +242,26 @@ class TeamTournament(
override val players = mutableMapOf<ID, Player>()
val teams: MutableMap<ID, Team> = _pairables
// For teams of individual players, map from a team game id to the list of individual games
// (filled on demand - it is merely a cache)
private val individualGames = mutableMapOf<ID, List<Game>>()
fun individualGames(round: Int): List<Game> {
val teamGames = games(round).values.toList()
return teamGames.flatMap { game ->
if (game.white == 0 || game.black ==0 ) listOf()
else {
individualGames.computeIfAbsent(game.id) { id ->
val whitePlayers = teams[game.white]!!.activePlayers(round)
val blackPlayers = teams[game.black]!!.activePlayers(round)
whitePlayers.zip(blackPlayers).map {
Game(nextGameId, game.table, it.first.id, it.second.id)
}
}
}
}
}
fun pairedTeams() = super.pairedPlayers()
fun pairedTeams(round: Int) = super.pairedPlayers(round)
@@ -271,7 +292,9 @@ class TeamTournament(
}
val teamOfIndividuals: Boolean get() = type.individual
override fun canPlay(round: Int) = teamPlayers.filter { it.canPlay(round) }.size == type.playersNumber
fun activePlayers(round: Int) = teamPlayers.filter { it.canPlay(round) }.sortedByDescending { it.rating }
override fun canPlay(round: Int) = activePlayers(round).size == type.playersNumber
}
fun getPlayerTeam(playerId: ID) = teams.values.filter { it.playerIds.contains(playerId) }.firstOrNull()