Skip to content

A free open source IT asset/license management system

Use history tab icon

snipec1c3c6724ff3
diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.php
index 95f7bd62c7..63d3ff8b55 100644
--- a/resources/lang/en-US/general.php
+++ b/resources/lang/en-US/general.php
@@ -130,6 +130,7 @@ return [
'department' => 'Department',
'deployed' => 'Deployed',
'depreciation' => 'Depreciation',
+ 'depreciation_type' => 'Depreciation Type',
'depreciations' => 'Depreciations',
'depreciation_report' => 'Depreciation Report',
'details' => 'Details',
diff --git a/resources/views/blade/box/info-panel.blade.php b/resources/views/blade/box/info-panel.blade.php
index 5cf64863fa..3ace037af2 100644
--- a/resources/views/blade/box/info-panel.blade.php
+++ b/resources/views/blade/box/info-panel.blade.php
@@ -372,7 +372,7 @@
@if ($infoPanelObj->months)
- <x-info-element title="{{ trans('general.months') }}">
+ <x-info-element icon_type="eol" title="{{ trans('general.depreciation') }}">
{{ $infoPanelObj->months }}
{{ trans('general.months') }}
</x-info-element>
@@ -380,7 +380,7 @@
@if ($infoPanelObj->depreciation_type)
- <x-info-element title="{{ trans('general.depreciation_type') }}">
+ <x-info-element icon="fa-solid fa-arrow-trend-down fa-fw" title="{{ trans('general.depreciation_type') }}">
@if ($infoPanelObj->depreciation_type == 'amount')
{{ trans('general.depreciation_options.amount') }}
@elseif ($infoPanelObj->depreciation_type == 'percent')
diff --git a/resources/views/depreciations/view.blade.php b/resources/views/depreciations/view.blade.php
index ec135bd5c2..3981a9e237 100644
--- a/resources/views/depreciations/view.blade.php
+++ b/resources/views/depreciations/view.blade.php
@@ -18,37 +18,9 @@
<x-page-column class="col-md-9 main-panel">
<x-tabs>
<x-slot:tabnav>
- @can('view', \App\Models\Asset::class)
- <x-tabs.nav-item
- class="active"
- name="assets"
- icon_type="asset"
- label="{{ trans('general.assets') }}"
- count="{{ $depreciation->assets()->AssetsForShow()->count() }}"
- tooltip="{{ trans('general.assets') }}"
- />
- @endcan
-
- @can('view', \App\Models\License::class)
- <x-tabs.nav-item
- name="licenses"
- icon_type="licenses"
- label="{{ trans('general.licenses') }}"
- count="{{ $depreciation->licenses()->count() }}"
- tooltip="{{ trans('general.licenses') }}"
- />
- @endcan
-
- @can('view', \App\Models\AssetModel::class)
- <x-tabs.nav-item
- name="models"
- icon="fa-solid fa-boxes-packing"
- label="{{ trans('general.asset_models') }}"
- count="{{ $depreciation->models_count }}"
- tooltip="{{ trans('general.asset_models') }}"
- />
- @endcan
-
+ <x-tabs.asset-tab count="{{ $depreciation->assets()->AssetsForShow()->count() }}"/>
+ <x-tabs.license-tab count="{{ $depreciation->licenses->count() }}"/>
+ <x-tabs.model-tab count="{{ $depreciation->models->count() }}"/>
</x-slot:tabnav>
<x-slot:tabpanes>
@@ -60,7 +32,6 @@
<!-- end assets tab pane -->
-
<!-- start licenses tab pane -->
<x-tabs.pane name="licenses">
<x-table.licenses name="licenses" :route="route('api.licenses.index', ['depreciation_id' => $depreciation->id])"/>
@@ -70,17 +41,7 @@
<!-- start models tab pane -->
@can('view', \App\Models\AssetModel::class)
<x-tabs.pane name="models">
- <x-slot:table_header>
- {{ trans('general.models') }}
- </x-slot:table_header>
- <x-table
- name="models"
- buttons="modelButtons"
- api_url="{{ route('api.models.index', ['depreciation_id' => $depreciation->id]) }}"
- :presenter="\App\Presenters\AssetModelPresenter::dataTableLayout()"
- export_filename="export-depreciation-{{ str_slug($depreciation->name) }}-models-{{ date('Y-m-d') }}"
- />
-
+ <x-table.models :route="route('api.models.index', ['status' => e(request('status')), 'depreciation_id' => $depreciation->id])"/>
</x-tabs.pane>
@endcan
<!-- end licenses tab pane -->
diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.php
index 644a653671..ed9244028f 100755
--- a/resources/views/licenses/view.blade.php
+++ b/resources/views/licenses/view.blade.php
@@ -33,20 +33,8 @@
count="{{ $license->availCount()->count() }}"
/>
- <x-tabs.nav-item
- name="files"
- icon_type="files"
- label="{{ trans('general.files') }}"
- count="{{ $license->uploads()->count() }}"
- />
-
- <x-tabs.nav-item
- name="history"
- icon_type="history"
- label="{{ trans('general.history') }}"
- tooltip="{{ trans('general.history') }}"
- />
-
+ <x-tabs.files-tab name="files" count="{{ $license->uploads()->count() }}"/>
+ <x-tabs.history-tab model="\App\Models\License::class"/>
@can('update', $license)
<x-tabs.nav-item-upload />
diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.php
index 988d29ee6a..7192860b0b 100644
--- a/resources/views/locations/view.blade.php
+++ b/resources/views/locations/view.blade.php
@@ -95,13 +95,7 @@
/>
<x-tabs.files-tab count="{{ $location->uploads->count() }}"/>
-
- <x-tabs.nav-item
- name="history"
- icon="fa-solid fa-clock-rotate-left fa-fw"
- label="{{ trans('general.history') }}"
- tooltip="{{ trans('general.history') }}"
- />
+ <x-tabs.history-tab model="\App\Models\Location::class"/>
@can('update', $location)
<x-tabs.nav-item-upload />