From f7c9608e42401c124fd1328271acd2c551b1dd4d Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 3 Jul 2012 15:35:00 +0000 Subject: [PATCH] Tournament result display. --- .../lotro/server/TournamentResource.java | 3 +- .../gemp-lotr-web/src/main/webapp/hall.html | 2 + .../webapp/includes/tournamentResults.html | 9 ++ .../main/webapp/js/gemp-007/communication.js | 13 ++ .../webapp/js/gemp-007/tournamentResultsUi.js | 127 ++++++++++++++++++ 5 files changed, 153 insertions(+), 1 deletion(-) create mode 100644 gemp-lotr/gemp-lotr-web/src/main/webapp/includes/tournamentResults.html create mode 100644 gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-007/tournamentResultsUi.js diff --git a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/TournamentResource.java b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/TournamentResource.java index 78fd6804e..c4b8084b7 100644 --- a/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/TournamentResource.java +++ b/gemp-lotr/gemp-lotr-web-server/src/main/java/com/gempukku/lotro/server/TournamentResource.java @@ -57,6 +57,7 @@ public class TournamentResource extends AbstractResource { tournamentElem.setAttribute("format", _lotroFormatLibrary.getFormat(tournament.getFormat()).getName()); tournamentElem.setAttribute("collection", tournament.getCollectionType().getFullName()); tournamentElem.setAttribute("round", String.valueOf(tournament.getCurrentRound())); + tournamentElem.setAttribute("finished", String.valueOf(tournament.isFinished())); tournaments.appendChild(tournamentElem); } @@ -93,7 +94,7 @@ public class TournamentResource extends AbstractResource { List leagueStandings = tournament.getCurrentStandings(); for (PlayerStanding standing : leagueStandings) { - Element standingElem = doc.createElement("leagueStanding"); + Element standingElem = doc.createElement("tournamentStanding"); setStandingAttributes(standing, standingElem); tournamentElem.appendChild(standingElem); } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html index fa57172f9..0c7fd20e2 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/hall.html @@ -178,6 +178,7 @@ + @@ -298,6 +299,7 @@