Merge pull request #1251 from openeuropa/EWPP-3056

EWPP-3056: Change project budget fields to decimal.

composer.json

@@ -119,6 +119,9 @@
             },
             "drupal/entity_reference_revisions": {
                 "https://www.drupal.org/project/entity_reference_revisions/issues/2937835": "https://www.drupal.org/files/issues/2021-03-26/entity_reference_revisions-field_formatter_label-2937835-36.patch"
+            },
+            "openeuropa/oe_content": {
+                "https://github.com/openeuropa/oe_content/pull/573": "https://github.com/openeuropa/oe_content/compare/3.0.0-alpha8...3.x.diff"
             }
         },
         "drupal-scaffold": {

modules/oe_theme_content_project/config/install/core.entity_view_display.node.oe_project.full.yml

@@ -2,6 +2,7 @@ langcode: en
 status: true
 dependencies:
   config:
+    - core.entity_view_mode.node.full
     - field.field.node.oe_project.body
     - field.field.node.oe_project.oe_departments
     - field.field.node.oe_project.oe_documents
@@ -12,6 +13,8 @@ dependencies:
     - field.field.node.oe_project.oe_project_contact
     - field.field.node.oe_project.oe_project_coordinators
     - field.field.node.oe_project.oe_project_dates
+    - field.field.node.oe_project.oe_project_eu_budget
+    - field.field.node.oe_project.oe_project_eu_contrib
     - field.field.node.oe_project.oe_project_funding_programme
     - field.field.node.oe_project.oe_project_locations
     - field.field.node.oe_project.oe_project_participants
@@ -31,6 +34,7 @@ dependencies:
     - oe_theme_helper
     - rdf_skos
     - text
+    - user
 third_party_settings:
   field_group:
     group_top:
@@ -40,171 +44,163 @@ third_party_settings:
         - group_details
         - group_budget
         - group_resources
+      label: Top
       parent_name: ''
-      weight: 0
-      format_type: html_element
       region: content
+      weight: 1
+      format_type: html_element
       format_settings:
+        classes: ''
+        id: ''
         element: div
         show_label: false
         label_element: h3
         label_element_classes: ''
         attributes: ''
         effect: none
         speed: fast
-        id: ''
-        classes: ''
-      label: Top
     group_details:
       children:
         - oe_reference_code
         - oe_project_dates
         - oe_project_locations
+      label: Details
       parent_name: group_top
+      region: content
       weight: 3
       format_type: oe_theme_helper_field_list_pattern
-      region: content
       format_settings:
         variant: featured_horizontal
-      label: Details
     group_budget:
       children:
-        - oe_project_budget
+        - extra_field_oe_theme_content_project_budget
         - extra_field_oe_theme_content_project_percentage
+      label: Budget
       parent_name: group_top
+      region: content
       weight: 4
       format_type: oe_theme_helper_field_list_pattern
-      region: content
       format_settings:
         variant: featured_horizontal
-      label: Budget
     group_resources:
       children:
         - oe_project_website
         - oe_departments
+      label: Resources
       parent_name: group_top
+      region: content
       weight: 5
       format_type: oe_theme_helper_field_list_pattern
-      region: content
       format_settings:
-        variant: featured_horizontal
         classes: ''
         id: ''
-      label: Resources
+        variant: featured_horizontal
     group_result:
       children:
         - oe_project_results
         - oe_project_result_files
+      label: Results
       parent_name: ''
-      weight: 2
-      format_type: html_element
       region: content
+      weight: 3
+      format_type: html_element
       format_settings:
+        classes: ''
+        id: ''
         element: div
         show_label: true
         label_element: h3
         label_element_classes: ''
         attributes: ''
         effect: none
         speed: fast
-        id: ''
-        classes: ''
-      label: Results
     group_stakeholders:
       children:
         - oe_project_coordinators
         - oe_project_participants
+      label: Stakeholders
       parent_name: ''
-      weight: 4
-      format_type: html_element
       region: content
+      weight: 5
+      format_type: html_element
       format_settings:
+        classes: ''
+        id: ''
         element: div
         show_label: true
         label_element: h3
         label_element_classes: ''
         attributes: ''
         effect: none
         speed: fast
-        id: ''
-        classes: ''
-      label: Stakeholders
     group_funding:
       children:
         - oe_project_funding_programme
         - oe_project_calls
+      label: Funding
       parent_name: ''
-      weight: 3
-      format_type: html_element
       region: content
+      weight: 4
+      format_type: html_element
       format_settings:
+        classes: ''
+        id: ''
         element: div
         show_label: true
         label_element: h3
         label_element_classes: ''
         attributes: ''
         effect: none
         speed: fast
-        id: ''
-        classes: ''
-      label: Funding
 id: node.oe_project.full
 targetEntityType: node
 bundle: oe_project
 mode: full
 content:
   body:
-    label: hidden
     type: text_default
+    label: hidden
+    settings: {  }
+    third_party_settings: {  }
     weight: 1
+    region: content
+  extra_field_oe_theme_content_project_budget:
     settings: {  }
     third_party_settings: {  }
+    weight: 0
     region: content
   extra_field_oe_theme_content_project_percentage:
-    weight: 9
-    region: content
     settings: {  }
     third_party_settings: {  }
+    weight: 1
+    region: content
   oe_departments:
     type: skos_concept_entity_reference_label
-    weight: 6
-    region: content
     label: above
     settings:
       link: false
     third_party_settings: {  }
+    weight: 6
+    region: content
   oe_documents:
     type: entity_reference_entity_view
-    weight: 1
-    region: content
     label: hidden
     settings:
       view_mode: default
       link: false
     third_party_settings: {  }
+    weight: 2
+    region: content
   oe_featured_media:
     type: oe_theme_helper_featured_media_formatter
-    weight: 0
-    region: content
     label: hidden
     settings:
       image_style: oe_theme_medium_no_crop
     third_party_settings: {  }
-  oe_project_budget:
-    type: number_decimal
-    weight: 7
+    weight: 0
     region: content
-    label: above
-    settings:
-      thousand_separator: ' '
-      decimal_separator: .
-      scale: 0
-      prefix_suffix: true
-    third_party_settings: {  }
   oe_project_calls:
     type: link
-    weight: 14
-    region: content
     label: hidden
     settings:
       trim_length: null
@@ -213,79 +209,79 @@ content:
       rel: '0'
       target: '0'
     third_party_settings: {  }
+    weight: 14
+    region: content
   oe_project_contact:
     type: entity_reference_revisions_entity_view
-    weight: 5
-    region: content
     label: hidden
     settings:
       view_mode: full
       link: ''
     third_party_settings: {  }
+    weight: 6
+    region: content
   oe_project_coordinators:
     type: entity_reference_revisions_entity_view
-    weight: 10
-    region: content
     label: hidden
     settings:
       view_mode: full
       link: ''
     third_party_settings: {  }
+    weight: 10
+    region: content
   oe_project_dates:
     type: daterange_default
-    weight: 1
-    region: content
     label: above
     settings:
       timezone_override: ''
       format_type: oe_project_date
       separator: '-'
     third_party_settings: {  }
+    weight: 1
+    region: content
   oe_project_funding_programme:
     type: skos_concept_entity_reference_label
-    weight: 13
-    region: content
     label: hidden
     settings:
       link: false
     third_party_settings: {  }
+    weight: 13
+    region: content
   oe_project_locations:
     type: oe_theme_helper_address_inline
-    weight: 2
-    region: content
     label: above
     settings:
       delimiter: ', '
     third_party_settings: {  }
+    weight: 2
+    region: content
   oe_project_participants:
     type: entity_reference_revisions_entity_view
-    weight: 11
-    region: content
     label: hidden
     settings:
       view_mode: full
       link: ''
     third_party_settings: {  }
+    weight: 11
+    region: content
   oe_project_result_files:
-    weight: 3
+    type: entity_reference_entity_view
     label: hidden
     settings:
       view_mode: default
       link: false
     third_party_settings: {  }
-    type: entity_reference_entity_view
+    weight: 3
     region: content
   oe_project_results:
     type: text_default
-    weight: 2
-    region: content
     label: hidden
     settings: {  }
     third_party_settings: {  }
+    weight: 2
+    region: content
   oe_project_website:
     type: link
-    weight: 5
-    region: content
     label: above
     settings:
       trim_length: 80
@@ -294,14 +290,16 @@ content:
       rel: ''
       target: ''
     third_party_settings: {  }
+    weight: 5
+    region: content
   oe_reference_code:
     type: string
-    weight: 0
-    region: content
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
+    weight: 0
+    region: content
 hidden:
   extra_field_oe_theme_helper_short_title_with_fallback: true
   langcode: true
@@ -311,7 +309,10 @@ hidden:
   oe_content_legacy_link: true
   oe_content_navigation_title: true
   oe_content_short_title: true
+  oe_project_budget: true
   oe_project_budget_eu: true
+  oe_project_eu_budget: true
+  oe_project_eu_contrib: true
   oe_subject: true
   oe_summary: true
   oe_teaser: true

modules/oe_theme_content_project/config/install/core.entity_view_display.node.oe_project.teaser.yml

@@ -79,6 +79,7 @@ content:
     region: content
 hidden:
   body: true
+  extra_field_oe_theme_content_project_budget: true
   extra_field_oe_theme_content_project_percentage: true
   langcode: true
   links: true