Skip to content

A free open source IT asset/license management system

Edited queries in ReportsController

snipe8fb8f0a4d2c8
diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php
index 3aeba47d6f..14597c6530 100644
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -231,23 +231,23 @@ class ReportsController extends Controller
$datasets = [];
foreach ([
- 'asset_checkouts' => fn ($s, $e) => $pluckActionByType('checkout', Asset::class, $s, $e),
- 'asset_checkins' => fn ($s, $e) => $pluckCheckinsByType(Asset::class, $s, $e),
- 'new_assets' => fn ($s, $e) => $pluckCreated(Asset::class, $s, $e),
- 'new_maintenances' => fn ($s, $e) => $pluckMaintenances($s, $e),
- 'new_audits' => fn ($s, $e) => $pluckAction('audit', $s, $e),
- 'component_checkouts' => fn ($s, $e) => $pluckActionByType('checkout', Component::class, $s, $e),
- 'component_checkins' => fn ($s, $e) => $pluckCheckinsByType(Component::class, $s, $e),
- 'new_components' => fn ($s, $e) => $pluckCreated(Component::class, $s, $e),
+ 'asset_checkouts' => fn ($s, $e) => $pluckActionByType('checkout', Asset::class, $s, $e),
+ 'asset_checkins' => fn ($s, $e) => $pluckCheckinsByType(Asset::class, $s, $e),
+ 'new_assets' => fn ($s, $e) => $pluckCreated(Asset::class, $s, $e),
+ 'new_maintenances' => fn ($s, $e) => $pluckMaintenances($s, $e),
+ 'new_audits' => fn ($s, $e) => $pluckAction('audit', $s, $e),
+ 'component_checkouts' => fn ($s, $e) => $pluckActionByType('checkout', Component::class, $s, $e),
+ 'component_checkins' => fn ($s, $e) => $pluckCheckinsByType(Component::class, $s, $e),
+ 'new_components' => fn ($s, $e) => $pluckCreated(Component::class, $s, $e),
'consumable_checkouts' => fn ($s, $e) => $pluckActionByType('checkout', Consumable::class, $s, $e),
- 'consumable_checkins' => fn ($s, $e) => $pluckCheckinsByType(Consumable::class, $s, $e),
- 'new_consumables' => fn ($s, $e) => $pluckCreated(Consumable::class, $s, $e),
- 'license_checkouts' => fn ($s, $e) => $pluckActionByType('checkout', LicenseSeat::class, $s, $e),
- 'license_checkins' => fn ($s, $e) => $pluckCheckinsByType(LicenseSeat::class, $s, $e),
- 'new_licenses' => fn ($s, $e) => $pluckCreated(License::class, $s, $e),
- 'accessory_checkouts' => fn ($s, $e) => $pluckActionByType('checkout', Accessory::class, $s, $e),
- 'accessory_checkins' => fn ($s, $e) => $pluckCheckinsByType(Accessory::class, $s, $e),
- 'new_accessories' => fn ($s, $e) => $pluckCreated(Accessory::class, $s, $e),
+ 'consumable_checkins' => fn ($s, $e) => $pluckCheckinsByType(Consumable::class, $s, $e),
+ 'new_consumables' => fn ($s, $e) => $pluckCreated(Consumable::class, $s, $e),
+ 'license_checkouts' => fn ($s, $e) => $pluckActionByType('checkout', LicenseSeat::class, $s, $e),
+ 'license_checkins' => fn ($s, $e) => $pluckCheckinsByType(LicenseSeat::class, $s, $e),
+ 'new_licenses' => fn ($s, $e) => $pluckCreated(License::class, $s, $e),
+ 'accessory_checkouts' => fn ($s, $e) => $pluckActionByType('checkout', Accessory::class, $s, $e),
+ 'accessory_checkins' => fn ($s, $e) => $pluckCheckinsByType(Accessory::class, $s, $e),
+ 'new_accessories' => fn ($s, $e) => $pluckCreated(Accessory::class, $s, $e),
] as $key => $query) {
$datasets[$key] = $fill($query($curStart, $curEnd), $curDates);
$datasets['prev_'.$key] = $fill($query($prevStart, $prevEnd), $prevDates);
diff --git a/resources/views/reports/index.blade.php b/resources/views/reports/index.blade.php
index 0143045b7c..26c35b0368 100755
--- a/resources/views/reports/index.blade.php
+++ b/resources/views/reports/index.blade.php
@@ -9,6 +9,30 @@
{{-- Page content --}}
@section('content')
+ {{-- Date Range Control --}}
+ <div class="row">
+ <div class="col-md-12">
+ <div class="well well-sm" style="display:flex; align-items:center; gap:8px; margin-bottom:15px;">
+ <label style="margin:0; font-weight:bold; white-space:nowrap;">{{ trans('general.time_range') }}:</label>
+ <select id="chartTimeRange" class="form-control input-sm" style="width:auto;">
+ <option value="7">{{ trans('general.last_7_days') }}</option>
+ <option value="14">{{ trans('general.last_14_days') }}</option>
+ <option value="30" selected>{{ trans('general.last_30_days') }}</option>
+ <option value="60">{{ trans('general.last_60_days') }}</option>
+ <option value="90">{{ trans('general.last_90_days') }}</option>
+ <option value="180">{{ trans('general.last_180_days') }}</option>
+ <option value="365">{{ trans('general.last_365_days') }}</option>
+ <option value="custom">{{ trans('general.custom_range') }}…</option>
+ </select>
+ <div id="customRangePicker" class="input-daterange input-group" style="display:none; width:auto;">
+ <input type="text" id="chartStartDate" class="form-control input-sm" placeholder="{{ trans('general.select_date') }}" style="width:110px;" autocomplete="off">
+ <span class="input-group-addon">–</span>
+ <input type="text" id="chartEndDate" class="form-control input-sm" placeholder="{{ trans('general.select_date') }}" style="width:110px;" autocomplete="off">
+ </div>
+ </div>
+ </div>
+ </div>
+
{{-- Row 1: Stat Alert Cards --}}
<div class="row">