From c9101f4d9789030936440d8f5c3b0ce2f6c4d339 Mon Sep 17 00:00:00 2001 From: spencerrlongg Date: Thu, 25 Jan 2024 18:18:24 -0600 Subject: [PATCH] initial work, not working yet --- app/Http/Controllers/Api/AssetsController.php | 7 ++++++- app/Importer/AssetImporter.php | 3 ++- app/Models/Loggable.php | 12 ++++++++++++ app/Observers/AssetObserver.php | 4 ++++ 4 files changed, 24 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php index f5168a591..3347f6dab 100644 --- a/app/Http/Controllers/Api/AssetsController.php +++ b/app/Http/Controllers/Api/AssetsController.php @@ -599,7 +599,12 @@ class AssetsController extends Controller $target = Location::find(request('assigned_location')); } if (isset($target)) { - $asset->checkOut($target, Auth::user(), date('Y-m-d H:i:s'), '', 'Checked out on asset creation', e($request->get('name'))); + $asset->checkOut($target, + Auth::user(), + date('Y-m-d H:i:s'), + '', + 'Checked out on asset creation', + e($request->get('name'))); } if ($asset->image) { diff --git a/app/Importer/AssetImporter.php b/app/Importer/AssetImporter.php index cf762a8fd..870bf6d16 100644 --- a/app/Importer/AssetImporter.php +++ b/app/Importer/AssetImporter.php @@ -138,7 +138,8 @@ class AssetImporter extends ItemImporter if ($asset->save()) { - $asset->logCreate(trans('general.importer.import_note')); + //$asset->logCreate(trans('general.importer.import_note')); + $asset->setImported(true); $this->log('Asset '.$this->item['name'].' with serial number '.$this->item['serial'].' was created'); // If we have a target to checkout to, lets do so. diff --git a/app/Models/Loggable.php b/app/Models/Loggable.php index ce3a07f15..8d63d1988 100644 --- a/app/Models/Loggable.php +++ b/app/Models/Loggable.php @@ -8,6 +8,8 @@ use Illuminate\Support\Facades\Auth; trait Loggable { + public ?bool $imported = false; // Import note attribute + /** * @author Daniel Meltzer * @since [v3.4] @@ -18,6 +20,16 @@ trait Loggable return $this->morphMany(Actionlog::class, 'item'); } + public function setImported(bool $bool): void + { + $this->imported = $bool; + } + + public function getImported(): bool + { + return $this->imported; + } + /** * @author Daniel Meltzer * @since [v3.4] diff --git a/app/Observers/AssetObserver.php b/app/Observers/AssetObserver.php index 2b0955fde..55cd05471 100644 --- a/app/Observers/AssetObserver.php +++ b/app/Observers/AssetObserver.php @@ -109,6 +109,10 @@ class AssetObserver $logAction->item_id = $asset->id; $logAction->created_at = date('Y-m-d H:i:s'); $logAction->user_id = Auth::id(); + $logAction->note = 'poop'; + if($asset->getImported()) { + $logAction->note = "this asset was imported"; + } $logAction->logaction('create'); }