Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-10-07 10:57:38 +02:00
Code Issues Projects Releases Wiki Activity

Error displayed when json request fails

Browse Source
This commit is contained in:
Rsl1122 2019-09-21 15:35:07 +03:00
parent 46a74d2297
commit b3bca52d48
4 changed files with 40 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
Plan/common/src/main/resources/assets/plan/web/js/network-values.js
View File

@ -36,14 +36,17 @@ function smallTrend(trend) {
} }
} }
/* This function loads Network Overview tab */ function displayError(element, error) {
function loadNetworkOverviewValues(json, error) { element.find('.d-sm-flex').after('<div class="alert alert-danger" role="alert">Failed to load values: ' + error + '</div>')
if (error) {
$('#network-overview').addClass('forbidden'); // TODO Figure out 403
return;
} }
/* This function loads Network Overview tab */
function loadNetworkOverviewValues(json, error) {
tab = $('#network-overview'); tab = $('#network-overview');
if (error) {
displayError(tab, error);
return;
}
// Last 7 days // Last 7 days
data = json.players; data = json.players;
@ -107,13 +110,12 @@ function loadNetworkOverviewValues(json, error) {
/* This function loads Online Activity Overview tab */ /* This function loads Online Activity Overview tab */
function loadOnlineActivityOverviewValues(json, error) { function loadOnlineActivityOverviewValues(json, error) {
tab = $('#online-activity-overview');
if (error) { if (error) {
$('#online-activity-overview').addClass('forbidden'); // TODO Figure out 403 displayError(tab, error);
return; return;
} }
tab = $('#online-activity-overview');
// Online Activity as Numbers // Online Activity as Numbers
data = json.numbers; data = json.numbers;
element = $(tab).find('#data_numbers'); element = $(tab).find('#data_numbers');
@ -166,13 +168,12 @@ function loadOnlineActivityOverviewValues(json, error) {
/* This function loads Sessions tab */ /* This function loads Sessions tab */
function loadSessionValues(json, error) { function loadSessionValues(json, error) {
tab = $('#sessions-overview');
if (error) { if (error) {
$('#sessions-overview').addClass('forbidden'); // TODO Figure out 403 displayError(tab, error);
return; return;
} }
tab = $('#sessions-overview');
// Insights // Insights
data = json.insights; data = json.insights;
element = $(tab).find('#data_insights'); element = $(tab).find('#data_insights');
@ -188,13 +189,12 @@ function loadSessionValues(json, error) {
/* This function loads Playerbase Overview tab */ /* This function loads Playerbase Overview tab */
function loadPlayerbaseOverviewValues(json, error) { function loadPlayerbaseOverviewValues(json, error) {
tab = $('#playerbase-overview');
if (error) { if (error) {
$('#playerbase-overview').addClass('forbidden'); // TODO Figure out 403 displayError(tab, error);
return; return;
} }
tab = $('#playerbase-overview');
// Trends // Trends
data = json.trends; data = json.trends;
element = $(tab).find('#data_trends'); element = $(tab).find('#data_trends');
@ -231,7 +231,7 @@ function loadPlayerbaseOverviewValues(json, error) {
function loadServerBoxes(servers, error) { function loadServerBoxes(servers, error) {
if (error) { if (error) {
$('#data_servers').addClass('forbidden'); // TODO Figure out 403 displayError($('#servers-tab'), error);
return; return;
} }

15
Plan/common/src/main/resources/assets/plan/web/js/player-values.js
View File

@ -1,11 +1,10 @@
function loadPlayerOverviewValues(json, error) { function loadPlayerOverviewValues(json, error) {
tab = $("#player-overview");
if (error) { if (error) {
$("#player-overview").addClass("forbidden"); // TODO Figure out 403 displayError(tab, error);
return; return;
} }
tab = $("#player-overview");
// Player information card // Player information card
data = json.info; data = json.info;
element = $(tab).find("#data_player_info"); element = $(tab).find("#data_player_info");
@ -62,13 +61,12 @@ function loadPlayerOverviewValues(json, error) {
/* This function loads PvP & PvE tab */ /* This function loads PvP & PvE tab */
function loadPvPPvEValues(json, error) { function loadPvPPvEValues(json, error) {
tab = $('#pvp-pve');
if (error) { if (error) {
$('#pvp-pve').addClass('forbidden'); // TODO Figure out 403 displayError(tab, error);
return; return;
} }
tab = $('#pvp-pve');
// as Numbers // as Numbers
data = json.kill_data; data = json.kill_data;
element = $(tab).find('#data_numbers'); element = $(tab).find('#data_numbers');
@ -145,12 +143,13 @@ function createConnectionsTableBody(connections) {
} }
function loadServerAccordion(json, error) { function loadServerAccordion(json, error) {
tab = $("#server-overview");
if (error) { if (error) {
$('#server-overview').addClass('forbidden'); // TODO Figure out 403 displayError(tab, error);
return; return;
} }
serverTable = $("#server-overview").find("#tableSAccordion").find("tbody"); serverTable = tab.find("#tableSAccordion").find("tbody");
var servers = json.servers; var servers = json.servers;

41
Plan/common/src/main/resources/assets/plan/web/js/server-values.js
View File

@ -36,15 +36,19 @@ function smallTrend(trend) {
} }
} }
/* This function loads Server Overview tab */ function displayError(element, error) {
function loadServerOverviewValues(json, error) { element.find('.d-sm-flex').after('<div class="alert alert-danger" role="alert">Failed to load values: ' + error + '</div>')
if (error) {
$('#server-overview').addClass('forbidden'); // TODO Figure out 403
return;
} }
/* This function loads Server Overview tab */
function loadServerOverviewValues(json, error) {
tab = $('#server-overview'); tab = $('#server-overview');
if (error) {
displayError(tab, error);
return;
}
// Last 7 days // Last 7 days
data = json.last_7_days; data = json.last_7_days;
element = $(tab).find('#data_7_days'); element = $(tab).find('#data_7_days');
@ -119,13 +123,13 @@ function loadServerOverviewValues(json, error) {
/* This function loads Online Activity Overview tab */ /* This function loads Online Activity Overview tab */
function loadOnlineActivityOverviewValues(json, error) { function loadOnlineActivityOverviewValues(json, error) {
tab = $('#online-activity-overview');
if (error) { if (error) {
$('#online-activity-overview').addClass('forbidden'); // TODO Figure out 403 displayError(tab, error);
return; return;
} }
tab = $('#online-activity-overview');
// Online Activity as Numbers // Online Activity as Numbers
data = json.numbers; data = json.numbers;
element = $(tab).find('#data_numbers'); element = $(tab).find('#data_numbers');
@ -178,13 +182,13 @@ function loadOnlineActivityOverviewValues(json, error) {
/* This function loads Sessions tab */ /* This function loads Sessions tab */
function loadSessionValues(json, error) { function loadSessionValues(json, error) {
tab = $('#sessions-overview');
if (error) { if (error) {
$('#sessions-overview').addClass('forbidden'); // TODO Figure out 403 displayError(tab, error);
return; return;
} }
tab = $('#sessions-overview');
// Insights // Insights
data = json.insights; data = json.insights;
element = $(tab).find('#data_insights'); element = $(tab).find('#data_insights');
@ -200,13 +204,12 @@ function loadSessionValues(json, error) {
/* This function loads PvP & PvE tab */ /* This function loads PvP & PvE tab */
function loadPvPPvEValues(json, error) { function loadPvPPvEValues(json, error) {
tab = $('#pvp-pve');
if (error) { if (error) {
$('#pvp-pve').addClass('forbidden'); // TODO Figure out 403 displayError(tab, error);
return; return;
} }
tab = $('#pvp-pve');
// as Numbers // as Numbers
data = json.numbers; data = json.numbers;
element = $(tab).find('#data_numbers'); element = $(tab).find('#data_numbers');
@ -246,13 +249,12 @@ function loadPvPPvEValues(json, error) {
/* This function loads Playerbase Overview tab */ /* This function loads Playerbase Overview tab */
function loadPlayerbaseOverviewValues(json, error) { function loadPlayerbaseOverviewValues(json, error) {
tab = $('#playerbase-overview');
if (error) { if (error) {
$('#playerbase-overview').addClass('forbidden'); // TODO Figure out 403 displayError(tab, error);
return; return;
} }
tab = $('#playerbase-overview');
// Trends // Trends
data = json.trends; data = json.trends;
element = $(tab).find('#data_trends'); element = $(tab).find('#data_trends');
@ -289,13 +291,12 @@ function loadPlayerbaseOverviewValues(json, error) {
/* This function loads Performance tab */ /* This function loads Performance tab */
function loadPerformanceValues(json, error) { function loadPerformanceValues(json, error) {
tab = $('#performance');
if (error) { if (error) {
$('#performance').addClass('forbidden'); // TODO Figure out 403 displayError(tab, error);
return; return;
} }
tab = $('#performance');
// as Numbers // as Numbers
data = json.numbers; data = json.numbers;
element = $(tab).find('#data_numbers'); element = $(tab).find('#data_numbers');

2
Plan/common/src/main/resources/assets/plan/web/network.html
View File

@ -307,7 +307,7 @@
</div> <!-- /.container-fluid --> </div> <!-- /.container-fluid -->
</div> <!-- End of Network Overview tab --> </div> <!-- End of Network Overview tab -->
<!-- Begin Servers Overview Tab --> <!-- Begin Servers Overview Tab -->
<div class="tab"> <div class="tab" id="servers-tab">
<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">