Issue #346: add Subactivity field formatter

National-Forestry-Authority · Apr 16, 2024 · 17eb6fe · 17eb6fe
1 parent 30fbefb
commit 17eb6fe
Show file tree

Hide file tree

Showing 9 changed files with 1,690 additions and 234 deletions.
diff --git a/web/modules/custom/farm_nfa/config/install/core.entity_view_display.log.activity.default.yml b/web/modules/custom/farm_nfa/config/install/core.entity_view_display.log.activity.default.yml
@@ -20,6 +20,7 @@ dependencies:
     - entity_reference_revisions
     - farm_field
     - farm_map
+    - farm_nfa
     - file
     - image
     - options
@@ -35,53 +36,53 @@ content:
     settings:
       link: true
     third_party_settings: {  }
-    weight: 96
+    weight: 12
     region: content
   asset:
     type: entity_reference_label
     label: inline
     settings:
       link: true
     third_party_settings: {  }
-    weight: -10
+    weight: 3
     region: content
   category:
     type: entity_reference_label
     label: inline
     settings:
       link: false
     third_party_settings: {  }
-    weight: 80
+    weight: 6
     region: content
   cfr:
     type: entity_reference_label
     label: above
     settings:
       link: true
     third_party_settings: {  }
-    weight: 98
+    weight: 13
     region: content
   file:
     type: file_table
     label: visually_hidden
     settings:
       use_description_as_link_text: true
     third_party_settings: {  }
-    weight: 90
+    weight: 8
     region: content
   flag:
     type: list_default
     label: inline
     settings: {  }
     third_party_settings: {  }
-    weight: -75
+    weight: 2
     region: content
   geometry:
     type: farm_map_geofield
     label: inline
     settings: {  }
     third_party_settings: {  }
-    weight: 95
+    weight: 10
     region: content
   image:
     type: image
@@ -92,7 +93,7 @@ content:
       image_loading:
         attribute: lazy
     third_party_settings: {  }
-    weight: 89
+    weight: 7
     region: content
   is_movement:
     type: hideable_boolean
@@ -104,40 +105,22 @@ content:
       hide_if_false: true
       hide_if_true: false
     third_party_settings: {  }
-    weight: 95
+    weight: 11
     region: content
   location:
     type: entity_reference_label
     label: inline
     settings:
       link: true
     third_party_settings: {  }
-    weight: 90
+    weight: 9
     region: content
   notes:
     type: text_default
     label: inline
     settings: {  }
     third_party_settings: {  }
-    weight: 0
-    region: content
-  owner:
-    type: entity_reference_label
-    label: inline
-    settings:
-      link: true
-    third_party_settings: {  }
-    weight: -70
-    region: content
-  plan_level:
-    type: boolean
-    label: above
-    settings:
-      format: default
-      format_custom_false: ''
-      format_custom_true: ''
-    third_party_settings: {  }
-    weight: 106
+    weight: 4
     region: content
   quantity:
     type: entity_reference_revisions_entity_view
@@ -146,29 +129,28 @@ content:
       view_mode: default
       link: ''
     third_party_settings: {  }
-    weight: 0
+    weight: 5
     region: content
   status:
     type: list_default
     label: inline
     settings: {  }
     third_party_settings: {  }
-    weight: -80
+    weight: 1
     region: content
   sub_activity:
-    type: string
+    type: subactivity
     label: above
-    settings:
-      link_to_entity: false
+    settings: {  }
     third_party_settings: {  }
-    weight: 105
+    weight: 20
     region: content
   task_description:
     type: text_default
     label: above
     settings: {  }
     third_party_settings: {  }
-    weight: 104
+    weight: 19
     region: content
   task_implementation:
     type: daterange_default
@@ -178,7 +160,7 @@ content:
       format_type: medium
       separator: '-'
     third_party_settings: {  }
-    weight: 100
+    weight: 15
     region: content
   task_inspection_audit:
     type: daterange_default
@@ -188,7 +170,7 @@ content:
       format_type: medium
       separator: '-'
     third_party_settings: {  }
-    weight: 102
+    weight: 17
     region: content
   task_planning:
     type: daterange_default
@@ -198,7 +180,7 @@ content:
       format_type: medium
       separator: '-'
     third_party_settings: {  }
-    weight: 99
+    weight: 14
     region: content
   task_reporting:
     type: daterange_default
@@ -208,15 +190,15 @@ content:
       format_type: medium
       separator: '-'
     third_party_settings: {  }
-    weight: 101
+    weight: 16
     region: content
   task_summary:
     type: string
     label: above
     settings:
       link_to_entity: false
     third_party_settings: {  }
-    weight: 103
+    weight: 18
     region: content
   timestamp:
     type: timestamp
@@ -235,10 +217,12 @@ content:
         granularity: 2
         refresh: 60
     third_party_settings: {  }
-    weight: -90
+    weight: 0
     region: content
 hidden:
   created: true
   data: true
+  owner: true
+  plan_level: true
   uid: true
   working_circle: true
diff --git a/web/modules/custom/farm_nfa/config/install/views.view.plan_logs.yml b/web/modules/custom/farm_nfa/config/install/views.view.plan_logs.yml
@@ -3,10 +3,9 @@ status: true
 dependencies:
   config:
     - field.storage.log.cfr
-    - field.storage.log.task_implementation
-    - field.storage.log.task_planning
+    - field.storage.log.sub_activity
   module:
-    - datetime_range
+    - farm_nfa
     - log
     - options
     - plan
@@ -80,7 +79,7 @@ display:
           click_sort_column: value
           type: string
           settings:
-            link_to_entity: false
+            link_to_entity: true
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -154,79 +153,15 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        status:
-          id: status
-          table: log_field_data
-          field: status
-          relationship: none
-          group_type: group
-          admin_label: ''
-          entity_type: log
-          entity_field: status
-          plugin_id: field
-          label: Status
-          exclude: false
-          alter:
-            alter_text: false
-            text: ''
-            make_link: false
-            path: ''
-            absolute: false
-            external: false
-            replace_spaces: false
-            path_case: none
-            trim_whitespace: false
-            alt: ''
-            rel: ''
-            link_class: ''
-            prefix: ''
-            suffix: ''
-            target: ''
-            nl2br: false
-            max_length: 0
-            word_boundary: true
-            ellipsis: true
-            more_link: false
-            more_link_text: ''
-            more_link_path: ''
-            strip_tags: false
-            trim: false
-            preserve_tags: ''
-            html: false
-          element_type: ''
-          element_class: ''
-          element_label_type: ''
-          element_label_class: ''
-          element_label_colon: true
-          element_wrapper_type: ''
-          element_wrapper_class: ''
-          element_default_classes: true
-          empty: ''
-          hide_empty: false
-          empty_zero: false
-          hide_alter_empty: true
-          click_sort_column: value
-          type: list_default
-          settings: {  }
-          group_column: value
-          group_columns: {  }
-          group_rows: true
-          delta_limit: 0
-          delta_offset: 0
-          delta_reversed: false
-          delta_first_last: false
-          multi_type: separator
-          separator: ', '
-          field_api_classes: false
-        task_planning:
-          id: task_planning
-          table: log__task_planning
-          field: task_planning
+        sub_activity:
+          id: sub_activity
+          table: log__sub_activity
+          field: sub_activity
           relationship: none
           group_type: group
           admin_label: ''
           plugin_id: field
-          label: 'Task planning'
+          label: Sub-activity
           exclude: false
           alter:
             alter_text: false
@@ -268,11 +203,9 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: daterange_default
+          type: subactivity
           settings:
-            timezone_override: ''
-            format_type: html_date
-            separator: '-'
+            link_to_entity: 0
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -283,15 +216,17 @@ display:
           multi_type: separator
           separator: ', '
           field_api_classes: false
-        task_implementation:
-          id: task_implementation
-          table: log__task_implementation
-          field: task_implementation
+        status:
+          id: status
+          table: log_field_data
+          field: status
           relationship: none
           group_type: group
           admin_label: ''
+          entity_type: log
+          entity_field: status
           plugin_id: field
-          label: 'Task implementation'
+          label: Status
           exclude: false
           alter:
             alter_text: false
@@ -333,11 +268,8 @@ display:
           empty_zero: false
           hide_alter_empty: true
           click_sort_column: value
-          type: daterange_default
-          settings:
-            timezone_override: ''
-            format_type: html_date
-            separator: '-'
+          type: list_default
+          settings: {  }
           group_column: value
           group_columns: {  }
           group_rows: true
@@ -667,8 +599,7 @@ display:
         - user.permissions
       tags:
         - 'config:field.storage.log.cfr'
-        - 'config:field.storage.log.task_implementation'
-        - 'config:field.storage.log.task_planning'
+        - 'config:field.storage.log.sub_activity'
   embed:
     id: embed
     display_title: Embed
@@ -686,5 +617,4 @@ display:
         - user.permissions
       tags:
         - 'config:field.storage.log.cfr'
-        - 'config:field.storage.log.task_implementation'
-        - 'config:field.storage.log.task_planning'
+        - 'config:field.storage.log.sub_activity'