From ae01216e60c5e1c5322df3511d60910a3b8da7cc Mon Sep 17 00:00:00 2001 From: bach Date: Wed, 10 May 2023 22:37:29 +0200 Subject: [PATCH] more puissance d'agir --- src/composer.json | 4 + src/composer.lock | 279 +++++++++++++++++- .../auto_entitylabel.settings.node.besoin.yml | 2 +- ...auto_entitylabel.settings.node.reponse.yml | 9 + ...corresponding_reference.besoin_reponse.yml | 14 + ...ntity_form_display.node.besoin.default.yml | 9 + ...tity_form_display.node.reponse.default.yml | 124 +++++++- ...ntity_view_display.node.besoin.default.yml | 10 + ...entity_view_display.node.besoin.teaser.yml | 2 + ...tity_view_display.node.reponse.default.yml | 41 ++- ...ntity_view_display.node.reponse.teaser.yml | 20 +- src/config/sync/core.extension.yml | 4 + .../field.field.node.besoin.field_index.yml | 23 ++ .../sync/field.field.node.reponse.body.yml | 23 -- .../field.field.node.reponse.field_avec.yml | 21 ++ .../field.field.node.reponse.field_besoin.yml | 29 ++ .../field.field.node.reponse.field_ou.yml | 21 ++ .../field.field.node.reponse.field_qui.yml | 21 ++ .../field.field.node.reponse.field_quoi.yml | 21 ++ .../sync/field.storage.node.field_avec.yml | 19 ++ .../sync/field.storage.node.field_index.yml | 20 ++ .../sync/field.storage.node.field_ou.yml | 19 ++ .../sync/field.storage.node.field_qui.yml | 19 ++ .../sync/field.storage.node.field_quoi.yml | 19 ++ src/config/sync/user.role.admin.yml | 5 + src/config/sync/user.role.group_admin.yml | 4 + src/config/sync/user.role.group_member.yml | 4 + src/config/sync/user.role.user.yml | 4 + .../ouatt_puissanceagir.module | 8 +- .../ouatminimal_theme/css/ouatminimal.css | 12 + .../ouatminimal_theme/css/ouatminimal.css.map | 2 +- .../ouatminimal_theme/ouatminimal.theme | 18 ++ .../ouatminimal_theme/scss/ouatminimal.scss | 11 + 33 files changed, 789 insertions(+), 52 deletions(-) create mode 100644 src/config/sync/auto_entitylabel.settings.node.reponse.yml create mode 100644 src/config/sync/cer.corresponding_reference.besoin_reponse.yml create mode 100644 src/config/sync/field.field.node.besoin.field_index.yml delete mode 100644 src/config/sync/field.field.node.reponse.body.yml create mode 100644 src/config/sync/field.field.node.reponse.field_avec.yml create mode 100644 src/config/sync/field.field.node.reponse.field_besoin.yml create mode 100644 src/config/sync/field.field.node.reponse.field_ou.yml create mode 100644 src/config/sync/field.field.node.reponse.field_qui.yml create mode 100644 src/config/sync/field.field.node.reponse.field_quoi.yml create mode 100644 src/config/sync/field.storage.node.field_avec.yml create mode 100644 src/config/sync/field.storage.node.field_index.yml create mode 100644 src/config/sync/field.storage.node.field_ou.yml create mode 100644 src/config/sync/field.storage.node.field_qui.yml create mode 100644 src/config/sync/field.storage.node.field_quoi.yml diff --git a/src/composer.json b/src/composer.json index 7b9e0c7..c76a504 100644 --- a/src/composer.json +++ b/src/composer.json @@ -23,11 +23,14 @@ "drupal/audiofield": "1.x-dev@dev", "drupal/auto_entitylabel": "^3.0", "drupal/base_field_override_ui": "^1.1", + "drupal/cer": "^5.0@beta", + "drupal/conditional_fields": "^4.0@alpha", "drupal/config_pages": "^2.14", "drupal/core-composer-scaffold": "^9", "drupal/core-project-message": "^9", "drupal/core-recommended": "^9", "drupal/entity_limit": "^2.0@alpha", + "drupal/field_hidden": "^2.0", "drupal/flexible_permissions": "@beta", "drupal/genpass": "^1.1", "drupal/graphql": "4.x-dev@dev", @@ -36,6 +39,7 @@ "drupal/mail_login": "^2.6", "drupal/paragraphs": "^1.15", "drupal/paragraphs_modal_edit": "^1.1", + "drupal/prepopulate": "^2.4", "drupal/regcode": "^1.1", "drupal/restui": "^1.21", "drupal/role_delegation": "^1.2", diff --git a/src/composer.lock b/src/composer.lock index 3439ecb..856ac0b 100644 --- a/src/composer.lock +++ b/src/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "This file is @generated automatically" ], - "content-hash": "d34a483af063733e7e63ed66c1314ff5", + "content-hash": "ef8573820b719325e4b4449166687561", "packages": [ { "name": "alchemy/zippy", @@ -3242,6 +3242,165 @@ "source": "https://git.drupalcode.org/project/bulkdelete" } }, + { + "name": "drupal/cer", + "version": "5.0.0-beta3", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/cer.git", + "reference": "5.0.0-beta3" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/cer-5.0.0-beta3.zip", + "reference": "5.0.0-beta3", + "shasum": "732e95528a8aa0771f38785a5db49861612da150" + }, + "require": { + "drupal/core": "^9.5 || ^10" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "5.0.0-beta3", + "datestamp": "1679926745", + "security-coverage": { + "status": "not-covered", + "message": "Project has not opted into security advisory coverage!" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Anybody", + "homepage": "https://www.drupal.org/user/291091" + }, + { + "name": "bmcclure", + "homepage": "https://www.drupal.org/user/278485" + }, + { + "name": "chertzog", + "homepage": "https://www.drupal.org/user/806366" + }, + { + "name": "gcb", + "homepage": "https://www.drupal.org/user/1682976" + }, + { + "name": "gregcube", + "homepage": "https://www.drupal.org/user/336930" + }, + { + "name": "Grevil", + "homepage": "https://www.drupal.org/user/3668491" + }, + { + "name": "jrglasgow", + "homepage": "https://www.drupal.org/user/36590" + }, + { + "name": "phenaproxima", + "homepage": "https://www.drupal.org/user/205645" + } + ], + "description": "Allows user to create two-way references between entities.", + "homepage": "https://www.drupal.org/project/cer", + "support": { + "source": "https://git.drupalcode.org/project/cer" + } + }, + { + "name": "drupal/conditional_fields", + "version": "4.0.0-alpha2", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/conditional_fields.git", + "reference": "4.0.0-alpha2" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/conditional_fields-4.0.0-alpha2.zip", + "reference": "4.0.0-alpha2", + "shasum": "acc5658cb370583449d119a4172b7e0c2d81c86a" + }, + "require": { + "drupal/core": "^8 || ^9 || ^10" + }, + "require-dev": { + "drupal/paragraphs": "*" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "4.0.0-alpha2", + "datestamp": "1677271425", + "security-coverage": { + "status": "not-covered", + "message": "Alpha releases are not covered by Drupal security advisories." + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "colan", + "homepage": "https://www.drupal.org/user/58704" + }, + { + "name": "ergonlogic", + "homepage": "https://www.drupal.org/user/368613" + }, + { + "name": "geek-merlin", + "homepage": "https://www.drupal.org/user/229048" + }, + { + "name": "heddn", + "homepage": "https://www.drupal.org/user/1463982" + }, + { + "name": "itsekhmistro", + "homepage": "https://www.drupal.org/user/928152" + }, + { + "name": "mparker17", + "homepage": "https://www.drupal.org/user/536298" + }, + { + "name": "OlgaRabodzei", + "homepage": "https://www.drupal.org/user/3389198" + }, + { + "name": "peterpoe", + "homepage": "https://www.drupal.org/user/55674" + }, + { + "name": "saurabh-2k17", + "homepage": "https://www.drupal.org/user/3622252" + }, + { + "name": "szhu", + "homepage": "https://www.drupal.org/user/3525295" + }, + { + "name": "thalles", + "homepage": "https://www.drupal.org/user/3589086" + } + ], + "description": "Define dependencies between fields based on their states and values.", + "homepage": "https://www.drupal.org/project/conditional_fields", + "support": { + "source": "https://git.drupalcode.org/project/conditional_fields" + } + }, { "name": "drupal/config_devel", "version": "dev-1.x", @@ -5501,6 +5660,54 @@ "issues": "https://www.drupal.org/project/issues/field_group" } }, + { + "name": "drupal/field_hidden", + "version": "2.0.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/field_hidden.git", + "reference": "2.0.0" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/field_hidden-2.0.0.zip", + "reference": "2.0.0", + "shasum": "db3931cff316ac940c5dd9db9f0eaf74c7acf9ab" + }, + "require": { + "drupal/core": "^8 || ^9" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "2.0.0", + "datestamp": "1598344371", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "amitsedaiz", + "homepage": "https://www.drupal.org/user/1992830" + }, + { + "name": "jacobfriis", + "homepage": "https://www.drupal.org/user/1558990" + } + ], + "description": "Defines hidden element widgets for number and (plain)text field types.", + "homepage": "https://www.drupal.org/project/field_hidden", + "support": { + "source": "https://git.drupalcode.org/project/field_hidden" + } + }, { "name": "drupal/file_mdm", "version": "2.4.0", @@ -7745,6 +7952,74 @@ "issues": "https://www.drupal.org/project/issues/persistent_login" } }, + { + "name": "drupal/prepopulate", + "version": "2.4.0", + "source": { + "type": "git", + "url": "https://git.drupalcode.org/project/prepopulate.git", + "reference": "8.x-2.4" + }, + "dist": { + "type": "zip", + "url": "https://ftp.drupal.org/files/projects/prepopulate-8.x-2.4.zip", + "reference": "8.x-2.4", + "shasum": "5e82bd6cbbaafc8320e8b3e48bc3862de4964e00" + }, + "require": { + "drupal/core": "^8 || ^9 || ^10" + }, + "require-dev": { + "drupal/inline_entity_form": "^1.0@beta", + "drupal/og": "^1.0@alpha" + }, + "type": "drupal-module", + "extra": { + "drupal": { + "version": "8.x-2.4", + "datestamp": "1678728834", + "security-coverage": { + "status": "covered", + "message": "Covered by Drupal's security advisory policy" + } + } + }, + "notification-url": "https://packages.drupal.org/8/downloads", + "license": [ + "GPL-2.0-or-later" + ], + "authors": [ + { + "name": "Heddn", + "homepage": "https://www.drupal.org/u/heddn", + "role": "Maintainer" + }, + { + "name": "Jbrauer", + "homepage": "https://www.drupal.org/u/jbrauer", + "role": "Maintainer" + }, + { + "name": "Eafarris", + "homepage": "https://www.drupal.org/u/eafarris", + "role": "Maintainer" + }, + { + "name": "FF1", + "homepage": "https://www.drupal.org/u/ff1", + "role": "Maintainer" + } + ], + "description": "Allows form elements to be prepopulated from the URL.", + "homepage": "https://www.drupal.org/project/prepopulate", + "keywords": [ + "Drupal" + ], + "support": { + "source": "https://git.drupalcode.org/project/prepopulate", + "issues": "https://www.drupal.org/project/issues/prepopulate" + } + }, { "name": "drupal/profile", "version": "1.4.0", @@ -14782,6 +15057,8 @@ "minimum-stability": "stable", "stability-flags": { "drupal/audiofield": 20, + "drupal/cer": 10, + "drupal/conditional_fields": 15, "drupal/entity_limit": 15, "drupal/flexible_permissions": 10, "drupal/graphql": 20, diff --git a/src/config/sync/auto_entitylabel.settings.node.besoin.yml b/src/config/sync/auto_entitylabel.settings.node.besoin.yml index 03a28e2..a52dab2 100644 --- a/src/config/sync/auto_entitylabel.settings.node.besoin.yml +++ b/src/config/sync/auto_entitylabel.settings.node.besoin.yml @@ -1,5 +1,5 @@ status: 1 -pattern: 'besoin-[node:field_concernement:entity:title]-[random:hash:sha1]' +pattern: 'besoin-[node:field_concernement:entity:title]-[node:field_index:value]' escape: false preserve_titles: false save: false diff --git a/src/config/sync/auto_entitylabel.settings.node.reponse.yml b/src/config/sync/auto_entitylabel.settings.node.reponse.yml new file mode 100644 index 0000000..6626d9d --- /dev/null +++ b/src/config/sync/auto_entitylabel.settings.node.reponse.yml @@ -0,0 +1,9 @@ +status: 1 +pattern: 'reponse-[node:field_besoin:entity:title]-[random:hash:sha1]' +escape: false +preserve_titles: false +save: false +chunk: 50 +dependencies: + config: + - node.type.reponse diff --git a/src/config/sync/cer.corresponding_reference.besoin_reponse.yml b/src/config/sync/cer.corresponding_reference.besoin_reponse.yml new file mode 100644 index 0000000..2b8b596 --- /dev/null +++ b/src/config/sync/cer.corresponding_reference.besoin_reponse.yml @@ -0,0 +1,14 @@ +uuid: b1ad7d7a-85f2-485c-aabc-4f557f54e115 +langcode: fr +status: true +dependencies: { } +id: besoin_reponse +label: 'besoin reponse' +enabled: true +first_field: field_besoin +second_field: field_reponse +add_direction: append +bundles: + node: + - besoin + - reponse diff --git a/src/config/sync/core.entity_form_display.node.besoin.default.yml b/src/config/sync/core.entity_form_display.node.besoin.default.yml index 1d576c4..0ea6a4e 100644 --- a/src/config/sync/core.entity_form_display.node.besoin.default.yml +++ b/src/config/sync/core.entity_form_display.node.besoin.default.yml @@ -5,10 +5,12 @@ dependencies: config: - field.field.node.besoin.body - field.field.node.besoin.field_concernement + - field.field.node.besoin.field_index - field.field.node.besoin.field_reponse - node.type.besoin module: - field_group + - field_hidden - text third_party_settings: field_group: @@ -82,6 +84,13 @@ content: size: 60 placeholder: '' third_party_settings: { } + field_index: + type: field_hidden_number + weight: 16 + region: content + settings: + placeholder: '' + third_party_settings: { } field_reponse: type: entity_reference_autocomplete weight: 3 diff --git a/src/config/sync/core.entity_form_display.node.reponse.default.yml b/src/config/sync/core.entity_form_display.node.reponse.default.yml index 5826333..8942935 100644 --- a/src/config/sync/core.entity_form_display.node.reponse.default.yml +++ b/src/config/sync/core.entity_form_display.node.reponse.default.yml @@ -3,33 +3,134 @@ langcode: fr status: true dependencies: config: - - field.field.node.reponse.body + - field.field.node.reponse.field_avec + - field.field.node.reponse.field_besoin + - field.field.node.reponse.field_ou + - field.field.node.reponse.field_qui + - field.field.node.reponse.field_quoi - node.type.reponse module: + - conditional_fields - text id: node.reponse.default targetEntityType: node bundle: reponse mode: default content: - body: - type: text_textarea_with_summary - weight: 1 + field_avec: + type: text_textarea + weight: 3 region: content settings: - rows: 9 - summary_rows: 3 + rows: 5 placeholder: '' - show_summary: false - third_party_settings: { } - title: - type: string_textfield - weight: 0 + third_party_settings: + conditional_fields: + 6bf630d8-0666-40fa-9bd9-e316f67d31bb: + entity_type: node + bundle: reponse + dependee: field_ou + settings: + state: visible + reset: true + condition: '!empty' + grouping: AND + values_set: 1 + value: '' + values: { } + value_form: + - + format: linkonly + value: '' + effect: slide + effect_options: + fade: + speed: '400' + slide: + speed: '400' + selector: '' + field_besoin: + type: entity_reference_autocomplete + weight: 4 region: content settings: + match_operator: CONTAINS + match_limit: 10 size: 60 placeholder: '' third_party_settings: { } + field_ou: + type: text_textarea + weight: 2 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: + conditional_fields: + d605b7fd-3063-4450-a3b2-ec6dae88e9bf: + entity_type: node + bundle: reponse + dependee: field_quoi + settings: + state: visible + reset: true + condition: '!empty' + grouping: AND + values_set: 1 + value: '' + values: { } + value_form: + - + format: linkonly + value: '' + effect: slide + effect_options: + fade: + speed: '400' + slide: + speed: '400' + selector: '' + field_qui: + type: text_textarea + weight: 0 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + field_quoi: + type: text_textarea + weight: 1 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: + conditional_fields: + 6ed65c54-cd81-4ac0-9fd1-be2ca043f2b8: + entity_type: node + bundle: reponse + dependee: field_qui + settings: + state: visible + reset: true + condition: '!empty' + grouping: AND + values_set: 1 + value: '' + values: { } + value_form: + - + format: linkonly + value: '' + effect: slide + effect_options: + fade: + speed: '400' + slide: + speed: '400' + selector: '' hidden: created: true langcode: true @@ -38,5 +139,6 @@ hidden: revision_log: true status: true sticky: true + title: true uid: true url_redirects: true diff --git a/src/config/sync/core.entity_view_display.node.besoin.default.yml b/src/config/sync/core.entity_view_display.node.besoin.default.yml index e216f95..1db0bd5 100644 --- a/src/config/sync/core.entity_view_display.node.besoin.default.yml +++ b/src/config/sync/core.entity_view_display.node.besoin.default.yml @@ -5,6 +5,7 @@ dependencies: config: - field.field.node.besoin.body - field.field.node.besoin.field_concernement + - field.field.node.besoin.field_index - field.field.node.besoin.field_reponse - node.type.besoin module: @@ -30,6 +31,15 @@ content: third_party_settings: { } weight: 102 region: content + field_index: + type: number_integer + label: above + settings: + thousand_separator: '' + prefix_suffix: true + third_party_settings: { } + weight: 104 + region: content field_reponse: type: entity_reference_label label: above diff --git a/src/config/sync/core.entity_view_display.node.besoin.teaser.yml b/src/config/sync/core.entity_view_display.node.besoin.teaser.yml index 5e84290..999155b 100644 --- a/src/config/sync/core.entity_view_display.node.besoin.teaser.yml +++ b/src/config/sync/core.entity_view_display.node.besoin.teaser.yml @@ -6,6 +6,7 @@ dependencies: - core.entity_view_mode.node.teaser - field.field.node.besoin.body - field.field.node.besoin.field_concernement + - field.field.node.besoin.field_index - field.field.node.besoin.field_reponse - node.type.besoin module: @@ -31,6 +32,7 @@ content: region: content hidden: field_concernement: true + field_index: true field_reponse: true langcode: true search_api_excerpt: true diff --git a/src/config/sync/core.entity_view_display.node.reponse.default.yml b/src/config/sync/core.entity_view_display.node.reponse.default.yml index 11d505a..47de564 100644 --- a/src/config/sync/core.entity_view_display.node.reponse.default.yml +++ b/src/config/sync/core.entity_view_display.node.reponse.default.yml @@ -3,7 +3,11 @@ langcode: fr status: true dependencies: config: - - field.field.node.reponse.body + - field.field.node.reponse.field_avec + - field.field.node.reponse.field_besoin + - field.field.node.reponse.field_ou + - field.field.node.reponse.field_qui + - field.field.node.reponse.field_quoi - node.type.reponse module: - text @@ -13,12 +17,41 @@ targetEntityType: node bundle: reponse mode: default content: - body: + field_avec: type: text_default - label: hidden + label: above settings: { } third_party_settings: { } - weight: 101 + weight: 106 + region: content + field_besoin: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 102 + region: content + field_ou: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 105 + region: content + field_qui: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 103 + region: content + field_quoi: + type: text_default + label: above + settings: { } + third_party_settings: { } + weight: 104 region: content links: settings: { } diff --git a/src/config/sync/core.entity_view_display.node.reponse.teaser.yml b/src/config/sync/core.entity_view_display.node.reponse.teaser.yml index c0cad58..b5b4085 100644 --- a/src/config/sync/core.entity_view_display.node.reponse.teaser.yml +++ b/src/config/sync/core.entity_view_display.node.reponse.teaser.yml @@ -4,29 +4,29 @@ status: true dependencies: config: - core.entity_view_mode.node.teaser - - field.field.node.reponse.body + - field.field.node.reponse.field_avec + - field.field.node.reponse.field_besoin + - field.field.node.reponse.field_ou + - field.field.node.reponse.field_qui + - field.field.node.reponse.field_quoi - node.type.reponse module: - - text - user id: node.reponse.teaser targetEntityType: node bundle: reponse mode: teaser content: - body: - type: text_summary_or_trimmed - label: hidden - settings: - trim_length: 600 - third_party_settings: { } - weight: 101 - region: content links: settings: { } third_party_settings: { } weight: 100 region: content hidden: + field_avec: true + field_besoin: true + field_ou: true + field_qui: true + field_quoi: true langcode: true search_api_excerpt: true diff --git a/src/config/sync/core.extension.yml b/src/config/sync/core.extension.yml index 79b7998..3110ab5 100644 --- a/src/config/sync/core.extension.yml +++ b/src/config/sync/core.extension.yml @@ -23,7 +23,9 @@ module: block_class: 0 breakpoint: 0 bulkdelete: 0 + cer: 0 ckeditor: 0 + conditional_fields: 0 config: 0 config_devel: 0 config_filter: 0 @@ -56,6 +58,7 @@ module: entity_reference_revisions: 0 field: 0 field_group: 0 + field_hidden: 0 field_ui: 0 file: 0 filter: 0 @@ -103,6 +106,7 @@ module: path_alias_xt: 0 pathologic: 0 persistent_login: 0 + prepopulate: 0 redirect: 0 redis: 0 regcode: 0 diff --git a/src/config/sync/field.field.node.besoin.field_index.yml b/src/config/sync/field.field.node.besoin.field_index.yml new file mode 100644 index 0000000..c9d1c3a --- /dev/null +++ b/src/config/sync/field.field.node.besoin.field_index.yml @@ -0,0 +1,23 @@ +uuid: 934ad462-6d4b-4ce8-be17-e3991d8a683f +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_index + - node.type.besoin +id: node.besoin.field_index +field_name: field_index +entity_type: node +bundle: besoin +label: index +description: 'hidden field prepopulated by code. Only used for auto entity label (naming the besoin with field delta of IEF (inline entity reference) in the concernement)' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + min: null + max: null + prefix: '' + suffix: '' +field_type: integer diff --git a/src/config/sync/field.field.node.reponse.body.yml b/src/config/sync/field.field.node.reponse.body.yml deleted file mode 100644 index a9deabd..0000000 --- a/src/config/sync/field.field.node.reponse.body.yml +++ /dev/null @@ -1,23 +0,0 @@ -uuid: 3fb92c3b-505d-4991-abde-b44e3f7a8ae0 -langcode: fr -status: true -dependencies: - config: - - field.storage.node.body - - node.type.reponse - module: - - text -id: node.reponse.body -field_name: body -entity_type: node -bundle: reponse -label: Body -description: '' -required: false -translatable: true -default_value: { } -default_value_callback: '' -settings: - display_summary: true - required_summary: false -field_type: text_with_summary diff --git a/src/config/sync/field.field.node.reponse.field_avec.yml b/src/config/sync/field.field.node.reponse.field_avec.yml new file mode 100644 index 0000000..754c0a9 --- /dev/null +++ b/src/config/sync/field.field.node.reponse.field_avec.yml @@ -0,0 +1,21 @@ +uuid: 3e7b0531-3382-4d12-ba73-2417c03843a5 +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_avec + - node.type.reponse + module: + - text +id: node.reponse.field_avec +field_name: field_avec +entity_type: node +bundle: reponse +label: Avec +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/src/config/sync/field.field.node.reponse.field_besoin.yml b/src/config/sync/field.field.node.reponse.field_besoin.yml new file mode 100644 index 0000000..9c961eb --- /dev/null +++ b/src/config/sync/field.field.node.reponse.field_besoin.yml @@ -0,0 +1,29 @@ +uuid: 427d92a7-ee39-4184-bf23-074aebb26faf +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_besoin + - node.type.besoin + - node.type.reponse +id: node.reponse.field_besoin +field_name: field_besoin +entity_type: node +bundle: reponse +label: Besoin +description: '' +required: false +translatable: true +default_value: { } +default_value_callback: '' +settings: + handler: 'default:node' + handler_settings: + target_bundles: + besoin: besoin + sort: + field: _none + direction: ASC + auto_create: false + auto_create_bundle: '' +field_type: entity_reference diff --git a/src/config/sync/field.field.node.reponse.field_ou.yml b/src/config/sync/field.field.node.reponse.field_ou.yml new file mode 100644 index 0000000..c50a5b2 --- /dev/null +++ b/src/config/sync/field.field.node.reponse.field_ou.yml @@ -0,0 +1,21 @@ +uuid: a64ee8d1-1070-4afe-aec9-c90849a612f8 +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_ou + - node.type.reponse + module: + - text +id: node.reponse.field_ou +field_name: field_ou +entity_type: node +bundle: reponse +label: Où +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/src/config/sync/field.field.node.reponse.field_qui.yml b/src/config/sync/field.field.node.reponse.field_qui.yml new file mode 100644 index 0000000..9d35aa0 --- /dev/null +++ b/src/config/sync/field.field.node.reponse.field_qui.yml @@ -0,0 +1,21 @@ +uuid: 64b5d63b-a57d-43c0-a44d-4d36106e3fd3 +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_qui + - node.type.reponse + module: + - text +id: node.reponse.field_qui +field_name: field_qui +entity_type: node +bundle: reponse +label: Qui +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/src/config/sync/field.field.node.reponse.field_quoi.yml b/src/config/sync/field.field.node.reponse.field_quoi.yml new file mode 100644 index 0000000..4da3c98 --- /dev/null +++ b/src/config/sync/field.field.node.reponse.field_quoi.yml @@ -0,0 +1,21 @@ +uuid: 11643489-f75f-4a4b-950e-8db77da1c1b4 +langcode: fr +status: true +dependencies: + config: + - field.storage.node.field_quoi + - node.type.reponse + module: + - text +id: node.reponse.field_quoi +field_name: field_quoi +entity_type: node +bundle: reponse +label: Quoi +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: { } +field_type: text_long diff --git a/src/config/sync/field.storage.node.field_avec.yml b/src/config/sync/field.storage.node.field_avec.yml new file mode 100644 index 0000000..828c350 --- /dev/null +++ b/src/config/sync/field.storage.node.field_avec.yml @@ -0,0 +1,19 @@ +uuid: 9dd22d40-14e7-4ee7-9983-d426ce022fef +langcode: fr +status: true +dependencies: + module: + - node + - text +id: node.field_avec +field_name: field_avec +entity_type: node +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/src/config/sync/field.storage.node.field_index.yml b/src/config/sync/field.storage.node.field_index.yml new file mode 100644 index 0000000..80e4097 --- /dev/null +++ b/src/config/sync/field.storage.node.field_index.yml @@ -0,0 +1,20 @@ +uuid: 424eacf0-ae50-4644-bc28-982685ea7570 +langcode: fr +status: true +dependencies: + module: + - node +id: node.field_index +field_name: field_index +entity_type: node +type: integer +settings: + unsigned: false + size: normal +module: core +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/src/config/sync/field.storage.node.field_ou.yml b/src/config/sync/field.storage.node.field_ou.yml new file mode 100644 index 0000000..75721d4 --- /dev/null +++ b/src/config/sync/field.storage.node.field_ou.yml @@ -0,0 +1,19 @@ +uuid: a89cd8fe-4b8c-45e9-922f-a5c47af3ab45 +langcode: fr +status: true +dependencies: + module: + - node + - text +id: node.field_ou +field_name: field_ou +entity_type: node +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/src/config/sync/field.storage.node.field_qui.yml b/src/config/sync/field.storage.node.field_qui.yml new file mode 100644 index 0000000..6824779 --- /dev/null +++ b/src/config/sync/field.storage.node.field_qui.yml @@ -0,0 +1,19 @@ +uuid: 7eb9540b-75d8-42d0-9968-a295681cbd16 +langcode: fr +status: true +dependencies: + module: + - node + - text +id: node.field_qui +field_name: field_qui +entity_type: node +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/src/config/sync/field.storage.node.field_quoi.yml b/src/config/sync/field.storage.node.field_quoi.yml new file mode 100644 index 0000000..b79f7bc --- /dev/null +++ b/src/config/sync/field.storage.node.field_quoi.yml @@ -0,0 +1,19 @@ +uuid: a07ae4a6-8a45-4cf3-a51f-7f41e7e7346d +langcode: fr +status: true +dependencies: + module: + - node + - text +id: node.field_quoi +field_name: field_quoi +entity_type: node +type: text_long +settings: { } +module: text +locked: false +cardinality: 1 +translatable: true +indexes: { } +persist_with_no_fields: false +custom_storage: false diff --git a/src/config/sync/user.role.admin.yml b/src/config/sync/user.role.admin.yml index 52c0ca9..a23fb0b 100644 --- a/src/config/sync/user.role.admin.yml +++ b/src/config/sync/user.role.admin.yml @@ -7,6 +7,7 @@ dependencies: - node.type.besoin - node.type.concernement - node.type.entite + - node.type.reponse - node.type.static - taxonomy.vocabulary.lieu - taxonomy.vocabulary.structure @@ -60,6 +61,7 @@ permissions: - 'create evenement content' - 'create generique workflow_transition' - 'create page content' + - 'create reponse content' - 'create static content' - 'create terms in collectionneurs' - 'create terms in entrees' @@ -80,6 +82,7 @@ permissions: - 'delete own besoin content' - 'delete own concernement content' - 'delete own entite content' + - 'delete own reponse content' - 'delete own static content' - 'delete static revisions' - 'delete terms in collectionneurs' @@ -95,9 +98,11 @@ permissions: - 'edit any entite content' - 'edit any evenement content' - 'edit any page content' + - 'edit any reponse content' - 'edit any static content' - 'edit own concernement content' - 'edit own enregistrement content' + - 'edit own reponse content' - 'edit terms in collectionneurs' - 'edit terms in entrees' - 'edit terms in genres' diff --git a/src/config/sync/user.role.group_admin.yml b/src/config/sync/user.role.group_admin.yml index dcaf669..5cdeac7 100644 --- a/src/config/sync/user.role.group_admin.yml +++ b/src/config/sync/user.role.group_admin.yml @@ -6,6 +6,7 @@ dependencies: - node.type.besoin - node.type.concernement - node.type.entite + - node.type.reponse - taxonomy.vocabulary.lieu - taxonomy.vocabulary.structure module: @@ -30,13 +31,16 @@ permissions: - 'create concernement content' - 'create confidentialite workflow_transition' - 'create entite content' + - 'create reponse content' - 'create terms in lieu' - 'create terms in structure' - 'create users' + - 'delete own reponse content' - 'delete terms in lieu' - 'delete terms in structure' - 'edit own concernement content' - 'edit own entite content' + - 'edit own reponse content' - 'edit terms in lieu' - 'edit terms in structure' - 'edit users by role' diff --git a/src/config/sync/user.role.group_member.yml b/src/config/sync/user.role.group_member.yml index 737762c..eaeaabb 100644 --- a/src/config/sync/user.role.group_member.yml +++ b/src/config/sync/user.role.group_member.yml @@ -6,6 +6,7 @@ dependencies: - node.type.besoin - node.type.concernement - node.type.entite + - node.type.reponse module: - node - system @@ -22,8 +23,11 @@ permissions: - 'create concernement content' - 'create confidentialite workflow_transition' - 'create entite content' + - 'create reponse content' + - 'delete own reponse content' - 'edit own concernement content' - 'edit own entite content' + - 'edit own reponse content' - 'revert concernement revisions' - 'revert entite revisions' - 'view concernement revisions' diff --git a/src/config/sync/user.role.user.yml b/src/config/sync/user.role.user.yml index aeaa0cf..d8bc4eb 100644 --- a/src/config/sync/user.role.user.yml +++ b/src/config/sync/user.role.user.yml @@ -4,6 +4,7 @@ status: true dependencies: config: - node.type.besoin + - node.type.reponse module: - node - workflow @@ -18,3 +19,6 @@ permissions: - 'create confidentialite workflow_transition' - 'create defalut workflow_transition' - 'create default workflow_transition' + - 'create reponse content' + - 'delete own reponse content' + - 'edit own reponse content' diff --git a/src/web/modules/custom/ouatt_puissanceagir/ouatt_puissanceagir.module b/src/web/modules/custom/ouatt_puissanceagir/ouatt_puissanceagir.module index 8b710bd..6acbb09 100644 --- a/src/web/modules/custom/ouatt_puissanceagir/ouatt_puissanceagir.module +++ b/src/web/modules/custom/ouatt_puissanceagir/ouatt_puissanceagir.module @@ -51,8 +51,14 @@ function ouatt_puissanceagir_inline_entity_form_entity_form_alter(&$entity_form, if (!$entity_form['field_concernement']['widget'][0]['target_id']['#default_value']) { $parent_node = \Drupal::routeMatch()->getParameter('node'); $entity_form['field_concernement']['widget'][0]['target_id']['#default_value'] = $parent_node; + $entity_form['field_index']['widget'][0]['value']['#default_value'] = $entity_form['#ief_row_delta']; } $entity_form['field_concernement']['#attributes']['style'] = ['display:none;']; + } -} \ No newline at end of file +} + +function ouatt_puissanceagir_inline_entity_form_table_fields_alter(&$fields, $context) { + $t="t"; +} diff --git a/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css b/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css index fc205ea..fb410b6 100644 --- a/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css +++ b/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css @@ -321,4 +321,16 @@ div.field--name-field-menace-maintien label { display: none; } +fieldset[data-drupal-selector=edit-field-besoin] { + border: none; + margin: 0; + padding: 0; +} +fieldset[data-drupal-selector=edit-field-besoin] > legend { + display: none; +} +fieldset[data-drupal-selector=edit-field-besoin] > div.fieldset-wrapper > table > tbody > tr.ief-row-form { + border: 1px #ccc solid; +} + /*# sourceMappingURL=ouatminimal.css.map */ diff --git a/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css.map b/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css.map index 1506f5c..6019f36 100644 --- a/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css.map +++ b/src/web/themes/custom/ouatminimal_theme/css/ouatminimal.css.map @@ -1 +1 @@ -{"version":3,"sourceRoot":"","sources":["../scss/ouatminimal.scss"],"names":[],"mappings":"AAAA;AACA;EACE;EACA;;;AAEF;AAAA;EAEE;;;AAEF;EACE;;;AAGF;EACE;EACA;;;AAGF;AAKI;EACE;;;AAKN;EACE;EACA;;AACA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AACE;EACA;EACA;;;AAEF;AAAA;EAEE;EACA;;;AAEF;AAAA;EAEE;EACA;;;AAGF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAGF;AAAA;AAAA;AAIA;AACA;EACE;;;AAGF;AACA;EAIE;IACE;IACA;IACA;;EAGF;IACE;IACA;;EAGF;AACE;IACA;IACA;IACA;IACA;AACA;IACA;;EAGF;IACE;IACA;IACA;;EAGF;AACE;IACA;IACA;AACA;IACA;;EAGF;IACE;;AAGF;EACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IASE;IACA;IACA;;;AAIJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;EAEE;IACE;;EAEF;AAAA;AAAA;IAGE;IACA;IACA;;;AAKJ;AAEE;EACE;EACA;EACA;EAAU;EACV;AAeA;AAAA;AAAA;;AAbA;EACE;;AAEF;EACE;EACA;EACA;;AAEF;AAAA;EAEE;EACA;;AAQJ;AACE;EACA;;AAEF;EACE;;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;EAGE;;AAEF;AAAA;AAAA;AAAA;AAAA;AAAA;EAGE;;AAKJ;EACE;;;AAOJ;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAIN;EACE;EACA;EACA;;AAEA;EACE;;AAIA;EACE;;AAEF;EACE;;AAMN;EACE;;AAGF;EACE;EACA;;AAKA;AAAA;EACE;;AAGF;AAAA;EACE;;AACA;AAAA;EACE;;AAMN;EACE;;AAeJ;EACE;EACA;AAEA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EAAY;EACZ;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AAGF;EACE;;;AAYV;AAAA;AAAA;EAGE;;;AAGF;AAAA;EAEE","file":"ouatminimal.css"} \ No newline at end of file +{"version":3,"sourceRoot":"","sources":["../scss/ouatminimal.scss"],"names":[],"mappings":"AAAA;AACA;EACE;EACA;;;AAEF;AAAA;EAEE;;;AAEF;EACE;;;AAGF;EACE;EACA;;;AAGF;AAKI;EACE;;;AAKN;EACE;EACA;;AACA;EACE;EACA;;;AAIJ;EACE;EACA;;;AAGF;EACE;EACA;;;AAGF;AACE;EACA;EACA;;;AAEF;AAAA;EAEE;EACA;;;AAEF;AAAA;EAEE;EACA;;;AAGF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;;;AAEF;EACE;EACA;;;AAGF;AAAA;AAAA;AAIA;AACA;EACE;;;AAGF;AACA;EAIE;IACE;IACA;IACA;;EAGF;IACE;IACA;;EAGF;AACE;IACA;IACA;IACA;IACA;AACA;IACA;;EAGF;IACE;IACA;IACA;;EAGF;AACE;IACA;IACA;AACA;IACA;;EAGF;IACE;;AAGF;EACA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;AAAA;IASE;IACA;IACA;;;AAIJ;AAAA;AAAA;AAAA;AAAA;AAAA;AAMA;EAEE;IACE;;EAEF;AAAA;AAAA;IAGE;IACA;IACA;;;AAKJ;AAEE;EACE;EACA;EACA;EAAU;EACV;AAeA;AAAA;AAAA;;AAbA;EACE;;AAEF;EACE;EACA;EACA;;AAEF;AAAA;EAEE;EACA;;AAQJ;AACE;EACA;;AAEF;EACE;;AAKA;AAAA;AAAA;AAAA;AAAA;AAAA;EAGE;;AAEF;AAAA;AAAA;AAAA;AAAA;AAAA;EAGE;;AAKJ;EACE;;;AAOJ;EACE;EACA;EACA;;AAEA;EACE;EACA;EACA;;AAEA;EACE;;AAEA;EACE;EACA;EACA;EACA;;AAEA;EACE;EACA;;AAGF;EACE;;AAIN;EACE;EACA;EACA;;AAEA;EACE;;AAIA;EACE;;AAEF;EACE;;AAMN;EACE;;AAGF;EACE;EACA;;AAKA;AAAA;EACE;;AAGF;AAAA;EACE;;AACA;AAAA;EACE;;AAMN;EACE;;AAeJ;EACE;EACA;AAEA;;AACA;EACE;EACA;EACA;EACA;EACA;EACA;AACA;EACA;EACA;EACA;;AAEA;EACE;EACA;EAAY;EACZ;EACA;EACA;EACA;;AAEA;EACE;;AAEF;EACE;EACA;;AAEF;EACE;;AAGF;EACE;;;AAYV;AAAA;AAAA;EAGE;;;AAGF;AAAA;EAEE;;;AAKF;EACE;EACA;EACA;;AACA;EACE;;AAEF;EACE","file":"ouatminimal.css"} \ No newline at end of file diff --git a/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme b/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme index f0bb5e1..d393e95 100644 --- a/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme +++ b/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme @@ -172,5 +172,23 @@ function ouatminimal_preprocess_input(&$variables) { $element['#value'] = $element['#attributes']['value'] = $variables['attributes']['value'] = "test"; $variables['attributes']['class'][] = 'ief-submit-remove'; } + + // puissance d'agir + // rename ajouter besoin + // edit-field-besoin-actions-ief-add--auhryC0X7yE + if (preg_match('/^ief-field_besoin-form-add$/', $name)) { + $element['#value'] = $element['#attributes']['value'] = $variables['attributes']['value'] = "Ajouter un Besoin"; + } + // ief-edit-submit-field_besoin-form-0 + if (preg_match('/^ief-edit-submit-field_besoin-form-\d$/', $name)) { + $element['#value'] = $element['#attributes']['value'] = $variables['attributes']['value'] = "Mise à jour du besoin"; + } + // ief-add-submit-field_besoin-form + if (preg_match('/^ief-add-submit-field_besoin-form$/', $name)) { + $element['#value'] = $element['#attributes']['value'] = $variables['attributes']['value'] = "Créer le besoin"; + } + + + } } \ No newline at end of file diff --git a/src/web/themes/custom/ouatminimal_theme/scss/ouatminimal.scss b/src/web/themes/custom/ouatminimal_theme/scss/ouatminimal.scss index 92cbf32..8559f42 100644 --- a/src/web/themes/custom/ouatminimal_theme/scss/ouatminimal.scss +++ b/src/web/themes/custom/ouatminimal_theme/scss/ouatminimal.scss @@ -378,3 +378,14 @@ div.field--name-field-menace-maintien label{ +fieldset[data-drupal-selector="edit-field-besoin"] { + border:none; + margin: 0; + padding: 0; + >legend{ + display: none; + } + >div.fieldset-wrapper>table>tbody>tr.ief-row-form{ + border: 1px #ccc solid; + } +} \ No newline at end of file