mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-26 22:19:41 -08:00
ac63642224
* Add manufacturer to licenses. Shows in table and edit. Need to improve manufacturer view to show lists beyond assets still. * Remove extra closing tags, formatting * Work on making the manufacturer view show more options. Need to figure out how to change the table dynamically. * Cleanup formatting and fix a few weirdities in hardware/view.blade.php * Standardize on two-space tabs in this file, as it seems the most * common. * Fix a few places where we call number_format without guaranteeing the * item is a number and not a string. * Show a "No Results" message on components page if there are no * components. * Show table of licenses on manufacturer view page. This reworks the ManufacturersController::getDataView method to delegate the view to a sub method (currently assets or licenses, but plan to extend to consumables/accessories/components as well). We then put tabs at the top of the view to show multiple tables. This just duplicates the table layout from licenses/index.blade, but I wonder if theres a way to centralize that code, maybe through partials, over time.. The only known missing part of manufacturers for licenses would be adding it to the importer, but the license importer should probably migrate to object importer before doing too much more... * Add manufacturer to accessory. * Add consumables to the manufacturer view page.
213 lines
13 KiB
PHP
213 lines
13 KiB
PHP
@extends('layouts/default')
|
|
|
|
{{-- Page title --}}
|
|
@section('title')
|
|
|
|
{{ $manufacturer->name }}
|
|
{{ trans('general.manufacturer') }}
|
|
@parent
|
|
@stop
|
|
|
|
@section('header_right')
|
|
<div class="btn-group pull-right">
|
|
<button class="btn btn-default dropdown-toggle" data-toggle="dropdown">{{ trans('button.actions') }}
|
|
<span class="caret"></span>
|
|
</button>
|
|
<ul class="dropdown-menu">
|
|
<li><a href="{{ route('update/manufacturer', $manufacturer->id) }}">{{ trans('admin/manufacturers/table.update') }}</a></li>
|
|
<li><a href="{{ route('create/manufacturer') }}">{{ trans('admin/manufacturers/table.create') }}</a></li>
|
|
</ul>
|
|
</div>
|
|
@stop
|
|
|
|
{{-- Page content --}}
|
|
@section('content')
|
|
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
|
|
<div class="nav-tabs-custom">
|
|
<ul class="nav nav-tabs">
|
|
<li class="active">
|
|
<a href="#assets" data-toggle="tab">Assets</a>
|
|
</li>
|
|
<li>
|
|
<a href="#licenses" data-toggle="tab">Licenses</a>
|
|
</li>
|
|
<li>
|
|
<a href="#accessories" data-toggle="tab">Accessories</a>
|
|
</li>
|
|
<li>
|
|
<a href="#consumables" data-toggle="tab">Consumables</a>
|
|
</li>
|
|
</ul>
|
|
<div class="tab-content">
|
|
<div class="tab-pane fade in active" id="assets">
|
|
<table
|
|
name="manufacturer_assets"
|
|
class="table table-striped bootstrap-table"
|
|
id="assets-table"
|
|
data-url="{{ route('api.manufacturers.view', ['manufacturerId' => $manufacturer->id, 'itemtype' => 'assets']) }}"
|
|
data-cookie="true"
|
|
data-click-to-select="true"
|
|
data-cookie-id-table="maufacturerAssetsTable-{{config('version.hash_version') }}"
|
|
>
|
|
<thead>
|
|
<tr>
|
|
<th data-searchable="false" data-sortable="false" data-field="companyName" data-visible="false">
|
|
{{ trans('admin/companies/table.title') }}
|
|
</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="name">{{ trans('general.name') }}</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="model">{{ trans('admin/hardware/form.model') }}</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="asset_tag">{{ trans('general.asset_tag') }}</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="serial">{{ trans('admin/hardware/form.serial') }}</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="assigned_to">{{ trans('general.user') }}</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="change" data-switchable="false">{{ trans('admin/hardware/table.change') }}</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="actions" data-switchable="false">{{ trans('table.actions') }}</th>
|
|
</tr>
|
|
</thead>
|
|
</table>
|
|
</div> <!-- /.tab-pane assets -->
|
|
|
|
<div class="tab-pane fade" id="licenses">
|
|
<table
|
|
name="manufacturer_licenses"
|
|
class="table table-striped bootstrap-table"
|
|
id="licenses-table"
|
|
data-url="{{ route('api.manufacturers.view', ['manufacturerId' => $manufacturer->id, 'itemtype' => 'licenses']) }}"
|
|
data-cookie="true"
|
|
data-click-to-select="true"
|
|
data-cookie-id-table="maufacturerLicensesTable-{{config('version.hash_version') }}"
|
|
>
|
|
<thead>
|
|
<tr>
|
|
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
|
|
<th data-field="companyName" data-sortable="false" data-switchable="true">{{ trans('general.company') }}</th>
|
|
<th data-field="name" data-sortable="true">{{ trans('admin/licenses/table.title') }}</th>
|
|
<th data-field="manufacturer" data-sortable="true">{{ trans('general.manufacturer') }}</th>
|
|
<th data-field="serial" data-sortable="true" >{{ trans('admin/licenses/table.serial') }}</th>
|
|
<th data-field="license_name" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.to_name') }}</th>
|
|
<th data-field="license_email" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.to_email') }}</th>
|
|
<th data-field="totalSeats" data-sortable="false">{{ trans('admin/licenses/form.seats') }}</th>
|
|
<th data-field="remaining" data-sortable="false">{{ trans('admin/licenses/form.remaining_seats') }}</th>
|
|
<th data-field="purchase_date" data-sortable="true">{{ trans('admin/licenses/table.purchase_date') }}</th>
|
|
<th data-field="purchase_cost" data-sortable="true">{{ trans('admin/licenses/form.cost') }}</th>
|
|
<th data-field="purchase_order" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.purchase_order') }}</th>
|
|
<th data-field="expiration_date" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.expiration') }}</th>
|
|
<th data-field="notes" data-sortable="true" data-visible="false">{{ trans('admin/licenses/form.notes') }}</th>
|
|
<th data-field="actions">{{ trans('table.actions') }}</th>
|
|
</tr>
|
|
</thead>
|
|
</table>
|
|
</div>
|
|
|
|
<div class="tab-pane fade" id="accessories">
|
|
<table
|
|
name="manufacturer_licenses"
|
|
class="table table-striped bootstrap-table"
|
|
id="licenses-table"
|
|
data-url="{{ route('api.manufacturers.view', ['manufacturerId' => $manufacturer->id, 'itemtype' => 'accessories']) }}"
|
|
data-cookie="true"
|
|
data-click-to-select="true"
|
|
data-cookie-id-table="maufacturerLicensesTable-{{config('version.hash_version') }}"
|
|
>
|
|
<thead>
|
|
<tr>
|
|
<th data-switchable="true" data-searchable="true" data-sortable="true" data-field="companyName" data-visible="false">{{ trans('admin/companies/table.title') }}</th>
|
|
<th data-sortable="true" data-searchable="true" data-field="name">{{ trans('admin/accessories/table.title') }}</th>
|
|
<th data-searchable="true" data-sortable="true" data-field="category">{{ trans('admin/accessories/general.accessory_category') }}</th>
|
|
<th data-field="manufacturer" data-searchable="true" data-sortable="true">{{ trans('general.manufacturer') }}</th>
|
|
<th data-searchable="true" data-sortable="true" data-field="location">{{ trans('general.location') }}</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="qty">{{ trans('admin/accessories/general.total') }}</th>
|
|
<th data-searchable="true" data-sortable="true" data-field="purchase_date" data-visible="false">{{ trans('admin/accessories/general.date') }}</th>
|
|
<th data-searchable="true" data-sortable="true" data-field="purchase_cost">{{ trans('admin/accessories/general.cost') }}</th>
|
|
<th data-searchable="true" data-sortable="true" data-field="order_number" data-visible="false">{{ trans('admin/accessories/general.order') }}</th>
|
|
<th data-searchable="false" data-sortable="true" data-field="min_amt">{{ trans('general.min_amt') }}</th>
|
|
<th data-searchable="false" data-sortable="false" data-field="numRemaining">{{ trans('admin/accessories/general.remaining') }}</th>
|
|
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions">{{ trans('table.actions') }}</th>
|
|
</tr>
|
|
</thead>
|
|
</table>
|
|
</div>
|
|
<div class="tab-pane fade" id="consumables">
|
|
<table
|
|
name="manufacturer_licenses"
|
|
class="table table-striped bootstrap-table"
|
|
id="licenses-table"
|
|
data-url="{{ route('api.manufacturers.view', ['manufacturerId' => $manufacturer->id, 'itemtype' => 'consumables']) }}"
|
|
data-cookie="true"
|
|
data-click-to-select="true"
|
|
data-cookie-id-table="maufacturerLicensesTable-{{config('version.hash_version') }}"
|
|
>
|
|
<thead>
|
|
<tr>
|
|
<th data-sortable="true" data-field="id" data-visible="false">{{ trans('general.id') }}</th>
|
|
<th data-switchable="true" data-searchable="true" data-sortable="true" data-field="companyName">{{ trans('admin/companies/table.title') }}</th>
|
|
<th data-sortable="true" data-searchable="true" data-field="name">{{ trans('admin/consumables/table.title') }}</th>
|
|
<th data-searchable="true" data-sortable="true" data-field="location">{{ trans('general.location') }}</th>
|
|
<th data-searchable="true" data-sortable="true" data-field="category">{{ trans('general.category') }}</th>
|
|
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="qty"> {{ trans('admin/consumables/general.total') }}</th>
|
|
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="numRemaining"> {{ trans('admin/consumables/general.remaining') }}</th>
|
|
<th data-switchable="false" data-searchable="false" data-sortable="true" data-field="min_amt"> {{ trans('general.min_amt') }}</th>
|
|
<th data-sortable="true" data-field="manufacturer" data-visible="false">{{ trans('general.manufacturer') }}</th>
|
|
<th data-sortable="true" data-field="model_no" data-visible="false">{{ trans('general.model_no') }}</th>
|
|
<th data-sortable="true" data-field="item_no" data-visible="false">{{ trans('admin/consumables/general.item_no') }}</th>
|
|
<th data-sortable="true" data-searchable="true" data-field="order_number" data-visible="false">{{ trans('admin/consumables/general.order') }}</th>
|
|
<th data-sortable="true" data-searchable="true" data-field="purchase_date" data-visible="false">{{ trans('admin/consumables/general.date') }}</th>
|
|
<th data-sortable="true" data-searchable="true" data-field="purchase_cost" data-visible="false">{{ trans('admin/consumables/general.cost') }}</th>
|
|
<th data-switchable="false" data-searchable="false" data-sortable="false" data-field="actions"> {{ trans('table.actions') }}</th>
|
|
</tr>
|
|
</thead>
|
|
</table>
|
|
</div>
|
|
</div> <!-- /.tab-content -->
|
|
</div> <!-- /.nav-tabs-custom -->
|
|
</div><!-- /. col-md-12 -->
|
|
</div> <!-- /.row -->
|
|
|
|
|
|
@section('moar_scripts')
|
|
<script src="{{ asset('assets/js/bootstrap-table.js') }}"></script>
|
|
<script src="{{ asset('assets/js/extensions/cookie/bootstrap-table-cookie.js') }}"></script>
|
|
<script src="{{ asset('assets/js/extensions/mobile/bootstrap-table-mobile.js') }}"></script>
|
|
<script src="{{ asset('assets/js/extensions/export/bootstrap-table-export.js') }}"></script>
|
|
<script src="{{ asset('assets/js/extensions/export/tableExport.js') }}"></script>
|
|
<script src="{{ asset('assets/js/extensions/export/jquery.base64.js') }}"></script>
|
|
<script type="text/javascript">
|
|
$('.bootstrap-table').bootstrapTable({
|
|
classes: 'table table-responsive table-no-bordered',
|
|
undefinedText: '',
|
|
iconsPrefix: 'fa',
|
|
showRefresh: true,
|
|
//search: true,
|
|
pageSize: {{ \App\Models\Setting::getSettings()->per_page }},
|
|
pagination: true,
|
|
sidePagination: 'server',
|
|
sortable: true,
|
|
cookie: true,
|
|
mobileResponsive: true,
|
|
showExport: true,
|
|
showColumns: true,
|
|
exportDataType: 'all',
|
|
exportTypes: ['csv', 'txt','json', 'xml'],
|
|
maintainSelected: true,
|
|
paginationFirstText: "{{ trans('general.first') }}",
|
|
paginationLastText: "{{ trans('general.last') }}",
|
|
paginationPreText: "{{ trans('general.previous') }}",
|
|
paginationNextText: "{{ trans('general.next') }}",
|
|
pageList: ['10','25','50','100','150','200'],
|
|
icons: {
|
|
paginationSwitchDown: 'fa-caret-square-o-down',
|
|
paginationSwitchUp: 'fa-caret-square-o-up',
|
|
columns: 'fa-columns',
|
|
refresh: 'fa-refresh'
|
|
},
|
|
|
|
});
|
|
</script>
|
|
@stop
|
|
|
|
|
|
@stop
|