From aa0c350766994e5a1f0288496b788019896444df Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 21 Apr 2022 08:46:13 +0100 Subject: [PATCH 1/4] Added links to admin menu for managing taxonomies --- opencase.links.menu.yml | 5 ++ .../Derivative/ManageTaxonomyMenuLink.php | 52 +++++++++++++++++++ src/Plugin/Menu/ManageTaxonomyMenuLink.php | 6 +++ 3 files changed, 63 insertions(+) create mode 100644 src/Plugin/Derivative/ManageTaxonomyMenuLink.php create mode 100644 src/Plugin/Menu/ManageTaxonomyMenuLink.php diff --git a/opencase.links.menu.yml b/opencase.links.menu.yml index 3eb8ffc..046bdc4 100644 --- a/opencase.links.menu.yml +++ b/opencase.links.menu.yml @@ -40,6 +40,11 @@ opencase.opencase_admin_menu: route_name: opencase.opencase_admin_menu menu_name: opencase weight: 100 +opencase.manage_taxonomy_links: + class: Drupal\opencase\Plugin\Menu\ManageTaxonomyMenuLink + deriver: Drupal\opencase\Plugin\Derivative\ManageTaxonomyMenuLink + menu_name: opencase + parent: opencase.opencase_admin_menu opencase.manage_user_logins: title: 'Manage user logins' description: 'Manage who can access the system' diff --git a/src/Plugin/Derivative/ManageTaxonomyMenuLink.php b/src/Plugin/Derivative/ManageTaxonomyMenuLink.php new file mode 100644 index 0000000..76b59b8 --- /dev/null +++ b/src/Plugin/Derivative/ManageTaxonomyMenuLink.php @@ -0,0 +1,52 @@ +entityTypeManager = $entity_type_manager; + } + + /** +   * {@inheritdoc} +   */ + public static function create(ContainerInterface $container, $base_plugin_id) { + return new static( + $base_plugin_id, + $container->get('entity_type.manager') + ); + } + /** +   * {@inheritdoc} +   */ + public function getDerivativeDefinitions($base_plugin_definition) { + $links = []; + $vocabs = $this->entityTypeManager->getStorage('taxonomy_vocabulary')->loadMultiple(); + foreach ($vocabs as $id => $vocab) { + $links[$id] = [ + 'title' => 'Manage ' . $vocab->label(), + 'route_name' => "entity.taxonomy_vocabulary.overview_form", + 'route_parameters' => ['taxonomy_vocabulary' => $vocab->id()] + ] + $base_plugin_definition; + } + return $links; + } +} diff --git a/src/Plugin/Menu/ManageTaxonomyMenuLink.php b/src/Plugin/Menu/ManageTaxonomyMenuLink.php new file mode 100644 index 0000000..0ce23fe --- /dev/null +++ b/src/Plugin/Menu/ManageTaxonomyMenuLink.php @@ -0,0 +1,6 @@ + Date: Thu, 21 Apr 2022 12:11:56 +0100 Subject: [PATCH 2/4] Total fee now updates when a new fee is added --- modules/opencase_cases/opencase_cases.module | 3 ++- modules/opencase_cases/src/Entity/OCCase.php | 4 ++++ modules/opencase_cases/src/Entity/OCCaseFee.php | 4 ++++ 3 files changed, 10 insertions(+), 1 deletion(-) diff --git a/modules/opencase_cases/opencase_cases.module b/modules/opencase_cases/opencase_cases.module index e131cd6..1f8e098 100644 --- a/modules/opencase_cases/opencase_cases.module +++ b/modules/opencase_cases/opencase_cases.module @@ -121,7 +121,8 @@ function opencase_cases_oc_case_fee_update(Drupal\opencase_cases\entity\OCCaseFe } function opencase_cases_oc_case_fee_insert(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void { - opencase_cases_update_total_fee_for_case_belonging_to_case_fee($case_fee); + $case = $case_fee->getCase(); + $case->addToTotalFee($case_fee->amount->value); } function opencase_cases_oc_case_fee_delete(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void { diff --git a/modules/opencase_cases/src/Entity/OCCase.php b/modules/opencase_cases/src/Entity/OCCase.php index c0838ec..12e679a 100644 --- a/modules/opencase_cases/src/Entity/OCCase.php +++ b/modules/opencase_cases/src/Entity/OCCase.php @@ -222,6 +222,10 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface return $this; } + public function addToTotalFee(float $amountToAdd): void { + $this->set('total_fee', $this->total_fee->value + $amountToAdd); + $this->save(); + } /** * {@inheritdoc} diff --git a/modules/opencase_cases/src/Entity/OCCaseFee.php b/modules/opencase_cases/src/Entity/OCCaseFee.php index bb409cd..a73ff13 100644 --- a/modules/opencase_cases/src/Entity/OCCaseFee.php +++ b/modules/opencase_cases/src/Entity/OCCaseFee.php @@ -190,6 +190,10 @@ class OCCaseFee extends EditorialContentEntityBase implements OCCaseFeeInterface return $this; } + public function getCase():\Drupal\opencase_cases\Entity\OCCase { + return \Drupal\opencase_cases\Entity\OCCase::load($this->oc_case->target_id); + } + /** * {@inheritdoc} */ From 92bce34fb1f500c1be859b7b3769a9ea86abab66 Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 21 Apr 2022 12:15:00 +0100 Subject: [PATCH 3/4] total fee updates when a case fee is deleted --- modules/opencase_cases/opencase_cases.module | 3 ++- modules/opencase_cases/src/Entity/OCCase.php | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/opencase_cases/opencase_cases.module b/modules/opencase_cases/opencase_cases.module index 1f8e098..baa574e 100644 --- a/modules/opencase_cases/opencase_cases.module +++ b/modules/opencase_cases/opencase_cases.module @@ -126,7 +126,8 @@ function opencase_cases_oc_case_fee_insert(Drupal\opencase_cases\entity\OCCaseFe } function opencase_cases_oc_case_fee_delete(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void { - opencase_cases_update_total_fee_for_case_belonging_to_case_fee($case_fee); + $case = $case_fee->getCase(); + $case->subtractFromTotalFee($case_fee->amount->value); } function opencase_cases_entity_base_field_info($entity_type) { diff --git a/modules/opencase_cases/src/Entity/OCCase.php b/modules/opencase_cases/src/Entity/OCCase.php index 12e679a..8e8bc8d 100644 --- a/modules/opencase_cases/src/Entity/OCCase.php +++ b/modules/opencase_cases/src/Entity/OCCase.php @@ -227,6 +227,11 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface $this->save(); } + public function subtractFromTotalFee(string $amountToSubtract): void { + $this->set('total_fee', $this->total_fee->value - $amountToSubtract); + $this->save(); + } + /** * {@inheritdoc} */ From 86c0fb1f651cfbd7fc7061a8fcbb994b7a445df8 Mon Sep 17 00:00:00 2001 From: naomi Date: Thu, 21 Apr 2022 12:20:22 +0100 Subject: [PATCH 4/4] case fee total updates when a fee is updated --- modules/opencase_cases/opencase_cases.module | 25 +++----------------- modules/opencase_cases/src/Entity/OCCase.php | 5 ---- 2 files changed, 3 insertions(+), 27 deletions(-) diff --git a/modules/opencase_cases/opencase_cases.module b/modules/opencase_cases/opencase_cases.module index baa574e..99cf06d 100644 --- a/modules/opencase_cases/opencase_cases.module +++ b/modules/opencase_cases/opencase_cases.module @@ -96,28 +96,9 @@ function opencase_cases_get_activities(Drupal\opencase_cases\entity\OCCase $case return $activities; } -function opencase_cases_get_amount(Drupal\opencase_cases\entity\OCCaseFee $case_fee): string { - if (!isEmpty($case_fee->amount)) return $case_fee->amount->first()->value; - else return '0'; -} - -function opencase_cases_get_case(Drupal\opencase_cases\entity\OCCaseFee $case_fee): Drupal\opencase_cases\entity\OCCase { - return $case_fee->oc_case->referencedEntities()[0]; -} - -function opencase_cases_update_total_fee_for_case_belonging_to_case_fee(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void { - $total = 0; - $case = opencase_cases_get_case($case_fee); - $case_fees = opencase_cases_get_case_fees($case); - foreach($case_fees as $case_fee) { - $total += opencase_cases_get_amount($case_fee); - } - $case->set('total_fee', $total); - $case->save(); -} - function opencase_cases_oc_case_fee_update(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void { - opencase_cases_update_total_fee_for_case_belonging_to_case_fee($case_fee); + $case = $case_fee->getCase(); + $case->addToTotalFee($case_fee->amount->value - $case_fee->original->amount->value); } function opencase_cases_oc_case_fee_insert(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void { @@ -127,7 +108,7 @@ function opencase_cases_oc_case_fee_insert(Drupal\opencase_cases\entity\OCCaseFe function opencase_cases_oc_case_fee_delete(Drupal\opencase_cases\entity\OCCaseFee $case_fee): void { $case = $case_fee->getCase(); - $case->subtractFromTotalFee($case_fee->amount->value); + $case->addToTotalFee(0 - $case_fee->amount->value); } function opencase_cases_entity_base_field_info($entity_type) { diff --git a/modules/opencase_cases/src/Entity/OCCase.php b/modules/opencase_cases/src/Entity/OCCase.php index 8e8bc8d..12e679a 100644 --- a/modules/opencase_cases/src/Entity/OCCase.php +++ b/modules/opencase_cases/src/Entity/OCCase.php @@ -227,11 +227,6 @@ class OCCase extends RevisionableContentEntityBase implements OCCaseInterface $this->save(); } - public function subtractFromTotalFee(string $amountToSubtract): void { - $this->set('total_fee', $this->total_fee->value - $amountToSubtract); - $this->save(); - } - /** * {@inheritdoc} */