diff --git a/composer.json b/composer.json index 0208523..9cd225f 100644 --- a/composer.json +++ b/composer.json @@ -53,7 +53,6 @@ "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": "*" }, @@ -82,6 +81,10 @@ "drupal-scaffold": { "locations": { "web-root": "web/" + }, + "file-mapping": { + "[web-root]/sites/development.services.yml": false, + "[web-root]/sites/default/services.yml": false } }, "installer-paths": { diff --git a/composer.lock b/composer.lock index 5443a16..1e7ba4e 100644 --- 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": "a9c60b20bdf256c4f5c40c3ad0e4da0e", + "content-hash": "eecc9ba6608a29440d6c8c177327ac65", "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": "c0adb1aa5784d5105b44737f0b34b7bb68e73f66" + "reference": "1a640d4542d8901c3007a8baa5b407b29ce4c764" }, "require": { "drupal/admin_toolbar": "*", @@ -85,7 +85,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-05-10T07:49:11+00:00" + "time": "2022-05-18T18:01:57+00:00" }, { "name": "autonomic/opencase", @@ -93,7 +93,7 @@ "source": { "type": "git", "url": "ssh://git@git.autonomic.zone:2222/autonomic-cooperative/opencase.git", - "reference": "18f8e6cab87020fcf30ebc41124c3cbf4704cda4" + "reference": "9351768b25b2c859ea849e6d4667dc792292cade" }, "require": { "composer/installers": "*", @@ -110,7 +110,7 @@ "email": "helo@autonomic.zone" } ], - "time": "2022-05-10T07:06:31+00:00" + "time": "2022-05-18T12:54:06+00:00" }, { "name": "behat/mink", @@ -2907,16 +2907,16 @@ }, { "name": "drupal/core", - "version": "9.3.12", + "version": "9.3.13", "source": { "type": "git", "url": "https://github.com/drupal/core.git", - "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c" + "reference": "02ba7a3a42612a04124ac5131df0726e1e5097c6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core/zipball/ed6af33093f66a9c5048d02f9f2c326ad0e7e90c", - "reference": "ed6af33093f66a9c5048d02f9f2c326ad0e7e90c", + "url": "https://api.github.com/repos/drupal/core/zipball/02ba7a3a42612a04124ac5131df0726e1e5097c6", + "reference": "02ba7a3a42612a04124ac5131df0726e1e5097c6", "shasum": "" }, "require": { @@ -3158,13 +3158,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.12" + "source": "https://github.com/drupal/core/tree/9.3.13" }, - "time": "2022-04-20T14:25:27+00:00" + "time": "2022-05-11T09:20:58+00:00" }, { "name": "drupal/core-composer-scaffold", - "version": "9.3.12", + "version": "9.3.13", "source": { "type": "git", "url": "https://github.com/drupal/core-composer-scaffold.git", @@ -3208,7 +3208,7 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.12" + "source": "https://github.com/drupal/core-composer-scaffold/tree/9.3.13" }, "time": "2022-02-24T17:40:56+00:00" }, @@ -3264,7 +3264,7 @@ }, { "name": "drupal/core-project-message", - "version": "9.3.12", + "version": "9.3.13", "source": { "type": "git", "url": "https://github.com/drupal/core-project-message.git", @@ -3299,22 +3299,22 @@ "drupal" ], "support": { - "source": "https://github.com/drupal/core-project-message/tree/9.3.12" + "source": "https://github.com/drupal/core-project-message/tree/9.3.13" }, "time": "2022-02-24T17:40:56+00:00" }, { "name": "drupal/core-recommended", - "version": "9.3.12", + "version": "9.3.13", "source": { "type": "git", "url": "https://github.com/drupal/core-recommended.git", - "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f" + "reference": "0fe76c7af47fafcff37d8cb6053014e52e0f4a69" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/drupal/core-recommended/zipball/a8fa50016c1aa1eb7f4e54f590e6343d286c418f", - "reference": "a8fa50016c1aa1eb7f4e54f590e6343d286c418f", + "url": "https://api.github.com/repos/drupal/core-recommended/zipball/0fe76c7af47fafcff37d8cb6053014e52e0f4a69", + "reference": "0fe76c7af47fafcff37d8cb6053014e52e0f4a69", "shasum": "" }, "require": { @@ -3323,7 +3323,7 @@ "doctrine/annotations": "1.13.2", "doctrine/lexer": "1.2.1", "doctrine/reflection": "1.2.2", - "drupal/core": "9.3.12", + "drupal/core": "9.3.13", "egulias/email-validator": "3.1.2", "guzzlehttp/guzzle": "6.5.5", "guzzlehttp/promises": "1.5.1", @@ -3385,59 +3385,9 @@ ], "description": "Locked core dependencies; require this project INSTEAD OF drupal/core.", "support": { - "source": "https://github.com/drupal/core-recommended/tree/9.3.12" + "source": "https://github.com/drupal/core-recommended/tree/9.3.13" }, - "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" - } + "time": "2022-05-11T09:20:58+00:00" }, { "name": "drupal/ctools", @@ -3895,7 +3845,7 @@ "extra": { "drupal": { "version": "2.0.2", - "datestamp": "1649070269", + "datestamp": "1649151557", "security-coverage": { "status": "covered", "message": "Covered by Drupal's security advisory policy" @@ -5292,75 +5242,6 @@ "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", @@ -6651,90 +6532,6 @@ ], "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", diff --git a/config/core.entity_view_display.oc_actor.trainer.default.yml b/config/core.entity_view_display.oc_actor.trainer.default.yml index 7a9439d..454fcd7 100644 --- a/config/core.entity_view_display.oc_actor.trainer.default.yml +++ b/config/core.entity_view_display.oc_actor.trainer.default.yml @@ -138,6 +138,15 @@ content: third_party_settings: { } weight: 9 region: content + total_cases: + type: number_integer + label: above + settings: + thousand_separator: '' + prefix_suffix: true + third_party_settings: { } + weight: 14 + region: content hidden: feeds_item: true full_name: true @@ -146,5 +155,4 @@ hidden: recent_cases: true search_api_excerpt: true status: true - total_cases: true user_id: true diff --git a/config/system.logging.yml b/config/system.logging.yml index e95b28a..0137fe9 100644 --- a/config/system.logging.yml +++ b/config/system.logging.yml @@ -1,3 +1,3 @@ -error_level: hide _core: default_config_hash: u3-njszl92FaxjrCMiq0yDcjAfcdx72w1zT1O9dx6aA +error_level: all diff --git a/config/system.performance.yml b/config/system.performance.yml index 65d6e1a..b380f12 100644 --- a/config/system.performance.yml +++ b/config/system.performance.yml @@ -1,9 +1,12 @@ +_core: + default_config_hash: b2cssrj-lOmATIbdehfCqfCFgVR0qCdxxWhwqa2KBVQ cache: page: max_age: 0 + use_internal: false css: preprocess: false - gzip: true + gzip: false fast_404: enabled: true paths: '/\.(?:txt|png|gif|jpe?g|css|js|ico|swf|flv|cgi|bat|pl|dll|exe|asp)$/i' @@ -11,7 +14,7 @@ fast_404: html: '404 Not Found

Not Found

The requested URL "@path" was not found on this server.

' js: preprocess: false - gzip: true + gzip: false stale_file_threshold: 2592000 -_core: - default_config_hash: b2cssrj-lOmATIbdehfCqfCFgVR0qCdxxWhwqa2KBVQ +response: + gzip: false diff --git a/config/views.settings.yml b/config/views.settings.yml index fbda2e6..d78ef33 100644 --- a/config/views.settings.yml +++ b/config/views.settings.yml @@ -1,3 +1,5 @@ +_core: + default_config_hash: RaRd9EIcwA4u3qCSRLL8EnCicbda1kV__ASmVbyehvQ display_extenders: { } skip_cache: false sql_signature: false @@ -5,13 +7,13 @@ ui: show: additional_queries: false advanced_column: false - master_display: false - performance_statistics: false + performance_statistics: true preview_information: true sql_query: - enabled: false + enabled: true where: above display_embed: false + master_display: false always_live_preview: true exposed_filter_any_label: old_any field_rewrite_elements: @@ -44,5 +46,3 @@ field_rewrite_elements: ins: INS q: Q s: S -_core: - default_config_hash: RaRd9EIcwA4u3qCSRLL8EnCicbda1kV__ASmVbyehvQ diff --git a/config/views.view.all_trainers.yml b/config/views.view.all_trainers.yml index e2bcaf3..327a961 100644 --- a/config/views.view.all_trainers.yml +++ b/config/views.view.all_trainers.yml @@ -160,6 +160,72 @@ display: multi_type: separator separator: ', ' field_api_classes: false + total_cases: + id: total_cases + table: oc_actor_field_data + field: total_cases + relationship: none + group_type: group + admin_label: '' + entity_type: oc_actor + entity_field: total_cases + plugin_id: field + label: 'Number of Cases' + 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: number_integer + settings: + thousand_separator: '' + prefix_suffix: 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: