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

Merge remote-tracking branch 'origin/master' into rector/rules-up-to-php80

Browse Source 
Conflicts:
	src/Bundle/ChillActivityBundle/Controller/ActivityController.php
	src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
	src/Bundle/ChillActivityBundle/Menu/PersonMenuBuilder.php
	src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
	src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
	src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php
	src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/MSGraphUserRepository.php
	src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
	src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
	src/Bundle/ChillDocStoreBundle/Repository/PersonDocumentACLAwareRepository.php
	src/Bundle/ChillEventBundle/Search/EventSearch.php
	src/Bundle/ChillMainBundle/Controller/ExportController.php
	src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
	src/Bundle/ChillMainBundle/Cron/CronManager.php
	src/Bundle/ChillMainBundle/Entity/CronJobExecution.php
	src/Bundle/ChillMainBundle/Export/ExportManager.php
	src/Bundle/ChillMainBundle/Form/Type/Export/PickCenterType.php
	src/Bundle/ChillMainBundle/Form/Type/Listing/FilterOrderType.php
	src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
	src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
	src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperBuilder.php
	src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelperFactory.php
	src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
	src/Bundle/ChillPersonBundle/Controller/SocialWorkSocialActionApiController.php
	src/Bundle/ChillPersonBundle/Export/Aggregator/PersonAggregators/AgeAggregator.php
	src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
	src/Bundle/ChillPersonBundle/Export/Export/ListHouseholdInPeriod.php
	src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
	src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
	src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
	src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodWorkEvaluationContext.php
	src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
	src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
	src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
This commit is contained in:
Julien Fastré
2023-07-17 12:49:13 +02:00
parent 737f5f9275 1ebf68683f
commit 224c2c74e8
544 changed files with 18622 additions and 2105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
View File

@@ -166,9 +166,9 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
/**
* pick a random choice.
*
* @return string|string[] the array of slug if multiple, a single slug otherwise
* @return string|string[]
*/
private function getRandomChoice(CustomField $field): string|array
private function getRandomChoice(CustomField $field)
{
$choices = $field->getOptions()['choices'];
$multiple = $field->getOptions()['multiple'];
@@ -212,7 +212,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
}
}
throw new \LogicException("should not happens");
return $picked;
}
/**
@@ -228,7 +228,7 @@ class LoadReports extends AbstractFixture implements ContainerAwareInterface, Or
/**
* pick a choice within a 'choices' options (for choice type).
*
* @return the slug of the selected choice
* @return string the slug of the selected choice
*/
private function pickChoice(array $choices)
{

7
src/Bundle/ChillReportBundle/Export/Export/ReportList.php
View File

@@ -74,7 +74,6 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
$cf->getSlug();
}
// Add a checkbox to select fields
$builder->add('fields', ChoiceType::class, [
'multiple' => true,
'expanded' => true,
@@ -107,14 +106,16 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
])],
]);
// add a date field for addresses
$builder->add('address_date', ChillDateType::class, [
'label' => 'Address valid at this date',
'data' => new DateTime(),
'required' => false,
'block_name' => 'list_export_form_address_date',
]);
}
public function getFormDefaultData(): array
{
return ['address_date' => new DateTime()];
}
public function getAllowedFormattersTypes()
{

6
src/Bundle/ChillReportBundle/Export/Filter/ReportDateFilter.php
View File

@@ -63,14 +63,16 @@ class ReportDateFilter implements FilterInterface
{
$builder->add('date_from', PickRollingDateType::class, [
'label' => 'Report is after this date',
'data' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START),
]);
$builder->add('date_to', PickRollingDateType::class, [
'label' => 'Report is before this date',
'data' => new RollingDate(RollingDate::T_TODAY),
]);
}
public function getFormDefaultData(): array
{
return ['date_from' => new RollingDate(RollingDate::T_YEAR_PREVIOUS_START), 'date_to' => new RollingDate(RollingDate::T_TODAY)];
}
public function describeAction($data, $format = 'string')
{