diff options
Diffstat (limited to 'resources/views/stats.blade.php')
| -rw-r--r-- | resources/views/stats.blade.php | 106 |
1 files changed, 79 insertions, 27 deletions
diff --git a/resources/views/stats.blade.php b/resources/views/stats.blade.php index 04fabfe..27010fd 100644 --- a/resources/views/stats.blade.php +++ b/resources/views/stats.blade.php @@ -7,19 +7,52 @@ $db_stats = RandomLog ->orderBy('created_at') ->get(); -$stats = []; +$stats['requests'] = []; +$last_date = null; foreach ($db_stats as $stat) { - $stats[] = "[Date.UTC" . date("(Y,n-1,j)", strtotime($stat->created_at)) . "," . $stat->count . "]"; + $date = strtotime($stat->created_at); + while ($last_date != null && $last_date + 86400 < $date) { + $last_date += 86400; + $stats['requests'][] = "[Date.UTC" . date("(Y,n-1,j)", $last_date) . ",0]"; + } + $stats['requests'][] = "[Date.UTC" . date("(Y,n-1,j)", $date) . "," . $stat->count . "]"; + $last_date = $date; } -$stats = "[" . implode(",", $stats) . "]"; +$stats['requests'] = "[" . implode(",", $stats['requests']) . "]"; + +$db_stats = RandomLog + ::select(DB::raw('COUNT(DISTINCT `ip`) as count'), 'created_at') + ->groupBy(DB::raw('DATE(created_at)')) + ->orderBy('created_at') + ->get(); + +$stats['unique-ips'] = []; +$last_date = null; +foreach ($db_stats as $stat) { + $date = strtotime($stat->created_at); + while ($last_date != null && $last_date + 86400 < $date) { + $last_date += 86400; + $stats['unique-ips'][] = "[Date.UTC" . date("(Y,n-1,j)", $last_date) . ",0]"; + } + $stats['unique-ips'][] = "[Date.UTC" . date("(Y,n-1,j)", $date) . "," . $stat->count . "]"; + $last_date = $date; +} +$stats['unique-ips'] = "[" . implode(",", $stats['unique-ips']) . "]"; ?> @extends('layouts.master') @section('master-content') <div class="row"> - <div class="col-md-12"> - <div id="statistics" style="height:400px;"></div> + <div class="col-lg-12"> + <div class="panel panel-default"> + <div class="panel-heading"> + <h3 class="panel-title">Random verb requests</h3> + </div> + <div class="panel-body"> + <div id="random-requests" style="height:400px;"></div> + </div> + </div> </div> </div> @@ -29,19 +62,24 @@ $stats = "[" . implode(",", $stats) . "]"; <script src="{{ url("/public/js/hebrewparsetrainer.js") }}"></script> <script type="text/javascript"> - $('#statistics').highcharts('StockChart', { + $('#random-requests').highcharts('StockChart', { chart: { type: 'column', zoomType: 'x' }, credits: { enabled: false }, - title: { text: 'Random verb requests' }, xAxis: { ordinal: false }, - yAxis: { - min: 0, - title: { text: 'Requests' }, - opposite: false - }, + yAxis: [ + { + min: 0, + title: { text: 'Requests' }, + opposite: false + }, { + min: 0, + title: { text: 'Unique visitors' }, + opposite: true + } + ], rangeSelector: { buttons: [ {type: 'week', count: 1, text: '1w'}, @@ -52,25 +90,39 @@ $stats = "[" . implode(",", $stats) . "]"; ], selected: 3 }, - plotOptions: { column: { - dataGrouping: { - groupPixelWidth: 100, - units: [ - ['day', [1]], - ['week', [1]], - ['month', [1]], - ['month', [3]], - ['year', [1]] - ] + plotOptions: { + column: { + dataGrouping: { + groupPixelWidth: 80, + units: [ + ['day', [1]], + ['week', [1]], + ['month', [1]], + ['month', [3]], + ['year', [1]] + ] + }, + pointPadding: 0.02, + groupPadding: 0.02 }, - pointPadding: 0.02, - groupPadding: 0.02 - } }, - tooltip: { pointFormat: '<b>{point.y}</b> requests' }, + series: { + dataGrouping: { + approximation: 'sum' + } + } + }, + tooltip: { pointFormat: '<b>{point.y}</b> requests<br>' }, series: [ { name: 'Requests', - data: {{ $stats }} + data: {{ $stats['requests'] }} + }, + { + type: 'spline', + yAxis: 1, + name: 'Unique visitors', + data: {{ $stats['unique-ips'] }}, + tooltip: { pointFormat: '<b>{point.y}</b> unique visitors' }, } ] }); |