wip bug 6

BUGS.md

@@ -15,7 +15,7 @@
 ## 2) CALCOLO DELLA MEDIANA: cambiamolo in questo modo: ordiniamo tutti i valori dal minore al maggiore, se il totale dati è dispari prendiamo il valore a metà dell'elenco, se è pari facciamo la media dei due valori a metà dell'elenco
 ## 3) RIEPILOGO DATI: sostituire HOME con IN FAVOUR e AWAY con AGAINST
 ## 4) CALCOLO SBAGLIATO di CARDS AWAY di qualsiasi squadra. Viene visualizzato sempre 0 ma i dati sono presenti nel DB
-5) Aggiungere, nel caso l'operatore scelga di visualizzare i dati statistici GOALS a livello di EVENTS, anche il grafico relativo alle Aspettative Goals Fatte e Subite che possiamo denominare EG-In Favour e EG-Against
+## 5) Aggiungere, nel caso l'operatore scelga di visualizzare i dati statistici GOALS a livello di EVENTS, anche il grafico relativo alle Aspettative Goals Fatte e Subite che possiamo denominare EG-In Favour e EG-Against
 6) Aggiungere nel Grafico Performance anche i dati della partita (Data / Home / Away / Risultato) come per gli altri grafici
 7) Il Grafico della Moving Average per Events Performance secondo me è sbagliato quindi probabilmnete c'è un errore nel calcolo della Moving Average
 8) Nel Riepilogo in verde, quando si seleziona SIMILAR PAST MATCHES sono invertiti WIN con LOST

app/Filament/Widgets/ChartEventPerf.php

@@ -25,7 +25,7 @@ class ChartEventPerf extends ChartWidget
                     <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="currentColor" viewBox="0 0 256 256"><path d="M232,64H208V48a8,8,0,0,0-8-8H56a8,8,0,0,0-8,8V64H24A16,16,0,0,0,8,80V96a40,40,0,0,0,40,40h3.65A80.13,80.13,0,0,0,120,191.61V216H96a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16H136V191.58c31.94-3.23,58.44-25.64,68.08-55.58H208a40,40,0,0,0,40-40V80A16,16,0,0,0,232,64ZM48,120A24,24,0,0,1,24,96V80H48v32q0,4,.39,8Zm144-8.9c0,35.52-29,64.64-64,64.9a64,64,0,0,1-64-64V56H192ZM232,96a24,24,0,0,1-24,24h-.5a81.81,81.81,0,0,0,.5-8.9V80h24Z"></path></svg>
                     Events Performance
                 </span>
-                <span>'.$this->type.'</span>
+                <span>' . $this->type . '</span>
             </span>
         ');
     }
@@ -47,6 +47,15 @@ class ChartEventPerf extends ChartWidget
                 interaction: {
                     intersect: false,
                 },
+                plugins: {
+                    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]];
+                            },
+                        }
+                    }
+                },
                 scales: {
                     x: {
                         title: {

app/Filament/Widgets/ChartEventPerfMoAv.php

@@ -26,7 +26,7 @@ class ChartEventPerfMoAv extends ChartWidget
                     <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" fill="currentColor" viewBox="0 0 256 256"><path d="M232,64H208V48a8,8,0,0,0-8-8H56a8,8,0,0,0-8,8V64H24A16,16,0,0,0,8,80V96a40,40,0,0,0,40,40h3.65A80.13,80.13,0,0,0,120,191.61V216H96a8,8,0,0,0,0,16h64a8,8,0,0,0,0-16H136V191.58c31.94-3.23,58.44-25.64,68.08-55.58H208a40,40,0,0,0,40-40V80A16,16,0,0,0,232,64ZM48,120A24,24,0,0,1,24,96V80H48v32q0,4,.39,8Zm144-8.9c0,35.52-29,64.64-64,64.9a64,64,0,0,1-64-64V56H192ZM232,96a24,24,0,0,1-24,24h-.5a81.81,81.81,0,0,0,.5-8.9V80h24Z"></path></svg>
                     Events Performance
                 </span>
-                <span>'.$this->type.'Moving Average</span>
+                <span>' . $this->type . 'Moving Average</span>
             </span>
         ');
     }
@@ -55,6 +55,15 @@ class ChartEventPerfMoAv extends ChartWidget
                 interaction: {
                     intersect: false,
                 },
+                plugins: {
+                    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]];
+                            },
+                        }
+                    }
+                },
                 scales: {
                     x: {
                         title: {

app/Filament/Widgets/Data/LoadPerformance.php

@@ -38,13 +38,20 @@ class LoadPerformance
 
         $home_matches = [];
         $away_matches = [];
+        $playing_date = [];
+        $events = [];
+        $results_per_event = [];
         $labels = [];
         foreach ($res as $val) {
             if ($val->home_id == $home_id or $val->away_id == $home_id or $val->home_id == $away_id or $val->away_id == $away_id) {
 
                 $labels[] = round($val->starttime->diffInDays(Carbon::now()));
 
-                $label_formatted[$val->match_id] = $val->starttime->format('d. F Y H:i');
+                $playing_date[] = $val['starttime']->format('d. F Y H:i');
+
+                $results_per_event[] = $val['gls_h'] . ' : ' . $val['gls_a'];
+
+                $events[] = $val->home->name . ' vs ' . $val->away->name;
 
                 if ($val->home_id == $home_id or $val->away_id == $home_id) {
                     $home_matches[] = $val->match_id;
@@ -73,6 +80,9 @@ class LoadPerformance
             'datasets' => [
                 [
                     'label' => $match->home->name,
+                    'playing_date' => $playing_date,
+                    'results_per_event' => $results_per_event,
+                    'events' => $events,
                     'data' => $homes['all'] ?? [],
                     'spanGaps' => true,
                     'tension' => 0.5,
@@ -82,6 +92,9 @@ class LoadPerformance
                 ],
                 [
                     'label' => 'Defence',
+                    'playing_date' => $playing_date,
+                    'results_per_event' => $results_per_event,
+                    'events' => $events,
                     'data' => $homes['def'] ?? [],
                     'spanGaps' => true,
                     'tension' => 0.5,
@@ -89,9 +102,13 @@ class LoadPerformance
                     'backgroundColor' => '#c10007',
                     'fill' => false,
                     'pointStyle' => $hasdots,
+                    'hidden' => true,
                 ],
                 [
                     'label' => 'Attak',
+                    'playing_date' => $playing_date,
+                    'results_per_event' => $results_per_event,
+                    'events' => $events,
                     'data' => $homes['att'] ?? [],
                     'spanGaps' => true,
                     'tension' => 0.5,
@@ -99,9 +116,13 @@ class LoadPerformance
                     'backgroundColor' => '#c10007',
                     'fill' => false,
                     'pointStyle' => $hasdots,
+                    'hidden' => true,
                 ],
                 [
                     'label' => 'Midfield',
+                    'playing_date' => $playing_date,
+                    'results_per_event' => $results_per_event,
+                    'events' => $events,
                     'data' => $homes['mid'] ?? [],
                     'spanGaps' => true,
                     'tension' => 0.5,
@@ -109,9 +130,13 @@ class LoadPerformance
                     'backgroundColor' => '#c10007',
                     'fill' => false,
                     'pointStyle' => $hasdots,
+                    'hidden' => true,
                 ],
                 [
                     'label' => $match->away->name,
+                    'playing_date' => $playing_date,
+                    'results_per_event' => $results_per_event,
+                    'events' => $events,
                     'data' => $aways['all'] ?? [],
                     'spanGaps' => true,
                     'tension' => 0.5,
@@ -119,9 +144,13 @@ class LoadPerformance
                     'backgroundColor' => '#fdc700',
                     'fill' => false,
                     'pointStyle' => $hasdots,
+                    'hidden' => true,
                 ],
                 [
                     'label' => 'Defence',
+                    'playing_date' => $playing_date,
+                    'results_per_event' => $results_per_event,
+                    'events' => $events,
                     'data' => $aways['def'] ?? [],
                     'spanGaps' => true,
                     'tension' => 0.5,
@@ -129,9 +158,13 @@ class LoadPerformance
                     'backgroundColor' => '#d08700',
                     'fill' => false,
                     'pointStyle' => $hasdots,
+                    'hidden' => true,
                 ],
                 [
                     'label' => 'Attak',
+                    'playing_date' => $playing_date,
+                    'results_per_event' => $results_per_event,
+                    'events' => $events,
                     'data' => $aways['att'] ?? [],
                     'spanGaps' => true,
                     'tension' => 0.5,
@@ -139,9 +172,13 @@ class LoadPerformance
                     'backgroundColor' => '#d08700',
                     'fill' => false,
                     'pointStyle' => $hasdots,
+                    'hidden' => true,
                 ],
                 [
                     'label' => 'Midfield',
+                    'playing_date' => $playing_date,
+                    'results_per_event' => $results_per_event,
+                    'events' => $events,
                     'data' => $aways['mid'] ?? [],
                     'spanGaps' => true,
                     'tension' => 0.5,
@@ -149,6 +186,7 @@ class LoadPerformance
                     'backgroundColor' => '#d08700',
                     'fill' => false,
                     'pointStyle' => $hasdots,
+                    'hidden' => true,
                 ],
             ],
             'labels' => $labels,