diff --git a/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php b/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php index 0a91e8fc6..c46f2cf82 100644 --- a/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php +++ b/src/Bundle/ChillPersonBundle/Form/PersonFindManuallyDuplicateType.php @@ -5,7 +5,7 @@ namespace Chill\PersonBundle\Form; use Chill\PersonBundle\Form\Type\PickPersonType; use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\Extension\Core\Type\CheckboxType; -use Symfony\Component\Form\Extension\Core\Type\ChoiceType; +use Symfony\Component\Form\Extension\Core\Type\HiddenType; use Symfony\Component\Form\FormBuilderInterface; class PersonFindManuallyDuplicateType extends AbstractType @@ -21,11 +21,8 @@ class PersonFindManuallyDuplicateType extends AbstractType 'label' => 'Find duplicate', 'mapped' => false, ]) - ->add('direction', ChoiceType::class, [ - 'choices' => [ - 'Starting' => 'starting', - 'Arrival' => 'arrival', - ], + ->add('direction', HiddenType::class, [ + 'data' => 'starting', ]) ; } diff --git a/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig new file mode 100644 index 000000000..dfd931761 --- /dev/null +++ b/src/Bundle/ChillPersonBundle/Resources/views/PersonDuplicate/_sidepane.html.twig @@ -0,0 +1,45 @@ +{%- macro details(person, options) -%} + +{% import '@ChillMain/Address/macro.html.twig' as address %} + +
{{ 'Old person'|trans }}: + {{ 'Old person explain'|trans }} +
+ +{{ 'New person'|trans }}: + {{ 'New person explain'|trans }} +
+ +