Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-15 11:51:59 +01:00
Code Issues Projects Releases Wiki Activity

Added pie colors

Browse Source
This commit is contained in:
Risto Lahtela 2017-09-25 11:04:50 +03:00
parent c127f03b00
commit a16c40a687
6 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Plan/src/main/java/com/djrapitops/plan/Settings.java
View File

@ -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"),

6
Plan/src/main/java/com/djrapitops/plan/data/analysis/ActivityPart.java
View File

@ -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]);

2
Plan/src/main/java/com/djrapitops/plan/data/analysis/WorldPart.java
View File

@ -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() {

3
Plan/src/main/java/com/djrapitops/plan/systems/info/parsing/InspectPageParser.java
View File

@ -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<String, Long> playtimeByServer = sessionsTable.getPlaytimeByServer(uuid);
addValue("serverPieSeries", ServerPreferencePieCreator.createSeriesData(playtimeByServer));
addValue("worldPieColors", Settings.THEME_GRAPH_WORLDPIE.toString());
addValue("serverPieColors", Settings.THEME_GRAPH_SERVERPREFPIE.toString());
List<String> geolocations = db.getIpsTable().getGeolocations(uuid);
List<String> nicknames = db.getNicknamesTable().getNicknames(uuid).stream()

3
Plan/src/main/resources/config.yml
View File

@ -93,6 +93,9 @@ Theme:
RAM: Base
Chunks: Base
Entities: Base
WorldPie: '[#222]'
ActivityPie: '[#333]'
ServerPreferencePie: '[#444]'
Plugins:
Factions:

2
Plan/src/main/resources/js/activityPie.js
View File

@ -17,7 +17,7 @@ function activityPie(id, activitySeries, activityTotal, activityColors) {
dataLabels: {
enabled: false
},
colors: activityColors,
// colors: activityColors,
showInLegend: true
}
},