diff --git a/app/Http/Controllers/AssetMaintenanceController.php b/app/Http/Controllers/AssetMaintenanceController.php
index f637ba0..c4612e5 100644
--- a/app/Http/Controllers/AssetMaintenanceController.php
+++ b/app/Http/Controllers/AssetMaintenanceController.php
@@ -17,10 +17,15 @@ class AssetMaintenanceController extends Controller
public function index(): View
{
- $maintenances = AssetMaintenance::with('asset')->latest()->paginate(config('system.ui.table_page_size', 20));
+ $status = request('status');
+ $maintenances = AssetMaintenance::with('asset')
+ ->when($status, fn($q) => $q->where('status', $status))
+ ->latest()
+ ->paginate(config('system.ui.table_page_size', 20))
+ ->withQueryString();
$assets = Asset::orderBy('code')->get();
- return view('assets.maintenances', compact('maintenances', 'assets'));
+ return view('assets.maintenances', compact('maintenances', 'assets', 'status'));
}
public function store(Request $request): RedirectResponse
diff --git a/app/Http/Controllers/AssetTransactionPageController.php b/app/Http/Controllers/AssetTransactionPageController.php
index 12a21dc..86c5d73 100644
--- a/app/Http/Controllers/AssetTransactionPageController.php
+++ b/app/Http/Controllers/AssetTransactionPageController.php
@@ -11,20 +11,26 @@ class AssetTransactionPageController extends Controller
{
public function movements(): View
{
+ $status = request('status');
$items = AssetMovement::with(['asset', 'fromLocation', 'toLocation', 'fromDepartment', 'toDepartment', 'fromUser', 'toUser'])
+ ->when($status, fn($q) => $q->where('status', $status))
->latest()
- ->paginate(config('system.ui.table_page_size', 20));
+ ->paginate(config('system.ui.table_page_size', 20))
+ ->withQueryString();
- return view('assets.movements', compact('items'));
+ return view('assets.movements', compact('items', 'status'));
}
public function disposals(): View
{
+ $status = request('status');
$items = AssetDisposal::with(['asset', 'previousStatus', 'previousLocation', 'previousDepartment'])
+ ->when($status, fn($q) => $q->where('status', $status))
->latest()
- ->paginate(config('system.ui.table_page_size', 20));
+ ->paginate(config('system.ui.table_page_size', 20))
+ ->withQueryString();
- return view('assets.disposals', compact('items'));
+ return view('assets.disposals', compact('items', 'status'));
}
public function audits(): View
diff --git a/resources/views/assets/disposals.blade.php b/resources/views/assets/disposals.blade.php
index 3203910..ec68cc6 100644
--- a/resources/views/assets/disposals.blade.php
+++ b/resources/views/assets/disposals.blade.php
@@ -12,6 +12,21 @@
Disposal
+
@@ -19,6 +34,7 @@
| Waktu |
Aset |
Alasan |
+ Status |
Catatan |
Status Reverse |
@@ -29,6 +45,7 @@
{{ optional($item->disposed_at)->format('d/m/Y H:i') ?: '-' }} |
{{ $item->asset?->code }} - {{ $item->asset?->name }} |
{{ $item->reason ?: '-' }} |
+ {{ $item->status }} |
{{ $item->notes ?: '-' }} |
@if($item->reversed_at)
@@ -40,7 +57,7 @@
@empty
|
- | Belum ada disposal. |
+ Belum ada disposal. |
@endforelse
diff --git a/resources/views/assets/maintenances.blade.php b/resources/views/assets/maintenances.blade.php
index 9c4242e..e0cd917 100644
--- a/resources/views/assets/maintenances.blade.php
+++ b/resources/views/assets/maintenances.blade.php
@@ -33,6 +33,23 @@
@endif
+
+
diff --git a/resources/views/assets/movements.blade.php b/resources/views/assets/movements.blade.php
index da9f501..897b88b 100644
--- a/resources/views/assets/movements.blade.php
+++ b/resources/views/assets/movements.blade.php
@@ -12,6 +12,21 @@
Movement
+
@@ -20,6 +35,7 @@
| Aset |
Dari |
Ke |
+ Status |
Catatan |
@@ -30,11 +46,12 @@
{{ $item->asset?->code }} - {{ $item->asset?->name }} |
{{ $item->fromLocation?->name ?: '-' }} / {{ $item->fromDepartment?->name ?: '-' }} / {{ $item->fromUser?->name ?: '-' }} |
{{ $item->toLocation?->name ?: '-' }} / {{ $item->toDepartment?->name ?: '-' }} / {{ $item->toUser?->name ?: '-' }} |
+ {{ $item->status }} |
{{ $item->notes ?: '-' }} |
@empty
- | Belum ada movement. |
+ Belum ada movement. |
@endforelse