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

Merge pull request #7798 from E-L-T/7400-lisibilite-liste-de-champs-elt

Browse source 
7400 Améliore la lisibilité de la liste de types de champ
This commit is contained in:
Eric Leroy-Terquem 2022-10-05 09:28:02 +02:00 committed by GitHub
commit 32cdff820f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 118 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/components/types_de_champ_editor/champ_component.rb
View file

@ -56,6 +56,24 @@ class TypesDeChampEditor::ChampComponent < ApplicationComponent
end
def types_of_type_de_champ
if Flipper.enabled?(:categories_type_de_champ, controller.current_user)
cat_scope = "activerecord.attributes.type_de_champ.categorie"
tdc_scope = "activerecord.attributes.type_de_champ.type_champs"
TypeDeChamp.type_champs
.keys
.filter(&method(:filter_type_champ))
.filter(&method(:filter_featured_type_champ))
.filter(&method(:filter_block_type_champ))
.group_by { TypeDeChamp::TYPE_DE_CHAMP_TO_CATEGORIE.fetch(_1.to_sym) }
.sort_by { |k, _v| TypeDeChamp::CATEGORIES.find_index(k) }
.to_h do |cat, tdc|
[
t(cat, scope: cat_scope),
tdc.map { [t(_1, scope: tdc_scope), _1] }
]
end
else
TypeDeChamp.type_champs
.keys
.filter(&method(:filter_type_champ))
@ -64,6 +82,7 @@ class TypesDeChampEditor::ChampComponent < ApplicationComponent
.map { |type_champ| [t("activerecord.attributes.type_de_champ.type_champs.#{type_champ}"), type_champ] }
.sort_by(&:first)
end
end
def piece_justificative_options(form)
{

3
app/components/types_de_champ_editor/champ_component/champ_component.html.haml
View file

@ -19,6 +19,9 @@
%span.sr-only Déplacer le champ vers le bas
.cell.flex.justify-start.column.flex-grow
= form.label :type_champ, "Type de champ", for: dom_id(type_de_champ, :type_champ)
- if Flipper.enabled?(:categories_type_de_champ, controller.current_user)
= form.select :type_champ, grouped_options_for_select(types_of_type_de_champ, type_de_champ.type_champ), {}, class: 'small-margin small inline width-100', id: dom_id(type_de_champ, :type_champ)
- else
= form.select :type_champ, types_of_type_de_champ, {}, class: 'small-margin small inline width-100', id: dom_id(type_de_champ, :type_champ)
.flex.column.justify-start.flex-grow
.cell

55
app/models/type_de_champ.rb
View file

@ -20,6 +20,53 @@ class TypeDeChamp < ApplicationRecord
FILE_MAX_SIZE = 200.megabytes
FEATURE_FLAGS = {}
CADRE = :cadre
STANDARD = :standard
CHOICE = :choice
ETAT_CIVIL = :etat_civil
PAIEMENT_IDENTIFICATION = :paiement_identification
REFERENTIEL_EXTERNE = :referentiel_externe
LOCALISATION = :localisation
CATEGORIES = [CADRE, ETAT_CIVIL, LOCALISATION, PAIEMENT_IDENTIFICATION, STANDARD, CHOICE, REFERENTIEL_EXTERNE]
TYPE_DE_CHAMP_TO_CATEGORIE = {
text: STANDARD,
textarea: STANDARD,
date: STANDARD,
datetime: STANDARD,
number: STANDARD,
decimal_number: STANDARD,
integer_number: STANDARD,
checkbox: CHOICE,
civilite: ETAT_CIVIL,
email: ETAT_CIVIL,
phone: ETAT_CIVIL,
address: LOCALISATION,
yes_no: CHOICE,
drop_down_list: CHOICE,
multiple_drop_down_list: CHOICE,
linked_drop_down_list: CHOICE,
pays: LOCALISATION,
regions: LOCALISATION,
departements: LOCALISATION,
communes: LOCALISATION,
header_section: CADRE,
explication: CADRE,
dossier_link: CADRE,
piece_justificative: STANDARD,
siret: PAIEMENT_IDENTIFICATION,
carte: REFERENTIEL_EXTERNE,
repetition: CADRE,
titre_identite: ETAT_CIVIL,
iban: PAIEMENT_IDENTIFICATION,
annuaire_education: REFERENTIEL_EXTERNE,
cnaf: REFERENTIEL_EXTERNE,
dgfip: REFERENTIEL_EXTERNE,
pole_emploi: REFERENTIEL_EXTERNE,
mesri: REFERENTIEL_EXTERNE
}
enum type_champs: {
text: 'text',
textarea: 'textarea',
@ -37,19 +84,19 @@ class TypeDeChamp < ApplicationRecord
drop_down_list: 'drop_down_list',
multiple_drop_down_list: 'multiple_drop_down_list',
linked_drop_down_list: 'linked_drop_down_list',
pays: 'pays',
regions: 'regions',
departements: 'departements',
communes: 'communes',
departements: 'departements',
regions: 'regions',
pays: 'pays',
header_section: 'header_section',
explication: 'explication',
dossier_link: 'dossier_link',
piece_justificative: 'piece_justificative',
siret: 'siret',
carte: 'carte',
repetition: 'repetition',
titre_identite: 'titre_identite',
iban: 'iban',
siret: 'siret',
annuaire_education: 'annuaire_education',
cnaf: 'cnaf',
dgfip: 'dgfip',

1
config/initializers/flipper.rb
View file

@ -21,6 +21,7 @@ end
features = [
:administrateur_web_hook,
:api_particulier,
:categories_type_de_champ,
:dossier_pdf_vide,
:expert_not_allowed_to_invite,
:hide_instructeur_email,

9
config/locales/models/type_de_champ/fr.yml
View file

@ -4,6 +4,15 @@ fr:
type_de_champ: 'Type de champ'
attributes:
type_de_champ:
categorie:
standard: 'Standard'
choice: 'Choix'
etat_civil: 'État civil'
cadre: 'Cadre'
file: 'Fichier'
paiement_identification: 'Paiement - Identification'
referentiel_externe: 'Référentiel externe'
localisation: 'Localisation'
type_champs:
text: 'Texte'
textarea: 'Zone de texte'

24
spec/services/procedure_export_service_spec.rb
View file

@ -64,18 +64,18 @@ describe ProcedureExportService do
"simple_drop_down_list",
"multiple_drop_down_list",
"linked_drop_down_list",
"pays",
"regions",
"departements",
"communes",
"communes (Code insee)",
"communes (Département)",
"departements",
"regions",
"pays",
"dossier_link",
"piece_justificative",
"siret",
"carte",
"titre_identite",
"iban",
"siret",
"annuaire_education",
"cnaf",
"dgfip",
@ -155,18 +155,18 @@ describe ProcedureExportService do
"simple_drop_down_list",
"multiple_drop_down_list",
"linked_drop_down_list",
"pays",
"regions",
"departements",
"communes",
"communes (Code insee)",
"communes (Département)",
"departements",
"regions",
"pays",
"dossier_link",
"piece_justificative",
"siret",
"carte",
"titre_identite",
"iban",
"siret",
"annuaire_education",
"cnaf",
"dgfip",
@ -241,18 +241,18 @@ describe ProcedureExportService do
"simple_drop_down_list",
"multiple_drop_down_list",
"linked_drop_down_list",
"pays",
"regions",
"departements",
"communes",
"communes (Code insee)",
"communes (Département)",
"departements",
"regions",
"pays",
"dossier_link",
"piece_justificative",
"siret",
"carte",
"titre_identite",
"iban",
"siret",
"annuaire_education",
"cnaf",
"dgfip",

15
spec/system/administrateurs/procedure_creation_spec.rb
View file

@ -69,4 +69,19 @@ describe 'Creating a new procedure', js: true do
expect(champs_card).to have_content('À modifier')
end
end
context 'with feature activated' do
let(:procedure) { create(:procedure, :with_service, administrateur: administrateur) }
before { Flipper.enable(:categories_type_de_champ, administrateur.user) }
after { Flipper.disable(:categories_type_de_champ, administrateur.user) }
it 'types de champ are grouped by categories ' do
visit champs_admin_procedure_path(procedure)
add_champ(remove_flash_message: true)
select('Bloc répétable', from: 'Type de champ')
expect(page).to have_selector('select > optgroup', count: 7)
end
end
end