From a38b0e6a0abec1666922d8eec1f8d44ac576acbf Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 19 Jun 2023 14:26:35 +0200 Subject: [PATCH 1/4] more fields in address fields --- .../core.entity_form_display.node.projet.default.yml | 11 +++++++++-- config/sync/field.field.node.projet.field_adresse.yml | 8 ++++---- config/sync/user.role.editeur.yml | 2 ++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/config/sync/core.entity_form_display.node.projet.default.yml b/config/sync/core.entity_form_display.node.projet.default.yml index c219842..191d48f 100644 --- a/config/sync/core.entity_form_display.node.projet.default.yml +++ b/config/sync/core.entity_form_display.node.projet.default.yml @@ -68,6 +68,7 @@ third_party_settings: - status - field_incube - field_neuf_rehabilitation + - promote - field_encours_fini label: Details region: content @@ -143,7 +144,7 @@ content: third_party_settings: { } field_encours_fini: type: options_select - weight: 3 + weight: 4 region: content settings: { } third_party_settings: { } @@ -232,6 +233,13 @@ content: form_display_mode: default default_paragraph_type: '' third_party_settings: { } + promote: + type: boolean_checkbox + weight: 3 + region: content + settings: + display_label: true + third_party_settings: { } status: type: boolean_checkbox weight: 0 @@ -252,7 +260,6 @@ hidden: created: true langcode: true path: true - promote: true sticky: true uid: true url_redirects: true diff --git a/config/sync/field.field.node.projet.field_adresse.yml b/config/sync/field.field.node.projet.field_adresse.yml index c454a60..f2550da 100644 --- a/config/sync/field.field.node.projet.field_adresse.yml +++ b/config/sync/field.field.node.projet.field_adresse.yml @@ -44,11 +44,11 @@ settings: organization: override: hidden addressLine1: - override: hidden + override: optional addressLine2: - override: hidden + override: optional postalCode: - override: hidden + override: optional sortingCode: override: hidden dependentLocality: @@ -56,6 +56,6 @@ settings: locality: override: optional administrativeArea: - override: hidden + override: optional fields: { } field_type: address diff --git a/config/sync/user.role.editeur.yml b/config/sync/user.role.editeur.yml index 73807b0..1bbed36 100644 --- a/config/sync/user.role.editeur.yml +++ b/config/sync/user.role.editeur.yml @@ -12,6 +12,7 @@ dependencies: - node.type.static module: - config_pages + - content_lock - node - system - toolbar @@ -26,6 +27,7 @@ permissions: - 'access toolbar' - 'access webform submission user' - 'administer nodes' + - 'break content lock' - 'create actualite content' - 'create offre_de_service content' - 'create partenaires_logo_footer_ content' From 33368b5a771bd7d5e21011fdca31ae5845909784 Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 19 Jun 2023 14:38:28 +0200 Subject: [PATCH 2/4] =?UTF-8?q?projets=20new=20fields:=20type=20de=20moa,?= =?UTF-8?q?=20type=20de=20projet,=20=C3=A9tape?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ntity_form_display.node.projet.default.yml | 44 ++++++++++++++++--- ...ield.node.projet.field_etape_du_projet.yml | 23 ++++++++++ ...ld.field.node.projet.field_type_de_moa.yml | 29 ++++++++++++ ...field.node.projet.field_type_de_projet.yml | 29 ++++++++++++ ...eld.storage.node.field_etape_du_projet.yml | 36 +++++++++++++++ .../field.storage.node.field_type_de_moa.yml | 20 +++++++++ ...ield.storage.node.field_type_de_projet.yml | 20 +++++++++ ...ent_settings.taxonomy_term.type_de_moa.yml | 11 +++++ ..._settings.taxonomy_term.type_de_projet.yml | 11 +++++ .../sync/taxonomy.vocabulary.type_de_moa.yml | 8 ++++ .../taxonomy.vocabulary.type_de_projet.yml | 8 ++++ 11 files changed, 233 insertions(+), 6 deletions(-) create mode 100644 config/sync/field.field.node.projet.field_etape_du_projet.yml create mode 100644 config/sync/field.field.node.projet.field_type_de_moa.yml create mode 100644 config/sync/field.field.node.projet.field_type_de_projet.yml create mode 100644 config/sync/field.storage.node.field_etape_du_projet.yml create mode 100644 config/sync/field.storage.node.field_type_de_moa.yml create mode 100644 config/sync/field.storage.node.field_type_de_projet.yml create mode 100644 config/sync/language.content_settings.taxonomy_term.type_de_moa.yml create mode 100644 config/sync/language.content_settings.taxonomy_term.type_de_projet.yml create mode 100644 config/sync/taxonomy.vocabulary.type_de_moa.yml create mode 100644 config/sync/taxonomy.vocabulary.type_de_projet.yml diff --git a/config/sync/core.entity_form_display.node.projet.default.yml b/config/sync/core.entity_form_display.node.projet.default.yml index 191d48f..ae006a6 100644 --- a/config/sync/core.entity_form_display.node.projet.default.yml +++ b/config/sync/core.entity_form_display.node.projet.default.yml @@ -7,6 +7,7 @@ dependencies: - field.field.node.projet.field_adresse - field.field.node.projet.field_encours_fini - field.field.node.projet.field_equipe + - field.field.node.projet.field_etape_du_projet - field.field.node.projet.field_fichiers - field.field.node.projet.field_geofield - field.field.node.projet.field_incube @@ -16,6 +17,8 @@ dependencies: - field.field.node.projet.field_photo - field.field.node.projet.field_ressource_s_liee_s_ - field.field.node.projet.field_textes + - field.field.node.projet.field_type_de_moa + - field.field.node.projet.field_type_de_projet - image.style.thumbnail - node.type.projet module: @@ -66,9 +69,12 @@ third_party_settings: group_details: children: - status - - field_incube - - field_neuf_rehabilitation - promote + - field_incube + - field_type_de_moa + - field_type_de_projet + - field_etape_du_projet + - field_neuf_rehabilitation - field_encours_fini label: Details region: content @@ -144,7 +150,7 @@ content: third_party_settings: { } field_encours_fini: type: options_select - weight: 4 + weight: 7 region: content settings: { } third_party_settings: { } @@ -156,6 +162,12 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_etape_du_projet: + type: options_select + weight: 5 + region: content + settings: { } + third_party_settings: { } field_fichiers: type: file_generic weight: 27 @@ -172,7 +184,7 @@ content: third_party_settings: { } field_incube: type: boolean_checkbox - weight: 1 + weight: 2 region: content settings: display_label: true @@ -187,7 +199,7 @@ content: third_party_settings: { } field_neuf_rehabilitation: type: options_select - weight: 2 + weight: 6 region: content settings: { } third_party_settings: { } @@ -233,9 +245,29 @@ content: form_display_mode: default default_paragraph_type: '' third_party_settings: { } + field_type_de_moa: + type: entity_reference_autocomplete + weight: 3 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + field_type_de_projet: + type: entity_reference_autocomplete + weight: 4 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } promote: type: boolean_checkbox - weight: 3 + weight: 1 region: content settings: display_label: true diff --git a/config/sync/field.field.node.projet.field_etape_du_projet.yml b/config/sync/field.field.node.projet.field_etape_du_projet.yml new file mode 100644 index 0000000..1eca9af --- /dev/null +++ b/config/sync/field.field.node.projet.field_etape_du_projet.yml @@ -0,0 +1,23 @@ +uuid: f7279bd9-ef57-4f41-bb20-8589cf556b4d +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_etape_du_projet + - node.type.projet + module: + - options +id: node.projet.field_etape_du_projet +field_name: field_etape_du_projet +entity_type: node +bundle: projet +label: 'Étape du projet' +description: '' +required: false +translatable: false +default_value: + - + value: 1 +default_value_callback: '' +settings: { } +field_type: list_integer diff --git a/config/sync/field.field.node.projet.field_type_de_moa.yml b/config/sync/field.field.node.projet.field_type_de_moa.yml new file mode 100644 index 0000000..97d0241 --- /dev/null +++ b/config/sync/field.field.node.projet.field_type_de_moa.yml @@ -0,0 +1,29 @@ +uuid: 5f72872e-3b22-490f-bd9d-1ae45f85d801 +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_type_de_moa + - node.type.projet + - taxonomy.vocabulary.type_de_moa +id: node.projet.field_type_de_moa +field_name: field_type_de_moa +entity_type: node +bundle: projet +label: 'Type de MOA' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:taxonomy_term' + handler_settings: + target_bundles: + type_de_moa: type_de_moa + sort: + field: name + direction: asc + auto_create: true + auto_create_bundle: '' +field_type: entity_reference diff --git a/config/sync/field.field.node.projet.field_type_de_projet.yml b/config/sync/field.field.node.projet.field_type_de_projet.yml new file mode 100644 index 0000000..91690f5 --- /dev/null +++ b/config/sync/field.field.node.projet.field_type_de_projet.yml @@ -0,0 +1,29 @@ +uuid: f1196716-6848-4852-af62-43632c46deba +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_type_de_projet + - node.type.projet + - taxonomy.vocabulary.type_de_projet +id: node.projet.field_type_de_projet +field_name: field_type_de_projet +entity_type: node +bundle: projet +label: 'Type de projet' +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:taxonomy_term' + handler_settings: + target_bundles: + type_de_projet: type_de_projet + sort: + field: name + direction: asc + auto_create: true + auto_create_bundle: '' +field_type: entity_reference diff --git a/config/sync/field.storage.node.field_etape_du_projet.yml b/config/sync/field.storage.node.field_etape_du_projet.yml new file mode 100644 index 0000000..89c15c1 --- /dev/null +++ b/config/sync/field.storage.node.field_etape_du_projet.yml @@ -0,0 +1,36 @@ +uuid: df73553c-1d9a-4349-a209-4700293d613d +langcode: fr +status: true +dependencies: + module: + - node + - options +id: node.field_etape_du_projet +field_name: field_etape_du_projet +entity_type: node +type: list_integer +settings: + allowed_values: + - + value: 1 + label: 'étape 1' + - + value: 2 + label: 'étape 2' + - + value: 3 + label: 'étape 3' + - + value: 4 + label: 'étape 4' + - + value: 5 + label: 'étape 5' + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.node.field_type_de_moa.yml b/config/sync/field.storage.node.field_type_de_moa.yml new file mode 100644 index 0000000..7bf0d31 --- /dev/null +++ b/config/sync/field.storage.node.field_type_de_moa.yml @@ -0,0 +1,20 @@ +uuid: 518b5923-17c4-4293-af33-5d311d5c717a +langcode: fr +status: true +dependencies: + module: + - node + - taxonomy +id: node.field_type_de_moa +field_name: field_type_de_moa +entity_type: node +type: entity_reference +settings: + target_type: taxonomy_term +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/field.storage.node.field_type_de_projet.yml b/config/sync/field.storage.node.field_type_de_projet.yml new file mode 100644 index 0000000..b513af9 --- /dev/null +++ b/config/sync/field.storage.node.field_type_de_projet.yml @@ -0,0 +1,20 @@ +uuid: 39dc9980-6305-4e3d-a003-68cf80026904 +langcode: fr +status: true +dependencies: + module: + - node + - taxonomy +id: node.field_type_de_projet +field_name: field_type_de_projet +entity_type: node +type: entity_reference +settings: + target_type: taxonomy_term +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/config/sync/language.content_settings.taxonomy_term.type_de_moa.yml b/config/sync/language.content_settings.taxonomy_term.type_de_moa.yml new file mode 100644 index 0000000..69372a0 --- /dev/null +++ b/config/sync/language.content_settings.taxonomy_term.type_de_moa.yml @@ -0,0 +1,11 @@ +uuid: 28326192-31a4-4a79-8403-09661e4f82a4 +langcode: fr +status: true +dependencies: + config: + - taxonomy.vocabulary.type_de_moa +id: taxonomy_term.type_de_moa +target_entity_type_id: taxonomy_term +target_bundle: type_de_moa +default_langcode: site_default +language_alterable: false diff --git a/config/sync/language.content_settings.taxonomy_term.type_de_projet.yml b/config/sync/language.content_settings.taxonomy_term.type_de_projet.yml new file mode 100644 index 0000000..404dd20 --- /dev/null +++ b/config/sync/language.content_settings.taxonomy_term.type_de_projet.yml @@ -0,0 +1,11 @@ +uuid: 9cd741fb-306b-4876-9ba4-d885cfd65216 +langcode: fr +status: true +dependencies: + config: + - taxonomy.vocabulary.type_de_projet +id: taxonomy_term.type_de_projet +target_entity_type_id: taxonomy_term +target_bundle: type_de_projet +default_langcode: site_default +language_alterable: false diff --git a/config/sync/taxonomy.vocabulary.type_de_moa.yml b/config/sync/taxonomy.vocabulary.type_de_moa.yml new file mode 100644 index 0000000..9e213d3 --- /dev/null +++ b/config/sync/taxonomy.vocabulary.type_de_moa.yml @@ -0,0 +1,8 @@ +uuid: c470345b-eacc-4320-8263-b20c51833791 +langcode: fr +status: true +dependencies: { } +name: 'Type de MOA' +vid: type_de_moa +description: '' +weight: 0 diff --git a/config/sync/taxonomy.vocabulary.type_de_projet.yml b/config/sync/taxonomy.vocabulary.type_de_projet.yml new file mode 100644 index 0000000..38a3cfb --- /dev/null +++ b/config/sync/taxonomy.vocabulary.type_de_projet.yml @@ -0,0 +1,8 @@ +uuid: 7aa853ed-9e82-42f6-9a76-17d319b7e07a +langcode: fr +status: true +dependencies: { } +name: 'Type de projet' +vid: type_de_projet +description: '' +weight: 0 From 4622192356586351529044f2845ae687e0f8f92d Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 19 Jun 2023 15:52:48 +0200 Subject: [PATCH 3/4] added region field as address field do not take care of it --- ...ntity_form_display.node.projet.default.yml | 18 +++-- ...ntity_view_display.node.projet.default.yml | 34 +++++++++ ...entity_view_display.node.projet.teaser.yml | 8 ++ .../field.field.node.projet.field_region.yml | 21 ++++++ .../sync/field.storage.node.field_region.yml | 75 +++++++++++++++++++ 5 files changed, 151 insertions(+), 5 deletions(-) create mode 100644 config/sync/field.field.node.projet.field_region.yml create mode 100644 config/sync/field.storage.node.field_region.yml diff --git a/config/sync/core.entity_form_display.node.projet.default.yml b/config/sync/core.entity_form_display.node.projet.default.yml index ae006a6..37b0265 100644 --- a/config/sync/core.entity_form_display.node.projet.default.yml +++ b/config/sync/core.entity_form_display.node.projet.default.yml @@ -15,6 +15,7 @@ dependencies: - field.field.node.projet.field_neuf_rehabilitation - field.field.node.projet.field_partenaires - field.field.node.projet.field_photo + - field.field.node.projet.field_region - field.field.node.projet.field_ressource_s_liee_s_ - field.field.node.projet.field_textes - field.field.node.projet.field_type_de_moa @@ -71,6 +72,7 @@ third_party_settings: - status - promote - field_incube + - field_region - field_type_de_moa - field_type_de_projet - field_etape_du_projet @@ -150,7 +152,7 @@ content: third_party_settings: { } field_encours_fini: type: options_select - weight: 7 + weight: 8 region: content settings: { } third_party_settings: { } @@ -164,7 +166,7 @@ content: third_party_settings: { } field_etape_du_projet: type: options_select - weight: 5 + weight: 6 region: content settings: { } third_party_settings: { } @@ -199,7 +201,7 @@ content: third_party_settings: { } field_neuf_rehabilitation: type: options_select - weight: 6 + weight: 7 region: content settings: { } third_party_settings: { } @@ -223,6 +225,12 @@ content: progress_indicator: throbber preview_image_style: thumbnail third_party_settings: { } + field_region: + type: options_select + weight: 3 + region: content + settings: { } + third_party_settings: { } field_ressource_s_liee_s_: type: entity_reference_autocomplete weight: 4 @@ -247,7 +255,7 @@ content: third_party_settings: { } field_type_de_moa: type: entity_reference_autocomplete - weight: 3 + weight: 4 region: content settings: match_operator: CONTAINS @@ -257,7 +265,7 @@ content: third_party_settings: { } field_type_de_projet: type: entity_reference_autocomplete - weight: 4 + weight: 5 region: content settings: match_operator: CONTAINS diff --git a/config/sync/core.entity_view_display.node.projet.default.yml b/config/sync/core.entity_view_display.node.projet.default.yml index 105bb31..cebdc56 100644 --- a/config/sync/core.entity_view_display.node.projet.default.yml +++ b/config/sync/core.entity_view_display.node.projet.default.yml @@ -7,6 +7,7 @@ dependencies: - field.field.node.projet.field_adresse - field.field.node.projet.field_encours_fini - field.field.node.projet.field_equipe + - field.field.node.projet.field_etape_du_projet - field.field.node.projet.field_fichiers - field.field.node.projet.field_geofield - field.field.node.projet.field_incube @@ -14,8 +15,11 @@ dependencies: - field.field.node.projet.field_neuf_rehabilitation - field.field.node.projet.field_partenaires - field.field.node.projet.field_photo + - field.field.node.projet.field_region - field.field.node.projet.field_ressource_s_liee_s_ - field.field.node.projet.field_textes + - field.field.node.projet.field_type_de_moa + - field.field.node.projet.field_type_de_projet - node.type.projet module: - address @@ -61,6 +65,13 @@ content: third_party_settings: { } weight: 113 region: content + field_etape_du_projet: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 116 + region: content field_fichiers: type: file_default label: above @@ -125,6 +136,13 @@ content: third_party_settings: { } weight: 110 region: content + field_region: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 117 + region: content field_ressource_s_liee_s_: type: entity_reference_label label: above @@ -142,6 +160,22 @@ content: third_party_settings: { } weight: 105 region: content + field_type_de_moa: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 114 + region: content + field_type_de_projet: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 115 + region: content links: settings: { } third_party_settings: { } diff --git a/config/sync/core.entity_view_display.node.projet.teaser.yml b/config/sync/core.entity_view_display.node.projet.teaser.yml index 4212d45..b3d1a82 100644 --- a/config/sync/core.entity_view_display.node.projet.teaser.yml +++ b/config/sync/core.entity_view_display.node.projet.teaser.yml @@ -8,6 +8,7 @@ dependencies: - field.field.node.projet.field_adresse - field.field.node.projet.field_encours_fini - field.field.node.projet.field_equipe + - field.field.node.projet.field_etape_du_projet - field.field.node.projet.field_fichiers - field.field.node.projet.field_geofield - field.field.node.projet.field_incube @@ -15,8 +16,11 @@ dependencies: - field.field.node.projet.field_neuf_rehabilitation - field.field.node.projet.field_partenaires - field.field.node.projet.field_photo + - field.field.node.projet.field_region - field.field.node.projet.field_ressource_s_liee_s_ - field.field.node.projet.field_textes + - field.field.node.projet.field_type_de_moa + - field.field.node.projet.field_type_de_projet - image.style.large - node.type.projet module: @@ -68,13 +72,17 @@ hidden: created: true field_encours_fini: true field_equipe: true + field_etape_du_projet: true field_fichiers: true field_geofield: true field_liens: true field_neuf_rehabilitation: true field_partenaires: true + field_region: true field_ressource_s_liee_s_: true field_textes: true + field_type_de_moa: true + field_type_de_projet: true langcode: true links: true search_api_excerpt: true diff --git a/config/sync/field.field.node.projet.field_region.yml b/config/sync/field.field.node.projet.field_region.yml new file mode 100644 index 0000000..c324ad1 --- /dev/null +++ b/config/sync/field.field.node.projet.field_region.yml @@ -0,0 +1,21 @@ +uuid: da92ab0c-5d56-46c8-8d71-99b998d0aebd +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_region + - node.type.projet + module: + - options +id: node.projet.field_region +field_name: field_region +entity_type: node +bundle: projet +label: Région +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: list_integer diff --git a/config/sync/field.storage.node.field_region.yml b/config/sync/field.storage.node.field_region.yml new file mode 100644 index 0000000..825952b --- /dev/null +++ b/config/sync/field.storage.node.field_region.yml @@ -0,0 +1,75 @@ +uuid: f4dbdd31-5ef7-43f7-b2f8-10150616c2e5 +langcode: fr +status: true +dependencies: + module: + - node + - options +id: node.field_region +field_name: field_region +entity_type: node +type: list_integer +settings: + allowed_values: + - + value: 0 + label: Auvergne-Rhône-Alpes + - + value: 1 + label: Bourgogne-Franche-Comté + - + value: 2 + label: Bretagne + - + value: 3 + label: 'Centre-Val de Loire' + - + value: 4 + label: Corse + - + value: 5 + label: 'Grand Est' + - + value: 6 + label: Hauts-de-France + - + value: 7 + label: Île-de-France + - + value: 8 + label: Normandie + - + value: 9 + label: Nouvelle-Aquitaine + - + value: 10 + label: Occitanie + - + value: 11 + label: 'Pays de la Loire' + - + value: 12 + label: 'Provence-Alpes-Côte d''Azur' + - + value: 13 + label: Guadeloupe + - + value: 14 + label: Martinique + - + value: 15 + label: Guyane + - + value: 16 + label: 'La Réunion' + - + value: 17 + label: Mayotte + allowed_values_function: '' +module: options +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false From b2503c69b24e60ba52f20ed694578e4f4060e8ca Mon Sep 17 00:00:00 2001 From: bach Date: Mon, 19 Jun 2023 17:06:04 +0200 Subject: [PATCH 4/4] =?UTF-8?q?projet=20=C3=A9tapes=20labels?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../sync/field.storage.node.field_etape_du_projet.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config/sync/field.storage.node.field_etape_du_projet.yml b/config/sync/field.storage.node.field_etape_du_projet.yml index 89c15c1..683cc9f 100644 --- a/config/sync/field.storage.node.field_etape_du_projet.yml +++ b/config/sync/field.storage.node.field_etape_du_projet.yml @@ -13,19 +13,19 @@ settings: allowed_values: - value: 1 - label: 'étape 1' + label: 'Études pré-opérationnelles/complémentaires' - value: 2 - label: 'étape 2' + label: 'Dépôt de PC' - value: 3 - label: 'étape 3' + label: 'Consultation des entreprises' - value: 4 - label: 'étape 4' + label: Chantier - value: 5 - label: 'étape 5' + label: 'Projet livré' allowed_values_function: '' module: options locked: false