Merge branch 'dev'

backend/api/rounds.js

@@ -449,7 +449,7 @@ function roundcheck(client, tournament, roundid) {
         // fetched the round objects of the active round
         let activePlayer;
         for (let i = 0; i < rounds.length; i++) {
-          if (rounds[i]._id.str == roundid.str) {
+          if (String(rounds[i]._id) == String(roundid)) {
             activePlayer = rounds[i].playerId;
             break;
           }

backend/api/tournament.js

@@ -309,6 +309,46 @@ router.get("/playeractive/:userid", (req, res) => {
   );
 });
 
+router.get("/specific/:id", (req, res) => {
+  MongoClient.connect(
+    connectionUrl,
+    { useNewUrlParser: true, useUnifiedTopology: true },
+    (err, client) => {
+      // Unable to connect to database
+      if (err) {
+        res.sendStatus(500); // Internal server error
+        return;
+      }
+      let id;
+      if (!req.params.id) {
+        res.sendStatus(400);
+      }
+      try {
+        id = mongo.ObjectID(req.params.id);
+      } catch (err) {
+        res.sendStatus(400);
+      }
+      // Using the database gameWare and collection tournaments
+      const db = client.db("gameWare");
+      const collection = "tournaments";
+
+      db.collection(collection)
+        .find({
+          _id: id,
+        })
+        .toArray((err, result) => {
+          if (err) {
+            res.sendStatus(500);
+            client.close();
+            return;
+          }
+          res.json(result[0]);
+          client.close();
+        });
+    }
+  );
+});
+
 router.get("/player/:userid/:active", (req, res) => {
   // Returns the tournaments of player with active field matching parameter
   // Also checks the state of all tournaments

frontend/core/src/com/gameware/game/states/CreateJoinTournamentState.java

@@ -70,6 +70,10 @@ public class CreateJoinTournamentState extends State {
     private boolean includeCheckboxClicked = false;
     private boolean leaveConfirmed = false;
     private boolean joinButtonClicked = false;
+    private boolean enterButtonClicked = false;
+    private Tournament enteredTournament;
+    private Round enteredRound;
+
     private LoadingText loadingText = new LoadingText();
 
     public CreateJoinTournamentState(GameStateManager gsm) {
@@ -293,6 +297,14 @@ public class CreateJoinTournamentState extends State {
             this.joinButtonClicked = false;
         }
 
+        // User pressed the enter tournament button
+        if(this.enterButtonClicked && this.loadingText.textIsRendering()){
+            this.handleEnterBtnClick(this.enteredTournament, this.enteredRound);
+            this.enterButtonClicked = false;
+            this.enteredTournament = null;
+            this.enteredRound = null;
+        }
+
 
         this.loadingText.update(dt);
     }
@@ -319,6 +331,13 @@ public class CreateJoinTournamentState extends State {
         this.loadingText.setLoading();
     }
 
+    private void setEnterButtonClicked(Tournament clickedTournament, Round enteredRound){
+        this.enterButtonClicked = true;
+        this.enteredTournament = clickedTournament;
+        this.enteredRound = enteredRound;
+        this.loadingText.setLoading();
+    }
+
 
 //    Handle click methods
 
@@ -405,7 +424,7 @@ public class CreateJoinTournamentState extends State {
         }
 
         public void clicked(InputEvent event, float x, float y) {
-            handleEnterBtnClick(tournament, round);
+            setEnterButtonClicked(tournament, round);
         };
     }