Revert "apply fixes for list"

This reverts commit 938027cc
This commit is contained in:
Julien Fastré 2023-06-18 11:58:42 +02:00
parent 960acb8c0a
commit 50de389bc7
Signed by: julienfastre
GPG Key ID: BDE2190974723FCB
12 changed files with 9 additions and 55 deletions

View File

@ -44,10 +44,6 @@ class ListActivity implements ListInterface, GroupedExportInterface
{ {
$this->helper->buildForm($builder); $this->helper->buildForm($builder);
} }
public function getFormDefaultData(): array
{
return [];
}
public function getAllowedFormattersTypes() public function getAllowedFormattersTypes()
{ {

View File

@ -88,10 +88,6 @@ class ListActivity implements ListInterface, GroupedExportInterface
])], ])],
]); ]);
} }
public function getFormDefaultData(): array
{
return [];
}
public function getAllowedFormattersTypes() public function getAllowedFormattersTypes()
{ {

View File

@ -73,10 +73,6 @@ final class ListAsideActivity implements ListInterface, GroupedExportInterface
public function buildForm(FormBuilderInterface $builder) public function buildForm(FormBuilderInterface $builder)
{ {
} }
public function getFormDefaultData(): array
{
return [];
}
public function getAllowedFormattersTypes() public function getAllowedFormattersTypes()
{ {

View File

@ -85,16 +85,10 @@ class CSVListFormatter implements FormatterInterface
'expanded' => true, 'expanded' => true,
'multiple' => false, 'multiple' => false,
'label' => 'Add a number on first column', 'label' => 'Add a number on first column',
'data' => true,
]); ]);
} }
public function getFormDefaultData(array $aggregatorAliases): array
{
return ['numerotation' => true];
}
public function getName() public function getName()
{ {
return 'CSV vertical list'; return 'CSV vertical list';

View File

@ -80,14 +80,10 @@ class CSVPivotedListFormatter implements FormatterInterface
'expanded' => true, 'expanded' => true,
'multiple' => false, 'multiple' => false,
'label' => 'Add a number on first column', 'label' => 'Add a number on first column',
'data' => true,
]); ]);
} }
public function getFormDefaultData(array $aggregatorAliases): array
{
return ['numerotation' => true];
}
public function getName() public function getName()
{ {
return 'CSV horizontal list'; return 'CSV horizontal list';

View File

@ -104,14 +104,10 @@ class SpreadsheetListFormatter implements FormatterInterface
'expanded' => true, 'expanded' => true,
'multiple' => false, 'multiple' => false,
'label' => 'Add a number on first column', 'label' => 'Add a number on first column',
'data' => true,
]); ]);
} }
public function getFormDefaultData(array $aggregatorAliases): array
{
return ['format' => 'xlsx', 'numerotation' => true];
}
public function getName() public function getName()
{ {
return 'Spreadsheet list formatter (.xlsx, .ods)'; return 'Spreadsheet list formatter (.xlsx, .ods)';

View File

@ -144,10 +144,6 @@ class ListAccompanyingPeriod implements ListInterface, GroupedExportInterface
'required' => true, 'required' => true,
]); ]);
} }
public function getFormDefaultData(): array
{
return [];
}
public function getAllowedFormattersTypes() public function getAllowedFormattersTypes()
{ {

View File

@ -135,12 +135,9 @@ class ListAccompanyingPeriodWork implements ListInterface, GroupedExportInterfac
'label' => 'export.list.acpw.Date of calculation for associated elements', 'label' => 'export.list.acpw.Date of calculation for associated elements',
'help' => 'export.list.acpw.help_description', 'help' => 'export.list.acpw.help_description',
'required' => true, 'required' => true,
'data' => new RollingDate(RollingDate::T_TODAY),
]); ]);
} }
public function getFormDefaultData(): array
{
return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
}
public function getAllowedFormattersTypes() public function getAllowedFormattersTypes()
{ {

View File

@ -123,12 +123,9 @@ class ListEvaluation implements ListInterface, GroupedExportInterface
'label' => 'export.list.eval.Date of calculation for associated elements', 'label' => 'export.list.eval.Date of calculation for associated elements',
'help' => 'export.list.eval.help_description', 'help' => 'export.list.eval.help_description',
'required' => true, 'required' => true,
'data' => new RollingDate(RollingDate::T_TODAY),
]); ]);
} }
public function getFormDefaultData(): array
{
return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
}
public function getAllowedFormattersTypes() public function getAllowedFormattersTypes()
{ {

View File

@ -75,13 +75,10 @@ class ListHouseholdInPeriod implements ListInterface, GroupedExportInterface
->add('calc_date', PickRollingDateType::class, [ ->add('calc_date', PickRollingDateType::class, [
'label' => 'export.list.household.Date of calculation for associated elements', 'label' => 'export.list.household.Date of calculation for associated elements',
'help' => 'export.list.household.help_description', 'help' => 'export.list.household.help_description',
'data' => new RollingDate(RollingDate::T_TODAY),
'required' => true, 'required' => true,
]); ]);
} }
public function getFormDefaultData(): array
{
return ['calc_date' => new RollingDate(RollingDate::T_TODAY)];
}
public function getAllowedFormattersTypes() public function getAllowedFormattersTypes()
{ {

View File

@ -80,21 +80,17 @@ class ListPersonWithAccompanyingPeriod implements ExportElementValidatedInterfac
} }
}, },
])], ])],
'data' => array_values($choices),
]); ]);
// add a date field for addresses // add a date field for addresses
$builder->add('address_date', ChillDateType::class, [ $builder->add('address_date', ChillDateType::class, [
'label' => 'Data valid at this date', 'label' => 'Data valid at this date',
'help' => 'Data regarding center, addresses, and so on will be computed at this date', 'help' => 'Data regarding center, addresses, and so on will be computed at this date',
'data' => new DateTimeImmutable(),
'input' => 'datetime_immutable', 'input' => 'datetime_immutable',
]); ]);
} }
public function getFormDefaultData(): array
{
$choices = array_combine(ListPersonHelper::FIELDS, ListPersonHelper::FIELDS);
return ['fields' => array_values($choices), 'address_date' => new DateTimeImmutable()];
}
public function getAllowedFormattersTypes() public function getAllowedFormattersTypes()
{ {

View File

@ -137,14 +137,11 @@ class ReportList implements ExportElementValidatedInterface, ListInterface
// add a date field for addresses // add a date field for addresses
$builder->add('address_date', ChillDateType::class, [ $builder->add('address_date', ChillDateType::class, [
'label' => 'Address valid at this date', 'label' => 'Address valid at this date',
'data' => new DateTime(),
'required' => false, 'required' => false,
'block_name' => 'list_export_form_address_date', 'block_name' => 'list_export_form_address_date',
]); ]);
} }
public function getFormDefaultData(): array
{
return ['address_date' => new DateTime()];
}
public function getAllowedFormattersTypes() public function getAllowedFormattersTypes()
{ {