From 4249f8ae25a572b75e0996330469e5ff750b46d1 Mon Sep 17 00:00:00 2001 From: Paul Chavard Date: Wed, 17 Oct 2018 13:07:51 +0300 Subject: [PATCH] Add carte type de champ options --- app/assets/javascripts/old_design/admin.js | 4 ++++ app/assets/stylesheets/admin_type_de_champ.scss | 3 ++- app/services/types_de_champ_service.rb | 2 ++ app/views/admin/types_de_champ/_fields.html.haml | 10 ++++++++++ config/locales/models/type_de_champ/fr.yml | 1 + 5 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/assets/javascripts/old_design/admin.js b/app/assets/javascripts/old_design/admin.js index 9b45a08c2..12fe3f8cc 100644 --- a/app/assets/javascripts/old_design/admin.js +++ b/app/assets/javascripts/old_design/admin.js @@ -27,6 +27,7 @@ $(document).on('change', 'select.form-control.type-champ', function() { parent.removeClass('header-section'); parent.children('.drop-down-list').removeClass('show-inline'); parent.children('.pj-template').removeClass('show-inline'); + parent.children('.carte-options').removeClass('show-inline'); $('.mandatory', parent).show(); @@ -42,6 +43,9 @@ $(document).on('change', 'select.form-control.type-champ', function() { case 'piece_justificative': parent.children('.pj-template').addClass('show-inline'); break; + case 'carte': + parent.children('.carte-options').addClass('show-inline'); + break; case 'explication': $('.mandatory', parent).hide(); break; diff --git a/app/assets/stylesheets/admin_type_de_champ.scss b/app/assets/stylesheets/admin_type_de_champ.scss index 2d31eb5bd..b444a553b 100644 --- a/app/assets/stylesheets/admin_type_de_champ.scss +++ b/app/assets/stylesheets/admin_type_de_champ.scss @@ -32,7 +32,8 @@ } .form-group.drop-down-list, - .form-group.pj-template { + .form-group.pj-template, + .form-group.carte-options { display: none; } diff --git a/app/services/types_de_champ_service.rb b/app/services/types_de_champ_service.rb index fa4b3b126..191d5e626 100644 --- a/app/services/types_de_champ_service.rb +++ b/app/services/types_de_champ_service.rb @@ -14,6 +14,8 @@ class TypesDeChampService :id, :mandatory, :piece_justificative_template, + :quartiers_prioritaires, + :cadastres, drop_down_list_attributes: [:value, :id] ]) diff --git a/app/views/admin/types_de_champ/_fields.html.haml b/app/views/admin/types_de_champ/_fields.html.haml index b157e895c..5a3d74ec7 100644 --- a/app/views/admin/types_de_champ/_fields.html.haml +++ b/app/views/admin/types_de_champ/_fields.html.haml @@ -38,6 +38,16 @@ = ff.file_field :piece_justificative_template, direct_upload: true + .form-group.carte-options{ class: (type_champ == TypeDeChamp.type_champs.fetch(:carte)) ? 'show-inline' : nil } + %h4 Utilisation de la cartographie + %label + = ff.check_box :quartiers_prioritaires + Quartiers prioritaires + %br + %label + = ff.check_box :cadastres + Cadastre + - hide_mandatory = (ff.object.object.private? || type_champ == TypeDeChamp.type_champs.fetch(:explication)) .form-group.mandatory{ style: hide_mandatory ? 'visibility: hidden;' : nil } %h4 Obligatoire ? diff --git a/config/locales/models/type_de_champ/fr.yml b/config/locales/models/type_de_champ/fr.yml index 655429494..2aed2a270 100644 --- a/config/locales/models/type_de_champ/fr.yml +++ b/config/locales/models/type_de_champ/fr.yml @@ -28,3 +28,4 @@ fr: dossier_link: 'Lien vers un autre dossier' piece_justificative: 'Pièce justificative' siret: 'SIRET' + carte: 'Carte'