From c9700fbd0c20772ab32108b105567d07c6f93ffd Mon Sep 17 00:00:00 2001 From: Deon George Date: Tue, 18 Jun 2024 20:12:36 +0930 Subject: [PATCH] Fix date for graph, problem introduced in 3f5668 --- app/Http/Controllers/DomainController.php | 5 +++-- resources/views/domain/view.blade.php | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Http/Controllers/DomainController.php b/app/Http/Controllers/DomainController.php index da661c1..96726f5 100644 --- a/app/Http/Controllers/DomainController.php +++ b/app/Http/Controllers/DomainController.php @@ -2,6 +2,7 @@ namespace App\Http\Controllers; +use Carbon\Carbon; use Illuminate\Http\Request; use Illuminate\Support\Collection; use Illuminate\Support\Facades\Gate; @@ -14,7 +15,7 @@ class DomainController extends Controller /** * Daily stats as shown on the about page * - * @param Domain $o + * @param Request $request * @return Collection */ public function api_daily_stats(Request $request): Collection @@ -25,7 +26,7 @@ class DomainController extends Controller ->sortBy('date') ->groupBy('date') ->transform(function($item,$key) { return [ - 'x'=>\Carbon\Carbon::createFromFormat('Y-m-d',$key)->timestamp, + 'x'=>Carbon::createFromFormat('Y-m-d',$key)->timestamp*1000, 'y'=>$item->sum('count')]; } ) ->values(); } diff --git a/resources/views/domain/view.blade.php b/resources/views/domain/view.blade.php index bcd10da..e7e9afa 100644 --- a/resources/views/domain/view.blade.php +++ b/resources/views/domain/view.blade.php @@ -338,7 +338,7 @@ 'name'=>$key, 'dashStyle'=>'ShortDot', 'visible'=>$item->first()->show, - 'data'=>$item->map(function($item) { return ['x'=>\Carbon\Carbon::createFromFormat('Y-m-d',$item->date)->timestamp,'y'=>$item->count]; }) + 'data'=>$item->map(function($item) { return ['x'=>\Carbon\Carbon::createFromFormat('Y-m-d',$item->date)->timestamp*1000,'y'=>$item->count]; }) ]; }) ->values() !!} });