DRCIT/snipe-it
1
0
Fork 0
mirror of https://github.com/snipe/snipe-it.git synced 2025-01-24 12:17:05 -08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fixed some date math for auditing

Browse source
This commit is contained in:
snipe 2017-08-28 17:20:20 -07:00
parent 42175782a5
commit e439f15a64
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Transformers/ActionlogsTransformer.php
View file

@ -37,7 +37,7 @@ class ActionlogsTransformer
] : null,
'created_at' => Helper::getFormattedDateObject($actionlog->created_at, 'datetime'),
'updated_at' => Helper::getFormattedDateObject($actionlog->updated_at, 'datetime'),
'next_audit_date' => ($actionlog->itemType()=='asset') ? Helper::getFormattedDateObject($actionlog->item->next_audit_date, 'date'): null,
'next_audit_date' => ($actionlog->itemType()=='asset') ? Helper::getFormattedDateObject($actionlog->calcNextAuditDate(), 'date'): null,
'days_to_next_audit' => $actionlog->daysUntilNextAudit($settings->audit_interval, $actionlog->item),
'action_type' => $actionlog->present()->actionType(),
'admin' => ($actionlog->user) ? [

8
app/Models/Actionlog.php
View file

@ -5,6 +5,7 @@ use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Support\Facades\Auth;
use Response;
use Carbon;
/**
* Model for the Actionlog (the table that keeps a historical log of
@ -179,16 +180,13 @@ class Actionlog extends SnipeModel
$monthInterval = 12;
}
$dt = \Carbon::now()->addMonths(12)->toDateString();
$last_audit_date = Carbon::parse($this->created_at);
// If there is an asset-specific next date already given,
if (($asset) && ($asset->next_audit_date)) {
return \Carbon::parse($asset->next_audit_date);;
return \Carbon::parse($asset->next_audit_date);
}
$next_audit_date = \Carbon::now()->addMonths($monthInterval)->toDateString();
$next_audit_date = $last_audit_date->diffInDays($last_audit_date->copy()->addMonth($monthInterval));
return \Carbon::parse($last_audit_date)->addMonths($monthInterval)->toDateString();
}
/**