[#3477] Show and / or relationship between filters

app/views/new_gestionnaire/procedures/show.html.haml

@@ -57,7 +57,12 @@
             %br
             = submit_tag "Ajouter le filtre", class: 'button'
 
-      - @current_filters.each do |filter|
+      - @current_filters.group_by { |filter| filter['table'] }.each_with_index do |(table, filters), i|
+        - if i > 0
+          et
+        - filters.each_with_index do |filter, i|
+          - if i > 0
+            ou
           %span.filter
             = link_to remove_filter_gestionnaire_procedure_path(@procedure, statut: @statut, table: filter['table'], column: filter['column'], value: filter['value']) do
               %img.close-icon{ src: image_url("close.svg") }