Chill-project/chill-bundles
6
0
Fork 0
mirror of https://gitlab.com/Chill-Projet/chill-bundles.git synced 2025-08-28 18:43:49 +00:00
Code Issues Actions Projects Releases Wiki Activity

[export] fix calendar scope/job Filters query + unit test (partial)

Browse Source
This commit is contained in:
Mathieu Jaumotte
2023-09-27 10:05:25 +02:00
parent f18ee2383c
commit 3f4a42adb2
7 changed files with 111 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php
View File

@@ -71,7 +71,7 @@ final readonly class JobAggregator implements AggregatorInterface
public function buildForm(FormBuilderInterface $builder)
{
$builder->add('job_at', PickRollingDateType::class, [
'label' => 'export.aggregator.calendar.agent_job.Calc date',
'label' => 'export.calendar.agent_job.Calc date',
]);
}

5
src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php
View File

@@ -60,7 +60,8 @@ final readonly class ScopeAggregator implements AggregatorInterface
->addSelect("IDENTITY({$p}_history.scope) AS {$p}_select")
->setParameter(
"{$p}_at",
$this->rollingDateConverter->convert($data['scope_at']))
$this->rollingDateConverter->convert($data['scope_at'])
)
->addGroupBy("{$p}_select");
}
@@ -72,7 +73,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
public function buildForm(FormBuilderInterface $builder)
{
$builder->add('scope_at', PickRollingDateType::class, [
'label' => 'export.aggregator.calendar.agent_scope.Calc date',
'label' => 'export.calendar.agent_scope.Calc date',
]);
}
public function getFormDefaultData(): array