Finishing touches

2026-05-18 16:13:13 +01:00
parent a04bf04900
commit 043292ff15
10 changed files with 134 additions and 70 deletions
@@ -13,6 +13,7 @@ use App\Models\Actionlog;
 use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Maintenance;
+use App\Models\Setting;
 use Illuminate\Database\Eloquent\Collection as EloquentCollection;
 use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
@@ -65,8 +66,8 @@ class MaintenancesController extends Controller
            $maintenances->where('maintenances.url', '=', $request->input('url'));
        }

-        if ($request->filled('asset_maintenance_type')) {
-            $maintenances->where('asset_maintenance_type', '=', $request->input('asset_maintenance_type'));
+        if ($request->filled('maintenance_type')) {
+            $maintenances->where('maintenance_type', '=', $request->input('maintenance_type'));
        }

        if ($request->filled('maintenance_type_id')) {
@@ -77,6 +78,29 @@ class MaintenancesController extends Controller
            $maintenances->where('responsible_party_id', '=', $request->input('responsible_party_id'));
        }

+        if ($request->filled('completed')) {
+            if ($request->input('completed') === 'true') {
+                $maintenances->completed();
+            } else {
+                $maintenances->active();
+            }
+        }
+
+        if ($request->filled('upcoming_status')) {
+            $settings = Setting::getSettings();
+            switch ($request->input('upcoming_status')) {
+                case 'due':
+                    $maintenances->dueForCompletion($settings);
+                    break;
+                case 'overdue':
+                    $maintenances->overdueForCompletion();
+                    break;
+                case 'due-or-overdue':
+                    $maintenances->dueOrOverdueForCompletion($settings);
+                    break;
+            }
+        }
+
        // Make sure the offset and limit are actually integers and do not exceed system limits
        $offset = ($request->input('offset') > $maintenances->count()) ? $maintenances->count() : abs($request->input('offset'));
        $limit = app('api_limit_value');
@@ -85,10 +109,10 @@ class MaintenancesController extends Controller
            'id',
            'name',
            'asset_maintenance_time',
-            'asset_maintenance_type',
            'cost',
            'start_date',
            'completion_date',
+            'completed_at',
            'notes',
            'asset_tag',
            'asset_name',
@@ -100,6 +124,7 @@ class MaintenancesController extends Controller
            'status_label',
            'model',
            'model_number',
+            'maintenance_type',
        ];

        $order = $request->input('order') === 'asc' ? 'asc' : 'desc';
@@ -107,31 +132,37 @@ class MaintenancesController extends Controller

        switch ($sort) {
            case 'created_by':
-                $maintenances = $maintenances->OrderByCreatedBy($order);
+                $maintenances = $maintenances->orderByCreatedBy($order);
                break;
            case 'supplier':
-                $maintenances = $maintenances->OrderBySupplier($order);
+                $maintenances = $maintenances->orderBySupplier($order);
                break;
            case 'asset_tag':
-                $maintenances = $maintenances->OrderByTag($order);
+                $maintenances = $maintenances->orderByTag($order);
                break;
            case 'asset_name':
-                $maintenances = $maintenances->OrderByAssetName($order);
+                $maintenances = $maintenances->orderByAssetName($order);
                break;
            case 'model':
-                $maintenances = $maintenances->OrderByAssetModelName($order);
+                $maintenances = $maintenances->orderByAssetModelName($order);
                break;
            case 'model_number':
-                $maintenances = $maintenances->OrderByAssetModelNumber($order);
+                $maintenances = $maintenances->orderByAssetModelNumber($order);
                break;
            case 'serial':
-                $maintenances = $maintenances->OrderByAssetSerial($order);
+                $maintenances = $maintenances->orderByAssetSerial($order);
                break;
            case 'location':
-                $maintenances = $maintenances->OrderLocationName($order);
+                $maintenances = $maintenances->orderLocationName($order);
                break;
            case 'status_label':
-                $maintenances = $maintenances->OrderStatusName($order);
+                $maintenances = $maintenances->orderStatusName($order);
+                break;
+            case 'maintenance_type':
+                $maintenances = $maintenances->orderByMaintenanceType($order);
+                break;
+            case 'completed_at':
+                $maintenances = $maintenances->orderByCompletedAt($order);
                break;
            default:
                $maintenances = $maintenances->orderBy($sort, $order);
@@ -322,6 +353,7 @@ class MaintenancesController extends Controller

        $maintenance->completed_at = now();
        $maintenance->completed_by = auth()->id();
+        $maintenance->asset_maintenance_time = (int) $maintenance->created_at->diffInDays(now(), true);
        $maintenance->saveQuietly();

        $logAction = new Actionlog;
@@ -330,6 +362,7 @@ class MaintenancesController extends Controller
        $logAction->target_type = Asset::class;
        $logAction->target_id = $maintenance->asset_id;
        $logAction->created_by = auth()->id();
+        $logAction->note = $request->input('note');
        $logAction->logaction(ActionType::MaintenanceComplete);

        return response()->json(Helper::formatStandardApiResponse('success', (new MaintenancesTransformer)->transformMaintenance($maintenance->fresh()), trans('admin/maintenances/message.complete.success')));
@@ -346,4 +379,50 @@ class MaintenancesController extends Controller

        return response()->json((new ActionlogsTransformer)->transformActionlogs($history, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
    }
+
+    public function notesIndex(Maintenance $maintenance): JsonResponse
+    {
+        $this->authorize('journal', $maintenance);
+
+        $notes = Actionlog::with('user:id,username')
+            ->where('item_type', Maintenance::class)
+            ->where('item_id', $maintenance->id)
+            ->where('action_type', 'note added')
+            ->orderBy('created_at', 'desc')
+            ->get(['id', 'created_at', 'note', 'created_by', 'item_id', 'item_type', 'action_type']);
+
+        $notesArray = $notes->map(fn ($note) => [
+            'id' => $note->id,
+            'created_at' => $note->created_at,
+            'note' => $note->note,
+            'created_by' => $note->created_by,
+            'username' => $note->user?->username,
+            'item_id' => $note->item_id,
+            'item_type' => $note->item_type,
+            'action_type' => $note->action_type,
+        ]);
+
+        return response()->json(Helper::formatStandardApiResponse('success', ['notes' => $notesArray, 'maintenance_id' => $maintenance->id]));
+    }
+
+    public function notesStore(Request $request, Maintenance $maintenance): JsonResponse
+    {
+        $this->authorize('update', $maintenance);
+
+        if (! $request->filled('note')) {
+            return response()->json(Helper::formatStandardApiResponse('error', null, trans('validation.required', ['attribute' => 'note'])), 422);
+        }
+
+        $logaction = new Actionlog;
+        $logaction->item_type = Maintenance::class;
+        $logaction->created_by = auth()->id();
+        $logaction->item_id = $maintenance->id;
+        $logaction->note = $request->input('note');
+
+        if ($logaction->logaction('note added')) {
+            return response()->json(Helper::formatStandardApiResponse('success', ['note' => $logaction->note, 'item_id' => $maintenance->id], trans('general.note_added')));
+        }
+
+        return response()->json(Helper::formatStandardApiResponse('error', null, 'Something went wrong'), 500);
+    }
 }
@@ -10,7 +10,6 @@ use App\Models\Asset;
 use App\Models\Company;
 use App\Models\Maintenance;
 use App\Models\MaintenanceType;
-use Carbon\Carbon;
 use Illuminate\Contracts\View\View;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
@@ -108,15 +107,6 @@ class MaintenancesController extends Controller
            $maintenance->responsible_party_id = $request->input('responsible_party_id') ?: auth()->id();
            $maintenance->created_by = auth()->id();

-            if (($maintenance->completion_date !== null)
-                && ($maintenance->start_date !== '')
-                && ($maintenance->start_date !== '0000-00-00')
-            ) {
-                $startDate = Carbon::parse($maintenance->start_date);
-                $completionDate = Carbon::parse($maintenance->completion_date);
-                $maintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
-            }
-
            $request->handleImages($maintenance);

            // Was the asset maintenance created?
@@ -187,24 +177,6 @@ class MaintenancesController extends Controller
        $maintenance->completion_date = $request->input('completion_date');
        $maintenance->responsible_party_id = $request->input('responsible_party_id');
        $maintenance->url = $request->input('url');
-
-        // Todo - put this in a getter/setter?
-        if (($maintenance->completion_date == null)) {
-            if (($maintenance->asset_maintenance_time !== 0)
-              || (! is_null($maintenance->asset_maintenance_time))
-            ) {
-                $maintenance->asset_maintenance_time = null;
-            }
-        }
-
-        if (($maintenance->completion_date !== null)
-          && ($maintenance->start_date !== '')
-          && ($maintenance->start_date !== '0000-00-00')
-        ) {
-            $startDate = Carbon::parse($maintenance->start_date);
-            $completionDate = Carbon::parse($maintenance->completion_date);
-            $maintenance->asset_maintenance_time = (int) $completionDate->diffInDays($startDate, true);
-        }
        $request->handleImages($maintenance);

        if ($maintenance->save()) {
@@ -281,6 +253,7 @@ class MaintenancesController extends Controller

        $maintenance->completed_at = now();
        $maintenance->completed_by = auth()->id();
+        $maintenance->asset_maintenance_time = (int) $maintenance->created_at->diffInDays(now(), true);
        $maintenance->saveQuietly();

        $logAction = new Actionlog;
@@ -289,6 +262,7 @@ class MaintenancesController extends Controller
        $logAction->target_type = Asset::class;
        $logAction->target_id = $maintenance->asset_id;
        $logAction->created_by = auth()->id();
+        $logAction->note = $request->input('note');
        $logAction->logaction(ActionType::MaintenanceComplete);

        return redirect()->back()
@@ -4,13 +4,15 @@ namespace App\Http\Controllers;

 use App\Models\Actionlog;
 use App\Models\Asset;
+use App\Models\Maintenance;
+use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Validation\Rule;

 class NotesController extends Controller
 {
-    public function store(Request $request)
+    public function store(Request $request): RedirectResponse
    {
        $this->authorize('update', Asset::class);

@@ -19,13 +21,19 @@ class NotesController extends Controller
            'note' => 'required|string|max:50000',
            'type' => [
                'required',
-                Rule::in(['asset']),
+                Rule::in(['asset', 'maintenance']),
            ],
        ]);

-        $item = Asset::findOrFail($validated['id']);
-
-        $this->authorize('update', $item);
+        if ($validated['type'] === 'maintenance') {
+            $item = Maintenance::findOrFail($validated['id']);
+            $this->authorize('update', $item->asset);
+            $redirect = redirect()->route('maintenances.show', $validated['id']);
+        } else {
+            $item = Asset::findOrFail($validated['id']);
+            $this->authorize('update', $item);
+            $redirect = redirect()->route('hardware.show', $validated['id']);
+        }

        $logaction = new Actionlog;
        $logaction->item_id = $item->id;
@@ -34,9 +42,6 @@ class NotesController extends Controller
        $logaction->created_by = Auth::id();
        $logaction->logaction('note added');

-        return redirect()
-            ->route('hardware.show', $validated['id'])
-            ->withFragment('history')
-            ->with('success', trans('general.note_added'));
+        return $redirect->withFragment('notes')->with('success', trans('general.note_added'));
    }
 }
@@ -82,13 +82,9 @@ class MaintenancesTransformer
                'id' => (int) $assetmaintenance->adminuser->id,
                'name' => e($assetmaintenance->adminuser->display_name),
            ] : null,
-            'maintenance_type' => ($assetmaintenance->maintenanceType) ? [
-                'id' => (int) $assetmaintenance->maintenanceType->id,
-                'name' => e($assetmaintenance->maintenanceType->name),
-            ] : null,
-            'maintenance_type_name' => $assetmaintenance->maintenanceType
+            'maintenance_type' => $assetmaintenance->maintenanceType
                ? e($assetmaintenance->maintenanceType->name)
-                : ($assetmaintenance->asset_maintenance_type ? e($assetmaintenance->asset_maintenance_type) : null),
+                : null,
            'responsible_party' => ($assetmaintenance->responsibleParty) ? [
                'id' => (int) $assetmaintenance->responsibleParty->id,
                'name' => e($assetmaintenance->responsibleParty->display_name),
@@ -149,9 +145,9 @@ class MaintenancesTransformer
            'supplier' => ($assetmaintenance->supplier) ? e($assetmaintenance->supplier?->name) : null,
            'url' => ($assetmaintenance->url) ? e($assetmaintenance->url) : null,
            'cost' => Helper::formatCurrencyOutput($assetmaintenance->cost),
-            'maintenance_type_name' => $assetmaintenance->maintenanceType
+            'maintenance_type' => $assetmaintenance->maintenanceType
                ? e($assetmaintenance->maintenanceType->name)
-                : ($assetmaintenance->asset_maintenance_type ? e($assetmaintenance->asset_maintenance_type) : null),
+                : null,
            'asset_maintenance_type' => e($assetmaintenance->asset_maintenance_type),
            'start_date' => Helper::getFormattedDateObject($assetmaintenance->start_date, 'date'),
            'asset_maintenance_time' => $assetmaintenance->asset_maintenance_time,
@@ -87,7 +87,6 @@ class Maintenance extends SnipeModel implements ICompanyableChild
        [
            'name',
            'notes',
-            'asset_maintenance_type',
            'cost',
            'start_date',
            'completion_date',
@@ -105,6 +104,7 @@ class Maintenance extends SnipeModel implements ICompanyableChild
        'asset.status' => ['name'],
        'supplier' => ['name'],
        'adminuser' => ['first_name', 'last_name', 'display_name'],
+        'maintenanceType' => ['name'],
    ];

    public function getCompanyableParents()
@@ -234,6 +234,11 @@ class Maintenance extends SnipeModel implements ICompanyableChild
        return $this->morphTo('checked_out_to');
    }

+    public function journal()
+    {
+        return $this->assetlog()->where('action_type', '=', 'note added');
+    }
+
    public function getDisplayNameAttribute()
    {
        return $this->name;
@@ -94,4 +94,9 @@ final class MaintenancePolicy
            || Gate::allows('view', $maintenance)
            || $user->hasAccess('activity.view');
    }
+
+    public function journal(User $user, Maintenance $maintenance): bool
+    {
+        return Gate::allows('view', $maintenance) || $user->hasAccess('activity.view');
+    }
 }
@@ -111,19 +111,12 @@ class MaintenancesPresenter extends Presenter
                'title' => trans('general.location'),
                'formatter' => 'locationsLinkObjFormatter',
            ], [
-                'field' => 'maintenance_type_name',
-                'searchable' => true,
-                'sortable' => false,
-                'switchable' => true,
-                'title' => trans('admin/maintenances/form.asset_maintenance_type'),
-                'visible' => true,
-            ], [
-                'field' => 'asset_maintenance_type',
+                'field' => 'maintenance_type',
                'searchable' => true,
                'sortable' => true,
                'switchable' => true,
-                'title' => trans('admin/maintenances/form.asset_maintenance_type').' (legacy)',
-                'visible' => false,
+                'title' => trans('admin/maintenances/form.asset_maintenance_type'),
+                'visible' => true,
            ], [
                'field' => 'responsible_party',
                'searchable' => true,
@@ -314,9 +307,9 @@ class MaintenancesPresenter extends Presenter
                'sortable' => true,
                'title' => trans('general.location'),
            ], [
-                'field' => 'maintenance_type_name',
+                'field' => 'maintenance_type',
                'searchable' => true,
-                'sortable' => false,
+                'sortable' => true,
                'switchable' => true,
                'title' => trans('admin/maintenances/form.asset_maintenance_type'),
                'visible' => true,
@@ -18,4 +18,5 @@ return [
    'completed_by' => 'Completed By',
    'mark_complete' => 'Mark Complete',
    'already_complete' => 'Already Completed',
+    'completion_notes' => 'Completion Notes',
 ];
@@ -15,4 +15,9 @@ return [
    'configuration_change' => 'Configuration Change',
    'pat_test' => 'PAT Test',
    'checked_out_to_help' => 'The user, etc that the asset was checked out to at the time of maintenance creation. This is for historical reference and does not affect the current checkout status of the asset.',
+    'show_completed' => 'Show Completed',
+    'show_active' => 'Show Active',
+    'due' => 'Due',
+    'overdue' => 'Overdue',
+    'completed' => 'Completed',
 ];
@@ -19,6 +19,7 @@ return [
    'warranty' => 'Warranty',
    'not_warranty' => 'Not Warranty',
    'complete' => [
+        'confirm' => 'Are you sure you want to mark this maintenance as complete? This cannot be undone.',
        'success' => 'Maintenance marked as complete.',
        'error' => 'There was an issue marking this maintenance as complete. Please try again.',
    ],