mirror of
https://github.com/plan-player-analytics/Plan.git
synced 2024-09-07 04:18:26 +02:00
Numbers for network overview tab
This commit is contained in:
parent
2afc139741
commit
a3a5c7ff4e
@ -375,6 +375,25 @@ public class SessionQueries {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Query<Long> sessionCount(long after, long before) {
|
||||||
|
String sql = SELECT + "COUNT(1) as count" +
|
||||||
|
FROM + SessionsTable.TABLE_NAME +
|
||||||
|
WHERE + SessionsTable.SESSION_END + ">=?" +
|
||||||
|
AND + SessionsTable.SESSION_START + "<=?";
|
||||||
|
return new QueryStatement<Long>(sql) {
|
||||||
|
@Override
|
||||||
|
public void prepare(PreparedStatement statement) throws SQLException {
|
||||||
|
statement.setLong(1, after);
|
||||||
|
statement.setLong(2, before);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Long processResults(ResultSet set) throws SQLException {
|
||||||
|
return set.next() ? set.getLong("count") : 0L;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
public static Query<NavigableMap<Long, Integer>> sessionCountPerDay(long after, long before, long timeZoneOffset, UUID serverUUID) {
|
public static Query<NavigableMap<Long, Integer>> sessionCountPerDay(long after, long before, long timeZoneOffset, UUID serverUUID) {
|
||||||
return database -> {
|
return database -> {
|
||||||
Sql sql = database.getSql();
|
Sql sql = database.getSql();
|
||||||
@ -430,6 +449,25 @@ public class SessionQueries {
|
|||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public static Query<Long> playtime(long after, long before) {
|
||||||
|
String sql = SELECT + "SUM(" + SessionsTable.SESSION_END + '-' + SessionsTable.SESSION_START + ") as playtime" +
|
||||||
|
FROM + SessionsTable.TABLE_NAME +
|
||||||
|
WHERE + SessionsTable.SESSION_END + ">=?" +
|
||||||
|
AND + SessionsTable.SESSION_START + "<=?";
|
||||||
|
return new QueryStatement<Long>(sql) {
|
||||||
|
@Override
|
||||||
|
public void prepare(PreparedStatement statement) throws SQLException {
|
||||||
|
statement.setLong(1, after);
|
||||||
|
statement.setLong(2, before);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public Long processResults(ResultSet set) throws SQLException {
|
||||||
|
return set.next() ? set.getLong("playtime") : 0L;
|
||||||
|
}
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
public static Query<NavigableMap<Long, Long>> playtimePerDay(long after, long before, long timeZoneOffset, UUID serverUUID) {
|
public static Query<NavigableMap<Long, Long>> playtimePerDay(long after, long before, long timeZoneOffset, UUID serverUUID) {
|
||||||
return database -> {
|
return database -> {
|
||||||
Sql sql = database.getSql();
|
Sql sql = database.getSql();
|
||||||
|
@ -0,0 +1,195 @@
|
|||||||
|
/*
|
||||||
|
* This file is part of Player Analytics (Plan).
|
||||||
|
*
|
||||||
|
* Plan is free software: you can redistribute it and/or modify
|
||||||
|
* it under the terms of the GNU Lesser General Public License v3 as published by
|
||||||
|
* the Free Software Foundation, either version 3 of the License, or
|
||||||
|
* (at your option) any later version.
|
||||||
|
*
|
||||||
|
* Plan is distributed in the hope that it will be useful,
|
||||||
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||||
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||||
|
* GNU Lesser General Public License for more details.
|
||||||
|
*
|
||||||
|
* You should have received a copy of the GNU Lesser General Public License
|
||||||
|
* along with Plan. If not, see <https://www.gnu.org/licenses/>.
|
||||||
|
*/
|
||||||
|
package com.djrapitops.plan.system.json.network;
|
||||||
|
|
||||||
|
import com.djrapitops.plan.data.store.objects.DateHolder;
|
||||||
|
import com.djrapitops.plan.data.store.objects.DateObj;
|
||||||
|
import com.djrapitops.plan.db.Database;
|
||||||
|
import com.djrapitops.plan.db.access.queries.analysis.NetworkActivityIndexQueries;
|
||||||
|
import com.djrapitops.plan.db.access.queries.analysis.PlayerCountQueries;
|
||||||
|
import com.djrapitops.plan.db.access.queries.objects.SessionQueries;
|
||||||
|
import com.djrapitops.plan.db.access.queries.objects.TPSQueries;
|
||||||
|
import com.djrapitops.plan.system.database.DBSystem;
|
||||||
|
import com.djrapitops.plan.system.info.server.ServerInfo;
|
||||||
|
import com.djrapitops.plan.system.json.Trend;
|
||||||
|
import com.djrapitops.plan.system.settings.config.PlanConfig;
|
||||||
|
import com.djrapitops.plan.system.settings.paths.TimeSettings;
|
||||||
|
import com.djrapitops.plan.utilities.formatting.Formatter;
|
||||||
|
import com.djrapitops.plan.utilities.formatting.Formatters;
|
||||||
|
|
||||||
|
import javax.inject.Inject;
|
||||||
|
import javax.inject.Singleton;
|
||||||
|
import java.util.*;
|
||||||
|
import java.util.concurrent.TimeUnit;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Parses JSON payload for /server-page Server Overview tab.
|
||||||
|
*
|
||||||
|
* @author Rsl1122
|
||||||
|
*/
|
||||||
|
@Singleton
|
||||||
|
public class NetworkOverviewJSONParser implements NetworkTabJSONParser<Map<String, Object>> {
|
||||||
|
|
||||||
|
private final Formatter<Long> day;
|
||||||
|
private final TimeZone timeZone;
|
||||||
|
private PlanConfig config;
|
||||||
|
private DBSystem dbSystem;
|
||||||
|
private ServerInfo serverInfo;
|
||||||
|
private Formatter<Long> timeAmount;
|
||||||
|
private Formatter<Double> decimals;
|
||||||
|
private Formatter<Double> percentage;
|
||||||
|
private Formatter<DateHolder> year;
|
||||||
|
|
||||||
|
@Inject
|
||||||
|
public NetworkOverviewJSONParser(
|
||||||
|
PlanConfig config,
|
||||||
|
DBSystem dbSystem,
|
||||||
|
ServerInfo serverInfo,
|
||||||
|
Formatters formatters
|
||||||
|
) {
|
||||||
|
this.config = config;
|
||||||
|
this.dbSystem = dbSystem;
|
||||||
|
this.serverInfo = serverInfo;
|
||||||
|
|
||||||
|
year = formatters.year();
|
||||||
|
day = formatters.dayLong();
|
||||||
|
timeAmount = formatters.timeAmount();
|
||||||
|
decimals = formatters.decimals();
|
||||||
|
percentage = formatters.percentage();
|
||||||
|
this.timeZone = config.getTimeZone();
|
||||||
|
}
|
||||||
|
|
||||||
|
public Map<String, Object> createJSONAsMap() {
|
||||||
|
Map<String, Object> serverOverview = new HashMap<>();
|
||||||
|
serverOverview.put("players", createPlayersMap());
|
||||||
|
serverOverview.put("numbers", createNumbersMap());
|
||||||
|
serverOverview.put("weeks", createWeeksMap());
|
||||||
|
return serverOverview;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Map<String, Object> createPlayersMap() {
|
||||||
|
Database db = dbSystem.getDatabase();
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
long dayAgo = now - TimeUnit.DAYS.toMillis(1L);
|
||||||
|
long weekAgo = now - TimeUnit.DAYS.toMillis(7L);
|
||||||
|
long monthAgo = now - TimeUnit.DAYS.toMillis(30L);
|
||||||
|
|
||||||
|
Map<String, Object> sevenDays = new HashMap<>();
|
||||||
|
|
||||||
|
sevenDays.put("unique_players_1d", db.query(PlayerCountQueries.uniquePlayerCount(dayAgo, now)));
|
||||||
|
sevenDays.put("unique_players_7d", db.query(PlayerCountQueries.uniquePlayerCount(weekAgo, now)));
|
||||||
|
sevenDays.put("unique_players_30d", db.query(PlayerCountQueries.uniquePlayerCount(monthAgo, now)));
|
||||||
|
|
||||||
|
sevenDays.put("new_players_1d", db.query(PlayerCountQueries.newPlayerCount(dayAgo, now)));
|
||||||
|
sevenDays.put("new_players_7d", db.query(PlayerCountQueries.newPlayerCount(weekAgo, now)));
|
||||||
|
sevenDays.put("new_players_30d", db.query(PlayerCountQueries.newPlayerCount(monthAgo, now)));
|
||||||
|
|
||||||
|
return sevenDays;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Map<String, Object> createNumbersMap() {
|
||||||
|
Database db = dbSystem.getDatabase();
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
long twoDaysAgo = now - TimeUnit.DAYS.toMillis(2L);
|
||||||
|
Long playtimeThreshold = config.get(TimeSettings.ACTIVE_PLAY_THRESHOLD);
|
||||||
|
|
||||||
|
Map<String, Object> numbers = new HashMap<>();
|
||||||
|
|
||||||
|
Integer userCount = db.query(PlayerCountQueries.newPlayerCount(0L, now));
|
||||||
|
numbers.put("total_players", userCount);
|
||||||
|
numbers.put("regular_players", db.query(NetworkActivityIndexQueries.fetchRegularPlayerCount(now, playtimeThreshold)));
|
||||||
|
numbers.put("online_players", getOnlinePlayers());
|
||||||
|
UUID serverUUID = serverInfo.getServerUUID();
|
||||||
|
Optional<DateObj<Integer>> lastPeak = db.query(TPSQueries.fetchPeakPlayerCount(serverUUID, twoDaysAgo));
|
||||||
|
Optional<DateObj<Integer>> allTimePeak = db.query(TPSQueries.fetchAllTimePeakPlayerCount(serverUUID));
|
||||||
|
numbers.put("last_peak_date", lastPeak.map(year).orElse("-"));
|
||||||
|
numbers.put("last_peak_players", lastPeak.map(dateObj -> dateObj.getValue().toString()).orElse("-"));
|
||||||
|
numbers.put("best_peak_date", allTimePeak.map(year).orElse("-"));
|
||||||
|
numbers.put("best_peak_players", allTimePeak.map(dateObj -> dateObj.getValue().toString()).orElse("-"));
|
||||||
|
Long totalPlaytime = db.query(SessionQueries.playtime(0L, now));
|
||||||
|
numbers.put("playtime", timeAmount.apply(totalPlaytime));
|
||||||
|
numbers.put("player_playtime", userCount != 0 ? timeAmount.apply(totalPlaytime / userCount) : "-");
|
||||||
|
Long sessionCount = db.query(SessionQueries.sessionCount(0L, now));
|
||||||
|
numbers.put("sessions", sessionCount);
|
||||||
|
numbers.put("session_length_avg", sessionCount != 0 ? timeAmount.apply(totalPlaytime / sessionCount) : "-");
|
||||||
|
|
||||||
|
return numbers;
|
||||||
|
}
|
||||||
|
|
||||||
|
private Object getOnlinePlayers() {
|
||||||
|
return serverInfo.getServerProperties().getOnlinePlayers();
|
||||||
|
}
|
||||||
|
|
||||||
|
private Map<String, Object> createWeeksMap() {
|
||||||
|
Database db = dbSystem.getDatabase();
|
||||||
|
long now = System.currentTimeMillis();
|
||||||
|
long oneWeekAgo = now - TimeUnit.DAYS.toMillis(7L);
|
||||||
|
long twoWeeksAgo = now - TimeUnit.DAYS.toMillis(14L);
|
||||||
|
Long playtimeThreshold = config.get(TimeSettings.ACTIVE_PLAY_THRESHOLD);
|
||||||
|
|
||||||
|
Map<String, Object> weeks = new HashMap<>();
|
||||||
|
|
||||||
|
weeks.put("start", day.apply(twoWeeksAgo));
|
||||||
|
weeks.put("midpoint", day.apply(oneWeekAgo));
|
||||||
|
weeks.put("end", day.apply(now));
|
||||||
|
|
||||||
|
Integer uniqueBefore = db.query(PlayerCountQueries.uniquePlayerCount(twoWeeksAgo, oneWeekAgo));
|
||||||
|
Integer uniqueAfter = db.query(PlayerCountQueries.uniquePlayerCount(oneWeekAgo, now));
|
||||||
|
Trend uniqueTrend = new Trend(uniqueBefore, uniqueAfter, false);
|
||||||
|
weeks.put("unique_before", uniqueBefore);
|
||||||
|
weeks.put("unique_after", uniqueAfter);
|
||||||
|
weeks.put("unique_trend", uniqueTrend);
|
||||||
|
|
||||||
|
Integer newBefore = db.query(PlayerCountQueries.newPlayerCount(twoWeeksAgo, oneWeekAgo));
|
||||||
|
Integer newAfter = db.query(PlayerCountQueries.newPlayerCount(oneWeekAgo, now));
|
||||||
|
Trend newTrend = new Trend(newBefore, newAfter, false);
|
||||||
|
weeks.put("new_before", newBefore);
|
||||||
|
weeks.put("new_after", newAfter);
|
||||||
|
weeks.put("new_trend", newTrend);
|
||||||
|
|
||||||
|
int regularBefore = db.query(NetworkActivityIndexQueries.fetchRegularPlayerCount(oneWeekAgo, playtimeThreshold));
|
||||||
|
int regularAfter = db.query(NetworkActivityIndexQueries.fetchRegularPlayerCount(now, playtimeThreshold));
|
||||||
|
weeks.put("regular_before", regularBefore);
|
||||||
|
weeks.put("regular_after", regularAfter);
|
||||||
|
weeks.put("regular_trend", new Trend(regularBefore, regularAfter, false));
|
||||||
|
|
||||||
|
Long playtimeBefore = db.query(SessionQueries.playtime(twoWeeksAgo, oneWeekAgo));
|
||||||
|
Long playtimeAfter = db.query(SessionQueries.playtime(oneWeekAgo, now));
|
||||||
|
long avgPlaytimeBefore = uniqueBefore != 0 ? playtimeBefore / uniqueBefore : 0L;
|
||||||
|
long avgPlaytimeAfter = uniqueAfter != 0 ? playtimeAfter / uniqueAfter : 0L;
|
||||||
|
Trend avgPlaytimeTrend = new Trend(avgPlaytimeBefore, avgPlaytimeAfter, false, timeAmount);
|
||||||
|
weeks.put("average_playtime_before", timeAmount.apply(avgPlaytimeBefore));
|
||||||
|
weeks.put("average_playtime_after", timeAmount.apply(avgPlaytimeAfter));
|
||||||
|
weeks.put("average_playtime_trend", avgPlaytimeTrend);
|
||||||
|
|
||||||
|
Long sessionsBefore = db.query(SessionQueries.sessionCount(twoWeeksAgo, oneWeekAgo));
|
||||||
|
Long sessionsAfter = db.query(SessionQueries.sessionCount(oneWeekAgo, now));
|
||||||
|
Trend sessionsTrend = new Trend(sessionsBefore, sessionsAfter, false);
|
||||||
|
weeks.put("sessions_before", sessionsBefore);
|
||||||
|
weeks.put("sessions_after", sessionsAfter);
|
||||||
|
weeks.put("sessions_trend", sessionsTrend);
|
||||||
|
|
||||||
|
long avgSessionLengthBefore = sessionsBefore != 0 ? playtimeBefore / sessionsBefore : 0;
|
||||||
|
long avgSessionLengthAfter = sessionsAfter != 0 ? playtimeAfter / sessionsAfter : 0;
|
||||||
|
Trend avgSessionLengthTrend = new Trend(avgSessionLengthBefore, avgSessionLengthAfter, false, timeAmount);
|
||||||
|
weeks.put("session_length_average_before", timeAmount.apply(avgSessionLengthBefore));
|
||||||
|
weeks.put("session_length_average_after", timeAmount.apply(avgSessionLengthAfter));
|
||||||
|
weeks.put("session_length_average_trend", avgSessionLengthTrend);
|
||||||
|
|
||||||
|
return weeks;
|
||||||
|
}
|
||||||
|
}
|
@ -17,6 +17,7 @@
|
|||||||
package com.djrapitops.plan.system.webserver.pages.json;
|
package com.djrapitops.plan.system.webserver.pages.json;
|
||||||
|
|
||||||
import com.djrapitops.plan.api.exceptions.WebUserAuthException;
|
import com.djrapitops.plan.api.exceptions.WebUserAuthException;
|
||||||
|
import com.djrapitops.plan.system.json.network.NetworkOverviewJSONParser;
|
||||||
import com.djrapitops.plan.system.json.network.NetworkPlayerBaseOverviewJSONParser;
|
import com.djrapitops.plan.system.json.network.NetworkPlayerBaseOverviewJSONParser;
|
||||||
import com.djrapitops.plan.system.json.network.NetworkTabJSONParser;
|
import com.djrapitops.plan.system.json.network.NetworkTabJSONParser;
|
||||||
import com.djrapitops.plan.system.webserver.RequestTarget;
|
import com.djrapitops.plan.system.webserver.RequestTarget;
|
||||||
@ -38,10 +39,12 @@ public class NeworkJSONHandler extends TreePageHandler {
|
|||||||
@Inject
|
@Inject
|
||||||
public NeworkJSONHandler(
|
public NeworkJSONHandler(
|
||||||
ResponseFactory responseFactory,
|
ResponseFactory responseFactory,
|
||||||
|
NetworkOverviewJSONParser networkOverviewJSONParser,
|
||||||
NetworkPlayerBaseOverviewJSONParser playerBaseOverviewJSONParser
|
NetworkPlayerBaseOverviewJSONParser playerBaseOverviewJSONParser
|
||||||
) {
|
) {
|
||||||
super(responseFactory);
|
super(responseFactory);
|
||||||
|
|
||||||
|
registerPage("overview", networkOverviewJSONParser);
|
||||||
registerPage("playerbaseOverview", playerBaseOverviewJSONParser);
|
registerPage("playerbaseOverview", playerBaseOverviewJSONParser);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -36,28 +36,25 @@ function smallTrend(trend) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This function loads Server Overview tab */
|
/* This function loads Network Overview tab */
|
||||||
function loadServerOverviewValues(json, error) {
|
function loadNetworkOverviewValues(json, error) {
|
||||||
if (error) {
|
if (error) {
|
||||||
$('#server-overview').addClass('forbidden'); // TODO Figure out 403
|
$('#network-overview').addClass('forbidden'); // TODO Figure out 403
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
tab = $('#server-overview');
|
tab = $('#network-overview');
|
||||||
|
|
||||||
// Last 7 Days
|
// Last 7 Days
|
||||||
data = json.last_7_days;
|
data = json.players;
|
||||||
element = $(tab).find('#data_7_days');
|
element = $(tab).find('#data_players');
|
||||||
|
|
||||||
$(element).find('#data_unique').text(data.unique_players);
|
$(element).find('#data_unique_players_1d').text(data.unique_players_1d);
|
||||||
$(element).find('#data_unique_day').text(data.unique_players_day);
|
$(element).find('#data_unique_players_7d').text(data.unique_players_7d);
|
||||||
$(element).find('#data_new').text(data.new_players);
|
$(element).find('#data_unique_players_30d').text(data.unique_players_30d);
|
||||||
$(element).find('#data_retention').text('(' + data.new_players_retention + '/' + data.new_players + ')');
|
$(element).find('#data_new_players_1d').text(data.new_players_1d);
|
||||||
$(element).find('#data_retention_perc').text(data.new_players_retention_perc);
|
$(element).find('#data_new_players_7d').text(data.new_players_7d);
|
||||||
|
$(element).find('#data_new_players_30d').text(data.new_players_30d);
|
||||||
$(element).find('#data_avg_tps').text(data.average_tps);
|
|
||||||
$(element).find('#data_low_tps_spikes').text(data.low_tps_spikes);
|
|
||||||
$(element).find('#data_downtime').text(data.downtime);
|
|
||||||
|
|
||||||
// Server As Numbers
|
// Server As Numbers
|
||||||
data = json.numbers;
|
data = json.numbers;
|
||||||
@ -74,12 +71,9 @@ function loadServerOverviewValues(json, error) {
|
|||||||
|
|
||||||
$(element).find('#data_playtime').text(data.playtime);
|
$(element).find('#data_playtime').text(data.playtime);
|
||||||
$(element).find('#data_player_playtime').text(data.player_playtime);
|
$(element).find('#data_player_playtime').text(data.player_playtime);
|
||||||
|
$(element).find('#data_session_length_avg').text(data.session_length_avg);
|
||||||
$(element).find('#data_sessions').text(data.sessions);
|
$(element).find('#data_sessions').text(data.sessions);
|
||||||
|
|
||||||
$(element).find('#data_player_kills').text(data.player_kills);
|
|
||||||
$(element).find('#data_mob_kills').text(data.mob_kills);
|
|
||||||
$(element).find('#data_deaths').text(data.deaths);
|
|
||||||
|
|
||||||
// Week Comparison
|
// Week Comparison
|
||||||
data = json.weeks;
|
data = json.weeks;
|
||||||
element = $(tab).find('#data_weeks');
|
element = $(tab).find('#data_weeks');
|
||||||
@ -94,22 +88,16 @@ function loadServerOverviewValues(json, error) {
|
|||||||
$(element).find('#data_regular_after').text(data.regular_after);
|
$(element).find('#data_regular_after').text(data.regular_after);
|
||||||
$(element).find('#data_regular_trend').replaceWith(trend(data.regular_trend));
|
$(element).find('#data_regular_trend').replaceWith(trend(data.regular_trend));
|
||||||
|
|
||||||
$(element).find('#data_playtime_before').text(data.playtime_before);
|
$(element).find('#data_average_playtime_before').text(data.average_playtime_before);
|
||||||
$(element).find('#data_playtime_after').text(data.playtime_after);
|
$(element).find('#data_average_playtime_after').text(data.average_playtime_after);
|
||||||
$(element).find('#data_playtime_trend').replaceWith(trend(data.playtime_trend));
|
$(element).find('#data_average_playtime_trend').replaceWith(trend(data.average_playtime_trend));
|
||||||
$(element).find('#data_sessions_before').text(data.sessions_before);
|
$(element).find('#data_sessions_before').text(data.sessions_before);
|
||||||
$(element).find('#data_sessions_after').text(data.sessions_after);
|
$(element).find('#data_sessions_after').text(data.sessions_after);
|
||||||
$(element).find('#data_sessions_trend').replaceWith(trend(data.sessions_trend));
|
$(element).find('#data_sessions_trend').replaceWith(trend(data.sessions_trend));
|
||||||
|
$(element).find('#data_session_length_average_before').text(data.session_length_average_before);
|
||||||
|
$(element).find('#data_session_length_average_after').text(data.session_length_average_after);
|
||||||
|
$(element).find('#data_session_length_average_trend').replaceWith(trend(data.session_length_average_trend));
|
||||||
|
|
||||||
$(element).find('#data_player_kills_before').text(data.player_kills_before);
|
|
||||||
$(element).find('#data_player_kills_after').text(data.player_kills_after);
|
|
||||||
$(element).find('#data_player_kills_trend').replaceWith(trend(data.player_kills_trend));
|
|
||||||
$(element).find('#data_mob_kills_before').text(data.mob_kills_before);
|
|
||||||
$(element).find('#data_mob_kills_after').text(data.mob_kills_after);
|
|
||||||
$(element).find('#data_mob_kills_trend').replaceWith(trend(data.mob_kills_trend));
|
|
||||||
$(element).find('#data_deaths_before').text(data.deaths_before);
|
|
||||||
$(element).find('#data_deaths_after').text(data.deaths_after);
|
|
||||||
$(element).find('#data_deaths_trend').replaceWith(trend(data.deaths_trend))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* This function loads Online Activity Overview tab */
|
/* This function loads Online Activity Overview tab */
|
||||||
|
@ -140,7 +140,7 @@
|
|||||||
<!-- Main Content -->
|
<!-- Main Content -->
|
||||||
<div id="content" style="display: flex;">
|
<div id="content" style="display: flex;">
|
||||||
<!-- Begin Network Overview Tab -->
|
<!-- Begin Network Overview Tab -->
|
||||||
<div class="tab">
|
<div class="tab" id="network-overview">
|
||||||
<div class="container-fluid mt-4">
|
<div class="container-fluid mt-4">
|
||||||
<!-- Page Heading -->
|
<!-- Page Heading -->
|
||||||
<div class="d-sm-flex align-items-center justify-content-between mb-4">
|
<div class="d-sm-flex align-items-center justify-content-between mb-4">
|
||||||
@ -190,22 +190,22 @@
|
|||||||
class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
|
class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
|
||||||
<h6 class="m-0 font-weight-bold col-black">Players</h6>
|
<h6 class="m-0 font-weight-bold col-black">Players</h6>
|
||||||
</div>
|
</div>
|
||||||
<div class="card-body">
|
<div class="card-body" id="data_players">
|
||||||
<p>Last 24 Hours</p>
|
<p>Last 24 Hours</p>
|
||||||
<p><i class="col-blue fa fa-fw fa-users"></i> Unique Players<span
|
<p><i class="col-blue fa fa-fw fa-users"></i> Unique Players<span
|
||||||
class="float-right"><b>0</b></span></p>
|
class="float-right"><b id="data_unique_players_1d"></b></span></p>
|
||||||
<p><i class="col-light-green fa fa-fw fa-user-plus"></i> New Players<span
|
<p><i class="col-light-green fa fa-fw fa-user-plus"></i> New Players<span
|
||||||
class="float-right"><b>0</b></span></p>
|
class="float-right"><b id="data_new_players_1d"></b></span></p>
|
||||||
<p>Last 7 Days</p>
|
<p>Last 7 Days</p>
|
||||||
<p><i class="col-blue fa fa-fw fa-users"></i> Unique Players<span
|
<p><i class="col-blue fa fa-fw fa-users"></i> Unique Players<span
|
||||||
class="float-right"><b>0</b></span></p>
|
class="float-right"><b id="data_unique_players_7d"></b></span></p>
|
||||||
<p><i class="col-light-green fa fa-fw fa-user-plus"></i> New Players<span
|
<p><i class="col-light-green fa fa-fw fa-user-plus"></i> New Players<span
|
||||||
class="float-right"><b>0</b></span></p>
|
class="float-right"><b id="data_new_players_7d"></b></span></p>
|
||||||
<p>Last 30 Days</p>
|
<p>Last 30 Days</p>
|
||||||
<p><i class="col-blue fa fa-fw fa-users"></i> Unique Players<span
|
<p><i class="col-blue fa fa-fw fa-users"></i> Unique Players<span
|
||||||
class="float-right"><b>0</b></span></p>
|
class="float-right"><b id="data_unique_players_30d"></b></span></p>
|
||||||
<p><i class="col-light-green fa fa-fw fa-user-plus"></i> New Players<span
|
<p><i class="col-light-green fa fa-fw fa-user-plus"></i> New Players<span
|
||||||
class="float-right"><b>0</b></span></p>
|
class="float-right"><b id="data_new_players_30d"></b></span></p>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -244,18 +244,6 @@
|
|||||||
class="float-right" id="data_session_length_avg"></span></p>
|
class="float-right" id="data_session_length_avg"></span></p>
|
||||||
<p><i class="col-teal far fa-fw fa-calendar-check"></i> Sessions<span
|
<p><i class="col-teal far fa-fw fa-calendar-check"></i> Sessions<span
|
||||||
class="float-right"><b id="data_sessions"></b></span></p>
|
class="float-right"><b id="data_sessions"></b></span></p>
|
||||||
<hr>
|
|
||||||
<p><i class="col-teal far fa-fw fa-clock"></i> Total Playtime<span
|
|
||||||
class="float-right">
|
|
||||||
8h 5m 56s </span></p>
|
|
||||||
<p><i class="col-teal far fa-fw fa-clock"></i> Average Playtime / Player<span
|
|
||||||
class="float-right">
|
|
||||||
0s </span></p>
|
|
||||||
<p><i class="col-teal far fa-fw fa-clock"></i> Average Session Length<span
|
|
||||||
class="float-right">
|
|
||||||
0s </span></p>
|
|
||||||
<p><i class="col-teal far fa-fw fa-calendar-check"></i> Sessions<span
|
|
||||||
class="float-right"><b>98</b></span></p>
|
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
@ -269,13 +257,15 @@
|
|||||||
</div>
|
</div>
|
||||||
<table class="table">
|
<table class="table">
|
||||||
<thead>
|
<thead>
|
||||||
<th><i class="text-success fa fa-caret-up"></i><i
|
<tr>
|
||||||
class="text-danger fa fa-caret-down"></i>
|
<th><i class="text-success fa fa-caret-up"></i><i
|
||||||
<small>Comparing 7 days</small>
|
class="text-danger fa fa-caret-down"></i>
|
||||||
</th>
|
<small>Comparing 7 days</small>
|
||||||
<th>7 days before (22.1. - 29.1.)</th>
|
</th>
|
||||||
<th>Last 7 days (29.1. - 5.2.)</th>
|
<th>7 days before (22.1. - 29.1.)</th>
|
||||||
<th>Trend</th>
|
<th>Last 7 days (29.1. - 5.2.)</th>
|
||||||
|
<th>Trend</th>
|
||||||
|
</tr>
|
||||||
</thead>
|
</thead>
|
||||||
<tbody id="data_weeks">
|
<tbody id="data_weeks">
|
||||||
<tr>
|
<tr>
|
||||||
@ -300,15 +290,15 @@
|
|||||||
<td><i class="col-green far fa-fw fa-clock"></i> Average Playtime /
|
<td><i class="col-green far fa-fw fa-clock"></i> Average Playtime /
|
||||||
Player
|
Player
|
||||||
</td>
|
</td>
|
||||||
<td id="data_playtime_before"></td>
|
<td id="data_average_playtime_before"></td>
|
||||||
<td id="data_playtime_after"></td>
|
<td id="data_average_playtime_after"></td>
|
||||||
<td><span id="data_playtime_trend"></span></td>
|
<td><span id="data_average_playtime_trend"></span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><i class="col-teal far fa-fw fa-clock"></i> Sessions</td>
|
<td><i class="col-teal far fa-fw fa-clock"></i> Average Session Length</td>
|
||||||
<td id="data_session_length_before"></td>
|
<td id="data_session_length_average_before"></td>
|
||||||
<td id="data_session_length_after"></td>
|
<td id="data_session_length_average_after"></td>
|
||||||
<td><span id="data_session_length_trend"></span></td>
|
<td><span id="data_session_length_average_trend"></span></td>
|
||||||
</tr>
|
</tr>
|
||||||
<tr>
|
<tr>
|
||||||
<td><i class="col-teal far fa-fw fa-calendar-check"></i> Sessions</td>
|
<td><i class="col-teal far fa-fw fa-calendar-check"></i> Sessions</td>
|
||||||
@ -1303,6 +1293,7 @@
|
|||||||
|
|
||||||
<script>
|
<script>
|
||||||
setLoadingText('Calculating values..');
|
setLoadingText('Calculating values..');
|
||||||
|
jsonRequest("../v1/network/overview", loadNetworkOverviewValues);
|
||||||
jsonRequest("../v1/network/playerbaseOverview", loadPlayerbaseOverviewValues);
|
jsonRequest("../v1/network/playerbaseOverview", loadPlayerbaseOverviewValues);
|
||||||
setLoadingText('Rendering graphs..');
|
setLoadingText('Rendering graphs..');
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user