Skip to content

Commit

Permalink
statistika done
Browse files Browse the repository at this point in the history
  • Loading branch information
ktali committed Oct 14, 2018
1 parent 6e7ea61 commit e59647a
Show file tree
Hide file tree
Showing 6 changed files with 195 additions and 13 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public List<Object> getTopOSs() {

public List<Integer> getTrafficByHour() {
List<Integer> trafficList = new ArrayList<>();
for (int i = 0; i < 23; i++) {
for (int i = 0; i < 24; i++) {
trafficList.add(statisticRepository.getRequestsByHour(i));
}
return trafficList;
Expand Down
135 changes: 135 additions & 0 deletions src/main/resources/static/js/statistics.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,135 @@
var browserData;
var osData;
var trafficData;


$(document).ready(function () {

$.ajaxSetup({
headers: {
'X-CSRF-TOKEN': $('meta[name="_csrf"]').attr('content')
}
});

function getBrowsers() {
return $.get('/statistics/browsers')
.done(function (data) {
browserData = data;
});
}

function getOSs() {
return $.get('/statistics/os')
.done(function (data) {
osData = data;
});
}

function getTraffic() {
return $.get('/statistics/traffic')
.done(function (data) {
trafficData = data;
});
}


$.when(getBrowsers()).then(function () {
var dataLabels = [];
var dataData = [];
for (var i = 0; i < browserData.length; i++) {
dataLabels.push(browserData[i][0]);
dataData.push(browserData[i][1])
}

var ctx = document.getElementById("browserChart").getContext('2d');
var browserPieChart = new Chart(ctx, {
type: 'pie',
data: {
labels: dataLabels,
datasets: [{
label: '# of Requests',
data: dataData,
backgroundColor: [
'rgba(255, 99, 132, 0.2)',
'rgba(54, 162, 235, 0.2)',
'rgba(255, 206, 86, 0.2)',
'rgba(75, 192, 192, 0.2)',
'rgba(153, 102, 255, 0.2)',
'rgba(255, 159, 64, 0.2)'
],
borderColor: [
'rgba(255,99,132,1)',
'rgba(54, 162, 235, 1)',
'rgba(255, 206, 86, 1)',
'rgba(75, 192, 192, 1)',
'rgba(153, 102, 255, 1)',
'rgba(255, 159, 64, 1)'
],
borderWidth: 1
}]
},
options: {}
});
});

$.when(getOSs()).then(function () {
var dataLabels = [];
var dataData = [];
for (var i = 0; i < osData.length; i++) {
dataLabels.push(osData[i][0]);
dataData.push(osData[i][1])
}

var ctx = document.getElementById("osChart").getContext('2d');
var osPieChart = new Chart(ctx, {
type: 'pie',
data: {
labels: dataLabels,
datasets: [{
label: '# of Requests',
data: dataData,
backgroundColor: [
'rgba(255, 99, 132, 0.2)',
'rgba(54, 162, 235, 0.2)',
'rgba(255, 206, 86, 0.2)',
'rgba(75, 192, 192, 0.2)',
'rgba(153, 102, 255, 0.2)',
'rgba(255, 159, 64, 0.2)'
],
borderColor: [
'rgba(255,99,132,1)',
'rgba(54, 162, 235, 1)',
'rgba(255, 206, 86, 1)',
'rgba(75, 192, 192, 1)',
'rgba(153, 102, 255, 1)',
'rgba(255, 159, 64, 1)'
],
borderWidth: 1
}]
},
options: {}
});
});

$.when(getTraffic()).then(function () {
var dataLabels = ['00', '01', '02', '03', '04',
'05', '06', '07', '08', '09',
'10', '11', '12', '13', '14',
'15', '16', '17', '18', '19',
'20', '21', '22', '23']
var ctx = document.getElementById("trafficChart").getContext('2d');
var trafficLineChart = new Chart(ctx, {
type: 'line',
data: {
labels: dataLabels,
datasets: [{
label: '# of Requests per hour',
data: trafficData,
borderColor: 'rgba(255, 159, 64, 1)',
borderWidth: 2
}]
},
options: {}
});
});
});
1 change: 0 additions & 1 deletion src/main/resources/templates/fragments/head.html
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,5 @@
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/4.0.0/js/bootstrap.min.js"
integrity="sha384-JZR6Spejh4U02d8jOt6vLEHfe/JQGiRRSQQxSfFWpi1MquVdAyjUar5+76PVCmYl"
crossorigin="anonymous"></script>
<script src="/js/index.js"></script>
<link rel="stylesheet" type="text/css" href="/css/navbar.css"/>
</html>
19 changes: 14 additions & 5 deletions src/main/resources/templates/map.html
Original file line number Diff line number Diff line change
Expand Up @@ -2,19 +2,28 @@
<html xmlns:th="http://www.thymeleaf.org"
lang="en">
<head>
<th:block th:include="fragments/head" />
<th:block th:include="fragments/head"/>
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="/css/index.css"/>
<script src="/js/index.js"></script>
</head>
<body>
<th:block th:include="fragments/navbar" />
<th:block th:include="fragments/footer" />
<th:block th:include="fragments/navbar"/>
<th:block th:include="fragments/footer"/>

<p><iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2202.8977752787514!2d26.
<div class="container">
<div class="row">
<div class="col-sm">
<p>
<iframe src="https://www.google.com/maps/embed?pb=!1m18!1m12!1m3!1d2202.8977752787514!2d26.
713396479564956!3d58.378099306628954!2m3!1f0!2f0!3f0!3m2!1i1024!2i768!4f13.1!3m3!1m2!1s0x46eb36e1900
bfbf1%3A0x5a26b1670e99e751!2sJuhan+Liivi+2%2C+50409+Tartu!5e0!3m2!1sen!2see!
4v1539369565632" width="600" height="450" frameborder="0" style="border:0" allowfullscreen></iframe></p>
4v1539369565632" width="600" height="450" frameborder="0" style="border:0" allowfullscreen></iframe>
</p>
</div>
</div>
</div>


</body>
</html>
32 changes: 32 additions & 0 deletions src/main/resources/templates/statistics.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
<!DOCTYPE HTML>
<html lang="en" xmlns:th="http://www.thymeleaf.org"> <!-- xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" -->
<head>
<th:block th:include="fragments/head" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
<link rel="stylesheet" type="text/css" href="/css/index.css"/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/Chart.js/2.7.2/Chart.bundle.min.js"
integrity="sha256-XF29CBwU1MWLaGEnsELogU6Y6rcc5nCkhhx89nFMIDQ="
crossorigin="anonymous"></script>
<script src="js/statistics.js"></script>
</head>

<body>
<th:block th:include="fragments/navbar" />
<th:block th:include="fragments/footer" />

<div class="container">
<div class="row">
<div class="col-sm">
<canvas id="browserChart" width="400" height="400"></canvas>
</div>
<div class="col-sm">
<canvas id="osChart" width="400" height="400"></canvas>
</div>
<div class="col-sm">
<canvas id="trafficChart" width="400" height="100"></canvas>
</div>
</div>
</div>

</body>
</html>
19 changes: 13 additions & 6 deletions src/main/resources/templates/upload.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,18 @@
<body>
<th:block th:include="fragments/navbar" />
<th:block th:include="fragments/footer" />
<form enctype="multipart/form-data" th:action="@{/upload}" th:method="POST">
<input id="image-file" type="file" name="file" />
<button type="submit"
class="btn btn-primary btn-lg">Upload
</button>
</form>
<div class="container">
<div class="row">
<div class="col-sm">
<form enctype="multipart/form-data" th:action="@{/upload}" th:method="POST">
<input id="image-file" type="file" name="file" />
<button type="submit"
class="btn btn-primary btn-lg">Upload
</button>
</form>
</div>
</div>
</div>

</body>
</html>

0 comments on commit e59647a

Please sign in to comment.