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

Merge branch 'develop' into staging

Browse source
This commit is contained in:
Xavier J 2016-12-22 11:56:31 +01:00
commit 8072ec8a9c
2 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/controllers/backoffice/dossiers_controller.rb
View file

@ -19,13 +19,15 @@ class Backoffice::DossiersController < Backoffice::DossiersListController
def show def show
create_dossier_facade params[:id] create_dossier_facade params[:id]
@champs_private = @facade.champs_private unless @facade.nil? unless @facade.nil?
@champs_private = @facade.champs_private
@headers_private = @champs_private.inject([]) do |acc, champ| @headers_private = @champs_private.inject([]) do |acc, champ|
acc.push(champ) if champ.type_champ == 'header_section' acc.push(champ) if champ.type_champ == 'header_section'
acc acc
end end
end end
end
def filter def filter
super super

15
app/views/admin/procedures/show.html.haml
View file

@ -59,12 +59,12 @@
%h3 Détails %h3 Détails
.row{style:'margin-right:3%; margin-left:3%;'} .row{style:'margin-right:3%; margin-left:3%;'}
.description.col-md-4.col-lg-4 .description.col-md-3.col-lg-3
%h4.text-info %h4.text-info
= @facade.procedure.libelle = @facade.procedure.libelle
= h @facade.procedure.description.html_safe = h @facade.procedure.description.html_safe
.champs.col-md-4.col-lg-4 .champs.col-md-3.col-lg-3
%h4.text-info %h4.text-info
Champs Champs
.badge.progress-bar-info .badge.progress-bar-info
@ -73,7 +73,16 @@
= champ.libelle = champ.libelle
%br %br
.pieces_justificatives.col-md-4.col-lg-4 .champs_private.col-md-3.col-lg-3
%h4.text-info
Champs privés
.badge.progress-bar-info
= @facade.procedure.types_de_champ_private.size
- @facade.procedure.types_de_champ_private.order(:order_place).each do |champ|
= champ.libelle
%br
.pieces_justificatives.col-md-3.col-lg-3
%h4.text-info %h4.text-info
Pièces justificatives Pièces justificatives
.badge.progress-bar-info .badge.progress-bar-info