diff --git a/client/src/app-components/stats.js b/client/src/app-components/stats.js index a93e67dd..4402a29e 100644 --- a/client/src/app-components/stats.js +++ b/client/src/app-components/stats.js @@ -134,10 +134,10 @@ class Stats extends React.Component { API.call({ path: '/system/get-stats', data: this.getApiCallData(periodName) - }).then(this.onRetrieveSuccess.bind(this, period)); + }).then(this.onRetrieveSuccess.bind(this)); } - onRetrieveSuccess(period, result) { + onRetrieveSuccess(result) { let newStats = this.getDefaultStats(); let newStrokes = this.getStrokes().map((name) => { @@ -149,7 +149,7 @@ class Stats extends React.Component { let realPeriod = result.data.length / this.getStrokes().length; - result.data.map((item) => { + result.data.reverse().map((item) => { newStats[item.type] += item.value * 1; newStrokes[ ID[item.type] ].values.push({ diff --git a/server/controllers/system/get-stats.php b/server/controllers/system/get-stats.php index 7f19a87a..20f47c5f 100644 --- a/server/controllers/system/get-stats.php +++ b/server/controllers/system/get-stats.php @@ -123,16 +123,16 @@ class GetStatsController extends Controller { $daysToRetrieve = 0; switch ($period) { - case 'week': + case 'WEEK': $daysToRetrieve = 7; break; - case 'month': + case 'MONTH': $daysToRetrieve = 30; break; - case 'quarter': + case 'QUARTER': $daysToRetrieve = 90; break; - case 'year': + case 'YEAR': $daysToRetrieve = 365; break; } diff --git a/server/controllers/system/init-settings.php b/server/controllers/system/init-settings.php index 8ac8314b..1c7610fc 100644 --- a/server/controllers/system/init-settings.php +++ b/server/controllers/system/init-settings.php @@ -44,7 +44,7 @@ class InitSettingsController extends Controller { 'url' => 'http://www.opensupports.com/support', 'registration' => true, 'user-system-enabled' => true, - 'last-stat-day' => '20170101', //TODO: get current date + 'last-stat-day' => date('YmdHi', strtotime(' -12 day ')), //TODO: get current date 'ticket-gap' => Hashing::generateRandomPrime(100000, 999999), 'file-gap' => Hashing::generateRandomPrime(100000, 999999), 'file-first-number' => Hashing::generateRandomNumber(100000, 999999),