Added basic logging for maintenances

app/Models/Maintenance.php

@@ -169,6 +169,21 @@ public function asset()
         return $this->belongsTo(\App\Models\Asset::class, 'asset_id')
             ->withTrashed();
     }
+
+    /**
+     * Get the maintenance logs
+     *
+     * @author [A. Gianotto] [<snipe@snipe.net>]
+     * @since  [v8.2.2]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function assetlog()
+    {
+        return $this->hasMany(\App\Models\Actionlog::class, 'item_id')
+            ->where('item_type', '=', self::class)
+            ->orderBy('created_at', 'desc')
+            ->withTrashed();
+    }
 
 
     /**

app/Observers/ComponentObserver.php

@@ -20,7 +20,11 @@ public function updated(Component $component)
         $logAction->item_type = Component::class;
         $logAction->item_id = $component->id;
         $logAction->created_at = date('Y-m-d H:i:s');
+        $logAction->action_date = date('Y-m-d H:i:s');
         $logAction->created_by = auth()->id();
+        if($component->imported) {
+            $logAction->setActionSource('importer');
+        }
         $logAction->logaction('update');
     }
 
@@ -37,6 +41,7 @@ public function created(Component $component)
         $logAction->item_type = Component::class;
         $logAction->item_id = $component->id;
         $logAction->created_at = date('Y-m-d H:i:s');
+        $logAction->action_date = date('Y-m-d H:i:s');
         $logAction->created_by = auth()->id();
         if($component->imported) {
             $logAction->setActionSource('importer');
@@ -56,6 +61,7 @@ public function deleting(Component $component)
         $logAction->item_type = Component::class;
         $logAction->item_id = $component->id;
         $logAction->created_at = date('Y-m-d H:i:s');
+        $logAction->action_date = date('Y-m-d H:i:s');
         $logAction->created_by = auth()->id();
         $logAction->logaction('delete');
     }

app/Observers/MaintenanceObserver.php

@@ -0,0 +1,74 @@
+<?php
+
+namespace App\Observers;
+
+use App\Models\Actionlog;
+use App\Models\Maintenance;
+use App\Models\Asset;
+
+class MaintenanceObserver
+{
+    /**
+     * Listen to the User created event.
+     *
+     * @param  Maintenance  $maintenance
+     * @return void
+     */
+    public function updated(Maintenance $maintenance)
+    {
+        $logAction = new Actionlog();
+        $logAction->item_type = Maintenance::class;
+        $logAction->item_id = $maintenance->id;
+        $logAction->target_type = Asset::class;
+        $logAction->target_id = $maintenance->asset_id;
+        $logAction->created_at = date('Y-m-d H:i:s');
+        $logAction->action_date = date('Y-m-d H:i:s');
+        $logAction->created_by = auth()->id();
+        if($maintenance->imported) {
+            $logAction->setActionSource('importer');
+        }
+        $logAction->logaction('update');
+    }
+
+    /**
+     * Listen to the Component created event when
+     * a new component is created.
+     *
+     * @param  Maintenance  $maintenance
+     * @return void
+     */
+    public function created(Maintenance $maintenance)
+    {
+        $logAction = new Actionlog();
+        $logAction->item_type = Maintenance::class;
+        $logAction->item_id = $maintenance->id;
+        $logAction->target_type = Asset::class;
+        $logAction->target_id = $maintenance->asset_id;
+        $logAction->created_at = date('Y-m-d H:i:s');
+        $logAction->action_date = date('Y-m-d H:i:s');
+        $logAction->created_by = auth()->id();
+        if($maintenance->imported) {
+            $logAction->setActionSource('importer');
+        }
+        $logAction->logaction('create');
+    }
+
+    /**
+     * Listen to the Component deleting event.
+     *
+     * @param  Maintenance  $maintenance
+     * @return void
+     */
+    public function deleting(Maintenance $maintenance)
+    {
+        $logAction = new Actionlog();
+        $logAction->item_type = Maintenance::class;
+        $logAction->item_id = $maintenance->id;
+        $logAction->target_type = Asset::class;
+        $logAction->target_id = $maintenance->asset_id;
+        $logAction->created_at = date('Y-m-d H:i:s');
+        $logAction->action_date = date('Y-m-d H:i:s');
+        $logAction->created_by = auth()->id();
+        $logAction->logaction('delete');
+    }
+}

app/Providers/AppServiceProvider.php

@@ -7,6 +7,7 @@
 use App\Models\Component;
 use App\Models\Consumable;
 use App\Models\License;
+use App\Models\Maintenance;
 use App\Models\User;
 use App\Models\Setting;
 use App\Models\SnipeSCIMConfig;
@@ -17,6 +18,7 @@
 use App\Observers\ConsumableObserver;
 use App\Observers\LicenseObserver;
 use App\Observers\SettingObserver;
+use App\Observers\MaintenanceObserver;
 use Illuminate\Routing\UrlGenerator;
 use Illuminate\Support\Facades\Schema;
 use Illuminate\Support\ServiceProvider;
@@ -67,6 +69,7 @@ public function boot(UrlGenerator $url)
 
         Schema::defaultStringLength(191);
         Asset::observe(AssetObserver::class);
+        Maintenance::observe(MaintenanceObserver::class);
         User::observe(UserObserver::class);
         Accessory::observe(AccessoryObserver::class);
         Component::observe(ComponentObserver::class);

resources/views/partials/bootstrap-table.blade.php

@@ -368,12 +368,12 @@ function genericColumnObjLinkFormatter(destination) {
 
                 // Add some overrides for any funny urls we have
                 var dest = destination;
-                var dpolymorphicItemFormatterest = '';
+                var polymorphicItemFormatterDest;
                 if (destination=='fieldsets') {
-                    var dpolymorphicItemFormatterest = 'fields/';
+                    var polymorphicItemFormatterDest = 'fields/';
                 }
 
-                return '<nobr><a href="{{ config('app.url') }}/' + dpolymorphicItemFormatterest + dest + '/' + value.id + '">' + value.name + '</a></span>';
+                return '<nobr><a href="{{ config('app.url') }}/' + polymorphicItemFormatterDest + dest + '/' + value.id + '">' + value.name + '</a></span>';
             }
         };
     }
@@ -438,8 +438,6 @@ function genericActionsFormatter(owner_name, element_name) {
 
                 if (row.name) {
                     var name_for_box = row.name
-                } else if (row.title) {
-                    var name_for_box = row.title
                 } else if (row.asset_tag) {
                     var name_for_box = row.asset_tag
                 }
@@ -503,6 +501,9 @@ function polymorphicItemFormatter(value) {
             } else if (value.type == 'location') {
                 item_destination = 'locations'
                 item_icon = 'fas fa-map-marker-alt';
+            } else if (value.type == 'maintenance') {
+                item_destination = 'maintenances'
+                item_icon = 'fa-solid fa-screwdriver-wrench';
             } else if (value.type == 'model') {
                 item_destination = 'models'
                 item_icon = '';
@@ -618,25 +619,26 @@ function assetRequestActionsFormatter (row, value) {
 
 
     var formatters = [
-        'hardware',
         'accessories',
-        'consumables',
-        'components',
-        'locations',
-        'users',
-        'manufacturers',
-        'maintenances',
-        'statuslabels',
-        'models',
-        'licenses',
         'categories',
-        'suppliers',
-        'departments',
         'companies',
+        'components',
+        'consumables',
+        'departments',
         'depreciations',
         'fieldsets',
         'groups',
-        'kits'
+        'hardware',
+        'kits',
+        'licenses',
+        'locations',
+        'maintenances',
+        'maintenances',
+        'manufacturers',
+        'models',
+        'statuslabels',
+        'suppliers',
+        'users',
     ];
 
     for (var i in formatters) {

tests/Feature/Maintenances/Api/CreateMaintenanceTest.php

@@ -65,6 +65,8 @@ public function testCanCreateMaintenance()
             'image' => $maintenance->image,
             'created_by' => $actor->id,
         ]);
+
+        $this->assertHasTheseActionLogs($maintenance, ['create']);
     }
 
 

tests/Feature/Maintenances/Api/DeleteMaintenancesTest.php

@@ -55,6 +55,7 @@ public function testAdheresToFullMultipleCompaniesSupportScoping()
         $this->assertNotSoftDeleted($maintenanceA);
         $this->assertNotSoftDeleted($maintenanceB);
         $this->assertSoftDeleted($maintenanceC);
+        $this->assertHasTheseActionLogs($maintenanceC, ['create', 'delete']);
     }
 
     public function testCanDeleteMaintenance()
@@ -66,5 +67,7 @@ public function testCanDeleteMaintenance()
             ->assertStatusMessageIs('success');
 
         $this->assertSoftDeleted($maintenance);
+
+        $this->assertHasTheseActionLogs($maintenance, ['create', 'delete']);
     }
 }

tests/Feature/Maintenances/Api/EditMaintenanceTest.php

@@ -59,5 +59,7 @@ public function testCanEditMaintenance()
             'notes' => 'A note',
             'image' => $maintenance->image,
         ]);
+
+        $this->assertHasTheseActionLogs($maintenance, ['create', 'update']);
     }
 }

tests/Feature/Maintenances/Ui/CreateMaintenanceTest.php

@@ -71,5 +71,7 @@ public function testCanCreateMaintenance()
             'image' => $maintenance->image,
             'created_by' => $actor->id,
         ]);
+
+        $this->assertHasTheseActionLogs($maintenance, ['create']);
     }
 }

tests/Feature/Maintenances/Ui/EditMaintenanceTest.php

@@ -60,6 +60,8 @@ public function testCanUpdateMaintenance()
             'notes' => 'A note',
             'cost' => '100.99',
         ]);
+
+        $this->assertHasTheseActionLogs($maintenance, ['create', 'update']);
     }
 
 }