mirror of
https://github.com/snipe/snipe-it.git
synced 2024-11-10 07:34:06 -08:00
87464e6ec0
# Conflicts: # README.md # app/Http/Controllers/AccessoriesController.php # app/Http/Controllers/Api/AssetsController.php # app/Http/Controllers/Api/LicensesController.php # app/Http/Controllers/Api/LocationsController.php # app/Http/Controllers/Api/SettingsController.php # app/Http/Controllers/Api/UsersController.php # app/Http/Controllers/AssetModelsController.php # app/Http/Controllers/Assets/AssetsController.php # app/Http/Controllers/Auth/ForgotPasswordController.php # app/Http/Controllers/CategoriesController.php # app/Http/Controllers/CompaniesController.php # app/Http/Controllers/ComponentsController.php # app/Http/Controllers/ConsumablesController.php # app/Http/Controllers/CustomFieldsetsController.php # app/Http/Controllers/DepartmentsController.php # app/Http/Controllers/LicensesController.php # app/Http/Controllers/LocationsController.php # app/Http/Controllers/ManufacturersController.php # app/Http/Controllers/SettingsController.php # app/Http/Controllers/SuppliersController.php # app/Http/Controllers/UsersController.php # app/Http/Requests/AssetRequest.php # app/Http/Requests/ImageUploadRequest.php # app/Models/LicenseSeat.php # app/Models/Location.php # app/Models/Setting.php # composer.json # composer.lock # config/database.php # config/version.php # npm-shrinkwrap.json # package.json # public/css/AdminLTE.css # public/css/AdminLTE.css.map # public/css/overrides.css # public/css/overrides.css.map # public/css/skins/skin-blue-light.css # public/css/skins/skin-blue.css # public/css/skins/skin-green-dark.min.css # public/js/app.js # public/js/bootstrap-table.js # public/js/bootstrap/js/bootstrap.js # public/js/bootstrap/js/bootstrap.min.js # public/js/build/all.js # public/js/build/vue.js # public/js/build/vue.js.map # public/js/demo.js # public/js/ekko-lightbox.js # public/js/ekko-lightbox.min.js # public/js/extensions/export/bootstrap-table-export.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.js # public/js/extensions/multiple-sort/bootstrap-table-multiple-sort.min.js # public/js/extensions/toolbar/bootstrap-table-toolbar.min.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # public/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # public/js/plugins/timepicker/bootstrap-timepicker.js # public/js/plugins/timepicker/bootstrap-timepicker.min.js # public/js/vue.js # public/mix-manifest.json # resources/assets/js/bootstrap-js.js # resources/assets/js/bootstrap.min.js # resources/assets/js/ekko-lightbox.js # resources/assets/js/ekko-lightbox.min.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.js # resources/assets/js/plugins/bootstrap-wysihtml5/bootstrap3-wysihtml5.all.min.js # resources/assets/js/plugins/chartjs/Chart.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.js # resources/assets/js/plugins/timepicker/bootstrap-timepicker.min.js # resources/assets/less/AdminLTE.less # resources/assets/less/overrides.less # resources/assets/less/skins/_all-skins.less # resources/assets/less/skins/skin-black.less # resources/assets/less/skins/skin-blue.less # resources/assets/less/skins/skin-green.less # resources/assets/less/skins/skin-purple.less # resources/assets/less/skins/skin-red.less # resources/assets/less/skins/skin-yellow.less # resources/assets/less/variables.less # resources/js/components/importer/importer-file.vue # resources/lang/en/auth/message.php # resources/lang/en/passwords.php # resources/lang/es-CO/general.php # resources/lang/es-ES/general.php # resources/lang/es-VE/general.php # resources/less/skins/skin-black-dark.less # resources/less/skins/skin-blue-dark.less # resources/less/skins/skin-contrast.less # resources/less/skins/skin-green-dark.less # resources/less/skins/skin-orange-dark.less # resources/less/skins/skin-orange.less # resources/less/skins/skin-purple-dark.less # resources/less/skins/skin-red-dark.less # resources/less/skins/skin-yellow-dark.less # resources/views/accessories/checkin.blade.php # resources/views/accessories/checkout.blade.php # resources/views/accessories/edit.blade.php # resources/views/account/profile.blade.php # resources/views/account/view-assets.blade.php # resources/views/asset_maintenances/edit.blade.php # resources/views/auth/passwords/email.blade.php # resources/views/auth/passwords/reset.blade.php # resources/views/categories/edit.blade.php # resources/views/companies/edit.blade.php # resources/views/components/checkin.blade.php # resources/views/components/checkout.blade.php # resources/views/components/edit.blade.php # resources/views/consumables/checkout.blade.php # resources/views/consumables/edit.blade.php # resources/views/custom_fields/fields/edit.blade.php # resources/views/custom_fields/fieldsets/edit.blade.php # resources/views/dashboard.blade.php # resources/views/departments/edit.blade.php # resources/views/groups/edit.blade.php # resources/views/hardware/audit.blade.php # resources/views/hardware/bulk-checkout.blade.php # resources/views/hardware/bulk.blade.php # resources/views/hardware/checkin.blade.php # resources/views/hardware/checkout.blade.php # resources/views/hardware/edit.blade.php # resources/views/hardware/index.blade.php # resources/views/hardware/quickscan.blade.php # resources/views/hardware/view.blade.php # resources/views/importer/import.blade.php # resources/views/layouts/basic.blade.php # resources/views/layouts/default.blade.php # resources/views/layouts/edit-form.blade.php # resources/views/licenses/checkin.blade.php # resources/views/licenses/checkout.blade.php # resources/views/licenses/edit.blade.php # resources/views/locations/edit.blade.php # resources/views/manufacturers/edit.blade.php # resources/views/modals/upload-file.blade.php # resources/views/models/bulk-edit.blade.php # resources/views/models/custom_fields_form.blade.php # resources/views/models/edit.blade.php # resources/views/partials/bootstrap-table.blade.php # resources/views/partials/forms/edit/address.blade.php # resources/views/partials/forms/edit/asset-select.blade.php # resources/views/partials/forms/edit/category-select.blade.php # resources/views/partials/forms/edit/category.blade.php # resources/views/partials/forms/edit/company-select.blade.php # resources/views/partials/forms/edit/company.blade.php # resources/views/partials/forms/edit/department-select.blade.php # resources/views/partials/forms/edit/depreciation.blade.php # resources/views/partials/forms/edit/email.blade.php # resources/views/partials/forms/edit/image-upload.blade.php # resources/views/partials/forms/edit/item_number.blade.php # resources/views/partials/forms/edit/location-profile-select.blade.php # resources/views/partials/forms/edit/location-select.blade.php # resources/views/partials/forms/edit/location.blade.php # resources/views/partials/forms/edit/maintenance_type.blade.php # resources/views/partials/forms/edit/manufacturer-select.blade.php # resources/views/partials/forms/edit/manufacturer.blade.php # resources/views/partials/forms/edit/minimum_quantity.blade.php # resources/views/partials/forms/edit/model-select.blade.php # resources/views/partials/forms/edit/model_number.blade.php # resources/views/partials/forms/edit/name.blade.php # resources/views/partials/forms/edit/notes.blade.php # resources/views/partials/forms/edit/order_number.blade.php # resources/views/partials/forms/edit/phone.blade.php # resources/views/partials/forms/edit/purchase_cost.blade.php # resources/views/partials/forms/edit/purchase_date.blade.php # resources/views/partials/forms/edit/quantity.blade.php # resources/views/partials/forms/edit/serial.blade.php # resources/views/partials/forms/edit/status.blade.php # resources/views/partials/forms/edit/submit.blade.php # resources/views/partials/forms/edit/supplier-select.blade.php # resources/views/partials/forms/edit/supplier.blade.php # resources/views/partials/forms/edit/user-select.blade.php # resources/views/reports/custom.blade.php # resources/views/settings/alerts.blade.php # resources/views/settings/asset_tags.blade.php # resources/views/settings/barcodes.blade.php # resources/views/settings/branding.blade.php # resources/views/settings/general.blade.php # resources/views/settings/labels.blade.php # resources/views/settings/ldap.blade.php # resources/views/settings/localization.blade.php # resources/views/settings/security.blade.php # resources/views/setup/user.blade.php # resources/views/suppliers/edit.blade.php # resources/views/users/bulk-edit.blade.php # resources/views/users/edit.blade.php # resources/views/users/ldap.blade.php # resources/views/users/print.blade.php # resources/views/users/view.blade.php # routes/api.php # routes/web/hardware.php # webpack.mix.js
282 lines
12 KiB
PHP
Executable file
282 lines
12 KiB
PHP
Executable file
|
|
@extends('layouts/edit-form', [
|
|
'createText' => trans('admin/hardware/form.create'),
|
|
'updateText' => trans('admin/hardware/form.update'),
|
|
'topSubmit' => true,
|
|
'helpText' => trans('help.assets'),
|
|
'helpPosition' => 'right',
|
|
'formAction' => ($item->id) ? route('hardware.update', ['hardware' => $item->id]) : route('hardware.store'),
|
|
])
|
|
|
|
|
|
{{-- Page content --}}
|
|
|
|
@section('inputFields')
|
|
|
|
@include ('partials.forms.edit.company-select', ['translated_name' => trans('general.company'), 'fieldname' => 'company_id'])
|
|
|
|
|
|
<!-- Asset Tag -->
|
|
<div class="form-group {{ $errors->has('asset_tag') ? ' has-error' : '' }}">
|
|
<label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }}</label>
|
|
|
|
<!-- we are editing an existing asset -->
|
|
@if ($item->id)
|
|
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'asset_tag')) ? ' required' : '' }}">
|
|
<input class="form-control" type="text" name="asset_tags[1]" id="asset_tag" value="{{ Request::old('asset_tag', $item->asset_tag) }}" data-validation="required">
|
|
{!! $errors->first('asset_tags', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
{!! $errors->first('asset_tag', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
@else
|
|
<!-- we are creating a new asset - let people use more than one asset tag -->
|
|
<div class="col-md-7 col-sm-12{{ (\App\Helpers\Helper::checkIfRequired($item, 'asset_tag')) ? ' required' : '' }}">
|
|
<input class="form-control" type="text" name="asset_tags[1]" id="asset_tag" value="{{ Request::old('asset_tag', \App\Models\Asset::autoincrement_asset()) }}" data-validation="required">
|
|
{!! $errors->first('asset_tags', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
{!! $errors->first('asset_tag', '<span class="alert-msg"><i class="fa fa-times"></i> :message</span>') !!}
|
|
</div>
|
|
<div class="col-md-2 col-sm-12">
|
|
<button class="add_field_button btn btn-default btn-sm"><i class="fa fa-plus"></i></button>
|
|
</div>
|
|
@endif
|
|
</div>
|
|
@include ('partials.forms.edit.serial', ['fieldname'=> 'serials[1]', 'translated_serial' => trans('admin/hardware/form.serial')])
|
|
|
|
<div class="input_fields_wrap">
|
|
</div>
|
|
|
|
|
|
@include ('partials.forms.edit.model-select', ['translated_name' => trans('admin/hardware/form.model'), 'fieldname' => 'model_id', 'required' => 'true'])
|
|
|
|
|
|
<div id='custom_fields_content'>
|
|
<!-- Custom Fields -->
|
|
@if ($item->model && $item->model->fieldset)
|
|
<?php $model=$item->model; ?>
|
|
@endif
|
|
@if (Request::old('model_id'))
|
|
<?php $model=\App\Models\AssetModel::find(Request::old('model_id')); ?>
|
|
@elseif (isset($selected_model))
|
|
<?php $model=$selected_model; ?>
|
|
@endif
|
|
@if (isset($model) && $model)
|
|
@include("models/custom_fields_form",["model" => $model])
|
|
@endif
|
|
</div>
|
|
|
|
@include ('partials.forms.edit.status', [ 'required' => 'true'])
|
|
|
|
@if (!$item->id)
|
|
@include ('partials.forms.checkout-selector', ['user_select' => 'true','asset_select' => 'true', 'location_select' => 'true', 'style' => 'display:none;'])
|
|
|
|
@include ('partials.forms.edit.user-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_user', 'style' => 'display:none;', 'required' => 'false'])
|
|
|
|
@include ('partials.forms.edit.asset-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_asset', 'style' => 'display:none;', 'required' => 'false'])
|
|
|
|
@include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.checkout_to'), 'fieldname' => 'assigned_location', 'style' => 'display:none;', 'required' => 'false'])
|
|
@endif
|
|
|
|
@include ('partials.forms.edit.serial', ['translated_serial' => trans('admin/hardware/form.serial')])
|
|
@include ('partials.forms.edit.name', ['translated_name' => trans('admin/hardware/form.name')])
|
|
@include ('partials.forms.edit.purchase_date')
|
|
@include ('partials.forms.edit.supplier-select', ['translated_name' => trans('general.supplier'), 'fieldname' => 'supplier_id'])
|
|
@include ('partials.forms.edit.order_number')
|
|
<?php
|
|
$currency_type=null;
|
|
if ($item->id && $item->location) {
|
|
$currency_type = $item->location->currency;
|
|
}
|
|
?>
|
|
@include ('partials.forms.edit.purchase_cost', ['currency_type' => $currency_type])
|
|
@include ('partials.forms.edit.warranty')
|
|
@include ('partials.forms.edit.notes')
|
|
|
|
@include ('partials.forms.edit.location-select', ['translated_name' => trans('admin/hardware/form.default_location'), 'fieldname' => 'rtd_location_id'])
|
|
|
|
|
|
@include ('partials.forms.edit.requestable', ['requestable_text' => trans('admin/hardware/general.requestable')])
|
|
|
|
<!-- Image -->
|
|
@if ($item->image)
|
|
<div class="form-group {{ $errors->has('image_delete') ? 'has-error' : '' }}">
|
|
<label class="col-md-3 control-label" for="image_delete">{{ trans('general.image_delete') }}</label>
|
|
<div class="col-md-5">
|
|
<label class="control-label" for="image_delete">
|
|
<input type="checkbox" value="1" name="image_delete" id="image_delete" class="minimal" {{ Request::old('image_delete') == '1' ? ' checked="checked"' : '' }}>
|
|
{!! $errors->first('image_delete', '<span class="alert-msg">:message</span>') !!}
|
|
</label>
|
|
<div style="margin-top: 0.5em">
|
|
<img src="{{ Storage::disk('public')->url(app('assets_upload_path').e($item->image)) }}" class="img-responsive" />
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@endif
|
|
|
|
@include ('partials.forms.edit.image-upload')
|
|
|
|
@stop
|
|
|
|
@section('moar_scripts')
|
|
|
|
|
|
|
|
<script nonce="{{ csrf_token() }}">
|
|
|
|
|
|
var transformed_oldvals={};
|
|
|
|
function fetchCustomFields() {
|
|
//save custom field choices
|
|
var oldvals = $('#custom_fields_content').find('input,select').serializeArray();
|
|
for(var i in oldvals) {
|
|
transformed_oldvals[oldvals[i].name]=oldvals[i].value;
|
|
}
|
|
|
|
var modelid = $('#model_select_id').val();
|
|
if (modelid == '') {
|
|
$('#custom_fields_content').html("");
|
|
} else {
|
|
|
|
$.ajax({
|
|
type: 'GET',
|
|
url: "{{url('/') }}/models/" + modelid + "/custom_fields",
|
|
headers: {
|
|
"X-Requested-With": 'XMLHttpRequest',
|
|
"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
|
|
},
|
|
_token: "{{ csrf_token() }}",
|
|
dataType: 'html',
|
|
success: function (data) {
|
|
$('#custom_fields_content').html(data);
|
|
$('#custom_fields_content select').select2(); //enable select2 on any custom fields that are select-boxes
|
|
//now re-populate the custom fields based on the previously saved values
|
|
$('#custom_fields_content').find('input,select').each(function (index,elem) {
|
|
if(transformed_oldvals[elem.name]) {
|
|
$(elem).val(transformed_oldvals[elem.name]).trigger('change'); //the trigger is for select2-based objects, if we have any
|
|
}
|
|
|
|
});
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|
|
function user_add(status_id) {
|
|
|
|
if (status_id != '') {
|
|
$(".status_spinner").css("display", "inline");
|
|
$.ajax({
|
|
url: "{{url('/') }}/api/v1/statuslabels/" + status_id + "/deployable",
|
|
headers: {
|
|
"X-Requested-With": 'XMLHttpRequest',
|
|
"X-CSRF-TOKEN": $('meta[name="csrf-token"]').attr('content')
|
|
},
|
|
success: function (data) {
|
|
$(".status_spinner").css("display", "none");
|
|
$("#selected_status_status").fadeIn();
|
|
|
|
if (data == true) {
|
|
$("#assignto_selector").show();
|
|
$("#assigned_user").show();
|
|
|
|
$("#selected_status_status").removeClass('alert-msg');
|
|
$("#selected_status_status").addClass('text-success');
|
|
$("#selected_status_status").html('<i class="fa fa-check"></i> That status is deployable. This asset can be checked out.');
|
|
|
|
|
|
} else {
|
|
$("#assignto_selector").hide();
|
|
$("#selected_status_status").removeClass('text-success');
|
|
$("#selected_status_status").addClass('alert-msg');
|
|
$("#selected_status_status").html('<i class="fa fa-times"></i> That asset status is not deployable. This asset cannot be checked out. ');
|
|
}
|
|
}
|
|
});
|
|
}
|
|
}
|
|
|
|
|
|
$(function () {
|
|
//grab custom fields for this model whenever model changes.
|
|
$('#model_select_id').on("change", fetchCustomFields);
|
|
|
|
//initialize assigned user/loc/asset based on statuslabel's statustype
|
|
user_add($(".status_id option:selected").val());
|
|
|
|
//whenever statuslabel changes, update assigned user/loc/asset
|
|
$(".status_id").on("change", function () {
|
|
user_add($(".status_id").val());
|
|
});
|
|
|
|
});
|
|
|
|
|
|
// Add another asset tag + serial combination if the plus sign is clicked
|
|
$(document).ready(function() {
|
|
|
|
var max_fields = 100; //maximum input boxes allowed
|
|
var wrapper = $(".input_fields_wrap"); //Fields wrapper
|
|
var add_button = $(".add_field_button"); //Add button ID
|
|
var x = 1; //initial text box count
|
|
|
|
|
|
|
|
|
|
$(add_button).click(function(e){ //on add input button click
|
|
|
|
e.preventDefault();
|
|
|
|
var auto_tag = $("#asset_tag").val().replace(/[^\d]/g, '');
|
|
var box_html = '';
|
|
|
|
|
|
// Check that we haven't exceeded the max number of asset fields
|
|
if (x < max_fields) {
|
|
|
|
if (auto_tag!='') {
|
|
auto_tag = parseInt(auto_tag) + parseInt(x);
|
|
} else {
|
|
auto_tag = '';
|
|
}
|
|
|
|
x++; //text box increment
|
|
|
|
box_html += '<span class="fields_wrapper">';
|
|
box_html += '<div class="form-group"><label for="asset_tag" class="col-md-3 control-label">{{ trans('admin/hardware/form.tag') }} ' + x + '</label>';
|
|
box_html += '<div class="col-md-7 col-sm-12 required">';
|
|
box_html += '<input type="text" class="form-control" name="asset_tags[' + x + ']" value="{{ (($snipeSettings->auto_increment_prefix!='') && ($snipeSettings->auto_increment_assets=='1')) ? $snipeSettings->auto_increment_prefix : '' }}'+ auto_tag +'" data-validation="required">';
|
|
box_html += '</div>';
|
|
box_html += '<div class="col-md-2 col-sm-12">';
|
|
box_html += '<a href="#" class="remove_field btn btn-default btn-sm"><i class="fa fa-minus"></i></a>';
|
|
box_html += '</div>';
|
|
box_html += '</div>';
|
|
box_html += '</div>';
|
|
box_html += '<div class="form-group"><label for="serial" class="col-md-3 control-label">{{ trans('admin/hardware/form.serial') }} ' + x + '</label>';
|
|
box_html += '<div class="col-md-7 col-sm-12">';
|
|
box_html += '<input type="text" class="form-control" name="serials[' + x + ']">';
|
|
box_html += '</div>';
|
|
box_html += '</div>';
|
|
box_html += '</span>';
|
|
$(wrapper).append(box_html);
|
|
|
|
// We have reached the maximum number of extra asset fields, so disable the button
|
|
} else {
|
|
$(".add_field_button").attr('disabled');
|
|
$(".add_field_button").addClass('disabled');
|
|
}
|
|
});
|
|
|
|
$(wrapper).on("click",".remove_field", function(e){ //user clicks on remove text
|
|
$(".add_field_button").removeAttr('disabled');
|
|
$(".add_field_button").removeClass('disabled');
|
|
e.preventDefault();
|
|
console.log(x);
|
|
|
|
$(this).parent('div').parent('div').parent('span').remove();
|
|
x--;
|
|
})
|
|
});
|
|
|
|
|
|
</script>
|
|
@stop
|