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

fix(dossiers): show correct count on download button

Browse source
This commit is contained in:
Paul Chavard 2022-04-06 17:08:22 +02:00
parent 23e2429d0d
commit 5bfcae1c0f
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,7 @@ module Instructeurs
@can_download_dossiers = (@counts[:tous] + @counts[:archives]) > 0 @can_download_dossiers = (@counts[:tous] + @counts[:archives]) > 0
dossiers = Dossier.where(groupe_instructeur_id: groupe_instructeur_ids) dossiers = Dossier.where(groupe_instructeur_id: groupe_instructeur_ids)
@dossiers_count = @counts[statut.underscore.to_sym] dossiers_count = @counts[statut.underscore.to_sym]
@followed_dossiers_id = current_instructeur @followed_dossiers_id = current_instructeur
.followed_dossiers .followed_dossiers
@ -76,10 +76,11 @@ module Instructeurs
@has_termine_notifications = notifications[:termines].present? @has_termine_notifications = notifications[:termines].present?
@not_archived_notifications_dossier_ids = notifications[:en_cours] + notifications[:termines] @not_archived_notifications_dossier_ids = notifications[:en_cours] + notifications[:termines]
filtered_sorted_ids = procedure_presentation.filtered_sorted_ids(dossiers, statut, count: @dossiers_count) filtered_sorted_ids = procedure_presentation.filtered_sorted_ids(dossiers, statut, count: dossiers_count)
page = params[:page].presence || 1 page = params[:page].presence || 1
@dossiers_count = filtered_sorted_ids.size
@filtered_sorted_paginated_ids = Kaminari @filtered_sorted_paginated_ids = Kaminari
.paginate_array(filtered_sorted_ids) .paginate_array(filtered_sorted_ids)
.page(page) .page(page)

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

@ -58,8 +58,9 @@
.flex .flex
.flex-grow .flex-grow
= render partial: "dossiers_filter", locals: { procedure: @procedure, procedure_presentation: @procedure_presentation, current_filters: @current_filters, statut: @statut, displayed_fields_options: @displayed_fields_options } = render partial: "dossiers_filter", locals: { procedure: @procedure, procedure_presentation: @procedure_presentation, current_filters: @current_filters, statut: @statut, displayed_fields_options: @displayed_fields_options }
.dossiers-export - if @dossiers_count > 0
= render partial: "dossiers_export", locals: { procedure: @procedure, exports: @exports, statut: @statut, count: @dossiers_count } .dossiers-export
= render partial: "dossiers_export", locals: { procedure: @procedure, exports: @exports, statut: @statut, count: @dossiers_count }
%table.table.dossiers-table.hoverable %table.table.dossiers-table.hoverable
%thead %thead