Merge branch 'features/activity-type' into features/activity-form

This commit is contained in:
Jean-Francois Monfort
2021-04-15 14:10:46 +02:00
66 changed files with 2779 additions and 583 deletions

View File

@@ -22,10 +22,6 @@ class ActivityTypeType extends AbstractType
$this->translatableStringHelper = $translatableStringHelper;
}
/**
* @param FormBuilderInterface $builder
* @param array $options
*/
public function buildForm(FormBuilderInterface $builder, array $options)
{
$builder
@@ -46,12 +42,11 @@ class ActivityTypeType extends AbstractType
;
$fields = [
'person', 'user', 'date', 'place', 'persons',
'thirdparty', 'durationTime', 'attendee',
'reasons', 'comment', 'sentReceived', 'document',
'persons', 'user', 'date', 'place', 'persons',
'thirdParties', 'durationTime', 'attendee',
'reasons', 'comment', 'sentReceived', 'documents',
'emergency', 'accompanyingPeriod', 'socialData'
];
foreach ($fields as $field) {
$builder
->add($field.'Visible', ActivityFieldPresence::class)
@@ -62,9 +57,6 @@ class ActivityTypeType extends AbstractType
}
}
/**
* @param OptionsResolverInterface $resolver
*/
public function configureOptions(OptionsResolver $resolver)
{
$resolver->setDefaults(array(