Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-29 02:53:50 +00:00
Code Issues Actions Projects Releases Wiki Activity

Merge branch '111_exports_suite' into calendar/finalization

Browse Source
This commit is contained in:
Julien Fastré
2022-10-24 11:10:44 +02:00
parent 5bd6281154 81c73f6acf
commit aae1fbf7e6
158 changed files with 3064 additions and 1522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/Bundle/ChillCalendarBundle/Export/Aggregator/MonthYearAggregator.php
View File

@@ -28,13 +28,7 @@ class MonthYearAggregator implements AggregatorInterface
{
$qb->addSelect("to_char(cal.startDate, 'MM-YYYY') AS month_year_aggregator");
// $qb->addSelect("extract(month from age(cal.startDate, cal.endDate)) AS month_aggregator");
$groupBy = $qb->getDQLPart('groupBy');
if (!empty($groupBy)) {
$qb->addGroupBy('month_year_aggregator');
} else {
$qb->groupBy('month_year_aggregator');
}
$qb->addGroupBy('month_year_aggregator');
}
public function applyOn(): string
@@ -54,10 +48,7 @@ class MonthYearAggregator implements AggregatorInterface
return 'by month and year';
}
$month = (int) substr($value, 0, 2);
$year = (int) substr($value, 3, 4);
return strftime('%B %G', mktime(0, 0, 0, $month, 1, $year));
return $value;
};
}