From ce151a612c03cb42694ba26de8632b4ab667457e Mon Sep 17 00:00:00 2001 From: Rsl1122 Date: Thu, 7 Sep 2017 19:19:28 +0300 Subject: [PATCH] Fixed Activity Pie amounts Fixed Graph size issue on load --- .../djrapitops/plan/data/AnalysisData.java | 2 +- .../plan/data/analysis/ActivityPart.java | 31 +++++++------------ .../plan/data/analysis/JoinInfoPart.java | 1 - .../plan/database/tables/CommandUseTable.java | 4 --- Plan/src/main/resources/html/server.html | 4 +-- 5 files changed, 15 insertions(+), 27 deletions(-) diff --git a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java index 876241b22..19ec39118 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/AnalysisData.java @@ -51,7 +51,7 @@ public class AnalysisData extends RawData { playtimePart = new PlaytimePart(); killPart = new KillPart(joinInfoPart); tpsPart = new TPSPart(); - activityPart = new ActivityPart(joinInfoPart, tpsPart); + activityPart = new ActivityPart(playerCountPart, joinInfoPart, tpsPart); worldPart = new WorldPart(); } 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 58ee5c09e..a561e42b7 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 @@ -34,13 +34,13 @@ import java.util.stream.Collectors; * ${punchCardSeries} - Data for HighCharts *

* ${sessionAverage} - Formatted Time amount - * //TODO ${tableBodyRecentLogins} * * @author Rsl1122 * @since 3.5.2 */ public class ActivityPart extends RawData { + private final PlayerCountPart playerCount; private final JoinInfoPart joins; private final TPSPart tpsPart; private final Set bans; @@ -50,7 +50,8 @@ public class ActivityPart extends RawData { private List recentPlayers; private List recentPlayersUUIDs; - public ActivityPart(JoinInfoPart joins, TPSPart tps) { + public ActivityPart(PlayerCountPart playerCount, JoinInfoPart joins, TPSPart tps) { + this.playerCount = playerCount; this.joins = joins; tpsPart = tps; bans = new HashSet<>(); @@ -64,9 +65,6 @@ public class ActivityPart extends RawData { Verify.nullCheck(recentPlayers); Verify.nullCheck(recentPlayersUUIDs); - // TODO Recent logins table - addValue("recentlogins", ""); - activityPiechart(); playerActivityGraphs(); @@ -90,15 +88,14 @@ public class ActivityPart extends RawData { } private void activityPiechart() { + calculateActivityAmounts(); + 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); - - calculateActivityAmounts(); - addValue("playersActive", counts[0]); addValue("active", counts[0]); addValue("inactive", counts[1]); @@ -107,12 +104,12 @@ public class ActivityPart extends RawData { } private void calculateActivityAmounts() { - for (Map.Entry> entry : joins.getSessions().entrySet()) { - UUID uuid = entry.getKey(); + Map> allSessions = joins.getSessions(); + for (UUID uuid : playerCount.getUuids()) { if (bans.contains(uuid)) { continue; } - List sessions = entry.getValue(); + List sessions = allSessions.getOrDefault(uuid, new ArrayList<>()); long lastSeen = AnalysisUtils.getLastSeen(sessions); long playtime = AnalysisUtils.getTotalPlaytime(sessions); int sessionCount = sessions.size(); @@ -134,23 +131,19 @@ public class ActivityPart extends RawData { } public void addBan(UUID uuid) { - Verify.nullCheck(uuid); - bans.add(uuid); + bans.add(Verify.nullCheck(uuid)); } public void addActive(UUID uuid) { - Verify.nullCheck(uuid); - active.add(uuid); + active.add(Verify.nullCheck(uuid)); } public void addInActive(UUID uuid) { - Verify.nullCheck(uuid); - inactive.add(uuid); + inactive.add(Verify.nullCheck(uuid)); } public void addJoinedOnce(UUID uuid) { - Verify.nullCheck(uuid); - joinedOnce.add(uuid); + joinedOnce.add(Verify.nullCheck(uuid)); } public Map getPlayersOnline() { diff --git a/Plan/src/main/java/com/djrapitops/plan/data/analysis/JoinInfoPart.java b/Plan/src/main/java/com/djrapitops/plan/data/analysis/JoinInfoPart.java index aac9e754b..6ea5b4f1e 100644 --- a/Plan/src/main/java/com/djrapitops/plan/data/analysis/JoinInfoPart.java +++ b/Plan/src/main/java/com/djrapitops/plan/data/analysis/JoinInfoPart.java @@ -31,7 +31,6 @@ import java.util.stream.Collectors; * ${playersNewAverageDay} - (Number) * ${playersNewAverageWeek} - (Number) * ${playersNewAverageMonth} - (Number) - * //TODO ${tableBodySessions} * * @author Rsl1122 * @since 3.5.2 diff --git a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java index 4876c6d77..31c851de7 100644 --- a/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java +++ b/Plan/src/main/java/com/djrapitops/plan/database/tables/CommandUseTable.java @@ -90,10 +90,6 @@ public class CommandUseTable extends Table { while (set.next()) { String cmd = set.getString(columnCommand).toLowerCase(); int amountUsed = set.getInt(columnTimesUsed); - Integer get = commandUse.get(cmd); - if (get != null && get > amountUsed) { - continue; - } commandUse.put(cmd, amountUsed); } return commandUse; diff --git a/Plan/src/main/resources/html/server.html b/Plan/src/main/resources/html/server.html index f660e8fe2..73b982d84 100644 --- a/Plan/src/main/resources/html/server.html +++ b/Plan/src/main/resources/html/server.html @@ -437,10 +437,10 @@ selected: true }, { name: 'Single Join', - y: ${joinLeaver} + y: ${joinLeaver} }, { name: 'Banned', - y: ${banned} + y: ${banned} }] }; var worldSeries = {