Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-12-27 19:47:49 +01:00
Code Issues Projects Releases Wiki Activity

Fixed server preference pie for network page

Browse Source 
- Flipped the dates in the query (ugh)
- Proper names for the servers in the pie

Affects issues:
- Fixed #1728
This commit is contained in:
Risto Lahtela 2021-01-29 11:01:08 +02:00
parent 60f6278352
commit b479753fc9
3 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/common/src/main/java/com/djrapitops/plan/delivery/rendering/json/graphs/GraphJSONCreator.java
View File

@ -362,7 +362,7 @@ public class GraphJSONCreator {
long now = System.currentTimeMillis(); long now = System.currentTimeMillis();
long monthAgo = now - TimeUnit.DAYS.toMillis(30L); long monthAgo = now - TimeUnit.DAYS.toMillis(30L);
String[] pieColors = theme.getPieColors(ThemeVal.GRAPH_WORLD_PIE); String[] pieColors = theme.getPieColors(ThemeVal.GRAPH_WORLD_PIE);
Map<String, Long> playtimePerServer = dbSystem.getDatabase().query(SessionQueries.playtimePerServer(now, monthAgo)); Map<String, Long> playtimePerServer = dbSystem.getDatabase().query(SessionQueries.playtimePerServer(monthAgo, now));
return Maps.builder(String.class, Object.class) return Maps.builder(String.class, Object.class)
.put("server_pie_colors", pieColors) .put("server_pie_colors", pieColors)

6
Plan/common/src/main/java/com/djrapitops/plan/identification/Server.java
View File

@ -60,10 +60,14 @@ public class Server implements Comparable<Server> {
return name; return name;
} }
public String getIdentifiableName() { public static String getIdentifiableName(String name, int id) {
return !"Plan".equalsIgnoreCase(name) ? name : "Server " + id; return !"Plan".equalsIgnoreCase(name) ? name : "Server " + id;
} }
public String getIdentifiableName() {
return getIdentifiableName(name, id);
}
public void setName(String name) { public void setName(String name) {
this.name = name; this.name = name;
} }

8
Plan/common/src/main/java/com/djrapitops/plan/storage/database/queries/objects/SessionQueries.java
View File

@ -23,6 +23,7 @@ import com.djrapitops.plan.gathering.domain.GMTimes;
import com.djrapitops.plan.gathering.domain.PlayerKill; import com.djrapitops.plan.gathering.domain.PlayerKill;
import com.djrapitops.plan.gathering.domain.Session; import com.djrapitops.plan.gathering.domain.Session;
import com.djrapitops.plan.gathering.domain.WorldTimes; import com.djrapitops.plan.gathering.domain.WorldTimes;
import com.djrapitops.plan.identification.Server;
import com.djrapitops.plan.storage.database.queries.Query; import com.djrapitops.plan.storage.database.queries.Query;
import com.djrapitops.plan.storage.database.queries.QueryAllStatement; import com.djrapitops.plan.storage.database.queries.QueryAllStatement;
import com.djrapitops.plan.storage.database.queries.QueryStatement; import com.djrapitops.plan.storage.database.queries.QueryStatement;
@ -743,6 +744,7 @@ public class SessionQueries {
public static Query<Map<String, Long>> playtimePerServer(long after, long before) { public static Query<Map<String, Long>> playtimePerServer(long after, long before) {
String sql = SELECT + String sql = SELECT +
"SUM(" + SessionsTable.SESSION_END + '-' + SessionsTable.SESSION_START + ") as playtime," + "SUM(" + SessionsTable.SESSION_END + '-' + SessionsTable.SESSION_START + ") as playtime," +
ServerTable.TABLE_NAME + '.' + ServerTable.SERVER_ID + ',' +
ServerTable.NAME + ServerTable.NAME +
FROM + SessionsTable.TABLE_NAME + FROM + SessionsTable.TABLE_NAME +
INNER_JOIN + ServerTable.TABLE_NAME + " s on s." + ServerTable.SERVER_UUID + '=' + SessionsTable.TABLE_NAME + '.' + SessionsTable.SERVER_UUID + INNER_JOIN + ServerTable.TABLE_NAME + " s on s." + ServerTable.SERVER_UUID + '=' + SessionsTable.TABLE_NAME + '.' + SessionsTable.SERVER_UUID +
@ -760,7 +762,11 @@ public class SessionQueries {
public Map<String, Long> processResults(ResultSet set) throws SQLException { public Map<String, Long> processResults(ResultSet set) throws SQLException {
Map<String, Long> playtimePerServer = new HashMap<>(); Map<String, Long> playtimePerServer = new HashMap<>();
while (set.next()) { while (set.next()) {
playtimePerServer.put(set.getString(ServerTable.NAME), set.getLong("playtime")); String name = Server.getIdentifiableName(
set.getString(ServerTable.NAME),
set.getInt(ServerTable.SERVER_ID)
);
playtimePerServer.put(name, set.getLong("playtime"));
} }
return playtimePerServer; return playtimePerServer;
} }