DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #5735 from betagouv/revert-counters

Browse source 
Revert counters display in Instructeur::ProceduresController::show
This commit is contained in:
Keirua 2020-11-12 09:48:04 +01:00 committed by GitHub
commit fd766fcf04
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/controllers/instructeurs/procedures_controller.rb
View file

@ -102,7 +102,6 @@ module Instructeurs
@has_termine_notifications = current_instructeur.notifications_for_procedure(@procedure, :termine).exists?
@not_archived_notifications_dossier_ids = current_instructeur.notifications_for_procedure(@procedure, :not_archived).pluck(:id)
@counters = @procedure.dossiers_count_for_instructeur(current_instructeur)
sorted_ids = procedure_presentation.sorted_ids(@dossiers, current_instructeur)

14
app/views/instructeurs/procedures/show.html.haml
View file

@ -24,29 +24,29 @@
= tab_item('à suivre',
instructeur_procedure_path(@procedure, statut: 'a-suivre'),
active: @statut == 'a-suivre',
badge: number_with_html_delimiter(@counters['a_suivre']))
badge: number_with_html_delimiter(@a_suivre_dossiers.count))
= tab_item(t('pluralize.followed', count: @counters['suivis']),
= tab_item(t('pluralize.followed', count: @followed_dossiers.count),
instructeur_procedure_path(@procedure, statut: 'suivis'),
active: @statut == 'suivis',
badge: number_with_html_delimiter(@counters['suivis']),
badge: number_with_html_delimiter(@followed_dossiers.count),
notification: @has_en_cours_notifications)
= tab_item(t('pluralize.processed', count: @counters['termines']),
= tab_item(t('pluralize.processed', count: @termines_dossiers.count),
instructeur_procedure_path(@procedure, statut: 'traites'),
active: @statut == 'traites',
badge: number_with_html_delimiter(@counters['termines']),
badge: number_with_html_delimiter(@termines_dossiers.count),
notification: @has_termine_notifications)
= tab_item('tous les dossiers',
instructeur_procedure_path(@procedure, statut: 'tous'),
active: @statut == 'tous',
badge: number_with_html_delimiter(@counters['total']))
badge: number_with_html_delimiter(@all_state_dossiers.count))
= tab_item(t('pluralize.archived', count: @archived_dossiers.count),
instructeur_procedure_path(@procedure, statut: 'archives'),
active: @statut == 'archives',
badge: number_with_html_delimiter(@counters['archived']))
badge: number_with_html_delimiter(@archived_dossiers.count))
.procedure-actions
= render partial: "download_dossiers",