Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix for the issue when the user tries to query assets due for audit without appropiate configuration [ch9625] #7273

Merged
merged 5 commits into from
Jul 18, 2019
Merged

Fix for the issue when the user tries to query assets due for audit without appropiate configuration [ch9625] #7273

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
3e7a370
Added propper routes to the controller
inietov Jul 18, 2019
26ba14b
Logic to handle the not setted ->audit_warning_days variable
inietov Jul 18, 2019
5100d61
Change the variable name for more clarity
inietov Jul 18, 2019
196ff3e
Got rid of the unnecesary if sentence in sake of brevity
inietov Jul 18, 2019
4099cce
Adding the null coalesce operator so it can properly handle when the …
inietov Jul 18, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion app/Models/Asset.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1068,8 +1068,14 @@ public function scopeOverdueForAudit($query)

public function scopeDueOrOverdueForAudit($query, $settings)
{
if(is_null($settings->audit_warning_days)){
$days_left = 0;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This variable name is a little confusing, since it's not really days left, which implies some math has been done on it to determine some magical number. Maybe just call it $interval? (I know it's a small thing, but I'll forget and it will confuse me in a year. :D)

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could also maybe do something like:

$interval = 0 + $settings->audit_warning_days;

tho not sure if it would choke on the nullness.

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I could try, I like it.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or actually a better solution would probably be:

$interval = $settings->audit_warning_days ?? 0;

} else {
$days_left = $settings->audit_warning_days;
}

return $query->whereNotNull('assets.next_audit_date')
->whereRaw("DATE_SUB(assets.next_audit_date, INTERVAL $settings->audit_warning_days DAY) <= '".Carbon::now()."'")
->whereRaw("DATE_SUB(assets.next_audit_date, INTERVAL $days_left DAY) <= '".Carbon::now()."'")
->where('assets.archived', '=', 0)
->NotArchived();
}
Expand Down
4 changes: 2 additions & 2 deletions routes/web/hardware.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,12 +31,12 @@ function () {

Route::get('audit/due', [
'as' => 'assets.audit.due',
'uses' => 'AssetsController@dueForAudit'
'uses' => 'Assets\AssetsController@dueForAudit'
]);

Route::get('audit/overdue', [
'as' => 'assets.audit.overdue',
'uses' => 'AssetsController@overdueForAudit'
'uses' => 'Assets\AssetsController@overdueForAudit'
]);

Route::get('audit/{id}', [
Expand Down