From a79a17b39e9f64abe267987d9c1e27a8cca3ff6e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julien=20Fastr=C3=A9?= Date: Thu, 5 May 2022 15:39:05 +0200 Subject: [PATCH] export duplicate: add check onbirthdate --- .../ChillPersonBundle/Export/Export/ListPersonDuplicate.php | 2 ++ .../ChillPersonBundle/Resources/views/Address/new.html.twig | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php index bf561705b..892d3270a 100644 --- a/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php +++ b/src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php @@ -88,6 +88,7 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat $builder->add('precision', NumberType::class, [ 'label' => 'Duplicate similarity', 'data' => self::PRECISION_DEFAULT_VALUE, + //'help' => 'Le degré de similarité mesure le nombre de caractères similaires entre la graphie des noms et prénoms. Un nombre faible indique que des graphies très différentes seront considérées comme similaires.', 'constraints' => [ new Range([ 'min' => 0.1, @@ -161,6 +162,7 @@ class ListPersonDuplicate implements DirectExportInterface, ExportElementValidat OR (UNACCENT(LOWER(p.firstname)) = UNACCENT(LOWER(p2.lastname)) AND UNACCENT(LOWER(p.lastname)) = UNACCENT(LOWER(p2.firstname))) ) + AND p.birthdate = p2.birthdate AND p.center_id = p2.center_id WHERE NOT EXISTS ( SELECT id diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig index 5682bef66..207432d61 100644 --- a/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig +++ b/src/Bundle/ChillPersonBundle/Resources/views/Address/new.html.twig @@ -35,7 +35,7 @@ {{ form_errors(form.postCode) }} {{ form_row(form.validFrom) }} {{ form_errors(form.validFrom) }} - + {% if form.customs is defined %} {{ form_widget(form.customs) }} {% endif %}