From b21dd2cb2e0b653f87619c1ab840feac050361a6 Mon Sep 17 00:00:00 2001
From: bach <bachir@figureslibres.io>
Date: Tue, 23 May 2023 14:32:43 +0200
Subject: [PATCH] doleancer admin fixes

---
 ...rm_display.node.cercle_politique.default.yml | 14 +++++++-------
 ...ew_display.node.cercle_politique.default.yml | 12 ++++++------
 ...iew_display.node.cercle_politique.teaser.yml |  4 ++--
 ...le_politique.field_enquete_terraindevie.yml} | 17 +++++------------
 ....node.cercle_politique.field_le_probleme.yml | 15 ++++-----------
 ...e_politique.field_oui_nouvelle_situation.yml |  2 +-
 ...storage.node.field_enquete_terraindevie.yml} | 14 +++++++-------
 .../field.storage.node.field_le_probleme.yml    | 10 +++++-----
 .../custom/ouatt_admin/ouatt_admin.module       | 12 ++++++------
 .../custom/ouatminimal_theme/ouatminimal.theme  | 17 ++++++++++++++++-
 .../form/text-format-wrapper.html.twig          |  4 ++--
 11 files changed, 61 insertions(+), 60 deletions(-)
 rename src/config/sync/{field.field.node.cercle_politique.field_enquete.yml => field.field.node.cercle_politique.field_enquete_terraindevie.yml} (57%)
 rename src/config/sync/{field.storage.node.field_enquete.yml => field.storage.node.field_enquete_terraindevie.yml} (51%)

diff --git a/src/config/sync/core.entity_form_display.node.cercle_politique.default.yml b/src/config/sync/core.entity_form_display.node.cercle_politique.default.yml
index 062f54b..f575488 100644
--- a/src/config/sync/core.entity_form_display.node.cercle_politique.default.yml
+++ b/src/config/sync/core.entity_form_display.node.cercle_politique.default.yml
@@ -8,7 +8,7 @@ dependencies:
     - field.field.node.cercle_politique.field_comment_enonce_doleance
     - field.field.node.cercle_politique.field_comment_formule_decision
     - field.field.node.cercle_politique.field_decision_formulee
-    - field.field.node.cercle_politique.field_enquete
+    - field.field.node.cercle_politique.field_enquete_terraindevie
     - field.field.node.cercle_politique.field_entite_adresse_application
     - field.field.node.cercle_politique.field_entite_adresse_doleance
     - field.field.node.cercle_politique.field_entites_decisionnaires
@@ -45,7 +45,7 @@ third_party_settings:
     group_probleme_enquete:
       children:
         - field_le_probleme
-        - field_enquete
+        - field_enquete_terraindevie
       label: 'Probleme & enquête'
       region: content
       parent_name: group_tabs
@@ -353,9 +353,9 @@ content:
       rows: 5
       placeholder: ''
     third_party_settings: {  }
-  field_enquete:
-    type: text_textarea
-    weight: 2
+  field_enquete_terraindevie:
+    type: string_textarea
+    weight: 36
     region: content
     settings:
       rows: 5
@@ -404,8 +404,8 @@ content:
         duplicate: duplicate
     third_party_settings: {  }
   field_le_probleme:
-    type: text_textarea
-    weight: 1
+    type: string_textarea
+    weight: 35
     region: content
     settings:
       rows: 5
diff --git a/src/config/sync/core.entity_view_display.node.cercle_politique.default.yml b/src/config/sync/core.entity_view_display.node.cercle_politique.default.yml
index a95ac90..3375f35 100644
--- a/src/config/sync/core.entity_view_display.node.cercle_politique.default.yml
+++ b/src/config/sync/core.entity_view_display.node.cercle_politique.default.yml
@@ -8,7 +8,7 @@ dependencies:
     - field.field.node.cercle_politique.field_comment_enonce_doleance
     - field.field.node.cercle_politique.field_comment_formule_decision
     - field.field.node.cercle_politique.field_decision_formulee
-    - field.field.node.cercle_politique.field_enquete
+    - field.field.node.cercle_politique.field_enquete_terraindevie
     - field.field.node.cercle_politique.field_entite_adresse_application
     - field.field.node.cercle_politique.field_entite_adresse_doleance
     - field.field.node.cercle_politique.field_entites_decisionnaires
@@ -66,12 +66,12 @@ content:
     third_party_settings: {  }
     weight: 109
     region: content
-  field_enquete:
-    type: text_default
+  field_enquete_terraindevie:
+    type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 102
+    weight: 120
     region: content
   field_entite_adresse_application:
     type: text_default
@@ -104,11 +104,11 @@ content:
     weight: 103
     region: content
   field_le_probleme:
-    type: text_default
+    type: basic_string
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 101
+    weight: 119
     region: content
   field_mise_en_oeuvre_decision:
     type: entity_reference_revisions_entity_view
diff --git a/src/config/sync/core.entity_view_display.node.cercle_politique.teaser.yml b/src/config/sync/core.entity_view_display.node.cercle_politique.teaser.yml
index 31d9266..1ae9439 100644
--- a/src/config/sync/core.entity_view_display.node.cercle_politique.teaser.yml
+++ b/src/config/sync/core.entity_view_display.node.cercle_politique.teaser.yml
@@ -9,7 +9,7 @@ dependencies:
     - field.field.node.cercle_politique.field_comment_enonce_doleance
     - field.field.node.cercle_politique.field_comment_formule_decision
     - field.field.node.cercle_politique.field_decision_formulee
-    - field.field.node.cercle_politique.field_enquete
+    - field.field.node.cercle_politique.field_enquete_terraindevie
     - field.field.node.cercle_politique.field_entite_adresse_application
     - field.field.node.cercle_politique.field_entite_adresse_doleance
     - field.field.node.cercle_politique.field_entites_decisionnaires
@@ -50,7 +50,7 @@ hidden:
   field_comment_enonce_doleance: true
   field_comment_formule_decision: true
   field_decision_formulee: true
-  field_enquete: true
+  field_enquete_terraindevie: true
   field_entite_adresse_application: true
   field_entite_adresse_doleance: true
   field_entites_decisionnaires: true
diff --git a/src/config/sync/field.field.node.cercle_politique.field_enquete.yml b/src/config/sync/field.field.node.cercle_politique.field_enquete_terraindevie.yml
similarity index 57%
rename from src/config/sync/field.field.node.cercle_politique.field_enquete.yml
rename to src/config/sync/field.field.node.cercle_politique.field_enquete_terraindevie.yml
index 217a8b8..dedc874 100644
--- a/src/config/sync/field.field.node.cercle_politique.field_enquete.yml
+++ b/src/config/sync/field.field.node.cercle_politique.field_enquete_terraindevie.yml
@@ -1,19 +1,12 @@
-uuid: 390d33a7-b878-4759-a6e8-126ff3739754
+uuid: 4c942826-9687-4f26-aad8-5cedb2fec9d9
 langcode: fr
 status: true
 dependencies:
   config:
-    - field.storage.node.field_enquete
+    - field.storage.node.field_enquete_terraindevie
     - node.type.cercle_politique
-  module:
-    - allowed_formats
-    - text
-third_party_settings:
-  allowed_formats:
-    allowed_formats:
-      - linkonly
-id: node.cercle_politique.field_enquete
-field_name: field_enquete
+id: node.cercle_politique.field_enquete_terraindevie
+field_name: field_enquete_terraindevie
 entity_type: node
 bundle: cercle_politique
 label: 'L’enquête menée sur le terrain de vie'
@@ -23,4 +16,4 @@ translatable: false
 default_value: {  }
 default_value_callback: ''
 settings: {  }
-field_type: text_long
+field_type: string_long
diff --git a/src/config/sync/field.field.node.cercle_politique.field_le_probleme.yml b/src/config/sync/field.field.node.cercle_politique.field_le_probleme.yml
index fe9cf95..50c27cc 100644
--- a/src/config/sync/field.field.node.cercle_politique.field_le_probleme.yml
+++ b/src/config/sync/field.field.node.cercle_politique.field_le_probleme.yml
@@ -1,26 +1,19 @@
-uuid: 31da45f1-cc01-4efb-9f8d-9b163724d298
+uuid: 57028fe9-9ff0-4c0e-8712-6604f1032773
 langcode: fr
 status: true
 dependencies:
   config:
     - field.storage.node.field_le_probleme
     - node.type.cercle_politique
-  module:
-    - allowed_formats
-    - text
-third_party_settings:
-  allowed_formats:
-    allowed_formats:
-      - linkonly
 id: node.cercle_politique.field_le_probleme
 field_name: field_le_probleme
 entity_type: node
 bundle: cercle_politique
-label: 'Le problème (injustice, indignation, plainte…)'
-description: 'Quel est le caillou dans votre chaussure qui vous fait mal quand vous marchez ? '
+label: 'Le problème (injustice, indignation, plainte…) '
+description: 'Quel est le caillou dans votre chaussure qui vous fait mal quand vous marchez ?'
 required: false
 translatable: false
 default_value: {  }
 default_value_callback: ''
 settings: {  }
-field_type: text_long
+field_type: string_long
diff --git a/src/config/sync/field.field.node.cercle_politique.field_oui_nouvelle_situation.yml b/src/config/sync/field.field.node.cercle_politique.field_oui_nouvelle_situation.yml
index f5254df..353e639 100644
--- a/src/config/sync/field.field.node.cercle_politique.field_oui_nouvelle_situation.yml
+++ b/src/config/sync/field.field.node.cercle_politique.field_oui_nouvelle_situation.yml
@@ -16,7 +16,7 @@ id: node.cercle_politique.field_oui_nouvelle_situation
 field_name: field_oui_nouvelle_situation
 entity_type: node
 bundle: cercle_politique
-label: 'Si oui ou partiellement, quelle est la nouvelle situation ?'
+label: 'Si oui, quelle est la nouvelle situation ?'
 description: ''
 required: false
 translatable: false
diff --git a/src/config/sync/field.storage.node.field_enquete.yml b/src/config/sync/field.storage.node.field_enquete_terraindevie.yml
similarity index 51%
rename from src/config/sync/field.storage.node.field_enquete.yml
rename to src/config/sync/field.storage.node.field_enquete_terraindevie.yml
index 646ffb4..ed8b245 100644
--- a/src/config/sync/field.storage.node.field_enquete.yml
+++ b/src/config/sync/field.storage.node.field_enquete_terraindevie.yml
@@ -1,16 +1,16 @@
-uuid: 94dc72a4-4224-469e-ae0b-90920a7e6783
+uuid: cb11a557-a87f-4ad9-a8e9-2d02152e001e
 langcode: fr
 status: true
 dependencies:
   module:
     - node
-    - text
-id: node.field_enquete
-field_name: field_enquete
+id: node.field_enquete_terraindevie
+field_name: field_enquete_terraindevie
 entity_type: node
-type: text_long
-settings: {  }
-module: text
+type: string_long
+settings:
+  case_sensitive: false
+module: core
 locked: false
 cardinality: 1
 translatable: true
diff --git a/src/config/sync/field.storage.node.field_le_probleme.yml b/src/config/sync/field.storage.node.field_le_probleme.yml
index 0ff0866..0ca5371 100644
--- a/src/config/sync/field.storage.node.field_le_probleme.yml
+++ b/src/config/sync/field.storage.node.field_le_probleme.yml
@@ -1,16 +1,16 @@
-uuid: 1202a85b-a0f1-4a74-932f-4f17db3ca82b
+uuid: 53170e37-a0bb-4915-bf95-2e6a6e3971e0
 langcode: fr
 status: true
 dependencies:
   module:
     - node
-    - text
 id: node.field_le_probleme
 field_name: field_le_probleme
 entity_type: node
-type: text_long
-settings: {  }
-module: text
+type: string_long
+settings:
+  case_sensitive: false
+module: core
 locked: false
 cardinality: 1
 translatable: true
diff --git a/src/web/modules/custom/ouatt_admin/ouatt_admin.module b/src/web/modules/custom/ouatt_admin/ouatt_admin.module
index 75a01e3..363a4cd 100644
--- a/src/web/modules/custom/ouatt_admin/ouatt_admin.module
+++ b/src/web/modules/custom/ouatt_admin/ouatt_admin.module
@@ -102,9 +102,9 @@ function ouatt_admin_inline_entity_form_entity_form_alter(&$entity_form, &$form_
  * @param \Drupal\Core\Form\FormStateInterface $form_state
  *   The form state of the parent form.
  */
-function ouatt_admin_inline_entity_form_reference_form_alter(&$reference_form, &$form_state) {
-  $t="t";
-}
+// function ouatt_admin_inline_entity_form_reference_form_alter(&$reference_form, &$form_state) {
+//   $t="t";
+// }
 
 /**
  * Alter the fields used to represent an entity in the IEF table.
@@ -121,9 +121,9 @@ function ouatt_admin_inline_entity_form_reference_form_alter(&$reference_form, &
  *
  * @see \Drupal\inline_entity_form\InlineFormInterface::getTableFields()
  */
-function ouatt_admin_inline_entity_form_table_fields_alter($fields, $context) {
-  $t="t";
-}
+// function ouatt_admin_inline_entity_form_table_fields_alter($fields, $context) {
+//   $t="t";
+// }
 
 /**
  * Provide post-processing of auto generated titles (labels).
diff --git a/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme b/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme
index 23a0a0a..81ca828 100644
--- a/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme
+++ b/src/web/themes/custom/ouatminimal_theme/ouatminimal.theme
@@ -120,12 +120,27 @@ function ouatminimal_preprocess_toolbar(&$variables) {
 
 function ouatminimal_preprocess_form_element(&$variables) {
   $element = $variables['element'];
-
+  
   if(isset($variables['description_display'])){
     $variables['description_display']="before";   
   }
+
 }
 
+/**
+ * Prepares variables for text format wrapper templates.
+ *
+ * Default template: text-format-wrapper.html.twig.
+ *
+ * @param array $variables
+ *   An associative array containing:
+ *   - attributes: An associative array containing properties of the element.
+ */
+// function ouatminimal_preprocess_text_format_wrapper(&$variables) {
+//   $t="t";
+//   // $children = $variables['children'];
+// }
+
 function ouatminimal_preprocess_textarea(&$variables) {
   $element = $variables['element'];
   unset($variables['element']['#cols']);
diff --git a/src/web/themes/custom/ouatminimal_theme/templates/form/text-format-wrapper.html.twig b/src/web/themes/custom/ouatminimal_theme/templates/form/text-format-wrapper.html.twig
index 08a88ca..5731add 100644
--- a/src/web/themes/custom/ouatminimal_theme/templates/form/text-format-wrapper.html.twig
+++ b/src/web/themes/custom/ouatminimal_theme/templates/form/text-format-wrapper.html.twig
@@ -15,12 +15,12 @@
 #}
 <div class="js-text-format-wrapper text-format-wrapper js-form-item form-item">
   {{ children }}
-  {% if description %}
+  {# {% if description %}
     {%
       set classes = [
         aria_description ? 'description',
       ]
     %}
     <div{{ attributes.addClass(classes) }}>{{ description }}</div>
-  {% endif %}
+  {% endif %} #}
 </div>