DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2024-12-27 06:29:47 -08:00
Code Issues Actions 12 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/develop' into develop

Browse source
This commit is contained in:
Brady Wetherington 2022-01-31 10:13:30 -08:00
parent 476075235a a65fb63b6b
commit 72e9360228
4 changed files with 22 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/Importer/AssetImporter.php
View file

@ -96,6 +96,14 @@ class AssetImporter extends ItemImporter
$item['rtd_location_id'] = $this->item['location_id']; $item['rtd_location_id'] = $this->item['location_id'];
} }
if (isset($this->item['last_audit_date'])) {
$item['last_audit_date'] = $this->item['last_audit_date'];
}
if (isset($this->item['next_audit_date'])) {
$item['next_audit_date'] = $this->item['next_audit_date'];
}
if ($editingAsset) { if ($editingAsset) {
$asset->update($item); $asset->update($item);
} else { } else {

11
app/Importer/ItemImporter.php
View file

@ -76,6 +76,17 @@ class ItemImporter extends Importer
if ($this->findCsvMatch($row, 'purchase_date') != '') { if ($this->findCsvMatch($row, 'purchase_date') != '') {
$this->item['purchase_date'] = date('Y-m-d 00:00:01', strtotime($this->findCsvMatch($row, 'purchase_date'))); $this->item['purchase_date'] = date('Y-m-d 00:00:01', strtotime($this->findCsvMatch($row, 'purchase_date')));
} }
$this->item['last_audit_date'] = null;
if ($this->findCsvMatch($row, 'last_audit_date') != '') {
$this->item['last_audit_date'] = date('Y-m-d', strtotime($this->findCsvMatch($row, 'last_audit_date')));
}
$this->item['next_audit_date'] = null;
if ($this->findCsvMatch($row, 'next_audit_date') != '') {
$this->item['next_audit_date'] = date('Y-m-d', strtotime($this->findCsvMatch($row, 'next_audit_date')));
}
$this->item['qty'] = $this->findCsvMatch($row, 'quantity'); $this->item['qty'] = $this->findCsvMatch($row, 'quantity');
$this->item['requestable'] = $this->findCsvMatch($row, 'requestable'); $this->item['requestable'] = $this->findCsvMatch($row, 'requestable');
$this->item['user_id'] = $this->user_id; $this->item['user_id'] = $this->user_id;

2
resources/assets/js/components/importer/importer-file.vue
View file

@ -154,6 +154,8 @@
{id: 'full_name', text: 'Full Name' }, {id: 'full_name', text: 'Full Name' },
{id: 'status', text: 'Status' }, {id: 'status', text: 'Status' },
{id: 'warranty_months', text: 'Warranty Months' }, {id: 'warranty_months', text: 'Warranty Months' },
{id: 'last_audit_date', text: 'Last Audit Date' },
{id: 'next_audit_date', text: 'Audit Date' },
], ],
consumables: [ consumables: [
{id: 'item_no', text: "Item Number"}, {id: 'item_no', text: "Item Number"},

12
resources/views/depreciations/edit.blade.php
View file

@ -16,21 +16,11 @@
{{ trans('admin/depreciations/general.number_of_months') }} {{ trans('admin/depreciations/general.number_of_months') }}
</label> </label>
<div class="col-md-7 col-sm-12 {{ (Helper::checkIfRequired($item, 'months')) ? ' required' : '' }}"> <div class="col-md-7 col-sm-12 {{ (Helper::checkIfRequired($item, 'months')) ? ' required' : '' }}">
<input class="form-control" type="text" name="months" aria-label="months" id="months" value="{{ Request::old('months', $item->months) }}" style="width: 80px;" /> <input class="form-control" type="text" name="months" aria-label="months" id="months" value="{{ Request::old('months', $item->months) }}" style="width: 80px;"{!! (Helper::checkIfRequired($item, 'months')) ? ' data-validation="required" required' : '' !!} />
{!! $errors->first('months', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!} {!! $errors->first('months', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div> </div>
</div> </div>
<!-- Depreciation Minimum -->
<div class="form-group {{ $errors->has('depreciation_min') ? ' has-error' : '' }}">
<label for="depreciation_min" class="col-md-3 control-label">
{{ trans('admin/depreciations/general.depreciation_min') }}
</label>
<div class="col-md-2" style="padding-left:0px">
<input class="form-control" name="depreciation_min" id="depreciation_min" value="{{ Request::old('depreciation_min', $item->depreciation_min) }}" style="width: 80px; margin-left:15px" />
</div>
{!! $errors->first('depreciation_min', '<span class="alert-msg" aria-hidden="true"><i class="fas fa-times" aria-hidden="true"></i> :message</span>') !!}
</div>
<!-- Depreciation Minimum --> <!-- Depreciation Minimum -->
<div class="form-group {{ $errors->has('depreciation_min') ? ' has-error' : '' }}"> <div class="form-group {{ $errors->has('depreciation_min') ? ' has-error' : '' }}">
<label for="depreciation_min" class="col-md-3 control-label"> <label for="depreciation_min" class="col-md-3 control-label">