Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-01-28 11:01:28 +01:00
Code Issues Projects Releases Wiki Activity

Updates HTML files

Browse Source
This commit is contained in:
Fuzzlemann 2017-07-27 19:15:41 +02:00
parent 1f931ed885
commit 71f7210a82
2 changed files with 594 additions and 440 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

180
Plan/src/main/resources/analysis.html
View File

@ -278,6 +278,7 @@
} }
} }
</style> </style>
</head> </head>
<body onload="countUpTimer()"> <body onload="countUpTimer()">
@ -382,7 +383,8 @@
<i class="fa fa-calendar-plus-o" aria-hidden="true"></i> Total Login times: <i class="fa fa-calendar-plus-o" aria-hidden="true"></i> Total Login times:
%totallogins%<br/> %totallogins%<br/>
<i class="fa fa-user-circle-o" aria-hidden="true"></i> Average Unique Players/Day: <i class="fa fa-user-circle-o" aria-hidden="true"></i> Average Unique Players/Day:
%avguniquejoins%<br> %avguniquejoins% | <i class="fa fa-user-plus" aria-hidden="true"></i> Average New/Day:
%newperday%<br>
<b><i class="fa fa-crosshairs" aria-hidden="true"></i></b> Player kills: %playerkills% | <i <b><i class="fa fa-crosshairs" aria-hidden="true"></i></b> Player kills: %playerkills% | <i
class="fa fa-crosshairs" aria-hidden="true"></i> Mob kills: %mobkills% | <i class="fa fa-crosshairs" aria-hidden="true"></i> Mob kills: %mobkills% | <i
class="fa fa-meh-o" aria-hidden="true"></i> Deaths: %deaths%</p> class="fa fa-meh-o" aria-hidden="true"></i> Deaths: %deaths%</p>
@ -473,7 +475,9 @@
</div> </div>
<canvas id="playerChartDay2" width="1000" height="350" style="width: 95%;"></canvas> <canvas id="playerChartDay2" width="1000" height="350" style="width: 95%;"></canvas>
<p><i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsday% | <i <p><i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsday% | <i
class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsday%</p> class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsday% | <i
class="fa fa-user-plus" aria-hidden="true"></i> New/Day: %newperdayday%
</p>
</div> </div>
<div class=" box column"> <div class=" box column">
<div class="headerbox"> <div class="headerbox">
@ -497,7 +501,10 @@
</div> </div>
<canvas id="playerChartWeek" width="1000" height="350" style="width: 95%;"></canvas> <canvas id="playerChartWeek" width="1000" height="350" style="width: 95%;"></canvas>
<p><i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsweek% | <i <p><i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsweek% | <i
class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsweek%</p> class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsweek% |
<i
class="fa fa-user-plus" aria-hidden="true"></i> New/Day: %newperdayweek%
</p>
</div> </div>
<div class=" box column"> <div class=" box column">
<div class="headerbox"> <div class="headerbox">
@ -521,7 +528,9 @@
</div> </div>
<canvas id="playerChartMonth" width="1000" height="350" style="width: 95%;"></canvas> <canvas id="playerChartMonth" width="1000" height="350" style="width: 95%;"></canvas>
<p><i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsmonth% | <i <p><i class="fa fa-user-circle" aria-hidden="true"></i> Unique Players: %uniquejoinsmonth% | <i
class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsmonth% class="fa fa-user-circle-o" aria-hidden="true"></i> Unique/Day: %avguniquejoinsmonth% |
<i
class="fa fa-user-plus" aria-hidden="true"></i> New/Day: %newperdaymonth%
</p> </p>
</div> </div>
</div> </div>
@ -717,8 +726,8 @@
</div> </div>
<div class="box column"> <div class="box column">
<canvas id="cpu24h" width="1000" height="600" style="width: 95%;"></canvas> <canvas id="cpu24h" width="1000" height="600" style="width: 95%;"></canvas>
<p>If Graph displays '-1' usage is not available for this platform.</p>
</div> </div>
<p>If CPU Graph displays '-1' CPU usage is not available for this platform.</p>
</div> </div>
</div> </div>
<div class="tab"> <div class="tab">
@ -855,8 +864,8 @@
var x = document.getElementById("main"); var x = document.getElementById("main");
x.style.transform = "translate3d(0px,0px,0)"; x.style.transform = "translate3d(0px,0px,0)";
x.style.width = "" + navButtons.length * 100 + "%"; x.style.width = "" + navButtons.length * 100 + "%";
for (var i = 0; i < navButtons.length; i++) { for (i = 0; i < navButtons.length; i++) {
navButtons[i].onclick = openFunc(i); navButtons[i].onclick = openFunc(i)
tabs[i].style.width = "" + 100 / navButtons.length + "%"; tabs[i].style.width = "" + 100 / navButtons.length + "%";
} }
x.style.opacity = "1"; x.style.opacity = "1";
@ -914,6 +923,7 @@
setTimeout('countUpTimer()', 1000); setTimeout('countUpTimer()', 1000);
} }
</script> </script>
<script src="https://www.kryogenix.org/code/browser/sorttable/sorttable.js"></script> <script src="https://www.kryogenix.org/code/browser/sorttable/sorttable.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.bundle.js"></script> <script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.5.0/Chart.bundle.js"></script>
@ -946,7 +956,29 @@
pointRadius: 1, pointRadius: 1,
pointHitRadius: 10, pointHitRadius: 10,
spanGaps: false, spanGaps: false,
data: %datascatterday% , 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 = { var dataweek = {
@ -972,6 +1004,28 @@
pointHitRadius: 10, pointHitRadius: 10,
spanGaps: false, spanGaps: false,
data: %datascatterweek% , 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 = { var datamonth = {
@ -997,6 +1051,28 @@
pointHitRadius: 10, pointHitRadius: 10,
spanGaps: false, spanGaps: false,
data: %datascattermonth% , 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, { var playersChartDay = new Chart(ctxday, {
@ -1112,6 +1188,7 @@
} }
}); });
</script> </script>
<script> <script>
// TPS Graph 7d // TPS Graph 7d
@ -1210,6 +1287,7 @@
} }
}); });
</script> </script>
<script> <script>
// TPS Graph 24h // TPS Graph 24h
@ -1308,6 +1386,7 @@
} }
}); });
</script> </script>
<script> <script>
// CPU Graph 24h // CPU Graph 24h
@ -1316,6 +1395,7 @@
datasets: [ datasets: [
{ {
label: "CPU Usage", label: "CPU Usage",
yAxisID: 'A',
fill: false, fill: false,
lineTension: 0.1, lineTension: 0.1,
borderColor: "#e0d264", borderColor: "#e0d264",
@ -1334,6 +1414,27 @@
pointHitRadius: 10, pointHitRadius: 10,
spanGaps: false, spanGaps: false,
data: %cpuscatterday% data: %cpuscatterday%
}, {
label: "Memory Usage",
yAxisID: 'B',
fill: false,
lineTension: 0.1,
borderColor: "#7dcc24",
borderCapStyle: 'butt',
borderDash: [],
borderDashOffset: 0.0,
borderJoinStyle: 'miter',
pointBorderColor: "#7dcc24",
pointBackgroundColor: "#7dcc24",
pointBorderWidth: 1,
pointHoverRadius: 5,
pointHoverBackgroundColor: "#7dcc24",
pointHoverBorderColor: "#8fabc6",
pointHoverBorderWidth: 2,
pointRadius: 1,
pointHitRadius: 10,
spanGaps: false,
data: %ramscatterday%
}] }]
}; };
var cpuChart = new Chart(ctxcpu, { var cpuChart = new Chart(ctxcpu, {
@ -1352,6 +1453,7 @@
}, },
scales: { scales: {
yAxes: [{ yAxes: [{
id: 'A',
type: 'linear', type: 'linear',
position: 'left', position: 'left',
ticks: { ticks: {
@ -1360,7 +1462,19 @@
}, },
scaleLabel: { scaleLabel: {
display: true, display: true,
labelString: 'CPU Usage' labelString: 'CPU Usage (%)'
}
}, {
id: 'B',
type: 'linear',
position: 'right',
ticks: {
suggestedMax: %maxram%,
suggestedMin: 0
},
scaleLabel: {
display: true,
labelString: 'Memory Usage (Mt)'
} }
}], }],
xAxes: [{ xAxes: [{
@ -1371,6 +1485,7 @@
} }
}); });
</script> </script>
<script> <script>
// CPU Graph 7d // CPU Graph 7d
@ -1379,6 +1494,7 @@
datasets: [ datasets: [
{ {
label: "CPU Usage", label: "CPU Usage",
yAxisID: 'A',
fill: false, fill: false,
lineTension: 0.1, lineTension: 0.1,
borderColor: "#e0d264", borderColor: "#e0d264",
@ -1397,6 +1513,27 @@
pointHitRadius: 10, pointHitRadius: 10,
spanGaps: false, spanGaps: false,
data: %cpuscatterweek% data: %cpuscatterweek%
}, {
label: "Memory Usage",
yAxisID: 'B',
fill: false,
lineTension: 0.1,
borderColor: "#7dcc24",
borderCapStyle: 'butt',
borderDash: [],
borderDashOffset: 0.0,
borderJoinStyle: 'miter',
pointBorderColor: "#7dcc24",
pointBackgroundColor: "#7dcc24",
pointBorderWidth: 1,
pointHoverRadius: 5,
pointHoverBackgroundColor: "#7dcc24",
pointHoverBorderColor: "#8fabc6",
pointHoverBorderWidth: 2,
pointRadius: 1,
pointHitRadius: 10,
spanGaps: false,
data: %ramscatterday%
}] }]
}; };
var cpuChart = new Chart(ctxcpu, { var cpuChart = new Chart(ctxcpu, {
@ -1415,6 +1552,7 @@
}, },
scales: { scales: {
yAxes: [{ yAxes: [{
id: 'A',
type: 'linear', type: 'linear',
position: 'left', position: 'left',
ticks: { ticks: {
@ -1423,7 +1561,19 @@
}, },
scaleLabel: { scaleLabel: {
display: true, display: true,
labelString: 'CPU Usage' labelString: 'CPU Usage (%)'
}
}, {
id: 'B',
type: 'linear',
position: 'right',
ticks: {
suggestedMax: %maxram%,
suggestedMin: 0
},
scaleLabel: {
display: true,
labelString: 'Memory Usage (Mt)'
} }
}], }],
xAxes: [{ xAxes: [{
@ -1433,6 +1583,7 @@
} }
} }
}); });
</script> </script>
<script> <script>
// ActivityPie Graph // ActivityPie Graph
@ -1460,6 +1611,7 @@
} }
}); });
</script> </script>
<script> <script>
// GMPie Graph // GMPie Graph
@ -1487,6 +1639,7 @@
} }
}); });
</script> </script>
<script> <script>
// Session start puchcard bubblechart // Session start puchcard bubblechart
@ -1568,6 +1721,7 @@
} }
}); });
</script> </script>
<script> <script>
// Session length distribution barchart // Session length distribution barchart
@ -1620,6 +1774,7 @@
} }
}); });
</script> </script>
<script> <script>
// Geolocation map // Geolocation map
@ -1652,8 +1807,8 @@
var layout = { var layout = {
title: '', title: '',
autosize: false, autosize: false,
height: 1000, width: window.innerWidth*0.7,
width: 1500, height: window.innerHeight*0.7,
geo:{ geo:{
showframe: false, showframe: false,
showcoastlines: false, showcoastlines: false,
@ -1663,7 +1818,6 @@
} }
}; };
Plotly.plot(CLOROPLETH, data, layout, {showLink: false}); Plotly.plot(CLOROPLETH, data, layout, {showLink: false});
</script> </script>
</div> </div>
</body> </body>

4
Plan/src/main/resources/player.html
View File

@ -582,8 +582,8 @@
x.style.transform = "translate3d(0px,0px,0)"; x.style.transform = "translate3d(0px,0px,0)";
x.style.width = ""+navButtons.length*100+"%"; x.style.width = ""+navButtons.length*100+"%";
for (var i = 0; i < navButtons.length; i++) { for (i=0; i < navButtons.length; i++) {
navButtons[i].onclick = openFunc(i); navButtons[i].onclick = openFunc(i)
tabs[i].style.width = ""+100/navButtons.length+"%"; tabs[i].style.width = ""+100/navButtons.length+"%";
} }
x.style.opacity = "1"; x.style.opacity = "1";