From d21b9c7aeaadb03fa3dc6296f5f0d6fe55910c73 Mon Sep 17 00:00:00 2001 From: LQ63 Date: Tue, 13 Jan 2026 22:22:34 +0100 Subject: [PATCH 1/2] feat(ui): Tie selection Added a nice tie selection ui --- knockoutwhistweb/app/dto/TieInfoDTO.scala | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/knockoutwhistweb/app/dto/TieInfoDTO.scala b/knockoutwhistweb/app/dto/TieInfoDTO.scala index 0710dab..0ecbda5 100644 --- a/knockoutwhistweb/app/dto/TieInfoDTO.scala +++ b/knockoutwhistweb/app/dto/TieInfoDTO.scala @@ -1,12 +1,13 @@ package dto -import dto.subDTO.PlayerDTO +import de.knockoutwhist.cards.Card +import dto.subDTO.{CardDTO, PlayerDTO} import logic.game.GameLobby import model.users.User import scala.util.Try -case class TieInfoDTO(gameId: String, currentPlayer: Option[PlayerDTO], self: Option[PlayerDTO], tiedPlayers: Seq[PlayerDTO], highestAmount: Int) +case class TieInfoDTO(gameId: String, currentPlayer: Option[PlayerDTO], self: Option[PlayerDTO], tiedPlayers: Seq[PlayerDTO], highestAmount: Int, selectedCards: Map[String, CardDTO]) object TieInfoDTO { @@ -20,7 +21,10 @@ object TieInfoDTO { currentPlayer = lobby.logic.playerTieLogic.currentTiePlayer().map(PlayerDTO.apply), self = selfPlayer.map(PlayerDTO.apply), tiedPlayers = lobby.logic.playerTieLogic.getTiedPlayers.map(PlayerDTO.apply), - highestAmount = lobby.logic.playerTieLogic.highestAllowedNumber() + highestAmount = lobby.logic.playerTieLogic.highestAllowedNumber(), + selectedCards = lobby.logic.playerTieLogic.getSelectedCard.map { + case (player, card) => player.id.toString -> CardDTO(card) + } ) } -- 2.52.0 From 3029afee3fef4c6589545c4004b5dfd96df749b1 Mon Sep 17 00:00:00 2001 From: Janis Date: Wed, 14 Jan 2026 10:35:27 +0100 Subject: [PATCH 2/2] feat: FRO-26 Create Tie selection component --- knockoutwhistfrontend | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/knockoutwhistfrontend b/knockoutwhistfrontend index 058d232..dbffce8 160000 --- a/knockoutwhistfrontend +++ b/knockoutwhistfrontend @@ -1 +1 @@ -Subproject commit 058d232d2ba00f33b1e658fc8a793dcd59018fa4 +Subproject commit dbffce8818865eec70222aa6561d1a364efb325d -- 2.52.0