#64 Merge with origin/dev.

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

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;

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);
         }
     };
 

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

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

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