Merge branch 'master' into dev

2022-04-25 12:45:54 +01:00 · 2022-04-25 12:45:54 +01:00 · 5889984cd8
commit 5889984cd8
parent ad356e805f 0deb98d2d0
37 changed files with 2262 additions and 1166 deletions
--- a/.gitignore
+++ b/.gitignore
@ -2,6 +2,7 @@

 !composer.json
 !composer.lock
+!update_project.sh
 !.gitignore
 !config
 !config/*
--- 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": "93acd913107c844b44d762597e0351cc",
+    "content-hash": "47f6c8168fc635474beecd594fac4370",
    "packages": [
        {
            "name": "asm89/stack-cors",
@ -68,7 +68,7 @@
            "source": {
                "type": "git",
                "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/goodnightout_opencase.git",
-                "reference": "86eb555757927091933ba70949aedae7a7474d28"
+                "reference": "8db98832e996ce35c6489a3cabf02ff81c6d6bc6"
            },
            "require": {
                "drupal/admin_toolbar": "*",
@ -85,7 +85,7 @@
                    "email": "helo@autonomic.zone"
                }
            ],
-            "time": "2022-04-03T18:47:09+00:00"
+            "time": "2022-04-25T11:44:58+00:00"
        },
        {
            "name": "autonomic/opencase",
@ -93,7 +93,7 @@
            "source": {
                "type": "git",
                "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git",
-                "reference": "34b7a1c7c9a56926bd47e0b024b443033e397d1c"
+                "reference": "5af08013021a173f0f29cff029fbfbbfec649ba2"
            },
            "require": {
                "composer/installers": "*",
@ -110,7 +110,7 @@
                    "email": "helo@autonomic.zone"
                }
            ],
-            "time": "2022-04-03T18:27:43+00:00"
+            "time": "2022-04-22T15:26:09+00:00"
        },
        {
            "name": "bjeavons/zxcvbn-php",
@ -457,22 +457,22 @@
        },
        {
            "name": "consolidation/annotated-command",
-            "version": "4.5.3",
+            "version": "4.5.4",
            "source": {
                "type": "git",
                "url": "https://github.com/consolidation/annotated-command.git",
-                "reference": "1941a743e63993288e09d0686a4cb7ed47813213"
+                "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/1941a743e63993288e09d0686a4cb7ed47813213",
-                "reference": "1941a743e63993288e09d0686a4cb7ed47813213",
+                "url": "https://api.github.com/repos/consolidation/annotated-command/zipball/93398c3166d9026ab93219ce23b2092b4d7b7904",
+                "reference": "93398c3166d9026ab93219ce23b2092b4d7b7904",
                "shasum": ""
            },
            "require": {
                "consolidation/output-formatters": "^4.1.1",
                "php": ">=7.1.3",
-                "psr/log": "^1|^2",
+                "psr/log": "^1|^2|^3",
                "symfony/console": "^4.4.8|^5|^6",
                "symfony/event-dispatcher": "^4.4.8|^5|^6",
                "symfony/finder": "^4.4.8|^5|^6"
@ -486,7 +486,7 @@
            "type": "library",
            "extra": {
                "branch-alias": {
-                    "dev-main": "5.x-dev"
+                    "dev-main": "4.x-dev"
                }
            },
            "autoload": {
@ -507,9 +507,9 @@
            "description": "Initialize Symfony Console commands from annotated command class methods.",
            "support": {
                "issues": "https://github.com/consolidation/annotated-command/issues",
-                "source": "https://github.com/consolidation/annotated-command/tree/4.5.3"
+                "source": "https://github.com/consolidation/annotated-command/tree/4.5.4"
            },
-            "time": "2022-04-02T00:17:53+00:00"
+            "time": "2022-04-05T17:58:10+00:00"
        },
        {
            "name": "consolidation/config",
@ -2124,16 +2124,16 @@
        },
        {
            "name": "drupal/core",
-            "version": "9.3.9",
+            "version": "9.3.12",
            "source": {
                "type": "git",
                "url": "https://github.com/drupal/core.git",
-                "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774"
+                "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core/zipball/86b0c4496e20ae7f945e9a7f0404fafe191ab774",
-                "reference": "86b0c4496e20ae7f945e9a7f0404fafe191ab774",
+                "url": "https://api.github.com/repos/drupal/core/zipball/ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
+                "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c",
                "shasum": ""
            },
            "require": {
@ -2375,13 +2375,13 @@
            ],
            "description": "Drupal is an open source content management platform powering millions of websites and applications.",
            "support": {
-                "source": "https://github.com/drupal/core/tree/9.3.9"
+                "source": "https://github.com/drupal/core/tree/9.3.12"
            },
-            "time": "2022-03-21T21:21:58+00:00"
+            "time": "2022-04-20T14:25:27+00:00"
        },
        {
            "name": "drupal/core-composer-scaffold",
-            "version": "9.3.9",
+            "version": "9.3.12",
            "source": {
                "type": "git",
                "url": "https://github.com/drupal/core-composer-scaffold.git",
@ -2425,13 +2425,13 @@
                "drupal"
            ],
            "support": {
-                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.9"
+                "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.12"
            },
            "time": "2022-02-24T17:40:56+00:00"
        },
        {
            "name": "drupal/core-project-message",
-            "version": "9.3.9",
+            "version": "9.3.12",
            "source": {
                "type": "git",
                "url": "https://github.com/drupal/core-project-message.git",
@ -2466,22 +2466,22 @@
                "drupal"
            ],
            "support": {
-                "source": "https://github.com/drupal/core-project-message/tree/9.3.9"
+                "source": "https://github.com/drupal/core-project-message/tree/9.3.12"
            },
            "time": "2022-02-24T17:40:56+00:00"
        },
        {
            "name": "drupal/core-recommended",
-            "version": "9.3.9",
+            "version": "9.3.12",
            "source": {
                "type": "git",
                "url": "https://github.com/drupal/core-recommended.git",
-                "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411"
+                "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/3ce3f2b6145de56178e006fb2ef94089d32cf411",
-                "reference": "3ce3f2b6145de56178e006fb2ef94089d32cf411",
+                "url": "https://api.github.com/repos/drupal/core-recommended/zipball/a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
+                "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f",
                "shasum": ""
            },
            "require": {
@ -2490,7 +2490,7 @@
                "doctrine/annotations": "1.13.2",
                "doctrine/lexer": "1.2.1",
                "doctrine/reflection": "1.2.2",
-                "drupal/core": "9.3.9",
+                "drupal/core": "9.3.12",
                "egulias/email-validator": "3.1.2",
                "guzzlehttp/guzzle": "6.5.5",
                "guzzlehttp/promises": "1.5.1",
@ -2552,9 +2552,59 @@
            ],
            "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.",
            "support": {
-                "source": "https://github.com/drupal/core-recommended/tree/9.3.9"
+                "source": "https://github.com/drupal/core-recommended/tree/9.3.12"
            },
-            "time": "2022-03-21T21:21:58+00:00"
+            "time": "2022-04-20T14:25:27+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",
@ -2981,17 +3031,17 @@
        },
        {
            "name": "drupal/facets",
-            "version": "2.0.1",
+            "version": "2.0.2",
            "source": {
                "type": "git",
                "url": "https://git.drupalcode.org/project/facets.git",
-                "reference": "2.0.1"
+                "reference": "2.0.2"
            },
            "dist": {
                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/facets-2.0.1.zip",
-                "reference": "2.0.1",
-                "shasum": "ec6e9de9dd1726b6ca173abd79a69d2574db3e89"
+                "url": "https://ftp.drupal.org/files/projects/facets-2.0.2.zip",
+                "reference": "2.0.2",
+                "shasum": "17afc46d3f4e4300e8e69f23b3b01a4935b57104"
            },
            "require": {
                "drupal/core": "^9.2 || ^10.0"
@ -3000,13 +3050,19 @@
                "drupal/search_api": "<1.14"
            },
            "require-dev": {
+                "drupal/jquery_ui_slider": "~1.1",
+                "drupal/jquery_ui_touch_punch": "~1.0",
                "drupal/search_api": "~1.21"
            },
+            "suggest": {
+                "drupal/jquery_ui_slider": "Required for the 'Facets Range Widget' module to work",
+                "drupal/jquery_ui_touch_punch": "Required for the 'Facets Range Widget' module to work"
+            },
            "type": "drupal-module",
            "extra": {
                "drupal": {
-                    "version": "2.0.1",
-                    "datestamp": "1642699685",
+                    "version": "2.0.2",
+                    "datestamp": "1649070269",
                    "security-coverage": {
                        "status": "covered",
                        "message": "Covered by Drupal's security advisory policy"
@ -3516,20 +3572,20 @@
        },
        {
            "name": "drupal/paragraphs",
-            "version": "1.13.0",
+            "version": "1.14.0",
            "source": {
                "type": "git",
                "url": "https://git.drupalcode.org/project/paragraphs.git",
-                "reference": "8.x-1.13"
+                "reference": "8.x-1.14"
            },
            "dist": {
                "type": "zip",
-                "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.13.zip",
-                "reference": "8.x-1.13",
-                "shasum": "5e06df68411b17a5d8adaa292ddf70840d00876f"
+                "url": "https://ftp.drupal.org/files/projects/paragraphs-8.x-1.14.zip",
+                "reference": "8.x-1.14",
+                "shasum": "caa1a945dcfd058c4937c4907743eed970ce14cc"
            },
            "require": {
-                "drupal/core": "^8.8 || ^9",
+                "drupal/core": "^9.2",
                "drupal/entity_reference_revisions": "~1.3"
            },
            "require-dev": {
@ -3551,8 +3607,8 @@
            "type": "drupal-module",
            "extra": {
                "drupal": {
-                    "version": "8.x-1.13",
-                    "datestamp": "1646121716",
+                    "version": "8.x-1.14",
+                    "datestamp": "1650520869",
                    "security-coverage": {
                        "status": "covered",
                        "message": "Covered by Drupal's security advisory policy"
@ -4399,6 +4455,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",
@ -4446,22 +4571,22 @@
        },
        {
            "name": "drush/drush",
-            "version": "11.0.7",
+            "version": "11.0.9",
            "source": {
                "type": "git",
                "url": "https://github.com/drush-ops/drush.git",
-                "reference": "6991a3b8f6827d0bab13005402730fc50d130a50"
+                "reference": "88b2293ded84f67aad96ad6dbd64cacd84bcd6fe"
            },
            "dist": {
                "type": "zip",
-                "url": "https://api.github.com/repos/drush-ops/drush/zipball/6991a3b8f6827d0bab13005402730fc50d130a50",
-                "reference": "6991a3b8f6827d0bab13005402730fc50d130a50",
+                "url": "https://api.github.com/repos/drush-ops/drush/zipball/88b2293ded84f67aad96ad6dbd64cacd84bcd6fe",
+                "reference": "88b2293ded84f67aad96ad6dbd64cacd84bcd6fe",
                "shasum": ""
            },
            "require": {
                "chi-teck/drupal-code-generator": "^2.4",
                "composer/semver": "^1.4 || ^3",
-                "consolidation/annotated-command": "^4.5",
+                "consolidation/annotated-command": "^4.5.3",
                "consolidation/config": "^2",
                "consolidation/filter-via-dot-access-data": "^2",
                "consolidation/robo": "^3.0.9",
@ -4580,7 +4705,7 @@
                "irc": "irc://irc.freenode.org/drush",
                "issues": "https://github.com/drush-ops/drush/issues",
                "slack": "https://drupal.slack.com/messages/C62H9CWQM",
-                "source": "https://github.com/drush-ops/drush/tree/11.0.7"
+                "source": "https://github.com/drush-ops/drush/tree/11.0.9"
            },
            "funding": [
                {
@ -4588,7 +4713,7 @@
                    "type": "github"
                }
            ],
-            "time": "2022-03-09T19:32:53+00:00"
+            "time": "2022-04-16T12:01:55+00:00"
        },
        {
            "name": "egulias/email-validator",
@ -5419,6 +5544,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_activity.phone_call.default.yml
+++ b/config/core.entity_form_display.oc_activity.phone_call.default.yml
@ -11,16 +11,6 @@ targetEntityType: oc_activity
 bundle: phone_call
 mode: default
 content:
-  client:
-    type: entity_reference_autocomplete
-    weight: 2
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
  name:
    type: string_textfield
    weight: 0
@ -31,7 +21,7 @@ content:
    third_party_settings: {  }
  revision_log:
    type: hide_revision_field_log_widget
-    weight: 80
+    weight: 2
    region: content
    settings:
      rows: 5
@ -50,6 +40,7 @@ content:
    third_party_settings: {  }
 hidden:
  activity_date_time: true
+  client: true
  description: true
  oc_provider: true
  oc_target: true
--- a/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml
+++ b/config/core.entity_form_display.oc_activity.trainer_debrief.default.yml
@ -94,14 +94,10 @@ content:
      placeholder: ''
    third_party_settings: {  }
  oc_provider:
-    type: entity_reference_autocomplete
+    type: options_select
    weight: 0
    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
    third_party_settings: {  }
  revision_log:
    type: hide_revision_field_log_widget
--- a/config/core.entity_form_display.oc_actor.trainer.default.yml
+++ b/config/core.entity_form_display.oc_actor.trainer.default.yml
@ -53,14 +53,10 @@ content:
      default_paragraph_type: _none
    third_party_settings: {  }
  field_delivery_partners:
-    type: entity_reference_autocomplete
+    type: options_select
    weight: 7
    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
    third_party_settings: {  }
  field_emergency_contact:
    type: entity_reference_paragraphs
--- a/config/core.entity_form_display.oc_case.project.default.yml
+++ b/config/core.entity_form_display.oc_case.project.default.yml
@ -6,7 +6,6 @@ dependencies:
    - field.field.oc_case.project.feeds_item
    - field.field.oc_case.project.field_contract_signed_date
    - field.field.oc_case.project.field_fee
-    - field.field.oc_case.project.field_total_fee
    - opencase_cases.oc_case_type.project
  module:
    - datetime
@ -18,14 +17,10 @@ bundle: project
 mode: default
 content:
  client:
-    type: entity_reference_autocomplete
+    type: options_select
    weight: 0
    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
    third_party_settings: {  }
  field_contract_signed_date:
    type: datetime_default
@ -62,7 +57,8 @@ content:
 hidden:
  feeds_item: true
  field_fee: true
-  field_total_fee: true
+  name: true
  notes: true
  oc_target: true
+  total_fee: true
  user_id: true
--- 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
@ -25,66 +24,66 @@ bundle: training
 mode: default
 content:
  client:
-    type: entity_reference_autocomplete
-    weight: 0
+    type: options_select
+    weight: 1
    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
    third_party_settings: {  }
  field_date_of_training:
    type: datetime_default
-    weight: 4
+    weight: 5
    region: content
    settings: {  }
    third_party_settings: {  }
  field_project:
-    type: entity_reference_autocomplete
-    weight: 1
+    type: options_select
+    weight: 2
    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    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
@ -92,7 +91,7 @@ content:
    third_party_settings: {  }
  revision_log:
    type: hide_revision_field_log_widget
-    weight: 80
+    weight: 11
    region: content
    settings:
      rows: 5
@ -104,7 +103,7 @@ content:
    third_party_settings: {  }
  status:
    type: boolean_checkbox
-    weight: 8
+    weight: 9
    region: content
    settings:
      display_label: true
@ -112,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_case_fee.project_fee.default.yml
+++ b/config/core.entity_form_display.oc_case_fee.project_fee.default.yml
@ -5,8 +5,6 @@ dependencies:
  config:
    - field.field.oc_case_fee.project_fee.feeds_item
    - opencase_cases.oc_case_fee_type.project_fee
-  module:
-    - hide_revision_field
 id: oc_case_fee.project_fee.default
 targetEntityType: oc_case_fee
 bundle: project_fee
@ -20,30 +18,15 @@ content:
      placeholder: ''
    third_party_settings: {  }
  oc_fee_category:
-    type: entity_reference_autocomplete
+    type: options_select
    weight: 0
    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
-  revision_log:
-    type: hide_revision_field_log_widget
-    weight: 80
-    region: content
-    settings:
-      rows: 5
-      placeholder: ''
-      show: false
-      default: ''
-      permission_based: false
-      allow_user_settings: false
+    settings: {  }
    third_party_settings: {  }
 hidden:
  feeds_item: true
  name: true
  oc_case: true
+  revision_log: true
  status: true
  user_id: true
--- a/config/core.entity_form_display.oc_case_provision.trainer.default.yml
+++ b/config/core.entity_form_display.oc_case_provision.trainer.default.yml
@ -27,16 +27,6 @@ content:
    region: content
    settings: {  }
    third_party_settings: {  }
-  oc_case:
-    type: entity_reference_autocomplete
-    weight: 4
-    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
-    third_party_settings: {  }
  oc_case_provider_role:
    type: options_select
    weight: 1
@ -44,18 +34,14 @@ content:
    settings: {  }
    third_party_settings: {  }
  oc_provider:
-    type: entity_reference_autocomplete
+    type: options_select
    weight: 0
    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
    third_party_settings: {  }
  revision_log:
    type: hide_revision_field_log_widget
-    weight: 80
+    weight: 4
    region: content
    settings:
      rows: 5
@ -68,5 +54,6 @@ content:
 hidden:
  feeds_item: true
  name: true
+  oc_case: true
  status: 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_form_display.oc_organisation.client.default.yml
+++ b/config/core.entity_form_display.oc_organisation.client.default.yml
@ -95,24 +95,16 @@ content:
      placeholder: ''
    third_party_settings: {  }
  field_tags:
-    type: entity_reference_autocomplete
+    type: options_select
    weight: 11
    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
    third_party_settings: {  }
  field_umbrella_client:
-    type: entity_reference_autocomplete
+    type: options_select
    weight: 6
    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
    third_party_settings: {  }
  name:
    type: string_textfield
--- a/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml
+++ b/config/core.entity_form_display.oc_organisation.umbrella_client.default.yml
@ -18,14 +18,10 @@ bundle: umbrella_client
 mode: default
 content:
  field_tags:
-    type: entity_reference_autocomplete
+    type: options_select
    weight: 2
    region: content
-    settings:
-      match_operator: CONTAINS
-      match_limit: 10
-      size: 60
-      placeholder: ''
+    settings: {  }
    third_party_settings: {  }
  field_type_of_umbrella_client:
    type: options_select
--- a/config/core.entity_view_display.oc_case.project.default.yml
+++ b/config/core.entity_view_display.oc_case.project.default.yml
@ -6,7 +6,6 @@ dependencies:
    - field.field.oc_case.project.feeds_item
    - field.field.oc_case.project.field_contract_signed_date
    - field.field.oc_case.project.field_fee
-    - field.field.oc_case.project.field_total_fee
    - opencase_cases.oc_case_type.project
  module:
    - datetime
@ -85,6 +84,8 @@ hidden:
  created: true
  feeds_item: true
  field_fee: true
-  field_total_fee: true
+  name: true
  notes: true
+  oc_target: true
  search_api_excerpt: true
+  status: 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.entity_view_mode.projects.yml
+++ b/config/core.entity_view_mode.projects.yml
@ -0,0 +1,18 @@
+uuid: d6279582-2817-4fc5-8da1-7aef408ac19f
+langcode: en
+status: true
+dependencies:
+  config:
+    - field.storage.oc_case.field_contract_signed_date
+    - opencase_cases.oc_case_type.project
+    - system.menu.opencase
+    - user.role.administrator
+    - user.role.gno_admin_user
+  module:
+    - datetime
+    - opencase_cases
+    - user
+id: projects
+label: Projects
+targetEntityType: null
+cache: 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/core.menu.static_menu_link_overrides.yml
+++ b/config/core.menu.static_menu_link_overrides.yml
@ -23,5 +23,59 @@ definitions:
    parent: ''
    expanded: false
    enabled: true
+  'opencase__manage_taxonomy_links:client_status':
+    enabled: false
+    menu_name: opencase
+    parent: opencase.opencase_admin_menu
+    expanded: false
+    weight: 0
+  'opencase__manage_taxonomy_links:clie':
+    enabled: false
+    menu_name: opencase
+    parent: opencase.opencase_admin_menu
+    weight: 0
+    expanded: false
+  'opencase__manage_taxonomy_links:client_subtypes':
+    enabled: false
+    menu_name: opencase
+    parent: opencase.opencase_admin_menu
+    weight: 0
+    expanded: false
+  'opencase__manage_taxonomy_links:client_types':
+    enabled: false
+    menu_name: opencase
+    parent: opencase.opencase_admin_menu
+    weight: 0
+    expanded: false
+  'opencase__see_all_organisations_links:client':
+    enabled: false
+    menu_name: opencase
+    parent: opencase.see_all
+    expanded: false
+    weight: 0
+  'opencase__see_all_organisations_links:partner_organisation':
+    enabled: false
+    menu_name: opencase
+    parent: opencase.see_all
+    weight: 0
+    expanded: false
+  'opencase__see_all_people_links:trainer':
+    enabled: false
+    menu_name: opencase
+    parent: opencase.see_all
+    weight: 0
+    expanded: false
+  'opencase__see_all_organisations_links:umbrella_client':
+    enabled: false
+    menu_name: opencase
+    parent: opencase.see_all
+    weight: 0
+    expanded: false
+  'opencase__manage_taxonomy_links:oc_case_provider_role':
+    enabled: false
+    menu_name: opencase
+    parent: opencase.opencase_admin_menu
+    expanded: false
+    weight: 0
 _core:
  default_config_hash: o4bYR9ZupWb3AsOIizTUG4g-nu1mdJqA59UB7QT-ifQ
--- 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.project.field_total_fee.yml
+++ b/config/field.field.oc_case.project.field_total_fee.yml
@ -1,23 +0,0 @@
-uuid: 244c5c44-44f0-40b8-8dc3-5a0b2119d536
-langcode: en
-status: true
-dependencies:
-  config:
-    - field.storage.oc_case.field_total_fee
-    - opencase_cases.oc_case_type.project
-id: oc_case.project.field_total_fee
-field_name: field_total_fee
-entity_type: oc_case
-bundle: project
-label: 'Total fee'
-description: ''
-required: false
-translatable: false
-default_value: {  }
-default_value_callback: ''
-settings:
-  min: null
-  max: null
-  prefix: £
-  suffix: ''
-field_type: decimal
--- 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.field.oc_case_provision.trainer.field_rate.yml
+++ b/config/field.field.oc_case_provision.trainer.field_rate.yml
@ -13,7 +13,9 @@ label: Rate
 description: ''
 required: false
 translatable: false
-default_value: {  }
+default_value:
+  -
+    value: !!float 120
 default_value_callback: ''
 settings:
  min: null
--- a/config/field.field.oc_case_provision.trainer.field_rate_type.yml
+++ b/config/field.field.oc_case_provision.trainer.field_rate_type.yml
@ -17,7 +17,7 @@ required: false
 translatable: false
 default_value:
  -
-    value: custom
+    value: standard
 default_value_callback: ''
 settings: {  }
 field_type: list_string
--- a/config/field.storage.oc_case.field_total_fee.yml
+++ b/config/field.storage.oc_case.field_total_fee.yml
@ -1,24 +0,0 @@
-uuid: 4bb28508-5949-4bf5-9b70-97c68ab50473
-langcode: en
-status: true
-dependencies:
-  module:
-    - field_permissions
-    - opencase_cases
-third_party_settings:
-  field_permissions:
-    permission_type: public
-id: oc_case.field_total_fee
-field_name: field_total_fee
-entity_type: oc_case
-type: decimal
-settings:
-  precision: 10
-  scale: 2
-module: core
-locked: false
-cardinality: 1
-translatable: true
-indexes: {  }
-persist_with_no_fields: false
-custom_storage: false
--- 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/user.role.gno_admin_user.yml
+++ b/config/user.role.gno_admin_user.yml
@ -2,10 +2,19 @@ uuid: 1b23a802-601d-4d00-8818-392b5e496f9d
 langcode: en
 status: true
 dependencies:
+  config:
+    - taxonomy.vocabulary.clie
+    - taxonomy.vocabulary.client_status
+    - taxonomy.vocabulary.client_subtypes
+    - taxonomy.vocabulary.client_types
+    - taxonomy.vocabulary.oc_case_provider_role
+    - taxonomy.vocabulary.oc_fee_category
+    - taxonomy.vocabulary.tags
  module:
    - opencase
    - opencase_cases
    - opencase_entities
+    - taxonomy
 id: gno_admin_user
 label: 'GNO Additional Admin Permissions'
 weight: 4
@ -15,7 +24,15 @@ permissions:
  - 'add case fee entities'
  - 'add case provision entities'
  - 'add equal opps entities'
+  - 'administer taxonomy'
  - 'administer users'
+  - 'create terms in clie'
+  - 'create terms in client_status'
+  - 'create terms in client_subtypes'
+  - 'create terms in client_types'
+  - 'create terms in oc_case_provider_role'
+  - 'create terms in oc_fee_category'
+  - 'create terms in tags'
  - 'delete activity entities'
  - 'delete all trainer revisions'
  - 'delete bank account entities'
@ -25,11 +42,24 @@ permissions:
  - 'delete equal opps entities'
  - 'delete event entities'
  - 'delete organisation entities'
+  - 'delete terms in client_subtypes'
+  - 'delete terms in client_types'
+  - 'delete terms in oc_case_provider_role'
+  - 'delete terms in oc_fee_category'
+  - 'delete terms in tags'
  - 'delete trainer entities'
  - 'edit case entities'
+  - 'edit case fee entities'
  - 'edit case provision entities'
  - 'edit equal opps entities'
+  - 'edit terms in client_subtypes'
+  - 'edit terms in client_types'
+  - 'edit terms in oc_case_provider_role'
+  - 'edit terms in oc_fee_category'
+  - 'edit terms in tags'
  - 'use opencase'
+  - 'view all case fee revisions'
+  - 'view all case provision revisions'
  - 'view edit delete all actor entities'
  - 'view published case entities'
  - 'view published case fee entities'
--- a/config/views.view.actors.yml
+++ b/config/views.view.actors.yml
@ -0,0 +1,240 @@
+uuid: 3c5bb2b8-402b-4876-a243-b05c20976cb3
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.authenticated
+  module:
+    - opencase_entities
+    - user
+id: actors
+label: Actors
+module: views
+description: ''
+tag: ''
+base_table: oc_actor_field_data
+base_field: id
+display:
+  default:
+    id: default
+    display_title: Default
+    display_plugin: default
+    position: 0
+    display_options:
+      fields:
+        name:
+          id: name
+          table: oc_actor_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_actor
+          entity_field: name
+          plugin_id: field
+          label: Name
+          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: string
+          settings:
+            link_to_entity: true
+          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
+      pager:
+        type: mini
+        options:
+          offset: 0
+          items_per_page: 10
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: role
+        options:
+          role:
+            authenticated: authenticated
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
+      sorts: {  }
+      arguments:
+        type:
+          id: type
+          table: oc_actor_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_actor
+          entity_field: type
+          plugin_id: string
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: true
+          title: '{{ arguments.type }} '
+          default_argument_type: raw
+          default_argument_options:
+            index: 1
+            use_alias: false
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 25
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          glossary: false
+          limit: 0
+          case: none
+          path_case: none
+          transform_dash: false
+          break_phrase: false
+      filters: {  }
+      style:
+        type: table
+        options:
+          grouping: {  }
+          row_class: ''
+          default_row_class: true
+          columns:
+            name: name
+          default: '-1'
+          info:
+            name:
+              sortable: false
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+          override: true
+          sticky: false
+          summary: ''
+          empty_table: false
+          caption: ''
+          description: ''
+      row:
+        type: fields
+        options:
+          default_field_elements: true
+          inline: {  }
+          separator: ''
+          hide_empty: false
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.roles
+      tags: {  }
+  page_1:
+    id: page_1
+    display_title: Actors
+    display_plugin: page
+    position: 1
+    display_options:
+      display_description: ''
+      display_extenders: {  }
+      path: opencase/actors/%type
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.roles
+      tags: {  }
--- a/config/views.view.all_clients.yml
+++ b/config/views.view.all_clients.yml
@ -648,38 +648,39 @@ display:
            field_client_substatus: field_client_substatus
            field_tags: field_tags
            status: status
+            field_accreditation_date: field_accreditation_date
          default: '-1'
          info:
            name:
-              sortable: false
+              sortable: true
              default_sort_order: asc
              align: ''
              separator: ''
              empty_column: false
              responsive: ''
            field_client_type:
-              sortable: false
+              sortable: true
              default_sort_order: asc
              align: ''
              separator: ''
              empty_column: false
              responsive: ''
            field_client_subtype:
-              sortable: false
+              sortable: true
              default_sort_order: asc
              align: ''
              separator: ''
              empty_column: false
              responsive: ''
            field_client_status:
-              sortable: false
+              sortable: true
              default_sort_order: asc
              align: ''
              separator: ''
              empty_column: false
              responsive: ''
            field_client_substatus:
-              sortable: false
+              sortable: true
              default_sort_order: asc
              align: ''
              separator: ''
@ -691,7 +692,14 @@ display:
              empty_column: false
              responsive: ''
            status:
-              sortable: false
+              sortable: true
+              default_sort_order: asc
+              align: ''
+              separator: ''
+              empty_column: false
+              responsive: ''
+            field_accreditation_date:
+              sortable: true
              default_sort_order: asc
              align: ''
              separator: ''
@ -869,6 +877,7 @@ display:
      contexts:
        - 'languages:language_content'
        - 'languages:language_interface'
+        - url.query_args
        - user
        - user.roles
      tags:
--- a/config/views.view.all_umbrella_clients.yml
+++ b/config/views.view.all_umbrella_clients.yml
@ -370,14 +370,14 @@ display:
          default: '-1'
          info:
            name:
-              sortable: false
+              sortable: true
              default_sort_order: asc
              align: ''
              separator: ''
              empty_column: false
              responsive: ''
            field_type_of_umbrella_client:
-              sortable: false
+              sortable: true
              default_sort_order: asc
              align: ''
              separator: ''
@ -389,7 +389,7 @@ display:
              empty_column: false
              responsive: ''
            status:
-              sortable: false
+              sortable: true
              default_sort_order: asc
              align: ''
              separator: ''
--- a/config/views.view.case_fees_report.yml
+++ b/config/views.view.case_fees_report.yml
@ -6,18 +6,25 @@ dependencies:
    - field.storage.oc_case.field_contract_signed_date
    - field.storage.oc_organisation.field_client_subtype
    - field.storage.oc_organisation.field_client_type
+    - field.storage.oc_organisation.field_tags
    - field.storage.oc_organisation.field_type_of_umbrella_client
    - field.storage.oc_organisation.field_umbrella_client
    - system.menu.opencase
+    - taxonomy.vocabulary.client_subtypes
    - taxonomy.vocabulary.client_types
+    - 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'
@ -351,6 +358,69 @@ display:
          multi_type: separator
          separator: ', '
          field_api_classes: false
+        field_tags:
+          id: field_tags
+          table: oc_organisation__field_tags
+          field: field_tags
+          relationship: client
+          group_type: group
+          admin_label: ''
+          plugin_id: field
+          label: 'Client Tags'
+          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: target_id
+          type: entity_reference_label
+          settings:
+            link: true
+          group_column: target_id
+          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
        oc_case:
          id: oc_case
          table: oc_case_fee_field_data
@ -716,6 +786,106 @@ display:
          hierarchy: false
          limit: true
          error_message: true
+        field_client_subtype_target_id:
+          id: field_client_subtype_target_id
+          table: oc_organisation__field_client_subtype
+          field: field_client_subtype_target_id
+          relationship: client
+          group_type: group
+          admin_label: ''
+          plugin_id: taxonomy_index_tid
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_client_subtype_target_id_op
+            label: 'Client subtype'
+            description: ''
+            use_operator: false
+            operator: field_client_subtype_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: field_client_subtype_target_id
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              gno_admin_user: '0'
+              follow_up_alerts: '0'
+              newly_accredited_alerts: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          vid: client_subtypes
+          type: select
+          hierarchy: false
+          limit: true
+          error_message: true
+        field_tags_target_id:
+          id: field_tags_target_id
+          table: oc_organisation__field_tags
+          field: field_tags_target_id
+          relationship: client
+          group_type: group
+          admin_label: ''
+          plugin_id: taxonomy_index_tid
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_tags_target_id_op
+            label: 'Client Tags'
+            description: ''
+            use_operator: false
+            operator: field_tags_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: field_tags_target_id
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              gno_admin_user: '0'
+              follow_up_alerts: '0'
+              newly_accredited_alerts: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          vid: tags
+          type: select
+          hierarchy: false
+          limit: true
+          error_message: true
        field_type_of_umbrella_client_value:
          id: field_type_of_umbrella_client_value
          table: oc_organisation__field_type_of_umbrella_client
@ -898,6 +1068,7 @@ display:
        - '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'
  attachment_1:
@ -995,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
@ -1119,5 +1339,6 @@ display:
        - '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'
--- 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
@ -14,16 +14,22 @@ dependencies:
    - opencase_entities.oc_organisation_type.client
    - system.menu.opencase
    - taxonomy.vocabulary.client_status
+    - taxonomy.vocabulary.client_subtypes
+    - taxonomy.vocabulary.client_types
    - taxonomy.vocabulary.tags
    - user.role.administrator
    - 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
@ -1040,6 +1046,106 @@ display:
            default_group: All
            default_group_multiple: {  }
            group_items: {  }
+        field_client_subtype_target_id:
+          id: field_client_subtype_target_id
+          table: oc_organisation__field_client_subtype
+          field: field_client_subtype_target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: taxonomy_index_tid
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_client_subtype_target_id_op
+            label: 'Client subtype'
+            description: ''
+            use_operator: false
+            operator: field_client_subtype_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: field_client_subtype_target_id
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              gno_admin_user: '0'
+              follow_up_alerts: '0'
+              newly_accredited_alerts: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          vid: client_subtypes
+          type: select
+          hierarchy: false
+          limit: true
+          error_message: true
+        field_client_type_target_id:
+          id: field_client_type_target_id
+          table: oc_organisation__field_client_type
+          field: field_client_type_target_id
+          relationship: none
+          group_type: group
+          admin_label: ''
+          plugin_id: taxonomy_index_tid
+          operator: or
+          value: {  }
+          group: 1
+          exposed: true
+          expose:
+            operator_id: field_client_type_target_id_op
+            label: 'Client type (field_client_type)'
+            description: ''
+            use_operator: false
+            operator: field_client_type_target_id_op
+            operator_limit_selection: false
+            operator_list: {  }
+            identifier: field_client_type_target_id
+            required: false
+            remember: false
+            multiple: false
+            remember_roles:
+              authenticated: authenticated
+              anonymous: '0'
+              administrator: '0'
+              gno_admin_user: '0'
+              follow_up_alerts: '0'
+              newly_accredited_alerts: '0'
+            reduce: false
+          is_grouped: false
+          group_info:
+            label: ''
+            description: ''
+            identifier: ''
+            optional: true
+            widget: select
+            multiple: false
+            remember: false
+            default_group: All
+            default_group_multiple: {  }
+            group_items: {  }
+          reduce_duplicates: false
+          vid: client_types
+          type: select
+          hierarchy: false
+          limit: true
+          error_message: true
      filter_groups:
        operator: AND
        groups:
@ -1154,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.organisations.yml
+++ b/config/views.view.organisations.yml
@ -0,0 +1,227 @@
+uuid: a0a32301-1ab4-46e5-8fc0-e0060e36d3e8
+langcode: en
+status: true
+dependencies:
+  config:
+    - user.role.authenticated
+  module:
+    - opencase_entities
+    - user
+id: organisations
+label: organisations
+module: views
+description: ''
+tag: ''
+base_table: oc_organisation_field_data
+base_field: id
+display:
+  default:
+    id: default
+    display_title: Default
+    display_plugin: default
+    position: 0
+    display_options:
+      title: organisations
+      fields:
+        name:
+          id: name
+          table: oc_organisation_field_data
+          field: name
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: null
+          entity_field: name
+          plugin_id: field
+          label: Name
+          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: string
+          settings:
+            link_to_entity: true
+          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
+      pager:
+        type: mini
+        options:
+          offset: 0
+          items_per_page: 10
+          total_pages: null
+          id: 0
+          tags:
+            next: ››
+            previous: ‹‹
+          expose:
+            items_per_page: false
+            items_per_page_label: 'Items per page'
+            items_per_page_options: '5, 10, 25, 50'
+            items_per_page_options_all: false
+            items_per_page_options_all_label: '- All -'
+            offset: false
+            offset_label: Offset
+      exposed_form:
+        type: basic
+        options:
+          submit_button: Apply
+          reset_button: false
+          reset_button_label: Reset
+          exposed_sorts_label: 'Sort by'
+          expose_sort_order: true
+          sort_asc_label: Asc
+          sort_desc_label: Desc
+      access:
+        type: role
+        options:
+          role:
+            authenticated: authenticated
+      cache:
+        type: tag
+        options: {  }
+      empty: {  }
+      sorts: {  }
+      arguments:
+        type:
+          id: type
+          table: oc_organisation_field_data
+          field: type
+          relationship: none
+          group_type: group
+          admin_label: ''
+          entity_type: oc_organisation
+          entity_field: type
+          plugin_id: string
+          default_action: default
+          exception:
+            value: all
+            title_enable: false
+            title: All
+          title_enable: true
+          title: '{{ arguments.type }}'
+          default_argument_type: raw
+          default_argument_options:
+            index: 1
+            use_alias: false
+          default_argument_skip_url: false
+          summary_options:
+            base_path: ''
+            count: true
+            override: false
+            items_per_page: 25
+          summary:
+            sort_order: asc
+            number_of_records: 0
+            format: default_summary
+          specify_validation: false
+          validate:
+            type: none
+            fail: 'not found'
+          validate_options: {  }
+          glossary: false
+          limit: 0
+          case: none
+          path_case: none
+          transform_dash: false
+          break_phrase: false
+      filters:
+        status:
+          id: status
+          table: oc_organisation_field_data
+          field: status
+          entity_type: oc_organisation
+          entity_field: status
+          plugin_id: boolean
+          value: '1'
+          group: 1
+          expose:
+            operator: ''
+            operator_limit_selection: false
+            operator_list: {  }
+      style:
+        type: table
+      row:
+        type: fields
+      query:
+        type: views_query
+        options:
+          query_comment: ''
+          disable_sql_rewrite: false
+          distinct: false
+          replica: false
+          query_tags: {  }
+      relationships: {  }
+      header: {  }
+      footer: {  }
+      display_extenders: {  }
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.roles
+      tags: {  }
+  page_1:
+    id: page_1
+    display_title: Page
+    display_plugin: page
+    position: 1
+    display_options:
+      display_extenders: {  }
+      path: organisations/%type
+    cache_metadata:
+      max-age: -1
+      contexts:
+        - 'languages:language_content'
+        - 'languages:language_interface'
+        - url
+        - url.query_args
+        - user.roles
+      tags: {  }
--- a/config/views.view.projects.yml
+++ b/config/views.view.projects.yml
@ -4,7 +4,6 @@ status: true
 dependencies:
  config:
    - field.storage.oc_case.field_contract_signed_date
-    - field.storage.oc_case.field_total_fee
    - opencase_cases.oc_case_type.project
    - system.menu.opencase
    - user.role.administrator
@ -223,15 +222,17 @@ display:
          multi_type: separator
          separator: ', '
          field_api_classes: false
-        field_total_fee:
-          id: field_total_fee
-          table: oc_case__field_total_fee
-          field: field_total_fee
+        total_fee:
+          id: total_fee
+          table: oc_case_field_data
+          field: total_fee
          relationship: none
          group_type: group
          admin_label: ''
+          entity_type: oc_case
+          entity_field: total_fee
          plugin_id: field
-          label: 'Total fee'
+          label: 'Total Fee'
          exclude: false
          alter:
            alter_text: false
@ -367,7 +368,6 @@ display:
        - user.roles
      tags:
        - 'config:field.storage.oc_case.field_contract_signed_date'
-        - 'config:field.storage.oc_case.field_total_fee'
  block_1:
    id: block_1
    display_title: Block
@ -636,7 +636,6 @@ display:
        - user.roles
      tags:
        - 'config:field.storage.oc_case.field_contract_signed_date'
-        - 'config:field.storage.oc_case.field_total_fee'
  entity_reference_1:
    id: entity_reference_1
    display_title: 'Entity Reference'
@ -812,4 +811,3 @@ display:
        - user.roles
      tags:
        - 'config:field.storage.oc_case.field_contract_signed_date'
-        - 'config:field.storage.oc_case.field_total_fee'
--- a/update_project.sh
+++ b/update_project.sh
@ -0,0 +1 @@
+git pull && composer install && drush config:import --source=../config
				`@ -0,0 +1 @@`
				`git pull && composer install && drush config:import --source=../config`