changes Ubaldo before Logomatic

This commit is contained in:
salam committed 2026-10-07 04:52:23 +02:00
1 parent 498660e9cc
commit f9e8b17d58
11 files changed
+607 -843

No files matched your search

+55 -52
View File
@@ -17,7 +17,6 @@ class LoadEvents
$team_id = (int) $filter['team_id'] ?? 0;
$statistic_type = $filter['statistic_type'] ?? 'gls';
$team_position = $filter['team_position'];
$seasonmode = $filter['seasonmode'];
$accuracy = (float) $filter['accuracy'] ?? 0.5;
$similar_past_matches = $filter['similar_past_matches'];
@@ -28,6 +27,10 @@ class LoadEvents
return [];
}
if (! $team_id && $similar_past_matches == 'none') {
return [];
}
if ($statistic_type == 'none') {
$statistic_type = 'gls';
}
@@ -128,10 +131,10 @@ class LoadEvents
break;
}
if ($statistic_type == 'gls') {
$dataset_exp_home[] = (float) round($value['exp_home'], 1);
$dataset_exp_away[] = (float) round($value['exp_away'], 1);
}
// if ($statistic_type == 'gls') {
// $dataset_exp_home[] = (float) round($value['exp_home'], 1);
// $dataset_exp_away[] = (float) round($value['exp_away'], 1);
// }
} else {
if ($team_position == 'home') {
switch ($value['result_code']) {
@@ -148,10 +151,10 @@ class LoadEvents
break;
}
if ($statistic_type == 'gls') {
$dataset_exp_home[] = (float) round($value['exp_home'], 1);
$dataset_exp_away[] = (float) round($value['exp_away'], 1);
}
// if ($statistic_type == 'gls') {
// $dataset_exp_home[] = (float) round($value['exp_home'], 1);
// $dataset_exp_away[] = (float) round($value['exp_away'], 1);
// }
} elseif ($team_position == 'away') {
switch ($value['result_code']) {
@@ -168,10 +171,10 @@ class LoadEvents
break;
}
if ($statistic_type == 'gls') {
$dataset_exp_home[] = (float) round($value['exp_away'], 1);
$dataset_exp_away[] = (float) round($value['exp_home'], 1);
}
// if ($statistic_type == 'gls') {
// $dataset_exp_home[] = (float) round($value['exp_away'], 1);
// $dataset_exp_away[] = (float) round($value['exp_home'], 1);
// }
} else {
// dd($team_id, $value['home_id'], $value['away_id']);
@@ -200,10 +203,10 @@ class LoadEvents
break;
}
if ($statistic_type == 'gls') {
$dataset_exp_home[] = (float) round($value['exp_away'], 1);
$dataset_exp_away[] = (float) round($value['exp_home'], 1);
}
// if ($statistic_type == 'gls') {
// $dataset_exp_home[] = (float) round($value['exp_away'], 1);
// $dataset_exp_away[] = (float) round($value['exp_home'], 1);
// }
}
}
if (isset($val_home) && isset($val_away)) {
@@ -240,8 +243,8 @@ class LoadEvents
$dataset_home2 = [];
$dataset_away2 = [];
$home_id = $match->home_id;
$away_id = $match->away_id;
// $home_id = $match->home_id;
// $away_id = $match->away_id;
foreach ($res[$team_position] as $value) {
@@ -310,13 +313,13 @@ class LoadEvents
'results_per_event' => $results_per_event,
'data' => $dataset_home,
'tension' => 0.5,
'borderColor' => '#fb2c36',
'backgroundColor' => '#fb2c36',
'borderColor' => '#00c950',
'backgroundColor' => '#00c950',
'pointStyle' => $hasdots,
'fill' => [
'target' => 1,
'above' => '#fb2c3680',
'below' => '#fdc70080',
'above' => '#00c95080',
'below' => '#2b7fff80',
],
],
[
@@ -326,11 +329,11 @@ class LoadEvents
'results_per_event' => $results_per_event,
'data' => $dataset_away,
'tension' => 0.5,
'borderColor' => '#fdc700',
'backgroundColor' => '#fdc700',
'borderColor' => '#2b7fff',
'backgroundColor' => '#2b7fff',
'pointStyle' => $hasdots,
'fill' => false,
'hidden' => true,
'hidden' => false,
],
],
'labels' => $labels,
@@ -342,32 +345,32 @@ class LoadEvents
'expectations_home' => $expectations['home'],
'expectations_away' => $expectations['away'],
];
if ($team_id && $statistic_type == 'gls') {
$data['datasets'][] = [
'label' => 'Goals '.$label1,
'events' => $events,
'playing_date' => $playing_date,
'results_per_event' => $results_per_event,
'data' => $dataset_exp_home,
'tension' => 0.5,
'borderColor' => '#00c950',
'backgroundColor' => '#00c950',
'pointStyle' => $hasdots,
'hidden' => true,
];
$data['datasets'][] = [
'label' => 'Goals '.$label2,
'events' => $events,
'playing_date' => $playing_date,
'results_per_event' => $results_per_event,
'data' => $dataset_exp_away,
'tension' => 0.5,
'borderColor' => '#2b7fff',
'backgroundColor' => '#2b7fff',
'pointStyle' => $hasdots,
'hidden' => true,
];
}
// if ($team_id && $statistic_type == 'gls') {
// $data['datasets'][] = [
// 'label' => 'Goals '.$label1,
// 'events' => $events,
// 'playing_date' => $playing_date,
// 'results_per_event' => $results_per_event,
// 'data' => $dataset_exp_home,
// 'tension' => 0.5,
// 'borderColor' => '#00c950',
// 'backgroundColor' => '#00c950',
// 'pointStyle' => $hasdots,
// 'hidden' => true,
// ];
// $data['datasets'][] = [
// 'label' => 'Goals '.$label2,
// 'events' => $events,
// 'playing_date' => $playing_date,
// 'results_per_event' => $results_per_event,
// 'data' => $dataset_exp_away,
// 'tension' => 0.5,
// 'borderColor' => '#2b7fff',
// 'backgroundColor' => '#2b7fff',
// 'pointStyle' => $hasdots,
// 'hidden' => true,
// ];
// }
if (isset($dataset_home2) && isset($dataset_away2)) {
$data['datasets'][] = [