wip
This commit is contained in:
salam committed
1 parent
2077be1c12
commit
1d9e18c402
3 files changed
+46
-21
No files matched your search
@@ -233,6 +233,7 @@ class Statistic extends BaseDashboard
|
||||
'all' => 'All',
|
||||
'lineup' => 'Lineup',
|
||||
'substituted' => 'Substituted',
|
||||
'notplayed' => 'Not Played',
|
||||
])
|
||||
->live(),
|
||||
Select::make('season')
|
||||
|
||||
@@ -111,10 +111,14 @@ class LoadEvents
|
||||
return $query->where('lineup', 'T');
|
||||
case 'substituted':
|
||||
return $query->where('lineup', 'P');
|
||||
case 'notplayed':
|
||||
return $query->where('minutes_played', 0);
|
||||
}
|
||||
})
|
||||
->pluck('match_id')->toArray();
|
||||
|
||||
// dd($matches_played);
|
||||
|
||||
$description = ' with ' . StatistikoDetail::where('tm_player_id', (int) $tm_player_id)->value('name') . ' (' . \count($matches_played) . ')';
|
||||
|
||||
if (! $matches_played) {
|
||||
@@ -612,10 +616,10 @@ class LoadEvents
|
||||
$average_league = $media_league_h ? round(array_sum($media_league_h) / \count($media_league_h), 2):0;
|
||||
break;
|
||||
case 'away':
|
||||
$average_league = $media_league_h ? round(array_sum($media_league_a) / \count($media_league_a), 2):0;
|
||||
$average_league = $media_league_a ? round(array_sum($media_league_a) / \count($media_league_a), 2):0;
|
||||
break;
|
||||
default:
|
||||
$media_league = $media_league_a + $media_league_h;
|
||||
$media_league = array_merge($media_league_a, $media_league_h);
|
||||
$average_league = $media_league ? round(array_sum($media_league) / \count($media_league), 2) : 0;
|
||||
break;
|
||||
}
|
||||
|
||||
@@ -39,20 +39,6 @@ class StatsMedianAverage extends StatsOverviewWidget
|
||||
$arr_home = [];
|
||||
$arr_away = [];
|
||||
|
||||
$max_boxes = 6;
|
||||
foreach ($data['datasets'] as $value) {
|
||||
if ($value['label'] == "Average League") {
|
||||
$max_boxes = 7;
|
||||
}
|
||||
}
|
||||
|
||||
$this->columns = [
|
||||
'default' => 1,
|
||||
'sm' => 2,
|
||||
'lg' => 4,
|
||||
'xl' => $max_boxes,
|
||||
];
|
||||
|
||||
$statistic_type = HelperStatisticType::get($this->filters);
|
||||
|
||||
if (! isset($data['datasets'][0])) {
|
||||
@@ -103,26 +89,60 @@ class StatsMedianAverage extends StatsOverviewWidget
|
||||
else
|
||||
$value_away = 0;
|
||||
|
||||
$max_boxes = 4;
|
||||
|
||||
$boxes = [];
|
||||
$boxes[] = Stat::make('Number', new HtmlString('<div id="number-of-events">' . $total_home . '</div>'))->description('Events')->extraAttributes(['x-init' => "animate('number-of-events', $total_home, 0)"]);
|
||||
$boxes[] = Stat::make('Average ' . $statistic_type, self::template('avhome', 'avaway', $home_team, $away_team))->description('Team ' . $team_position)->extraAttributes(['x-init' => "animate('avhome', $value_home); animate('avaway', $value_away, 0)"]);
|
||||
foreach ($data['datasets'] as $value) {
|
||||
if ($value['label'] == "Average League") {
|
||||
$str = $value['data'][0] ?? 0;
|
||||
$boxes[] = Stat::make('Average ' . $statistic_type, new HtmlString('<div id="number-of-events">' . $str . '</div>'))->description('League ' . $team_position)->extraAttributes(['x-init' => "animate('number-of-events', $total_home, 0)"]);
|
||||
$boxes[] = Stat::make('Average ' . $statistic_type, new HtmlString('<div id="number-of-events">' . $str . '</div>'))->description('League ' . $team_position)->extraAttributes(['x-init' => "animate('number-of-events', $str, 0)"]);
|
||||
$max_boxes = 5;
|
||||
}
|
||||
}
|
||||
$boxes[] = Stat::make('Median ' . $statistic_type, self::template('mehome', 'meaway', $home_team, $away_team))->description($team_position)->extraAttributes(['x-init' => "animate('mehome', $median_home); animate('meaway', $median_away, 0)"]);
|
||||
$boxes[] = Stat::make($data['similar_past_matches'] != 'none' ? '1' : 'Win: ' . $data['results']['w'], new HtmlString('<div id="number-of-win">' . $win . '</div>'))->extraAttributes(['x-init' => "animate('number-of-win', $win, 1)"]);
|
||||
$boxes[] = Stat::make($data['similar_past_matches'] != 'none' ? 'X' : 'Draw: ' . $data['results']['d'], new HtmlString('<div id="number-of-draw">' . $draw . '</div>'))->extraAttributes(['x-init' => "animate('number-of-draw', $draw, 1)"]);
|
||||
$boxes[] = Stat::make($data['similar_past_matches'] != 'none' ? '2' : 'Lost: ' . $data['results']['l'], new HtmlString('<div id="number-of-lost">' . $lost . '</div>'))->extraAttributes(['x-init' => "animate('number-of-lost', $lost, 1)"]);
|
||||
|
||||
$boxes[] = Stat::make('Odds', self::templateOdds($data, $win, $draw, $lost))->description($team_position)->extraAttributes(['x-init' => "animate('mehome', $median_home); animate('meaway', $median_away, 0)"]);
|
||||
|
||||
// $boxes[] = Stat::make($data['similar_past_matches'] != 'none' ? '1' : 'Win: ' . $data['results']['w'], new HtmlString('<div id="number-of-win">' . $win . '</div>'))->extraAttributes(['x-init' => "animate('number-of-win', $win, 1)"]);
|
||||
// $boxes[] = Stat::make($data['similar_past_matches'] != 'none' ? 'X' : 'Draw: ' . $data['results']['d'], new HtmlString('<div id="number-of-draw">' . $draw . '</div>'))->extraAttributes(['x-init' => "animate('number-of-draw', $draw, 1)"]);
|
||||
// $boxes[] = Stat::make($data['similar_past_matches'] != 'none' ? '2' : 'Lost: ' . $data['results']['l'], new HtmlString('<div id="number-of-lost">' . $lost . '</div>'))->extraAttributes(['x-init' => "animate('number-of-lost', $lost, 1)"]);
|
||||
|
||||
$this->columns = [
|
||||
'default' => 1,
|
||||
'sm' => 3,
|
||||
'xl' => $max_boxes,
|
||||
];
|
||||
|
||||
return $boxes;
|
||||
}
|
||||
|
||||
protected function templateOdds(&$data, float $win, float $draw, float $lost): HtmlString
|
||||
{
|
||||
if($data['similar_past_matches'] != 'none') {
|
||||
$name_win = '1 ('.$data['results']['w'].')';
|
||||
$name_draw = 'X ('.$data['results']['d'].')';
|
||||
$name_lost = '2 ('.$data['results']['l'].')';
|
||||
}
|
||||
else {
|
||||
$name_win = 'Win ('.$data['results']['w'].')';
|
||||
$name_draw = 'Draw ('.$data['results']['d'].')';
|
||||
$name_lost = 'Lost ('.$data['results']['l'].')';
|
||||
}
|
||||
return new HtmlString('<div class="grid grid-cols-3 justify-center">
|
||||
<span class="text-center font-bold text-2xl">'.number_format($win, 2).'</span>
|
||||
<span class="text-center font-bold text-2xl">'.number_format($draw, 2).'</span>
|
||||
<span class="text-center font-bold text-2xl">'.number_format($lost, 2).'</span>
|
||||
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$name_win.'</span>
|
||||
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$name_draw.'</span>
|
||||
<span class="text-center text-xs text-gray-500 dark:text-gray-400">'.$name_lost.'</span>
|
||||
</div>');
|
||||
}
|
||||
|
||||
protected function template(string $home_id, string $away_id, string $home_name, string $away_name): HtmlString
|
||||
{
|
||||
return new HtmlString('<div class="grid grid-cols-2 justify-center font-bold text-3xl">
|
||||
return new HtmlString('<div class="grid grid-cols-2 justify-center font-bold text-2xl">
|
||||
<span class="text-center" id="' . $home_id . '">0</span>
|
||||
<span class="text-center" id="' . $away_id . '">0</span>
|
||||
<span class="text-center text-xs text-gray-500 dark:text-gray-400">' . $home_name . '</span>
|
||||
|
||||
Reference in new issue
Block a user