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

Expose stable_id on champ

Browse source
This commit is contained in:
Paul Chavard 2020-04-30 15:49:31 +02:00
parent aad44dbac8
commit ef2d9e1138
4 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
app/models/champ.rb
View file

@ -86,6 +86,10 @@ class Champ < ApplicationRecord
true true
end end
def stable_id
type_de_champ.stable_id
end
private private
def needs_dossier_id? def needs_dossier_id?

2
app/models/champs/carte_champ.rb
View file

@ -74,7 +74,7 @@ class Champs::CarteChamp < Champ
def to_feature_collection def to_feature_collection
{ {
type: 'FeatureCollection', type: 'FeatureCollection',
id: type_de_champ.stable_id, id: stable_id,
bbox: bounding_box, bbox: bounding_box,
features: (legacy_selections_utilisateur + except_selections_utilisateur).map(&:to_feature) features: (legacy_selections_utilisateur + except_selections_utilisateur).map(&:to_feature)
} }

2
app/models/champs/repetition_champ.rb
View file

@ -35,7 +35,7 @@ class Champs::RepetitionChamp < Champ
# We have to truncate the label here as spreadsheets have a (30 char) limit on length. # We have to truncate the label here as spreadsheets have a (30 char) limit on length.
def libelle_for_export def libelle_for_export
str = "(#{type_de_champ.stable_id}) #{libelle}" str = "(#{stable_id}) #{libelle}"
# /\*?[] are invalid Excel worksheet characters # /\*?[] are invalid Excel worksheet characters
ActiveStorage::Filename.new(str.delete('[]*?')).sanitized.truncate(30) ActiveStorage::Filename.new(str.delete('[]*?')).sanitized.truncate(30)
end end

2
app/views/shared/dossiers/editable_champs/_carte.html.haml
View file

@ -10,4 +10,4 @@
= render partial: 'shared/champs/carte/geo_areas', locals: { champ: champ, error: false } = render partial: 'shared/champs/carte/geo_areas', locals: { champ: champ, error: false }
= form.hidden_field :value, = form.hidden_field :value,
data: { remote: true, feature_collection_id: champ.type_de_champ.stable_id, url: champs_carte_path(form.index), params: champ_carte_params(champ).to_query, method: 'post' } data: { remote: true, feature_collection_id: champ.stable_id, url: champs_carte_path(form.index), params: champ_carte_params(champ).to_query, method: 'post' }