diff --git a/js/simpleads.charts.js b/js/simpleads.charts.js index 6d963da..77f5ac2 100644 --- a/js/simpleads.charts.js +++ b/js/simpleads.charts.js @@ -43,7 +43,7 @@ chartConfig.data.datasets = []; var aggregated = []; for (var i = 0; i < data.length; i++) { - var sDate = data[i].month + ' ' + data[i].year; + var sDate = data[i].year + ' ' + data[i].month; if (chartConfig.data.labels.indexOf(sDate) === -1) { chartConfig.data.labels.push(sDate); } @@ -71,7 +71,7 @@ var aggregated = []; for (var i = 0; i < data.length; i++) { var sDate = data[i].date; - if (limit > i) { + if (i > data.length-limit-1) { chartConfig.data.labels.push(sDate); } aggregated[sDate] = []; @@ -118,6 +118,7 @@ }; SimpleAdsCharts.prototype.table = function(element, data) { + data.reverse(); var arrayData = []; var arrayCsvData = []; var arrayTitles = [ diff --git a/src/SimpleAdsStats.php b/src/SimpleAdsStats.php index 8989075..e7ba6b0 100644 --- a/src/SimpleAdsStats.php +++ b/src/SimpleAdsStats.php @@ -126,15 +126,6 @@ class SimpleAdsStats { public function loadData() { $stats = []; if ($entity_id = $this->getEntityId()) { - // Todays stats. - if ($today_stats = $this->loadTodayData()) { - $date = \DateTime::createFromFormat('YMd', date('YMd')); - $today_stats['month'] = $date->format('F'); - $today_stats['day'] = $date->format('d'); - $today_stats['year'] = $date->format('Y'); - $today_stats['weekday'] = $date->format('w'); - $stats[] = $today_stats; - } $result = $this->connection->query('SELECT DATE_FORMAT(FROM_UNIXTIME(timestamp), \'%M\') AS "month", DATE_FORMAT(FROM_UNIXTIME(timestamp), \'%d\') AS "day", @@ -151,7 +142,7 @@ class SimpleAdsStats { $date = \DateTime::createFromFormat('YMd', $row->year . $row->month . $row->day); $stats[] = [ 'date' => $date->format($this->getDateTimeFormat()), - 'month' => $this->t('@month', ['@month' => $date->format('F')]), + 'month' => $this->t($date->format('F')), 'day' => $date->format('d'), 'year' => $date->format('Y'), 'weekday' => $date->format('w'), @@ -162,6 +153,15 @@ class SimpleAdsStats { 'ctr' => number_format($row->clicks_unique / $row->impressions_unique, 4, '.', '') ]; } + // Todays stats. + if ($today_stats = $this->loadTodayData()) { + $date = \DateTime::createFromFormat('YMd', date('YMd')); + $today_stats['month'] = t($date->format('F')); + $today_stats['day'] = $date->format('d'); + $today_stats['year'] = $date->format('Y'); + $today_stats['weekday'] = $date->format('w'); + $stats[] = $today_stats; + } } return $stats; }