A free open source IT asset/license management system
Switched layout, added chart
snipe64bea202c509
diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.phpindex 2eb5904cd0..ecdbad94f2 100644--- a/app/Http/Controllers/Api/ReportsController.php+++ b/app/Http/Controllers/Api/ReportsController.php@@ -11,6 +11,7 @@ use App\Models\Actionlog;use App\Models\Asset;use App\Models\Component;use App\Models\Consumable;+use App\Models\License;use App\Models\Maintenance;use App\Models\User;use Carbon\Carbon;@@ -183,7 +184,8 @@ class ReportsController extends Controller->toArray();};- // Query a model's own table for created_at counts (catches API/import creates, not just UI)+ // Query a model's own table for created_at counts (catches API/import creates, not just UI).+ // Models with CompanyableTrait have a global scope applied automatically.$pluckCreated = function (string $modelClass, Carbon $start, Carbon $end): array {return $modelClass::whereBetween('created_at', [$start, $end])->selectRaw('DATE(created_at) as date, COUNT(*) as count')@@ -192,18 +194,30 @@ class ReportsController extends Controller->toArray();};+ // Maintenance has no company_id column and no CompanyableTrait, so scope through+ // its asset relationship — whereHas('asset') applies Asset's FMCS global scope.+ $pluckMaintenances = function (Carbon $start, Carbon $end): array {+ return Maintenance::whereHas('asset')+ ->whereBetween('maintenances.created_at', [$start, $end])+ ->selectRaw('DATE(maintenances.created_at) as date, COUNT(*) as count')+ ->groupBy('date')+ ->pluck('count', 'date')+ ->toArray();+ };+$fill = fn (array $raw, array $dates) => array_map(fn ($d) => (int) ($raw[$d] ?? 0), $dates);$datasets = [];foreach ([- 'checkouts' => fn ($s, $e) => $pluckAction('checkout', $s, $e),- 'checkins' => fn ($s, $e) => $pluckAction('checkin from', $s, $e),- 'new_assets' => fn ($s, $e) => $pluckCreated(Asset::class, $s, $e),- 'new_maintenances' => fn ($s, $e) => $pluckCreated(Maintenance::class, $s, $e),- 'new_users' => fn ($s, $e) => $pluckCreated(User::class, $s, $e),+ 'checkouts' => fn ($s, $e) => $pluckAction('checkout', $s, $e),+ 'checkins' => fn ($s, $e) => $pluckAction('checkin from', $s, $e),+ 'new_assets' => fn ($s, $e) => $pluckCreated(Asset::class, $s, $e),+ 'new_maintenances'=> fn ($s, $e) => $pluckMaintenances($s, $e),+ 'new_users' => fn ($s, $e) => $pluckCreated(User::class, $s, $e),'new_accessories' => fn ($s, $e) => $pluckCreated(Accessory::class, $s, $e),- 'new_components' => fn ($s, $e) => $pluckCreated(Component::class, $s, $e),+ 'new_components' => fn ($s, $e) => $pluckCreated(Component::class, $s, $e),'new_consumables' => fn ($s, $e) => $pluckCreated(Consumable::class, $s, $e),+ 'new_licenses' => fn ($s, $e) => $pluckCreated(License::class, $s, $e),] as $key => $query) {$datasets[$key] = $fill($query($curStart, $curEnd), $curDates);$datasets['prev_'.$key] = $fill($query($prevStart, $prevEnd), $prevDates);diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.phpindex 269fa6daae..11a81e4f4e 100644--- a/app/Http/Controllers/ReportsController.php+++ b/app/Http/Controllers/ReportsController.php@@ -63,7 +63,11 @@ class ReportsController extends Controller$audit_alert_count = Asset::DueOrOverdueForAudit($settings)->count();$checkin_alert_count = Asset::DueOrOverdueForCheckin($settings)->count();- $pending_acceptance_count = CheckoutAcceptance::pending()->count();+ // CheckoutAcceptance has no company_id column; scope through the checkoutable+ // relationship so each type's CompanyableTrait global scope is applied.+ $pending_acceptance_count = CheckoutAcceptance::pending()+ ->whereHasMorph('checkoutable', [Asset::class, LicenseSeat::class, Accessory::class, Component::class, Consumable::class])+ ->count();$licenses_low_count = License::withCount(['freeSeats as free_seats_count'])->get()->filter(fn ($l) => $l->free_seats_count <= 0)diff --git a/resources/lang/en-US/general.php b/resources/lang/en-US/general.phpindex 240c52e08a..7e1732f66e 100644--- a/resources/lang/en-US/general.php+++ b/resources/lang/en-US/general.php@@ -501,6 +501,7 @@ return ['new_accessories_created' => 'New Accessories','new_components_created' => 'New Components','new_consumables_created' => 'New Consumables',+ 'new_licenses_created' => 'New Licenses','time_range' => 'Time Range','last_7_days' => 'Last 7 Days','last_14_days' => 'Last 14 Days',diff --git a/resources/views/reports/index.blade.php b/resources/views/reports/index.blade.phpindex 6118207108..8ccff0bdbf 100755--- a/resources/views/reports/index.blade.php+++ b/resources/views/reports/index.blade.php@@ -105,60 +105,78 @@<div class="box-body">- {{-- Row A: Checkouts & Check-ins | New Assets --}}<div class="row"><div class="col-md-6">- <p class="text-muted" style="margin:0 0 4px; font-size:12px; text-transform:uppercase; letter-spacing:.05em;">{!! trans('general.checkouts_checkins') !!}</p>- <div style="position:relative; height:160px;">- <canvas id="chart-checkouts"></canvas>+ <div class="well">+ <h4>{!! trans('general.checkouts_checkins') !!}</h4>+ <div style="position:relative; height:160px;">+ <canvas id="chart-checkouts"></canvas>+ </div></div></div><div class="col-md-6">- <p class="text-muted" style="margin:0 0 4px; font-size:12px; text-transform:uppercase; letter-spacing:.05em;">{!! trans('general.new_assets_created') !!}</p>- <div style="position:relative; height:160px;">- <canvas id="chart-assets"></canvas>+ <div class="well">+ <h4>{!! trans('general.new_assets_created') !!}</h4>+ <div style="position:relative; height:160px;">+ <canvas id="chart-assets"></canvas>+ </div></div></div></div>- <hr style="margin: 16px 0;">-- {{-- Row B: New Maintenances | New Users --}}<div class="row"><div class="col-md-6">- <p class="text-muted" style="margin:0 0 4px; font-size:12px; text-transform:uppercase; letter-spacing:.05em;">{!! trans('general.new_maintenances_created') !!}</p>- <div style="position:relative; height:160px;">- <canvas id="chart-maintenances"></canvas>+ <div class="well">+ <h4>{!! trans('general.new_maintenances_created') !!}</h4>+ <div style="position:relative; height:160px;">+ <canvas id="chart-maintenances"></canvas>+ </div></div></div><div class="col-md-6">- <p class="text-muted" style="margin:0 0 4px; font-size:12px; text-transform:uppercase; letter-spacing:.05em;">{!! trans('general.new_users_created') !!}</p>- <div style="position:relative; height:160px;">- <canvas id="chart-users"></canvas>+ <div class="well">+ <h4>{!! trans('general.new_users_created') !!}</h4>+ <div style="position:relative; height:160px;">+ <canvas id="chart-users"></canvas>+ </div></div></div></div>- <hr style="margin: 16px 0;">-- {{-- Row C: New Accessories | New Components | New Consumables --}}<div class="row">- <div class="col-md-4">- <p class="text-muted" style="margin:0 0 4px; font-size:12px; text-transform:uppercase; letter-spacing:.05em;">{!! trans('general.new_accessories_created') !!}</p>- <div style="position:relative; height:160px;">- <canvas id="chart-accessories"></canvas>+ <div class="col-md-6">+ <div class="well">+ <h4>{!! trans('general.new_accessories_created') !!}</h4>+ <div style="position:relative; height:160px;">+ <canvas id="chart-accessories"></canvas>+ </div></div></div>- <div class="col-md-4">- <p class="text-muted" style="margin:0 0 4px; font-size:12px; text-transform:uppercase; letter-spacing:.05em;">{!! trans('general.new_components_created') !!}</p>- <div style="position:relative; height:160px;">- <canvas id="chart-components"></canvas>+ <div class="col-md-6">+ <div class="well">+ <h4>{!! trans('general.new_components_created') !!}</h4>+ <div style="position:relative; height:160px;">+ <canvas id="chart-components"></canvas>+ </div></div></div>- <div class="col-md-4">- <p class="text-muted" style="margin:0 0 4px; font-size:12px; text-transform:uppercase; letter-spacing:.05em;">{!! trans('general.new_consumables_created') !!}</p>- <div style="position:relative; height:160px;">- <canvas id="chart-consumables"></canvas>+ </div>++ <div class="row">+ <div class="col-md-6">+ <div class="well">+ <h4>{!! trans('general.new_consumables_created') !!}</h4>+ <div style="position:relative; height:160px;">+ <canvas id="chart-consumables"></canvas>+ </div>+ </div>+ </div>+ <div class="col-md-6">+ <div class="well">+ <h4>{!! trans('general.new_licenses_created') !!}</h4>+ <div style="position:relative; height:160px;">+ <canvas id="chart-licenses"></canvas>+ </div></div></div></div>@@ -354,6 +372,11 @@ function loadCharts(params) {d.labels, d.new_consumables, d.prev_new_consumables,'{!! trans('general.consumables') !!}', p, '#ff851b');++ makeChart('chart-licenses',+ d.labels, d.new_licenses, d.prev_new_licenses,+ '{!! trans('general.licenses') !!}', p, '#d81b60'+ );}});}