DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-02-21 03:15:45 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Refactored date parsing

Browse source 
Signed-off-by: snipe <snipe@snipe.net>
This commit is contained in:
snipe 2024-05-31 02:14:40 +01:00
parent 026c80992e
commit 52950f1322
2 changed files with 32 additions and 50 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
app/Importer/AssetImporter.php
View file

@ -97,13 +97,12 @@ class AssetImporter extends ItemImporter
$this->item['warranty_months'] = intval(trim($this->findCsvMatch($row, 'warranty_months'))); $this->item['warranty_months'] = intval(trim($this->findCsvMatch($row, 'warranty_months')));
$this->item['model_id'] = $this->createOrFetchAssetModel($row); $this->item['model_id'] = $this->createOrFetchAssetModel($row);
$this->item['byod'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'byod'))) == 1) ? '1' : 0; $this->item['byod'] = ($this->fetchHumanBoolean(trim($this->findCsvMatch($row, 'byod'))) == 1) ? '1' : 0;
$this->item['last_checkout'] = trim($this->findCsvMatch($row, 'last_checkout'));
$this->item['last_checkin'] = trim($this->findCsvMatch($row, 'last_checkin')); $this->item['last_checkin'] = trim($this->findCsvMatch($row, 'last_checkin'));
$this->item['last_checkout'] = trim($this->findCsvMatch($row, 'last_checkout'));
$this->item['expected_checkin'] = trim($this->findCsvMatch($row, 'expected_checkin')); $this->item['expected_checkin'] = trim($this->findCsvMatch($row, 'expected_checkin'));
$this->item['last_audit_date'] = trim($this->findCsvMatch($row, 'last_audit_date')); $this->item['last_audit_date'] = trim($this->findCsvMatch($row, 'last_audit_date'));
$this->item['next_audit_date'] = trim($this->findCsvMatch($row, 'next_audit_date')); $this->item['next_audit_date'] = trim($this->findCsvMatch($row, 'next_audit_date'));
$this->item['asset_eol_date'] = trim($this->findCsvMatch($row, 'asset_eol_date')); $this->item['asset_eol_date'] = trim($this->findCsvMatch($row, 'next_audit_date'));
$this->item['asset_tag'] = $asset_tag; $this->item['asset_tag'] = $asset_tag;
// We need to save the user if it exists so that we can checkout to user later. // We need to save the user if it exists so that we can checkout to user later.
@ -121,15 +120,14 @@ class AssetImporter extends ItemImporter
$item['rtd_location_id'] = $this->item['location_id']; $item['rtd_location_id'] = $this->item['location_id'];
} }
/**
* We use this to backdate the checkin action further down
*/
$checkin_date = date('Y-m-d H:i:s'); $checkin_date = date('Y-m-d H:i:s');
if ($this->item['last_checkin']!='') { if ($this->item['last_checkin']!='') {
try { $item['last_checkin'] = $this->parseOrNullDate('last_checkin', 'datetime');
$checkin_date = CarbonImmutable::parse($this->item['last_checkin'])->format('Y-m-d H:i:s'); $checkout_date = $this->item['last_checkin'];
$this->item['last_checkout'] = $checkin_date;
} catch (\Exception $e) {
Log::info($e->getMessage());
$this->log('Unable to parse date: '.$this->item['last_checkout']);
}
} }
/** /**
@ -137,41 +135,24 @@ class AssetImporter extends ItemImporter
*/ */
$checkout_date = date('Y-m-d H:i:s'); $checkout_date = date('Y-m-d H:i:s');
if ($this->item['last_checkout']!='') { if ($this->item['last_checkout']!='') {
$item['last_checkout'] = $this->parseOrNullDate('last_checkout', 'datetime');
try { $checkout_date = $this->item['last_checkout'];
$checkout_date = CarbonImmutable::parse($this->item['last_checkout'])->format('Y-m-d H:i:s');
$this->item['last_checkout'] = $checkout_date;
} catch (\Exception $e) {
Log::info($e->getMessage());
$this->log('Unable to parse date: '.$this->item['last_checkout']);
}
} }
if ($this->item['expected_checkin']!='') { if ($this->item['expected_checkin']!='') {
try { $item['expected_checkin'] = $this->parseOrNullDate('expected_checkin');
$this->item['expected_checkin'] = CarbonImmutable::parse($this->item['expected_checkin'])->format('Y-m-d');
} catch (\Exception $e) {
Log::info($e->getMessage());
$this->log('Unable to parse date: '.$this->item['expected_checkin']);
}
} }
if ($this->item['last_audit_date']!='') { if ($this->item['last_audit_date']!='') {
try { $item['last_audit_date'] = $this->parseOrNullDate('last_audit_date');
$this->item['last_audit_date'] = CarbonImmutable::parse($this->item['last_audit_date'])->format('Y-m-d');
} catch (\Exception $e) {
Log::info($e->getMessage());
$this->log('Unable to parse date: '.$this->item['last_audit_date']);
}
} }
if ($this->item['next_audit_date']!='') { if ($this->item['next_audit_date']!='') {
try { $item['next_audit_date'] = $this->parseOrNullDate('next_audit_date');
$this->item['next_audit_date'] = CarbonImmutable::parse($this->item['next_audit_date'])->format('Y-m-d');
} catch (\Exception $e) {
Log::info($e->getMessage());
$this->log('Unable to parse date: '.$this->item['next_audit_date']);
} }
if ($this->item['asset_eol_date']!='') {
$item['asset_eol_date'] = $this->parseOrNullDate('asset_eol_date');
} }
@ -202,16 +183,16 @@ class AssetImporter extends ItemImporter
if (!is_null($asset->assigned_to)){ if (!is_null($asset->assigned_to)){
if ($asset->assigned_to != $target->id) { if ($asset->assigned_to != $target->id) {
event(new CheckoutableCheckedIn($asset, User::find($asset->assigned_to), Auth::user(), 'Checkin from CSV Importer', $checkin_date)); event(new CheckoutableCheckedIn($asset, User::find($asset->assigned_to), Auth::user(), 'Checkin from CSV Importer', $checkin_date));
$this->log('Checking this asset in');
} }
} }
$asset->fresh()->checkOut($target, $this->user_id, $checkout_date, null, 'Checkout from CSV Importer', $asset->name); $asset->fresh()->checkOut($target, $this->user_id, $checkout_date, null, 'Checkout from CSV Importer', $asset->name);
$this->log('Checking this asset out');
} }
return; return;
} }
$this->logError($asset, 'Asset "'.$this->item['name'].'"'); $this->logError($asset, 'Asset "'.$this->item['name'].'"');
} }
} }

23
app/Importer/ItemImporter.php
View file

@ -79,17 +79,17 @@ class ItemImporter extends Importer
$this->item['purchase_date'] = date('Y-m-d', strtotime($this->findCsvMatch($row, 'purchase_date'))); $this->item['purchase_date'] = date('Y-m-d', strtotime($this->findCsvMatch($row, 'purchase_date')));
} }
$this->item['asset_eol_date'] = null; // $this->item['asset_eol_date'] = null;
if ($this->findCsvMatch($row, 'asset_eol_date') != '') { // if ($this->findCsvMatch($row, 'asset_eol_date') != '') {
$csvMatch = $this->findCsvMatch($row, 'asset_eol_date'); // $csvMatch = $this->findCsvMatch($row, 'asset_eol_date');
\Log::warning('EOL Date for $csvMatch is '.$csvMatch); // \Log::warning('EOL Date for $csvMatch is '.$csvMatch);
try { // try {
$this->item['asset_eol_date'] = CarbonImmutable::parse($csvMatch)->format('Y-m-d'); // $this->item['asset_eol_date'] = CarbonImmutable::parse($csvMatch)->format('Y-m-d');
} catch (\Exception $e) { // } catch (\Exception $e) {
Log::info($e->getMessage()); // Log::info($e->getMessage());
$this->log('Unable to parse date: '.$csvMatch); // $this->log('Unable to parse date: '.$csvMatch);
} // }
} // }
$this->item['qty'] = $this->findCsvMatch($row, 'quantity'); $this->item['qty'] = $this->findCsvMatch($row, 'quantity');
@ -500,4 +500,5 @@ class ItemImporter extends Importer
return null; return null;
} }
} }