mirror/Plan
2
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-06 15:44:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed ServerProfile db sessions not including Kills or WorldTimes

Browse Source
This commit is contained in:
Rsl1122 2017-11-23 10:27:37 +02:00
parent 55244b2f8c
commit 6d13727bc5
4 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Plan/src/main/java/com/djrapitops/plan/database/databases/SQLDB.java
View File

@ -304,7 +304,12 @@ public abstract class SQLDB extends Database {
Map<UUID, Integer> timesKicked = usersTable.getAllTimesKicked();
Map<UUID, List<Action>> actions = actionsTable.getServerActions(serverUUID);
Map<UUID, List<GeoInfo>> geoInfo = ipsTable.getAllGeoInfo();
Map<UUID, List<Session>> sessions = sessionsTable.getSessionInfoOfServer(serverUUID);
Map<UUID, Map<UUID, List<Session>>> map = new HashMap<>();
map.put(serverUUID, sessions);
killsTable.addKillsToSessions(map);
worldTimesTable.addWorldTimesToSessions(map);
List<PlayerProfile> players = new ArrayList<>();

9
Plan/src/main/java/com/djrapitops/plan/database/tables/SessionsTable.java
View File

@ -457,15 +457,10 @@ public class SessionsTable extends UserIDTable {
}
public Map<UUID, List<Session>> getSessionInfoOfServer(UUID serverUUID) throws SQLException {
Optional<Integer> id = serverTable.getServerID(serverUUID);
if (!id.isPresent()) {
return new HashMap<>();
}
int serverID = id.get();
String usersIDColumn = usersTable + "." + usersTable.getColumnID();
String usersUUIDColumn = usersTable + "." + usersTable.getColumnUUID() + " as uuid";
String sql = "SELECT " +
tableName + "." + columnID + ", " +
columnSessionStart + ", " +
columnSessionEnd + ", " +
columnDeaths + ", " +
@ -492,7 +487,7 @@ public class SessionsTable extends UserIDTable {
int deaths = set.getInt(columnDeaths);
int mobKills = set.getInt(columnMobKills);
List<Session> sessions = sessionsByUser.getOrDefault(uuid, new ArrayList<>());
sessions.add(new Session(serverID, start, end, mobKills, deaths));
sessions.add(new Session(set.getInt(columnID), start, end, mobKills, deaths));
sessionsByUser.put(uuid, sessions);
}
return sessionsByUser;

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

@ -65,7 +65,7 @@ public enum Html {
"<th><i class=\"fa fa-calendar-check-o\"></i> Last Seen</th>" +
"<th><i class=\"fa fa-globe\"></i> Geolocation</th></thead>" +
"<tfoot><tr><th><i class=\"fa fa-user\"></i> Name</th>" +
"<th><i class=\"fa fa-check\"></i> Active</th>" +
"<th><i class=\"fa fa-check\"></i> Activity Index</th>" +
"<th><i class=\"fa fa-clock-o\"></i> Playtime</th>" +
"<th><i class=\"fa fa-calendar-plus-o\"></i> Sessions</th>" +
"<th><i class=\"fa fa-user-plus\"></i> Registered</th>" +

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

@ -66,7 +66,9 @@ public class SessionTabStructureCreator {
HtmlStructure.separateWithDots(name, sessionStart) :
sessionStart;
String id = "worldPie" + session.getSessionStart() + i;
String htmlID = "" + session.getSessionStart() + sessionID + i;
String worldId = "worldPie" + session.getSessionStart() + i;
WorldTimes worldTimes = session.getWorldTimes();
AnalysisUtils.addMissingWorlds(worldTimes);
@ -76,18 +78,18 @@ public class SessionTabStructureCreator {
// Accordion panel header
html.append("<div title=\"Session ID: ").append(sessionID).append("\"class=\"panel panel-col-teal\">")
.append("<div class=\"panel-heading\" role=\"tab\" id=\"heading_").append(sessionID).append("\">")
.append("<div class=\"panel-heading\" role=\"tab\" id=\"heading_").append(htmlID).append("\">")
.append("<h4 class=\"panel-title\">")
.append("<a class=\"collapsed\" role=\"button\" data-toggle=\"collapse\" data-parent=\"#session_accordion\" ")
.append("href=\"#session_").append(sessionID).append("\" aria-expanded=\"false\" ")
.append("aria-controls=\"session_").append(sessionID).append("\">")
.append("href=\"#session_").append(htmlID).append("\" aria-expanded=\"false\" ")
.append("aria-controls=\"session_").append(htmlID).append("\">")
.append(dotSeparated).append("<span class=\"pull-right\">").append(sessionLength).append("</span>") // Title (header)
.append("</a></h4>") // Closes collapsed, panel title
.append("</div>"); // Closes panel heading
// Content
html.append("<div id=\"session_").append(sessionID).append("\" class=\"panel-collapse collapse\" role=\"tabpanel\"")
.append(" aria-labelledby=\"heading_").append(sessionID).append("\">")
html.append("<div id=\"session_").append(htmlID).append("\" class=\"panel-collapse collapse\" role=\"tabpanel\"")
.append(" aria-labelledby=\"heading_").append(htmlID).append("\">")
.append("<div class=\"panel-body\"><div class=\"row clearfix\">")
.append("<div class=\"col-xs-12 col-sm-6 col-md-6 col-lg-6\">") // Left col-6
//
@ -110,11 +112,11 @@ public class SessionTabStructureCreator {
.append("<li><i class=\"col-red fa fa-frown-o\"></i> Deaths<span class=\"pull-right\"><b>").append(session.getDeaths()).append("</b></span></li>")
.append("</ul></div>") // Closes stat-list, Left col-6
.append("<div class=\"col-xs-12 col-sm-6 col-md-6 col-lg-6\">") // Right col-6
.append("<div id=\"").append(id).append("\" class=\"dashboard-donut-chart\"></div>")
.append("<div id=\"").append(worldId).append("\" class=\"dashboard-donut-chart\"></div>")
// World Pie data script
.append("<script>")
.append("var ").append(id).append("series = {name:'World Playtime',colors: worldPieColors,colorByPoint:true,data:").append(worldData[0]).append("};")
.append("var ").append(id).append("gmseries = ").append(worldData[1]).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("</script>")
.append("</div>") // Right col-6
.append("</div>") // Closes row clearfix
@ -133,9 +135,9 @@ public class SessionTabStructureCreator {
.append("</div>"); // Closes panel
viewScript.append("worldPie(")
.append(id).append(", ")
.append(id).append("series, ")
.append(id).append("gmseries")
.append(worldId).append(", ")
.append(worldId).append("series, ")
.append(worldId).append("gmseries")
.append(");");
i++;
}