diff --git a/knockoutwhistweb/app/views/ingame/ingame.scala.html b/knockoutwhistweb/app/views/ingame/ingame.scala.html index 302d262..28b8550 100644 --- a/knockoutwhistweb/app/views/ingame/ingame.scala.html +++ b/knockoutwhistweb/app/views/ingame/ingame.scala.html @@ -1,51 +1,71 @@ +@import de.knockoutwhist.control.controllerBaseImpl.sublogic.util.TrickUtil + @(player: de.knockoutwhist.player.AbstractPlayer, gamelobby: logic.game.GameLobby) @main("Ingame") { -
Next Player
-@gamelobby.getLogic.getPlayerQueue.get.duplicate().nextPlayer()
+@gamelobby.getLogic.getCurrentPlayer.get.name
+ @if(!TrickUtil.isOver(gamelobby.getLogic.getCurrentMatch.get, gamelobby.getLogic.getPlayerQueue.get)) { +@nextplayer
+ } + } +@gamelobby.getLogic.getCurrentRound.get.trumpSuit
+ +Cards played
-Trumpsuit:
-@gamelobby.getLogic.getCurrentRound.get.trumpSuit
-First Card:
- @if(gamelobby.getLogic.getCurrentTrick.get.firstCard.isDefined) { - @util.WebUIUtils.cardtoImage(gamelobby.getLogic.getCurrentTrick.get.firstCard.get) width="30%"/> - } else { - @views.html.render.card.apply("images/cards/1B.png")("Blank Card") width="30%"/> - } -