diff --git a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java index 64058aea2..a67910790 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java +++ b/gemp-lotr/gemp-lotr-async/src/main/java/com/gempukku/lotro/async/handler/TournamentRequestHandler.java @@ -145,7 +145,7 @@ public class TournamentRequestHandler extends LotroServerRequestHandler implemen Document doc = documentBuilder.newDocument(); Element tournaments = doc.createElement("tournaments"); - for (Tournament tournament : _tournamentService.getOldTournaments(ZonedDateTime.now().minus(RecentTournamentDuration))) { + for (Tournament tournament : _tournamentService.getOldTournaments(ZonedDateTime.now().minus(RecentTournamentDuration)).reversed()) { Element tournamentElem = doc.createElement("tournament"); tournamentElem.setAttribute("id", tournament.getTournamentId()); @@ -155,6 +155,10 @@ public class TournamentRequestHandler extends LotroServerRequestHandler implemen tournamentElem.setAttribute("round", String.valueOf(tournament.getCurrentRound())); tournamentElem.setAttribute("stage", tournament.getTournamentStage().getHumanReadable()); + if (tournament.getTournamentStage().equals(Tournament.Stage.FINISHED) && tournament.getCurrentRound() == 0) { + // do NOT include past tournaments with 0 games played (for example draft of one player against bots) + continue; + } tournaments.appendChild(tournamentElem); } diff --git a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/tournamentResultsUi.js b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/tournamentResultsUi.js index d31e30e89..ae3b7058e 100644 --- a/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/tournamentResultsUi.js +++ b/gemp-lotr/gemp-lotr-async/src/main/web/js/gemp-022/tournamentResultsUi.js @@ -35,13 +35,11 @@ var TournamentResultsUI = Class.extend({ }); }, - loadedTournament:function (xml) { + loadedTournament:function (xml, targetDiv) { var that = this; log(xml); var root = xml.documentElement; if (root.tagName == 'tournament') { - $("#tournamentExtraInfo").html(""); - var tournament = root; var tournamentId = tournament.getAttribute("id"); @@ -51,16 +49,16 @@ var TournamentResultsUI = Class.extend({ var tournamentRound = tournament.getAttribute("round"); var tournamentStage = tournament.getAttribute("stage"); - $("#tournamentExtraInfo").append("