DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-03-05 20:52:15 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Status labels (#4895)

Browse source 
* fix statuslabels

* fix statuslabels
This commit is contained in:
vcordes79 2018-01-24 03:08:54 +01:00 committed by snipe
parent c75a2051ff
commit f4e9d245d0
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Transformers/AssetsTransformer.php
View file

@ -36,7 +36,7 @@ class AssetsTransformer
'id' => (int) $asset->assetstatus->id, 'id' => (int) $asset->assetstatus->id,
'name'=> e($asset->assetstatus->name), 'name'=> e($asset->assetstatus->name),
'status_type'=> e($asset->assetstatus->getStatuslabelType()), 'status_type'=> e($asset->assetstatus->getStatuslabelType()),
'status_meta' => e($asset->present()->statusMeta), 'status_meta' => e($asset->present()->statusMeta),
] : null, ] : null,
'category' => ($asset->model->category) ? [ 'category' => ($asset->model->category) ? [
'id' => (int) $asset->model->category->id, 'id' => (int) $asset->model->category->id,

9
app/Presenters/AssetPresenter.php
View file

@ -250,7 +250,7 @@ class AssetPresenter extends Presenter
"visible" => true, "visible" => true,
"formatter" => "hardwareInOutFormatter", "formatter" => "hardwareInOutFormatter",
]; ];
$layout[] = [ $layout[] = [
"field" => "actions", "field" => "actions",
"searchable" => false, "searchable" => false,
@ -263,7 +263,7 @@ class AssetPresenter extends Presenter
return json_encode($layout); return json_encode($layout);
} }
/** /**
* Generate html link to this items name. * Generate html link to this items name.
@ -325,7 +325,7 @@ class AssetPresenter extends Presenter
**/ **/
public function name() public function name()
{ {
if (empty($this->model->name)) { if (empty($this->model->name)) {
if (isset($this->model->model)) { if (isset($this->model->model)) {
return $this->model->model->name.' ('.$this->model->asset_tag.')'; return $this->model->model->name.' ('.$this->model->asset_tag.')';
@ -398,7 +398,7 @@ class AssetPresenter extends Presenter
public function statusMeta() public function statusMeta()
{ {
if ($this->model->assigned) { if ($this->model->assigned) {
return strtolower(trans('general.deployed')); return 'deployed';
} }
return $this->model->assetstatus->getStatuslabelType(); return $this->model->assetstatus->getStatuslabelType();
} }
@ -482,4 +482,3 @@ class AssetPresenter extends Presenter
return '<i class="fa fa-barcode"></i>'; return '<i class="fa fa-barcode"></i>';
} }
} }

17
resources/views/partials/bootstrap-table.blade.php
View file

@ -175,19 +175,24 @@
var text_color; var text_color;
var icon_style; var icon_style;
var text_help; var text_help;
var status_meta = {
'deployed': '{{ strtolower(trans('general.deployed')) }}',
'deployable': '{{ strtolower(trans('admin/hardware/general.deployable')) }}',
'pending': '{{ strtolower(trans('general.pending')) }}'
}
switch (value.status_meta) { switch (value.status_meta) {
case '{{ strtolower(trans('general.deployed')) }}': case 'deployed':
text_color = 'blue'; text_color = 'blue';
icon_style = 'fa-circle'; icon_style = 'fa-circle';
text_help = '<label class="label label-default">{{ trans('general.deployed') }}</label>'; text_help = '<label class="label label-default">{{ trans('general.deployed') }}</label>';
break; break;
case '{{ strtolower(trans('admin/hardware/general.deployable')) }}': case 'deployable':
text_color = 'green'; text_color = 'green';
icon_style = 'fa-circle'; icon_style = 'fa-circle';
text_help = ''; text_help = '';
break; break;
case '{{ strtolower(trans('general.pending')) }}': case 'pending':
text_color = 'orange'; text_color = 'orange';
icon_style = 'fa-circle'; icon_style = 'fa-circle';
text_help = ''; text_help = '';
@ -198,7 +203,7 @@
text_help = ''; text_help = '';
} }
return '<nobr><a href="{{ url('/') }}/' + destination + '/' + value.id + '" data-tooltip="true" title="'+ value.status_meta + '"> <i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + value.name + ' ' + text_help + ' </a> </nobr>'; return '<nobr><a href="{{ url('/') }}/' + destination + '/' + value.id + '" data-tooltip="true" title="'+ status_meta[value.status_meta] + '"> <i class="fa ' + icon_style + ' text-' + text_color + '"></i> ' + value.name + ' ' + text_help + ' </a> </nobr>';
} else if ((value) && (value.name)) { } else if ((value) && (value.name)) {
return '<nobr><a href="{{ url('/') }}/' + destination + '/' + value.id + '"> ' + value.name + '</a></span>'; return '<nobr><a href="{{ url('/') }}/' + destination + '/' + value.id + '"> ' + value.name + '</a></span>';
} }
@ -327,7 +332,7 @@
return '<a href="{{ url('/') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>'; return '<a href="{{ url('/') }}/' + destination + '/' + row.assigned_pivot_id + '/checkin" class="btn btn-sm bg-purple" data-tooltip="true" title="Check this item in so it is available for re-imaging, re-issue, etc.">{{ trans('general.checkin') }}</a>';
} }
} }
} }
@ -525,7 +530,7 @@
}, 0); }, 0);
return total_sum.toFixed(2); return total_sum.toFixed(2);
} }
$(function () { $(function () {
$('#bulkEdit').click(function () { $('#bulkEdit').click(function () {