From f618616379dc4c9ab6907ba4adc306d0efdab494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20B=C3=B6hmer?= Date: Sun, 8 Jan 2023 19:14:24 +0100 Subject: [PATCH] Show BOM entries in projects history --- src/DataTables/Column/LogEntryTargetColumn.php | 3 +++ src/Services/LogSystem/HistoryHelper.php | 5 +++++ 2 files changed, 8 insertions(+) diff --git a/src/DataTables/Column/LogEntryTargetColumn.php b/src/DataTables/Column/LogEntryTargetColumn.php index 4c8ad386..4aaeb069 100644 --- a/src/DataTables/Column/LogEntryTargetColumn.php +++ b/src/DataTables/Column/LogEntryTargetColumn.php @@ -31,6 +31,7 @@ use App\Entity\Parameters\AbstractParameter; use App\Entity\Parts\PartLot; use App\Entity\PriceInformations\Orderdetail; use App\Entity\PriceInformations\Pricedetail; +use App\Entity\ProjectSystem\ProjectBOMEntry; use App\Exceptions\EntityNotSupportedException; use App\Repository\LogEntryRepository; use App\Services\ElementTypeNameGenerator; @@ -126,6 +127,8 @@ class LogEntryTargetColumn extends AbstractColumn $on = $target->getPart(); } elseif ($target instanceof Pricedetail && null !== $target->getOrderdetail() && null !== $target->getOrderdetail()->getPart()) { $on = $target->getOrderdetail()->getPart(); + } elseif ($target instanceof ProjectBOMEntry && null !== $target->getProject()) { + $on = $target->getProject(); } if (isset($on) && is_object($on)) { diff --git a/src/Services/LogSystem/HistoryHelper.php b/src/Services/LogSystem/HistoryHelper.php index 0e3f7212..e1638f41 100644 --- a/src/Services/LogSystem/HistoryHelper.php +++ b/src/Services/LogSystem/HistoryHelper.php @@ -46,6 +46,7 @@ use App\Entity\Base\AbstractDBElement; use App\Entity\Base\AbstractStructuralDBElement; use App\Entity\Parameters\AbstractParameter; use App\Entity\Parts\Part; +use App\Entity\ProjectSystem\Project; class HistoryHelper { @@ -81,6 +82,10 @@ class HistoryHelper $array = array_merge($array, $element->getParameters()->toArray()); } + if ($element instanceof Project) { + $array = array_merge($array, $element->getBomEntries()->toArray()); + } + return $array; } }