From 71f7210a82c3ae7cd8b0028749e49723b5fe2e8c Mon Sep 17 00:00:00 2001 From: Fuzzlemann Date: Thu, 27 Jul 2017 19:15:41 +0200 Subject: [PATCH] Updates HTML files --- Plan/src/main/resources/analysis.html | 334 ++++++++---- Plan/src/main/resources/player.html | 700 +++++++++++++------------- 2 files changed, 594 insertions(+), 440 deletions(-) diff --git a/Plan/src/main/resources/analysis.html b/Plan/src/main/resources/analysis.html index 58d5461e3..ee28105bc 100644 --- a/Plan/src/main/resources/analysis.html +++ b/Plan/src/main/resources/analysis.html @@ -278,6 +278,7 @@ } } + @@ -382,7 +383,8 @@ Total Login times: %totallogins%
Average Unique Players/Day: - %avguniquejoins%
+ %avguniquejoins% | Average New/Day: + %newperday%
Player kills: %playerkills% | Mob kills: %mobkills% | Deaths: %deaths%

@@ -473,7 +475,9 @@

Unique Players: %uniquejoinsday% | Unique/Day: %avguniquejoinsday%

+ class="fa fa-user-circle-o" aria-hidden="true"> Unique/Day: %avguniquejoinsday% | New/Day: %newperdayday% +

@@ -497,7 +501,10 @@

Unique Players: %uniquejoinsweek% | Unique/Day: %avguniquejoinsweek%

+ class="fa fa-user-circle-o" aria-hidden="true"> Unique/Day: %avguniquejoinsweek% | + New/Day: %newperdayweek% +

@@ -521,7 +528,9 @@

Unique Players: %uniquejoinsmonth% | Unique/Day: %avguniquejoinsmonth% + class="fa fa-user-circle-o" aria-hidden="true"> Unique/Day: %avguniquejoinsmonth% | + New/Day: %newperdaymonth%

@@ -717,8 +726,8 @@
+

If Graph displays '-1' usage is not available for this platform.

-

If CPU Graph displays '-1' CPU usage is not available for this platform.

@@ -855,8 +864,8 @@ var x = document.getElementById("main"); x.style.transform = "translate3d(0px,0px,0)"; x.style.width = "" + navButtons.length * 100 + "%"; - for (var i = 0; i < navButtons.length; i++) { - navButtons[i].onclick = openFunc(i); + for (i = 0; i < navButtons.length; i++) { + navButtons[i].onclick = openFunc(i) tabs[i].style.width = "" + 100 / navButtons.length + "%"; } x.style.opacity = "1"; @@ -914,6 +923,7 @@ setTimeout('countUpTimer()', 1000); } + @@ -925,78 +935,144 @@ var ctxweek = document.getElementById("playerChartWeek"); var ctxmonth = document.getElementById("playerChartMonth"); var dataday = { - datasets: [ - { - label: "Players Online", - fill: true, - lineTension: 0.1, - backgroundColor: "#%playersgraphfill%", - borderColor: "#%playersgraphcolor%", - borderCapStyle: 'butt', - borderDash: [], - borderDashOffset: 0.0, - borderJoinStyle: 'miter', - pointBorderColor: "#%playersgraphcolor%", - pointBackgroundColor: "#fff", - pointBorderWidth: 1, - pointHoverRadius: 5, - pointHoverBackgroundColor: "#%playersgraphcolor%", - pointHoverBorderColor: "#8fabc6", - pointHoverBorderWidth: 2, - pointRadius: 1, - pointHitRadius: 10, - spanGaps: false, - data: %datascatterday% , + datasets: [ + { + label: "Players Online", + fill: true, + lineTension: 0.1, + backgroundColor: "#%playersgraphfill%", + borderColor: "#%playersgraphcolor%", + borderCapStyle: 'butt', + borderDash: [], + borderDashOffset: 0.0, + borderJoinStyle: 'miter', + pointBorderColor: "#%playersgraphcolor%", + pointBackgroundColor: "#fff", + pointBorderWidth: 1, + pointHoverRadius: 5, + pointHoverBackgroundColor: "#%playersgraphcolor%", + pointHoverBorderColor: "#8fabc6", + pointHoverBorderWidth: 2, + pointRadius: 1, + pointHitRadius: 10, + spanGaps: false, + data: %datascatterday% + }, + { + label: "New Players", + fill: true, + lineTension: 0.1, + backgroundColor: "#fff", + borderColor: "#7dcc24", + borderCapStyle: 'butt', + borderDash: [], + borderDashOffset: 0.0, + borderJoinStyle: 'miter', + pointBorderColor: "#7dcc24", + pointBackgroundColor: "#fff", + pointBorderWidth: 1, + pointHoverRadius: 5, + pointHoverBackgroundColor: "#7dcc24", + pointHoverBorderColor: "#8fabc6", + pointHoverBorderWidth: 2, + pointRadius: 1, + pointHitRadius: 10, + spanGaps: false, + data: %npdataday% }] } var dataweek = { - datasets: [ - { - label: "Players Online", - fill: true, - lineTension: 0.1, - backgroundColor: "#%playersgraphfill%", - borderColor: "#%playersgraphcolor%", - borderCapStyle: 'butt', - borderDash: [], - borderDashOffset: 0.0, - borderJoinStyle: 'miter', - pointBorderColor: "#%playersgraphcolor%", - pointBackgroundColor: "#fff", - pointBorderWidth: 1, - pointHoverRadius: 5, - pointHoverBackgroundColor: "#%playersgraphcolor%", - pointHoverBorderColor: "#8fabc6", - pointHoverBorderWidth: 2, - pointRadius: 1, - pointHitRadius: 10, - spanGaps: false, - data: %datascatterweek% , + datasets: [ + { + label: "Players Online", + fill: true, + lineTension: 0.1, + backgroundColor: "#%playersgraphfill%", + borderColor: "#%playersgraphcolor%", + borderCapStyle: 'butt', + borderDash: [], + borderDashOffset: 0.0, + borderJoinStyle: 'miter', + pointBorderColor: "#%playersgraphcolor%", + pointBackgroundColor: "#fff", + pointBorderWidth: 1, + pointHoverRadius: 5, + pointHoverBackgroundColor: "#%playersgraphcolor%", + pointHoverBorderColor: "#8fabc6", + pointHoverBorderWidth: 2, + pointRadius: 1, + pointHitRadius: 10, + spanGaps: false, + data: %datascatterweek% , + }, + { + label: "New Players", + fill: true, + lineTension: 0.1, + backgroundColor: "#fff", + borderColor: "#7dcc24", + borderCapStyle: 'butt', + borderDash: [], + borderDashOffset: 0.0, + borderJoinStyle: 'miter', + pointBorderColor: "#7dcc24", + pointBackgroundColor: "#fff", + pointBorderWidth: 1, + pointHoverRadius: 5, + pointHoverBackgroundColor: "#7dcc24", + pointHoverBorderColor: "#8fabc6", + pointHoverBorderWidth: 2, + pointRadius: 1, + pointHitRadius: 10, + spanGaps: false, + data: %npdataweek% }] } var datamonth = { - datasets: [ - { - label: "Players Online", - fill: true, - lineTension: 0.1, - backgroundColor: "#%playersgraphfill%", - borderColor: "#%playersgraphcolor%", - borderCapStyle: 'butt', - borderDash: [], - borderDashOffset: 0.0, - borderJoinStyle: 'miter', - pointBorderColor: "#%playersgraphcolor%", - pointBackgroundColor: "#fff", - pointBorderWidth: 1, - pointHoverRadius: 5, - pointHoverBackgroundColor: "#%playersgraphcolor%", - pointHoverBorderColor: "#8fabc6", - pointHoverBorderWidth: 2, - pointRadius: 1, - pointHitRadius: 10, - spanGaps: false, - data: %datascattermonth% , + datasets: [ + { + label: "Players Online", + fill: true, + lineTension: 0.1, + backgroundColor: "#%playersgraphfill%", + borderColor: "#%playersgraphcolor%", + borderCapStyle: 'butt', + borderDash: [], + borderDashOffset: 0.0, + borderJoinStyle: 'miter', + pointBorderColor: "#%playersgraphcolor%", + pointBackgroundColor: "#fff", + pointBorderWidth: 1, + pointHoverRadius: 5, + pointHoverBackgroundColor: "#%playersgraphcolor%", + pointHoverBorderColor: "#8fabc6", + pointHoverBorderWidth: 2, + pointRadius: 1, + pointHitRadius: 10, + spanGaps: false, + data: %datascattermonth% , + }, + { + label: "New Players", + fill: true, + lineTension: 0.1, + backgroundColor: "#fff", + borderColor: "#7dcc24", + borderCapStyle: 'butt', + borderDash: [], + borderDashOffset: 0.0, + borderJoinStyle: 'miter', + pointBorderColor: "#7dcc24", + pointBackgroundColor: "#fff", + pointBorderWidth: 1, + pointHoverRadius: 5, + pointHoverBackgroundColor: "#7dcc24", + pointHoverBorderColor: "#8fabc6", + pointHoverBorderWidth: 2, + pointRadius: 1, + pointHitRadius: 10, + spanGaps: false, + data: %npdatamonth% }] } var playersChartDay = new Chart(ctxday, { @@ -1112,6 +1188,7 @@ } }); +
diff --git a/Plan/src/main/resources/player.html b/Plan/src/main/resources/player.html index 0f1f3f2ee..8a270334c 100644 --- a/Plan/src/main/resources/player.html +++ b/Plan/src/main/resources/player.html @@ -7,313 +7,313 @@ @@ -582,8 +582,8 @@ x.style.transform = "translate3d(0px,0px,0)"; x.style.width = ""+navButtons.length*100+"%"; - for (var i = 0; i < navButtons.length; i++) { - navButtons[i].onclick = openFunc(i); + for (i=0; i < navButtons.length; i++) { + navButtons[i].onclick = openFunc(i) tabs[i].style.width = ""+100/navButtons.length+"%"; } x.style.opacity = "1"; @@ -714,46 +714,46 @@ var ctxweek = document.getElementById("playerChartWeek"); var dataweek = { datasets: [{ - label: "Online", - fill: true, - lineTension: 0.1, - backgroundColor: "#%playersgraphfill%", - borderColor: "#%playersgraphcolor%", - borderCapStyle: 'butt', - borderDash: [], - borderDashOffset: 0.0, - borderJoinStyle: 'miter', - pointBorderColor: "#%playersgraphcolor%", - pointBackgroundColor: "#fff", - pointBorderWidth: 1, - pointHoverRadius: 5, - pointHoverBackgroundColor: "#%playersgraphcolor%", - pointHoverBorderColor: "#8fabc6", - pointHoverBorderWidth: 2, - pointRadius: 1, - pointHitRadius: 10, - spanGaps: false, - data: %dataweek% , + label: "Online", + fill: true, + lineTension: 0.1, + backgroundColor: "#%playersgraphfill%", + borderColor: "#%playersgraphcolor%", + borderCapStyle: 'butt', + borderDash: [], + borderDashOffset: 0.0, + borderJoinStyle: 'miter', + pointBorderColor: "#%playersgraphcolor%", + pointBackgroundColor: "#fff", + pointBorderWidth: 1, + pointHoverRadius: 5, + pointHoverBackgroundColor: "#%playersgraphcolor%", + pointHoverBorderColor: "#8fabc6", + pointHoverBorderWidth: 2, + pointRadius: 1, + pointHitRadius: 10, + spanGaps: false, + data: %dataweek% , }]}; var playersChartWeek = new Chart(ctxweek, { - type: 'scatter', - data: dataweek, - options: { - tooltips: { - callbacks: { - label: function(tooltipItems, data) { - var newDate = new Date(); - newDate.setTime(tooltipItems.xLabel); - dateString = newDate.toUTCString(); - return dateString +': '+ tooltipItems.yLabel+ ' Players'; - } - } - }, - scales: { - yAxes: [{ - display: true, - ticks: { - callback: function(value, index, values) { + type: 'scatter', + data: dataweek, + options: { + tooltips: { + callbacks: { + label: function(tooltipItems, data) { + var newDate = new Date(); + newDate.setTime(tooltipItems.xLabel); + dateString = newDate.toUTCString(); + return dateString +': '+ tooltipItems.yLabel+ ' Players'; + } + } + }, + scales: { + yAxes: [{ + display: true, + ticks: { + callback: function(value, index, values) { switch (value) { case 0: return '0'; @@ -763,17 +763,17 @@ return ''; }; }, - suggestedMax: %graphmaxplayers%, - suggestedMin: 0 - } - }], - xAxes: [{ - type: 'linear', - display: false - }] - } - } - }); + suggestedMax: %graphmaxplayers%, + suggestedMin: 0 + } + }], + xAxes: [{ + type: 'linear', + display: false + }] + } + } + }); var ctxpunch = document.getElementById("punchcard"); var datapunch = { datasets: [