From a8e3c62185ff50fbd736c93aa1e436d0efbdb71b Mon Sep 17 00:00:00 2001 From: salam Date: Tue, 16 Jun 2026 12:08:47 +0200 Subject: [PATCH] av pop wip --- app/Filament/Widgets/ChartEvent.php | 11 ++++++++--- app/Filament/Widgets/ChartEventMoAv.php | 9 +++++++-- app/Filament/Widgets/StatsMedianAverage.php | 4 ++-- public/js/app/number-animator.js | 2 +- 4 files changed, 18 insertions(+), 8 deletions(-) diff --git a/app/Filament/Widgets/ChartEvent.php b/app/Filament/Widgets/ChartEvent.php index 5f9e8be3..0de09e30 100644 --- a/app/Filament/Widgets/ChartEvent.php +++ b/app/Filament/Widgets/ChartEvent.php @@ -28,7 +28,7 @@ class ChartEvent extends ChartWidget Events - '.$this->type.' + ' . $this->type . ' '); } @@ -62,10 +62,15 @@ class ChartEvent extends ChartWidget tooltip: { callbacks: { label: (context) => { - return [' '+context.parsed.y, ' '+context.dataset.playing_date[context.dataIndex], ' '+context.dataset.events[context.dataIndex], ' '+context.dataset.results_per_event[context.dataIndex]]; + if(context.dataset.label == 'Average League' || context.dataset.label == 'Average Team'){ + return [context.dataset.label+' '+context.dataset.data[0]]; + } + else { + return [' '+context.parsed.y, ' '+context.dataset.playing_date[context.dataIndex], ' '+context.dataset.events[context.dataIndex], ' '+context.dataset.results_per_event[context.dataIndex]]; + } }, } - } + }, }, scales: { x: { diff --git a/app/Filament/Widgets/ChartEventMoAv.php b/app/Filament/Widgets/ChartEventMoAv.php index 2bc046da..e17de0fb 100644 --- a/app/Filament/Widgets/ChartEventMoAv.php +++ b/app/Filament/Widgets/ChartEventMoAv.php @@ -27,7 +27,7 @@ class ChartEventMoAv extends ChartWidget Events - '.$this->type.' Moving Average + ' . $this->type . ' Moving Average '); } @@ -66,7 +66,12 @@ class ChartEventMoAv extends ChartWidget tooltip: { callbacks: { label: (context) => { - return [' '+context.parsed.y, ' '+context.dataset.playing_date[context.dataIndex], ' '+context.dataset.events[context.dataIndex], ' '+context.dataset.results_per_event[context.dataIndex]]; + if(context.dataset.label == 'Average League' || context.dataset.label == 'Average Team'){ + return [context.dataset.label+' '+context.dataset.data[0]]; + } + else { + return [' '+context.parsed.y, ' '+context.dataset.playing_date[context.dataIndex], ' '+context.dataset.events[context.dataIndex], ' '+context.dataset.results_per_event[context.dataIndex]]; + } }, } }, diff --git a/app/Filament/Widgets/StatsMedianAverage.php b/app/Filament/Widgets/StatsMedianAverage.php index 8ec79644..4d63423c 100644 --- a/app/Filament/Widgets/StatsMedianAverage.php +++ b/app/Filament/Widgets/StatsMedianAverage.php @@ -46,8 +46,8 @@ class StatsMedianAverage extends StatsOverviewWidget $this->columns = [ 'default' => 1, 'sm' => 2, - 'md' => 3, - 'lg' => $max_boxes, + 'lg' => 4, + 'xl' => $max_boxes, ]; $statistic_type = HelperStatisticType::get($this->filters); diff --git a/public/js/app/number-animator.js b/public/js/app/number-animator.js index 401e315c..2c470a12 100644 --- a/public/js/app/number-animator.js +++ b/public/js/app/number-animator.js @@ -1,5 +1,5 @@ function animate(element, end, fixtotwo) { - console.log(element, end); + // console.log(element, end); var element = document.getElementById(element); const startTime = performance.now();