A free open source IT asset/license management system
Small fixes in formatting
snipee285ee293128
diff --git a/app/Helpers/IconHelper.php b/app/Helpers/IconHelper.phpindex b10d2e804e..741ea01ae4 100644--- a/app/Helpers/IconHelper.php+++ b/app/Helpers/IconHelper.php@@ -260,6 +260,8 @@ class IconHelperreturn 'fa-solid fa-file-invoice';case 'checkout-all':return 'fa-solid fa-arrows-down-to-people';+ case 'checkin-all':+ return 'fa-solid fa-arrows-turn-right';case 'square-right':return 'fa-regular fa-square-caret-right';case 'square-left':diff --git a/app/Http/Controllers/Licenses/LicensesController.php b/app/Http/Controllers/Licenses/LicensesController.phpindex 20f74b6893..d34fd3bbca 100755--- a/app/Http/Controllers/Licenses/LicensesController.php+++ b/app/Http/Controllers/Licenses/LicensesController.php@@ -262,7 +262,7 @@ class LicensesController extends Controller*/public function show(License $license){- $license = License::with('assignedusers')->find($license->id);+ $license = License::with('assignedusers')->withCount('freeSeats as free_seats_count')->find($license->id);$users_count = User::where('autoassign_licenses', '1')->count();diff --git a/app/Models/CustomField.php b/app/Models/CustomField.phpindex a917050e2b..6f833a8491 100644--- a/app/Models/CustomField.php+++ b/app/Models/CustomField.php@@ -57,6 +57,7 @@ class CustomField extends Model'show_in_listview' => 'boolean','show_in_requestable_list' => 'boolean','show_in_email' => 'boolean',+ 'format' => 'nullable|string|max:191',];protected $casts = [diff --git a/app/Models/SnipeModel.php b/app/Models/SnipeModel.phpindex cede985177..e0eae999ce 100644--- a/app/Models/SnipeModel.php+++ b/app/Models/SnipeModel.php@@ -235,29 +235,50 @@ class SnipeModel extends Modelreturn false;}+ public function actionlog()+ {+ return $this->hasMany(Actionlog::class, 'target_id')->where('target_type', '=', self::class)->orderBy('created_at', 'DESC')->withTrashed();+ }+public function showCheckoutButton($item){- if ((method_exists($item, 'numRemaining')) && ($item->numRemaining() > 0)) {- return true;++ if (method_exists($item, 'numRemaining')) {+ if ($item->numRemaining() > 0) {+ return 'show-active';+ }+ return 'show-disabled';}- if ((method_exists($item, 'availableForCheckout')) && ($item->availableForCheckout())) {- return true;+ if (method_exists($item, 'availableForCheckout')) {+ if ($item->availableForCheckout() > 0) {+ return 'show-active';+ }+ return 'show-disabled';}return false;++}public function showCheckinButton($item){- if ((method_exists($item, 'numRemaining')) && ($item->numRemaining() <= 0)) {- return true;+ if (method_exists($item, 'numRemaining')) {+ if ($item->numRemaining() <= 0) {+ return 'show-active';+ }+ return 'show-disabled';}- if ((method_exists($item, 'availableForCheckIn')) && ($item->availableForCheckIn())) {- return true;+ if (method_exists($item, 'availableForCheckout')) {+ if ($item->availableForCheckIn()) {+ return 'show-active';+ }+ return 'show-disabled';}return false;+}}diff --git a/resources/lang/en-US/admin/maintenances/form.php b/resources/lang/en-US/admin/maintenances/form.phpindex c7a96fa1f4..030c597d85 100644--- a/resources/lang/en-US/admin/maintenances/form.php+++ b/resources/lang/en-US/admin/maintenances/form.php@@ -8,7 +8,7 @@ return ['completion_date' => 'Completion Date','cost' => 'Cost','is_warranty' => 'Warranty Improvement',- 'asset_maintenance_time' => 'Asset Maintenance Time (in days)',+ 'asset_maintenance_time' => 'Duration','notes' => 'Notes','update' => 'Update Asset Maintenance','create' => 'Create Asset Maintenance',diff --git a/resources/views/accessories/view.blade.php b/resources/views/accessories/view.blade.phpindex 006a7155a0..8411fb944c 100644--- a/resources/views/accessories/view.blade.php+++ b/resources/views/accessories/view.blade.php@@ -80,9 +80,9 @@<x-box class="side-box expanded"><x-info-panel :infoPanelObj="$accessory" img_path="{{ app('accessories_upload_url') }}"><x-slot:buttons>+ <x-button.edit :item="$accessory" :route="route('accessories.edit', $accessory->id)"/>+ <x-button.clone :item="$accessory" :route="route('clone/accessories', $accessory->id)"/><x-button.checkout permission="checkout" :item="$accessory" :route="route('accessories.checkout.show', $accessory->id)" />- <x-button.edit :item="$accessory" :route="route('accessories.edit', $accessory->id)" />- <x-button.clone :item="$accessory" :route="route('clone/accessories', $accessory->id)" /><x-button.delete :item="$accessory" /></x-slot:buttons></x-info-panel>diff --git a/resources/views/blade/button/checkout.blade.php b/resources/views/blade/button/checkout.blade.phpindex 1d7dcc2d35..44d828b44f 100644--- a/resources/views/blade/button/checkout.blade.php+++ b/resources/views/blade/button/checkout.blade.php@@ -6,12 +6,19 @@])@can('checkout', $item)- @if ($item->showCheckoutButton($item))+ @if ($item->showCheckoutButton($item) == 'show-active')<a href="{{ $route }}" class="btn btn-sm bg-maroon hidden-print" data-tooltip="true" data-placement="top" data-title="{{ trans('general.checkout') }}"><x-icon type="checkout" class="fa-fw" />@if ($wide=='true'){{ trans('general.checkout') }}@endif</a>+ @elseif ($item->showCheckoutButton($item) == 'show-disabled')+ <button href="#" class="btn btn-sm bg-maroon hidden-print disabled" data-tooltip="true" data-placement="top" data-title="{{ trans('general.undeployable_tooltip') }}">+ <x-icon type="checkout" class="fa-fw"/>+ @if ($wide=='true')+ {{ trans('general.checkout') }}+ @endif+ </button>@endif@endcandiff --git a/resources/views/blade/button/delete.blade.php b/resources/views/blade/button/delete.blade.phpindex 9ecd501c81..3f39bb7280 100644--- a/resources/views/blade/button/delete.blade.php+++ b/resources/views/blade/button/delete.blade.php@@ -14,7 +14,7 @@<x-icon type="delete" class="fa-fw" /></button>@else- <button class="pull-right btn btn-sm btn-danger delete-asset{{ $wide == 'true' ? ' btn-block btn-social' : '' }}" style="margin-right: 8px;" data-toggle="modal" title="{{ trans('general.delete_what', ['item'=> trans('general.'.$type)]) }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $item->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-icon="fa fa-trash" data-placement="top" data-title="{{ trans('general.delete_what', ['item'=> trans('general.'.$type)]) }}" onClick="return false;">+ <button class="pull-right btn btn-sm btn-danger delete-asset{{ $wide == 'true' ? ' btn-block btn-social' : '' }}" style="margin-right: 8px;" data-toggle="modal" title="{{ ($item->assignedTo) ? trans('general.checkin_and_delete') : trans('general.delete') }}" data-content="{{ trans('general.sure_to_delete_var', ['item' => $item->name]) }}" data-target="#dataConfirmModal" data-tooltip="true" data-icon="fa fa-trash" data-placement="top" onClick="return false;"><x-icon type="delete" class="fa-fw" /></button>@endifdiff --git a/resources/views/blade/info-panel/index.blade.php b/resources/views/blade/info-panel/index.blade.phpindex f040176b44..183c05ef05 100644--- a/resources/views/blade/info-panel/index.blade.php+++ b/resources/views/blade/info-panel/index.blade.php@@ -65,9 +65,11 @@{{ $slot }}- <x-info-element icon_type="notes" title="{{ trans('general.notes') }}">- <x-copy-to-clipboard class="pull-right" copy_what="notes">{!! nl2br(Helper::parseEscapedMarkedownInline($infoPanelObj->notes)) !!}</x-copy-to-clipboard>- </x-info-element>+ @if ($infoPanelObj->notes)+ <x-info-element icon_type="notes" title="{{ trans('general.notes') }}">+ <x-copy-to-clipboard class="pull-right" copy_what="notes">{!! nl2br(Helper::parseEscapedMarkedownInline($infoPanelObj->notes)) !!}</x-copy-to-clipboard>+ </x-info-element>+ @endif@if ($infoPanelObj->serial)@can('viewKeys', $infoPanelObj)@@ -223,7 +225,7 @@@if ($infoPanelObj->category)<x-info-element icon_type="category" icon_color="{{ $infoPanelObj->category->tag_color }}" title="{{ trans('general.category') }}">- <x-copy-to-clipboard class="pull-right" copy_what="category">{!! $infoPanelObj->category->present()->formattedNameLink !!}</x-copy-to-clipboard>+ <x-copy-to-clipboard class="pull-right" copy_what="category">{!! $infoPanelObj->category->present()->nameUrl !!}</x-copy-to-clipboard></x-info-element>@endif@@ -384,7 +386,7 @@<x-info-element><x-icon type="calendar" class="fa-fw" title="{{ trans('general.purchase_date') }}" />{{ trans('general.purchased_plain') }}- {{ Helper::getFormattedDateObject($infoPanelObj->purchase_date, 'datetime', false) }} -+ {{ Helper::getFormattedDateObject($infoPanelObj->purchase_date, 'date', false) }} -<span class="text-muted">{{ Carbon::parse($infoPanelObj->purchase_date)->diffForHumans(['parts' => 2]) }}</span></x-info-element>@endifdiff --git a/resources/views/blade/info-panel/manufacturer.blade.php b/resources/views/blade/info-panel/manufacturer.blade.phpindex 5ef8e076ae..69a56f5f90 100644--- a/resources/views/blade/info-panel/manufacturer.blade.php+++ b/resources/views/blade/info-panel/manufacturer.blade.php@@ -6,10 +6,10 @@@if ($manufacturer)- <x-info-element icon_type="manufacturer" title="{{ trans('general.manufacturer') }}">- {!! $manufacturer->present()->formattedNameLink !!}+ <x-info-element icon_type="manufacturer" title="{{ trans('general.manufacturer') }}" icon_color="{{ $manufacturer->tag_color }}">+ {!! $manufacturer->present()->nameUrl !!}<a class="pull-right js-copy-link" style="font-size: 16px; margin-right: 3px;" type="button" data-toggle="collapse" data-target="#manufacturerContact" aria-expanded="false" aria-controls="manufacturerContact">- <x-icon type="plus" class="fa-faw"/>+ <x-icon type="plus" class="fa-fw"/></a></x-info-element>diff --git a/resources/views/blade/info-panel/supplier.blade.php b/resources/views/blade/info-panel/supplier.blade.phpindex 288b0721d0..4232bbda9a 100644--- a/resources/views/blade/info-panel/supplier.blade.php+++ b/resources/views/blade/info-panel/supplier.blade.php@@ -4,10 +4,10 @@@if ($infoPanelObj->supplier)- <x-info-element icon_type="supplier" title="{{ trans('general.supplier') }}">- {!! $infoPanelObj->supplier->present()->formattedNameLink !!}+ <x-info-element icon_type="supplier" icon_color="{{ $infoPanelObj->supplier->tag_color }}" title="{{ trans('general.supplier') }}">+ {!! $infoPanelObj->supplier->present()->nameUrl !!}<a class="pull-right js-copy-link" style="font-size: 16px; margin-right: 3px;" type="button" data-toggle="collapse" data-target="#supplierContact" aria-expanded="false" aria-controls="supplierContact">- <x-icon type="plus" class="fa-faw"/>+ <x-icon type="plus" class="fa-fw"/></a></x-info-element>diff --git a/resources/views/components/checkout.blade.php b/resources/views/components/checkout.blade.phpindex 2db2421d40..9765f71225 100644--- a/resources/views/components/checkout.blade.php+++ b/resources/views/components/checkout.blade.php@@ -55,7 +55,7 @@{{ trans('general.qty') }}</label><div class="col-md-2 col-sm-5 col-xs-5">- <input class="form-control required col-md-12" type="text" name="assigned_qty" id="assigned_qty" value="{{ old('assigned_qty') ?? 1 }}" maxlength="99999" />+ <input class="form-control" type="number" name="assigned_qty" id="assigned_qty" value="1" min="1" max="{{ old('assigned_qty') ?? $component->numRemaining()}}" maxlength="999999"/></div>@if ($errors->first('assigned_qty'))<div class="col-md-9 col-md-offset-3">diff --git a/resources/views/components/view.blade.php b/resources/views/components/view.blade.phpindex c1031fc182..8e2294a6d3 100644--- a/resources/views/components/view.blade.php+++ b/resources/views/components/view.blade.php@@ -71,9 +71,9 @@<x-info-panel :infoPanelObj="$snipe_component" img_path="{{ app('components_upload_url') }}"><x-slot:buttons>+ <x-button.edit :item="$snipe_component" :route="route('components.edit', $snipe_component->id)"/>+ <x-button.clone :item="$snipe_component" :route="route('components.clone.create', $snipe_component->id)"/><x-button.checkout :item="$snipe_component" :route="route('components.checkout.show', $snipe_component->id)" />- <x-button.edit :item="$snipe_component" :route="route('components.edit', $snipe_component->id)" />- <x-button.clone :item="$snipe_component" :route="route('components.clone.create', $snipe_component->id)" /><x-button.delete :item="$snipe_component" /></x-slot:buttons>diff --git a/resources/views/consumables/view.blade.php b/resources/views/consumables/view.blade.phpindex cab68b6841..cc8d0144af 100644--- a/resources/views/consumables/view.blade.php+++ b/resources/views/consumables/view.blade.php@@ -72,10 +72,10 @@<x-info-panel :infoPanelObj="$consumable" img_path="{{ app('consumables_upload_url') }}"><x-slot:buttons>+ <x-button.edit :item="$consumable" :route="route('consumables.edit', $consumable->id)"/>+ <x-button.clone :item="$consumable" :route="route('consumables.clone.create', $consumable->id)"/>+ <x-button.delete :item="$consumable"/><x-button.checkout :item="$consumable" :route="route('consumables.checkout.show', $consumable->id)" />- <x-button.edit :item="$consumable" :route="route('consumables.edit', $consumable->id)" />- <x-button.clone :item="$consumable" :route="route('consumables.clone.create', $consumable->id)" />- <x-button.delete :item="$consumable" /></x-slot:buttons></x-info-panel>diff --git a/resources/views/hardware/view.blade.php b/resources/views/hardware/view.blade.phpindex 75244b9646..52ec211ec1 100755--- a/resources/views/hardware/view.blade.php+++ b/resources/views/hardware/view.blade.php@@ -73,13 +73,13 @@<x-page-data><x-page-column class="col-md-4">- <x-well>+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;"><x-info-element.status :infoObject="$asset"/></x-well></x-page-column><x-page-column class="col-md-4">- <x-well>+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;"><x-icon type="calendar" class="fa-fw"/><strong>{{ trans('general.last_checkout') }}</strong>@if ($asset->last_checkout != '')@@ -92,7 +92,7 @@</x-page-column><x-page-column class="col-md-4">- <x-well>+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;"><x-icon type="expected_checkin" class="fa-fw"/><strong>{{ trans('general.expected_checkin') }}</strong>@if ($asset->expected_checkin!='')diff --git a/resources/views/licenses/view.blade.php b/resources/views/licenses/view.blade.phpindex 0897972624..de90ff7759 100755--- a/resources/views/licenses/view.blade.php+++ b/resources/views/licenses/view.blade.php@@ -106,54 +106,49 @@<x-slot:buttons>+ <x-button.edit :item="$license" :route="route('licenses.edit', $license->id)"/>+ <x-button.clone :item="$license" :route="route('clone/license', $license->id)"/><x-button.checkout permission="checkout" :item="$license" :route="route('licenses.checkout', $license->id)" />- <x-button.edit :item="$license" :route="route('licenses.edit', $license->id)" />- <x-button.clone :item="$license" :route="route('clone/license', $license->id)" />- <x-button.delete :item="$license" />- </x-slot:buttons>--- <x-slot:before_list>--@can('checkout', $license)@if (($license->availCount()->count() > 0) && (!$license->isInactive()))- <a href="#" class="btn bg-maroon btn-sm btn-social btn-block hidden-print" style="margin-bottom: 5px;" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">- <x-icon type="checkout-all" />- {{ trans('admin/licenses/general.bulk.checkout_all.button') }}+ <a href="#" class="btn bg-maroon btn-sm hidden-print" data-toggle="modal" data-tooltip="true" title="{{ trans('admin/licenses/general.bulk.checkout_all.enabled_tooltip') }}" data-target="#checkoutFromAllModal">+ <x-icon type="checkout-all" class="fa-fw"/></a>@else- <span data-tooltip="true" title="{{ ($license->availCount()->count() == 0) ? trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') : trans('admin/licenses/message.checkout.license_is_inactive') }}" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 5px;" data-tooltip="true" title="{{ trans('general.checkout') }}">- <x-icon type="checkout" />- {{ trans('general.checkout') }}- </span>- <span data-tooltip="true" title="{{ ($license->availCount()->count() == 0) ? trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') : trans('admin/licenses/message.checkout.license_is_inactive') }}" class="btn bg-maroon btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 5px;" data-tooltip="true" title="{{ trans('general.checkout') }}">- <x-icon type="checkout" />- {{ trans('admin/licenses/general.bulk.checkout_all.button') }}+ <span data-tooltip="true" title="{{ ($license->availCount()->count() == 0) ? trans('admin/licenses/general.bulk.checkout_all.disabled_tooltip') : trans('admin/licenses/message.checkout.license_is_inactive') }}" class="btn bg-maroon btn-sm hidden-print disabled" title="{{ trans('general.checkout') }}">+ <x-icon type="checkout-all" class="fa-fw"/></span>@endif@endcan- @can('checkin', $license)- @if (($license->seats - $license->availCount()->count()) <= 0 )- <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip') }}">- <a href="#" class="btn btn-primary bg-purple btn-sm btn-social btn-block hidden-print disabled" style="margin-bottom: 25px;">- <x-icon type="checkin" />- {{ trans('admin/licenses/general.bulk.checkin_all.button') }}- </a>+ @can('checkin', $license)++ @if (($license->seats - $license->availCount()->count()) <= 0 )+ <span data-tooltip="true" title=" {{ trans('admin/licenses/general.bulk.checkin_all.disabled_tooltip') }}">+ <a href="#" class="btn btn-primary bg-purple btn-sm hidden-print disabled"><x-icon type="checkin-all" class="fa-fw"/></a></span>- @else- <a href="#" class="btn btn-primary bg-purple btn-sm btn-social btn-block hidden-print" style="margin-bottom: 25px;" data-toggle="modal" data-tooltip="true" data-target="#checkinFromAllModal" data-content="{{ trans('general.sure_to_delete') }} data-title="{{ trans('general.delete') }}" onClick="return false;">- <x-icon type="checkin" />- {{ trans('admin/licenses/general.bulk.checkin_all.button') }}- </a>- @endif- @endcan+ @else+ <a href="#" class="btn bg-purple btn-sm hidden-print" data-toggle="modal" data-tooltip="true" data-target="#checkinFromAllModal" data-content="{{ trans('general.sure_to_delete') }} title=" {{ trans('admin/licenses/general.bulk.checkin_all.button') }} data-title=" {{ trans('admin/licenses/general.bulk.checkin_all.button') }}">+ <x-icon type="checkin-all" class="fa-fw"/>+ </a>+ @endif+ @endcan+++ <x-button.delete :item="$license" />+++ </x-slot:buttons>+++ <x-slot:before_list>++</x-slot:before_list>diff --git a/resources/views/locations/view.blade.php b/resources/views/locations/view.blade.phpindex 7146fd0bdb..27745aceb5 100644--- a/resources/views/locations/view.blade.php+++ b/resources/views/locations/view.blade.php@@ -83,8 +83,8 @@@endcan- <x-tabs.consumable-tab count="{{ $location->consumables->count() }}"/>- <x-tabs.component-tab count="{{ $location->components->count() }}"/>+ <x-tabs.consumable-tab count="{{ $location->consumables()->count() }}"/>+ <x-tabs.component-tab count="{{ $location->components()->count() }}"/><x-tabs.nav-itemname="child_locations"@@ -94,9 +94,9 @@tooltip="{{ trans('general.child_locations') }}"/>- <x-tabs.files-tab count="{{ $location->uploads->count() }}"/>- <x-tabs.history-tab model="\App\Models\Location::class"/>- <x-tabs.upload-tab :item="$location"/>+ <x-tabs.files-tab count="{{ $location->uploads()->count() }}"/>+ <x-tabs.history-tab count="{{ $location->actionlog()->count() }}" model="\App\Models\Location::class"/>+ <x-tabs.upload-tab count="{{ $location->uploads()->count() }}" :item="$location"/></x-slot:tabnav>diff --git a/resources/views/maintenances/view.blade.php b/resources/views/maintenances/view.blade.phpindex 4932aa1ffd..6b2a631e18 100644--- a/resources/views/maintenances/view.blade.php+++ b/resources/views/maintenances/view.blade.php@@ -29,141 +29,118 @@ use Carbon\Carbon;<x-tabs.pane name="details">- <div class="tab-pane active" id="info">- <div class="row-new-striped">- <div class="row">-- <div class="col-md-3">- {{ trans('admin/maintenances/form.asset_maintenance_type') }}- </div>- <div class="col-md-9">- {{ $maintenance->asset_maintenance_type }}- </div>-- </div> <!-- /row -->-- <div class="row">- <div class="col-md-3">- {{ trans('general.asset') }}- </div>- <div class="col-md-9">- <a href="{{ route('hardware.show', $maintenance->asset_id) }}">- {{ $maintenance->asset?->present()->fullName }}- </a>- </div>- </div> <!-- /row -->-- <x-info-element.status :infoObject="$maintenance->asset" />-- @if ($maintenance->asset->model)- <div class="row">- <div class="col-md-3">- {{ trans('general.asset_model') }}- </div>- <div class="col-md-9">- <a href="{{ route('models.show', $maintenance->asset->model_id) }}">- {{ $maintenance->asset?->model?->name }}- </a>- </div>- </div> <!-- /row -->- @endif-- @if ($maintenance->asset->company)- <div class="row">- <div class="col-md-3">- {{ trans('general.company') }}- </div>- <div class="col-md-9">- <a href="{{ route('companies.show', $maintenance->asset->company_id) }}">- {{ $maintenance->asset?->company?->name }}- </a>- </div>- </div> <!-- /row -->- @endif---- <div class="row">- <div class="col-md-3">- {{ trans('admin/maintenances/form.start_date') }}- </div>- <div class="col-md-9">- {{ Helper::getFormattedDateObject($maintenance->start_date, 'date', false) }}- </div>- </div> <!-- /row -->-- <div class="row">- <div class="col-md-3">- {{ trans('admin/maintenances/form.completion_date') }}- </div>- <div class="col-md-9">- @if ($maintenance->completion_date)- {{ Helper::getFormattedDateObject($maintenance->completion_date, 'date', false) }}- @else- {{ trans('admin/maintenances/message.asset_maintenance_incomplete') }}- @endif- </div>- </div> <!-- /row -->-- @if ($maintenance->url)- <div class="row">- <div class="col-md-3">- {{ trans('general.url') }}- </div>- <div class="col-md-9">- <a href="{{ $maintenance->url }}">- {{ $maintenance->url }}- <x-icon type="external-link" />- </a>- </div>- </div> <!-- /row -->- @endif-- <div class="row">- <div class="col-md-3">- {{ trans('admin/maintenances/form.asset_maintenance_time') }}- </div>- <div class="col-md-9">- {{ $maintenance->asset_maintenance_time }}- </div>- </div> <!-- /row -->-- @if ($maintenance->cost > 0)- <div class="row">- <div class="col-md-3">- {{ trans('admin/maintenances/form.cost') }}- </div>- <div class="col-md-9">- {{ \App\Models\Setting::getSettings()->default_currency .' '. Helper::formatCurrencyOutput($maintenance->cost) }}- </div>- </div> <!-- /row -->- @endif-- <div class="row">- <div class="col-md-3">- {{ trans('admin/maintenances/form.is_warranty') }}- </div>- <div class="col-md-9">- {{ $maintenance->is_warranty ? trans('admin/maintenances/message.warranty') : trans('admin/maintenances/message.not_warranty') }}- </div>- </div> <!-- /row -->-- @if ($maintenance->notes)- <div class="row">- <div class="col-md-3">- {{ trans('admin/maintenances/form.notes') }}- </div>- <div class="col-md-9">- {!! nl2br(Helper::parseEscapedMarkedownInline($maintenance->notes)) !!}- </div>- </div> <!-- /row -->- @endif-- </div>- </div><!-- /row-new-striped -->+ <x-page-data>++ <x-page-column class="col-md-4">+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">+ <x-info-element.status :infoObject="$maintenance->asset"/>+ </x-well>+ </x-page-column>+++ <x-page-column class="col-md-4">+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">+ <x-icon type="asset" class="fa-fw"/>+ {!! $maintenance->asset?->present()->nameUrl !!}+ </x-well>+ </x-page-column>++ <x-page-column class="col-md-4">+ <x-well style="text-overflow: ellipsis;white-space: nowrap;overflow: hidden;">+ <x-icon type="maintenances" class="fa-fw"/>+ <strong>{{ trans('admin/maintenances/form.asset_maintenance_type') }}</strong>+ {{ $maintenance->asset_maintenance_type }}+ </x-well>+ </x-page-column>++ <x-page-column class="col-md-8 col-sm-12">++ <x-data-row :label="trans('admin/hardware/form.tag')" copy_what="asset_tag">+ {{ $maintenance->asset?->asset_tag }}+ </x-data-row>++ <x-data-row :label="trans('general.asset_model')" copy_what="model">+ {!! $maintenance->asset?->model?->present()->nameUrl !!}+ </x-data-row>++ <x-data-row :label="trans('general.model_no')" copy_what="model_number">+ {{ $maintenance->asset?->model?->model_number }}+ </x-data-row>++ <x-data-row :label="trans('general.start_date')" copy_what="start_date">+ {{ Helper::getFormattedDateObject($maintenance->start_date, 'date', false) }}+ </x-data-row>++ <x-data-row :label="trans('admin/maintenances/form.completion_date')" copy_what="completion_date">+ @if ($maintenance->completion_date)+ {{ Helper::getFormattedDateObject($maintenance->completion_date, 'date', false) }}+ @else+ {{ trans('admin/maintenances/message.asset_maintenance_incomplete') }}+ @endif+ </x-data-row>++ <x-data-row :label="trans('admin/maintenances/form.asset_maintenance_time')" copy_what="time">+ {{ $maintenance->asset_maintenance_time }} {{ trans('general.days') }}+ </x-data-row>++ <x-data-row :label="trans('admin/maintenances/form.cost')" copy_what="cost">+ {{ $snipeSettings->default_currency .' '. Helper::formatCurrencyOutput($maintenance->cost) }}+ </x-data-row>++ <x-data-row :label="trans('admin/maintenances/form.is_warranty')" copy_what="warranty_improvement">+ @if ($maintenance->is_warranty=='1')+ <x-icon type="checkmark" class="text-success"/>+ {{ trans('general.yes') }}+ @else+ <x-icon type="x" class="text-danger"/>+ {{ trans('general.no') }}+ @endif++ </x-data-row>++ <div class="clearfix"></div>+ </x-page-column>++ <!-- begin side stats well column-->+ <x-page-column class="col-md-4 col-sm-12">++ <x-well class="well-sm" style="padding-left: 15px;">+ @php++ $startCarbon = $maintenance->start_date ? Carbon::parse($maintenance->start_date) : null;+ $endCarbon = $maintenance->completion_date+ ? Carbon::parse($maintenance->completion_date)+ : null;++ $maintenancePercent = 0;+ if ($startCarbon) {+ $progressLabel = App\Helpers\Helper::getFormattedDateObject($maintenance->start_date, 'date', false);+ if ($endCarbon) {+ $progressLabel .= ' - '.App\Helpers\Helper::getFormattedDateObject($maintenance->completion_date, 'date', false);;+ // Completed: show how far through the total duration we are as of today+ $totalDays = max(1, $startCarbon->diffInDays($endCarbon));+ $elapsedDays = min($totalDays, $startCarbon->diffInDays(Carbon::now()));+ $maintenancePercent = min(100, max(0, ($elapsedDays / $totalDays) * 100));+ } else {+ // In progress: base on days elapsed since start_date relative to 30-day window+ $elapsedDays = $startCarbon->diffInDays(Carbon::now());+ $maintenancePercent = min(100, max(0, ($elapsedDays / 30) * 100));+ }+ }+ @endphp+++ <x-progressbar use_well="false" columns="12" :text="$progressLabel" :percent="$maintenancePercent">+ </x-progressbar>++ </x-well>+ </x-page-column>+ <div class="clearfix"></div>+ </x-page-data></x-tabs.pane>+<x-tabs.pane name="files"><x-table.files object_type="maintenances" :object="$maintenance"/></x-tabs.pane>