made event attendees a multiselect instead of autocomplete

Added csv download option to reports.
removed old "trainers" field which was a paragraph
2022-04-22 09:34:48 +01:00 · 2022-04-21 13:48:35 +01:00 · 2022-04-21 13:16:39 +01:00
15 changed files with 1306 additions and 949 deletions
--- a/composer.json
+++ b/composer.json
@ -52,6 +52,7 @@
        "drupal/typed_data": "^1.0@alpha",
        "drupal/views_aggregator": "^2.0",
        "drupal/views_autosubmit": "^1.4",
+        "drupal/views_data_export": "^1.1",
        "drupal/views_summarize": "1.1.x-dev",
        "drush/drush": "*"
    },
--- a/composer.lock
+++ b/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": "cae722cdc05e4e2525a003694a33aa1d",
+    "content-hash": "fc650255701de3f228f8fcc1979b9880",
    "packages": [
        {
            "name": "asm89/stack-cors",
@ -2557,6 +2557,56 @@
            },
            "time": "2022-03-21T21:21:58+00:00"
        },
+        {
+            "name": "drupal/csv_serialization",
+            "version": "2.0.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/csv_serialization.git",
+                "reference": "8.x-2.0"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/csv_serialization-8.x-2.0.zip",
+                "reference": "8.x-2.0",
+                "shasum": "3531383a6926a4ed761be56553997c2a937449ac"
+            },
+            "require": {
+                "drupal/core": "^8 || ^9",
+                "league/csv": "^9.1"
+            },
+            "require-dev": {
+                "dealerdirect/phpcodesniffer-composer-installer": "^0.5.0",
+                "drupal/coder": "^8.3"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "8.x-2.0",
+                    "datestamp": "1612801962",
+                    "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": "Matthew Grasmick",
+                    "homepage": "https://www.drupal.org/user/455714"
+                }
+            ],
+            "description": "Provides CSV as a serialization format.",
+            "homepage": "https://www.drupal.org/project/csv_serialization",
+            "support": {
+                "source": "http://cgit.drupalcode.org/csv_serialization",
+                "issues": "https://www.drupal.org/project/issues/csv_serialization"
+            }
+        },
        {
            "name": "drupal/ctools",
            "version": "3.7.0",
@ -4406,6 +4456,75 @@
                "issues": "https://www.drupal.org/project/issues/views_autosubmit"
            }
        },
+        {
+            "name": "drupal/views_data_export",
+            "version": "1.1.0",
+            "source": {
+                "type": "git",
+                "url": "https://git.drupalcode.org/project/views_data_export.git",
+                "reference": "8.x-1.1"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://ftp.drupal.org/files/projects/views_data_export-8.x-1.1.zip",
+                "reference": "8.x-1.1",
+                "shasum": "8ee9d441e69b5861ab12286246522d52613f4e61"
+            },
+            "require": {
+                "drupal/core": "^8.8 || ^9",
+                "drupal/csv_serialization": "~1.4 || ~2.0"
+            },
+            "require-dev": {
+                "drupal/search_api": "~1.12",
+                "drupal/xls_serialization": "~1.0"
+            },
+            "type": "drupal-module",
+            "extra": {
+                "drupal": {
+                    "version": "8.x-1.1",
+                    "datestamp": "1642805106",
+                    "security-coverage": {
+                        "status": "covered",
+                        "message": "Covered by Drupal's security advisory policy"
+                    }
+                }
+            },
+            "notification-url": "https://packages.drupal.org/8/downloads",
+            "license": [
+                "GPL-2.0+"
+            ],
+            "authors": [
+                {
+                    "name": "Steven Jones",
+                    "homepage": "https://www.drupal.org/user/99644"
+                },
+                {
+                    "name": "amoebanath",
+                    "homepage": "https://www.drupal.org/user/2810799"
+                },
+                {
+                    "name": "james.williams",
+                    "homepage": "https://www.drupal.org/user/592268"
+                },
+                {
+                    "name": "jamsilver",
+                    "homepage": "https://www.drupal.org/user/476732"
+                },
+                {
+                    "name": "jhedstrom",
+                    "homepage": "https://www.drupal.org/user/208732"
+                },
+                {
+                    "name": "nerdstein",
+                    "homepage": "https://www.drupal.org/user/1557710"
+                }
+            ],
+            "description": "Plugin to export views data into various file formats.",
+            "homepage": "https://www.drupal.org/project/views_data_export",
+            "support": {
+                "source": "https://git.drupalcode.org/project/views_data_export"
+            }
+        },
        {
            "name": "drupal/views_summarize",
            "version": "dev-1.1.x",
@ -5426,6 +5545,90 @@
            ],
            "time": "2021-11-16T10:29:06+00:00"
        },
+        {
+            "name": "league/csv",
+            "version": "9.8.0",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/thephpleague/csv.git",
+                "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/thephpleague/csv/zipball/9d2e0265c5d90f5dd601bc65ff717e05cec19b47",
+                "reference": "9d2e0265c5d90f5dd601bc65ff717e05cec19b47",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "ext-mbstring": "*",
+                "php": "^7.4 || ^8.0"
+            },
+            "require-dev": {
+                "ext-curl": "*",
+                "ext-dom": "*",
+                "friendsofphp/php-cs-fixer": "^v3.4.0",
+                "phpstan/phpstan": "^1.3.0",
+                "phpstan/phpstan-phpunit": "^1.0.0",
+                "phpstan/phpstan-strict-rules": "^1.1.0",
+                "phpunit/phpunit": "^9.5.11"
+            },
+            "suggest": {
+                "ext-dom": "Required to use the XMLConverter and or the HTMLConverter classes",
+                "ext-iconv": "Needed to ease transcoding CSV using iconv stream filters"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-master": "9.x-dev"
+                }
+            },
+            "autoload": {
+                "files": [
+                    "src/functions_include.php"
+                ],
+                "psr-4": {
+                    "League\\Csv\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Ignace Nyamagana Butera",
+                    "email": "nyamsprod@gmail.com",
+                    "homepage": "https://github.com/nyamsprod/",
+                    "role": "Developer"
+                }
+            ],
+            "description": "CSV data manipulation made easy in PHP",
+            "homepage": "https://csv.thephpleague.com",
+            "keywords": [
+                "convert",
+                "csv",
+                "export",
+                "filter",
+                "import",
+                "read",
+                "transform",
+                "write"
+            ],
+            "support": {
+                "docs": "https://csv.thephpleague.com",
+                "issues": "https://github.com/thephpleague/csv/issues",
+                "rss": "https://github.com/thephpleague/csv/releases.atom",
+                "source": "https://github.com/thephpleague/csv"
+            },
+            "funding": [
+                {
+                    "url": "https://github.com/sponsors/nyamsprod",
+                    "type": "github"
+                }
+            ],
+            "time": "2022-01-04T00:13:07+00:00"
+        },
        {
            "name": "masterminds/html5",
            "version": "2.7.5",
--- a/config/core.entity_form_display.oc_case.training.default.yml
+++ b/config/core.entity_form_display.oc_case.training.default.yml
@ -8,7 +8,6 @@ dependencies:
    - field.field.oc_case.training.field_number_of_participants
    - field.field.oc_case.training.field_project
    - field.field.oc_case.training.field_social_media
-    - field.field.oc_case.training.field_trainer
    - field.field.oc_case.training.field_training_delivery_format
    - field.field.oc_case.training.field_training_status
    - field.field.oc_case.training.field_training_type
@ -26,57 +25,65 @@ mode: default
 content:
  client:
    type: options_select
-    weight: 0
+    weight: 1
    region: content
    settings: {  }
    third_party_settings: {  }
  field_date_of_training:
    type: datetime_default
-    weight: 4
+    weight: 5
    region: content
    settings: {  }
    third_party_settings: {  }
  field_project:
    type: options_select
-    weight: 1
+    weight: 2
    region: content
    settings: {  }
    third_party_settings: {  }
  field_social_media:
    type: boolean_checkbox
-    weight: 7
+    weight: 8
    region: content
    settings:
      display_label: true
    third_party_settings: {  }
  field_training_delivery_format:
    type: options_select
-    weight: 5
+    weight: 6
    region: content
    settings: {  }
    third_party_settings: {  }
  field_training_status:
    type: options_select
-    weight: 3
+    weight: 4
    region: content
    settings: {  }
    third_party_settings: {  }
  field_training_type:
    type: options_select
-    weight: 2
+    weight: 3
    region: content
    settings: {  }
    third_party_settings: {  }
  files:
    type: file_generic
-    weight: 6
+    weight: 7
    region: content
    settings:
      progress_indicator: throbber
    third_party_settings: {  }
+  name:
+    type: string_textfield
+    weight: 0
+    region: content
+    settings:
+      size: 60
+      placeholder: ''
+    third_party_settings: {  }
  notes:
    type: string_textarea
-    weight: 9
+    weight: 10
    region: content
    settings:
      rows: 5
@ -84,7 +91,7 @@ content:
    third_party_settings: {  }
  revision_log:
    type: hide_revision_field_log_widget
-    weight: 80
+    weight: 11
    region: content
    settings:
      rows: 5
@ -96,7 +103,7 @@ content:
    third_party_settings: {  }
  status:
    type: boolean_checkbox
-    weight: 8
+    weight: 9
    region: content
    settings:
      display_label: true
@ -104,6 +111,6 @@ content:
 hidden:
  feeds_item: true
  field_number_of_participants: true
-  field_trainer: true
  oc_target: true
+  total_fee: true
  user_id: true
--- a/config/core.entity_form_display.oc_event.train_the_trainer.default.yml
+++ b/config/core.entity_form_display.oc_event.train_the_trainer.default.yml
@ -4,13 +4,17 @@ status: true
 dependencies:
  config:
    - opencase_entities.oc_event_type.train_the_trainer
-  module:
-    - datetime
 id: oc_event.train_the_trainer.default
 targetEntityType: oc_event
 bundle: train_the_trainer
 mode: default
 content:
+  attendees:
+    type: options_select
+    weight: 2
+    region: content
+    settings: {  }
+    third_party_settings: {  }
  name:
    type: string_textfield
    weight: 0
@ -26,4 +30,7 @@ content:
    settings:
      display_label: true
    third_party_settings: {  }
-hidden: {  }
+hidden:
+  activity_date_time: true
+  description: true
+  user_id: true
--- a/config/core.entity_view_display.oc_case.training.default.yml
+++ b/config/core.entity_view_display.oc_case.training.default.yml
@ -8,7 +8,6 @@ dependencies:
    - field.field.oc_case.training.field_number_of_participants
    - field.field.oc_case.training.field_project
    - field.field.oc_case.training.field_social_media
-    - field.field.oc_case.training.field_trainer
    - field.field.oc_case.training.field_training_delivery_format
    - field.field.oc_case.training.field_training_status
    - field.field.oc_case.training.field_training_type
@ -174,6 +173,8 @@ hidden:
  changed: true
  created: true
  feeds_item: true
-  field_trainer: true
+  name: true
+  oc_target: true
  search_api_excerpt: true
+  status: true
  total_fee: true
--- a/config/core.extension.yml
+++ b/config/core.extension.yml
@ -14,6 +14,7 @@ module:
  contact: 0
  content_as_config: 0
  contextual: 0
+  csv_serialization: 0
  ctools: 0
  date_popup: 0
  datetime: 0
@ -78,6 +79,7 @@ module:
  user: 0
  views_aggregator: 0
  views_autosubmit: 0
+  views_data_export: 0
  views_summarize: 0
  views_ui: 0
  hide_revision_field: 1
--- a/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml
+++ b/config/entity_extra_field.extra_field.oc_organisation.client.trainings.yml
@ -1,46 +0,0 @@
-uuid: 8a57272e-e5d7-45cf-94f2-9bdb9c734cb9
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_date_of_training
-    - field.storage.oc_case.field_trainer
-    - field.storage.paragraph.field_trainer
-    - opencase_cases.oc_case_type.training
-    - system.menu.opencase
-  module:
-    - datetime
-    - entity_reference_revisions
-    - opencase_cases
-    - paragraphs
-    - user
-_core:
-  default_config_hash: Of0WcqhFUX1HB3oQfisZ29RgEzlpmN7kiIRRYU2nzMo
-id: oc_organisation.client.trainings
-label: Trainings
-display_label: true
-name: trainings
-description: ''
-base_entity_type_id: oc_organisation
-base_bundle_type_id: client
-field_type_id: views
-field_type_config:
-  view_name: trainings
-  display: block_2
-  arguments: ''
-field_type_condition:
-  route:
-    id: route
-    routes: ''
-    negate: false
-  request_path:
-    id: request_path
-    pages: ''
-    negate: false
-  current_theme:
-    id: current_theme
-    theme: ''
-    negate: 0
-field_conditions_all_pass: false
-display:
-  type: view
--- a/config/field.field.oc_case.training.field_trainer.yml
+++ b/config/field.field.oc_case.training.field_trainer.yml
@ -1,33 +0,0 @@
-uuid: c722bc26-a033-4f9d-8f04-a65b247e113b
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_trainer
-    - opencase_cases.oc_case_type.training
-    - paragraphs.paragraphs_type.trainer
-  module:
-    - entity_reference_revisions
-_core:
-  default_config_hash: o2DTDQHJfJCyEoBkkDbvkoaAFv-DRtgFn_nGl4in-0s
-id: oc_case.training.field_trainer
-field_name: field_trainer
-entity_type: oc_case
-bundle: training
-label: Trainers
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  handler: 'default:paragraph'
-  handler_settings:
-    negate: 0
-    target_bundles:
-      trainer: trainer
-    target_bundles_drag_drop:
-      trainer:
-        enabled: true
-        weight: 2
-field_type: entity_reference_revisions
--- a/config/field.storage.oc_case.field_trainer.yml
+++ b/config/field.storage.oc_case.field_trainer.yml
@ -1,23 +0,0 @@
-uuid: 89971a6a-34b5-41aa-869d-a343c2f96e55
-langcode: en
-status: true
-dependencies:
-  module:
-    - entity_reference_revisions
-    - opencase_cases
-    - paragraphs
-_core:
-  default_config_hash: Pmyzz5YecwFkTwL_KrDpiCYyP24kjfrahEfTN4OZOc4
-id: oc_case.field_trainer
-field_name: field_trainer
-entity_type: oc_case
-type: entity_reference_revisions
-settings:
-  target_type: paragraph
-module: entity_reference_revisions
-locked: false
-cardinality: -1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
--- a/config/views.view.case_fees_report.yml
+++ b/config/views.view.case_fees_report.yml
@ -15,12 +15,16 @@ dependencies:
    - taxonomy.vocabulary.tags
    - user.role.gno_admin_user
  module:
+    - csv_serialization
    - datetime
    - opencase_cases
    - opencase_entities
    - options
+    - rest
+    - serialization
    - taxonomy
    - user
+    - views_data_export
    - views_summarize
 id: case_fees_report
 label: 'Case Fees Report'
@ -1162,6 +1166,55 @@ display:
        - user
        - user.roles
      tags: {  }
+  data_export_1:
+    id: data_export_1
+    display_title: 'Data export'
+    display_plugin: data_export
+    position: 3
+    display_options:
+      style:
+        type: data_export
+        options:
+          formats:
+            csv: csv
+          csv_settings:
+            delimiter: ','
+            enclosure: '"'
+            escape_char: \
+            strip_tags: true
+            trim: true
+            encoding: utf8
+            utf8_bom: '0'
+            use_serializer_encode_only: false
+      display_extenders: {  }
+      path: case_fees_report/download
+      auth:
+        - cookie
+      displays:
+        page_1: page_1
+        default: '0'
+      filename: '[view:label]-[date:short] '
+      automatic_download: false
+      store_in_public_file_directory: null
+      custom_redirect_path: false
+      redirect_to_display: none
+      include_query_params: false
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - request_format
+        - url
+        - user
+        - user.roles
+      tags:
+        - 'config:field.storage.oc_case.field_contract_signed_date'
+        - 'config:field.storage.oc_organisation.field_client_subtype'
+        - 'config:field.storage.oc_organisation.field_client_type'
+        - 'config:field.storage.oc_organisation.field_tags'
+        - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
+        - 'config:field.storage.oc_organisation.field_umbrella_client'
  page_1:
    id: page_1
    display_title: Page
--- a/config/views.view.case_provision_report.yml
+++ b/config/views.view.case_provision_report.yml
@ -8,10 +8,14 @@ dependencies:
    - system.menu.opencase
    - user.role.gno_admin_user
  module:
+    - csv_serialization
    - opencase_cases
    - opencase_entities
    - options
+    - rest
+    - serialization
    - user
+    - views_data_export
 id: case_provision_report
 label: 'Case provision report'
 module: views
@ -693,6 +697,50 @@ display:
      tags:
        - 'config:field.storage.oc_case_provision.field_rate'
        - 'config:field.storage.oc_case_provision.field_rate_type'
+  data_export_1:
+    id: data_export_1
+    display_title: 'Data export'
+    display_plugin: data_export
+    position: 2
+    display_options:
+      style:
+        type: data_export
+        options:
+          formats:
+            csv: csv
+          csv_settings:
+            delimiter: ','
+            enclosure: '"'
+            escape_char: \
+            strip_tags: true
+            trim: true
+            encoding: utf8
+            utf8_bom: '0'
+            use_serializer_encode_only: false
+      display_extenders: {  }
+      path: case_provision_report/download
+      auth:
+        - cookie
+      displays:
+        page_1: page_1
+        default: '0'
+      filename: 'Trainer-report-[date:short] '
+      automatic_download: false
+      store_in_public_file_directory: null
+      custom_redirect_path: false
+      redirect_to_display: none
+      include_query_params: false
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - request_format
+        - url
+        - user.roles
+      tags:
+        - 'config:field.storage.oc_case_provision.field_rate'
+        - 'config:field.storage.oc_case_provision.field_rate_type'
  page_1:
    id: page_1
    display_title: Page
--- a/config/views.view.client_report.yml
+++ b/config/views.view.client_report.yml
@ -21,11 +21,15 @@ dependencies:
    - user.role.gno_admin_user
  module:
    - better_exposed_filters
+    - csv_serialization
    - datetime
    - opencase_entities
    - options
+    - rest
+    - serialization
    - taxonomy
    - user
+    - views_data_export
 id: client_report
 label: 'Client Report'
 module: views
@ -1256,6 +1260,57 @@ display:
        - 'config:field.storage.oc_organisation.field_tags'
        - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
        - 'config:field.storage.oc_organisation.field_umbrella_client'
+  data_export_1:
+    id: data_export_1
+    display_title: 'Data export'
+    display_plugin: data_export
+    position: 2
+    display_options:
+      style:
+        type: data_export
+        options:
+          formats:
+            csv: csv
+          csv_settings:
+            delimiter: ','
+            enclosure: '"'
+            escape_char: \
+            strip_tags: true
+            trim: true
+            encoding: utf8
+            utf8_bom: '0'
+            use_serializer_encode_only: false
+      display_extenders: {  }
+      path: client-report/download
+      auth:
+        - cookie
+      displays:
+        page_1: page_1
+        default: '0'
+      filename: '[view:label]-[date:short]'
+      automatic_download: false
+      store_in_public_file_directory: null
+      custom_redirect_path: false
+      redirect_to_display: none
+      include_query_params: false
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - request_format
+        - url
+        - user
+        - user.roles
+      tags:
+        - 'config:field.storage.oc_organisation.field_accreditation_date'
+        - 'config:field.storage.oc_organisation.field_client_status'
+        - 'config:field.storage.oc_organisation.field_client_substatus'
+        - 'config:field.storage.oc_organisation.field_client_subtype'
+        - 'config:field.storage.oc_organisation.field_client_type'
+        - 'config:field.storage.oc_organisation.field_tags'
+        - 'config:field.storage.oc_organisation.field_type_of_umbrella_client'
+        - 'config:field.storage.oc_organisation.field_umbrella_client'
  page_1:
    id: page_1
    display_title: Page
--- a/config/views.view.debrief_report.yml
+++ b/config/views.view.debrief_report.yml
@ -8,7 +8,10 @@ dependencies:
    - user.role.gno_admin_user
  module:
    - opencase_entities
+    - rest
+    - serialization
    - user
+    - views_data_export
 id: debrief_report
 label: 'Debrief Report'
 module: views
@ -362,6 +365,34 @@ display:
        - url.query_args
        - user.roles
      tags: {  }
+  data_export_1:
+    id: data_export_1
+    display_title: 'Data export'
+    display_plugin: data_export
+    position: 2
+    display_options:
+      display_extenders: {  }
+      path: debrief-report/download
+      auth:
+        - cookie
+      displays:
+        page_1: page_1
+        default: '0'
+      filename: '[view:label]-[date:short]'
+      automatic_download: false
+      store_in_public_file_directory: null
+      custom_redirect_path: false
+      redirect_to_display: none
+      include_query_params: false
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - request_format
+        - url
+        - user.roles
+      tags: {  }
  page_1:
    id: page_1
    display_title: Page
--- a/config/views.view.evaluation_report.yml
+++ b/config/views.view.evaluation_report.yml
--- a/config/views.view.projects.yml
+++ b/config/views.view.projects.yml
@ -1,6 +1,6 @@
 uuid: d6279582-2817-4fc5-8da1-7aef408ac19f
 langcode: en
-status: false
+status: true
 dependencies:
  config:
    - field.storage.oc_case.field_contract_signed_date
Author	SHA1	Message	Date
naomi	7b6d60ceee	made event attendees a multiselect instead of autocomplete	2022-04-22 09:34:48 +01:00
naomi	917161c3e6	Added csv download option to reports.	2022-04-21 13:48:35 +01:00
naomi	c1a79f6747	removed old "trainers" field which was a paragraph	2022-04-21 13:16:39 +01:00