mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-13 17:14:10 -08:00
5127727730
* Fixed #9294: Assets import history. Behaviour based on Checkin Date added, including assigning checked out items to users. * Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items. * Fixed #9294: whitespace and comment cleanup for merge * Fixed #9294: Fixed asset import history to respect checkin and update user with checked out items.
229 lines
9.6 KiB
PHP
229 lines
9.6 KiB
PHP
@extends('layouts/default')
|
|
|
|
{{-- Page title --}}
|
|
@section('title')
|
|
Import History
|
|
@parent
|
|
@stop
|
|
|
|
@section('header_right')
|
|
<a href="{{ route('hardware.index') }}" class="btn btn-default"> {{ trans('general.back') }}</a>
|
|
@stop
|
|
|
|
{{-- Page content --}}
|
|
@section('content')
|
|
|
|
|
|
@if (isset($status))
|
|
|
|
@if (count($status['error']) > 0)
|
|
<div class="row">
|
|
<div class="col-md-8 col-md-offset-2">
|
|
<div class="box box-default">
|
|
<div class="alert alert-danger">
|
|
<i class="fa fa-exclamation-circle faa-pulse animated"></i>
|
|
<strong>{{ count($status['error']) }} Error Messagess: </strong>
|
|
Please see below for errors.
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
<div class="row">
|
|
<div class="col-md-8 col-md-offset-2">
|
|
<div class="box box-default">
|
|
<div class="alert alert-success">
|
|
<i class="fa fa-check faa-pulse animated"></i>
|
|
<strong>{{ count($status['success']) }} Success Messages: </strong>
|
|
Please see below for details.
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
@endif
|
|
|
|
<div class="row">
|
|
<div class="col-md-8 col-md-offset-2">
|
|
<div class="box box-default">
|
|
<div class="box-body">
|
|
<div class="col-md-12">
|
|
<form class="form-horizontal" role="form" method="post" enctype="multipart/form-data" action="">
|
|
<!-- CSRF Token -->
|
|
<input type="hidden" name="_token" value="{{ csrf_token() }}" />
|
|
|
|
@if (Session::get('message'))
|
|
<p class="alert-danger">
|
|
You have an error in your CSV file:<br />
|
|
{{ Session::get('message') }}
|
|
</p>
|
|
@endif
|
|
|
|
<p>
|
|
Upload a CSV that contains asset history. The assets and users MUST already exist in the system, or they will be skipped. Matching assets for history import happens against the asset tag. We will try to find a matching user based on the user's name you provide, and the criteria you select below. If you do not select any criteria below, it will simply try to match on the username format you configured in the Admin > General Settings.
|
|
</p>
|
|
|
|
<p>Fields included in the CSV must match the headers: <strong>Asset Tag, Name, Checkout Date, Checkin Date</strong>. Any additional fields will be ignored. </p>
|
|
|
|
<p>Checkin Date: blank or future checkin dates will checkout items to associated user. Excluding the Checkin Date column will create a checkin date with todays date.</p>
|
|
|
|
<div class="form-group">
|
|
<label for="first_name" class="col-sm-3 control-label">{{ trans('admin/users/general.usercsv') }}</label>
|
|
<div class="col-sm-9">
|
|
<input type="file" name="user_import_csv" id="user_import_csv"{{ (config('app.lock_passwords')===true) ? ' disabled' : '' }}>
|
|
@if (config('app.lock_passwords')===true)
|
|
<p class="text-warning"><i class="fa fa-lock"></i> {{ trans('general.feature_disabled') }}</p>
|
|
@endif
|
|
</div>
|
|
</div>
|
|
|
|
|
|
|
|
|
|
<!-- Match firstname.lastname -->
|
|
<div class="form-group">
|
|
<div class="col-sm-2">
|
|
</div>
|
|
<div class="col-sm-10">
|
|
{{ Form::checkbox('match_firstnamelastname', '1', Request::old('match_firstnamelastname')) }} Try to match users by firstname.lastname (jane.smith) format
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Match flastname -->
|
|
<div class="form-group">
|
|
<div class="col-sm-2">
|
|
</div>
|
|
<div class="col-sm-10">
|
|
{{ Form::checkbox('match_flastname', '1', Request::old('match_flastname')) }} Try to match users by first initial last name (jsmith) format
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Match firstname -->
|
|
<div class="form-group">
|
|
<div class="col-sm-2">
|
|
</div>
|
|
<div class="col-sm-10">
|
|
{{ Form::checkbox('match_firstname', '1', Request::old('match_firstname')) }} Try to match users by first name (jane) format
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Match email -->
|
|
<div class="form-group">
|
|
<div class="col-sm-2">
|
|
</div>
|
|
<div class="col-sm-10">
|
|
{{ Form::checkbox('match_email', '1', Request::old('match_email')) }} Try to match users by email as username
|
|
</div>
|
|
</div>
|
|
|
|
<!-- Match username -->
|
|
<div class="form-group">
|
|
<div class="col-sm-2">
|
|
</div>
|
|
<div class="col-sm-10">
|
|
{{ Form::checkbox('match_username', '1', Request::old('match_username')) }} Try to match users by username
|
|
</div>
|
|
</div>
|
|
|
|
</div>
|
|
|
|
|
|
|
|
</div>
|
|
|
|
<!-- Form Actions -->
|
|
<div class="box-footer text-right">
|
|
@if (config('app.lock_passwords')===true)
|
|
<div class="col-md-12">
|
|
<div class="callout callout-info">
|
|
{{ trans('general.feature_disabled') }}
|
|
</div>
|
|
</div>
|
|
|
|
@else
|
|
<button type="submit" class="btn btn-default">{{ trans('button.submit') }}</button>
|
|
@endif
|
|
</div>
|
|
|
|
</form>
|
|
|
|
</div>
|
|
|
|
@if (isset($status))
|
|
|
|
|
|
@if (count($status['error']) > 0)
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<div class="box box-default">
|
|
<div class="box-header with-border">
|
|
<h2 class="box-title"> {{ count($status['error']) }} Error Messages </h2>
|
|
</div>
|
|
<div class="box-body">
|
|
<div style="height : 400px; overflow : auto;">
|
|
<table class="table">
|
|
@for ($x = 0; $x < count($status['error']); $x++)
|
|
@foreach($status['error'][$x] as $object_type => $message)
|
|
<tr class="danger">
|
|
<td><strong>{{ ucwords($object_type) }} {{ key($message) }}:</strong></td>
|
|
<td>{{ $message[key($message)]['msg'] }}</td>
|
|
</tr>
|
|
@endforeach
|
|
@endfor
|
|
</table>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
|
|
@endif
|
|
|
|
@if (count($status['success']) > 0)
|
|
<div class="row">
|
|
<div class="col-md-12">
|
|
<div class="box box-default">
|
|
<div class="box-header with-border">
|
|
<h2 class="box-title"> {{ count($status['success']) }} Success Messages </h2>
|
|
</div>
|
|
<div class="box-body">
|
|
<div style="height : 400px; overflow : auto;">
|
|
<table class="table">
|
|
@for ($x = 0; $x < count($status['success']); $x++)
|
|
@foreach($status['success'][$x] as $object_type => $message)
|
|
<tr class="success">
|
|
<td><strong>{{ ucwords($object_type) }} {{ key($message) }}:</strong></td>
|
|
<td>{{ $message[key($message)]['msg'] }}</td>
|
|
</tr>
|
|
@endforeach
|
|
@endfor
|
|
</table>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
@endif
|
|
|
|
</div></div></div>
|
|
<script nonce="{{ csrf_token() }}">
|
|
$(document).ready(function(){
|
|
|
|
$('#generate-password').pGenerator({
|
|
'bind': 'click',
|
|
'passwordElement': '#password',
|
|
'displayElement': '#password-display',
|
|
'passwordLength': 10,
|
|
'uppercase': true,
|
|
'lowercase': true,
|
|
'numbers': true,
|
|
'specialChars': false,
|
|
|
|
});
|
|
});
|
|
|
|
</script>
|
|
@stop
|