From eb9bd789c861a99688949e3e3e72016d07770f50 Mon Sep 17 00:00:00 2001 From: naomi Date: Wed, 11 May 2022 13:47:37 +0100 Subject: [PATCH 01/24] Pluralising entity names in "See all" menu --- src/Plugin/Derivative/SeeAllActorsMenuLink.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugin/Derivative/SeeAllActorsMenuLink.php b/src/Plugin/Derivative/SeeAllActorsMenuLink.php index 64b838a..7ec179c 100644 --- a/src/Plugin/Derivative/SeeAllActorsMenuLink.php +++ b/src/Plugin/Derivative/SeeAllActorsMenuLink.php @@ -45,7 +45,7 @@ class SeeAllActorsMenuLink extends DeriverBase implements ContainerDeriverInterf $actorTypes = $this->entityTypeManager->getStorage('oc_actor_type')->loadMultiple(); foreach ($actorTypes as $id => $actorType) { $links[$id] = [ - 'title' => $actorType->label(), + 'title' => \Drupal\opencase\Pluraliser::pluralise($actorType->label()), 'route_name' => "view.actors.page_1", 'route_parameters' => ['type' => $actorType->id()] ] + $base_plugin_definition; From cfe0b820f570e00a8acd2725b6039ac85a722a37 Mon Sep 17 00:00:00 2001 From: naomi Date: Wed, 11 May 2022 13:49:15 +0100 Subject: [PATCH 02/24] Forgot to add pluraliser class (new file) --- src/Pluraliser.php | 9 +++++++++ 1 file changed, 9 insertions(+) create mode 100644 src/Pluraliser.php diff --git a/src/Pluraliser.php b/src/Pluraliser.php new file mode 100644 index 0000000..35ba94f --- /dev/null +++ b/src/Pluraliser.php @@ -0,0 +1,9 @@ + Date: Thu, 12 May 2022 09:03:11 +0100 Subject: [PATCH 03/24] event menu items - removed "Event" and pluralised --- opencase.module | 1 + src/Plugin/Derivative/AddEventsMenuLink.php | 2 +- src/Plugin/Derivative/SeeAllEventsMenuLink.php | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/opencase.module b/opencase.module index 6160a6a..5fa0d87 100644 --- a/opencase.module +++ b/opencase.module @@ -14,6 +14,7 @@ function opencase_element_info_alter(array &$types) { $types['datetime']['#process'][] = 'opencase_process_element'; } + /** * Element process callback for datetime fields. Removes the seconds part. */ diff --git a/src/Plugin/Derivative/AddEventsMenuLink.php b/src/Plugin/Derivative/AddEventsMenuLink.php index 0c74353..0a205f1 100644 --- a/src/Plugin/Derivative/AddEventsMenuLink.php +++ b/src/Plugin/Derivative/AddEventsMenuLink.php @@ -45,7 +45,7 @@ class AddEventsMenuLink extends DeriverBase implements ContainerDeriverInterface $eventTypes = $this->entityTypeManager->getStorage('oc_event_type')->loadMultiple(); foreach ($eventTypes as $id => $eventType) { $links[$id] = [ - 'title' => $eventType->label() . " Event", + 'title' => $eventType->label(), 'route_name' => "entity.oc_event.add_form", 'route_parameters' => ['oc_event_type' => $eventType->id()] ] + $base_plugin_definition; diff --git a/src/Plugin/Derivative/SeeAllEventsMenuLink.php b/src/Plugin/Derivative/SeeAllEventsMenuLink.php index e6b3b2c..73795b3 100644 --- a/src/Plugin/Derivative/SeeAllEventsMenuLink.php +++ b/src/Plugin/Derivative/SeeAllEventsMenuLink.php @@ -50,7 +50,7 @@ class SeeAllEventsMenuLink extends DeriverBase implements ContainerDeriverInterf $eventTypes = $this->entityTypeManager->getStorage('oc_event_type')->loadMultiple(); foreach ($eventTypes as $id => $eventType) { $links[$id] = [ - 'title' => $eventType->label(), + 'title' => \Drupal\opencase\Pluraliser::pluralise($eventType->label()), 'route_name' => "view.events.page_1", 'route_parameters' => ['type' => $eventType->id()] ] + $base_plugin_definition; From 4a222153aff05409f1507b9117ba3a023e439aab Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 12 May 2022 10:37:07 +0100 Subject: [PATCH 04/24] Download button for reports --- .../block.block.bartik_breadcrumbs.yml | 22 - ...block.block.views_block__cases_block_1.yml | 29 - ...y.oc_case_provision.caseworker.default.yml | 13 + ..._form_display.oc_event.piss_up.default.yml | 34 - ...y_view_display.oc_actor.client.default.yml | 47 +- ...iew_display.oc_actor.volunteer.default.yml | 33 +- ...y.oc_case_provision.caseworker.default.yml | 9 + ..._view_display.oc_event.piss_up.default.yml | 25 - .../core.menu.static_menu_link_overrides.yml | 24 + config/optional/editor.editor.basic_html.yml | 8 +- ...extra_field.oc_actor.client.activities.yml | 43 ++ ...ield.oc_case.accommodation.caseworkers.yml | 53 ++ ...c_case_provision.caseworker.field_test.yml | 31 + ...ield.field.oc_event.piss_up.field_test.yml | 21 - ....storage.oc_case_provision.field_test.yml} | 9 +- ...pencase_entities.oc_event_type.piss_up.yml | 6 - ..._event_type.volunteer_training_session.yml | 6 + config/optional/system.site.yml | 2 +- config/optional/user.role.caseworker.yml | 4 +- config/optional/user.role.opencase_admin.yml | 7 +- config/optional/user.role.overseer.yml | 4 +- .../optional/user.role.volunteer_co_ord.yml | 4 +- config/optional/views.view.actors.yml | 4 +- config/optional/views.view.case_providers.yml | 10 +- .../optional/views.view.case_provisions.yml | 701 ++++++++++++++++++ .../views.view.sample_downloadable_report.yml | 24 +- config/optional/views.view.search_content.yml | 24 +- css/opencase.css | 9 +- resources/download.png | Bin 0 -> 9004 bytes 29 files changed, 1010 insertions(+), 196 deletions(-) delete mode 100644 config/optional/block.block.bartik_breadcrumbs.yml delete mode 100644 config/optional/block.block.views_block__cases_block_1.yml delete mode 100644 config/optional/core.entity_form_display.oc_event.piss_up.default.yml delete mode 100644 config/optional/core.entity_view_display.oc_event.piss_up.default.yml create mode 100644 config/optional/entity_extra_field.extra_field.oc_actor.client.activities.yml create mode 100644 config/optional/entity_extra_field.extra_field.oc_case.accommodation.caseworkers.yml create mode 100644 config/optional/field.field.oc_case_provision.caseworker.field_test.yml delete mode 100644 config/optional/field.field.oc_event.piss_up.field_test.yml rename config/optional/{field.storage.oc_event.field_test.yml => field.storage.oc_case_provision.field_test.yml} (65%) delete mode 100644 config/optional/opencase_entities.oc_event_type.piss_up.yml create mode 100644 config/optional/opencase_entities.oc_event_type.volunteer_training_session.yml create mode 100644 config/optional/views.view.case_provisions.yml create mode 100644 resources/download.png diff --git a/config/optional/block.block.bartik_breadcrumbs.yml b/config/optional/block.block.bartik_breadcrumbs.yml deleted file mode 100644 index 5bf2653..0000000 --- a/config/optional/block.block.bartik_breadcrumbs.yml +++ /dev/null @@ -1,22 +0,0 @@ -uuid: 0420cf43-7f91-4c16-80aa-f76d56641c9f -langcode: en -status: true -dependencies: - module: - - system - theme: - - bartik -_core: - default_config_hash: y0bXRvKYQQKkf_RVxA3aOPGpIfKKsDOzzrWYCgjxJ9Y -id: bartik_breadcrumbs -theme: bartik -region: breadcrumb -weight: 0 -provider: null -plugin: system_breadcrumb_block -settings: - id: system_breadcrumb_block - label: Breadcrumbs - label_display: '0' - provider: system -visibility: { } diff --git a/config/optional/block.block.views_block__cases_block_1.yml b/config/optional/block.block.views_block__cases_block_1.yml deleted file mode 100644 index 0955022..0000000 --- a/config/optional/block.block.views_block__cases_block_1.yml +++ /dev/null @@ -1,29 +0,0 @@ -uuid: 22782d1b-4b5d-422e-9609-96e63ffd39da -langcode: en -status: true -dependencies: - config: - - views.view.cases - module: - - route_condition - - views - theme: - - bartik -id: views_block__cases_block_1 -theme: bartik -region: content -weight: 0 -provider: null -plugin: 'views_block:cases-block_1' -settings: - id: 'views_block:cases-block_1' - label: '' - label_display: visible - provider: views - views_label: '' - items_per_page: none -visibility: - route: - id: route - negate: false - routes: entity.oc_actor.canonical diff --git a/config/optional/core.entity_form_display.oc_case_provision.caseworker.default.yml b/config/optional/core.entity_form_display.oc_case_provision.caseworker.default.yml index e29de23..8e7d292 100644 --- a/config/optional/core.entity_form_display.oc_case_provision.caseworker.default.yml +++ b/config/optional/core.entity_form_display.oc_case_provision.caseworker.default.yml @@ -3,12 +3,25 @@ langcode: en status: true dependencies: config: + - field.field.oc_case_provision.caseworker.field_test - opencase_cases.oc_case_provision_type.caseworker + module: + - hide_revision_field id: oc_case_provision.caseworker.default targetEntityType: oc_case_provision bundle: caseworker mode: default content: + field_test: + type: entity_reference_autocomplete + weight: 81 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } oc_case: type: entity_reference_autocomplete weight: 0 diff --git a/config/optional/core.entity_form_display.oc_event.piss_up.default.yml b/config/optional/core.entity_form_display.oc_event.piss_up.default.yml deleted file mode 100644 index d5a5569..0000000 --- a/config/optional/core.entity_form_display.oc_event.piss_up.default.yml +++ /dev/null @@ -1,34 +0,0 @@ -uuid: af8b76e1-d9c9-4e4b-8a00-0831b7822170 -langcode: en -status: true -dependencies: - config: - - field.field.oc_event.piss_up.field_test - - opencase_entities.oc_event_type.piss_up - module: - - datetime -id: oc_event.piss_up.default -targetEntityType: oc_event -bundle: piss_up -mode: default -content: - field_test: - type: entity_reference_autocomplete - weight: 51 - region: content - settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 - placeholder: '' - third_party_settings: { } - name: - type: string_textfield - weight: -4 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } -hidden: - status: true diff --git a/config/optional/core.entity_view_display.oc_actor.client.default.yml b/config/optional/core.entity_view_display.oc_actor.client.default.yml index 9842c31..3ff950c 100644 --- a/config/optional/core.entity_view_display.oc_actor.client.default.yml +++ b/config/optional/core.entity_view_display.oc_actor.client.default.yml @@ -17,31 +17,36 @@ dependencies: - field.field.oc_actor.client.field_marital_ - field.field.oc_actor.client.field_nationalities - field.field.oc_actor.client.field_referred_by + - field.field.oc_actor.client.field_sex - opencase_entities.oc_actor_type.client module: - datetime - file - options - - user id: oc_actor.client.default targetEntityType: oc_actor bundle: client mode: default content: + cases: + settings: { } + third_party_settings: { } + weight: 19 + region: content email: type: string label: above settings: link_to_entity: false third_party_settings: { } - weight: -5 + weight: 0 region: content field_asylum_status: type: list_default label: above settings: { } third_party_settings: { } - weight: 3 + weight: 8 region: content field_client_field_1: type: string @@ -57,7 +62,7 @@ content: settings: use_description_as_link_text: true third_party_settings: { } - weight: 12 + weight: 17 region: content field_date_of_birth: type: datetime_default @@ -66,7 +71,7 @@ content: timezone_override: '' format_type: short third_party_settings: { } - weight: 0 + weight: 5 region: content field_dependants: type: string @@ -74,7 +79,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 9 + weight: 14 region: content field_disability: type: string @@ -82,7 +87,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 7 + weight: 12 region: content field_ethnic_o: type: string @@ -90,56 +95,56 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 4 + weight: 9 region: content field_gender_identified_with: type: list_default label: above settings: { } third_party_settings: { } - weight: 1 + weight: 6 region: content field_general_noes: type: basic_string label: above settings: { } third_party_settings: { } - weight: 13 + weight: 18 region: content field_how_heard: type: list_default label: above settings: { } third_party_settings: { } - weight: 10 + weight: 15 region: content field_income: type: list_default label: above settings: { } third_party_settings: { } - weight: 8 + weight: 13 region: content field_languages_spoken: type: list_default label: above settings: { } third_party_settings: { } - weight: 6 + weight: 11 region: content field_marital_: type: list_default label: above settings: { } third_party_settings: { } - weight: 2 + weight: 7 region: content field_nationalities: type: list_default label: above settings: { } third_party_settings: { } - weight: 5 + weight: 10 region: content field_referred_by: type: string @@ -147,7 +152,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 11 + weight: 16 region: content name: type: string @@ -163,7 +168,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: -4 + weight: 1 region: content phone2: type: string @@ -171,7 +176,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: -3 + weight: 2 region: content post_code: type: string @@ -179,14 +184,14 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: -1 + weight: 4 region: content postal_address: type: basic_string label: above settings: { } third_party_settings: { } - weight: -2 + weight: 3 region: content hidden: field_sex: true @@ -194,3 +199,5 @@ hidden: last_name: true middle_names: true search_api_excerpt: true + status: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml b/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml index e9b4268..da4c0d7 100644 --- a/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml +++ b/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml @@ -23,7 +23,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: -5 + weight: 0 region: content field_ethnic_o: type: string @@ -31,35 +31,35 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: 6 + weight: 10 region: content field_general_noes: type: basic_string label: above settings: { } third_party_settings: { } - weight: 5 + weight: 9 region: content field_languages_spoken: type: list_default label: above settings: { } third_party_settings: { } - weight: 2 + weight: 6 region: content field_nationalities: type: list_default label: above settings: { } third_party_settings: { } - weight: 1 + weight: 5 region: content field_osic_level: type: list_default label: above settings: { } third_party_settings: { } - weight: 3 + weight: 7 region: content field_sdfdsfds: type: text_default @@ -73,7 +73,7 @@ content: label: above settings: { } third_party_settings: { } - weight: 4 + weight: 8 region: content name: type: string @@ -89,7 +89,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: -4 + weight: 1 region: content phone2: type: string @@ -97,7 +97,7 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: -3 + weight: 2 region: content post_code: type: string @@ -105,17 +105,28 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: -1 + weight: 4 region: content postal_address: type: basic_string label: above settings: { } third_party_settings: { } - weight: -2 + weight: 3 + region: content + total_cases: + type: number_integer + label: above + settings: + thousand_separator: '' + prefix_suffix: true + third_party_settings: { } + weight: 11 region: content hidden: first_name: true last_name: true middle_names: true search_api_excerpt: true + status: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_case_provision.caseworker.default.yml b/config/optional/core.entity_view_display.oc_case_provision.caseworker.default.yml index fbd6654..6d3aa24 100644 --- a/config/optional/core.entity_view_display.oc_case_provision.caseworker.default.yml +++ b/config/optional/core.entity_view_display.oc_case_provision.caseworker.default.yml @@ -3,6 +3,7 @@ langcode: en status: true dependencies: config: + - field.field.oc_case_provision.caseworker.field_test - opencase_cases.oc_case_provision_type.caseworker module: - user @@ -11,6 +12,14 @@ targetEntityType: oc_case_provision bundle: caseworker mode: default content: + field_test: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 4 + region: content oc_case_provider_role: type: entity_reference_label label: above diff --git a/config/optional/core.entity_view_display.oc_event.piss_up.default.yml b/config/optional/core.entity_view_display.oc_event.piss_up.default.yml deleted file mode 100644 index dd46455..0000000 --- a/config/optional/core.entity_view_display.oc_event.piss_up.default.yml +++ /dev/null @@ -1,25 +0,0 @@ -uuid: d4b5d087-cb11-45a3-aeb7-9a7657f25e07 -langcode: en -status: true -dependencies: - config: - - field.field.oc_event.piss_up.field_test - - opencase_entities.oc_event_type.piss_up - module: - - datetime -id: oc_event.piss_up.default -targetEntityType: oc_event -bundle: piss_up -mode: default -content: - field_test: - type: entity_reference_label - label: above - settings: - link: true - third_party_settings: { } - weight: 51 - region: content -hidden: - name: true - search_api_excerpt: true diff --git a/config/optional/core.menu.static_menu_link_overrides.yml b/config/optional/core.menu.static_menu_link_overrides.yml index eb6e35e..02670cc 100644 --- a/config/optional/core.menu.static_menu_link_overrides.yml +++ b/config/optional/core.menu.static_menu_link_overrides.yml @@ -7,3 +7,27 @@ definitions: weight: 0 expanded: false enabled: true + opencase__reporting: + weight: -48 + menu_name: opencase + parent: '' + enabled: true + expanded: false + opencase__see_all: + weight: -50 + menu_name: opencase + parent: '' + expanded: false + enabled: true + opencase__opencase_add_new_things_menu: + weight: -49 + menu_name: opencase + parent: '' + expanded: false + enabled: true + opencase__opencase_admin_menu: + weight: -47 + menu_name: opencase + parent: '' + expanded: false + enabled: true diff --git a/config/optional/editor.editor.basic_html.yml b/config/optional/editor.editor.basic_html.yml index 3caab26..d1ae14e 100644 --- a/config/optional/editor.editor.basic_html.yml +++ b/config/optional/editor.editor.basic_html.yml @@ -43,13 +43,15 @@ settings: items: - Source plugins: + language: + language_list: un stylescombo: styles: '' image_upload: - status: true + status: false scheme: public directory: inline-images max_size: '' max_dimensions: - width: 0 - height: 0 + width: null + height: null diff --git a/config/optional/entity_extra_field.extra_field.oc_actor.client.activities.yml b/config/optional/entity_extra_field.extra_field.oc_actor.client.activities.yml new file mode 100644 index 0000000..20858b7 --- /dev/null +++ b/config/optional/entity_extra_field.extra_field.oc_actor.client.activities.yml @@ -0,0 +1,43 @@ +uuid: 4c460157-a452-4eec-9616-6c00b30c110c +langcode: en +status: true +dependencies: + config: + - user.role.authenticated + module: + - opencase_entities + - user +id: oc_actor.client.activities +label: Activities +display_label: true +name: activities +description: '' +base_entity_type_id: oc_actor +base_bundle_type_id: client +field_type_id: views +field_type_config: + view_name: activities + display: block_1 + arguments: '' +field_type_condition: + 'entity_bundle:oc_actor': + id: 'entity_bundle:oc_actor' + negate: false + context_mapping: + oc_actor: entity_extra_field.target_entity + bundles: { } + route: + id: route + negate: false + routes: '' + request_path: + id: request_path + negate: false + pages: '' + current_theme: + id: current_theme + theme: '' + negate: 0 +field_conditions_all_pass: false +display: + type: view diff --git a/config/optional/entity_extra_field.extra_field.oc_case.accommodation.caseworkers.yml b/config/optional/entity_extra_field.extra_field.oc_case.accommodation.caseworkers.yml new file mode 100644 index 0000000..bf740b9 --- /dev/null +++ b/config/optional/entity_extra_field.extra_field.oc_case.accommodation.caseworkers.yml @@ -0,0 +1,53 @@ +uuid: 77781cfa-1449-4d3b-8e87-28b1eb760e14 +langcode: en +status: true +dependencies: + config: + - opencase_cases.oc_case_provision_type.caseworker + - user.role.authenticated + module: + - opencase_cases + - user +id: oc_case.accommodation.caseworkers +label: Caseworkers +display_label: true +name: caseworkers +description: '' +base_entity_type_id: oc_case +base_bundle_type_id: accommodation +field_type_id: views +field_type_config: + view_name: case_provisions + display: block_2 + arguments: '' +field_type_condition: + 'entity_bundle:oc_case': + id: 'entity_bundle:oc_case' + negate: false + context_mapping: + oc_case: entity_extra_field.target_entity + bundles: + accommodation: accommodation + asylum_support: asylum_support + employability: employability + enquiry: enquiry + health: health + immigration: immigration + pro_bono_immigration_service: pro_bono_immigration_service + volunteer_engagement: volunteer_engagement + welfare_rights: welfare_rights + route: + id: route + negate: false + routes: '' + request_path: + id: request_path + negate: false + pages: '' + current_theme: + id: current_theme + theme: '' + negate: 0 +field_conditions_all_pass: false +display: + type: view diff --git a/config/optional/field.field.oc_case_provision.caseworker.field_test.yml b/config/optional/field.field.oc_case_provision.caseworker.field_test.yml new file mode 100644 index 0000000..b016d3a --- /dev/null +++ b/config/optional/field.field.oc_case_provision.caseworker.field_test.yml @@ -0,0 +1,31 @@ +uuid: 561fe652-6e6b-401a-a5d7-eef6402f6d07 +langcode: en +status: true +dependencies: + config: + - field.storage.oc_case_provision.field_test + - opencase_cases.oc_case_provision_type.caseworker + - opencase_entities.oc_actor_type.staff_member + - opencase_entities.oc_actor_type.volunteer +id: oc_case_provision.caseworker.field_test +field_name: field_test +entity_type: oc_case_provision +bundle: caseworker +label: test +description: '' +required: false +translatable: false +default_value: { } +default_value_callback: '' +settings: + handler: 'default:oc_actor' + handler_settings: + target_bundles: + staff_member: staff_member + volunteer: volunteer + sort: + field: _none + direction: ASC + auto_create: false + auto_create_bundle: staff_member +field_type: entity_reference diff --git a/config/optional/field.field.oc_event.piss_up.field_test.yml b/config/optional/field.field.oc_event.piss_up.field_test.yml deleted file mode 100644 index be70892..0000000 --- a/config/optional/field.field.oc_event.piss_up.field_test.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: aef69a74-1ce8-4730-ae74-00508301ce5c -langcode: en -status: true -dependencies: - config: - - field.storage.oc_event.field_test - - opencase_entities.oc_event_type.piss_up -id: oc_event.piss_up.field_test -field_name: field_test -entity_type: oc_event -bundle: piss_up -label: test -description: '' -required: false -translatable: false -default_value: { } -default_value_callback: '' -settings: - handler: 'default:oc_actor' - handler_settings: { } -field_type: entity_reference diff --git a/config/optional/field.storage.oc_event.field_test.yml b/config/optional/field.storage.oc_case_provision.field_test.yml similarity index 65% rename from config/optional/field.storage.oc_event.field_test.yml rename to config/optional/field.storage.oc_case_provision.field_test.yml index 533e546..9071af1 100644 --- a/config/optional/field.storage.oc_event.field_test.yml +++ b/config/optional/field.storage.oc_case_provision.field_test.yml @@ -1,18 +1,19 @@ -uuid: 9f37ed7d-87ee-4d6c-a4a2-f69077b51db0 +uuid: f90d1b9f-ee8a-4f79-ae7d-fafd4ec10cea langcode: en status: true dependencies: module: + - opencase_cases - opencase_entities -id: oc_event.field_test +id: oc_case_provision.field_test field_name: field_test -entity_type: oc_event +entity_type: oc_case_provision type: entity_reference settings: target_type: oc_actor module: core locked: false -cardinality: -1 +cardinality: 1 translatable: true indexes: { } persist_with_no_fields: false diff --git a/config/optional/opencase_entities.oc_event_type.piss_up.yml b/config/optional/opencase_entities.oc_event_type.piss_up.yml deleted file mode 100644 index 3e986cb..0000000 --- a/config/optional/opencase_entities.oc_event_type.piss_up.yml +++ /dev/null @@ -1,6 +0,0 @@ -uuid: 114bb324-9157-430e-9d69-a7ae31a0cbad -langcode: en -status: true -dependencies: { } -id: piss_up -label: Piss-up diff --git a/config/optional/opencase_entities.oc_event_type.volunteer_training_session.yml b/config/optional/opencase_entities.oc_event_type.volunteer_training_session.yml new file mode 100644 index 0000000..13d37dd --- /dev/null +++ b/config/optional/opencase_entities.oc_event_type.volunteer_training_session.yml @@ -0,0 +1,6 @@ +uuid: 23b76c7c-1cee-4bcf-ba4b-97696774c574 +langcode: en +status: true +dependencies: { } +id: volunteer_training_session +label: 'Volunteer training session' diff --git a/config/optional/system.site.yml b/config/optional/system.site.yml index 6f1adac..10c0d47 100644 --- a/config/optional/system.site.yml +++ b/config/optional/system.site.yml @@ -8,7 +8,7 @@ slogan: '' page: 403: /user/login 404: '' - front: /node + front: /opencase/actors/client admin_compact_mode: false weight_select_max: 100 default_langcode: en diff --git a/config/optional/user.role.caseworker.yml b/config/optional/user.role.caseworker.yml index e940bac..f0d7d71 100644 --- a/config/optional/user.role.caseworker.yml +++ b/config/optional/user.role.caseworker.yml @@ -1,7 +1,9 @@ uuid: 82123195-ae6e-4d7a-9755-df73244e110d langcode: en status: true -dependencies: { } +dependencies: + module: + - opencase_entities id: caseworker label: Caseworker weight: 5 diff --git a/config/optional/user.role.opencase_admin.yml b/config/optional/user.role.opencase_admin.yml index 58b28dd..0dbeb7a 100644 --- a/config/optional/user.role.opencase_admin.yml +++ b/config/optional/user.role.opencase_admin.yml @@ -1,7 +1,12 @@ uuid: 89e8d1a4-b540-4ce5-b503-bf6f32178d49 langcode: en status: true -dependencies: { } +dependencies: + module: + - field_ui + - opencase + - opencase_cases + - opencase_entities _core: default_config_hash: NYNlwo5WdxRZXhqrfBgLvCR19LE64SrLojs7_zOGJ5Q id: opencase_admin diff --git a/config/optional/user.role.overseer.yml b/config/optional/user.role.overseer.yml index 4562f53..24dcad9 100644 --- a/config/optional/user.role.overseer.yml +++ b/config/optional/user.role.overseer.yml @@ -1,7 +1,9 @@ uuid: 7f74c263-619c-41d8-a528-6eacff355fe7 langcode: en status: true -dependencies: { } +dependencies: + module: + - opencase_entities id: overseer label: Overseer weight: 4 diff --git a/config/optional/user.role.volunteer_co_ord.yml b/config/optional/user.role.volunteer_co_ord.yml index 696591b..db713ca 100644 --- a/config/optional/user.role.volunteer_co_ord.yml +++ b/config/optional/user.role.volunteer_co_ord.yml @@ -1,7 +1,9 @@ uuid: 88bb4aeb-bccc-41ed-8799-bdb10d5e4f4e langcode: en status: true -dependencies: { } +dependencies: + module: + - opencase_entities id: volunteer_co_ord label: 'Volunteer Co-ordinator' weight: 6 diff --git a/config/optional/views.view.actors.yml b/config/optional/views.view.actors.yml index e72235d..292f510 100644 --- a/config/optional/views.view.actors.yml +++ b/config/optional/views.view.actors.yml @@ -142,7 +142,7 @@ display: title_enable: false title: All title_enable: true - title: '{{ arguments.type }} ' + title: '{{ arguments.type }}s' default_argument_type: raw default_argument_options: index: 1 @@ -164,7 +164,7 @@ display: validate_options: { } glossary: false limit: 0 - case: none + case: ucfirst path_case: none transform_dash: false break_phrase: false diff --git a/config/optional/views.view.case_providers.yml b/config/optional/views.view.case_providers.yml index 64ffad9..9d6e48c 100644 --- a/config/optional/views.view.case_providers.yml +++ b/config/optional/views.view.case_providers.yml @@ -5,8 +5,10 @@ dependencies: config: - opencase_entities.oc_actor_type.staff_member - opencase_entities.oc_actor_type.volunteer + - user.role.authenticated module: - opencase_entities + - user id: case_providers label: 'Case providers' module: views @@ -115,8 +117,10 @@ display: sort_asc_label: Asc sort_desc_label: Desc access: - type: none - options: { } + type: role + options: + role: + authenticated: authenticated cache: type: tag options: { } @@ -199,6 +203,7 @@ display: - 'languages:language_content' - 'languages:language_interface' - url.query_args + - user.roles tags: { } entity_reference_1: id: entity_reference_1 @@ -217,4 +222,5 @@ display: contexts: - 'languages:language_content' - 'languages:language_interface' + - user.roles tags: { } diff --git a/config/optional/views.view.case_provisions.yml b/config/optional/views.view.case_provisions.yml new file mode 100644 index 0000000..65ad989 --- /dev/null +++ b/config/optional/views.view.case_provisions.yml @@ -0,0 +1,701 @@ +uuid: 00afe158-4881-4478-b808-06e2841efc36 +langcode: en +status: true +dependencies: + config: + - opencase_cases.oc_case_provision_type.caseworker + - user.role.authenticated + module: + - opencase_cases + - user +id: case_provisions +label: 'Case provisions' +module: views +description: '' +tag: '' +base_table: oc_case_provision_field_data +base_field: id +display: + default: + id: default + display_title: Default + display_plugin: default + position: 0 + display_options: + title: 'Case provisions' + fields: + oc_case: + id: oc_case + table: oc_case_provision_field_data + field: oc_case + relationship: none + group_type: group + admin_label: '' + entity_type: oc_case_provision + entity_field: oc_case + plugin_id: field + label: Case + 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_provider_role: + id: oc_case_provider_role + table: oc_case_provision_field_data + field: oc_case_provider_role + relationship: none + group_type: group + admin_label: '' + entity_type: oc_case_provision + entity_field: oc_case_provider_role + plugin_id: field + label: Role + 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 + pager: + type: none + options: + offset: 0 + items_per_page: null + 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: + oc_provider: + id: oc_provider + table: oc_case_provision_field_data + field: oc_provider + relationship: none + group_type: group + admin_label: '' + entity_type: oc_case_provision + entity_field: oc_provider + plugin_id: numeric + default_action: default + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: raw + default_argument_options: + index: 2 + 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: { } + break_phrase: false + not: false + filters: + status: + id: status + table: oc_case_provision_field_data + field: status + entity_type: oc_case_provision + entity_field: status + plugin_id: boolean + value: '1' + group: 1 + expose: + operator: '' + operator_limit_selection: false + operator_list: { } + type: + id: type + table: oc_case_provision_field_data + field: type + entity_type: oc_case_provision + entity_field: type + plugin_id: bundle + value: + caseworker: caseworker + expose: + 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 + - user.roles + tags: { } + block_1: + id: block_1 + display_title: 'By provider' + display_plugin: block + position: 1 + display_options: + fields: + oc_case: + id: oc_case + table: oc_case_provision_field_data + field: oc_case + relationship: none + group_type: group + admin_label: '' + entity_type: oc_case_provision + entity_field: oc_case + plugin_id: field + label: Case + 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_provider_role: + id: oc_case_provider_role + table: oc_case_provision_field_data + field: oc_case_provider_role + relationship: none + group_type: group + admin_label: '' + entity_type: oc_case_provision + entity_field: oc_case_provider_role + plugin_id: field + label: Role + 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_target: + id: oc_target + table: oc_case_field_data + field: oc_target + relationship: oc_case + group_type: group + admin_label: '' + entity_type: oc_case + entity_field: oc_target + plugin_id: field + label: Target + 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 + defaults: + relationships: false + fields: false + relationships: + oc_case: + id: oc_case + table: oc_case_provision_field_data + field: oc_case + relationship: none + group_type: group + admin_label: Case + entity_type: oc_case_provision + entity_field: oc_case + plugin_id: standard + required: false + display_description: '' + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - user.roles + tags: { } + block_2: + id: block_2 + display_title: 'By case' + display_plugin: block + position: 2 + display_options: + fields: + oc_provider: + id: oc_provider + table: oc_case_provision_field_data + field: oc_provider + relationship: none + group_type: group + admin_label: '' + entity_type: oc_case_provision + entity_field: oc_provider + 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: 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_provider_role: + id: oc_case_provider_role + table: oc_case_provision_field_data + field: oc_case_provider_role + relationship: none + group_type: group + admin_label: '' + entity_type: oc_case_provision + entity_field: oc_case_provider_role + plugin_id: field + label: Role + 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 + arguments: + oc_case: + id: oc_case + table: oc_case_provision_field_data + field: oc_case + relationship: none + group_type: group + admin_label: '' + entity_type: oc_case_provision + entity_field: oc_case + plugin_id: numeric + default_action: default + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: raw + default_argument_options: + index: 2 + 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: { } + break_phrase: false + not: false + defaults: + relationships: false + fields: false + arguments: false + header: false + relationships: { } + display_description: '' + header: + area_text_custom: + id: area_text_custom + table: views + field: area_text_custom + relationship: none + group_type: group + admin_label: '' + plugin_id: text_custom + empty: true + content: 'Add a caseworker' + tokenize: true + display_extenders: { } + cache_metadata: + max-age: -1 + contexts: + - 'languages:language_content' + - 'languages:language_interface' + - url + - user.roles + tags: { } diff --git a/config/optional/views.view.sample_downloadable_report.yml b/config/optional/views.view.sample_downloadable_report.yml index 80a291c..f572ad8 100644 --- a/config/optional/views.view.sample_downloadable_report.yml +++ b/config/optional/views.view.sample_downloadable_report.yml @@ -2,11 +2,15 @@ uuid: 0c812021-ff90-442b-a7a0-353d538d6e15 langcode: en status: true dependencies: + config: + - system.menu.opencase + - user.role.authenticated module: - csv_serialization - opencase_entities - rest - serialization + - user - views_data_export id: sample_downloadable_report label: 'Sample Downloadable Report' @@ -22,7 +26,7 @@ display: display_plugin: default position: 0 display_options: - title: 'Sample Downloadable Report' + title: 'Sample Report' fields: name: id: name @@ -117,8 +121,10 @@ display: sort_asc_label: Asc sort_desc_label: Desc access: - type: none - options: { } + type: role + options: + role: + authenticated: authenticated cache: type: tag options: { } @@ -197,6 +203,7 @@ display: - 'languages:language_interface' - url - url.query_args + - user.roles tags: { } data_export_1: id: data_export_1 @@ -236,6 +243,7 @@ display: - 'languages:language_interface' - request_format - url + - user.roles tags: { } page_1: id: page_1 @@ -245,6 +253,15 @@ display: display_options: display_extenders: { } path: sample-downloadable-report + menu: + type: normal + title: 'Sample downloadable report' + description: '' + weight: 0 + expanded: false + menu_name: opencase + parent: opencase.reporting + context: '0' cache_metadata: max-age: -1 contexts: @@ -252,4 +269,5 @@ display: - 'languages:language_interface' - url - url.query_args + - user.roles tags: { } diff --git a/config/optional/views.view.search_content.yml b/config/optional/views.view.search_content.yml index 598606b..ef23a91 100644 --- a/config/optional/views.view.search_content.yml +++ b/config/optional/views.view.search_content.yml @@ -4,8 +4,10 @@ status: true dependencies: config: - search_api.index.default_index + - user.role.authenticated module: - search_api + - user _core: default_config_hash: EeNNkLARDmftWehrk-ew_OW8srW2RgDKI1mZrWxZ-ao id: search_content @@ -54,8 +56,10 @@ display: text_input_required: 'Please enter some keywords to search.' text_input_required_format: basic_html access: - type: none - options: { } + type: role + options: + role: + authenticated: authenticated cache: type: none options: { } @@ -133,13 +137,15 @@ display: footer: { } display_extenders: { } cache_metadata: - max-age: 0 + max-age: -1 contexts: - - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - tags: { } + - 'user.node_grants:view' + - user.roles + tags: + - 'config:search_api.index.default_index' cacheable: false page_1: id: page_1 @@ -150,11 +156,13 @@ display: display_extenders: { } path: search/content cache_metadata: - max-age: 0 + max-age: -1 contexts: - - 'languages:language_content' - 'languages:language_interface' - url - url.query_args - tags: { } + - 'user.node_grants:view' + - user.roles + tags: + - 'config:search_api.index.default_index' cacheable: false diff --git a/css/opencase.css b/css/opencase.css index e7858b7..de3acd2 100644 --- a/css/opencase.css +++ b/css/opencase.css @@ -3,6 +3,13 @@ display: none; } +/* download icon for reports */ +.feed-icons .views-data-export-feed .feed-icon { + background-image: url('/modules/contrib/opencase/resources/download.png'); + width: 50px; + height: 50px; +} + /* paragraphs */ @@ -16,7 +23,7 @@ } .field.field--type-entity-reference-revisions .field__item { - padding: 0; + padding: 0; } /* end paragraphs */ diff --git a/resources/download.png b/resources/download.png new file mode 100644 index 0000000000000000000000000000000000000000..885a78f7ac1c256d49af332985fd3de70c771e67 GIT binary patch literal 9004 zcmeHLc{r49+qWcZB9t|Q%93Fg%b4s&$i79k8so;;X3Wwc6cGuDB763IPb9Kt3l*}J zEh5Sm(xUo?dY-4}d!O%pzvno<@4sh`-wF)^Spl7d0zM2*HsfEoqa6)EHpGU z`}A~CX4GHU&c#Ge{g#~exlBXDammlZnq-EifbayIGu8tDk$mw02=Ku=)6n>g^(J8n zVkb&NzY}>H_Vn#ZXoY4{R^umyZ^wH0*1nebM80czzA&4ctEm~!Ztnbbva#mVA+>@* zS4XK>_rCaaYs_YpxMNxR`EN*pCzI=3+e<22+jYM6)4q~#5{EAyo$PCDTt3Wd7uH_2 z;U&UXqxgAUKz?EUvn!?T>oB z))TP)nbAb^p@U-ms$kDHBJfk4zOX|h*wrX}a=y#Q?$g3%vA#ck{@a5s?y9Z2dUq&S zzdvztx!bq>YHCc_dPPsxYO;?*U)FmLtq<&=^z$QqnA$~U&PkcNg`^i=sWW(buB@{U z@f(33@eXk&{+nVkqcW&~+9myb^j_L3+WH`?udN3urM6FAU*VEb7IN|Ha9j?a{N6Y7 zBJ{)1O-f(4*y)ki@>LM68v~6g3?Q$`b%|7(NnzoO+`}}%3n6Fl<)eY%XK@c+$IqD} z)ESKo1j}rQz{Eii%I*X@k`;8WinR-HxwiF4>6OIPfVHlF_(S?2{VwC;4QL1(;??Gu ze{Lx{D3LH57RlV31Svf;LvWZNv0EvjxVP+w3mn=O@%5%VVvq=o7ljn9#Y z{?05mXjZhsSGG7+=(@DIbE@ZkZK;yl{_Y~_GvsQ+!lm*VqZ2EY!0`Ctd?jM@=Y=)m z;7cL-i!uFNkLl%AZMp-P^OlZCI)mo2=+`otTecOi3!W+X5x8g8&Tjp zEev0n*CAdAPK9sXo!MZ;5DHYz2zFNbA1)n~lgy~pRTbWnmWeu}kk-Wp$VNTem<_SH zm3o-`{+;z1zn+H)Vk5V>)Mbb7*0^rHgz3NQEqfSlC+g}g@Ic-75Wh>ZX4vzBp~tr? zi{HgpSc!cj4$nTHIU^A{XjT4EdNvxV%T3sGpk`GZb!me*ki8XA!I{$Fx5b|<^r95Z zDpcuNZ}-7}Te>Y++Pn|;#gnf{co?`853~#c5hvw_&r+6*#lN+Y*Tp92ZtUDh_hp>CF7=Kw+*?%s{Z!<{122crugi75JRiQZZ(kgE(^FJF zX-~EI7RK9k>U=YEyY*3s&ol#5_$zM`)cF{DCiiQ=ct` z+>H*-ZKe9yi#zCE(^IXieQBFq^+@O>;P>gqEm!T@b@ec5I<2Xb;A@H4`y;V~{g)DF zm*?L!?7w+=D~4y#;Z$YSKJ(_pYJn?~EvWa24`|JY+BK`swfQ=iJsRW;HnLUhI{{Q@ z>g4*K6|am5w_Fz%j6lv*46%PzTg+SSds&jUmE(XH2xU#1L(&VeK-Z&v+jHI>(}<6E z&l%HtzjwG=An@!xO!b?^?f`W-yK3$NtaH+xuQXjefA%?Gs87-F3#pYp>=$B)AX9>zJvTsQ&+ND(mmX6dUu_;P0J{ZF|f*_&=<@Wg2&C~ zI6v%F4L#1y5*pHb=ym_TIAfjlae*ft4kAR1ewQ3gQ!o3&1gXM|Y<97l=YvN&<~Zvt zlNUH+NQp|vbR{$8EcRtZMh(;SulZl+PFi(Y+L`f;WpwAVcPw{YeXjL-=>R!> zxKpGv<>?HIZua#jiYvWa=mjbL8YcuU;)S*!Q_|4>7o7q8Z^uU6xzff<=)zJGEsxu{ zIM*HYtj>hQ>=SrcoSKy>t{^4aX-#~NjQFrrdv8S512>j^x8nYD|Etx(tsy=-JgWCI zdpfr@M(jCs9Ff(812rb>Bu=6D8!S%AHU60bgKfGs$`RL z%VdhX))f#Scl}TVy_BN9+NiRhl>GJTRq$-o@L|j0`VTh3bLB6JKBL=5wBtOIm04_D ztd%bh@il0^y;huNWqRt1e~ao1U_C|BN(|~*kwUx!uReS-8}p@MLue8x7HF;pWH9Ix?Za9yWLQ*^a`A zg-sKNk^#G?Ym%V|i@?^X^AahBmKuBZYU_CKlaal`DSwDdUGYw}Sz0voreevyhTfbLO$dd>QX44eT-Vl(~!t`yaoJJUAR?6T4K}F~|Ev zuHgEy1}?+?RQpI8eR+ZKz9d6|H@7p3_To)1FBMt>T7Z6lp z8+Z47=F;6f>uMEpct)}Wwe}h|_+~IOi~fUTAk@M-e1UF&l-yKPJ*5($huw#(6h3)o z$S!*{n}Y6$=_7ET*qC6KCSo;<%*y<*w#k-czZWi$RI_H@rz#nJ0JxlNU-YY4bz8`!^KoGw?YY1HrTw2i!0r zUIL3u+zlnPn@@#?Y6PLiU9sI2*KP*W7S?69SXnHdI#V3Sq_H)B;l|@{gjnnJD5SQYhZFu4n>JX4F;A7bE|Y9=wx zdYDkGH3H2oHyW&Svm3Cjkm?bWZY@F$eTz@n(;30wR{LhyaJ}Gg&m>RVydUJE6-WBp z=52co|5CnHJL z*ZXVEy(oWKB8T!_E@-WgD>O-pF0J+Zkj6_Fs#)`xq#GO<-?V?+?d7nuXjGWA#nQ

i$sx??s_>j*rU_J8mmv=8NJbAeKcANm=A{rp}x*m5BPge8Gq0lw1zMbRQ zykt8!o#0>P^iigMf0+?o;-vaJ=?#H!$#Zjx9Og|uI8g4v+mq@BwD88D+jP!>^w8?o z?Y)jHw|!}$W1d#RL)HyK*E0QJ1Kz9}dI=~<9M4AQXtmB_rvV2pDc;R)?0AHfV2wpw zG^{dlONh5LYGY|QdXI6R0$YOCK_1(LKvs=L@fpmRlKo|yUegD6Q(@7^(yzEPQ0}b= zf8jMLQzHh$8Ec~rT0u;imoG_zUN2=6mWpGe`GT}TXY>>!#!((0pJ^3x(pu7YJ3XDBr?nCK2HPXwBUP-I4ay?*I&}8 znYm0)AU3$d2%~%SubQiX!|)XNca%n;kKAOMNv!Spam|)(ohx&9L<)Rvk`K1XlDP0v zpRVuqZD2%;%pY~t_B|o?&PH*i(>o+<057#~K%IT%eW86N%c!cnmfJHBEZR|{>FvGT zb_nYGG0O2wTe+7_2&mR> zoUd8J>MCk_X-qqJ34!YAg=McwbY&qq{zohst@9*CGw{M>&VbL~?L?*({=D&Gd+ zG(m@PxYlEPuE+g`FKeVP7={aimTAv{A#>H8^$hLx2NP?WZtFNL=5NGugcZ@prDYD~ zNznYSlI)mPYc-Ef>4f2%Pun$Cg9&;uq0~yb@_*>Kw-b>$U?Z zrWjLgX23f9S>X*wQSC3@`@dhBIn;GDu4vE6XanW8;c80L$3kb+S0CL| zyAt$N=4t-uhph@vMWahiaC}bn_AMl2UC*y1NBjDv3D2olbva!ZnqIR%{hqCVWmcCq z>6`yyAGIu8H(fxD`c~2lTcU8@e)XifQxi0dVNJS0mBT6%5 zSSJ-xD|thRAzlk`#p?PI0CPVh3yhyTM#)K3O_fF22T3LH1W0I*kEe$h5$U5My332C z-tTnFih_0_BzF~2YeN%|7LEXb`1|sX}`6mk^N&EaC{{GT}XhA)rlQjc~I5GhPXrBkXNMgS_ z#e0y6zxpH-ft{}1xILVlWvM~!dj8c$N6*mYcbgpIb};IWHw z!pH(1fG0H&B9$5XCp-!3{Ko?QX+Aq6{}Kq*-S7N=LjR`MZY;aHB2hRDdB>?9N=0-h zUZfKagLOjg-lFB*2cEC-c`D9JhfLZ#|=2aYkblexWcXV5yaW_V_ib z9V#a(6+{VvhA04Nup=Ce0n5Ri05AejLWAK@KtWy!fxnRYVQ2USyv?1}w0ifH?`hBN|je9tM|FR8WLL6d*8!(jTDH0D(wN@*Pen zLckxC;iHcIxeC#c85lWOtj&vi}bJFHGjHIEvT*j^_{P z?<^Vw5(P(aHzpW6x&au{zvuZY@b64!)V+>KBKYe4he`c6obr!!)ur0v2)@7gHwV0b zw0>+z9@t%}K%m`C0Ex!@ke`S?5B$hgs*XQ~Fs^7X7l69k{w%fM`mukJ#?JBzP(U65 zfFTe?2w2Vu0|z@oU{J6k#0jp1a8hst5a`_n{+*qOb0$&H1VF=ungi5zrk2+3I)fy3 zvrqERXo@R9&5`2}C=vn@{jt0tW!aq#^|$FM?`%1ShR9z9P~O>+ka|0rXHLfBJ+J`b z&%*qcDE|ZQ7yF+{`Jc>xh5fMB!r^_XMe9m3rg;5Z_kRKW!C-*J0A57gzYG0W$PZb5 zdG1hS{?SK$o>3oex}?1qX#PWKTiIZzW>Pek6eFCfxiX*C%gWU z>u)LWx4{2o*Z-MZEPuRV176fWdKBvWbFJM;bLzXdrip=t_V@4Kskdk}8UTRU*x1d@ zO?i3whK7d8$;l%}j;yY(nwpy0+uNt6rq0dHkw_$efB&|&w#dlH!NI|biV6`CkvmS2 zDpU$uM|~X>O*n&)F15jo*F8g|p<(6PxoByUQh2GIj3hlnZN@nUHf8}i=3-|nYFE7; zO2b08V=4X_`(+TD_B5?qp+v~)_eSKw%Ws;@9A3ubC*%Y(5)@3sWnmgli)QL4&q-+U zbqh-|F@HJzZY_K(`i3Q2MO3AHtJHf}eXO)@Le-+NR#^#?e=UDAe7(0^rsHmFFo#lr zf#>Lm1=-$v03nWP_tUxAd&BX;6>X`Om54+BIh& Date: Thu, 12 May 2022 14:57:15 +0100 Subject: [PATCH 05/24] Added block for adding activities --- modules/opencase_cases/opencase_cases.module | 9 +++-- src/Plugin/Block/AddActivity.php | 37 ++++++++++++++++++++ 2 files changed, 43 insertions(+), 3 deletions(-) create mode 100644 src/Plugin/Block/AddActivity.php diff --git a/modules/opencase_cases/opencase_cases.module b/modules/opencase_cases/opencase_cases.module index 5bf6ae8..f439526 100644 --- a/modules/opencase_cases/opencase_cases.module +++ b/modules/opencase_cases/opencase_cases.module @@ -156,11 +156,14 @@ function _opencase_cases_redirect_to_home($form, &$form_state) { // Upon deletion of an activity, go to the related case if there is one, otherwise to its target. function _opencase_cases_delete_activity_redirect($form, &$form_state) { - if (!IsEmpty($form_state->getFormObject()->getEntity()->oc_case)) { - $case_id = $form_state->getFormObject()->getEntity()->oc_case->target_id; + $entity = $form_state->getFormObject()->getEntity(); + // for some reason this fires when deleting an activity type, shouldn't do but.s + if ($entity instanceof \Drupal\opencase_entities\Entity\OCActivityType) return; + if (!IsEmpty($entity->oc_case)) { + $case_id = $entity->oc_case->target_id; $form_state->setRedirect('entity.oc_case.canonical', ['oc_case' => $case_id]); } else { - $target_actor_id = $form_state->getFormObject()->getEntity()->oc_target->target_id; + $target_actor_id = $entity->oc_target->target_id; $form_state->setRedirect('entity.oc_actor.canonical', ['oc_actor' => $target_actor_id]); } } diff --git a/src/Plugin/Block/AddActivity.php b/src/Plugin/Block/AddActivity.php new file mode 100644 index 0000000..8150b5c --- /dev/null +++ b/src/Plugin/Block/AddActivity.php @@ -0,0 +1,37 @@ +getParameter('oc_actor')->id(); + $activity_types = \Drupal::service('entity_type.bundle.info')->getBundleInfo('oc_activity'); + $markup = "

    "; + foreach($activity_types as $id => $info) { + $label = $info['label']; + $markup .= "
  • $label
    • "; + } + $markup .= "
"; + return array('#markup' => $markup); + } + + public function getCacheMaxAge():int { + return 0; + } + +} From d1bf996c823ca0922c994034c8c497d7227b37d7 Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 12 May 2022 14:58:56 +0100 Subject: [PATCH 06/24] Made caseless demo version with add-activity block --- config/optional/block.block.addactivity.yml | 25 ++ config/optional/core.date_format.short.yml | 2 +- ...isplay.oc_activity.application.default.yml | 33 ++- ..._display.oc_activity.case_note.default.yml | 50 ++-- ...ity.destitution_funds_provided.default.yml | 52 ++-- ...form_display.oc_activity.email.default.yml | 60 +++++ ..._display.oc_activity.interview.default.yml | 60 +++++ ..._form_display.oc_activity.lete.default.yml | 60 +++++ ...display.oc_activity.phone_call.default.yml | 34 +-- ...m_display.oc_activity.research.default.yml | 60 +++++ ...isplay.oc_activity.supervision.default.yml | 60 +++++ ...ity.volunteer_training_session.default.yml | 62 ----- ....entity_form_display.user.user.default.yml | 39 ++- ...isplay.oc_activity.application.default.yml | 37 +-- ..._display.oc_activity.case_note.default.yml | 51 ++-- ...ity.destitution_funds_provided.default.yml | 63 +++-- ...view_display.oc_activity.email.default.yml | 58 +++++ ..._display.oc_activity.interview.default.yml | 58 +++++ ..._view_display.oc_activity.lete.default.yml | 58 +++++ ...display.oc_activity.phone_call.default.yml | 32 +-- ...w_display.oc_activity.research.default.yml | 58 +++++ ...isplay.oc_activity.supervision.default.yml | 58 +++++ ...ity.volunteer_training_session.default.yml | 65 ----- ....entity_view_display.user.user.default.yml | 15 +- ...extra_field.oc_actor.client.activities.yml | 43 ---- ...r_training_session.field_date_attended.yml | 21 -- ...training_session.field_type_of_session.yml | 19 -- ...torage.oc_activity.field_date_attended.yml | 20 -- ...rage.oc_activity.field_type_of_session.yml | 21 -- ...tities.oc_activity_type.telephone_call.yml | 6 - ...tivity_type.volunteer_training_session.yml | 6 - config/optional/views.view.activities.yml | 228 +++++++++++++++++- 32 files changed, 1080 insertions(+), 434 deletions(-) create mode 100644 config/optional/block.block.addactivity.yml create mode 100644 config/optional/core.entity_form_display.oc_activity.email.default.yml create mode 100644 config/optional/core.entity_form_display.oc_activity.interview.default.yml create mode 100644 config/optional/core.entity_form_display.oc_activity.lete.default.yml create mode 100644 config/optional/core.entity_form_display.oc_activity.research.default.yml create mode 100644 config/optional/core.entity_form_display.oc_activity.supervision.default.yml delete mode 100644 config/optional/core.entity_form_display.oc_activity.volunteer_training_session.default.yml create mode 100644 config/optional/core.entity_view_display.oc_activity.email.default.yml create mode 100644 config/optional/core.entity_view_display.oc_activity.interview.default.yml create mode 100644 config/optional/core.entity_view_display.oc_activity.lete.default.yml create mode 100644 config/optional/core.entity_view_display.oc_activity.research.default.yml create mode 100644 config/optional/core.entity_view_display.oc_activity.supervision.default.yml delete mode 100644 config/optional/core.entity_view_display.oc_activity.volunteer_training_session.default.yml delete mode 100644 config/optional/entity_extra_field.extra_field.oc_actor.client.activities.yml delete mode 100644 config/optional/field.field.oc_activity.volunteer_training_session.field_date_attended.yml delete mode 100644 config/optional/field.field.oc_activity.volunteer_training_session.field_type_of_session.yml delete mode 100644 config/optional/field.storage.oc_activity.field_date_attended.yml delete mode 100644 config/optional/field.storage.oc_activity.field_type_of_session.yml delete mode 100644 config/optional/opencase_entities.oc_activity_type.telephone_call.yml delete mode 100644 config/optional/opencase_entities.oc_activity_type.volunteer_training_session.yml diff --git a/config/optional/block.block.addactivity.yml b/config/optional/block.block.addactivity.yml new file mode 100644 index 0000000..2eae4c8 --- /dev/null +++ b/config/optional/block.block.addactivity.yml @@ -0,0 +1,25 @@ +uuid: 036ff73a-049d-4979-abf0-95b1a9d1b830 +langcode: en +status: true +dependencies: + module: + - opencase + - route_condition + theme: + - bartik +id: addactivity +theme: bartik +region: sidebar_second +weight: 0 +provider: null +plugin: add_activity +settings: + id: add_activity + label: 'Add Activity' + label_display: visible + provider: opencase +visibility: + route: + id: route + negate: false + routes: entity.oc_actor.canonical diff --git a/config/optional/core.date_format.short.yml b/config/optional/core.date_format.short.yml index 928ad46..36918ee 100644 --- a/config/optional/core.date_format.short.yml +++ b/config/optional/core.date_format.short.yml @@ -7,4 +7,4 @@ _core: id: short label: 'Default short date' locked: false -pattern: 'd/m/Y - H:i' +pattern: 'd M Y' diff --git a/config/optional/core.entity_form_display.oc_activity.application.default.yml b/config/optional/core.entity_form_display.oc_activity.application.default.yml index 1d20d77..bd70d58 100644 --- a/config/optional/core.entity_form_display.oc_activity.application.default.yml +++ b/config/optional/core.entity_form_display.oc_activity.application.default.yml @@ -4,14 +4,22 @@ status: true dependencies: config: - opencase_entities.oc_activity_type.application + module: + - datetime id: oc_activity.application.default targetEntityType: oc_activity bundle: application mode: default content: + activity_date_time: + type: datetime_default + weight: 0 + region: content + settings: { } + third_party_settings: { } description: type: string_textarea - weight: 4 + weight: 5 region: content settings: rows: 5 @@ -19,7 +27,7 @@ content: third_party_settings: { } name: type: string_textfield - weight: 2 + weight: 3 region: content settings: size: 60 @@ -27,7 +35,7 @@ content: third_party_settings: { } oc_provider: type: entity_reference_autocomplete - weight: 1 + weight: 2 region: content settings: match_operator: CONTAINS @@ -37,7 +45,7 @@ content: third_party_settings: { } oc_target: type: entity_reference_autocomplete - weight: 0 + weight: 1 region: content settings: match_operator: CONTAINS @@ -45,25 +53,14 @@ content: size: 60 placeholder: '' third_party_settings: { } - revision_log: - type: hide_revision_field_log_widget - weight: 80 - region: content - settings: - rows: 5 - placeholder: '' - show: true - default: '' - permission_based: false - allow_user_settings: true - third_party_settings: { } time_taken: type: number - weight: 3 + weight: 4 region: content settings: placeholder: '' third_party_settings: { } hidden: - activity_date_time: true + revision_log: true status: true + user_id: true diff --git a/config/optional/core.entity_form_display.oc_activity.case_note.default.yml b/config/optional/core.entity_form_display.oc_activity.case_note.default.yml index c3689f6..c29897e 100644 --- a/config/optional/core.entity_form_display.oc_activity.case_note.default.yml +++ b/config/optional/core.entity_form_display.oc_activity.case_note.default.yml @@ -4,41 +4,63 @@ status: true dependencies: config: - opencase_entities.oc_activity_type.case_note + module: + - datetime id: oc_activity.case_note.default targetEntityType: oc_activity bundle: case_note mode: default content: + activity_date_time: + type: datetime_default + weight: 0 + region: content + settings: { } + third_party_settings: { } + description: + type: string_textarea + weight: 5 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } name: type: string_textfield - weight: -3 + weight: 4 region: content settings: size: 60 placeholder: '' third_party_settings: { } - revision_log: - type: hide_revision_field_log_widget - weight: 80 + oc_provider: + type: entity_reference_autocomplete + weight: 2 region: content settings: - rows: 5 + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + oc_target: + type: entity_reference_autocomplete + weight: 1 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 placeholder: '' - show: true - default: '' - permission_based: false - allow_user_settings: true third_party_settings: { } time_taken: type: number - weight: -3 + weight: 3 region: content settings: placeholder: '' third_party_settings: { } hidden: - activity_date_time: true - description: true - oc_provider: true - oc_target: true + revision_log: true status: true + user_id: true diff --git a/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml b/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml index c584be6..c9d5939 100644 --- a/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml +++ b/config/optional/core.entity_form_display.oc_activity.destitution_funds_provided.default.yml @@ -6,54 +6,70 @@ dependencies: - field.field.oc_activity.destitution_funds_provided.field_amount - field.field.oc_activity.destitution_funds_provided.field_funds_for - opencase_entities.oc_activity_type.destitution_funds_provided + module: + - datetime id: oc_activity.destitution_funds_provided.default targetEntityType: oc_activity bundle: destitution_funds_provided mode: default content: + activity_date_time: + type: datetime_default + weight: 0 + region: content + settings: { } + third_party_settings: { } + description: + type: string_textarea + weight: 6 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } field_amount: type: number - weight: 28 + weight: 5 region: content settings: placeholder: '' third_party_settings: { } field_funds_for: type: options_select - weight: 27 + weight: 4 region: content settings: { } third_party_settings: { } name: type: string_textfield - weight: -3 + weight: 3 region: content settings: size: 60 placeholder: '' third_party_settings: { } - revision_log: - type: hide_revision_field_log_widget - weight: 80 + oc_provider: + type: entity_reference_autocomplete + weight: 2 region: content settings: - rows: 5 + match_operator: CONTAINS + match_limit: 10 + size: 60 placeholder: '' - show: true - default: '' - permission_based: false - allow_user_settings: true third_party_settings: { } - time_taken: - type: number - weight: -3 + oc_target: + type: entity_reference_autocomplete + weight: 1 region: content settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 placeholder: '' third_party_settings: { } hidden: - activity_date_time: true - description: true - oc_provider: true - oc_target: true + revision_log: true status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_form_display.oc_activity.email.default.yml b/config/optional/core.entity_form_display.oc_activity.email.default.yml new file mode 100644 index 0000000..06f9fb7 --- /dev/null +++ b/config/optional/core.entity_form_display.oc_activity.email.default.yml @@ -0,0 +1,60 @@ +uuid: c9168804-754e-4c9c-872e-34d340c0db2a +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_activity_type.email + module: + - datetime +id: oc_activity.email.default +targetEntityType: oc_activity +bundle: email +mode: default +content: + activity_date_time: + type: datetime_default + weight: 0 + region: content + settings: { } + third_party_settings: { } + description: + type: string_textarea + weight: 4 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + name: + type: string_textfield + weight: 3 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + oc_provider: + type: entity_reference_autocomplete + weight: 2 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + oc_target: + type: entity_reference_autocomplete + weight: 1 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + revision_log: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_form_display.oc_activity.interview.default.yml b/config/optional/core.entity_form_display.oc_activity.interview.default.yml new file mode 100644 index 0000000..731863d --- /dev/null +++ b/config/optional/core.entity_form_display.oc_activity.interview.default.yml @@ -0,0 +1,60 @@ +uuid: 86825dc4-21cd-4670-80f5-fd3fc6c67e25 +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_activity_type.interview + module: + - datetime +id: oc_activity.interview.default +targetEntityType: oc_activity +bundle: interview +mode: default +content: + activity_date_time: + type: datetime_default + weight: 0 + region: content + settings: { } + third_party_settings: { } + description: + type: string_textarea + weight: 4 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + name: + type: string_textfield + weight: 3 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + oc_provider: + type: entity_reference_autocomplete + weight: 2 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + oc_target: + type: entity_reference_autocomplete + weight: 1 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + revision_log: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_form_display.oc_activity.lete.default.yml b/config/optional/core.entity_form_display.oc_activity.lete.default.yml new file mode 100644 index 0000000..b544eb8 --- /dev/null +++ b/config/optional/core.entity_form_display.oc_activity.lete.default.yml @@ -0,0 +1,60 @@ +uuid: a86206a2-d677-4276-8450-39941361eee1 +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_activity_type.lete + module: + - datetime +id: oc_activity.lete.default +targetEntityType: oc_activity +bundle: lete +mode: default +content: + activity_date_time: + type: datetime_default + weight: 0 + region: content + settings: { } + third_party_settings: { } + description: + type: string_textarea + weight: 4 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + name: + type: string_textfield + weight: 3 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + oc_provider: + type: entity_reference_autocomplete + weight: 2 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + oc_target: + type: entity_reference_autocomplete + weight: 1 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + revision_log: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_form_display.oc_activity.phone_call.default.yml b/config/optional/core.entity_form_display.oc_activity.phone_call.default.yml index c7f1f41..422e807 100644 --- a/config/optional/core.entity_form_display.oc_activity.phone_call.default.yml +++ b/config/optional/core.entity_form_display.oc_activity.phone_call.default.yml @@ -6,7 +6,6 @@ dependencies: - opencase_entities.oc_activity_type.phone_call module: - datetime - - hide_revision_field id: oc_activity.phone_call.default targetEntityType: oc_activity bundle: phone_call @@ -18,9 +17,17 @@ content: region: content settings: { } third_party_settings: { } + description: + type: string_textarea + weight: 4 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } name: type: string_textfield - weight: 4 + weight: 3 region: content settings: size: 60 @@ -46,25 +53,8 @@ content: size: 60 placeholder: '' third_party_settings: { } - revision_log: - type: hide_revision_field_log_widget - weight: 5 - region: content - settings: - rows: 5 - placeholder: '' - show: true - default: '' - permission_based: false - allow_user_settings: true - third_party_settings: { } - time_taken: - type: number - weight: 3 - region: content - settings: - placeholder: '' - third_party_settings: { } hidden: - description: true + revision_log: true status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_form_display.oc_activity.research.default.yml b/config/optional/core.entity_form_display.oc_activity.research.default.yml new file mode 100644 index 0000000..dce5ad8 --- /dev/null +++ b/config/optional/core.entity_form_display.oc_activity.research.default.yml @@ -0,0 +1,60 @@ +uuid: 0751919f-0018-47c0-b5fd-074d40ccc2df +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_activity_type.research + module: + - datetime +id: oc_activity.research.default +targetEntityType: oc_activity +bundle: research +mode: default +content: + activity_date_time: + type: datetime_default + weight: 0 + region: content + settings: { } + third_party_settings: { } + description: + type: string_textarea + weight: 4 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + name: + type: string_textfield + weight: 3 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + oc_provider: + type: entity_reference_autocomplete + weight: 2 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + oc_target: + type: entity_reference_autocomplete + weight: 1 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + revision_log: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_form_display.oc_activity.supervision.default.yml b/config/optional/core.entity_form_display.oc_activity.supervision.default.yml new file mode 100644 index 0000000..c6ea98a --- /dev/null +++ b/config/optional/core.entity_form_display.oc_activity.supervision.default.yml @@ -0,0 +1,60 @@ +uuid: 43b06d48-94ac-4f74-9adc-f40bb63d4f4e +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_activity_type.supervision + module: + - datetime +id: oc_activity.supervision.default +targetEntityType: oc_activity +bundle: supervision +mode: default +content: + activity_date_time: + type: datetime_default + weight: 0 + region: content + settings: { } + third_party_settings: { } + description: + type: string_textarea + weight: 4 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + name: + type: string_textfield + weight: 3 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + oc_provider: + type: entity_reference_autocomplete + weight: 2 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + oc_target: + type: entity_reference_autocomplete + weight: 1 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + revision_log: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_form_display.oc_activity.volunteer_training_session.default.yml b/config/optional/core.entity_form_display.oc_activity.volunteer_training_session.default.yml deleted file mode 100644 index a9f6c1d..0000000 --- a/config/optional/core.entity_form_display.oc_activity.volunteer_training_session.default.yml +++ /dev/null @@ -1,62 +0,0 @@ -uuid: 13b48008-63b7-4485-babe-9b72256f976a -langcode: en -status: true -dependencies: - config: - - field.field.oc_activity.volunteer_training_session.field_date_attended - - field.field.oc_activity.volunteer_training_session.field_type_of_session - - opencase_entities.oc_activity_type.volunteer_training_session - module: - - datetime -id: oc_activity.volunteer_training_session.default -targetEntityType: oc_activity -bundle: volunteer_training_session -mode: default -content: - field_date_attended: - type: datetime_default - weight: 27 - region: content - settings: { } - third_party_settings: { } - field_type_of_session: - type: string_textfield - weight: 26 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } - name: - type: string_textfield - weight: -3 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } - revision_log: - type: hide_revision_field_log_widget - weight: 80 - region: content - settings: - rows: 5 - placeholder: '' - show: true - default: '' - permission_based: false - allow_user_settings: true - third_party_settings: { } - time_taken: - type: number - weight: -3 - region: content - settings: - placeholder: '' - third_party_settings: { } -hidden: - activity_date_time: true - description: true - oc_provider: true - oc_target: true - status: true diff --git a/config/optional/core.entity_form_display.user.user.default.yml b/config/optional/core.entity_form_display.user.user.default.yml index 187f57f..f505761 100644 --- a/config/optional/core.entity_form_display.user.user.default.yml +++ b/config/optional/core.entity_form_display.user.user.default.yml @@ -17,24 +17,41 @@ bundle: user mode: default content: account: - weight: -10 - region: content - contact: - weight: 5 - region: content - language: weight: 0 region: content - timezone: - weight: 6 + settings: { } + third_party_settings: { } + contact: + weight: 4 region: content + settings: { } + third_party_settings: { } + field_linked_opencase_actor: + type: entity_reference_autocomplete + weight: 1 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + language: + weight: 3 + region: content + settings: { } + third_party_settings: { } + timezone: + weight: 5 + region: content + settings: { } + third_party_settings: { } user_picture: type: image_image - weight: -1 + weight: 2 region: content settings: progress_indicator: throbber preview_image_style: thumbnail third_party_settings: { } -hidden: - field_linked_opencase_actor: true +hidden: { } diff --git a/config/optional/core.entity_view_display.oc_activity.application.default.yml b/config/optional/core.entity_view_display.oc_activity.application.default.yml index b01a183..0feabec 100644 --- a/config/optional/core.entity_view_display.oc_activity.application.default.yml +++ b/config/optional/core.entity_view_display.oc_activity.application.default.yml @@ -5,19 +5,35 @@ dependencies: config: - opencase_entities.oc_activity_type.application module: - - user + - datetime id: oc_activity.application.default targetEntityType: oc_activity bundle: application mode: default content: + activity_date_time: + type: datetime_default + label: above + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 0 + region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 5 + region: content name: type: string label: hidden settings: link_to_entity: false third_party_settings: { } - weight: 3 + weight: 4 region: content oc_provider: type: entity_reference_label @@ -25,7 +41,7 @@ content: settings: link: true third_party_settings: { } - weight: 1 + weight: 2 region: content oc_target: type: entity_reference_label @@ -33,7 +49,7 @@ content: settings: link: true third_party_settings: { } - weight: 0 + weight: 1 region: content time_taken: type: number_decimal @@ -44,16 +60,9 @@ content: scale: 2 prefix_suffix: true third_party_settings: { } - weight: 2 - region: content - user_id: - type: author - label: above - settings: { } - third_party_settings: { } - weight: 4 + weight: 3 region: content hidden: - activity_date_time: true - description: true search_api_excerpt: true + status: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.case_note.default.yml b/config/optional/core.entity_view_display.oc_activity.case_note.default.yml index c4c003c..8401adf 100644 --- a/config/optional/core.entity_view_display.oc_activity.case_note.default.yml +++ b/config/optional/core.entity_view_display.oc_activity.case_note.default.yml @@ -5,19 +5,51 @@ dependencies: config: - opencase_entities.oc_activity_type.case_note module: - - user + - datetime id: oc_activity.case_note.default targetEntityType: oc_activity bundle: case_note mode: default content: + activity_date_time: + type: datetime_default + label: above + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 0 + region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 5 + region: content name: type: string label: hidden settings: link_to_entity: false third_party_settings: { } - weight: -3 + weight: 4 + region: content + oc_provider: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 2 + region: content + oc_target: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 1 region: content time_taken: type: number_decimal @@ -28,18 +60,9 @@ content: scale: 2 prefix_suffix: true third_party_settings: { } - weight: -3 - region: content - user_id: - type: author - label: above - settings: { } - third_party_settings: { } - weight: 0 + weight: 3 region: content hidden: - activity_date_time: true - description: true - oc_provider: true - oc_target: true search_api_excerpt: true + status: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml b/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml index dd9ced8..0bd3c06 100644 --- a/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml +++ b/config/optional/core.entity_view_display.oc_activity.destitution_funds_provided.default.yml @@ -7,13 +7,29 @@ dependencies: - field.field.oc_activity.destitution_funds_provided.field_funds_for - opencase_entities.oc_activity_type.destitution_funds_provided module: + - datetime - options - - user id: oc_activity.destitution_funds_provided.default targetEntityType: oc_activity bundle: destitution_funds_provided mode: default content: + activity_date_time: + type: datetime_default + label: above + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 0 + region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 6 + region: content field_amount: type: number_decimal label: above @@ -23,14 +39,14 @@ content: scale: 2 prefix_suffix: true third_party_settings: { } - weight: 2 + weight: 5 region: content field_funds_for: type: list_default label: above settings: { } third_party_settings: { } - weight: 1 + weight: 4 region: content name: type: string @@ -38,29 +54,26 @@ content: settings: link_to_entity: false third_party_settings: { } - weight: -3 - region: content - time_taken: - type: number_decimal - label: above - settings: - thousand_separator: '' - decimal_separator: . - scale: 2 - prefix_suffix: true - third_party_settings: { } - weight: -3 - region: content - user_id: - type: author - label: above - settings: { } - third_party_settings: { } weight: 3 region: content + oc_provider: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 2 + region: content + oc_target: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 1 + region: content hidden: - activity_date_time: true - description: true - oc_provider: true - oc_target: true search_api_excerpt: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.email.default.yml b/config/optional/core.entity_view_display.oc_activity.email.default.yml new file mode 100644 index 0000000..f15d7e3 --- /dev/null +++ b/config/optional/core.entity_view_display.oc_activity.email.default.yml @@ -0,0 +1,58 @@ +uuid: bcd68faf-74c4-457e-9fc3-6e2fb7a25c97 +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_activity_type.email + module: + - datetime +id: oc_activity.email.default +targetEntityType: oc_activity +bundle: email +mode: default +content: + activity_date_time: + type: datetime_default + label: above + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 0 + region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 4 + region: content + name: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 3 + region: content + oc_provider: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 2 + region: content + oc_target: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 1 + region: content +hidden: + search_api_excerpt: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.interview.default.yml b/config/optional/core.entity_view_display.oc_activity.interview.default.yml new file mode 100644 index 0000000..4f5b642 --- /dev/null +++ b/config/optional/core.entity_view_display.oc_activity.interview.default.yml @@ -0,0 +1,58 @@ +uuid: a696fdb4-5317-4bfa-ac92-c15b09c3a7d2 +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_activity_type.interview + module: + - datetime +id: oc_activity.interview.default +targetEntityType: oc_activity +bundle: interview +mode: default +content: + activity_date_time: + type: datetime_default + label: above + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 0 + region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 4 + region: content + name: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 3 + region: content + oc_provider: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 2 + region: content + oc_target: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 1 + region: content +hidden: + search_api_excerpt: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.lete.default.yml b/config/optional/core.entity_view_display.oc_activity.lete.default.yml new file mode 100644 index 0000000..a5c4340 --- /dev/null +++ b/config/optional/core.entity_view_display.oc_activity.lete.default.yml @@ -0,0 +1,58 @@ +uuid: 46f32ceb-da51-40ce-adba-1f3e4bd206ec +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_activity_type.lete + module: + - datetime +id: oc_activity.lete.default +targetEntityType: oc_activity +bundle: lete +mode: default +content: + activity_date_time: + type: datetime_default + label: above + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 0 + region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 4 + region: content + name: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 3 + region: content + oc_provider: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 2 + region: content + oc_target: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 1 + region: content +hidden: + search_api_excerpt: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.phone_call.default.yml b/config/optional/core.entity_view_display.oc_activity.phone_call.default.yml index 02f94e9..3487e9c 100644 --- a/config/optional/core.entity_view_display.oc_activity.phone_call.default.yml +++ b/config/optional/core.entity_view_display.oc_activity.phone_call.default.yml @@ -6,7 +6,6 @@ dependencies: - opencase_entities.oc_activity_type.phone_call module: - datetime - - user id: oc_activity.phone_call.default targetEntityType: oc_activity bundle: phone_call @@ -21,13 +20,20 @@ content: third_party_settings: { } weight: 0 region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 4 + region: content name: type: string label: hidden settings: link_to_entity: false third_party_settings: { } - weight: 4 + weight: 3 region: content oc_provider: type: entity_reference_label @@ -45,24 +51,8 @@ content: third_party_settings: { } weight: 1 region: content - time_taken: - type: number_decimal - label: above - settings: - thousand_separator: '' - decimal_separator: . - scale: 2 - prefix_suffix: true - third_party_settings: { } - weight: 3 - region: content - user_id: - type: author - label: above - settings: { } - third_party_settings: { } - weight: 5 - region: content hidden: - description: true search_api_excerpt: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.research.default.yml b/config/optional/core.entity_view_display.oc_activity.research.default.yml new file mode 100644 index 0000000..511f191 --- /dev/null +++ b/config/optional/core.entity_view_display.oc_activity.research.default.yml @@ -0,0 +1,58 @@ +uuid: 5277f0e8-d0c5-4faf-8978-f0c6d7cc0f5b +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_activity_type.research + module: + - datetime +id: oc_activity.research.default +targetEntityType: oc_activity +bundle: research +mode: default +content: + activity_date_time: + type: datetime_default + label: above + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 0 + region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 4 + region: content + name: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 3 + region: content + oc_provider: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 2 + region: content + oc_target: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 1 + region: content +hidden: + search_api_excerpt: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.supervision.default.yml b/config/optional/core.entity_view_display.oc_activity.supervision.default.yml new file mode 100644 index 0000000..b62a9cf --- /dev/null +++ b/config/optional/core.entity_view_display.oc_activity.supervision.default.yml @@ -0,0 +1,58 @@ +uuid: bc3147a1-d263-4fb3-8059-4fe0dc180df9 +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_activity_type.supervision + module: + - datetime +id: oc_activity.supervision.default +targetEntityType: oc_activity +bundle: supervision +mode: default +content: + activity_date_time: + type: datetime_default + label: above + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 0 + region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 4 + region: content + name: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 3 + region: content + oc_provider: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 2 + region: content + oc_target: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 1 + region: content +hidden: + search_api_excerpt: true + status: true + time_taken: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_activity.volunteer_training_session.default.yml b/config/optional/core.entity_view_display.oc_activity.volunteer_training_session.default.yml deleted file mode 100644 index 45ec2ff..0000000 --- a/config/optional/core.entity_view_display.oc_activity.volunteer_training_session.default.yml +++ /dev/null @@ -1,65 +0,0 @@ -uuid: f33b1e75-dcc3-4471-9637-0bda9d795804 -langcode: en -status: true -dependencies: - config: - - field.field.oc_activity.volunteer_training_session.field_date_attended - - field.field.oc_activity.volunteer_training_session.field_type_of_session - - opencase_entities.oc_activity_type.volunteer_training_session - module: - - datetime - - user -id: oc_activity.volunteer_training_session.default -targetEntityType: oc_activity -bundle: volunteer_training_session -mode: default -content: - field_date_attended: - type: datetime_default - label: above - settings: - timezone_override: '' - format_type: medium - third_party_settings: { } - weight: 1 - region: content - field_type_of_session: - type: string - label: above - settings: - link_to_entity: false - third_party_settings: { } - weight: 0 - region: content - name: - type: string - label: hidden - settings: - link_to_entity: false - third_party_settings: { } - weight: -3 - region: content - time_taken: - type: number_decimal - label: above - settings: - thousand_separator: '' - decimal_separator: . - scale: 2 - prefix_suffix: true - third_party_settings: { } - weight: -3 - region: content - user_id: - type: author - label: above - settings: { } - third_party_settings: { } - weight: 2 - region: content -hidden: - activity_date_time: true - description: true - oc_provider: true - oc_target: true - search_api_excerpt: true diff --git a/config/optional/core.entity_view_display.user.user.default.yml b/config/optional/core.entity_view_display.user.user.default.yml index b8779df..28f3475 100644 --- a/config/optional/core.entity_view_display.user.user.default.yml +++ b/config/optional/core.entity_view_display.user.user.default.yml @@ -16,8 +16,18 @@ targetEntityType: user bundle: user mode: default content: + field_linked_opencase_actor: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 0 + region: content member_for: - weight: 5 + settings: { } + third_party_settings: { } + weight: 2 region: content user_picture: type: image @@ -26,8 +36,7 @@ content: image_link: content image_style: thumbnail third_party_settings: { } - weight: 0 + weight: 1 region: content hidden: - field_linked_opencase_actor: true search_api_excerpt: true diff --git a/config/optional/entity_extra_field.extra_field.oc_actor.client.activities.yml b/config/optional/entity_extra_field.extra_field.oc_actor.client.activities.yml deleted file mode 100644 index 20858b7..0000000 --- a/config/optional/entity_extra_field.extra_field.oc_actor.client.activities.yml +++ /dev/null @@ -1,43 +0,0 @@ -uuid: 4c460157-a452-4eec-9616-6c00b30c110c -langcode: en -status: true -dependencies: - config: - - user.role.authenticated - module: - - opencase_entities - - user -id: oc_actor.client.activities -label: Activities -display_label: true -name: activities -description: '' -base_entity_type_id: oc_actor -base_bundle_type_id: client -field_type_id: views -field_type_config: - view_name: activities - display: block_1 - arguments: '' -field_type_condition: - 'entity_bundle:oc_actor': - id: 'entity_bundle:oc_actor' - negate: false - context_mapping: - oc_actor: entity_extra_field.target_entity - bundles: { } - route: - id: route - negate: false - routes: '' - request_path: - id: request_path - negate: false - pages: '' - current_theme: - id: current_theme - theme: '' - negate: 0 -field_conditions_all_pass: false -display: - type: view diff --git a/config/optional/field.field.oc_activity.volunteer_training_session.field_date_attended.yml b/config/optional/field.field.oc_activity.volunteer_training_session.field_date_attended.yml deleted file mode 100644 index e13a07b..0000000 --- a/config/optional/field.field.oc_activity.volunteer_training_session.field_date_attended.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: e3c9dacd-b1d3-4394-8291-87dcbdb483b8 -langcode: en -status: true -dependencies: - config: - - field.storage.oc_activity.field_date_attended - - opencase_entities.oc_activity_type.volunteer_training_session - module: - - datetime -id: oc_activity.volunteer_training_session.field_date_attended -field_name: field_date_attended -entity_type: oc_activity -bundle: volunteer_training_session -label: 'Date attended' -description: '' -required: true -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: datetime diff --git a/config/optional/field.field.oc_activity.volunteer_training_session.field_type_of_session.yml b/config/optional/field.field.oc_activity.volunteer_training_session.field_type_of_session.yml deleted file mode 100644 index 3b6420d..0000000 --- a/config/optional/field.field.oc_activity.volunteer_training_session.field_type_of_session.yml +++ /dev/null @@ -1,19 +0,0 @@ -uuid: 5ee021de-3208-4be0-8279-0ffad8042602 -langcode: en -status: true -dependencies: - config: - - field.storage.oc_activity.field_type_of_session - - opencase_entities.oc_activity_type.volunteer_training_session -id: oc_activity.volunteer_training_session.field_type_of_session -field_name: field_type_of_session -entity_type: oc_activity -bundle: volunteer_training_session -label: 'Type of session' -description: '' -required: true -translatable: false -default_value: { } -default_value_callback: '' -settings: { } -field_type: string diff --git a/config/optional/field.storage.oc_activity.field_date_attended.yml b/config/optional/field.storage.oc_activity.field_date_attended.yml deleted file mode 100644 index 9e09f0f..0000000 --- a/config/optional/field.storage.oc_activity.field_date_attended.yml +++ /dev/null @@ -1,20 +0,0 @@ -uuid: a61bfa28-fc31-4bf7-ac3c-871192b9d57e -langcode: en -status: true -dependencies: - module: - - datetime - - opencase_entities -id: oc_activity.field_date_attended -field_name: field_date_attended -entity_type: oc_activity -type: datetime -settings: - datetime_type: date -module: datetime -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/optional/field.storage.oc_activity.field_type_of_session.yml b/config/optional/field.storage.oc_activity.field_type_of_session.yml deleted file mode 100644 index dcb263f..0000000 --- a/config/optional/field.storage.oc_activity.field_type_of_session.yml +++ /dev/null @@ -1,21 +0,0 @@ -uuid: 2667af61-41f7-4d8b-a154-68ce7514f559 -langcode: en -status: true -dependencies: - module: - - opencase_entities -id: oc_activity.field_type_of_session -field_name: field_type_of_session -entity_type: oc_activity -type: string -settings: - max_length: 255 - case_sensitive: false - is_ascii: false -module: core -locked: false -cardinality: 1 -translatable: true -indexes: { } -persist_with_no_fields: false -custom_storage: false diff --git a/config/optional/opencase_entities.oc_activity_type.telephone_call.yml b/config/optional/opencase_entities.oc_activity_type.telephone_call.yml deleted file mode 100644 index 1046fd1..0000000 --- a/config/optional/opencase_entities.oc_activity_type.telephone_call.yml +++ /dev/null @@ -1,6 +0,0 @@ -uuid: fde52f28-d60a-46ef-9cf9-e924bd852893 -langcode: en -status: true -dependencies: { } -id: telephone_call -label: 'Telephone call' diff --git a/config/optional/opencase_entities.oc_activity_type.volunteer_training_session.yml b/config/optional/opencase_entities.oc_activity_type.volunteer_training_session.yml deleted file mode 100644 index 4ac37a5..0000000 --- a/config/optional/opencase_entities.oc_activity_type.volunteer_training_session.yml +++ /dev/null @@ -1,6 +0,0 @@ -uuid: 578260fa-04c2-4965-bc38-057f5669524e -langcode: en -status: true -dependencies: { } -id: volunteer_training_session -label: 'Volunteer training attended' diff --git a/config/optional/views.view.activities.yml b/config/optional/views.view.activities.yml index af63af1..bdd9d74 100644 --- a/config/optional/views.view.activities.yml +++ b/config/optional/views.view.activities.yml @@ -5,6 +5,7 @@ dependencies: config: - user.role.authenticated module: + - datetime - opencase_entities - user id: activities @@ -23,6 +24,202 @@ display: display_options: title: Activities fields: + type: + id: type + table: oc_activity_field_data + field: type + relationship: none + group_type: group + admin_label: '' + entity_type: oc_activity + entity_field: type + plugin_id: field + label: 'Activity type' + 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: false + 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 + activity_date_time: + id: activity_date_time + table: oc_activity_field_data + field: activity_date_time + relationship: none + group_type: group + admin_label: '' + entity_type: oc_activity + entity_field: activity_date_time + plugin_id: field + label: Date + 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: datetime_default + settings: + timezone_override: '' + format_type: short + 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 + oc_provider: + id: oc_provider + table: oc_activity_field_data + field: oc_provider + relationship: none + group_type: group + admin_label: '' + entity_type: oc_activity + entity_field: oc_provider + plugin_id: field + label: Provider + 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 name: id: name table: oc_activity_field_data @@ -33,7 +230,7 @@ display: entity_type: null entity_field: name plugin_id: field - label: '' + label: Subject exclude: false alter: alter_text: false @@ -88,16 +285,17 @@ display: multi_type: separator separator: ', ' field_api_classes: false - delete_oc_activity: - id: delete_oc_activity - table: oc_activity - field: delete_oc_activity + description: + id: description + table: oc_activity_field_data + field: description relationship: none group_type: group admin_label: '' entity_type: oc_activity - plugin_id: entity_link_delete - label: 'Link to delete Activity' + entity_field: description + plugin_id: field + label: Notes exclude: false alter: alter_text: false @@ -138,9 +336,19 @@ display: hide_empty: false empty_zero: false hide_alter_empty: true - text: delete - output_url_as_text: false - absolute: false + click_sort_column: value + type: basic_string + settings: { } + group_column: value + group_columns: { } + group_rows: true + delta_limit: 0 + delta_offset: 0 + delta_reversed: false + delta_first_last: false + multi_type: separator + separator: ', ' + field_api_classes: false pager: type: mini options: From 5768d9187bc96ad102d4c0151e26f40920f9b648 Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 12 May 2022 17:49:09 +0100 Subject: [PATCH 07/24] removed css and js aggregation --- config/optional/system.performance.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/optional/system.performance.yml b/config/optional/system.performance.yml index cd81c18..6b57fb6 100644 --- a/config/optional/system.performance.yml +++ b/config/optional/system.performance.yml @@ -4,7 +4,7 @@ cache: page: max_age: 0 css: - preprocess: true + preprocess: false gzip: true fast_404: enabled: true @@ -12,6 +12,6 @@ fast_404: exclude_paths: '/\/(?:styles|imagecache)\//' html: '404 Not Found

Not Found

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

' js: - preprocess: true + preprocess: false gzip: true stale_file_threshold: 2592000 From 95c1d4970ee72d81e0d962f0eff6dfeb350e0628 Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 12 May 2022 18:08:15 +0100 Subject: [PATCH 08/24] improvements to actors view --- config/optional/views.view.actors.yml | 77 ++++++++++++++++++++++++++- 1 file changed, 76 insertions(+), 1 deletion(-) diff --git a/config/optional/views.view.actors.yml b/config/optional/views.view.actors.yml index 292f510..f51a403 100644 --- a/config/optional/views.view.actors.yml +++ b/config/optional/views.view.actors.yml @@ -87,6 +87,73 @@ display: multi_type: separator separator: ', ' field_api_classes: false + created: + id: created + table: oc_actor_field_data + field: created + relationship: none + group_type: group + admin_label: '' + entity_type: oc_actor + entity_field: created + plugin_id: field + label: 'Date added' + 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: timestamp + settings: + date_format: short + custom_date_format: '' + timezone: '' + 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: @@ -177,15 +244,23 @@ display: default_row_class: true columns: name: name + created: created default: '-1' info: name: - sortable: false + sortable: true default_sort_order: asc align: '' separator: '' empty_column: false responsive: '' + created: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: '' override: true sticky: false summary: '' From 44598d7a19689f1d921b2c65944096755809d692 Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 12 May 2022 18:14:10 +0100 Subject: [PATCH 09/24] fields on actor form and view displays --- ..._display.oc_actor.staff_member.default.yml | 79 +++++++++++++++++++ ...orm_display.oc_actor.volunteer.default.yml | 73 ++++------------- ..._display.oc_actor.staff_member.default.yml | 58 ++++++++++++++ ...iew_display.oc_actor.volunteer.default.yml | 33 ++------ 4 files changed, 159 insertions(+), 84 deletions(-) create mode 100644 config/optional/core.entity_form_display.oc_actor.staff_member.default.yml create mode 100644 config/optional/core.entity_view_display.oc_actor.staff_member.default.yml diff --git a/config/optional/core.entity_form_display.oc_actor.staff_member.default.yml b/config/optional/core.entity_form_display.oc_actor.staff_member.default.yml new file mode 100644 index 0000000..1f46f0f --- /dev/null +++ b/config/optional/core.entity_form_display.oc_actor.staff_member.default.yml @@ -0,0 +1,79 @@ +uuid: 56d178c9-a69d-42a7-8235-6ecce238a904 +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_actor_type.staff_member +id: oc_actor.staff_member.default +targetEntityType: oc_actor +bundle: staff_member +mode: default +content: + email: + type: string_textfield + weight: 2 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + first_name: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + last_name: + type: string_textfield + weight: 1 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + middle_names: + type: string_textfield + weight: 3 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + phone: + type: string_textfield + weight: 4 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + phone2: + type: string_textfield + weight: 5 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + post_code: + type: string_textfield + weight: 7 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + postal_address: + type: string_textarea + weight: 6 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } +hidden: + revision_log: true + status: true + user_id: true diff --git a/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml b/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml index 697215f..d8fd572 100644 --- a/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml +++ b/config/optional/core.entity_form_display.oc_actor.volunteer.default.yml @@ -10,8 +10,6 @@ dependencies: - field.field.oc_actor.volunteer.field_osic_level - field.field.oc_actor.volunteer.field_skills - opencase_entities.oc_actor_type.volunteer - module: - - hide_revision_field id: oc_actor.volunteer.default targetEntityType: oc_actor bundle: volunteer @@ -19,15 +17,7 @@ mode: default content: email: type: string_textfield - weight: -5 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } - field_ethnic_o: - type: string_textfield - weight: 81 + weight: 2 region: content settings: size: 60 @@ -35,7 +25,7 @@ content: third_party_settings: { } field_general_noes: type: string_textarea - weight: 5 + weight: 10 region: content settings: rows: 5 @@ -43,25 +33,19 @@ content: third_party_settings: { } field_languages_spoken: type: options_select - weight: 2 - region: content - settings: { } - third_party_settings: { } - field_nationalities: - type: options_select - weight: 1 + weight: 7 region: content settings: { } third_party_settings: { } field_osic_level: type: options_select - weight: 3 + weight: 8 region: content settings: { } third_party_settings: { } field_skills: type: string_textarea - weight: 4 + weight: 9 region: content settings: rows: 5 @@ -69,7 +53,7 @@ content: third_party_settings: { } first_name: type: string_textfield - weight: -100 + weight: 0 region: content settings: size: 60 @@ -77,15 +61,7 @@ content: third_party_settings: { } last_name: type: string_textfield - weight: -98 - region: content - settings: - size: 60 - placeholder: '' - third_party_settings: { } - middle_names: - type: string_textfield - weight: -99 + weight: 1 region: content settings: size: 60 @@ -101,7 +77,7 @@ content: third_party_settings: { } phone: type: string_textfield - weight: -4 + weight: 3 region: content settings: size: 60 @@ -109,7 +85,7 @@ content: third_party_settings: { } phone2: type: string_textfield - weight: -3 + weight: 4 region: content settings: size: 60 @@ -117,7 +93,7 @@ content: third_party_settings: { } post_code: type: string_textfield - weight: -1 + weight: 6 region: content settings: size: 60 @@ -125,34 +101,17 @@ content: third_party_settings: { } postal_address: type: string_textarea - weight: -2 - region: content - settings: - rows: 5 - placeholder: '' - third_party_settings: { } - revision_log: - type: hide_revision_field_log_widget - weight: 80 - region: content - settings: - rows: 5 - placeholder: '' - show: true - default: '' - permission_based: false - allow_user_settings: true - third_party_settings: { } - user_id: - type: entity_reference_autocomplete weight: 5 region: content settings: - match_operator: CONTAINS - match_limit: 10 - size: 60 + rows: 5 placeholder: '' third_party_settings: { } hidden: + field_ethnic_o: true + field_nationalities: true + middle_names: true + revision_log: true status: true + user_id: true user_login: true diff --git a/config/optional/core.entity_view_display.oc_actor.staff_member.default.yml b/config/optional/core.entity_view_display.oc_actor.staff_member.default.yml new file mode 100644 index 0000000..bced3c5 --- /dev/null +++ b/config/optional/core.entity_view_display.oc_actor.staff_member.default.yml @@ -0,0 +1,58 @@ +uuid: 67d86fb5-981d-4e62-866b-16921b71fa17 +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_actor_type.staff_member +id: oc_actor.staff_member.default +targetEntityType: oc_actor +bundle: staff_member +mode: default +content: + email: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content + phone: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 1 + region: content + phone2: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 2 + region: content + post_code: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 4 + region: content + postal_address: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 3 + region: content +hidden: + first_name: true + last_name: true + middle_names: true + search_api_excerpt: true + status: true + total_cases: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml b/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml index da4c0d7..4773c92 100644 --- a/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml +++ b/config/optional/core.entity_view_display.oc_actor.volunteer.default.yml @@ -25,29 +25,14 @@ content: third_party_settings: { } weight: 0 region: content - field_ethnic_o: - type: string - label: above - settings: - link_to_entity: false - third_party_settings: { } - weight: 10 - region: content field_general_noes: type: basic_string label: above settings: { } third_party_settings: { } - weight: 9 + weight: 8 region: content field_languages_spoken: - type: list_default - label: above - settings: { } - third_party_settings: { } - weight: 6 - region: content - field_nationalities: type: list_default label: above settings: { } @@ -59,7 +44,7 @@ content: label: above settings: { } third_party_settings: { } - weight: 7 + weight: 6 region: content field_sdfdsfds: type: text_default @@ -73,7 +58,7 @@ content: label: above settings: { } third_party_settings: { } - weight: 8 + weight: 7 region: content name: type: string @@ -114,19 +99,13 @@ content: third_party_settings: { } weight: 3 region: content - total_cases: - type: number_integer - label: above - settings: - thousand_separator: '' - prefix_suffix: true - third_party_settings: { } - weight: 11 - region: content hidden: + field_ethnic_o: true + field_nationalities: true first_name: true last_name: true middle_names: true search_api_excerpt: true status: true + total_cases: true user_id: true From 1e323d42f955681222390b0d02edb4799bf7535e Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 12 May 2022 18:20:23 +0100 Subject: [PATCH 10/24] actor search view fields --- config/optional/views.view.actor_search.yml | 225 +------------------- 1 file changed, 5 insertions(+), 220 deletions(-) diff --git a/config/optional/views.view.actor_search.yml b/config/optional/views.view.actor_search.yml index dee7363..f522b2e 100644 --- a/config/optional/views.view.actor_search.yml +++ b/config/optional/views.view.actor_search.yml @@ -28,14 +28,15 @@ display: fields: name: id: name - table: search_api_index_opencase_actors + table: search_api_datasource_opencase_actors_entity_oc_actor field: name relationship: none group_type: group admin_label: '' + entity_type: oc_actor plugin_id: search_api_field - label: 'Organisation name ' - exclude: true + label: Name + exclude: false alter: alter_text: false text: '' @@ -106,7 +107,7 @@ display: entity_type: oc_actor plugin_id: search_api_field label: 'Person type' - exclude: true + exclude: false alter: alter_text: false text: '' @@ -170,222 +171,6 @@ display: display_methods: oc_actor_type: display_method: label - type_1: - id: type_1 - table: search_api_datasource_opencase_actors_entity_oc_organisation - field: type - relationship: none - group_type: group - admin_label: '' - entity_type: oc_organisation - plugin_id: search_api_field - label: Type - exclude: false - alter: - alter_text: true - text: '{{ type }}{{ type_1 }}' - 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: '{{ type }}{{ type_1 }}' - hide_empty: false - empty_zero: false - hide_alter_empty: true - click_sort_column: target_id - type: entity_reference_label - settings: - link: false - 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 - field_rendering: true - fallback_handler: search_api_entity - fallback_options: - link_to_item: false - use_highlighting: false - multi_type: separator - multi_separator: ', ' - display_methods: - oc_organisation_type: - display_method: label - first_name: - id: first_name - table: search_api_datasource_opencase_actors_entity_oc_actor - field: first_name - relationship: none - group_type: group - admin_label: '' - entity_type: oc_actor - plugin_id: search_api_field - label: 'First 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: false - 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 - field_rendering: true - fallback_handler: search_api - fallback_options: - link_to_item: false - use_highlighting: false - multi_type: separator - multi_separator: ', ' - last_name: - id: last_name - table: search_api_datasource_opencase_actors_entity_oc_actor - field: last_name - relationship: none - group_type: group - admin_label: '' - entity_type: oc_actor - plugin_id: search_api_field - label: 'Last 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: false - 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 - field_rendering: true - fallback_handler: search_api - fallback_options: - link_to_item: false - use_highlighting: false - multi_type: separator - multi_separator: ', ' pager: type: mini options: From 44f40ce0da6fb43475b7ce0a52bedcae176d715a Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 12 May 2022 18:34:20 +0100 Subject: [PATCH 11/24] more on config for demo --- ...ent.volunteer_training_session.default.yml | 48 +++++++++++++++++++ ...ent.volunteer_training_session.default.yml | 42 ++++++++++++++++ 2 files changed, 90 insertions(+) create mode 100644 config/optional/core.entity_form_display.oc_event.volunteer_training_session.default.yml create mode 100644 config/optional/core.entity_view_display.oc_event.volunteer_training_session.default.yml diff --git a/config/optional/core.entity_form_display.oc_event.volunteer_training_session.default.yml b/config/optional/core.entity_form_display.oc_event.volunteer_training_session.default.yml new file mode 100644 index 0000000..5f9a566 --- /dev/null +++ b/config/optional/core.entity_form_display.oc_event.volunteer_training_session.default.yml @@ -0,0 +1,48 @@ +uuid: b512b25f-0fab-4582-88ee-ce7184c6b6c6 +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_event_type.volunteer_training_session + module: + - datetime +id: oc_event.volunteer_training_session.default +targetEntityType: oc_event +bundle: volunteer_training_session +mode: default +content: + activity_date_time: + type: datetime_default + weight: 1 + region: content + settings: { } + third_party_settings: { } + attendees: + type: entity_reference_autocomplete + weight: 3 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + description: + type: string_textarea + weight: 2 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + name: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + status: true + user_id: true diff --git a/config/optional/core.entity_view_display.oc_event.volunteer_training_session.default.yml b/config/optional/core.entity_view_display.oc_event.volunteer_training_session.default.yml new file mode 100644 index 0000000..c5b0d01 --- /dev/null +++ b/config/optional/core.entity_view_display.oc_event.volunteer_training_session.default.yml @@ -0,0 +1,42 @@ +uuid: 2018da40-3ab6-436f-8f34-8544ac73fb29 +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_event_type.volunteer_training_session + module: + - datetime +id: oc_event.volunteer_training_session.default +targetEntityType: oc_event +bundle: volunteer_training_session +mode: default +content: + activity_date_time: + type: datetime_default + label: above + settings: + timezone_override: '' + format_type: medium + third_party_settings: { } + weight: 0 + region: content + attendees: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 2 + region: content + description: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 1 + region: content +hidden: + name: true + search_api_excerpt: true + status: true + user_id: true From 1a1cfb0a2d3a6d4feaf994a86b9c453a76da9b07 Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 12 May 2022 18:38:02 +0100 Subject: [PATCH 12/24] more config for demo --- ...ay.oc_equal_opps.oc_equal_opps.default.yml | 57 ++++++++++++++++++ ...ay.oc_equal_opps.oc_equal_opps.default.yml | 59 +++++++++++++++++++ 2 files changed, 116 insertions(+) create mode 100644 config/optional/core.entity_form_display.oc_equal_opps.oc_equal_opps.default.yml create mode 100644 config/optional/core.entity_view_display.oc_equal_opps.oc_equal_opps.default.yml diff --git a/config/optional/core.entity_form_display.oc_equal_opps.oc_equal_opps.default.yml b/config/optional/core.entity_form_display.oc_equal_opps.oc_equal_opps.default.yml new file mode 100644 index 0000000..9d5f076 --- /dev/null +++ b/config/optional/core.entity_form_display.oc_equal_opps.oc_equal_opps.default.yml @@ -0,0 +1,57 @@ +uuid: 9282eb8d-96fa-4c3a-a0ea-abbdc763efa0 +langcode: en +status: true +dependencies: + module: + - opencase_entities +id: oc_equal_opps.oc_equal_opps.default +targetEntityType: oc_equal_opps +bundle: oc_equal_opps +mode: default +content: + access_needs: + type: string_textarea + weight: 2 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + age: + type: options_select + weight: 1 + region: content + settings: { } + third_party_settings: { } + gender: + type: options_select + weight: 3 + region: content + settings: { } + third_party_settings: { } + oc_actor: + type: entity_reference_autocomplete + weight: 0 + region: content + settings: + match_operator: CONTAINS + match_limit: 10 + size: 60 + placeholder: '' + third_party_settings: { } + race_ethnicity: + type: options_select + weight: 4 + region: content + settings: { } + third_party_settings: { } + sexuality: + type: string_textfield + weight: 5 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + name: true diff --git a/config/optional/core.entity_view_display.oc_equal_opps.oc_equal_opps.default.yml b/config/optional/core.entity_view_display.oc_equal_opps.oc_equal_opps.default.yml new file mode 100644 index 0000000..b352ce9 --- /dev/null +++ b/config/optional/core.entity_view_display.oc_equal_opps.oc_equal_opps.default.yml @@ -0,0 +1,59 @@ +uuid: a943f9cf-97d5-47e4-99dd-bef53045f497 +langcode: en +status: true +dependencies: + module: + - opencase_entities + - options +id: oc_equal_opps.oc_equal_opps.default +targetEntityType: oc_equal_opps +bundle: oc_equal_opps +mode: default +content: + access_needs: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 2 + region: content + age: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 1 + region: content + gender: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 3 + region: content + oc_actor: + type: entity_reference_label + label: above + settings: + link: true + third_party_settings: { } + weight: 0 + region: content + race_ethnicity: + type: list_default + label: above + settings: { } + third_party_settings: { } + weight: 4 + region: content + sexuality: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 5 + region: content +hidden: + name: true + search_api_excerpt: true From 8d50660e88c4a4075bf13afa1fee00237f838021 Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 12 May 2022 18:42:21 +0100 Subject: [PATCH 13/24] more of the same --- config/optional/views.view.equal_opps_records.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/config/optional/views.view.equal_opps_records.yml b/config/optional/views.view.equal_opps_records.yml index 4907291..9cfac80 100644 --- a/config/optional/views.view.equal_opps_records.yml +++ b/config/optional/views.view.equal_opps_records.yml @@ -7,7 +7,6 @@ dependencies: module: - opencase_entities - user - - views_autosubmit _core: default_config_hash: eYcO9ivZP8SZgdNDXedppm0USNqwvJM7jFy6LOV6tcg id: equal_opps_records @@ -110,7 +109,7 @@ display: offset: false offset_label: Offset exposed_form: - type: autosubmit + type: input_required options: submit_button: Apply reset_button: false @@ -119,7 +118,8 @@ display: expose_sort_order: true sort_asc_label: Asc sort_desc_label: Desc - autosubmit_hide: true + text_input_required: '' + text_input_required_format: basic_html access: type: perm options: From bec63239f8d3c03b3fa848c6265d497e77066bcf Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 13 May 2022 11:28:02 +0100 Subject: [PATCH 14/24] Added perms to auth user role --- config/optional/user.role.authenticated.yml | 32 +++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/config/optional/user.role.authenticated.yml b/config/optional/user.role.authenticated.yml index 72bdcb5..abdeec2 100644 --- a/config/optional/user.role.authenticated.yml +++ b/config/optional/user.role.authenticated.yml @@ -8,6 +8,8 @@ dependencies: - comment - contact - filter + - opencase + - opencase_entities - search - shortcut - system @@ -22,7 +24,37 @@ permissions: - 'access content' - 'access shortcuts' - 'access site-wide contact form' + - 'add activity entities' + - 'add case entities' + - 'add client entities' + - 'add equal opps entities' + - 'add event entities' + - 'add staff_member entities' + - 'add volunteer entities' + - 'edit activity entities' + - 'edit bank account entities' + - 'edit case entities' + - 'edit client entities' + - 'edit equal opps entities' + - 'edit event entities' + - 'edit staff_member entities' + - 'edit volunteer entities' - 'post comments' + - 'revert all activity revisions' + - 'revert all client revisions' + - 'revert all staff_member revisions' + - 'revert all volunteer revisions' - 'search content' - 'skip comment approval' + - 'use opencase' - 'use text format basic_html' + - 'view all activity revisions' + - 'view all client revisions' + - 'view all staff_member revisions' + - 'view all volunteer revisions' + - 'view published activity entities' + - 'view published client entities' + - 'view published equal opps entities' + - 'view published event entities' + - 'view published staff_member entities' + - 'view published volunteer entities' From c3e6f05b21e16e65d16af544320eafe3df1b8a93 Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 13 May 2022 11:37:31 +0100 Subject: [PATCH 15/24] "view published activities" now means all of them --- .../opencase_entities/src/OCActivityAccessControlHandler.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/opencase_entities/src/OCActivityAccessControlHandler.php b/modules/opencase_entities/src/OCActivityAccessControlHandler.php index 63591a0..db16d7f 100644 --- a/modules/opencase_entities/src/OCActivityAccessControlHandler.php +++ b/modules/opencase_entities/src/OCActivityAccessControlHandler.php @@ -25,12 +25,12 @@ class OCActivityAccessControlHandler extends EntityAccessControlHandler { return AccessResult::allowedIfHasPermission($account, 'view unpublished activity entities'); } return AccessResult::allowedIf( - $account->hasPermission('view published case entities') // activity permissions are inherited from case + $account->hasPermission('view published activity entities') || $entity->getOwner()->id() == $account->id() ); case 'update': // allowed only if a) they can see the case the activity is on and b) they can edit activities return AccessResult::allowedIf( - $account->hasPermission('edit activity entities') // activity permissions are inherited from case + $account->hasPermission('edit activity entities') || $entity->getOwner()->id() == $account->id() ); case 'delete': // allowed only if a) they can see the case the activity is on and b) they can delete activities From 42f4b124d0a3c3efb3186b3e8057706a3622f7b4 Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 13 May 2022 11:53:25 +0100 Subject: [PATCH 16/24] pluralised "partner organisations" --- config/optional/user.role.authenticated.yml | 5 +++++ config/optional/views.view.organisations.yml | 4 ++-- src/Plugin/Derivative/SeeAllOrganisationsMenuLink.php | 2 +- 3 files changed, 8 insertions(+), 3 deletions(-) diff --git a/config/optional/user.role.authenticated.yml b/config/optional/user.role.authenticated.yml index abdeec2..63d6e2d 100644 --- a/config/optional/user.role.authenticated.yml +++ b/config/optional/user.role.authenticated.yml @@ -37,11 +37,13 @@ permissions: - 'edit client entities' - 'edit equal opps entities' - 'edit event entities' + - 'edit organisation entities' - 'edit staff_member entities' - 'edit volunteer entities' - 'post comments' - 'revert all activity revisions' - 'revert all client revisions' + - 'revert all organisation revisions' - 'revert all staff_member revisions' - 'revert all volunteer revisions' - 'search content' @@ -50,11 +52,14 @@ permissions: - 'use text format basic_html' - 'view all activity revisions' - 'view all client revisions' + - 'view all organisation revisions' - 'view all staff_member revisions' - 'view all volunteer revisions' - 'view published activity entities' - 'view published client entities' - 'view published equal opps entities' - 'view published event entities' + - 'view published organisation entities' + - 'view published organisation relation entities' - 'view published staff_member entities' - 'view published volunteer entities' diff --git a/config/optional/views.view.organisations.yml b/config/optional/views.view.organisations.yml index ec52507..dfa18c6 100644 --- a/config/optional/views.view.organisations.yml +++ b/config/optional/views.view.organisations.yml @@ -143,7 +143,7 @@ display: title_enable: false title: All title_enable: true - title: '{{ arguments.type }}' + title: '{{ arguments.type }}s' default_argument_type: raw default_argument_options: index: 1 @@ -165,7 +165,7 @@ display: validate_options: { } glossary: false limit: 0 - case: none + case: ucfirst path_case: none transform_dash: false break_phrase: false diff --git a/src/Plugin/Derivative/SeeAllOrganisationsMenuLink.php b/src/Plugin/Derivative/SeeAllOrganisationsMenuLink.php index c563a80..ffb349f 100644 --- a/src/Plugin/Derivative/SeeAllOrganisationsMenuLink.php +++ b/src/Plugin/Derivative/SeeAllOrganisationsMenuLink.php @@ -45,7 +45,7 @@ class SeeAllOrganisationsMenuLink extends DeriverBase implements ContainerDerive $organisationTypes = $this->entityTypeManager->getStorage('oc_organisation_type')->loadMultiple(); foreach ($organisationTypes as $id => $organisationType) { $links[$id] = [ - 'title' => $organisationType->label(), + 'title' => \Drupal\opencase\Pluraliser::pluralise($organisationType->label()), 'route_name' => "view.organisations.page_1", 'route_parameters' => ['type' => $organisationType->id()] ] + $base_plugin_definition; From c65295be62034155405fafb90e926e51997153f9 Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 13 May 2022 11:54:51 +0100 Subject: [PATCH 17/24] standardised abbrev: equal opps --- opencase.links.menu.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opencase.links.menu.yml b/opencase.links.menu.yml index 156c316..7b8247f 100644 --- a/opencase.links.menu.yml +++ b/opencase.links.menu.yml @@ -39,7 +39,7 @@ opencase.add_events_links: menu_name: opencase parent: opencase.opencase_add_new_things_menu opencase.add_equal_opps: - title: 'Equal Opportunies record' + title: 'Equal Opps record' menu_name: opencase url: internal:/opencase/oc_equal_opps/add parent: opencase.opencase_add_new_things_menu From e5b01eac5355a99c0dc2e49563040b8a02c0b18f Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 13 May 2022 11:59:04 +0100 Subject: [PATCH 18/24] and lower-cased --- ...ncase_entities.oc_organisation_type.partner_organisation.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config/optional/opencase_entities.oc_organisation_type.partner_organisation.yml b/config/optional/opencase_entities.oc_organisation_type.partner_organisation.yml index d5d0738..5b6b37e 100644 --- a/config/optional/opencase_entities.oc_organisation_type.partner_organisation.yml +++ b/config/optional/opencase_entities.oc_organisation_type.partner_organisation.yml @@ -3,4 +3,4 @@ langcode: en status: true dependencies: { } id: partner_organisation -label: 'Partner Organisation' +label: 'Partner organisation' From 559ff4d83b22687c6a97788fbb2aa7d007d12b24 Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 13 May 2022 13:21:13 +0100 Subject: [PATCH 19/24] Filtering types in AddActivity block by actor type --- config/optional/core.extension.yml | 1 + config/optional/views.view.activities.yml | 146 +++++++++++++++++++++- opencase.module | 13 ++ src/Plugin/Block/AddActivity.php | 19 ++- 4 files changed, 176 insertions(+), 3 deletions(-) diff --git a/config/optional/core.extension.yml b/config/optional/core.extension.yml index b48be27..22ae288 100644 --- a/config/optional/core.extension.yml +++ b/config/optional/core.extension.yml @@ -81,6 +81,7 @@ module: views_aggregator: 0 views_aggregator_more_functions: 0 views_autosubmit: 0 + views_contextual_filters_or: 0 views_data_export: 0 views_summarize: 0 views_ui: 0 diff --git a/config/optional/views.view.activities.yml b/config/optional/views.view.activities.yml index bdd9d74..714863d 100644 --- a/config/optional/views.view.activities.yml +++ b/config/optional/views.view.activities.yml @@ -155,6 +155,71 @@ display: multi_type: separator separator: ', ' field_api_classes: false + oc_target: + id: oc_target + table: oc_activity_field_data + field: oc_target + relationship: none + group_type: group + admin_label: '' + entity_type: oc_activity + entity_field: oc_target + plugin_id: field + label: Target + 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_provider: id: oc_provider table: oc_activity_field_data @@ -426,6 +491,44 @@ display: validate_options: { } break_phrase: false not: false + oc_provider: + id: oc_provider + table: oc_activity_field_data + field: oc_provider + relationship: none + group_type: group + admin_label: '' + entity_type: oc_activity + entity_field: oc_provider + plugin_id: numeric + default_action: default + exception: + value: all + title_enable: false + title: All + title_enable: false + title: '' + default_argument_type: raw + default_argument_options: + index: 2 + 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: { } + break_phrase: false + not: false filters: { } style: type: table @@ -434,11 +537,51 @@ display: row_class: '' default_row_class: true columns: + type: type + activity_date_time: activity_date_time + oc_target: oc_target + oc_provider: oc_provider name: name + description: description default: '-1' info: + type: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + activity_date_time: + sortable: true + default_sort_order: desc + align: '' + separator: '' + empty_column: false + responsive: '' + oc_target: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + oc_provider: + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' name: - sortable: false + sortable: true + default_sort_order: asc + align: '' + separator: '' + empty_column: false + responsive: '' + description: + sortable: true default_sort_order: asc align: '' separator: '' @@ -465,6 +608,7 @@ display: distinct: false replica: false query_tags: { } + contextual_filters_or: true relationships: { } header: { } footer: { } diff --git a/opencase.module b/opencase.module index 5fa0d87..cb90300 100644 --- a/opencase.module +++ b/opencase.module @@ -127,6 +127,19 @@ function opencase_entity_field_access($operation, \Drupal\Core\Field\FieldDefini return AccessResult::neutral(); } +/* + Implementation of hook_relevant_activity_type_ids which is a custom hook invoked in the AddActivity block. +*/ +function opencase_relevant_activity_type_ids($actorTypeID) { + switch ($actorTypeID) { + case 'volunteer': + return ['email', 'phone_call', 'supervision']; + case 'client': + return ['email', 'lete', 'phone_call', 'case_note', 'destitution_funds_provided', 'research', 'application']; + case 'staff_member': + return ['application', 'interview']; + } +} /** * Implementation of hook_form_alter() diff --git a/src/Plugin/Block/AddActivity.php b/src/Plugin/Block/AddActivity.php index 8150b5c..0f32ce5 100644 --- a/src/Plugin/Block/AddActivity.php +++ b/src/Plugin/Block/AddActivity.php @@ -19,9 +19,11 @@ class AddActivity extends BlockBase { * {@inheritdoc} */ public function build():array { - $target_id = \Drupal::routeMatch()->getParameter('oc_actor')->id(); - $activity_types = \Drupal::service('entity_type.bundle.info')->getBundleInfo('oc_activity'); + $actor = \Drupal::routeMatch()->getParameter('oc_actor'); + $target_id = $actor->id(); + $actorType = $actor->bundle(); $markup = "
    "; + $activity_types = $this->getActivityTypesToDisplay($actorType); foreach($activity_types as $id => $info) { $label = $info['label']; $markup .= "
  • $label
    • "; @@ -34,4 +36,17 @@ class AddActivity extends BlockBase { return 0; } + private function getActivityTypesToDisplay(string $actorType): array { + // Client modules will provide a list of what activity types (bundles) are relevant for each actor type. + // Check if they are implemented, and if so display them. + $implemented_activity_types = \Drupal::service('entity_type.bundle.info')->getBundleInfo('oc_activity'); + $relevant_activity_type_ids = \Drupal::moduleHandler()->invokeAll('relevant_activity_type_ids', [$actorType]); + $activity_types_to_display = []; + foreach ($relevant_activity_type_ids as $type_id) { + if (array_key_exists($type_id, $implemented_activity_types)) { + $activity_types_to_display[$type_id] = $implemented_activity_types[$type_id]; + } + } + return $activity_types_to_display; + } } From b0f3376c82a736f7d57bf53db01223063f804954 Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 13 May 2022 13:30:02 +0100 Subject: [PATCH 20/24] sorting actors by name --- config/optional/views.view.actors.yml | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/config/optional/views.view.actors.yml b/config/optional/views.view.actors.yml index f51a403..d67fa8c 100644 --- a/config/optional/views.view.actors.yml +++ b/config/optional/views.view.actors.yml @@ -191,7 +191,22 @@ display: type: tag options: { } empty: { } - sorts: { } + sorts: + 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: standard + order: ASC + expose: + label: '' + field_identifier: '' + exposed: false arguments: type: id: type From f532286802fb00698ba6cda839c40d23b7397193 Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 13 May 2022 13:39:38 +0100 Subject: [PATCH 21/24] allow authuser to add orgs --- config/optional/user.role.authenticated.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/config/optional/user.role.authenticated.yml b/config/optional/user.role.authenticated.yml index 63d6e2d..9019baf 100644 --- a/config/optional/user.role.authenticated.yml +++ b/config/optional/user.role.authenticated.yml @@ -29,6 +29,7 @@ permissions: - 'add client entities' - 'add equal opps entities' - 'add event entities' + - 'add organisation entities' - 'add staff_member entities' - 'add volunteer entities' - 'edit activity entities' From e5358503f40cf279cc1ee2e811c313cd14dcca98 Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 13 May 2022 13:41:22 +0100 Subject: [PATCH 22/24] config for orgs --- ...anisation.partner_organisation.default.yml | 65 +++++++++++++++++++ ...anisation.partner_organisation.default.yml | 57 ++++++++++++++++ 2 files changed, 122 insertions(+) create mode 100644 config/optional/core.entity_form_display.oc_organisation.partner_organisation.default.yml create mode 100644 config/optional/core.entity_view_display.oc_organisation.partner_organisation.default.yml diff --git a/config/optional/core.entity_form_display.oc_organisation.partner_organisation.default.yml b/config/optional/core.entity_form_display.oc_organisation.partner_organisation.default.yml new file mode 100644 index 0000000..24fbc7c --- /dev/null +++ b/config/optional/core.entity_form_display.oc_organisation.partner_organisation.default.yml @@ -0,0 +1,65 @@ +uuid: ac6da2f0-4de2-4e8d-baf6-f7229b42616f +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_organisation_type.partner_organisation + module: + - file +id: oc_organisation.partner_organisation.default +targetEntityType: oc_organisation +bundle: partner_organisation +mode: default +content: + contact_name: + type: string_textfield + weight: 3 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + email: + type: string_textfield + weight: 4 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + name: + type: string_textfield + weight: 0 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } + notes: + type: string_textarea + weight: 2 + region: content + settings: + rows: 5 + placeholder: '' + third_party_settings: { } + website: + type: string_textfield + weight: 1 + region: content + settings: + size: 60 + placeholder: '' + third_party_settings: { } +hidden: + billing_contact_name: true + billing_email: true + billing_phone: true + billing_post_code: true + billing_postal_address: true + contact_role: true + phone: true + post_code: true + postal_address: true + revision_log: true + status: true diff --git a/config/optional/core.entity_view_display.oc_organisation.partner_organisation.default.yml b/config/optional/core.entity_view_display.oc_organisation.partner_organisation.default.yml new file mode 100644 index 0000000..1f1ea68 --- /dev/null +++ b/config/optional/core.entity_view_display.oc_organisation.partner_organisation.default.yml @@ -0,0 +1,57 @@ +uuid: 96b9f3c8-1433-4915-9656-4547eb1bc899 +langcode: en +status: true +dependencies: + config: + - opencase_entities.oc_organisation_type.partner_organisation + module: + - file +id: oc_organisation.partner_organisation.default +targetEntityType: oc_organisation +bundle: partner_organisation +mode: default +content: + contact_name: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 2 + region: content + email: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 3 + region: content + notes: + type: basic_string + label: above + settings: { } + third_party_settings: { } + weight: 1 + region: content + website: + type: string + label: above + settings: + link_to_entity: false + third_party_settings: { } + weight: 0 + region: content +hidden: + billing_contact_name: true + billing_email: true + billing_phone: true + billing_post_code: true + billing_postal_address: true + contact_role: true + name: true + phone: true + post_code: true + postal_address: true + search_api_excerpt: true + status: true From 19e0718fb832fd32197b6da0a6fa421cec05943d Mon Sep 17 00:00:00 2001 From: naomi Date: Fri, 13 May 2022 14:18:17 +0100 Subject: [PATCH 23/24] added strict type declaration --- src/Plugin/Block/AddActivity.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Plugin/Block/AddActivity.php b/src/Plugin/Block/AddActivity.php index 0f32ce5..84b7d0a 100644 --- a/src/Plugin/Block/AddActivity.php +++ b/src/Plugin/Block/AddActivity.php @@ -1,4 +1,4 @@ - Date: Fri, 13 May 2022 17:46:29 +0100 Subject: [PATCH 24/24] refactored time based field update stuff --- src/EmailAlerter.php | 3 +-- src/TimeBasedFieldUpdater.php | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/EmailAlerter.php b/src/EmailAlerter.php index 17cfbd6..cda6b5d 100644 --- a/src/EmailAlerter.php +++ b/src/EmailAlerter.php @@ -4,9 +4,8 @@ namespace Drupal\opencase; use Drupal\user\Entity\User; class EmailAlerter { - public function send_email_to_users_with_role(array $params, string $key, string $role): void { + public function send_email_to_users_with_role(array $params, string $key, string $role, string $module): void { $mailManager = \Drupal::service('plugin.manager.mail'); - $module = 'goodnightout_opencase'; $to = implode(',', $this->get_email_addresses_of_users_with_role($role)); $send = true; $result = $mailManager->mail($module, $key, $to, NULL, $params, NULL, $send); diff --git a/src/TimeBasedFieldUpdater.php b/src/TimeBasedFieldUpdater.php index 2195946..ffe4794 100644 --- a/src/TimeBasedFieldUpdater.php +++ b/src/TimeBasedFieldUpdater.php @@ -4,28 +4,28 @@ namespace Drupal\opencase; use Drupal; final class TimeBasedFieldUpdater { - private string $date_field; + private string $date_field_to_compare; private string $entity_type; - private array $conditions; + private array $where; private string $date_format; - final public function __construct($entity_type, $date_field, $conditions = [], $date_format = 'Y-m-d') + final public function __construct($entity_type, $where = [], $date_field_to_compare, $date_format = 'Y-m-d') { - $this->date_field = $date_field; - $this->conditions = $conditions; + $this->date_field_to_compare = $date_field_to_compare; + $this->where = $where; $this->date_format = $date_format; $this->entity_type = $entity_type; } final public function update($time_elapsed, $old_values, $new_values): void { $query = Drupal::entityQuery($this->entity_type); - foreach($this->conditions as $cond_field=>$cond_value) { + foreach($this->where as $cond_field=>$cond_value) { $query->condition($cond_field, $cond_value); } foreach($old_values as $old_field=>$old_value) { $query->condition($old_field, $old_value); } - $query->condition($this->date_field, date($this->date_format, strtotime('-'.$time_elapsed)), "<"); + $query->condition($this->date_field_to_compare, date($this->date_format, strtotime('-'.$time_elapsed)), "<"); foreach($query->execute() as $id) { $entity = Drupal::entityTypeManager()->getStorage($this->entity_type)->load($id); foreach($new_values as $new_field=>$new_value) {