Fix visitor age group sorting in report

OHFLesvos · Nov 16, 2023 · 6d1e6c9 · 6d1e6c9
1 parent 9fbe432
commit 6d1e6c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/Changelog.md b/Changelog.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 5.3.1
+
+* Fix visitor age group sorting in report
+
 ## 5.3.0
 
 * Added new visitor gender, nationality, age distribution charts

diff --git a/app/Http/Controllers/Visitors/API/ReportController.php b/app/Http/Controllers/Visitors/API/ReportController.php
@@ -132,7 +132,7 @@ public function ageDistribution(Request $request): JsonResponse
 
         [$startDate, $endDate] = $this->getDatePeriodFromRequest($request, defaultDays: null, dateStartField: 'date_start', dateEndField: 'date_end');
 
-        $ageDistribution = Visitor::query()
+        $data = Visitor::query()
             ->selectRaw('CASE
                     WHEN age <= 5 THEN "1-5"
                     WHEN age >= 6 AND age <= 11 THEN "6-11"
@@ -155,9 +155,10 @@ public function ageDistribution(Request $request): JsonResponse
             }, 's')
             ->groupBy('age_group')
             ->orderBy('age_group')
-            ->get();
+            ->get()
+            ->sortBy('age_group', SORT_NATURAL)->values();
 
-        return response()->json($ageDistribution
+        return response()->json($data
             ->map(fn ($e) => [
                 'label' => __($e->age_group),
                 'value' => $e->total_count,