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

replace status_badge partial by status_badge helper

Browse source
This commit is contained in:
Christophe Robillard 2020-03-24 15:55:03 +01:00
parent ba8cd8dde0
commit 72783fd8fd
5 changed files with 4 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -143,7 +143,7 @@
%td.status-col %td.status-col
= link_to(instructeur_dossier_path(@procedure, dossier), class: 'cell-link') do = link_to(instructeur_dossier_path(@procedure, dossier), class: 'cell-link') do
= render partial: 'shared/dossiers/status_badge', locals: { dossier: dossier } = status_badge(dossier.state)
%td.action-col.follow-col= render partial: 'dossier_actions', locals: { procedure: @procedure, dossier: dossier, dossier_is_followed: @followed_dossiers_id.include?(dossier.id) } %td.action-col.follow-col= render partial: 'dossier_actions', locals: { procedure: @procedure, dossier: dossier, dossier_is_followed: @followed_dossiers_id.include?(dossier.id) }
= paginate @dossiers = paginate @dossiers
- else - else

2
app/views/instructeurs/recherche/index.html.haml
View file

@ -30,7 +30,7 @@
%td= link_to(dossier.user.email, dossier_linked_path(current_instructeur, dossier), class: 'cell-link') %td= link_to(dossier.user.email, dossier_linked_path(current_instructeur, dossier), class: 'cell-link')
%td.status-col %td.status-col
= link_to(dossier_linked_path(current_instructeur, dossier), class: 'cell-link') do = link_to(dossier_linked_path(current_instructeur, dossier), class: 'cell-link') do
= render partial: 'shared/dossiers/status_badge', locals: { dossier: dossier } = status_badge(dossier.state)
%td.action-col.follow-col= render partial: 'instructeurs/procedures/dossier_actions', locals: { procedure: dossier.procedure, dossier: dossier, dossier_is_followed: @followed_dossiers_id.include?(dossier.id) } %td.action-col.follow-col= render partial: 'instructeurs/procedures/dossier_actions', locals: { procedure: dossier.procedure, dossier: dossier, dossier_is_followed: @followed_dossiers_id.include?(dossier.id) }
- else - else
%h2 Aucun dossier correspondant à votre recherche n'a été trouvé %h2 Aucun dossier correspondant à votre recherche n'a été trouvé

12
app/views/shared/dossiers/_status_badge.html.haml
View file

@ -1,12 +0,0 @@
- if dossier.brouillon?
%span.label.brouillon brouillon
- elsif dossier.en_construction?
%span.label.construction en construction
- elsif dossier.en_instruction?
%span.label.instruction en instruction
- elsif dossier.accepte?
%span.label.accepted accepté
- elsif dossier.refuse?
%span.label.refused refusé
- elsif dossier.sans_suite?
%span.label.without-continuation sans suite

2
app/views/users/dossiers/index.html.haml
View file

@ -44,7 +44,7 @@
= procedure_libelle(dossier.procedure) = procedure_libelle(dossier.procedure)
%td.status-col %td.status-col
= link_to(url_for_dossier(dossier), class: 'cell-link') do = link_to(url_for_dossier(dossier), class: 'cell-link') do
= render partial: 'shared/dossiers/status_badge', locals: { dossier: dossier } = status_badge(dossier.state)
%td.updated-at-col %td.updated-at-col
= link_to(url_for_dossier(dossier), class: 'cell-link') do = link_to(url_for_dossier(dossier), class: 'cell-link') do
= try_format_date(dossier.updated_at) = try_format_date(dossier.updated_at)

2
app/views/users/dossiers/show/_header.html.haml
View file

@ -1,6 +1,6 @@
.sub-header .sub-header
.container .container
= render partial: 'shared/dossiers/status_badge', locals: { dossier: dossier } = status_badge(dossier.state)
.title-container .title-container
%span.icon.folder %span.icon.folder