From a16c40a687587d7def07b13e78a82196bbe06cd9 Mon Sep 17 00:00:00 2001 From: Risto Lahtela Date: Mon, 25 Sep 2017 11:04:50 +0300 Subject: [PATCH] Added pie colors --- Plan/src/main/java/com/djrapitops/plan/Settings.java | 3 +++ .../com/djrapitops/plan/data/analysis/ActivityPart.java | 6 ++---- .../java/com/djrapitops/plan/data/analysis/WorldPart.java | 2 ++ .../plan/systems/info/parsing/InspectPageParser.java | 3 +++ Plan/src/main/resources/config.yml | 3 +++ Plan/src/main/resources/js/activityPie.js | 2 +- 6 files changed, 14 insertions(+), 5 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/Settings.java b/Plan/src/main/java/com/djrapitops/plan/Settings.java index 3b35efe0e..1da9e66ef 100644 --- a/Plan/src/main/java/com/djrapitops/plan/Settings.java +++ b/Plan/src/main/java/com/djrapitops/plan/Settings.java @@ -88,6 +88,9 @@ public enum Settings { THEME_GRAPH_RAM("Theme.Graphs.RAM"), THEME_GRAPH_CHUNKS("Theme.Graphs.Chunks"), THEME_GRAPH_ENTITIES("Theme.Graphs.Entities"), + THEME_GRAPH_WORLDPIE("Theme.Graphs.WorldPie"), + THEME_GRAPH_ACTIVITYPIE("Theme.Graphs.ActivityPie"), + THEME_GRAPH_SERVERPREFPIE("Theme.Graphs.ServerPreferencePie"), // StringList HIDE_FACTIONS("Plugins.Factions.HideFactions"), HIDE_TOWNS("Plugins.Towny.HideTowns"), diff --git a/Plan/src/main/java/com/djrapitops/plan/data/analysis/ActivityPart.java b/Plan/src/main/java/com/djrapitops/plan/data/analysis/ActivityPart.java index a561e42b7..b98a6292f 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/analysis/ActivityPart.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/analysis/ActivityPart.java @@ -15,6 +15,7 @@ import main.java.com.djrapitops.plan.utilities.html.graphs.PunchCardGraphCreator import java.util.*; import java.util.stream.Collectors; +import main.java.com.djrapitops.plan.Settings; /** * Part responsible for all Player Activity related analysis. @@ -92,10 +93,7 @@ public class ActivityPart extends RawData { int[] counts = new int[]{active.size(), inactive.size(), joinedOnce.size(), bans.size()}; - String activityColors = HtmlUtils.separateWithQuotes( - "#55ffff", "#ff55ff", "#ff5555", "#ffff55" //TODO Write Colors (enums) for Activity pie. - ); - addValue("activityColors", activityColors); + addValue("activityPieColors", Settings.THEME_GRAPH_ACTIVITYPIE.toString()); addValue("playersActive", counts[0]); addValue("active", counts[0]); addValue("inactive", counts[1]); diff --git a/Plan/src/main/java/com/djrapitops/plan/data/analysis/WorldPart.java b/Plan/src/main/java/com/djrapitops/plan/data/analysis/WorldPart.java index 0923678db..45bff87bd 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/analysis/WorldPart.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/analysis/WorldPart.java @@ -5,6 +5,7 @@ import main.java.com.djrapitops.plan.utilities.FormatUtils; import main.java.com.djrapitops.plan.utilities.html.graphs.WorldPieCreator; import java.util.HashMap; +import main.java.com.djrapitops.plan.Settings; /** * Part responsible for all World Playtime related analysis. @@ -34,6 +35,7 @@ public class WorldPart extends RawData { String[] seriesData = WorldPieCreator.createSeriesData(worldTimes); addValue("worldSeries", seriesData[0]); addValue("gmSeries", seriesData[1]); + addValue("worldPieColors", Settings.THEME_GRAPH_WORLDPIE.toString()); } public WorldTimes getWorldTimes() { diff --git a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java index 9ca627086..25c71687b 100644 --- a/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java +++ b/Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java @@ -33,6 +33,7 @@ import java.util.List; import java.util.Map; import java.util.UUID; import java.util.stream.Collectors; +import main.java.com.djrapitops.plan.Settings; import main.java.com.djrapitops.plan.utilities.html.graphs.ServerPreferencePieCreator; /** @@ -81,6 +82,8 @@ public class InspectPageParser extends PageParser { Map playtimeByServer = sessionsTable.getPlaytimeByServer(uuid); addValue("serverPieSeries", ServerPreferencePieCreator.createSeriesData(playtimeByServer)); + addValue("worldPieColors", Settings.THEME_GRAPH_WORLDPIE.toString()); + addValue("serverPieColors", Settings.THEME_GRAPH_SERVERPREFPIE.toString()); List geolocations = db.getIpsTable().getGeolocations(uuid); List nicknames = db.getNicknamesTable().getNicknames(uuid).stream() diff --git a/Plan/src/main/resources/config.yml b/Plan/src/main/resources/config.yml index ea16a871d..075634592 100644 --- a/Plan/src/main/resources/config.yml +++ b/Plan/src/main/resources/config.yml @@ -93,6 +93,9 @@ Theme: RAM: Base Chunks: Base Entities: Base + WorldPie: '[#222]' + ActivityPie: '[#333]' + ServerPreferencePie: '[#444]' Plugins: Factions: diff --git a/Plan/src/main/resources/js/activityPie.js b/Plan/src/main/resources/js/activityPie.js index 074465923..afe280c7d 100644 --- a/Plan/src/main/resources/js/activityPie.js +++ b/Plan/src/main/resources/js/activityPie.js @@ -17,7 +17,7 @@ function activityPie(id, activitySeries, activityTotal, activityColors) { dataLabels: { enabled: false }, - colors: activityColors, +// colors: activityColors, showInLegend: true } },