Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Working on charts

Browse Source
This commit is contained in:
Hillel Coren 2018-03-05 21:18:05 +02:00
parent c344af9de3
commit be447757c9
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Ninja/Reports/AbstractReport.php
View File

@ -4,6 +4,7 @@ namespace App\Ninja\Reports;
use Utils; use Utils;
use Auth; use Auth;
use Carbon;
use DateInterval; use DateInterval;
use DatePeriod; use DatePeriod;
use stdClass; use stdClass;
@ -214,7 +215,22 @@ class AbstractReport
foreach ($this->chartData as $dimension => $data) { foreach ($this->chartData as $dimension => $data) {
$interval = new DateInterval('P1'.substr($groupBy, 0, 1)); $interval = new DateInterval('P1'.substr($groupBy, 0, 1));
$period = new DatePeriod($startDate, $interval, $endDate); $intervalStartDate = Carbon::instance($startDate);
$intervalEndDate = Carbon::instance($endDate);
// round dates to match grouping
$intervalStartDate->hour(0)->minute(0)->second(0);
$intervalEndDate->hour(24)->minute(0)->second(0);
if ($groupBy == 'MONTHYEAR' || $groupBy == 'YEAR') {
$intervalStartDate->day(1);
$intervalEndDate->addMonth(1)->day(1);
}
if ($groupBy == 'YEAR') {
$intervalStartDate->month(1);
$intervalEndDate->month(12);
}
$period = new DatePeriod($intervalStartDate, $interval, $intervalEndDate);
$records = []; $records = [];
foreach ($period as $date) { foreach ($period as $date) {