diff --git a/app/assets/stylesheets/default_data_block.scss b/app/assets/stylesheets/default_data_block.scss index 454b11e9e..adc1ad053 100644 --- a/app/assets/stylesheets/default_data_block.scss +++ b/app/assets/stylesheets/default_data_block.scss @@ -1,6 +1,5 @@ .default_data_block { font-family: Arial; - margin-top: 40px; .show-block { width: 840px; diff --git a/app/assets/stylesheets/description.scss b/app/assets/stylesheets/description.scss index 3a269908e..dc24f6646 100644 --- a/app/assets/stylesheets/description.scss +++ b/app/assets/stylesheets/description.scss @@ -41,8 +41,6 @@ .type_champ-header_section { @extend .col-md-12; @extend .col-lg-12; - - margin-bottom: -25px; } .type_champ-address { diff --git a/app/controllers/backoffice/dossiers_controller.rb b/app/controllers/backoffice/dossiers_controller.rb index f6209281a..78644ccdb 100644 --- a/app/controllers/backoffice/dossiers_controller.rb +++ b/app/controllers/backoffice/dossiers_controller.rb @@ -19,7 +19,12 @@ class Backoffice::DossiersController < Backoffice::DossiersListController def show create_dossier_facade params[:id] - @champs = @facade.champs_private unless @facade.nil? + @champs_private = @facade.champs_private unless @facade.nil? + + @headers_private = @champs_private.inject([]) do |acc, champ| + acc.push(champ) if champ.type_champ == 'header_section' + acc + end end def filter diff --git a/app/views/dossiers/_dossier_show.html.haml b/app/views/dossiers/_dossier_show.html.haml index 2a0abded1..517614cea 100644 --- a/app/views/dossiers/_dossier_show.html.haml +++ b/app/views/dossiers/_dossier_show.html.haml @@ -1,4 +1,4 @@ -.default_data_block +.default_data_block{style:'margin-top: 40px'} .row.show-block#messages %div.header %div.col-lg-10.col-md-10.title @@ -100,16 +100,16 @@ = render partial: 'users/carte/init_carto', locals: {dossier: @facade.dossier} -- if @current_gestionnaire && gestionnaire_signed_in? && @champs.count > 0 - .default_data_block +- if @current_gestionnaire && gestionnaire_signed_in? && @champs_private.count > 0 + .default_data_block.default_visible %div.row.show-block#private-fields %div.header %div.col-lg-10.col-md-10.title %div.carret-right %div.carret-down - = "champs".upcase + = "formulaire privé".upcase %div.col-lg-2.col-md-2.count - - private_fields_count = @champs.count + - private_fields_count = @champs_private.count = (private_fields_count == 1) ? "1 champ" : "#{private_fields_count} champs" %div.body = render partial: '/dossiers/infos_private_fields' diff --git a/app/views/dossiers/_infos_private_fields.html.haml b/app/views/dossiers/_infos_private_fields.html.haml index a7f8011fd..cb107673e 100644 --- a/app/views/dossiers/_infos_private_fields.html.haml +++ b/app/views/dossiers/_infos_private_fields.html.haml @@ -1,12 +1,6 @@ -.row +.row{style: 'margin-top: -20px'} .col-md-12.col-lg-12 - - if @champs.nil? || @champs.empty? - %h4.text-primary.center - Pas de champ privé pour ce dossier - - else - = form_for @facade.dossier, url: {controller: 'backoffice/private_formulaires', action: :update, dossier_id: @facade.dossier.id}, remote: true do - = render partial: '/users/description/champs', locals:{private: true} - .row - .col-md-4.col-lg-4 - .col-md-4.col-lg-4= submit_tag :Enregistrer, {class: 'btn-action'} - .col-md-4.col-lg-4 + = form_for @facade.dossier, url: {controller: 'backoffice/private_formulaires', action: :update, dossier_id: @facade.dossier.id}, remote: true do + = render partial: '/users/description/champs', locals:{private: true} + .row.center + = submit_tag :Enregistrer, {class: 'btn-action'} diff --git a/app/views/users/description/_champs.html.haml b/app/views/users/description/_champs.html.haml index c8ea6df55..7ee565d10 100644 --- a/app/views/users/description/_champs.html.haml +++ b/app/views/users/description/_champs.html.haml @@ -1,4 +1,7 @@ - render_partial_url = private ? 'users/description/champs/header_private_section' : 'users/description/champs/header_section' +- @champs = @champs_private if private +- @headers = @headers_private if private + - unless @headers.blank? - if @champs.first.type_champ != 'header_section' =render partial: render_partial_url, locals: {libelle: 'Dossier', order_place: -1, champs: @champs} diff --git a/app/views/users/description/_show.html.haml b/app/views/users/description/_show.html.haml index 8c0fc622b..a9985b1a3 100644 --- a/app/views/users/description/_show.html.haml +++ b/app/views/users/description/_show.html.haml @@ -16,9 +16,8 @@ -#TODO use form_for = form_tag(url_for({controller: 'users/description', action: :create, dossier_id: @dossier.id}), class: 'form-inline', method: 'POST', multipart: true) do - - #liste_champs - -unless @champs.nil? + -unless @champs.nil? + #liste_champs =render partial: 'users/description/champs', locals:{private: false} -if !@procedure.lien_demarche.blank? || @procedure.cerfa_flag || @dossier.types_de_piece_justificative.size > 0 diff --git a/app/views/users/description/champs/_header_private_section.html.haml b/app/views/users/description/champs/_header_private_section.html.haml index 2ce9457a3..5aa7d3584 100644 --- a/app/views/users/description/champs/_header_private_section.html.haml +++ b/app/views/users/description/champs/_header_private_section.html.haml @@ -1,4 +1,6 @@ .row - .col-lg-2.col-md-2 - .col-lg-8.col-md-8 + .col-lg-12.col-md-12 + %br + %h3.text-info + =libelle = render partial: 'users/description/champs/render_list_champs', locals: {champs: champs, order_place: order_place} diff --git a/app/views/users/description/champs/_header_section.html.haml b/app/views/users/description/champs/_header_section.html.haml index 3eee2def8..e6f0a1269 100644 --- a/app/views/users/description/champs/_header_section.html.haml +++ b/app/views/users/description/champs/_header_section.html.haml @@ -6,57 +6,4 @@ %div.carret-down =libelle %div.body - -champs.each do |champ| - - if champ.order_place > order_place - - if champ.type_champ == 'header_section' - - break - - - unless champ.type_champ == 'checkbox' || champ.type_champ == 'engagement' - %h4 - = champ.libelle - - if champ.mandatory? - = '*' - - -if champ.type_champ == 'textarea' - =render partial: 'users/description/champs/textarea', locals: {champ: champ} - - -elsif champ.type_champ == 'checkbox' - = render partial: 'users/description/champs/checkbox', locals: {champ: champ} - - -elsif champ.type_champ == 'civilite' - =render partial: 'users/description/champs/civilite', locals: {champ: champ} - - - elsif champ.type_champ == 'datetime' - =render partial: 'users/description/champs/datetime', locals: {champ: champ} - - - elsif champ.type_champ == 'yes_no' - =render partial: 'users/description/champs/yes_no', locals: {champ: champ} - - - elsif champ.type_champ == 'drop_down_list' - =render partial: 'users/description/champs/drop_down_list', locals: {champ: champ} - - - elsif champ.type_champ == 'pays' - =render partial: 'users/description/champs/pays', locals: {champ: champ} - - - elsif champ.type_champ == 'regions' - =render partial: 'users/description/champs/regions', locals: {champ: champ} - - - elsif champ.type_champ == 'engagement' - =render partial: 'users/description/champs/engagement', locals: {champ: champ} - - - elsif champ.type_champ == 'departements' - =render partial: 'users/description/champs/departements', locals: {champ: champ} - - -else - %input.form-control{name:"champs['#{champ.id}']", - placeholder: champ.libelle, - id: "champs_#{champ.id}", - value: champ.value, - type: champ.type_champ, - 'data-provide' => champ.data_provide, - 'data-date-format' => champ.data_date_format} - - - unless champ.description.empty? || champ.type_champ == 'engagement' - .row - .col-lg-8.col-md-8{class: 'description_div', id:"description_champs_#{champ.id}"} - = champ.description + = render partial: 'users/description/champs/render_list_champs', locals: {champs: champs, order_place: order_place} \ No newline at end of file