From f1b989dd28488aa13a3a92bacd3ac97ae21c3100 Mon Sep 17 00:00:00 2001 From: "marcins78@gmail.com" Date: Mon, 9 Jul 2012 20:17:59 +0000 Subject: [PATCH] Stats display on UI. --- .../lotro/game/GameHistoryStatistics.java | 4 +++ .../src/main/webapp/js/gemp-009/statsUi.js | 32 +++++++++---------- 2 files changed, 20 insertions(+), 16 deletions(-) diff --git a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameHistoryStatistics.java b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameHistoryStatistics.java index b99b2a2ee..c9b0a16da 100644 --- a/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameHistoryStatistics.java +++ b/gemp-lotr/gemp-lotr-server/src/main/java/com/gempukku/lotro/game/GameHistoryStatistics.java @@ -50,6 +50,8 @@ public class GameHistoryStatistics { } private String getMainFormat(String format) { + if (format == null) + return "Fellowship block"; if (format.equals("Community Fellowship block")) return "Fellowship block"; if (format.equals("Community Two Towers block")) @@ -64,6 +66,8 @@ public class GameHistoryStatistics { } private boolean isIgnorable(String format) { + if (format == null) + return false; if (format.startsWith("Fellowship block - ")) return true; if (format.equals("Format for testing")) diff --git a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-009/statsUi.js b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-009/statsUi.js index 5fb2d2abd..95dedb9ce 100644 --- a/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-009/statsUi.js +++ b/gemp-lotr/gemp-lotr-web/src/main/webapp/js/gemp-009/statsUi.js @@ -4,30 +4,30 @@ var StatsUI = Class.extend({ init:function (url) { this.communication = new GempLotrCommunication(url, - function (xhr, ajaxOptions, thrownError) { - }); + function (xhr, ajaxOptions, thrownError) { + }); var now = new Date(); var nowStr = now.getFullYear() + "-" + (1 + now.getMonth()) + "-" + now.getDate(); - $(".statsParameters").append("Start date: "); - $(".statsParameters").append(" period: "); - $(".statsParameters").append(" "); + $("#statsParameters").append("Start date: "); + $("#statsParameters").append(" period: "); + $("#statsParameters").append(" "); var that = this; - $(".getStats", $(".statsParameters")).click( - function () { - var startDay = $(".startDay", $(".statsParameters")).prop("value"); - var period = $("option:selected", $(".period", $(".statsParameters"))).prop("value"); + $(".getStats", $("#statsParameters")).click( + function () { + var startDay = $(".startDay", $("#statsParameters")).prop("value"); + var period = $("option:selected", $(".period", $("#statsParameters"))).prop("value"); - that.communication.getStats(startDay, period, that.loadedStats, { - "400":function () { - alert("Invalid parameter entered"); - } - }) - }); + that.communication.getStats(startDay, period, that.loadedStats, { + "400":function () { + alert("Invalid parameter entered"); + } + }) + }); }, loadedStats:function (xml) { @@ -52,7 +52,7 @@ var StatsUI = Class.extend({ if (formatStats.length > 0) { $("#stats").append("
Casual games per format
"); - var table = $("
"); + var table = $("
"); table.append("Format name# of games% of casual"); for (var i = 0; i < formatStats.length; i++) { var formatStat = formatStats[i];