A free open source IT asset/license management system
Added select2
snipeb94e7fd8a03d
diff --git a/resources/views/hardware/quickscan.blade.php b/resources/views/hardware/quickscan.blade.phpindex 962561683f..e5c5d14128 100644--- a/resources/views/hardware/quickscan.blade.php+++ b/resources/views/hardware/quickscan.blade.php@@ -27,15 +27,29 @@<div class="box-body">{{csrf_field()}}- <!-- Next Audit -->- <div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">- <label for="asset_tag" class="col-md-3 control-label" id="audit_tag">{{ trans('general.asset_tag') }}</label>- <div class="col-md-9">- <div class="input-group date col-md-11 required" data-date-format="yyyy-mm-dd">- <input type="text" class="form-control" name="asset_tag" id="asset_tag" required value="{{ old('asset_tag') }}">+ <div class="form-group {{ $errors->has('audit_by_field') ? 'error' : '' }}">+ <label for="audit_by_field" class="col-md-3 control-label" id="audit_by_field">{{ trans('general.audit_by_field') }}</label>+ <div class="col-md-8">+ <select name="audit_by_field" data-minimum-results-for-search="Infinity" id="audit_by_field" class="form-control select2" aria-label="audit_by_field" required>+ <option value="asset_tag">{{ trans('general.asset_tag') }}</option>+ <option value="serial" {{ (($settings->unique_serial != '1') ? 'disabled' : '') }}>{{ trans('general.serial_number') }}</option>+ </select>+ {!! $errors->first('audit_by_field', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}- </div>- {!! $errors->first('asset_tag', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}+ <p class="help-block">+ <x-icon type="tip"/>+ {{ trans('general.audit_by_field_help') }}+ </p>++ </div>+ </div>++ <!-- Tag/Serial -->+ <div class="form-group {{ $errors->has('asset_tag') ? 'error' : '' }}">+ <label for="audit_key" class="col-md-3 control-label" id="audit_key_label">{{ trans('general.asset_tag') }}</label>+ <div class="col-md-8">+ <input type="text" class="form-control" name="audit_key" required value="{{ old('audit_key') }}">+ {!! $errors->first('audit_key', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}</div></div>@@ -105,7 +119,7 @@<table id="audited" class="table table-striped snipe-table"><thead><tr>- <th>{{ trans('general.asset_tag') }}</th>+ <th>{{ trans('general.audit') }}</th><th>{{ trans('general.bulkaudit_status') }}</th><th>{{ trans('general.status') }}</th><th>{{ trans('general.notes') }}</th>@@ -134,6 +148,15 @@@section('moar_scripts')<script nonce="{{ csrf_token() }}">+ $(document.body).on("change", "#audit_by_field", function () {+ $('label#audit_key_label').text('{{ trans('general.asset_tag') }}');++ if (this.value === 'serial') {+ $('label#audit_key_label').text('{{ trans('general.serial_number') }}');+ }+ });++$("#audit-form").submit(function (event) {$('#audited-div').show();$('#audit-loader').show();@@ -142,7 +165,7 @@var form = $("#audit-form").get(0);var formData = $('#audit-form').serializeArray();- var asset_tag = $('#asset_tag').val();+ var audit_key = $('#audit_key').val();$.ajax({url: "{{ route('api.asset.audit.legacy') }}",@@ -156,7 +179,7 @@success : function (data) {if (data.status == 'success') {- $('#audited tbody').prepend("<tr class='success'><td>" + data.payload.asset_tag + "</td><td>" + data.messages + "</td><td>" + data.payload.status_label + " (" + data.payload.status_type + ")</td><td>" + data.payload.note + "</td><td><i class='fas fa-check text-success' style='font-size:18px;'></i></td></tr>");+ $('#audited tbody').prepend("<tr class='success'><td>" + data.payload.audit_by_field + ': ' + data.payload.audit_key + "</td><td>" + data.messages + "</td><td>" + data.payload.status_label + " (" + data.payload.status_type + ")</td><td>" + data.payload.note + "</td><td><i class='fas fa-check' style='font-size:18px;'></i></td></tr>");@if ($user?->enable_sounds)var audio = new Audio('{{ config('app.url') }}/sounds/success.mp3');@@ -165,12 +188,12 @@incrementOnSuccess();} else {- handleAuditFail(data, asset_tag);+ handleAuditFail(data);}- $('input#asset_tag').val('');+ $('input#audit_key').val('');},error: function (data) {- handleAuditFail(data, asset_tag);+ handleAuditFail(data, audit_key);},complete: function() {$('#audit-loader').hide();@@ -181,19 +204,13 @@return false;});- function handleAuditFail (data, asset_tag) {+ function handleAuditFail(data) {@if ($user?->enable_sounds)var audio = new Audio('{{ config('app.url') }}/sounds/error.mp3');audio.play()@endif- if ((!asset_tag) && (data.payload) && (data.payload.asset_tag)) {- asset_tag = data.payload.asset_tag;- }-- asset_tag = jQuery('<span>' + asset_tag + '</span>').text();-let messages = "";// Loop through the error messages@@ -203,7 +220,7 @@}}- $('#audited tbody').prepend("<tr class='danger'><td>" + asset_tag + "</td><td>" + messages + "</td><td></td><td></td><td><i class='fas fa-times text-danger' style='font-size:18px;'></i></td></tr>");+ $('#audited tbody').prepend("<tr class='danger'><td>" + data.payload.audit_by_field + ': ' + data.payload.audit_key + "</td><td>" + messages + "</td><td></td><td></td><td><i class='fas fa-times' style='font-size:18px;'></i></td></tr>");}function incrementOnSuccess() {@@ -212,7 +229,7 @@$('#audit-counter').html(y);}- $("#audit_tag").focus();+ $("#audit_key").focus();</script>@stop