Merge pull request #16295 from snipe/#16282_adds_accessories_tab_to_assets

snipe · web-flow · commit 84a29378cd69 · 2025-02-22T14:21:32.000Z
Fixed #16282 - adds accessories tab to assets
diff --git a/app/Http/Controllers/Api/AssetsController.php b/app/Http/Controllers/Api/AssetsController.php
@@ -1230,7 +1230,10 @@ public function assignedAccessories(Request $request, Asset $asset) : JsonRespon
     {
         $this->authorize('view', Asset::class);
         $this->authorize('view', $asset);
-        $accessory_checkouts = AccessoryCheckout::AssetsAssigned()->with('adminuser')->with('accessories');
+        $accessory_checkouts = AccessoryCheckout::AssetsAssigned()
+            ->where('assigned_to', $asset->id)
+            ->with('adminuser')
+            ->with('accessories');
 
         $offset = ($request->input('offset') > $accessory_checkouts->count()) ? $accessory_checkouts->count() : app('api_offset_value');
         $limit = app('api_limit_value');
@@ -1239,6 +1242,8 @@ public function assignedAccessories(Request $request, Asset $asset) : JsonRespon
         $accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();
         return (new AssetsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);
     }
+
+
     /**
      * Generate asset labels by tag
      * 
diff --git a/app/Http/Transformers/AssetsTransformer.php b/app/Http/Transformers/AssetsTransformer.php
@@ -309,6 +309,7 @@ public function transformCheckedoutAccessory(AccessoryCheckout $accessory_checko
                 'id' => $accessory_checkout->accessory->id,
                 'name' => $accessory_checkout->accessory->name,
             ],
+            'assigned_to' => $accessory_checkout->assigned_to,
             'image' => ($accessory_checkout->accessory->image) ? Storage::disk('public')->url('accessories/'.e($accessory_checkout->accessory->image)) : null,
             'note' => $accessory_checkout->note ? e($accessory_checkout->note) : null,
             'created_by' => $accessory_checkout->adminuser ? [
diff --git a/app/Http/Transformers/LocationsTransformer.php b/app/Http/Transformers/LocationsTransformer.php
@@ -100,6 +100,7 @@ public function transformCheckedoutAccessory(AccessoryCheckout $accessory_checko
 
             $array = [
                 'id' => $accessory_checkout->id,
+                'assigned_to' => $accessory_checkout->assigned_to,
                 'accessory' => [
                     'id' => $accessory_checkout->accessory->id,
                     'name' => $accessory_checkout->accessory->name,
diff --git a/app/Models/AccessoryCheckout.php b/app/Models/AccessoryCheckout.php
@@ -57,7 +57,7 @@ public function accessories()
      */
     public function adminuser()
     {
-        return $this->hasOne(\App\Models\User::class, 'created_by');
+        return $this->hasOne(\App\Models\User::class, 'id', 'created_by');
     }
 
     /**
@@ -118,7 +118,7 @@ public function scopeLocationAssigned(Builder $query): void
         $query->where('assigned_type', '=', Location::class);
     }
 
-    public function scopeAssetAssigned(Builder $query): void
+    public function scopeAssetsAssigned(Builder $query): void
     {
         $query->where('assigned_type', '=', Asset::class);
     }
diff --git a/app/Models/Asset.php b/app/Models/Asset.php
@@ -523,6 +523,18 @@ public function assignedAssets()
         return $this->morphMany(self::class, 'assigned', 'assigned_type', 'assigned_to')->withTrashed();
     }
 
+    /**
+     * Establishes the accessory -> asset assignment relationship
+     *
+     * @author A. Gianotto <snipe@snipe.net>
+     * @since [v3.0]
+     * @return \Illuminate\Database\Eloquent\Relations\Relation
+     */
+    public function assignedAccessories()
+    {
+        return $this->morphMany(\App\Models\AccessoryCheckout::class, 'assigned', 'assigned_type', 'assigned_to');
+    }
+
 
     /**
      * Get the asset's location based on the assigned user
diff --git a/app/Presenters/AssetPresenter.php b/app/Presenters/AssetPresenter.php
@@ -352,6 +352,74 @@ public static function dataTableLayout()
         return json_encode($layout);
     }
 
+
+    public static function assignedAccessoriesDataTableLayout()
+    {
+        $layout = [
+            [
+                'field' => 'id',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.id'),
+                'visible' => false,
+            ],
+            [
+                'field' => 'accessory',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.accessory'),
+                'visible' => true,
+                'formatter' => 'accessoriesLinkObjFormatter',
+            ],
+            [
+                'field' => 'image',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.image'),
+                'visible' => true,
+                'formatter' => 'imageFormatter',
+            ],
+            [
+                'field' => 'note',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('general.notes'),
+                'visible' => true,
+            ],
+            [
+                'field' => 'created_at',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => true,
+                'title' => trans('admin/hardware/table.checkout_date'),
+                'visible' => true,
+                'formatter' => 'dateDisplayFormatter',
+            ],
+            [
+                'field' => 'created_by',
+                'searchable' => false,
+                'sortable' => false,
+                'title' => trans('general.created_by'),
+                'visible' => false,
+                'formatter' => 'usersLinkObjFormatter',
+            ],
+            [
+                'field' => 'available_actions',
+                'searchable' => false,
+                'sortable' => false,
+                'switchable' => false,
+                'title' => trans('table.actions'),
+                'formatter' => 'accessoriesInOutFormatter',
+            ],
+        ];
+
+        return json_encode($layout);
+    }
+
     /**
      * Generate html link to this items name.
      * @return string
diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.php
@@ -77,13 +77,30 @@
                           <span class="hidden-lg hidden-md">
                             <x-icon type="assets" class="fa-2x" />
                           </span>
-                            <span class="hidden-xs hidden-sm">{{ trans('general.assets') }}
+                            <span class="hidden-xs hidden-sm">
+                                {{ trans('general.assets') }}
                                 {!! ($asset->assignedAssets()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAssets()->count()).'</span>' : '' !!}
 
                           </span>
                         </a>
                     </li>
 
+                    @if ($asset->assignedAccessories->count() > 0)
+                        <li>
+                            <a href="#accessories_assigned" data-toggle="tab" data-tooltip="true">
+
+                                <span class="hidden-lg hidden-md">
+                                    <i class="fas fa-keyboard fa-2x"></i>
+                                </span>
+                                <span class="hidden-xs hidden-sm">
+                                    {{ trans('general.accessories_assigned') }}
+                                    {!! ($asset->assignedAccessories()->count() > 0 ) ? '<span class="badge badge-secondary">'.number_format($asset->assignedAccessories()->count()).'</span>' : '' !!}
+
+                                </span>
+                            </a>
+                        </li>
+                    @endif
+
 
                     <li>
                         <a href="#history" data-toggle="tab">
@@ -1294,6 +1311,40 @@ class="table table-striped snipe-table"
                     </div> <!-- /.tab-pane software -->
 
 
+                <div class="tab-pane" id="accessories_assigned">
+
+
+                    <div class="table table-responsive">
+
+                        <h2 class="box-title" style="float:left">
+                            {{ trans('general.accessories_assigned') }}
+                        </h2>
+
+                        <table
+                                data-columns="{{ \App\Presenters\AssetPresenter::assignedAccessoriesDataTableLayout() }}"
+                                data-cookie-id-table="accessoriesAssignedListingTable"
+                                data-pagination="true"
+                                data-id-table="accessoriesAssignedListingTable"
+                                data-search="true"
+                                data-side-pagination="server"
+                                data-show-columns="true"
+                                data-show-export="true"
+                                data-show-refresh="true"
+                                data-sort-order="asc"
+                                data-click-to-select="true"
+                                id="accessoriesAssignedListingTable"
+                                class="table table-striped snipe-table"
+                                data-url="{{ route('api.assets.assigned_accessories', ['asset' => $asset]) }}"
+                                data-export-options='{
+                              "fileName": "export-locations-{{ str_slug($asset->name) }}-accessories-{{ date('Y-m-d') }}",
+                              "ignoreColumn": ["actions","image","change","checkbox","checkincheckout","icon"]
+                              }'>
+                        </table>
+
+                    </div><!-- /.table-responsive -->
+                </div><!-- /.tab-pane -->
+
+
                     <div class="tab-pane fade" id="maintenances">
                         <div class="row{{($asset->assetmaintenances->count() > 0 ) ? '' : ' hidden-print'}}">
                             <div class="col-md-12">
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
@@ -314,11 +314,13 @@ class="table table-striped snipe-table"
               </div><!-- /.tab-pane -->
 
               <div class="tab-pane" id="accessories_assigned">
-                  <h2 class="box-title">
-                      Assigned Accessories
-                  </h2>
 
                   <div class="table table-responsive">
+
+                      <h2 class="box-title" style="float:left">
+                          {{ trans('general.accessories_assigned') }}
+                      </h2>
+
                       <table
                               data-columns="{{ \App\Presenters\LocationPresenter::assignedAccessoriesDataTableLayout() }}"
                               data-cookie-id-table="accessoriesAssignedListingTable"

Original file line number	Diff line number	Diff line change
`@@ -1230,7 +1230,10 @@ public function assignedAccessories(Request $request, Asset $asset) : JsonRespon`
`1230`	`1230`	`{`
`1231`	`1231`	`$this->authorize('view', Asset::class);`
`1232`	`1232`	`$this->authorize('view', $asset);`
`1233`		`- $accessory_checkouts = AccessoryCheckout::AssetsAssigned()->with('adminuser')->with('accessories');`
	`1233`	`+ $accessory_checkouts = AccessoryCheckout::AssetsAssigned()`
	`1234`	`+ ->where('assigned_to', $asset->id)`
	`1235`	`+ ->with('adminuser')`
	`1236`	`+ ->with('accessories');`
`1234`	`1237`
`1235`	`1238`	`$offset = ($request->input('offset') > $accessory_checkouts->count()) ? $accessory_checkouts->count() : app('api_offset_value');`
`1236`	`1239`	`$limit = app('api_limit_value');`
`@@ -1239,6 +1242,8 @@ public function assignedAccessories(Request $request, Asset $asset) : JsonRespon`
`1239`	`1242`	`$accessory_checkouts = $accessory_checkouts->skip($offset)->take($limit)->get();`
`1240`	`1243`	`return (new AssetsTransformer)->transformCheckedoutAccessories($accessory_checkouts, $total);`
`1241`	`1244`	`}`
	`1245`	`+`
	`1246`	`+`
`1242`	`1247`	`/**`
`1243`	`1248`	`* Generate asset labels by tag`
`1244`	`1249`	`*`
Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ public function accessories()`
`57`	`57`	`*/`
`58`	`58`	`public function adminuser()`
`59`	`59`	`{`
`60`		`- return $this->hasOne(\App\Models\User::class, 'created_by');`
	`60`	`+ return $this->hasOne(\App\Models\User::class, 'id', 'created_by');`
`61`	`61`	`}`
`62`	`62`
`63`	`63`	`/**`
`@@ -118,7 +118,7 @@ public function scopeLocationAssigned(Builder $query): void`
`118`	`118`	`$query->where('assigned_type', '=', Location::class);`
`119`	`119`	`}`
`120`	`120`
`121`		`- public function scopeAssetAssigned(Builder $query): void`
	`121`	`+ public function scopeAssetsAssigned(Builder $query): void`
`122`	`122`	`{`
`123`	`123`	`$query->where('assigned_type', '=', Asset::class);`
`124`	`124`	`}`