Skip to content

A free open source IT asset/license management system

Added controller methods for reports

snipefb3024ca9c3e
diff --git a/app/Http/Controllers/Api/ReportsController.php b/app/Http/Controllers/Api/ReportsController.php
index 8758a15ca1..2eb5904cd0 100644
--- a/app/Http/Controllers/Api/ReportsController.php
+++ b/app/Http/Controllers/Api/ReportsController.php
@@ -6,8 +6,16 @@ use App\Helpers\Helper;
use App\Http\Controllers\Controller;
use App\Http\Requests\FilterRequest;
use App\Http\Transformers\ActionlogsTransformer;
+use App\Models\Accessory;
use App\Models\Actionlog;
+use App\Models\Asset;
+use App\Models\Component;
+use App\Models\Consumable;
+use App\Models\Maintenance;
+use App\Models\User;
+use Carbon\Carbon;
use Illuminate\Http\JsonResponse;
+use Illuminate\Http\Request;
use Illuminate\Support\Facades\Gate;
class ReportsController extends Controller
@@ -125,4 +133,85 @@ class ReportsController extends Controller
return response()->json((new ActionlogsTransformer)->transformActionlogs($actionlogs, $total), 200, ['Content-Type' => 'application/json;charset=utf8'], JSON_UNESCAPED_UNICODE);
}
+
+ /**
+ * Returns time-series data for the reports overview charts.
+ *
+ * Accepts ?days=N (preset, default 30) OR ?start_date=YYYY-MM-DD&end_date=YYYY-MM-DD.
+ * Also returns the immediately preceding period of equal length for comparison lines.
+ */
+ public function activityChart(Request $request): JsonResponse
+ {
+ $this->authorize('reports.view');
+
+ $allowedDays = [7, 14, 30, 60, 90, 180, 365];
+
+ if ($request->filled('start_date') && $request->filled('end_date')) {
+ $curStart = Carbon::parse($request->input('start_date'))->startOfDay();
+ $curEnd = Carbon::parse($request->input('end_date'))->endOfDay();
+ if ($curEnd->lt($curStart)) {
+ [$curStart, $curEnd] = [$curEnd, $curStart];
+ }
+ $days = max(1, (int) $curStart->diffInDays($curEnd) + 1);
+ } else {
+ $days = in_array((int) $request->input('days'), $allowedDays) ? (int) $request->input('days') : 30;
+ $curEnd = Carbon::today()->endOfDay();
+ $curStart = Carbon::today()->subDays($days - 1)->startOfDay();
+ }
+
+ $prevEnd = $curStart->copy()->subSecond()->endOfDay();
+ $prevStart = $prevEnd->copy()->subDays($days - 1)->startOfDay();
+
+ $buildDates = function (Carbon $start, Carbon $end): array {
+ $dates = [];
+ for ($d = $start->copy(); $d->lte($end); $d->addDay()) {
+ $dates[] = $d->toDateString();
+ }
+
+ return $dates;
+ };
+
+ $curDates = $buildDates($curStart, $curEnd);
+ $prevDates = $buildDates($prevStart, $prevEnd);
+
+ $pluckAction = function (string $actionType, Carbon $start, Carbon $end): array {
+ return Actionlog::where('action_type', $actionType)
+ ->whereBetween('created_at', [$start, $end])
+ ->selectRaw('DATE(created_at) as date, COUNT(*) as count')
+ ->groupBy('date')
+ ->pluck('count', 'date')
+ ->toArray();
+ };
+
+ // Query a model's own table for created_at counts (catches API/import creates, not just UI)
+ $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')
+ ->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),
+ 'new_accessories' => fn ($s, $e) => $pluckCreated(Accessory::class, $s, $e),
+ 'new_components' => fn ($s, $e) => $pluckCreated(Component::class, $s, $e),
+ 'new_consumables' => fn ($s, $e) => $pluckCreated(Consumable::class, $s, $e),
+ ] as $key => $query) {
+ $datasets[$key] = $fill($query($curStart, $curEnd), $curDates);
+ $datasets['prev_'.$key] = $fill($query($prevStart, $prevEnd), $prevDates);
+ }
+
+ return response()->json(array_merge([
+ 'labels' => array_map(fn ($d) => Carbon::parse($d)->format('M j'), $curDates),
+ 'prev_label' => $prevStart->format('M j').' – '.$prevEnd->format('M j'),
+ ], $datasets));
+ }
}
diff --git a/app/Http/Controllers/ReportsController.php b/app/Http/Controllers/ReportsController.php
index f31d436ace..269fa6daae 100644
--- a/app/Http/Controllers/ReportsController.php
+++ b/app/Http/Controllers/ReportsController.php
@@ -56,6 +56,27 @@ class ReportsController extends Controller
parent::__construct();
}
+ public function index(): View
+ {
+ $this->authorize('reports.view');
+ $settings = Setting::getSettings();
+
+ $audit_alert_count = Asset::DueOrOverdueForAudit($settings)->count();
+ $checkin_alert_count = Asset::DueOrOverdueForCheckin($settings)->count();
+ $pending_acceptance_count = CheckoutAcceptance::pending()->count();
+ $licenses_low_count = License::withCount(['freeSeats as free_seats_count'])
+ ->get()
+ ->filter(fn ($l) => $l->free_seats_count <= 0)
+ ->count();
+
+ return view('reports/index', compact(
+ 'audit_alert_count',
+ 'checkin_alert_count',
+ 'pending_acceptance_count',
+ 'licenses_low_count',
+ ));
+ }
+
/**
* Returns a view that displays the accessories report.
*