This commit is contained in:
salam committed 2026-05-27 15:33:16 +02:00
1 parent fc18f98fd8
commit c329d5a6f5
5 files changed
+33 -38

No files matched your search

+10 -4
View File
@@ -149,10 +149,10 @@ class Statistic extends BaseDashboard
->options([ ->options([
'gls' => 'Goals', 'gls' => 'Goals',
'crn' => 'Corner', 'crn' => 'Corner',
'fls' => 'Fouls commited', 'fls' => 'Fouls Commited',
'ofs' => 'Offside', 'ofs' => 'Offside',
'crd' => 'Cards', 'crd' => 'Cards',
'snt' => 'Shot on target', 'snt' => 'Shots On Target',
'tsh' => 'Total shots', 'tsh' => 'Total shots',
]), ]),
Select::make('similar_past_matches') Select::make('similar_past_matches')
@@ -167,6 +167,10 @@ class Statistic extends BaseDashboard
->default('none') ->default('none')
->live() ->live()
->selectablePlaceholder(false) ->selectablePlaceholder(false)
->afterStateUpdated(function (callable $set) {
$set('team_id', null);
$set('tm_player_id', null);
})
->options([ ->options([
'none' => 'None', 'none' => 'None',
'league' => 'League', 'league' => 'League',
@@ -233,10 +237,12 @@ class Statistic extends BaseDashboard
{ {
return [ return [
StatsMedianAverage::make(), StatsMedianAverage::make(),
// Events
ChartPunctualEvent::make(), ChartPunctualEvent::make(),
ChartMovingAverageEvent::make(), ChartMovingAverageEvent::make(),
ChartPunctualPlayer::make(), // Players
ChartMovingAveragePlayer::make(), // ChartPunctualPlayer::make(),
// ChartMovingAveragePlayer::make(),
]; ];
} }
+1 -1
View File
@@ -37,7 +37,7 @@ class ChartPunctualPlayer extends ChartWidget
$this->heading = 'Player'; $this->heading = 'Player';
$this->description = ucfirst(HelperStatisticType::get($this->filters)); $this->description = HelperStatisticType::get($this->filters);
if (isset($data['description'])) { if (isset($data['description'])) {
$this->description .= $data['description']; $this->description .= $data['description'];
@@ -7,10 +7,10 @@ class HelperStatisticType
protected static array $types = [ protected static array $types = [
'gls' => 'Goals', 'gls' => 'Goals',
'crn' => 'Corner', 'crn' => 'Corner',
'fls' => 'Fouls commited', 'fls' => 'Fouls Commited',
'ofs' => 'Offside', 'ofs' => 'Offside',
'crd' => 'Cards', 'crd' => 'Cards',
'snt' => 'Shot on target', 'snt' => 'Shots On Target',
'tsh' => 'Total shots', 'tsh' => 'Total shots',
]; ];
+3 -14
View File
@@ -47,7 +47,7 @@ class LoadEvents
if (! $match_id) { if (! $match_id) {
return []; return [];
} }
if (! $team_id && $similar_past_matches != 'none') { if (! $team_id && $similar_past_matches == 'none') {
return []; return [];
} }
@@ -64,7 +64,7 @@ class LoadEvents
*/ */
$handicap_range = 0; $handicap_range = 0;
$total_range = 0; $total_range = 0;
if ($similar_past_matches != 'none' && isset($res)) { if ($similar_past_matches != 'none') {
$res = StatisticFixtures::where('id', (int) $match_id)->first(); $res = StatisticFixtures::where('id', (int) $match_id)->first();
$exp_handicap = $res->exp_away - $res->exp_home; $exp_handicap = $res->exp_away - $res->exp_home;
@@ -103,8 +103,7 @@ class LoadEvents
/** /**
* STATTISTIC DATA * STATTISTIC DATA
*/ */
$res = StatistikoEvent::with('home') $res = StatistikoEvent::with('home')->with('away')
->with('away')
->where(function ($query) use ($league_id, $similar_past_matches) { ->where(function ($query) use ($league_id, $similar_past_matches) {
switch ($similar_past_matches) { switch ($similar_past_matches) {
case 'none': case 'none':
@@ -148,18 +147,8 @@ class LoadEvents
$labels = []; $labels = [];
$events = []; $events = [];
$labels_since = []; $labels_since = [];
// win in favor (w) against (w2)
// draw in favor (d) against (d2)
// lost in favor (l) against (l2)
$results = ['w' => 0, 'd' => 0, 'l' => 0, 'w2' => 0, 'l2' => 0]; $results = ['w' => 0, 'd' => 0, 'l' => 0, 'w2' => 0, 'l2' => 0];
/**
* IF WITH PLAYER
*/
// $res = StatisticFixtures::with('home')->with('away')->where('id', (int) $match_id)->first();
// $event = $res->home->name.' vs '.$res->away->name;
// dd($event);
foreach ($res as $value) { foreach ($res as $value) {
$labels[] = $value['starttime']->format('d.M.Y H:i'); $labels[] = $value['starttime']->format('d.M.Y H:i');
+17 -17
View File
@@ -757,23 +757,23 @@ class BettypeSeeder extends Seeder
('744', '1', '1330', 'HALF MORE SHOT', 'ONE,X,TWO', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('744', '1', '1330', 'HALF MORE SHOT', 'ONE,X,TWO', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('745', '1', '1337', 'CORRECT SCORE SHOT', '3-3,3-4,3-5,3-6,3-7,4-3,4-4,4-5,4-6,4-7,5-3,5-4,5-5,5-6,5-7,6-3,6-4,6-5,6-6,6-7,7-3,7-4,7-5,7-6,7-7,OTHER', '1', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('745', '1', '1337', 'CORRECT SCORE SHOT', '3-3,3-4,3-5,3-6,3-7,4-3,4-4,4-5,4-6,4-7,5-3,5-4,5-5,5-6,5-7,6-3,6-4,6-5,6-6,6-7,7-3,7-4,7-5,7-6,7-7,OTHER', '1', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('746', '1', '1367', 'NUMBER OF SHOT Y/N', 'YES,NO', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('746', '1', '1367', 'NUMBER OF SHOT Y/N', 'YES,NO', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('747', '1', '1401', '1X2 SHOT ON TARGET', 'ONE,X,TWO', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('747', '1', '1401', '1X2 Shots On Target', 'ONE,X,TWO', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('748', '1', '1407', 'FIRST SHOT ON TARGET', 'ONE,NONE,TWO', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('748', '1', '1407', 'FIRST Shots On Target', 'ONE,NONE,TWO', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('749', '1', '1408', 'LAST SHOT ON TARGET', 'ONE,NONE,TWO', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('749', '1', '1408', 'LAST Shots On Target', 'ONE,NONE,TWO', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('750', '1', '1409', 'ODD EVEN SHOT ON TARGET', 'EVEN,ODD', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('750', '1', '1409', 'ODD EVEN Shots On Target', 'EVEN,ODD', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('751', '1', '1411', 'NUMBER OF SHOT ON TARGET', 'NG01,NG2,NG3,NG4,NG5,NG6P', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('751', '1', '1411', 'NUMBER OF Shots On Target', 'NG01,NG2,NG3,NG4,NG5,NG6P', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('752', '1', '1414', 'HANDICAP SHOT ON TARGET', 'HTH1,HTH2', '1', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('752', '1', '1414', 'HANDICAP Shots On Target', 'HTH1,HTH2', '1', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('753', '1', '1416', 'OVER UNDER SHOT ON TARGET', 'OVER,UNDER', '0', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('753', '1', '1416', 'OVER UNDER Shots On Target', 'OVER,UNDER', '0', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('754', '1', '1417', '1X2 & O/U SHOT ON TARGET', '1/O,1/U,X/O,X/U,2/O,2/U', '0', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('754', '1', '1417', '1X2 & O/U Shots On Target', '1/O,1/U,X/O,X/U,2/O,2/U', '0', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('755', '1', '1420', 'HOME TEAM SHOT ON TARGET', 'NC0,NC1,NC2,NC3,NC4,NC5,NC6,NC+6', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('755', '1', '1420', 'HOME TEAM Shots On Target', 'NC0,NC1,NC2,NC3,NC4,NC5,NC6,NC+6', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('756', '1', '1422', 'ODD EVEN SHOT ON TARGET HOME', 'EVEN,ODD', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('756', '1', '1422', 'ODD EVEN Shots On Target HOME', 'EVEN,ODD', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('757', '1', '1423', 'OVER UNDER SHOT ON TARGET HOME', 'OVER,UNDER', '0', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('757', '1', '1423', 'OVER UNDER Shots On Target HOME', 'OVER,UNDER', '0', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('758', '1', '1424', 'AWAY TEAM SHOT ON TARGET', 'NC0,NC1,NC2,NC3,NC4,NC5,NC6,NC+6', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('758', '1', '1424', 'AWAY TEAM Shots On Target', 'NC0,NC1,NC2,NC3,NC4,NC5,NC6,NC+6', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('759', '1', '1426', 'ODD EVEN SHOT ON TARGET AWAY', 'EVEN,ODD', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('759', '1', '1426', 'ODD EVEN Shots On Target AWAY', 'EVEN,ODD', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('760', '1', '1427', 'OVER UNDER SHOT ON TARGET AWAY', 'OVER,UNDER', '0', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('760', '1', '1427', 'OVER UNDER Shots On Target AWAY', 'OVER,UNDER', '0', '1', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('761', '1', '1430', 'HALF MORE SHOT ON TARGET', 'ONE,X,TWO', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('761', '1', '1430', 'HALF MORE Shots On Target', 'ONE,X,TWO', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('762', '1', '1437', 'CORRECT SCORE SHOT ON TARGET', '0-0,0-1,0-2,0-3,0-4,1-0,1-1,1-2,1-3,1-4,2-0,2-1,2-2,2-3,2-4,3-0,3-1,3-2,3-3,3-4,4-0,4-1,4-2,4-3,4-4,OTHER', '1', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('762', '1', '1437', 'CORRECT SCORE Shots On Target', '0-0,0-1,0-2,0-3,0-4,1-0,1-1,1-2,1-3,1-4,2-0,2-1,2-2,2-3,2-4,3-0,3-1,3-2,3-3,3-4,4-0,4-1,4-2,4-3,4-4,OTHER', '1', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('763', '1', '1467', 'NUMBER OF SHOT ON TARGET Y/N', 'YES,NO', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('763', '1', '1467', 'NUMBER OF Shots On Target Y/N', 'YES,NO', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('764', '5', '5017', 'COMBO ML O/U (2/3)', '1/o,1/u,2/o,2/u', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '4', NULL, NULL), ('764', '5', '5017', 'COMBO ML O/U (2/3)', '1/o,1/u,2/o,2/u', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '4', NULL, NULL),
('765', '5', '5217', 'COMBO ML O/U (3/5)', '1/o,1/u,2/o,2/u', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '18', NULL, NULL), ('765', '5', '5217', 'COMBO ML O/U (3/5)', '1/o,1/u,2/o,2/u', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '18', NULL, NULL),
('766', '2', '2023', 'DOUBLE CHANCE', '1X,X2,12', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '3', NULL, NULL), ('766', '2', '2023', 'DOUBLE CHANCE', '1X,X2,12', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '1', '1', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '0', '1', '0', '0', '0', '0', '0', '0', '0', '0', '0', '3', NULL, NULL),