From 27e7e3ae2ab9a20496ca6efcb2f045b30f29c330 Mon Sep 17 00:00:00 2001 From: naomi Date: Sat, 4 Dec 2021 11:18:36 +0000 Subject: [PATCH] removed stuff to do with allowed activity types. --- ...case_cases.oc_case_type.asylum_support.yml | 10 --- ...ncase_cases.oc_case_type.employability.yml | 10 --- .../opencase_cases.oc_case_type.enquiry.yml | 11 --- .../opencase_cases.oc_case_type.health.yml | 10 --- ...pencase_cases.oc_case_type.immigration.yml | 10 --- ...case_type.pro_bono_immigration_service.yml | 10 --- ...ases.oc_case_type.volunteer_engagement.yml | 11 --- ...case_cases.oc_case_type.welfare_rights.yml | 10 --- .../opencase_defaults.module | 19 ----- .../src/EntityTypeRelations.php | 17 ----- .../src/EntityTypeRelationsWidget.php | 76 ------------------- 11 files changed, 194 deletions(-) delete mode 100644 modules/opencase_defaults/src/EntityTypeRelations.php delete mode 100644 modules/opencase_defaults/src/EntityTypeRelationsWidget.php diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.asylum_support.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.asylum_support.yml index 076f8f9..44d43da 100644 --- a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.asylum_support.yml +++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.asylum_support.yml @@ -3,13 +3,3 @@ status: true dependencies: { } id: asylum_support label: 'Asylum support' -allowedActivityTypes: - application: application - case_note: case_note - destitution_funds_provided: destitution_funds_provided - email: email - interview: interview - lete: lete - research: research - telephone_call: telephone_call - volunteer_training_session: 0 diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.employability.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.employability.yml index 7a7b600..66cdf51 100644 --- a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.employability.yml +++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.employability.yml @@ -3,13 +3,3 @@ status: true dependencies: { } id: employability label: Employability -allowedActivityTypes: - application: application - case_note: case_note - destitution_funds_provided: destitution_funds_provided - email: email - interview: interview - lete: lete - research: research - telephone_call: telephone_call - volunteer_training_session: 0 diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.enquiry.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.enquiry.yml index f5777b4..9c00b54 100644 --- a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.enquiry.yml +++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.enquiry.yml @@ -4,14 +4,3 @@ status: true dependencies: { } id: enquiry label: Enquiry -allowedActivityTypes: - application: 0 - case_note: 0 - destitution_funds_provided: 0 - email: 0 - interview: 0 - lete: 0 - research: 0 - supervision: 0 - telephone_call: 0 - volunteer_training_session: 0 diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.health.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.health.yml index d63b67a..9e87ac9 100644 --- a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.health.yml +++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.health.yml @@ -3,13 +3,3 @@ status: true dependencies: { } id: health label: Health -allowedActivityTypes: - application: application - case_note: case_note - destitution_funds_provided: destitution_funds_provided - email: email - interview: interview - lete: lete - research: research - telephone_call: telephone_call - volunteer_training_session: 0 diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.immigration.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.immigration.yml index b42ede7..3e925f8 100644 --- a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.immigration.yml +++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.immigration.yml @@ -3,13 +3,3 @@ status: true dependencies: { } id: immigration label: Immigration -allowedActivityTypes: - application: application - case_note: case_note - destitution_funds_provided: destitution_funds_provided - email: email - interview: interview - lete: lete - research: research - telephone_call: telephone_call - volunteer_training_session: 0 diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml index ea96589..f882d2d 100644 --- a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml +++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.pro_bono_immigration_service.yml @@ -4,13 +4,3 @@ status: true dependencies: { } id: pro_bono_immigration_service label: 'Pro Bono Immigration Service' -allowedActivityTypes: - application: application - case_note: case_note - destitution_funds_provided: destitution_funds_provided - email: email - interview: interview - lete: lete - research: research - telephone_call: telephone_call - volunteer_training_session: 0 diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.volunteer_engagement.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.volunteer_engagement.yml index 6104d5f..d102114 100644 --- a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.volunteer_engagement.yml +++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.volunteer_engagement.yml @@ -3,14 +3,3 @@ status: true dependencies: { } id: volunteer_engagement label: 'Volunteer Engagement' -allowedActivityTypes: - application: application - case_note: case_note - email: email - interview: interview - lete: lete - research: research - supervision: supervision - telephone_call: telephone_call - volunteer_training_session: volunteer_training_session - destitution_funds_provided: 0 diff --git a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.welfare_rights.yml b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.welfare_rights.yml index c6742e5..59d44df 100644 --- a/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.welfare_rights.yml +++ b/modules/opencase_defaults/config/optional/opencase_cases.oc_case_type.welfare_rights.yml @@ -3,13 +3,3 @@ status: true dependencies: { } id: welfare_rights label: 'Welfare Rights' -allowedActivityTypes: - application: application - case_note: case_note - destitution_funds_provided: destitution_funds_provided - email: email - interview: interview - lete: lete - research: research - telephone_call: telephone_call - volunteer_training_session: 0 diff --git a/modules/opencase_defaults/opencase_defaults.module b/modules/opencase_defaults/opencase_defaults.module index 1edd2b5..4b7562b 100644 --- a/modules/opencase_defaults/opencase_defaults.module +++ b/modules/opencase_defaults/opencase_defaults.module @@ -10,7 +10,6 @@ use Drupal\Core\Field\BaseFieldDefinition; use Drupal\Core\Routing\RouteMatchInterface; use Drupal\user\Entity\Role; use Drupal\user\RoleInterface; -use Drupal\opencase_defaults\EntityTypeRelationsWidget; /** * Implements hook_help(). @@ -59,21 +58,3 @@ function opencase_defaults_entity_base_field_info($entity_type) { return $fields; } -/** - * Implements hook_form_ID_alter - */ -function opencase_defaults_form_oc_case_type_add_form_alter(&$form, $form_state) { - $widget = new EntityTypeRelationsWidget(); - $widget->setup($form); -} - - -/** - * Implements hook_form_ID_alter - */ -function opencase_defaults_form_oc_case_type_edit_form_alter(&$form, $form_state) { - $widget = new EntityTypeRelationsWidget(); - $widget->setup($form); - $widget->populate($form); -} - diff --git a/modules/opencase_defaults/src/EntityTypeRelations.php b/modules/opencase_defaults/src/EntityTypeRelations.php deleted file mode 100644 index c675bd2..0000000 --- a/modules/opencase_defaults/src/EntityTypeRelations.php +++ /dev/null @@ -1,17 +0,0 @@ -getStorage('oc_case_type')->load($case_type); - $allowedActivityTypes = $caseTypeConfig->get('allowedActivityTypes'); // format: ['application' => 'application', 'interview' => 0] - if (!$allowedActivityTypes) $allowedActivityTypes = array(); - return $allowedActivityTypes; - } -} diff --git a/modules/opencase_defaults/src/EntityTypeRelationsWidget.php b/modules/opencase_defaults/src/EntityTypeRelationsWidget.php deleted file mode 100644 index bdab897..0000000 --- a/modules/opencase_defaults/src/EntityTypeRelationsWidget.php +++ /dev/null @@ -1,76 +0,0 @@ -getBundleInfo('oc_actor'); - # $options = array(); - # foreach($actor_types as $machine_name => $info) { - # $options[$machine_name] = $info['label']; - # } - # $form['allowed_actor_types'] = array( - # '#title' => t('Allowed involved parties'), - # '#description' => t('Types of people that can be involved in this kind of case.'), - # '#type' => 'checkboxes', - # '#options' => $options - # ); - $activity_types = \Drupal::service('entity_type.bundle.info')->getBundleInfo('oc_activity'); - $options = array(); - foreach($activity_types as $machine_name => $info) { - $options[$machine_name] = $info['label']; - } - $form['allowed_activity_types'] = array( - '#title' => t('Activity types'), - '#description' => t('Types of activities that can be logged against this case.'), - '#type' => 'checkboxes', - '#options' => $options - ); - $form['actions']['submit']['#submit'][] = array($this, 'submit'); - } - - /** - * Populates the form with actor/activity types that are already set - * - * $form - the form to be modified (reference) - */ - public function populate(&$form) { - $case_type = $form['id']['#default_value']; -# $allowedActorTypes = EntityTypeRelations::getAllowedActorTypesForCaseType($case_type); -# $form['allowed_actor_types']['#default_value'] = $allowedActorTypes; - $allowedActivityTypes = EntityTypeRelations::getAllowedActivityTypesForCaseType($case_type); - $form['allowed_activity_types']['#default_value'] = $allowedActivityTypes; - } - - /** - * Submit callback which takes the data from the actor types and activity types fields and - * creates/edits the relevant config objects - * - * $form - the form that is being submitted - * $form_state - the data in the form - */ - public function submit($form, $form_state) { - $case_type_machine_name = $form['id']['#default_value'] ? $form['id']['#default_value'] : $form_state->getValue('id'); -# $base_field_override = \Drupal\Core\Field\Entity\BaseFieldOverride::load("oc_case.$case_type_machine_name.actors_involved"); -# if (!$base_field_override) { -# $entity_fields = \Drupal::service('entity_field.manager')->getBaseFieldDefinitions('oc_case'); -# $field_definition = $entity_fields['actors_involved']; -# $base_field_override = \Drupal\Core\field\Entity\BaseFieldOverride::createFromBaseFieldDefinition($field_definition, $case_type_machine_name); -# } -# $base_field_override->setSetting('handler_settings', ['target_bundles' => $form_state->getValue('allowed_actor_types')]); -# $base_field_override->save(); - $caseTypeConfig = \Drupal::entityTypeManager()->getStorage('oc_case_type')->load($case_type_machine_name); - $caseTypeConfig->set('allowedActivityTypes', $form_state->getValue('allowed_activity_types')); - $caseTypeConfig->save(); - } -}