A free open source IT asset/license management system
Use the HasCalendarEvents trait
snipe0b95e70e005b
diff --git a/app/Models/Asset.php b/app/Models/Asset.phpindex 4e1b2a285a..d6428594d6 100644--- a/app/Models/Asset.php+++ b/app/Models/Asset.php@@ -8,6 +8,7 @@ use App\Helpers\Helper;use App\Http\Traits\UniqueUndeletedTrait;use App\Models\Traits\Acceptable;use App\Models\Traits\CompanyableTrait;+use App\Models\Traits\HasCalendarEvents;use App\Models\Traits\HasOrders;use App\Models\Traits\HasUploads;use App\Models\Traits\Loggable;@@ -30,6 +31,14 @@ use Watson\Validating\ValidatingTrait;* Model for Assets.** @version v1.0+ *+ * @property ?int $location_id+ * @property Carbon|string|null $next_audit_date+ * @property Carbon|string|null $last_audit_date+ * @property Carbon|string|null $asset_eol_date+ * @property ?int $company_id+ * @property Carbon|string|null $last_checkin+ * @property bool $requestable*/class Asset extends Depreciable{@@ -38,6 +47,7 @@ class Asset extends Depreciable// protected $with = ['model', 'adminuser', 'location', 'company'];use CompanyableTrait;+ use HasCalendarEvents;use HasFactory;use HasOrders;use HasUploads;@@ -339,7 +349,7 @@ class Asset extends Depreciableprotected function warrantyExpires(): Attribute{return Attribute::make(- get: fn (mixed $value, array $attributes) => ($attributes['warranty_months'] && $attributes['purchase_date']) ? Carbon::parse($attributes['purchase_date'])->addMonths((int) $attributes['warranty_months']) : null,+ get: fn (mixed $value, array $attributes) => (! empty($attributes['warranty_months']) && ! empty($attributes['purchase_date'])) ? Carbon::parse($attributes['purchase_date'])->addMonths((int) $attributes['warranty_months']) : null,);}@@ -1835,6 +1845,46 @@ class Asset extends Depreciable* @param \Illuminate\Database\Query\Builder $query Query builder instance* @return \Illuminate\Database\Query\Builder Modified query builder*/+ public function calendarEventDefinitions(): array+ {+ // Every entry marked all_day: true. Cast metadata on Asset is+ // mixed (next_audit_date is 'datetime:m-d-Y', expected_checkin+ // and last_checkout are 'datetime', asset_eol_date has no cast+ // at all) so cast-based auto-detection wouldn't catch them+ // uniformly. Calendar context also doesn't need hour-precision+ // for any of these - an audit-due date, an EOL date, or the+ // day something got checked out reads as an all-day marker on+ // the calendar even for columns that happen to store a time.+ return [+ [+ 'field' => 'next_audit_date',+ 'event_type' => 'asset.audit_due',+ 'all_day' => true,+ ],+ [+ 'field' => 'expected_checkin',+ 'event_type' => 'asset.expected_checkin',+ 'all_day' => true,+ ],+ [+ 'field' => 'last_checkout',+ 'event_type' => 'asset.checkout',+ 'all_day' => true,+ ],+ [+ 'field' => 'asset_eol_date',+ 'event_type' => 'asset.eol',+ 'all_day' => true,+ ],+ [+ 'field' => 'warranty_expires',+ 'event_type' => 'asset.warranty_expiration',+ 'trigger_fields' => ['purchase_date', 'warranty_months'],+ 'all_day' => true,+ ],+ ];+ }+public function scopeAssetsForShow($query){// Pluck IDs then whereIn — do NOT replace with whereHas. whereHas generates a correlated EXISTS per row and causes severe slowdowns in withCount contexts.diff --git a/app/Models/License.php b/app/Models/License.phpindex a42313a792..8b97ef1cef 100755--- a/app/Models/License.php+++ b/app/Models/License.php@@ -5,6 +5,7 @@ namespace App\Models;use App\Console\Commands\SendExpiringLicenseNotifications;use App\Helpers\Helper;use App\Models\Traits\CompanyableTrait;+use App\Models\Traits\HasCalendarEvents;use App\Models\Traits\HasUploads;use App\Models\Traits\Loggable;use App\Models\Traits\Searchable;@@ -28,6 +29,7 @@ class License extends Depreciableprotected $presenter = LicensePresenter::class;use CompanyableTrait;+ use HasCalendarEvents;use HasUploads;use Loggable, Presentable;use SoftDeletes;@@ -182,6 +184,20 @@ class License extends Depreciable&& ($this->deleted_at == '');}+ public function calendarEventDefinitions(): array+ {+ return [+ [+ 'field' => 'expiration_date',+ 'event_type' => 'license.expiration',+ ],+ [+ 'field' => 'termination_date',+ 'event_type' => 'license.termination',+ ],+ ];+ }+/*** @return Attribute<string|null, never>*/diff --git a/app/Models/Maintenance.php b/app/Models/Maintenance.phpindex 4f636810d0..a574d7a02e 100644--- a/app/Models/Maintenance.php+++ b/app/Models/Maintenance.php@@ -5,6 +5,7 @@ namespace App\Models;use App\Helpers\Helper;use App\Models\Builders\MaintenanceQueryBuilder;use App\Models\Traits\CompanyableChildTrait;+use App\Models\Traits\HasCalendarEvents;use App\Models\Traits\HasUploads;use App\Models\Traits\Loggable;use App\Models\Traits\Searchable;@@ -32,7 +33,7 @@ use Watson\Validating\ValidatingTrait;class Maintenance extends SnipeModel implements ICompanyableChild{use CompanyableChildTrait;-+ use HasCalendarEvents;use HasFactory;use HasUploads;use Loggable, Presentable;diff --git a/app/Models/User.php b/app/Models/User.phpindex ede9bfb247..cc6720ab87 100644--- a/app/Models/User.php+++ b/app/Models/User.php@@ -4,6 +4,7 @@ namespace App\Models;use App\Http\Traits\UniqueUndeletedTrait;use App\Models\Traits\CompanyableTrait;+use App\Models\Traits\HasCalendarEvents;use App\Models\Traits\HasUploads;use App\Models\Traits\Loggable;use App\Models\Traits\Searchable;@@ -35,6 +36,7 @@ use Watson\Validating\ValidatingTrait;class User extends SnipeModel implements AuthenticatableContract, AuthorizableContract, CanResetPasswordContract, HasLocalePreference{use CompanyableTrait;+ use HasCalendarEvents;use HasFactory;use HasUploads;@@ -664,6 +666,17 @@ class User extends SnipeModel implements AuthenticatableContract, AuthorizableCo&& ($this->deleted_at == '');}+ public function calendarEventDefinitions(): array+ {+ return [+ [+ 'field' => 'end_date',+ 'event_type' => 'user.end_date',+ 'all_day' => true,+ ],+ ];+ }+/*** The association-blocker half of isDeletable(): true only when the* user has no assigned assets / accessories / licenses / consumables