mirror of
https://github.com/snipe/snipe-it.git
synced 2024-12-24 21:24:13 -08:00
Added upcoming audit report
TODO: Fid diff/threshold math
This commit is contained in:
parent
ce16eae508
commit
e46cccdf90
93
app/Console/Commands/SendUpcomingAuditReport.php
Normal file
93
app/Console/Commands/SendUpcomingAuditReport.php
Normal file
|
@ -0,0 +1,93 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Console\Commands;
|
||||||
|
|
||||||
|
use App\Models\Asset;
|
||||||
|
use App\Models\License;
|
||||||
|
use App\Models\Setting;
|
||||||
|
use App\Notifications\ExpiringAssetsNotification;
|
||||||
|
use App\Models\Recipients;
|
||||||
|
use DB;
|
||||||
|
use Illuminate\Console\Command;
|
||||||
|
use App\Notifications\SendUpcomingAuditNotification;
|
||||||
|
use Carbon\Carbon;
|
||||||
|
|
||||||
|
class SendUpcomingAuditReport extends Command
|
||||||
|
{
|
||||||
|
/**
|
||||||
|
* The name and signature of the console command.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $signature = 'snipeit:upcoming-audits';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* The console command description.
|
||||||
|
*
|
||||||
|
* @var string
|
||||||
|
*/
|
||||||
|
protected $description = 'Send email/slack notifications for upcoming asset audits.';
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new command instance.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function __construct()
|
||||||
|
{
|
||||||
|
parent::__construct();
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Execute the console command.
|
||||||
|
*
|
||||||
|
* @return mixed
|
||||||
|
*/
|
||||||
|
public function handle()
|
||||||
|
{
|
||||||
|
$settings = Setting::getSettings();
|
||||||
|
|
||||||
|
// Threshold sets the very latest date the next audit could be: $settings->audit_warning_days from today
|
||||||
|
$threshold = Carbon::now()->addDays($settings->audit_warning_days);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
if (($settings->alert_email != '') && ($settings->audit_warning_days) && ($settings->alerts_enabled == 1)) {
|
||||||
|
|
||||||
|
// Send a rollup to the admin, if settings dictate
|
||||||
|
$recipients = collect(explode(',', $settings->alert_email))->map(function ($item, $key) {
|
||||||
|
return new \App\Models\Recipients\AlertRecipient($item);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Assets due for auditing
|
||||||
|
$assets = Asset::whereDate('next_audit_date', '<=', $threshold)
|
||||||
|
->orderBy('last_audit_date', 'asc')->get();
|
||||||
|
|
||||||
|
if ($assets->count() > 0) {
|
||||||
|
|
||||||
|
$this->info(trans_choice('mail.upcoming-audits', $assets->count(),
|
||||||
|
['count' => $assets->count(), 'threshold' => $threshold]));
|
||||||
|
\Notification::send($recipients, new SendUpcomingAuditNotification($assets, $threshold));
|
||||||
|
$this->info('Audit report sent to '.$settings->alert_email);
|
||||||
|
} else {
|
||||||
|
$this->info('No assets to be audited. No report sent.');
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
} elseif ($settings->alert_email=='') {
|
||||||
|
$this->error('Could not send email. No alert email configured in settings');
|
||||||
|
} elseif (!$settings->audit_warning_days) {
|
||||||
|
$this->error('No audit warning days set in Admin Notifications. No mail will be sent.');
|
||||||
|
} elseif ($settings->alerts_enabled!=1) {
|
||||||
|
$this->info('Alerts are disabled in the settings. No mail will be sent');
|
||||||
|
} else {
|
||||||
|
$this->error('Something went wrong. :( ');
|
||||||
|
$this->error('Admin Notifications Email Setting: '.$settings->alert_email);
|
||||||
|
$this->error('Admin Audit Warning Setting: '.$settings->audit_warning_days);
|
||||||
|
$this->error('Admin Alerts Emnabled: '.$settings->alerts_enabled);
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
|
@ -2,6 +2,7 @@
|
||||||
|
|
||||||
namespace App\Console;
|
namespace App\Console;
|
||||||
|
|
||||||
|
use App\Console\Commands\RestoreDeletedUsers;
|
||||||
use Illuminate\Console\Scheduling\Schedule;
|
use Illuminate\Console\Scheduling\Schedule;
|
||||||
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
|
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
|
||||||
|
|
||||||
|
@ -31,6 +32,7 @@ class Kernel extends ConsoleKernel
|
||||||
Commands\RegenerateAssetTags::class,
|
Commands\RegenerateAssetTags::class,
|
||||||
Commands\SyncAssetCounters::class,
|
Commands\SyncAssetCounters::class,
|
||||||
Commands\RestoreDeletedUsers::class,
|
Commands\RestoreDeletedUsers::class,
|
||||||
|
Commands\SendUpcomingAuditReport::class,
|
||||||
];
|
];
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
65
app/Notifications/SendUpcomingAuditNotification.php
Normal file
65
app/Notifications/SendUpcomingAuditNotification.php
Normal file
|
@ -0,0 +1,65 @@
|
||||||
|
<?php
|
||||||
|
|
||||||
|
namespace App\Notifications;
|
||||||
|
|
||||||
|
use App\Models\Setting;
|
||||||
|
use Illuminate\Bus\Queueable;
|
||||||
|
use Illuminate\Notifications\Notification;
|
||||||
|
use Illuminate\Contracts\Queue\ShouldQueue;
|
||||||
|
use Illuminate\Notifications\Messages\MailMessage;
|
||||||
|
|
||||||
|
class SendUpcomingAuditNotification extends Notification
|
||||||
|
{
|
||||||
|
use Queueable;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Create a new notification instance.
|
||||||
|
*
|
||||||
|
* @return void
|
||||||
|
*/
|
||||||
|
public function __construct($params, $threshold)
|
||||||
|
{
|
||||||
|
$this->assets = $params;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the notification's delivery channels.
|
||||||
|
*
|
||||||
|
* @param mixed $notifiable
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function via($notifiable)
|
||||||
|
{
|
||||||
|
return $notifyBy = ['mail'];
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the mail representation of the notification.
|
||||||
|
*
|
||||||
|
* @param mixed $notifiable
|
||||||
|
* @return \Illuminate\Notifications\Messages\MailMessage
|
||||||
|
*/
|
||||||
|
public function toMail($notifiable)
|
||||||
|
{
|
||||||
|
$message = (new MailMessage)->markdown('notifications.markdown.upcoming-audits',
|
||||||
|
[
|
||||||
|
'assets' => $this->assets,
|
||||||
|
])
|
||||||
|
->subject(trans_choice('mail.upcoming-audits', $this->assets->count(), ['count' => $this->assets->count()]));
|
||||||
|
|
||||||
|
return $message;
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the array representation of the notification.
|
||||||
|
*
|
||||||
|
* @param mixed $notifiable
|
||||||
|
* @return array
|
||||||
|
*/
|
||||||
|
public function toArray($notifiable)
|
||||||
|
{
|
||||||
|
return [
|
||||||
|
//
|
||||||
|
];
|
||||||
|
}
|
||||||
|
}
|
|
@ -64,9 +64,11 @@ return array(
|
||||||
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
|
'license_expiring_alert' => 'There is :count license expiring in the next :threshold days.|There are :count licenses expiring in the next :threshold days.',
|
||||||
'to_reset' => 'To reset your :web password, complete this form:',
|
'to_reset' => 'To reset your :web password, complete this form:',
|
||||||
'type' => 'Type',
|
'type' => 'Type',
|
||||||
|
'upcoming-audits' => 'There is :count asset that is coming up for audit within :threshold days.|There are :count assets that are coming up for audit within :threshold days.',
|
||||||
'user' => 'User',
|
'user' => 'User',
|
||||||
'username' => 'Username',
|
'username' => 'Username',
|
||||||
'welcome' => 'Welcome :name',
|
'welcome' => 'Welcome :name',
|
||||||
'welcome_to' => 'Welcome to :web!',
|
'welcome_to' => 'Welcome to :web!',
|
||||||
'your_credentials' => 'Your Snipe-IT credentials',
|
'your_credentials' => 'Your Snipe-IT credentials',
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
|
@ -0,0 +1,20 @@
|
||||||
|
@component('mail::message')
|
||||||
|
|
||||||
|
### {{ trans_choice('mail.upcoming-audits', $assets->count(), ['count' => $assets->count()]) }}
|
||||||
|
|
||||||
|
@component('mail::table')
|
||||||
|
| |{{ trans('mail.name') }}|{{ trans('general.last_audit') }}|{{ trans('general.next_audit_date') }}|{{ trans('mail.Days') }}|{{ trans('mail.supplier') }} | {{ trans('mail.assigned_to') }}
|
||||||
|
| |:------------- |:-------------|:---------|:---------|:---------|:---------|
|
||||||
|
@foreach ($assets as $asset)
|
||||||
|
@php
|
||||||
|
$next_audit_date = \App\Helpers\Helper::getFormattedDateObject($asset->next_audit_date, 'date', false);
|
||||||
|
$last_audit_date = \App\Helpers\Helper::getFormattedDateObject($asset->last_audit_date, 'date', false);
|
||||||
|
$diff = Carbon::parse($last_audit_date)->diffInDays(Carbon::now());
|
||||||
|
$icon = ($diff <= 7) ? '🚨' : (($diff <= 14) ? '⚠️' : ' ');
|
||||||
|
@endphp
|
||||||
|
|{{ $icon }}| [{{ $asset->present()->name }}]({{ route('hardware.show', $asset->id) }}) | {{ $last_audit_date }}| {{ $next_audit_date }} | {{ $diff }} | {{ ($asset->supplier ? e($asset->supplier->name) : '') }}|{{ ($asset->assignedTo ? $asset->assignedTo->present()->name() : '') }}
|
||||||
|
@endforeach
|
||||||
|
@endcomponent
|
||||||
|
|
||||||
|
|
||||||
|
@endcomponent
|
Loading…
Reference in a new issue