Stats: Add start date filter
This commit is contained in:
nikolark committed
1 parent
36cce15c06
commit
c76b4594d8
3 files changed
+171
-152
No files matched your search
+38
-152
@@ -1,5 +1,9 @@
|
||||
<?php
|
||||
|
||||
$semester_start = date_create('first day of august');
|
||||
if($semester_start > date_create()) {
|
||||
$semester_start = date_modify($semester_start, '-1 year');
|
||||
}
|
||||
$start = isset($_GET['start']) ? date_create($_GET['start']) : $semester_start;
|
||||
?>
|
||||
<!DOCTYPE html>
|
||||
<html>
|
||||
@@ -7,163 +11,45 @@
|
||||
<meta charset="utf-8">
|
||||
<title>Medlemsstatistikk - Det Norske Studentersamfund</title>
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1">
|
||||
<link rel="stylesheet" type="text/css" media="all" href="../snapporder/css/style.css" />
|
||||
|
||||
<script src="https://code.jquery.com/jquery-2.1.4.js"></script>
|
||||
<script src="https://code.highcharts.com/highcharts.src.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.js"></script>
|
||||
<script>
|
||||
var barSales;
|
||||
var appSales;
|
||||
var smsSales;
|
||||
var salesChart;
|
||||
var salesChartToday;
|
||||
|
||||
var urls = {
|
||||
cards: 'https://kassa.neuf.no/stats/card-sales/',
|
||||
tekstmelding: 'https://tekstmelding.neuf.no/stats/memberships/',
|
||||
snapporder: '/stats/snapporder.php'
|
||||
};
|
||||
|
||||
function sumSales(memo, num) {
|
||||
return memo + num.sales;
|
||||
}
|
||||
|
||||
function toHighchartsSeries(memberships) {
|
||||
return _.map(memberships, function (el) {
|
||||
return [moment.utc(el.date).valueOf(), el.sales]
|
||||
});
|
||||
}
|
||||
|
||||
function getBarSales() {
|
||||
return $.getJSON(urls.cards, function(data) {
|
||||
barSales = data.memberships;
|
||||
salesChart.addSeries({name: 'Bar-salg', data: toHighchartsSeries(barSales)});
|
||||
});
|
||||
}
|
||||
|
||||
function getSmsSales() {
|
||||
return $.getJSON(urls.tekstmelding, function(data) {
|
||||
smsSales = data.memberships;
|
||||
salesChart.addSeries({name: 'SMS-salg', data: toHighchartsSeries(smsSales)});
|
||||
});
|
||||
}
|
||||
|
||||
function getAppSales() {
|
||||
return $.getJSON(urls.snapporder, function (data) {
|
||||
appSales = data.memberships;
|
||||
salesChart.addSeries({name: 'App-salg', data: toHighchartsSeries(appSales)});
|
||||
});
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
Highcharts.setOptions({
|
||||
credits: {enabled: false}
|
||||
});
|
||||
salesChart = new Highcharts.Chart({
|
||||
chart: {
|
||||
renderTo: 'sales-chart'
|
||||
},
|
||||
title: {
|
||||
text: false
|
||||
},
|
||||
xAxis: {
|
||||
type: "datetime"
|
||||
},
|
||||
yAxis: {
|
||||
title: {
|
||||
text: "Salg"
|
||||
},
|
||||
min: 0
|
||||
},
|
||||
plotOptions: {
|
||||
series: {
|
||||
marker: {
|
||||
radius: 4
|
||||
}
|
||||
}
|
||||
},
|
||||
series: []
|
||||
});
|
||||
$.when(getSmsSales(), getAppSales(), getBarSales()).done(function() {
|
||||
/* Totals */
|
||||
var barTotal = _.reduce(barSales, sumSales, 0);
|
||||
$('.bar').html(barTotal);
|
||||
var smsTotal = _.reduce(smsSales, sumSales, 0);
|
||||
$('.sms').html(smsTotal);
|
||||
var appTotal = _.reduce(appSales, sumSales, 0);
|
||||
$('.app').html(appTotal);
|
||||
|
||||
$('.sum').html(barTotal + smsTotal + appTotal);
|
||||
|
||||
/* Today */
|
||||
var today = moment.utc().format('YYYY-MM-DD');
|
||||
$('.today-date-wrap').text(today);
|
||||
var todayBarSales = _.findWhere(barSales, {date:today}) || {sales: 0};
|
||||
$('.bar-today').html(todayBarSales.sales);
|
||||
var todaySmsSales = _.findWhere(smsSales, {date:today}) || {sales: 0};
|
||||
$('.sms-today').html(todaySmsSales.sales);
|
||||
var todayAppSales = _.findWhere(appSales, {date:today}) || {sales: 0};
|
||||
$('.app-today').html(todayAppSales.sales);
|
||||
|
||||
$('.sum-today').html(todayBarSales.sales + todaySmsSales.sales + todayAppSales.sales);
|
||||
|
||||
salesChartToday = new Highcharts.Chart({
|
||||
chart: {
|
||||
renderTo: 'sales-chart-today',
|
||||
plotBackgroundColor: null,
|
||||
plotBorderWidth: null,
|
||||
plotShadow: false,
|
||||
type: 'pie'
|
||||
},
|
||||
title: {
|
||||
text: false
|
||||
},
|
||||
series: [{
|
||||
name: 'Salg', data: [
|
||||
{name: 'Bar-salg', y: todayBarSales.sales},
|
||||
{name: 'SMS-salg', y: todaySmsSales.sales},
|
||||
{name: 'App-salg', y: todayAppSales.sales}
|
||||
]}
|
||||
]
|
||||
});
|
||||
});
|
||||
});
|
||||
</script>
|
||||
<style>
|
||||
.big-number {
|
||||
font-weight: bold;
|
||||
font-size: 1.5em;
|
||||
}
|
||||
</style>
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap-theme.min.css" integrity="sha384-rHyoN1iRsVXV4nD0JutlnGaslCJuC7uwjduW9SVrLvRYooPp2bWYgmgJQIXwl/Sp" crossorigin="anonymous">
|
||||
<link rel="stylesheet" href="stats.css">
|
||||
</head>
|
||||
<body>
|
||||
<div class="container">
|
||||
<h2>Salg per dag</h2>
|
||||
<em>Fra 1. august 2015</em>
|
||||
<div id="sales-chart"></div>
|
||||
<h2>Salg totalt</h2>
|
||||
<div id="sums">
|
||||
<div>SMS: <span class="sms big-number"></span></div>
|
||||
<div>App: <span class="app big-number"></span></div>
|
||||
<div>Bar: <span class="bar big-number"></span></div>
|
||||
<div>Totalt: <span class="sum big-number"></span></div>
|
||||
<div class="row">
|
||||
<div class="col-xs-12 col-md-6"></div>
|
||||
<h2>Salg per dag</h2>
|
||||
<label for="start">Fra</label> <input id="start" name="start" type="date" value="<?php echo date_format($start, 'Y-m-d'); ?>" />
|
||||
<div id="sales-chart"></div>
|
||||
<h2>Salg totalt</h2>
|
||||
<div id="sums">
|
||||
<div>SMS: <span class="sms big-number"></span></div>
|
||||
<div>App: <span class="app big-number"></span></div>
|
||||
<div>Bar: <span class="bar big-number"></span></div>
|
||||
<div>Totalt: <span class="sum big-number"></span></div>
|
||||
</div>
|
||||
<h2>Salg idag</h2>
|
||||
<em>Dato: <span class="today-date-wrap"></span></em>
|
||||
<div id="sales-chart-today" style="min-width: 310px; height: 400px; max-width: 600px;"></div>
|
||||
<div id="sums">
|
||||
<div>SMS: <span class="sms-today big-number"></span></div>
|
||||
<div>App: <span class="app-today big-number"></span></div>
|
||||
<div>Bar: <span class="bar-today big-number"></span></div>
|
||||
<div>Totalt: <span class="sum-today big-number"></span></div>
|
||||
</div>
|
||||
<div class="disclaimer"><br><br><br><em>Disse tallene kan avvike fra faktiske salgtall.</em></div>
|
||||
</div>
|
||||
</div>
|
||||
<h2>Salg idag</h2>
|
||||
<em>Dato: <span class="today-date-wrap"></span></em>
|
||||
<div id="sales-chart-today" style="min-width: 310px; height: 400px; max-width: 600px;"></div>
|
||||
<div id="sums">
|
||||
<div>SMS: <span class="sms-today big-number"></span></div>
|
||||
<div>App: <span class="app-today big-number"></span></div>
|
||||
<div>Bar: <span class="bar-today big-number"></span></div>
|
||||
<div>Totalt: <span class="sum-today big-number"></span></div>
|
||||
</div>
|
||||
<!--<div class="credits-wrap">
|
||||
<div class="credits">Laget med <span class="love" title="kærlighed">♥</span> av <a href="http://kak.studentersamfundet.no/" title="Kommunikasjonsavdelingen">KAK</a></div>
|
||||
</div>-->
|
||||
<div class="disclaimer"><br><br><br><em>Disse tallene kan avvike fra faktiske salgtall.</em></div>
|
||||
</div>
|
||||
|
||||
<script src="https://code.jquery.com/jquery-2.1.4.js"></script>
|
||||
<script src="https://code.highcharts.com/highcharts.src.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/underscore.js/1.8.3/underscore.js"></script>
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.10.6/moment.js"></script>
|
||||
<script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
|
||||
<script src="stats.js"></script>
|
||||
|
||||
</body>
|
||||
</html>
|
||||
@@ -0,0 +1,4 @@
|
||||
.big-number {
|
||||
font-weight: bold;
|
||||
font-size: 1.5em;
|
||||
}
|
||||
+129
@@ -0,0 +1,129 @@
|
||||
var barSales;
|
||||
var appSales;
|
||||
var smsSales;
|
||||
var salesChart;
|
||||
var salesChartToday;
|
||||
|
||||
var urls = {
|
||||
cards: 'https://kassa.neuf.no/stats/card-sales/',
|
||||
tekstmelding: 'https://tekstmelding.neuf.no/stats/memberships/',
|
||||
snapporder: '/stats/snapporder.php'
|
||||
};
|
||||
|
||||
function sumSales(memo, num) {
|
||||
return memo + num.sales;
|
||||
}
|
||||
|
||||
function toHighchartsSeries(memberships) {
|
||||
return _.map(memberships, function (el) {
|
||||
return [moment.utc(el.date).valueOf(), el.sales]
|
||||
});
|
||||
}
|
||||
|
||||
function getBarSales(start) {
|
||||
return $.getJSON(urls.cards + '?start=' + start, function(data) {
|
||||
barSales = data.memberships;
|
||||
salesChart.addSeries({name: 'Bar-salg', data: toHighchartsSeries(barSales)});
|
||||
});
|
||||
}
|
||||
|
||||
function getSmsSales(start) {
|
||||
return $.getJSON(urls.tekstmelding + '?start=' + start, function(data) {
|
||||
smsSales = data.memberships;
|
||||
salesChart.addSeries({name: 'SMS-salg', data: toHighchartsSeries(smsSales)});
|
||||
});
|
||||
}
|
||||
|
||||
function getAppSales(start) {
|
||||
return $.getJSON(urls.snapporder + '?start=' + start, function (data) {
|
||||
appSales = data.memberships;
|
||||
salesChart.addSeries({name: 'App-salg', data: toHighchartsSeries(appSales)});
|
||||
});
|
||||
}
|
||||
|
||||
function recalc(start) {
|
||||
salesChart = new Highcharts.Chart({
|
||||
chart: {
|
||||
renderTo: 'sales-chart'
|
||||
},
|
||||
title: {
|
||||
text: false
|
||||
},
|
||||
xAxis: {
|
||||
type: "datetime"
|
||||
},
|
||||
yAxis: {
|
||||
title: {
|
||||
text: "Salg"
|
||||
},
|
||||
min: 0
|
||||
},
|
||||
plotOptions: {
|
||||
series: {
|
||||
marker: {
|
||||
radius: 4
|
||||
}
|
||||
}
|
||||
},
|
||||
series: []
|
||||
});
|
||||
|
||||
$.when(getSmsSales(start), getAppSales(start), getBarSales(start)).done(function() {
|
||||
/* Totals */
|
||||
var barTotal = _.reduce(barSales, sumSales, 0);
|
||||
$('.bar').html(barTotal);
|
||||
var smsTotal = _.reduce(smsSales, sumSales, 0);
|
||||
$('.sms').html(smsTotal);
|
||||
var appTotal = _.reduce(appSales, sumSales, 0);
|
||||
$('.app').html(appTotal);
|
||||
|
||||
$('.sum').html(barTotal + smsTotal + appTotal);
|
||||
|
||||
/* Today */
|
||||
var today = moment.utc().format('YYYY-MM-DD');
|
||||
$('.today-date-wrap').text(today);
|
||||
var todayBarSales = _.findWhere(barSales, {date:today}) || {sales: 0};
|
||||
$('.bar-today').html(todayBarSales.sales);
|
||||
var todaySmsSales = _.findWhere(smsSales, {date:today}) || {sales: 0};
|
||||
$('.sms-today').html(todaySmsSales.sales);
|
||||
var todayAppSales = _.findWhere(appSales, {date:today}) || {sales: 0};
|
||||
$('.app-today').html(todayAppSales.sales);
|
||||
|
||||
$('.sum-today').html(todayBarSales.sales + todaySmsSales.sales + todayAppSales.sales);
|
||||
|
||||
salesChartToday = new Highcharts.Chart({
|
||||
chart: {
|
||||
renderTo: 'sales-chart-today',
|
||||
plotBackgroundColor: null,
|
||||
plotBorderWidth: null,
|
||||
plotShadow: false,
|
||||
type: 'pie'
|
||||
},
|
||||
title: {
|
||||
text: false
|
||||
},
|
||||
series: [{
|
||||
name: 'Salg', data: [
|
||||
{name: 'Bar-salg', y: todayBarSales.sales},
|
||||
{name: 'SMS-salg', y: todaySmsSales.sales},
|
||||
{name: 'App-salg', y: todayAppSales.sales}
|
||||
]}
|
||||
]
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
$(document).ready(function() {
|
||||
Highcharts.setOptions({
|
||||
credits: {enabled: false}
|
||||
});
|
||||
|
||||
var $startInput = $('#start');
|
||||
var start = $startInput.val();
|
||||
recalc(start);
|
||||
|
||||
$startInput.on('input', function(e) {
|
||||
start = $(e.target).val();
|
||||
recalc(start);
|
||||
})
|
||||
});
|
||||
Reference in new issue
Block a user