From b0482cacf664e99138ac68649ad27861edcb1e67 Mon Sep 17 00:00:00 2001 From: salam Date: Thu, 22 Jan 2026 20:21:19 +0100 Subject: [PATCH] fucking around with tooltip update --- .../Resources/Events/Tables/EventsTable.php | 3 + app/Filament/Tables/Columns/Column3way.php | 2 +- app/Filament/Tables/Columns/Column3wayHt.php | 2 +- app/Filament/Tables/Columns/ColumnDc.php | 2 +- app/Filament/Tables/Columns/ColumnDnb.php | 2 +- app/Filament/Tables/Columns/ColumnGgng.php | 2 +- app/Filament/Tables/Columns/ColumnMl.php | 2 +- app/Filament/Tables/Columns/ColumnMlS1.php | 2 +- app/Filament/Tables/Columns/ColumnPoint.php | 2 +- app/Filament/Tables/Columns/ColumnPointQ1.php | 2 +- app/Filament/Tables/Columns/ColumnTotal.php | 2 +- app/Filament/Tables/Columns/ColumnTotalHt.php | 2 +- app/Filament/Tables/Columns/ColumnTotalQ1.php | 2 +- app/Filament/Tables/Columns/ColumnTq.php | 2 +- app/Filament/Tables/Columns/PopupOdds.php | 58 +++++++ composer.json | 2 +- composer.lock | 6 +- .../tables/columns/column_3way.blade.php | 70 +-------- .../columns/fumetto/fumetto_1x2.blade.php | 7 +- .../columns/fumetto/fumetto_1x2_ht.blade.php | 138 +++++++++-------- .../columns/fumetto/fumetto_dc.blade.php | 142 +++++++++--------- .../columns/fumetto/fumetto_dnb.blade.php | 2 - .../columns/fumetto/fumetto_ggng.blade.php | 2 - .../columns/fumetto/fumetto_ml.blade.php | 2 - .../columns/fumetto/fumetto_ml_s1.blade.php | 2 - .../columns/fumetto/fumetto_point.blade.php | 2 - .../fumetto/fumetto_point_q1.blade.php | 2 - .../columns/fumetto/fumetto_total.blade.php | 2 - .../fumetto/fumetto_total_ht.blade.php | 2 - .../fumetto/fumetto_total_q1.blade.php | 2 - .../columns/fumetto/fumetto_tq.blade.php | 2 - .../tables/columns/popup-odds.blade.php | 83 ++++++++++ todo.md | 1 + 33 files changed, 302 insertions(+), 254 deletions(-) create mode 100644 app/Filament/Tables/Columns/PopupOdds.php create mode 100644 resources/views/filament/tables/columns/popup-odds.blade.php diff --git a/app/Filament/Resources/Events/Tables/EventsTable.php b/app/Filament/Resources/Events/Tables/EventsTable.php index 7481cd19..342ce085 100644 --- a/app/Filament/Resources/Events/Tables/EventsTable.php +++ b/app/Filament/Resources/Events/Tables/EventsTable.php @@ -19,6 +19,7 @@ use App\Filament\Tables\Columns\ColumnTotalQ1; use App\Filament\Tables\Columns\ColumnTq; use App\Filament\Tables\Columns\EventColumn; use App\Filament\Tables\Columns\MatchIds; +use App\Filament\Tables\Columns\PopupOdds; use App\Models\CompetitionGroup; use App\Models\Country; use App\Models\Event; @@ -99,6 +100,8 @@ class EventsTable ->alignCenter() ->label('ML'), + PopupOdds::make('1x2')->label(''), + Column3way::make('odds_3ways')->bookmakers(self::$multiline_bookmaker['odds_3ways'] ?? []) ->visible(fn () => in_array('odds_3ways', self::$bettype_settings)) ->verticalAlignment(VerticalAlignment::Start) diff --git a/app/Filament/Tables/Columns/Column3way.php b/app/Filament/Tables/Columns/Column3way.php index 5ff5c08d..241397f0 100644 --- a/app/Filament/Tables/Columns/Column3way.php +++ b/app/Filament/Tables/Columns/Column3way.php @@ -16,7 +16,7 @@ class Column3way extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/Column3wayHt.php b/app/Filament/Tables/Columns/Column3wayHt.php index dd9b9beb..aab6f1c5 100644 --- a/app/Filament/Tables/Columns/Column3wayHt.php +++ b/app/Filament/Tables/Columns/Column3wayHt.php @@ -16,7 +16,7 @@ class Column3wayHt extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/ColumnDc.php b/app/Filament/Tables/Columns/ColumnDc.php index df9f7ef7..1e272b8a 100644 --- a/app/Filament/Tables/Columns/ColumnDc.php +++ b/app/Filament/Tables/Columns/ColumnDc.php @@ -16,7 +16,7 @@ class ColumnDc extends Column protected ?array $bookmakers; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/ColumnDnb.php b/app/Filament/Tables/Columns/ColumnDnb.php index 99be59a5..ed25791f 100644 --- a/app/Filament/Tables/Columns/ColumnDnb.php +++ b/app/Filament/Tables/Columns/ColumnDnb.php @@ -16,7 +16,7 @@ class ColumnDnb extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/ColumnGgng.php b/app/Filament/Tables/Columns/ColumnGgng.php index d02e7845..819e292e 100644 --- a/app/Filament/Tables/Columns/ColumnGgng.php +++ b/app/Filament/Tables/Columns/ColumnGgng.php @@ -16,7 +16,7 @@ class ColumnGgng extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/ColumnMl.php b/app/Filament/Tables/Columns/ColumnMl.php index 7ea08f3e..6aab63e1 100644 --- a/app/Filament/Tables/Columns/ColumnMl.php +++ b/app/Filament/Tables/Columns/ColumnMl.php @@ -16,7 +16,7 @@ class ColumnMl extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/ColumnMlS1.php b/app/Filament/Tables/Columns/ColumnMlS1.php index 8c2d7a94..96c680f1 100644 --- a/app/Filament/Tables/Columns/ColumnMlS1.php +++ b/app/Filament/Tables/Columns/ColumnMlS1.php @@ -16,7 +16,7 @@ class ColumnMlS1 extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/ColumnPoint.php b/app/Filament/Tables/Columns/ColumnPoint.php index 3ba9f0cd..92c850b7 100644 --- a/app/Filament/Tables/Columns/ColumnPoint.php +++ b/app/Filament/Tables/Columns/ColumnPoint.php @@ -16,7 +16,7 @@ class ColumnPoint extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/ColumnPointQ1.php b/app/Filament/Tables/Columns/ColumnPointQ1.php index bd992ebc..b194cada 100644 --- a/app/Filament/Tables/Columns/ColumnPointQ1.php +++ b/app/Filament/Tables/Columns/ColumnPointQ1.php @@ -16,7 +16,7 @@ class ColumnPointQ1 extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/ColumnTotal.php b/app/Filament/Tables/Columns/ColumnTotal.php index e87d3eb7..e8a0eb75 100644 --- a/app/Filament/Tables/Columns/ColumnTotal.php +++ b/app/Filament/Tables/Columns/ColumnTotal.php @@ -16,7 +16,7 @@ class ColumnTotal extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/ColumnTotalHt.php b/app/Filament/Tables/Columns/ColumnTotalHt.php index 9e5ad1a0..ec3cf7d3 100644 --- a/app/Filament/Tables/Columns/ColumnTotalHt.php +++ b/app/Filament/Tables/Columns/ColumnTotalHt.php @@ -16,7 +16,7 @@ class ColumnTotalHt extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/ColumnTotalQ1.php b/app/Filament/Tables/Columns/ColumnTotalQ1.php index fd8bf720..c7da8211 100644 --- a/app/Filament/Tables/Columns/ColumnTotalQ1.php +++ b/app/Filament/Tables/Columns/ColumnTotalQ1.php @@ -16,7 +16,7 @@ class ColumnTotalQ1 extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/ColumnTq.php b/app/Filament/Tables/Columns/ColumnTq.php index 30819962..672c9d53 100644 --- a/app/Filament/Tables/Columns/ColumnTq.php +++ b/app/Filament/Tables/Columns/ColumnTq.php @@ -16,7 +16,7 @@ class ColumnTq extends Column protected $act; - protected ?bool $has_data; + protected ?int $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/app/Filament/Tables/Columns/PopupOdds.php b/app/Filament/Tables/Columns/PopupOdds.php new file mode 100644 index 00000000..3f0157d9 --- /dev/null +++ b/app/Filament/Tables/Columns/PopupOdds.php @@ -0,0 +1,58 @@ +has_data = count($record->odds_3ways); + + $this->act = $record->odds_3ways->where('bookmaker_id', auth()->user()->bookmaker_id)->first(); + + $this->max['h3w'] = $record->odds_3ways->max('h3w'); + + $this->max['d3w'] = $record->odds_3ways->max('d3w'); + + $this->max['a3w'] = $record->odds_3ways->max('a3w'); + + $this->min['h3w'] = $record->odds_3ways->min('h3w'); + + $this->min['d3w'] = $record->odds_3ways->min('d3w'); + + $this->min['a3w'] = $record->odds_3ways->min('a3w'); + + } + + public function getAct() + { + return $this->act; + } + + public function getMax() + { + return $this->max; + } + + public function getMin() + { + return $this->min; + } + + public function hasData() + { + return $this->has_data; + } +} diff --git a/composer.json b/composer.json index 12a76c8a..3731be77 100644 --- a/composer.json +++ b/composer.json @@ -89,4 +89,4 @@ }, "minimum-stability": "stable", "prefer-stable": true -} \ No newline at end of file +} diff --git a/composer.lock b/composer.lock index 89013bf5..22c3084c 100644 --- a/composer.lock +++ b/composer.lock @@ -12814,12 +12814,12 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { "php": "^8.3" }, - "platform-dev": {}, - "plugin-api-version": "2.9.0" + "platform-dev": [], + "plugin-api-version": "2.6.0" } diff --git a/resources/views/filament/tables/columns/column_3way.blade.php b/resources/views/filament/tables/columns/column_3way.blade.php index fdf06534..fe777286 100644 --- a/resources/views/filament/tables/columns/column_3way.blade.php +++ b/resources/views/filament/tables/columns/column_3way.blade.php @@ -7,75 +7,7 @@ @if ($hasData()) -
- - - -
+ @include('filament.tables.columns.fumetto.fumetto_1x2')
diff --git a/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php b/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php index 367a0776..2278b020 100644 --- a/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php +++ b/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php @@ -1,4 +1,3 @@ -@if ($hasData())