diff --git a/application/AssetManagement/AssetManagementController.php b/application/AssetManagement/AssetManagementController.php index 1353aa134..0a0ace068 100644 --- a/application/AssetManagement/AssetManagementController.php +++ b/application/AssetManagement/AssetManagementController.php @@ -92,6 +92,7 @@ class AssetManagementController extends TTCrud $row['currentSite'] = $latestJournal->site; $row['borrowDate'] = $latestJournal->borrowDate; $row['expectedReturnDate'] = $latestJournal->expectedReturnDate; + $row['externalUser'] = $latestJournal->externalUser; } else { // Asset is available $row['journalId'] = null; @@ -100,6 +101,7 @@ class AssetManagementController extends TTCrud $row['currentSite'] = null; $row['borrowDate'] = null; $row['expectedReturnDate'] = null; + $row['externalUser'] = null; } $row['reservations'] = $reservationMap[$asset->id] ?? []; @@ -156,6 +158,7 @@ class AssetManagementController extends TTCrud 'assetId' => $post['assetId'], 'userId' => $post['userId'], 'site' => $post['site'], + 'externalUser' => $post['externalUser'] ?? null, 'borrowReason' => $post['reason'] ?? null, 'expectedReturnDate' => $post['expectedReturnDate'] ?? null, 'borrowDate' => time(), diff --git a/application/AssetManagementJournal/AssetManagementJournalModel.php b/application/AssetManagementJournal/AssetManagementJournalModel.php index 5fffca7f5..c7739b1a9 100644 --- a/application/AssetManagementJournal/AssetManagementJournalModel.php +++ b/application/AssetManagementJournal/AssetManagementJournalModel.php @@ -5,6 +5,7 @@ class AssetManagementJournalModel extends TTCrudBaseModel { public int $assetId; public int $userId; public string $site; + public ?string $externalUser; public int $borrowDate; public ?int $expectedReturnDate; public ?int $returnDate; diff --git a/db/migrations/20250711105000_asset_management_journal_add_external_user.php b/db/migrations/20250711105000_asset_management_journal_add_external_user.php new file mode 100644 index 000000000..356be4195 --- /dev/null +++ b/db/migrations/20250711105000_asset_management_journal_add_external_user.php @@ -0,0 +1,30 @@ +getEnvironment() == "thetool") { + $table = $this->table('AssetManagementJournal'); + $table->addColumn('externalUser', 'string', [ + 'limit' => 255, + 'null' => true, + 'default' => null, + 'after' => 'site', + ]); + $table->update(); + } + } + + public function down(): void + { + if ($this->getEnvironment() == "thetool") { + $table = $this->table('AssetManagementJournal'); + $table->removeColumn('externalUser'); + $table->update(); + } + } +} diff --git a/public/js/pages/AssetManagement/AssetManagement.js b/public/js/pages/AssetManagement/AssetManagement.js index f776ff516..31be0529f 100644 --- a/public/js/pages/AssetManagement/AssetManagement.js +++ b/public/js/pages/AssetManagement/AssetManagement.js @@ -220,6 +220,7 @@ Vue.component('asset-borrow-return-widget', {
Gerät: {{ rowData.name }}
Mitarbeiter: {{ selectedUserName }}
Extern an: {{ entry.externalUser }}
Grund: {{ entry.borrowReason || '-' }}