fix apres retours

app/assets/stylesheets/procedure_list.scss

@@ -7,6 +7,10 @@
     background-image: none;
   }
 
+  li {
+    border-top: 1px solid var(--border-default-grey);
+  }
+
   .procedure-logo {
     @include ie-compatible-background-image();
 

app/controllers/instructeurs/procedures_controller.rb

@@ -36,10 +36,8 @@ def index
 
       @dossiers_count_per_procedure = dossiers.by_statut('tous').group('groupe_instructeurs.procedure_id').reorder(nil).count
       @dossiers_a_suivre_count_per_procedure = dossiers.by_statut('a-suivre').group('groupe_instructeurs.procedure_id').reorder(nil).count
-      @dossiers_archived_count_per_procedure = dossiers.by_statut('archives').group('groupe_instructeurs.procedure_id').count
       @dossiers_termines_count_per_procedure = dossiers.by_statut('traites').group('groupe_instructeurs.procedure_id').reorder(nil).count
       @dossiers_expirant_count_per_procedure = dossiers.by_statut('expirant').group('groupe_instructeurs.procedure_id').count
-      @dossiers_supprimes_count_per_procedure = dossiers.by_statut('supprimes').group('groupe_instructeurs.procedure_id').reorder(nil).count
 
       groupe_ids = current_instructeur.groupe_instructeurs.pluck(:id)
       @followed_dossiers_count_per_procedure = current_instructeur
@@ -57,9 +55,7 @@ def index
         t('.followed') => @followed_dossiers_count_per_procedure.sum { |_, v| v },
         t('.processed') => @dossiers_termines_count_per_procedure.sum { |_, v| v },
         t('.all') => @dossiers_count_per_procedure.sum { |_, v| v },
-        t('.dossiers_close_to_expiration') => @dossiers_expirant_count_per_procedure.sum { |_, v| v },
-        t('.archived') => @dossiers_archived_count_per_procedure.sum { |_, v| v },
-        t('.dossiers_supprimes') => @dossiers_supprimes_count_per_procedure.sum { |_, v| v }
+        t('.dossiers_close_to_expiration') => @dossiers_expirant_count_per_procedure.sum { |_, v| v }
       }
 
       @procedure_ids_en_cours_with_notifications = current_instructeur.procedure_ids_with_notifications(:en_cours)

app/helpers/procedure_helper.rb

@@ -8,9 +8,13 @@ def procedure_libelle(procedure)
   end
 
   def procedure_badge(procedure)
-    return nil unless procedure.brouillon?
-
-    tag.span(t('helpers.procedure.testing_procedure'), class: 'fr-badge fr-badge--sm')
+    if procedure.close?
+      tag.span('Close', class: 'fr-badge')
+    elsif procedure.depubliee?
+      tag.span('Dépubliée', class: 'fr-badge')
+    elsif procedure.brouillon?
+      tag.span(t('helpers.procedure.testing_procedure'), class: 'fr-badge fr-badge--sm')
+    end
   end
 
   def procedure_publish_label(procedure, key)

app/views/instructeurs/procedures/_list.html.haml

@@ -1,12 +1,12 @@
 
-%li.flex.align-start.fr-mb-3w{ style: "border-top: 1px solid var(--border-default-grey);" }
+%li.flex.align-start.fr-mb-3w
   .flex
 
     .procedure-details
-      .flex.clipboard-container
+      .clipboard-container
         .fr-mb-2w.fr-mt-2w
-          = procedure_badge(p)
-          %h3.font-weight-normal.fr-link.fr-ml-1w
+          = badge = procedure_badge(p)
+          %h3{ class: class_names('font-weight-normal fr-link' => true, 'fr-ml-1v' => badge.present?) }
             = link_to "#{p.libelle} - n°#{p.id}", instructeur_procedure_path(p)
 
           = render Dsfr::CopyButtonComponent.new(title: t('instructeurs.procedures.index.copy_link_button'), text: commencer_url(p.path))
@@ -67,11 +67,4 @@
               %span.fr-icon-delete-line
             .center.fr-text--xs
               = t('instructeurs.dossiers.labels.dossiers_supprimes')
-
-
-    - if p.close?
-      .ml-auto
-        %span.fr-badge Close
-    - elsif p.depubliee?
-      .ml-auto
-        %span.fr-badge Dépubliée
+r

config/locales/views/instructeurs/procedures/en.yml

@@ -9,9 +9,7 @@ en:
         followed: followed
         processed: processed
         all: files
-        archived: archived
         dossiers_close_to_expiration: expiring
-        dossiers_supprimes: recently deleted
         copy_link_button: Copy the procedure link to clipboard
       show:
         file_tracking: File tracking

config/locales/views/instructeurs/procedures/fr.yml

@@ -9,9 +9,7 @@ fr:
         followed: suivis
         processed: traités
         all: dossiers
-        archived: archivés
         dossiers_close_to_expiration: expirant
-        dossiers_supprimes: supprimés
         copy_link_button: Copier le lien de la démarche dans le presse-papiers
       show:
         file_tracking: Suivi des dossiers

spec/controllers/instructeurs/procedures_controller_spec.rb

@@ -92,7 +92,6 @@
 
           it { expect(assigns(:dossiers_count_per_procedure)[procedure.id]).to eq(nil) }
           it { expect(assigns(:dossiers_a_suivre_count_per_procedure)[procedure.id]).to eq(nil) }
-          it { expect(assigns(:dossiers_archived_count_per_procedure)[procedure.id]).to eq(nil) }
           it { expect(assigns(:followed_dossiers_count_per_procedure)[procedure.id]).to eq(nil) }
           it { expect(assigns(:dossiers_termines_count_per_procedure)[procedure.id]).to eq(nil) }
           it { expect(assigns(:dossiers_expirant_count_per_procedure)[procedure.id]).to eq(nil) }
@@ -101,7 +100,6 @@
           it { expect(assigns(:all_dossiers_counts)['suivis']).to eq(0) }
           it { expect(assigns(:all_dossiers_counts)['traités']).to eq(0) }
           it { expect(assigns(:all_dossiers_counts)['dossiers']).to eq(0) }
-          it { expect(assigns(:all_dossiers_counts)['archivés']).to eq(0) }
           it { expect(assigns(:all_dossiers_counts)['expirant']).to eq(0) }
         end
 
@@ -149,14 +147,12 @@
           it { expect(assigns(:dossiers_count_per_procedure)[procedure.id]).to eq(5) }
           it { expect(assigns(:dossiers_a_suivre_count_per_procedure)[procedure.id]).to eq(3) }
           it { expect(assigns(:followed_dossiers_count_per_procedure)[procedure.id]).to eq(nil) }
-          it { expect(assigns(:dossiers_archived_count_per_procedure)[procedure.id]).to eq(1) }
           it { expect(assigns(:dossiers_termines_count_per_procedure)[procedure.id]).to eq(2) }
           it { expect(assigns(:dossiers_expirant_count_per_procedure)[procedure.id]).to eq(2) }
 
           it { expect(assigns(:dossiers_count_per_procedure)[procedure2.id]).to eq(3) }
           it { expect(assigns(:dossiers_a_suivre_count_per_procedure)[procedure2.id]).to eq(nil) }
           it { expect(assigns(:followed_dossiers_count_per_procedure)[procedure2.id]).to eq(1) }
-          it { expect(assigns(:dossiers_archived_count_per_procedure)[procedure2.id]).to eq(nil) }
           it { expect(assigns(:dossiers_termines_count_per_procedure)[procedure2.id]).to eq(1) }
 
           it { expect(assigns(:dossiers_count_per_procedure)[procedure3.id]).to eq(2) }
@@ -165,7 +161,6 @@
           it { expect(assigns(:all_dossiers_counts)['suivis']).to eq(0 + 1) }
           it { expect(assigns(:all_dossiers_counts)['traités']).to eq(2 + 1 + 1 + 1) }
           it { expect(assigns(:all_dossiers_counts)['dossiers']).to eq(5 + 3 + 2 + 1) }
-          it { expect(assigns(:all_dossiers_counts)['archivés']).to eq(1 + 0) }
           it { expect(assigns(:all_dossiers_counts)['expirant']).to eq(2 + 0) }
 
           it { expect(assigns(:procedures_en_cours)).to match_array([procedure2, procedure, procedure3]) }
@@ -223,13 +218,11 @@
             it { expect(assigns(:followed_dossiers_count_per_procedure)[procedure.id]).to eq(6) }
             it { expect(assigns(:dossiers_termines_count_per_procedure)[procedure.id]).to eq(10) }
             it { expect(assigns(:dossiers_count_per_procedure)[procedure.id]).to eq(4 + 6 + 10) }
-            it { expect(assigns(:dossiers_archived_count_per_procedure)[procedure.id]).to eq(14) }
 
             it { expect(assigns(:all_dossiers_counts)['à suivre']).to eq(4) }
             it { expect(assigns(:all_dossiers_counts)['suivis']).to eq(6) }
             it { expect(assigns(:all_dossiers_counts)['traités']).to eq(10) }
             it { expect(assigns(:all_dossiers_counts)['dossiers']).to eq(4 + 6 + 10) }
-            it { expect(assigns(:all_dossiers_counts)['archivés']).to eq(14) }
           end
 
           context 'when an instructeur only belongs to one of them gi' do
@@ -244,13 +237,11 @@
             it { expect(assigns(:followed_dossiers_count_per_procedure)[procedure.id]).to eq(3) }
             it { expect(assigns(:dossiers_termines_count_per_procedure)[procedure.id]).to eq(5) }
             it { expect(assigns(:dossiers_count_per_procedure)[procedure.id]).to eq(2 + 3 + 5) }
-            it { expect(assigns(:dossiers_archived_count_per_procedure)[procedure.id]).to eq(7) }
 
             it { expect(assigns(:all_dossiers_counts)['à suivre']).to eq(2) }
             it { expect(assigns(:all_dossiers_counts)['suivis']).to eq(3) }
             it { expect(assigns(:all_dossiers_counts)['traités']).to eq(5) }
             it { expect(assigns(:all_dossiers_counts)['dossiers']).to eq(2 + 3 + 5) }
-            it { expect(assigns(:all_dossiers_counts)['archivés']).to eq(7) }
           end
         end
       end