From cda06f56b10ddae68ce44eb96dccd39bc74c3a54 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Tue, 10 Jan 2012 12:36:41 +0000 Subject: [PATCH] League (and serie) results in 2 columns. --- .../CantTakeMoreThanXWoundsModifier.java | 2 - .../src/main/webapp/js/leagueResultsUi.js | 96 +++++++++---------- 2 files changed, 46 insertions(+), 52 deletions(-) diff --git a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeMoreThanXWoundsModifier.java b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeMoreThanXWoundsModifier.java index 7a35f01d7..9fc6746bf 100644 --- a/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeMoreThanXWoundsModifier.java +++ b/gemp-lotr/gemp-lotr-cards/src/main/java/com/gempukku/lotro/cards/modifiers/CantTakeMoreThanXWoundsModifier.java @@ -13,7 +13,6 @@ import com.gempukku.lotro.logic.modifiers.ModifierEffect; import com.gempukku.lotro.logic.modifiers.ModifiersQuerying; public class CantTakeMoreThanXWoundsModifier extends AbstractModifier { - private Phase _phase; private int _count; public CantTakeMoreThanXWoundsModifier(PhysicalCard source, Phase phase, int count, Filterable... affectFilters) { @@ -23,7 +22,6 @@ public class CantTakeMoreThanXWoundsModifier extends AbstractModifier { public CantTakeMoreThanXWoundsModifier(PhysicalCard source, final Phase phase, int count, Condition condition, Filterable... affectFilters) { super(source, "Can't take more than " + count + " wound(s)", Filters.and(affectFilters), (condition == null ? new PhaseCondition(phase) : new AndCondition(new PhaseCondition(phase), condition)), ModifierEffect.WOUND_MODIFIER); - _phase = phase; _count = count; } diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/leagueResultsUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/leagueResultsUi.js index 1c62b7264..9a8436a8f 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/leagueResultsUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/leagueResultsUi.js @@ -44,31 +44,8 @@ var LeagueResultsUI = Class.extend({ var tabContent = $("
"); var standings = league.getElementsByTagName("leagueStanding"); - if (standings.length > 0) { - var standingsTable = $("
"); - - standingsTable.append("StandingPlayerPointsGames played"); - - var lastPoints = -1; - var lastGamesPlayed = -1; - var currentStanding = -1; - - for (var k = 0; k < standings.length; k++) { - var standing = standings[k]; - var player = standing.getAttribute("player"); - var points = parseInt(standing.getAttribute("points")); - var gamesPlayed = parseInt(standing.getAttribute("gamesPlayed")); - if (points != lastPoints || gamesPlayed != lastGamesPlayed) { - lastPoints = points; - lastGamesPlayed = gamesPlayed; - currentStanding = k + 1; - } - - standingsTable.append("" + currentStanding + "" + player + "" + points + "" + gamesPlayed + ""); - } - - tabContent.append(standingsTable); - } + if (standings.length > 0) + tabContent.append(this.createStandingsTable(standings)); tabDiv.append(tabContent); tabNavigation.append("
  • Overall results
    • "); @@ -89,31 +66,8 @@ var LeagueResultsUI = Class.extend({ tabContent.append("Maximum ranked matches in serie: " + maxMatches + ""); var standings = serie.getElementsByTagName("standing"); - if (standings.length > 0) { - var standingsTable = $("
    "); - - standingsTable.append("StandingPlayerPointsGames played"); - - var lastPoints = -1; - var lastGamesPlayed = -1; - var currentStanding = -1; - - for (var k = 0; k < standings.length; k++) { - var standing = standings[k]; - var player = standing.getAttribute("player"); - var points = parseInt(standing.getAttribute("points")); - var gamesPlayed = parseInt(standing.getAttribute("gamesPlayed")); - if (points != lastPoints || gamesPlayed != lastGamesPlayed) { - lastPoints = points; - lastGamesPlayed = gamesPlayed; - currentStanding = k + 1; - } - - standingsTable.append("" + currentStanding + "" + player + "" + points + "" + gamesPlayed + ""); - } - - tabContent.append(standingsTable); - } + if (standings.length > 0) + tabContent.append(this.createStandingsTable(standings)); tabDiv.append(tabContent); tabNavigation.append("
  • Serie " + (j + 1) + "
    • "); @@ -124,5 +78,47 @@ var LeagueResultsUI = Class.extend({ $("#leagueResults").append(tabDiv); } } + }, + + createStandingsTable: function(standings) { + var standingsTable = $("
    "); + + standingsTable.append("StandingPlayerPointsGames playedStandingPlayerPointsGames played"); + + var lastPoints = -1; + var lastGamesPlayed = -1; + var currentStanding = -1; + + var secondColumnBaseIndex = Math.ceil(standings.length / 2); + + for (var k = 0; k < secondColumnBaseIndex; k++) { + var standing = standings[k]; + var player = standing.getAttribute("player"); + var points = parseInt(standing.getAttribute("points")); + var gamesPlayed = parseInt(standing.getAttribute("gamesPlayed")); + if (points != lastPoints || gamesPlayed != lastGamesPlayed) { + lastPoints = points; + lastGamesPlayed = gamesPlayed; + currentStanding = k + 1; + } + + standingsTable.append("" + currentStanding + "" + player + "" + points + "" + gamesPlayed + ""); + } + + for (var k = secondColumnBaseIndex; k < standings.length; k++) { + var standing = standings[k]; + var player = standing.getAttribute("player"); + var points = parseInt(standing.getAttribute("points")); + var gamesPlayed = parseInt(standing.getAttribute("gamesPlayed")); + if (points != lastPoints || gamesPlayed != lastGamesPlayed) { + lastPoints = points; + lastGamesPlayed = gamesPlayed; + currentStanding = k + 1; + } + + $("tr:eq(" + (k - secondColumnBaseIndex + 1) + ")", standingsTable).append("" + currentStanding + "" + player + "" + points + "" + gamesPlayed + ""); + } + + return standingsTable; } }); \ No newline at end of file