Write the stock change comment also in the elementEdited log entry

This commit is contained in:
Jan Böhmer 2023-01-08 01:45:34 +01:00
parent 5d6b7a9470
commit 137c6430b1
2 changed files with 22 additions and 3 deletions

View file

@ -195,7 +195,7 @@ class LogDataTable implements DataTableTypeInterface
if ($context instanceof PartStockChangedLogEntry) { if ($context instanceof PartStockChangedLogEntry) {
$text .= sprintf( $text .= sprintf(
' (%s)', ' (<i>%s</i>)',
$this->translator->trans('log.part_stock_changed.' . $context->getInstockChangeType()) $this->translator->trans('log.part_stock_changed.' . $context->getInstockChangeType())
); );
} }

View file

@ -5,15 +5,19 @@ namespace App\Services\Parts;
use App\Entity\LogSystem\PartStockChangedLogEntry; use App\Entity\LogSystem\PartStockChangedLogEntry;
use App\Entity\Parts\Part; use App\Entity\Parts\Part;
use App\Entity\Parts\PartLot; use App\Entity\Parts\PartLot;
use App\Services\LogSystem\EventCommentHelper;
use App\Services\LogSystem\EventLogger; use App\Services\LogSystem\EventLogger;
final class PartLotWithdrawAddHelper final class PartLotWithdrawAddHelper
{ {
private $eventLogger; private EventLogger $eventLogger;
private EventCommentHelper $eventCommentHelper;
public function __construct(EventLogger $eventLogger)
public function __construct(EventLogger $eventLogger, EventCommentHelper $eventCommentHelper)
{ {
$this->eventLogger = $eventLogger; $this->eventLogger = $eventLogger;
$this->eventCommentHelper = $eventCommentHelper;
} }
/** /**
@ -95,6 +99,11 @@ final class PartLotWithdrawAddHelper
$event = PartStockChangedLogEntry::withdraw($partLot, $oldAmount, $partLot->getAmount(), $part->getAmountSum() , $comment); $event = PartStockChangedLogEntry::withdraw($partLot, $oldAmount, $partLot->getAmount(), $part->getAmountSum() , $comment);
$this->eventLogger->log($event); $this->eventLogger->log($event);
//Apply the comment also to global events, so it gets associated with the elementChanged log entry
if (!$this->eventCommentHelper->isMessageSet() && !empty($comment)) {
$this->eventCommentHelper->setMessage($comment);
}
return $partLot; return $partLot;
} }
@ -130,6 +139,11 @@ final class PartLotWithdrawAddHelper
$event = PartStockChangedLogEntry::add($partLot, $oldAmount, $partLot->getAmount(), $part->getAmountSum() , $comment); $event = PartStockChangedLogEntry::add($partLot, $oldAmount, $partLot->getAmount(), $part->getAmountSum() , $comment);
$this->eventLogger->log($event); $this->eventLogger->log($event);
//Apply the comment also to global events, so it gets associated with the elementChanged log entry
if (!$this->eventCommentHelper->isMessageSet() && !empty($comment)) {
$this->eventCommentHelper->setMessage($comment);
}
return $partLot; return $partLot;
} }
@ -179,5 +193,10 @@ final class PartLotWithdrawAddHelper
$event = PartStockChangedLogEntry::move($origin, $oldOriginAmount, $origin->getAmount(), $part->getAmountSum() , $comment, $target); $event = PartStockChangedLogEntry::move($origin, $oldOriginAmount, $origin->getAmount(), $part->getAmountSum() , $comment, $target);
$this->eventLogger->log($event); $this->eventLogger->log($event);
//Apply the comment also to global events, so it gets associated with the elementChanged log entry
if (!$this->eventCommentHelper->isMessageSet() && !empty($comment)) {
$this->eventCommentHelper->setMessage($comment);
}
} }
} }