Skip to content

Commit 324c937

Browse files
snipesnipe
committed
Merge remote-tracking branch 'origin/develop'
2 parents 93ae07c + 908d04e commit 324c937

3 files changed

Lines changed: 36 additions & 63 deletions

File tree

‎resources/views/blade/info-element/status.blade.php‎

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
@props([
2+
'infoObject',
3+
])
4+
5+
@if (($infoObject) && ($infoObject->assetstatus))
6+
7+
<div class="row">
8+
<div class="col-md-3">
9+
<strong>{{ trans('general.status') }}</strong>
10+
</div>
11+
<div class="col-md-9">
12+
@if (($infoObject->assignedTo) && ($infoObject->deleted_at==''))
13+
<x-icon type="circle-solid" class="text-blue" />
14+
{{ $infoObject->assetstatus->name }}
15+
<label class="label label-default">{{ trans('general.deployed') }}</label>
16+
<x-icon type="long-arrow-right" />
17+
<x-icon type="{{ $infoObject->assignedType() }}" class="fa-fw" />
18+
{!! $infoObject->assignedTo->present()->nameUrl() !!}
19+
@else
20+
@if (($infoObject->assetstatus) && ($infoObject->assetstatus->deployable=='1'))
21+
<x-icon type="circle-solid" class="text-green" />
22+
@elseif (($infoObject->assetstatus) && ($infoObject->assetstatus->pending=='1'))
23+
<x-icon type="circle-solid" class="text-orange" />
24+
@else
25+
<x-icon type="x" class="text-red" />
26+
@endif
27+
<a href="{{ route('statuslabels.show', $infoObject->assetstatus->id) }}">
28+
{{ $infoObject->assetstatus->name }}</a>
29+
<label class="label label-default">{{ $infoObject->present()->statusMeta }}</label>
30+
31+
@endif
32+
</div>
33+
</div>
34+
@endif

‎resources/views/hardware/view.blade.php‎

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -457,38 +457,7 @@ class="form-inline"
457457

458458

459459

460-
@if ($asset->assetstatus)
461-
462-
<div class="row">
463-
<div class="col-md-3">
464-
<strong>{{ trans('general.status') }}</strong>
465-
</div>
466-
<div class="col-md-9">
467-
@if (($asset->assignedTo) && ($asset->deleted_at==''))
468-
<x-icon type="circle-solid" class="text-blue" />
469-
{{ $asset->assetstatus->name }}
470-
<label class="label label-default">{{ trans('general.deployed') }}</label>
471-
472-
473-
<x-icon type="long-arrow-right" />
474-
<x-icon type="{{ $asset->assignedType() }}" class="fa-fw" />
475-
{!! $asset->assignedTo->present()->nameUrl() !!}
476-
@else
477-
@if (($asset->assetstatus) && ($asset->assetstatus->deployable=='1'))
478-
<x-icon type="circle-solid" class="text-green" />
479-
@elseif (($asset->assetstatus) && ($asset->assetstatus->pending=='1'))
480-
<x-icon type="circle-solid" class="text-orange" />
481-
@else
482-
<x-icon type="x" class="text-red" />
483-
@endif
484-
<a href="{{ route('statuslabels.show', $asset->assetstatus->id) }}">
485-
{{ $asset->assetstatus->name }}</a>
486-
<label class="label label-default">{{ $asset->present()->statusMeta }}</label>
487-
488-
@endif
489-
</div>
490-
</div>
491-
@endif
460+
<x-info-element.status :infoObject="$asset" />
492461

493462

494463
@if ($asset->company)

‎resources/views/maintenances/view.blade.php‎

Lines changed: 1 addition & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -65,37 +65,7 @@ class="active"
6565
</div>
6666
</div> <!-- /row -->
6767

68-
@if ($maintenance->asset->assignedTo)
69-
<div class="row">
70-
<div class="col-md-3">
71-
{{ trans('admin/hardware/form.checkedout_to') }}
72-
</div>
73-
<div class="col-md-9">
74-
@if (($maintenance->asset?->assignedTo) && ($maintenance->asset?->deleted_at==''))
75-
<x-icon type="circle-solid" class="text-blue" />
76-
{{ $maintenance->asset?->assetstatus->name }}
77-
<label class="label label-default">{{ trans('general.deployed') }}</label>
78-
79-
80-
<x-icon type="long-arrow-right" />
81-
<x-icon type="{{ $maintenance->asset?->assignedType() }}" class="fa-fw" />
82-
{!! $maintenance->asset?->assignedTo->present()->nameUrl() !!}
83-
@else
84-
@if (($maintenance->asset?->assetstatus) && ($maintenance->asset?->assetstatus->deployable=='1'))
85-
<x-icon type="circle-solid" class="text-green" />
86-
@elseif (($maintenance->asset?->assetstatus) && ($maintenance->asset?->assetstatus->pending=='1'))
87-
<x-icon type="circle-solid" class="text-orange" />
88-
@else
89-
<x-icon type="x" class="text-red" />
90-
@endif
91-
<a href="{{ route('statuslabels.show', $maintenance->asset?->assetstatus->id) }}">
92-
{{ $maintenance->asset?->assetstatus->name }}</a>
93-
<label class="label label-default">{{ $asset->present()->statusMeta }}</label>
94-
95-
@endif
96-
</div>
97-
</div> <!-- /row -->
98-
@endif
68+
<x-info-element.status :infoObject="$maintenance->asset" />
9969

10070
@if ($maintenance->asset->model)
10171
<div class="row">

0 commit comments

Comments
 (0)