diff --git a/app/Filament/Widgets/ChartEvent.php b/app/Filament/Widgets/ChartEvent.php index 40763b77..46e869a8 100644 --- a/app/Filament/Widgets/ChartEvent.php +++ b/app/Filament/Widgets/ChartEvent.php @@ -82,7 +82,7 @@ class ChartEvent extends ChartWidget x: { title: { display: true, - text: 'Days since event' + text: 'Number of days since the event' } }, y: { diff --git a/app/Filament/Widgets/ChartEventMoAv.php b/app/Filament/Widgets/ChartEventMoAv.php index fbdc47d9..28affee9 100644 --- a/app/Filament/Widgets/ChartEventMoAv.php +++ b/app/Filament/Widgets/ChartEventMoAv.php @@ -83,7 +83,7 @@ class ChartEventMoAv extends ChartWidget x: { title: { display: true, - text: 'Days since event' + text: 'Number of days since the event' } }, y: { diff --git a/app/Filament/Widgets/ChartEventPerf.php b/app/Filament/Widgets/ChartEventPerf.php index 672428a4..a195b8d6 100644 --- a/app/Filament/Widgets/ChartEventPerf.php +++ b/app/Filament/Widgets/ChartEventPerf.php @@ -69,7 +69,7 @@ class ChartEventPerf extends ChartWidget x: { title: { display: true, - text: 'Days since event' + text: 'Number of days since the event' } }, }, diff --git a/app/Filament/Widgets/ChartEventPerfMoAv.php b/app/Filament/Widgets/ChartEventPerfMoAv.php index be7eb1b7..708dd832 100644 --- a/app/Filament/Widgets/ChartEventPerfMoAv.php +++ b/app/Filament/Widgets/ChartEventPerfMoAv.php @@ -77,7 +77,7 @@ class ChartEventPerfMoAv extends ChartWidget x: { title: { display: true, - text: 'Days since event' + text: 'Number of days since the event' } }, }, diff --git a/app/Filament/Widgets/ChartPlayer.php b/app/Filament/Widgets/ChartPlayer.php index 781d0d32..a17cd8ee 100644 --- a/app/Filament/Widgets/ChartPlayer.php +++ b/app/Filament/Widgets/ChartPlayer.php @@ -78,7 +78,7 @@ class ChartPlayer extends ChartWidget x: { title: { display: true, - text: 'Days since event' + text: 'Number of days since the event' } }, y: { diff --git a/app/Filament/Widgets/ChartPlayerMoAv.php b/app/Filament/Widgets/ChartPlayerMoAv.php index 7d73b48f..fe2b64ef 100644 --- a/app/Filament/Widgets/ChartPlayerMoAv.php +++ b/app/Filament/Widgets/ChartPlayerMoAv.php @@ -81,7 +81,7 @@ class ChartPlayerMoAv extends ChartWidget x: { title: { display: true, - text: 'Days since event' + text: 'Number of days since the event' } }, y: { diff --git a/app/Filament/Widgets/ChartPlayerPerf.php b/app/Filament/Widgets/ChartPlayerPerf.php index 38ea6b46..447f04e7 100644 --- a/app/Filament/Widgets/ChartPlayerPerf.php +++ b/app/Filament/Widgets/ChartPlayerPerf.php @@ -75,7 +75,7 @@ class ChartPlayerPerf extends ChartWidget x: { title: { display: true, - text: 'Days since event' + text: 'Number of days since the event' } }, y: { diff --git a/app/Filament/Widgets/ChartPlayerPerfMoAv.php b/app/Filament/Widgets/ChartPlayerPerfMoAv.php index 6c9a6cad..77191437 100644 --- a/app/Filament/Widgets/ChartPlayerPerfMoAv.php +++ b/app/Filament/Widgets/ChartPlayerPerfMoAv.php @@ -79,7 +79,7 @@ class ChartPlayerPerfMoAv extends ChartWidget x: { title: { display: true, - text: 'Days since event' + text: 'Number of days since the event' } }, y: { diff --git a/app/Filament/Widgets/Data/LoadPlayer.php b/app/Filament/Widgets/Data/LoadPlayer.php index 505bdc2a..4b596879 100644 --- a/app/Filament/Widgets/Data/LoadPlayer.php +++ b/app/Filament/Widgets/Data/LoadPlayer.php @@ -2,9 +2,9 @@ namespace App\Filament\Widgets\Data; +use Illuminate\Support\Carbon; use App\Models\StatistikoDetail; use App\Models\StatistikoPlayer; -use Illuminate\Support\Carbon; class LoadPlayer { @@ -50,19 +50,20 @@ class LoadPlayer $res = StatistikoPlayer::with('event')->where('ss_player_id', (int) $ss_player_id)->get(); - $labels = []; - $datasets = []; + + $tmp = []; foreach ($res as $value) { // dd($value); $val = 0; + $key = 0; if (isset($value->event->starttime)) { // $labels[] = $value->event->starttime->format('d.M.y'); - $labels[] = round($value->event->starttime->diffInDays(Carbon::now())); + $key = round($value->event->starttime->diffInDays(Carbon::now())); switch ($statistic_type) { case 'gls': @@ -87,15 +88,24 @@ class LoadPlayer $val = (int) $value->shots_off_target; break; } + + $tmp[$key] = $val; } - $datasets[] = $val; + } + + ksort($tmp); + $dataset = []; + $labels = []; + foreach ($tmp as $key => $value) { + $labels[] = $key; + $dataset[] = $value; } $data = [ 'datasets' => [ [ 'label' => ucfirst($statistic_name), - 'data' => $datasets, + 'data' => $dataset, 'tension' => 0.5, 'borderColor' => '#36A2EB', 'pointStyle' => $hasdots, diff --git a/app/Filament/Widgets/Data/LoadPlayerPerformance.php b/app/Filament/Widgets/Data/LoadPlayerPerformance.php index 834b0027..69a059b0 100644 --- a/app/Filament/Widgets/Data/LoadPlayerPerformance.php +++ b/app/Filament/Widgets/Data/LoadPlayerPerformance.php @@ -68,7 +68,7 @@ class LoadPlayerPerformance $dataset[] = $value; } - $labels = array_keys($dataset); + // $labels = array_keys($dataset); $data = [ 'datasets' => [