mirror of
https://github.com/plan-player-analytics/Plan.git
synced 2024-09-19 18:21:00 +02:00
Made session accordion load again
This commit is contained in:
Risto Lahtela
parent
85c0a10c12
commit
6715244b2c
@ -17,12 +17,14 @@
|
||||
package com.djrapitops.plan.delivery.webserver.resolver.json;
|
||||
|
||||
import com.djrapitops.plan.delivery.rendering.json.JSONFactory;
|
||||
import com.djrapitops.plan.delivery.web.resolver.MimeType;
|
||||
import com.djrapitops.plan.delivery.web.resolver.Resolver;
|
||||
import com.djrapitops.plan.delivery.web.resolver.Response;
|
||||
import com.djrapitops.plan.delivery.web.resolver.request.Request;
|
||||
import com.djrapitops.plan.delivery.web.resolver.request.WebUser;
|
||||
import com.djrapitops.plan.delivery.webserver.cache.AsyncJSONResolverService;
|
||||
import com.djrapitops.plan.delivery.webserver.cache.DataID;
|
||||
import com.djrapitops.plan.delivery.webserver.cache.JSONCache;
|
||||
import com.djrapitops.plan.delivery.webserver.cache.JSONStorage;
|
||||
import com.djrapitops.plan.identification.Identifiers;
|
||||
|
||||
import javax.inject.Inject;
|
||||
@ -40,14 +42,17 @@ import java.util.UUID;
|
||||
public class SessionsJSONResolver implements Resolver {
|
||||
|
||||
private final Identifiers identifiers;
|
||||
private final AsyncJSONResolverService jsonResolverService;
|
||||
private final JSONFactory jsonFactory;
|
||||
|
||||
@Inject
|
||||
public SessionsJSONResolver(
|
||||
Identifiers identifiers,
|
||||
AsyncJSONResolverService jsonResolverService,
|
||||
JSONFactory jsonFactory
|
||||
) {
|
||||
this.identifiers = identifiers;
|
||||
this.jsonResolverService = jsonResolverService;
|
||||
this.jsonFactory = jsonFactory;
|
||||
}
|
||||
|
||||
@ -62,11 +67,23 @@ public class SessionsJSONResolver implements Resolver {
|
||||
}
|
||||
|
||||
private Response getResponse(Request request) {
|
||||
return Response.builder()
|
||||
.setMimeType(MimeType.JSON)
|
||||
.setJSONContent(getStoredJSON(request).json)
|
||||
.build();
|
||||
}
|
||||
|
||||
private JSONStorage.StoredJSON getStoredJSON(Request request) {
|
||||
long timestamp = Identifiers.getTimestamp(request);
|
||||
if (request.getQuery().get("server").isPresent()) {
|
||||
UUID serverUUID = identifiers.getServerUUID(request);
|
||||
return JSONCache.getOrCache(DataID.SESSIONS, serverUUID, () -> Collections.singletonMap("sessions", jsonFactory.serverSessionsAsJSONMap(serverUUID)));
|
||||
return jsonResolverService.resolve(timestamp, DataID.SESSIONS, serverUUID,
|
||||
theUUID -> Collections.singletonMap("sessions", jsonFactory.serverSessionsAsJSONMap(theUUID))
|
||||
);
|
||||
}
|
||||
// Assume network
|
||||
return JSONCache.getOrCache(DataID.SESSIONS, () -> Collections.singletonMap("sessions", jsonFactory.networkSessionsAsJSONMap()));
|
||||
return jsonResolverService.resolve(timestamp, DataID.SESSIONS,
|
||||
() -> Collections.singletonMap("sessions", jsonFactory.networkSessionsAsJSONMap())
|
||||
);
|
||||
}
|
||||
}
|
||||
@ -1,49 +1,48 @@
|
||||
function loadSessionAccordion(json, error) {
|
||||
sessionTable = $("#sessions-overview").find("#tableAccordion").find("tbody");
|
||||
const sessionTable = document.querySelector('#sessions-overview #tableAccordion tbody');
|
||||
|
||||
if (error) {
|
||||
sessionTable.append(`<tr><td>Error: ` + error + '</td><td>-</td><td>-</td><td>-</td></tr>');
|
||||
sessionTable.innerHTML = `<tr><td>Error: ${error}</td><td>-</td><td>-</td><td>-</td></tr>`;
|
||||
return;
|
||||
}
|
||||
|
||||
var sessions = json.sessions;
|
||||
const sessions = json.sessions;
|
||||
|
||||
if (!sessions.length) {
|
||||
sessionTable.append(`<tr><td>No Data</td><td>-</td><td>-</td><td>-</td></tr>`);
|
||||
sessionTable.innerHTML = `<tr><td>No Data</td><td>-</td><td>-</td><td>-</td></tr>`;
|
||||
return;
|
||||
}
|
||||
|
||||
// sessions_per_page can be undefined (-> NaN) or higher than amount of sessions.
|
||||
var limit = json.sessions_per_page ? json.sessions_per_page : sessions.length;
|
||||
let limit = json.sessions_per_page ? json.sessions_per_page : sessions.length;
|
||||
limit = Math.min(limit, sessions.length);
|
||||
|
||||
var sessionsHtml = '';
|
||||
for (var i = 0; i < limit; i++) {
|
||||
var session = sessions[i];
|
||||
var title = createAccordionTitle(i, session);
|
||||
var body = createAccordionBody(i, session);
|
||||
let sessionsHtml = '';
|
||||
for (let i = 0; i < limit; i++) {
|
||||
const session = sessions[i];
|
||||
const title = createAccordionTitle(i, session);
|
||||
const body = createAccordionBody(i, session);
|
||||
sessionsHtml += title + body;
|
||||
}
|
||||
sessionTable.innerHTML = sessionsHtml;
|
||||
|
||||
sessionTable.append(sessionsHtml);
|
||||
|
||||
for (var i = 0; i < limit; i++) {
|
||||
$('#session_h_' + i).click(onOpenSession(i, sessions));
|
||||
for (let i = 0; i < limit; i++) {
|
||||
document.getElementById(`session_h_${i}`).addEventListener('click', onOpenSession(i, sessions));
|
||||
}
|
||||
}
|
||||
|
||||
function onOpenSession(i, sessions) {
|
||||
var opened = false;
|
||||
let opened = false;
|
||||
return function () {
|
||||
if (opened) {
|
||||
return;
|
||||
}
|
||||
setTimeout(function () {
|
||||
var session = sessions[i];
|
||||
var worldSeries = {name: `World Playtime`, colorByPoint: true, data: session.world_series};
|
||||
var gmSeries = session.gm_series;
|
||||
const session = sessions[i];
|
||||
const worldSeries = {name: `World Playtime`, colorByPoint: true, data: session.world_series};
|
||||
const gmSeries = session.gm_series;
|
||||
|
||||
worldPie("worldpie_" + i, worldSeries, gmSeries);
|
||||
worldPie(`worldpie_${i}`, worldSeries, gmSeries);
|
||||
}, 250);
|
||||
opened = true;
|
||||
}
|
||||
@ -51,7 +50,7 @@ function onOpenSession(i, sessions) {
|
||||
|
||||
function loadPlayerKills(json, error) {
|
||||
if (error) {
|
||||
$('#playerKillTable').replaceWith(`<p>Failed to load player kills: ` + error + '</p>');
|
||||
$('#playerKillTable').replaceWith(`<p>Failed to load player kills: ${error}</p>`);
|
||||
return;
|
||||
}
|
||||
$('#playerKillTable').replaceWith(createKillsTable(json.player_kills));
|
||||
@ -59,7 +58,7 @@ function loadPlayerKills(json, error) {
|
||||
|
||||
function loadPlayerdeaths(json, error) {
|
||||
if (error) {
|
||||
$('#playerDeathTable').replaceWith(`<p>Failed to load player deaths: ` + error + '</p>');
|
||||
$('#playerDeathTable').replaceWith(`<p>Failed to load player deaths: ${error}</p>`);
|
||||
return;
|
||||
}
|
||||
$('#playerDeathTable').replaceWith(createKillsTable(json.player_deaths));
|
||||
@ -67,50 +66,62 @@ function loadPlayerdeaths(json, error) {
|
||||
|
||||
function createAccordionTitle(i, session) {
|
||||
let style = session.start.includes("Online") ? 'bg-teal' : 'bg-teal-outline';
|
||||
return `<tr id="session_h_` + i + `" aria-controls="session_t_` + i + `" aria-expanded="false" class="clickable collapsed ` + style + `" data-target="#session_t_` + i + `" data-toggle="collapse"><td>`
|
||||
+ session.name + (session.first_session ? ` <i title="Registered (First session)" class="far fa-calendar-plus"></i>` : ``) + `</td>`
|
||||
+ `<td>` + session.start + `</td>`
|
||||
+ `<td>` + session.length + `</td>`
|
||||
+ `<td>` + (session.network_server ? session.network_server : session.most_used_world) + `</td></tr>`
|
||||
return `<tr id="session_h_${i}" aria-controls="session_t_${i}" aria-expanded="false"
|
||||
class="clickable collapsed ${style}" data-target="#session_t_${i}" data-toggle="collapse">
|
||||
<td>${session.name}${session.first_session ? ` <i title="Registered (First session)" class="far fa-calendar-plus"></i>` : ``}</td>
|
||||
<td>${session.start}</td><td>${session.length}</td>
|
||||
<td>${session.network_server ? session.network_server : session.most_used_world}</td>
|
||||
</tr>`
|
||||
}
|
||||
|
||||
function createAccordionBody(i, session) {
|
||||
return `<tr class="collapse" data-parent="#tableAccordion" id="session_t_` + i + `">` +
|
||||
`<td colspan="4">` +
|
||||
`<div class="collapse row" data-parent="#tableAccordion" id="session_t_` + i + `">` +
|
||||
`<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">` +
|
||||
`<p><i class="col-teal far fa-fw fa-clock"></i> Ended<span class="float-right"><b>` + session.end + `</b></span></p>` +
|
||||
`<p><i class="col-green far fa-fw fa-clock"></i> Length<span class="float-right"><b>` + session.length + `</b></span></p>` +
|
||||
`<p><i class="col-grey far fa-fw fa-clock"></i> AFK Time<span class="float-right"><b>` + session.afk_time + `</b></span></p>` +
|
||||
`<p><i class="col-green fa fa-fw fa-server"></i> Server<span class="float-right"><b>` + session.server_name + `</b></span></p>` +
|
||||
(session.avg_ping ? `<p><i class="col-amber fa fa-fw fa-signal"></i> Average Ping<span class="float-right"><b>` + session.avg_ping + `</b></span></p>` : ``) +
|
||||
`<br>` +
|
||||
`<p><i class="col-red fa fa-fw fa-crosshairs"></i> Player Kills<span class="float-right"><b>` + session.player_kills.length + `</b></span></p>` +
|
||||
`<p><i class="col-green fa fa-fw fa-crosshairs"></i> Mob Kills<span class="float-right"><b>` + session.mob_kills + `</b></span></p>` +
|
||||
`<p><i class=" fa fa-fw fa-skull"></i> Deaths<span class="float-right"><b>` + session.deaths + `</b></span></p><hr>` +
|
||||
createKillsTable(session.player_kills) +
|
||||
`</div><div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">` +
|
||||
`<div id="worldpie_` + i + `" class="chart-pie"></div>` +
|
||||
`<a href="` + (session.network_server ? `./player/` : `../player/`) + session.player_url_name + `" class="float-right btn bg-blue"><i class="fa fa-user"></i><span> Player Page</span></a>` +
|
||||
(session.network_server ? `<a href="./server/` + session.server_url_name + `" class="float-right btn bg-light-green mr-2"><i class="fa fa-server"></i><span> Server Analysis</span></a>` : ``) +
|
||||
`</div>` +
|
||||
`</div></td></tr>`
|
||||
return `<tr class="collapse" data-parent="#tableAccordion" id="session_t_${i}">
|
||||
<td colspan="4">
|
||||
<div class="collapse row" data-parent="#tableAccordion" id="session_t_${i}">
|
||||
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
|
||||
<p><i class="col-teal far fa-fw fa-clock"></i> Ended<span class="float-right"><b>${session.end}</b></span></p>
|
||||
<p><i class="col-green far fa-fw fa-clock"></i> Length<span class="float-right"><b>${session.length}</b></span></p>
|
||||
<p><i class="col-grey far fa-fw fa-clock"></i> AFK Time<span class="float-right"><b>${session.afk_time}</b></span></p>
|
||||
<p><i class="col-green fa fa-fw fa-server"></i> Server<span class="float-right"><b>${session.server_name}</b></span></p>
|
||||
${session.avg_ping ? `<p><i class="col-amber fa fa-fw fa-signal"></i> Average Ping<span class="float-right"><b>` + session.avg_ping + `</b></span></p>` : ``}
|
||||
<br>
|
||||
<p><i class="col-red fa fa-fw fa-crosshairs"></i> Player Kills<span class="float-right"><b>${session.player_kills.length}</b></span></p>
|
||||
<p><i class="col-green fa fa-fw fa-crosshairs"></i> Mob Kills<span class="float-right"><b>${session.mob_kills}</b></span></p>
|
||||
<p><i class=" fa fa-fw fa-skull"></i> Deaths<span class="float-right"><b>${session.deaths}</b></span></p>
|
||||
<hr>
|
||||
${createKillsTable(session.player_kills)}
|
||||
</div>
|
||||
<div class="col-xs-12 col-sm-12 col-md-6 col-lg-6">
|
||||
<div id="worldpie_${i}" class="chart-pie"></div>
|
||||
<a href="${session.network_server ? `./player/` : `../player/`}${session.player_url_name}" class="float-right btn bg-blue">
|
||||
<i class="fa fa-user"></i><span> Player Page</span>
|
||||
</a>
|
||||
${session.network_server ? `<a href="./server/${session.server_url_name}" class="float-right btn bg-light-green mr-2">
|
||||
<i class="fa fa-server"></i><span> Server Analysis</span>
|
||||
</a>` : ``}
|
||||
</div>
|
||||
</div>
|
||||
</td>
|
||||
</tr>`;
|
||||
}
|
||||
|
||||
function createKillsTable(player_kills) {
|
||||
var table = '<table class="table mb-0"><tbody>';
|
||||
let table = '<table class="table mb-0"><tbody>';
|
||||
|
||||
if (player_kills.length === 0) {
|
||||
if (!player_kills.length) {
|
||||
table += `<tr><td>None</td><td>-</td><td>-</td></tr>`
|
||||
}
|
||||
|
||||
for (var i = 0; i < player_kills.length; i++) {
|
||||
var kill = player_kills[i];
|
||||
table += '<tr><td>' + kill.date + '</td>' +
|
||||
'<td>' + kill.killer +
|
||||
(kill.killer === kill.victim ? '<i class="fa fa-fw fa-skull-crossbones col-red"></i>' : '<i class="fa fa-fw fa-angle-right col-red"></i>') +
|
||||
kill.victim + '</td>' +
|
||||
'<td>' + kill.weapon + '</td></tr>'
|
||||
for (const kill of player_kills) {
|
||||
table += `<tr>
|
||||
<td>${kill.date}</td>
|
||||
<td>${kill.killer} ${
|
||||
kill.killer === kill.victim
|
||||
? '<i class="fa fa-fw fa-skull-crossbones col-red"></i>'
|
||||
: '<i class="fa fa-fw fa-angle-right col-red"></i>'
|
||||
} ${kill.victim}</td>
|
||||
<td>${kill.weapon}</td>
|
||||
</tr>`
|
||||
}
|
||||
|
||||
table += '</tbody></table>';
|
||||
|
||||
@ -864,7 +864,7 @@
|
||||
refreshingJsonRequest("./v1/network/servers", loadservers, 'servers');
|
||||
refreshingJsonRequest("./v1/network/sessionsOverview", loadSessionValues, 'sessions-overview');
|
||||
refreshingJsonRequest("./v1/network/playerbaseOverview", loadPlayerbaseOverviewValues, 'playerbase-overview');
|
||||
jsonRequest("./v1/sessions", loadSessionAccordion);
|
||||
refreshingJsonRequest("./v1/sessions", loadSessionAccordion, 'sessions-overview');
|
||||
setLoadingText('Rendering graphs..');
|
||||
|
||||
// TODO remove
|
||||
|
||||
@ -1402,7 +1402,7 @@
|
||||
setLoadingText('Almost done..');
|
||||
openPage();
|
||||
|
||||
jsonRequest("../v1/sessions?server=${serverUUID}", loadSessionAccordion);
|
||||
refreshingJsonRequest("../v1/sessions?server=${serverUUID}", loadSessionAccordion, 'sessions-overview');
|
||||
|
||||
setLoadingText('Done.');
|
||||
setTimeout(function () {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user