Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-09 20:31:38 +01:00
Code Issues Projects Releases Wiki Activity

Eluded 0-time worlds/aliases from world pies #402

Browse Source
This commit is contained in:
Rsl1122 2017-11-29 10:55:39 +02:00
parent ac98c1e9d2
commit 7b33c1a43e
5 changed files with 15 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Plan/src/main/java/com/djrapitops/plan/utilities/html/graphs/WorldPieCreator.java
View File

@ -1,6 +1,7 @@
package main.java.com.djrapitops.plan.utilities.html.graphs; package main.java.com.djrapitops.plan.utilities.html.graphs;
import main.java.com.djrapitops.plan.Plan; import main.java.com.djrapitops.plan.Plan;
import main.java.com.djrapitops.plan.Settings;
import main.java.com.djrapitops.plan.WorldAliasSettings; import main.java.com.djrapitops.plan.WorldAliasSettings;
import main.java.com.djrapitops.plan.data.time.GMTimes; import main.java.com.djrapitops.plan.data.time.GMTimes;
import main.java.com.djrapitops.plan.data.time.WorldTimes; import main.java.com.djrapitops.plan.data.time.WorldTimes;
@ -21,6 +22,9 @@ public class WorldPieCreator {
* @return String array, index 0: Series data, 1: drilldown data * @return String array, index 0: Series data, 1: drilldown data
*/ */
public static String[] createSeriesData(WorldTimes worldTimes) { public static String[] createSeriesData(WorldTimes worldTimes) {
String[] colors = Settings.THEME_GRAPH_WORLD_PIE.toString().split(", ");
int colLenght = colors.length;
StringBuilder seriesBuilder = new StringBuilder("["); StringBuilder seriesBuilder = new StringBuilder("[");
int i = 0; int i = 0;
// WorldTimes Map<String, GMTimes> (GMTimes.getTotal) // WorldTimes Map<String, GMTimes> (GMTimes.getTotal)
@ -34,8 +38,14 @@ public class WorldPieCreator {
int size = playtimePerAlias.size(); int size = playtimePerAlias.size();
for (String alias : worlds) { for (String alias : worlds) {
Long value = playtimePerAlias.getOrDefault(alias, 0L);
if (value == 0L) {
i++;
continue;
}
seriesBuilder.append("{name:'").append(alias) seriesBuilder.append("{name:'").append(alias)
.append("',y:").append(playtimePerAlias.getOrDefault(alias, 0L)) .append("',y:").append(value)
.append(",color:").append(colors[i % colLenght])
.append(",drilldown: '").append(alias).append("'"); .append(",drilldown: '").append(alias).append("'");
seriesBuilder.append("}"); seriesBuilder.append("}");

2
Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/ServerAccordionCreator.java
View File

@ -98,7 +98,7 @@ public class ServerAccordionCreator {
.append("<div id=\"").append(worldId).append("\" class=\"dashboard-donut-chart\"></div>") .append("<div id=\"").append(worldId).append("\" class=\"dashboard-donut-chart\"></div>")
// World Pie data script // World Pie data script
.append("<script>") .append("<script>")
.append("var ").append(worldId).append("series = {name:'World Playtime',colors: worldPieColors,colorByPoint:true,data:").append(worldData[0]).append("};") .append("var ").append(worldId).append("series = {name:'World Playtime'," +/*colors: worldPieColors,*/"colorByPoint:true,data:").append(worldData[0]).append("};")
.append("var ").append(worldId).append("gmseries = ").append(worldData[1]).append(";") .append("var ").append(worldId).append("gmseries = ").append(worldData[1]).append(";")
.append("</script>") .append("</script>")
.append("</div>") // Right col-6 .append("</div>") // Right col-6

2
Plan/src/main/java/com/djrapitops/plan/utilities/html/structure/SessionTabStructureCreator.java
View File

@ -118,7 +118,7 @@ public class SessionTabStructureCreator {
.append("<div id=\"").append(worldId).append("\" class=\"dashboard-donut-chart\"></div>") .append("<div id=\"").append(worldId).append("\" class=\"dashboard-donut-chart\"></div>")
// World Pie data script // World Pie data script
.append("<script>") .append("<script>")
.append("var ").append(worldId).append("series = {name:'World Playtime',colors: worldPieColors,colorByPoint:true,data:").append(worldData[0]).append("};") .append("var ").append(worldId).append("series = {name:'World Playtime'," +/*colors: worldPieColors,*/"colorByPoint:true,data:").append(worldData[0]).append("};")
.append("var ").append(worldId).append("gmseries = ").append(worldData[1]).append(";") .append("var ").append(worldId).append("gmseries = ").append(worldData[1]).append(";")
.append("</script>") .append("</script>")
.append("</div>") // Right col-6 .append("</div>") // Right col-6

2
Plan/src/main/resources/web/player.html
View File

@ -602,7 +602,7 @@
var worldSeries = { var worldSeries = {
name: 'World Playtime', name: 'World Playtime',
colorByPoint: true, colorByPoint: true,
colors: worldPieColors, // colors: worldPieColors,
data: ${worldPieSeries} data: ${worldPieSeries}
}; };
var gmSeries = ${gmSeries}; var gmSeries = ${gmSeries};

2
Plan/src/main/resources/web/server.html
View File

@ -1046,7 +1046,7 @@
var worldSeries = { var worldSeries = {
name: 'World Playtime', name: 'World Playtime',
colorByPoint: true, colorByPoint: true,
colors: worldPieColors, // colors: worldPieColors,
data: ${worldSeries} data: ${worldSeries}
}; };
var gmSeries = ${gmSeries}; var gmSeries = ${gmSeries};