diff --git a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java index 5fdf63b4fb3e6effbce14e3a34dbd6eb1577bc42..4f445a7eb565135866814ba302f5af2ad3762b80 100644 --- a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java @@ -11,6 +11,7 @@ import com.badlogic.gdx.scenes.scene2d.ui.Table; import com.badlogic.gdx.scenes.scene2d.ui.TextButton; import com.badlogic.gdx.scenes.scene2d.ui.TextField; import com.badlogic.gdx.scenes.scene2d.utils.ClickListener; +import com.badlogic.gdx.utils.Align; import com.gameware.game.GameWare; import com.gameware.game.QueryIntermediate; import com.gameware.game.models.Game; @@ -26,12 +27,14 @@ public class CreateNewTournamentState extends State { private Label title = new Label("Create new\ntournament", skin, "big"); private String nameText = "Name"; private TextField nameInputField; - private String timePerRoundText = "Minutes per round"; + private String timePerRoundText = "Hours to \n complete each round"; private SelectBox timePerRoundSelectBox; private String maxPlayersText = "Max number of players"; private SelectBox maxPlayersSelectBox; private String roundsPerGameText = "Round per game"; private SelectBox roundsPerGameSelectBox; + private String startDelayText = "Hours waiting for more \n players before start"; + private SelectBox startDelaySelectBox; private Label errorLabel = new Label("", skin, "error"); @@ -61,31 +64,42 @@ public class CreateNewTournamentState extends State { table = new Table(); table.setFillParent(true); + table.setBackground(background); title.setFontScale(titleFontBigScale); table.add(title).colspan(2).spaceBottom(spacingOnBottomInputFIeld); table.row(); + table.add(makeLabel(nameText,skin)); nameInputField = new TextField("",skin); nameInputField.setMaxLength(10); table.add(nameInputField).size(nameFieldWidth, inputFieldHeight).spaceBottom(spacingOnBottom); table.row(); + table.add(makeLabel(timePerRoundText,skin)); timePerRoundSelectBox = new SelectBox(skin); timePerRoundSelectBox.setItems(1,2,3,4,5); table.add(timePerRoundSelectBox).spaceBottom(spacingOnBottom); table.row(); + table.add(makeLabel(maxPlayersText,skin)); maxPlayersSelectBox = new SelectBox(skin); maxPlayersSelectBox.setItems(2,3,4,5); table.add(maxPlayersSelectBox).spaceBottom(spacingOnBottom); table.row(); + table.add(makeLabel(roundsPerGameText,skin)); roundsPerGameSelectBox = new SelectBox(skin); roundsPerGameSelectBox.setItems(1,2,3); table.add(roundsPerGameSelectBox).spaceBottom(spacingOnBottom); table.row(); + table.add(makeLabel(startDelayText,skin)).spaceBottom(spacingOnBottom); + startDelaySelectBox = new SelectBox(skin); + startDelaySelectBox.setItems(1,2,3); + table.add(startDelaySelectBox).spaceBottom(spacingOnBottom); + table.row(); + for (final Game g : games){ Label gameLabel = new Label(g.getName(),skin); table.add(gameLabel).spaceBottom(spacingOnBottom); @@ -116,6 +130,7 @@ public class CreateNewTournamentState extends State { private Label makeLabel(String text, Skin skin){ Label label = new Label(text,skin); + label.setAlignment(Align.center); return label; } @@ -188,7 +203,7 @@ public class CreateNewTournamentState extends State { } try { - tournament = new Tournament(GameWare.getInstance().getPlayer().getId(),chosenGames,getTournamentName(),getTimePerRound(),getMaxPlayers(),getRoundsPerGame(),1,chosenGames.size(), 1); + tournament = new Tournament(GameWare.getInstance().getPlayer().getId(),chosenGames,getTournamentName(),getTimePerRound(),getMaxPlayers(),getRoundsPerGame(),1,chosenGames.size(),getStartDelay()); tournamentFromDB = QueryIntermediate.createNewTournament(tournament); round = QueryIntermediate.getRoundFromTournament(tournamentFromDB.get_id(), GameWare.getInstance().getPlayer().getId(), tournamentFromDB.getCurrentRound()); } catch (IOException e) { @@ -213,4 +228,6 @@ public class CreateNewTournamentState extends State { return (int) roundsPerGameSelectBox.getSelected(); } + private int getStartDelay(){ return (int) startDelaySelectBox.getSelected(); } + } \ No newline at end of file