mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 07:34:06 -08:00
d722ed3823
* Consolidate edit form elements into reusable partials.
This is a large code change that doesn't do much immediately. It
refactors all of the various edit.blade.php files to reference
standardized partials, so that they all reference the same base html
layout. This has the side effect of moving everything to the new fancy
"required" indicators, and making things look consistent.
In addition, I've gone ahead and renamed a few database fields. We had
Assetmodel::modelno and Consumable::model_no, I've renamed both to
model_number. We had items using ::note and ::notes, I've standardized
on ::notes. Component used total_qty where consumables and accessories
used qty, so I've moved everything to qty (And fixed a few bugs in the
helper file in the process.
TODO includes looking at how/where to place the modal javascripts to
allow for on the fly creation from all places, rather than just the
asset page.
Rename assetmodel::modelno to model_number for clarity and consistency
Rename consumable::model_no to model_number for clarity and consistency
Rename assetmodel::note to notes for clarity and consistency
Port asset and assetmodel to new partials layout. Adapt all code to the renamed model_number and notes database changes. Fix some stying.
* Share a settings variable with all views.
* Allow editing the per_page setting. We showed the value, but we never showed it on the edit page..
* use snipeSettings in all views instead of the long ugly path.
* War on partials. Centralize all bootstrap table javascript
* Use model_number instead of modelno in importer
* Codacy fix.
* More unification/deduplication. Create an edit form template layout that we use as the base for all edit forms. This gives the same interface for editing everything and makes the edit.blade.* files much easier to read.
* Use a ViewComposer instead of sharing the variable directly. Fixes artisan optimize trying to hit the db--which ruins new installs
* Fix DB seeder.
* Base sql dump and csv's to import data from for tests.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* A few things to make acceptance tests work. Add a name to the companies table, and make the locations table have the correct name
* Use a .env.tests file for testing functional and unit to allow a separate database.
* Add functional tests for compoents, groups, and licenses.
* Now that the config is in the functional.yml, this just confuses things.
* Start some functional tests for creating items.
* Add functional tests for all create methods. Still need to do tests for edits, deletes, and lots of other things
* Improvements to functional tests.
Use the built in DB seeding mechanism instead of doing it ourselves.
Break the tests into multiple units, rather than testing everything in
each function.
* Some improvements to acceptance tests.
Make sure we're only looking at the "trs" within the bootstrap table.
Creation of assets is now tested at the functional level (and is faster)
so ignore it here.
I'm testing acceptance tests with the
IMPORT_{ASSETS,ACCESSORIES,CONSUMABLES}.csv in the tests/_data folder
imported.
* update db dump
* Update tests to new reality
* env for the test setup
* only load the database at beginning of tests, not between each Functional test.
* Fix a miss from renaming note to notes.
* Set Termination date when creating an asset. It was only set on edit.
* Rename serial_number to serial in components for consistency.
* Update validation rules to match limits in database. Currently we just accepted the values and they were truncated when adding to DB.
* Much more detailed functional testing of creating items. This checks to make sure all values on form have been successfully persisted to database.
174 lines
8 KiB
PHP
174 lines
8 KiB
PHP
@extends('layouts/default')
|
|
|
|
@section('title0')
|
|
{{ trans('admin/hardware/general.requestable') }}
|
|
{{ trans('general.assets') }}
|
|
@stop
|
|
|
|
{{-- Page title --}}
|
|
@section('title')
|
|
@yield('title0') @parent
|
|
@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" title="{{ trans('general.assets') }}">{{ trans('general.assets') }}</a>
|
|
</li>
|
|
<li>
|
|
<a href="#models" data-toggle="tab" title="{{ trans('general.asset_models') }}">{{ trans('general.asset_models') }}</a>
|
|
</li>
|
|
</ul>
|
|
<div class="tab-content">
|
|
<div class="tab-pane fade in active" id="assets">
|
|
|
|
@if ($assets->count() > 0)
|
|
|
|
<div class="table-responsive">
|
|
<table class="table table-striped">
|
|
<thead>
|
|
<tr role="row">
|
|
<th class="col-md-3" bSortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
|
|
@if ($snipeSettings->display_asset_name)
|
|
<th class="col-md-3" bSortable="true">{{ trans('admin/hardware/form.name') }}</th>
|
|
@endif
|
|
<th class="col-md-3" bSortable="true">{{ trans('admin/hardware/table.serial') }}</th>
|
|
<th class="col-md-2" bSortable="true">{{ trans('admin/hardware/table.location') }}</th>
|
|
<th class="col-md-2" bSortable="true">{{ trans('admin/hardware/table.status') }}</th>
|
|
<th class="col-md-2" bSortable="true">{{ trans('admin/hardware/form.expected_checkin') }}</th>
|
|
<th class="col-md-1 actions" bSortable="false">{{ trans('table.actions') }}</th>
|
|
</tr>
|
|
</thead>
|
|
<tbody>
|
|
@foreach ($assets as $asset)
|
|
|
|
<tr>
|
|
<form action="{{route('account/request-item', ['itemType' => 'asset', 'itemId' => $asset->id])}}" method="POST" accept-charset="utf-8">
|
|
{{ csrf_field() }}
|
|
<td>{{ $asset->model->name }}</td>
|
|
|
|
@if ($snipeSettings->display_asset_name)
|
|
<td>{{ $asset->name }}</td>
|
|
@endif
|
|
|
|
<td>{{ $asset->serial }}</td>
|
|
|
|
<td>
|
|
@if ($asset->assigneduser && $asset->assetloc)
|
|
{{ $asset->assetloc->name }}
|
|
@elseif ($asset->defaultLoc)
|
|
{{ $asset->defaultLoc->name }}
|
|
@endif
|
|
</td>
|
|
@if ($asset->assigned_to != '' && $asset->assigned_to > 0)
|
|
<td>Checked out</td>
|
|
@else
|
|
<td>{{ trans('admin/hardware/general.requestable') }}</td>
|
|
@endif
|
|
|
|
<td>{{ $asset->expected_checkin }}</td>
|
|
|
|
|
|
<td>
|
|
@if ($asset->isRequestedBy(Auth::user()))
|
|
{{Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}}
|
|
@else
|
|
{{Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}}
|
|
@endif
|
|
</td>
|
|
</form>
|
|
</tr>
|
|
@endforeach
|
|
</tbody>
|
|
</table>
|
|
</div>
|
|
|
|
|
|
@else
|
|
<div class="col-md-12">
|
|
<div class="alert alert-info alert-block">
|
|
<i class="fa fa-info-circle"></i>
|
|
{{ trans('general.no_results') }}
|
|
</div>
|
|
</div>
|
|
|
|
|
|
@endif
|
|
</div>
|
|
|
|
<div class="tab-pane fade" id="models">
|
|
|
|
@if ($models->count() > 0)
|
|
<h4>Requestable Models</h4>
|
|
<table class="table table-striped">
|
|
<thead>
|
|
<tr role="row">
|
|
<th class="col-md-6" bSortable="true">{{ trans('admin/hardware/table.asset_model') }}</th>
|
|
<th class="col-md-3" bSortable="true">{{ trans('admin/accessories/general.remaining') }}</th>
|
|
<th class="col-md-2" bSortable="true">{{ trans('general.quantity') }}</th>
|
|
<th class="col-md-1 actions" bSortable="false">{{ trans('table.actions') }}</th>
|
|
</tr>
|
|
</thead>
|
|
|
|
<tbody>
|
|
@foreach($models as $requestableModel)
|
|
|
|
<tr>
|
|
<form action="{{route('account/request-item', ['itemType' => 'asset_model', 'itemId' => $requestableModel->id])}}"
|
|
method="POST"
|
|
accept-charset="utf-8"
|
|
>
|
|
{{ csrf_field() }}
|
|
<td>{{$requestableModel->name}}</td>
|
|
<td>{{$requestableModel->assets()->where('requestable', '1')->count()}}</td>
|
|
<td><input type="text" name="request-quantity" value=""></td>
|
|
<td>
|
|
@if ($requestableModel->isRequestedBy(Auth::user()))
|
|
{{Form::submit(trans('button.cancel'), ['class' => 'btn btn-danger btn-sm'])}}
|
|
@else
|
|
{{Form::submit(trans('button.request'), ['class' => 'btn btn-primary btn-sm'])}}
|
|
@endif
|
|
</td>
|
|
</form>
|
|
</tr>
|
|
@endforeach
|
|
</tbody>
|
|
</table>
|
|
|
|
@else
|
|
<div class="col-md-12">
|
|
<div class="alert alert-info alert-block">
|
|
<i class="fa fa-info-circle"></i>
|
|
{{ trans('general.no_results') }}
|
|
</div>
|
|
</div>
|
|
@endif
|
|
</div>
|
|
|
|
</div> <!-- .tab-content-->
|
|
</div> <!-- .nav-tabs-custom -->
|
|
</div> <!-- .col-md-12> -->
|
|
</div> <!-- .row -->
|
|
|
|
|
|
|
|
@stop
|
|
@section('moar_scripts')
|
|
<script>
|
|
|
|
$( "a[name='Request']").click(function(event) {
|
|
// event.preventDefault();
|
|
quantity = $(this).closest('td').siblings().find('input').val();
|
|
currentUrl = $(this).attr('href');
|
|
// $(this).attr('href', currentUrl + '?quantity=' + quantity);
|
|
// alert($(this).attr('href'));
|
|
});
|
|
</script>
|
|
@stop
|