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

use DossierProjectionService

Browse source
This commit is contained in:
simon lehericey 2021-04-21 12:03:15 +02:00
parent 5bfd4ecbbf
commit 0c845c937d
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -112,6 +112,8 @@ module Instructeurs
@dossiers = @dossiers.sort_by { |d| filtered_sorted_paginated_ids.index(d.id) } @dossiers = @dossiers.sort_by { |d| filtered_sorted_paginated_ids.index(d.id) }
@projected_dossiers = DossierProjectionService.project(filtered_sorted_paginated_ids, procedure_presentation.displayed_fields)
kaminarize(page, filtered_sorted_ids.count) kaminarize(page, filtered_sorted_ids.count)
assign_exports assign_exports

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

@ -129,7 +129,8 @@
= submit_tag "Enregistrer", class: 'button' = submit_tag "Enregistrer", class: 'button'
%tbody %tbody
- @dossiers.each do |dossier| - @projected_dossiers.each do |p|
- dossier = p.dossier
%tr %tr
%td.folder-col %td.folder-col
= link_to(instructeur_dossier_path(@procedure, dossier), class: 'cell-link') do = link_to(instructeur_dossier_path(@procedure, dossier), class: 'cell-link') do
@ -141,7 +142,7 @@
= link_to(instructeur_dossier_path(@procedure, dossier), class: 'cell-link') do = link_to(instructeur_dossier_path(@procedure, dossier), class: 'cell-link') do
= dossier.id = dossier.id
- @procedure_presentation.displayed_fields_values(dossier).each do |value| - p.columns.each do |column|
%td %td
= link_to(value, instructeur_dossier_path(@procedure, dossier), class: 'cell-link') = link_to(value, instructeur_dossier_path(@procedure, dossier), class: 'cell-link')