From c43cde56473f7034f8f09741c39f57e543dba255 Mon Sep 17 00:00:00 2001
From: Frederic Merizen <frederic.merizen@beta.gouv.fr>
Date: Mon, 4 Mar 2019 18:07:47 +0100
Subject: [PATCH] [#3477] Show and / or relationship between filters

---
 .../new_gestionnaire/procedures/show.html.haml    | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/views/new_gestionnaire/procedures/show.html.haml b/app/views/new_gestionnaire/procedures/show.html.haml
index 8b000ec33..003929fd6 100644
--- a/app/views/new_gestionnaire/procedures/show.html.haml
+++ b/app/views/new_gestionnaire/procedures/show.html.haml
@@ -57,11 +57,16 @@
             %br
             = submit_tag "Ajouter le filtre", class: 'button'
 
-      - @current_filters.each do |filter|
-        %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") }
-          = "#{filter['label'].truncate(50)} : #{filter['value']}"
+      - @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") }
+            = "#{filter['label'].truncate(50)} : #{filter['value']}"
       %table.table.dossiers-table.hoverable
         %thead
           %tr