diff --git a/frontend/core/src/com/gameware/game/QueryIntermediate.java b/frontend/core/src/com/gameware/game/QueryIntermediate.java index 8d3d3ca0f9331b84dab1672442c91278897ffbf2..94fba4f86bca0c7cefa46df1bbbf2a667562fa32 100644 --- a/frontend/core/src/com/gameware/game/QueryIntermediate.java +++ b/frontend/core/src/com/gameware/game/QueryIntermediate.java @@ -174,7 +174,7 @@ public class QueryIntermediate { public static Tournament createNewTournament(Tournament tournament) throws IOException, NoSuchElementException { String route = "tournament/new"; Map<String, String> params = new HashMap<>(); - params.put("userid", tournament.getPlayers().get(0)); + params.put("playerId", tournament.getPlayers().get(0)); params.put("games", tournament.getGames().toString()); params.put("name", tournament.getName()); params.put("timePerRound", Double.toString(tournament.getTimePerRound())); diff --git a/frontend/core/src/com/gameware/game/models/Tournament.java b/frontend/core/src/com/gameware/game/models/Tournament.java index 82da072c722a07a29db5dd136a68976d536c1b6a..f0a9d044b32aa9543bc6aa8494c989e988981e0f 100644 --- a/frontend/core/src/com/gameware/game/models/Tournament.java +++ b/frontend/core/src/com/gameware/game/models/Tournament.java @@ -24,6 +24,7 @@ public class Tournament implements ModelInterface { private int currentPlayers; private int totalGames; private int startDelay; + private String startTime; public Tournament() { } @@ -42,20 +43,22 @@ public class Tournament implements ModelInterface { this.startDelay = startDelay; } - // Just testing delete afterwards - public Tournament(String _id, String name, List<String> players, int roundsPerGame, int currentRound) { - this._id = _id; + public Tournament(String playerId, List<String> games, String name, double timePerRound, int maxPlayers, + int roundsPerGame, int currentPlayers, int totalGames, int startDelay, String startTime) { + this.players = new ArrayList<>(); + this.players.add(playerId); + this.games = games; this.name = name; - this.players = players; + this.timePerRound = timePerRound; + this.maxPlayers = maxPlayers; this.roundsPerGame = roundsPerGame; - this.currentRound = currentRound; + this.currentPlayers = currentPlayers; + this.totalGames = totalGames; + this.startDelay = startDelay; + this.startTime = startTime; } - // Just testing delete afterwards - public Tournament(String _id, String name) { - this._id = _id; - this.name = name; - } + public String get_id() { return _id; diff --git a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java index 372d1e8ce58d01e14308cbd7f46b0b71d1b8d94c..36c8785b38a46c77578fbe8caab4432d5612676b 100644 --- a/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java @@ -29,6 +29,7 @@ public class CreateJoinTournamentState extends State { private Label gameNameText = new Label("Multiplayer", skin, "big"); private Label stateTitleText = new Label("Currently playing", skin, "big"); + private Label joinTournamentFeedbackLabel = new Label("", skin); private String backBtnText = "Back"; private String createBtnText = "Create new"; @@ -38,6 +39,8 @@ public class CreateJoinTournamentState extends State { private String statusColText = "Status"; private String isPlayedTrueText = "Waiting"; private String isPlayedFalseText = "Your turn"; + private String noAvailableTournamentsText = "No available tournaments"; + private String joinedText = "Joined "; private List<Tournament> tournaments = new ArrayList<>(); @@ -99,9 +102,11 @@ public class CreateJoinTournamentState extends State { createTournamentList(); tournamentsPane = new ScrollPane(innerTable, skin); - outerTable.add(tournamentsPane).spaceBottom(spacingOnBottomInputFIeld*1.3f); + outerTable.add(tournamentsPane).spaceBottom(spacingOnBottom); outerTable.getCell(tournamentsPane).size(Gdx.graphics.getWidth()/1.1f, Gdx.graphics.getHeight()/4f); outerTable.row(); + outerTable.add(joinTournamentFeedbackLabel).spaceBottom(spacingOnBottom);; + outerTable.row(); Table btnTable = new Table(); btnTable.add(makeCreateBtn()).size(buttonWidth, buttonHeight).spaceBottom(spacingOnBottomInputFIeld).spaceRight(spacingOnBottom); btnTable.add(makeJoinBtn()).size(buttonWidth, buttonHeight).spaceBottom(spacingOnBottomInputFIeld); @@ -235,11 +240,14 @@ public class CreateJoinTournamentState extends State { Tournament newT = QueryIntermediate.joinATournament(GameWare.getInstance().getPlayer().getId()); tournaments.add(newT); + joinTournamentFeedbackLabel.setText(joinedText+newT.getName()); + //Fjerner alt og legger til alt igjen, aka dårlig måte å gjøre på men fant ingen annen måte outerTable.remove(); makeStage(); }catch(Exception e){ System.out.println(e); + joinTournamentFeedbackLabel.setText(noAvailableTournamentsText); } }; diff --git a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java index d4775dbe047732a471bb61f9979e4db8d7661aca..a3bc7009b57d23c41636afe03347b047574ee656 100644 --- a/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/CreateNewTournamentState.java @@ -42,6 +42,7 @@ public class CreateNewTournamentState extends State { private Tournament tournament; private List<String> chosenGames = new ArrayList<>(); private Round round; + private Tournament tournamentFromDB; private int inputFieldHeight = Gdx.graphics.getHeight()/15; private int nameFieldWidth = Gdx.graphics.getWidth()/3; @@ -203,12 +204,12 @@ public class CreateNewTournamentState extends State { try { tournament = new Tournament(GameWare.getInstance().getPlayer().getId(),chosenGames,getTournamentName(),getTimePerRound(),getMaxPlayers(),getRoundsPerGame(),1,chosenGames.size(),getStartDelay()); - round = new Round(); - QueryIntermediate.createNewTournament(tournament); + tournamentFromDB = QueryIntermediate.createNewTournament(tournament); + round = QueryIntermediate.getRoundFromTournament(tournamentFromDB.get_id(), GameWare.getInstance().getPlayer().getId(), tournamentFromDB.getCurrentRound()); } catch (IOException e) { e.printStackTrace(); } - gsm.set(new ViewTournamentState(gsm,tournament,round)); + gsm.set(new ViewTournamentState(gsm,tournamentFromDB,round)); } private String getTournamentName(){ diff --git a/frontend/core/src/com/gameware/game/states/TournamentHighScoreState.java b/frontend/core/src/com/gameware/game/states/TournamentHighScoreState.java index 9b06e93334b17480169e53b3d12be2d577df8001..c28cec58892c8a4d1c6617bac370fd047b9161fe 100644 --- a/frontend/core/src/com/gameware/game/states/TournamentHighScoreState.java +++ b/frontend/core/src/com/gameware/game/states/TournamentHighScoreState.java @@ -29,7 +29,8 @@ public class TournamentHighScoreState extends State{ private Round round; private Label stateNameText; - private String tournamentPointsText = "\nTournament Points"; + private Label tournamentNameText; + private String tournamentPointsText = "Tournament Points"; private String colOneText = "Player"; private String colTwoText = "Total"; private String colThreeText = "Last Round"; @@ -40,7 +41,8 @@ public class TournamentHighScoreState extends State{ super(gsm); this.tournament = tournament; this.round = r; - stateNameText = new Label(tournament.getName()+tournamentPointsText, skin, "big"); + tournamentNameText = new Label(tournament.getName(), skin, "big"); + stateNameText = new Label(tournamentPointsText, skin, "big"); try { points = QueryIntermediate.getTournamentPoints(tournament.get_id()); }catch(Exception e){ @@ -54,7 +56,10 @@ public class TournamentHighScoreState extends State{ table.setFillParent(true); table.setBackground(background); stateNameText.setFontScale(tinierTitleFontBigScale); + tournamentNameText.setFontScale(tinierTitleFontBigScale); + table.add(tournamentNameText); + table.row(); table.add(stateNameText).spaceBottom(spacingOnBottomInputFIeld); table.row(); diff --git a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java index 3cd52a63e3b048d5647bbc250560445e714c565b..76392f3bf5eaf3d46872c1016d95719eb0bebf96 100644 --- a/frontend/core/src/com/gameware/game/states/ViewTournamentState.java +++ b/frontend/core/src/com/gameware/game/states/ViewTournamentState.java @@ -63,7 +63,7 @@ public class ViewTournamentState extends State { table.row(); table.add(new Label(nrPlayersText+" "+tournament.getPlayers().size(), skin)); table.row(); - table.add(new Label(roundsLeftText+" "+((tournament.getRoundsPerGame()*tournament.getRoundsPerGame())-tournament.getCurrentRound()), skin)).spaceBottom(spacingOnBottomInputFIeld); + table.add(new Label(roundsLeftText+" "+((tournament.getRoundsPerGame()*tournament.getGames().size())-tournament.getCurrentRound()+1), skin)).spaceBottom(spacingOnBottomInputFIeld); table.row(); Table innerTable = new Table();