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()

+
+ + +
+
+

Current Player

+

@gamelobby.getLogic.getCurrentPlayer.get.name

+ @if(!TrickUtil.isOver(gamelobby.getLogic.getCurrentMatch.get, gamelobby.getLogic.getPlayerQueue.get)) { +

Next Player

+ @for(nextplayer <- gamelobby.getLogic.getPlayerQueue.get.duplicate()) { +

@nextplayer

+ } + } +
+ + +
+ +
+ +
+

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="80px"/> + } else { + @views.html.render.card.apply("images/cards/1B.png")("Blank Card") width="80px"/> + } +
+
-
-

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%"/> - } -
-
-
-
- @for((cardplayed, player) <- gamelobby.getLogic.getCurrentTrick.get.cards) { -
-
- @util.WebUIUtils.cardtoImage(cardplayed) /> -
-
@player
-
+ + +
+ @for((cardplayed, player) <- gamelobby.getLogic.getCurrentTrick.get.cards) { +
+
+
+ @util.WebUIUtils.cardtoImage(cardplayed) width="100%"/> +
+
+ @player
- } +
+ } +
+ + +
+ @for(i <- player.currentHand().get.cards.indices) { +
+
+ + +
+
+ }
-
- @for(i <- 0 until player.currentHand().get.cards.size) { -
-
- - -
-
- } -
-
-} \ No newline at end of file +}