chg: [instance:getStatistics] Usage of cake's FrozenTime instead of DateTime
parent
f6900b0843
commit
503b9e53b7
|
@ -9,6 +9,7 @@ use Cake\Validation\Validator;
|
||||||
use Migrations\Migrations;
|
use Migrations\Migrations;
|
||||||
use Cake\Filesystem\Folder;
|
use Cake\Filesystem\Folder;
|
||||||
use Cake\Http\Exception\MethodNotAllowedException;
|
use Cake\Http\Exception\MethodNotAllowedException;
|
||||||
|
use Cake\I18n\FrozenTime;
|
||||||
|
|
||||||
class InstanceTable extends AppTable
|
class InstanceTable extends AppTable
|
||||||
{
|
{
|
||||||
|
@ -39,12 +40,12 @@ class InstanceTable extends AppTable
|
||||||
'count' => $query->func()->count('id'),
|
'count' => $query->func()->count('id'),
|
||||||
'date' => 'DATE(modified)',
|
'date' => 'DATE(modified)',
|
||||||
])
|
])
|
||||||
->where(['modified >' => new \DateTime("-{$days} days")])
|
->where(['modified >' => FrozenTime::now()->subDays($days)])
|
||||||
->group(['date'])
|
->group(['date'])
|
||||||
->order(['date']);
|
->order(['date']);
|
||||||
$data = $query->toArray();
|
$data = $query->toArray();
|
||||||
$interval = new \DateInterval('P1D');
|
$interval = new \DateInterval('P1D');
|
||||||
$period = new \DatePeriod(new \DateTime("-{$days} days"), $interval, new \DateTime());
|
$period = new \DatePeriod(FrozenTime::now()->subDays($days), $interval, FrozenTime::now());
|
||||||
$timeline = [];
|
$timeline = [];
|
||||||
foreach ($period as $date) {
|
foreach ($period as $date) {
|
||||||
$timeline[$date->format("Y-m-d")] = [
|
$timeline[$date->format("Y-m-d")] = [
|
||||||
|
@ -57,7 +58,7 @@ class InstanceTable extends AppTable
|
||||||
}
|
}
|
||||||
$statistics[$model]['timeline'] = array_values($timeline);
|
$statistics[$model]['timeline'] = array_values($timeline);
|
||||||
|
|
||||||
$startCount = $table->find()->where(['modified <' => new \DateTime("-{$days} days")])->all()->count();
|
$startCount = $table->find()->where(['modified <' => FrozenTime::now()->subDays($days)])->all()->count();
|
||||||
$endCount = $statistics[$model]['amount'];
|
$endCount = $statistics[$model]['amount'];
|
||||||
$statistics[$model]['variation'] = $endCount - $startCount;
|
$statistics[$model]['variation'] = $endCount - $startCount;
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue