From a6fc32866994eecfafcc57cb2fedbb4242834c1f Mon Sep 17 00:00:00 2001 From: salam Date: Thu, 22 Jan 2026 14:22:24 +0100 Subject: [PATCH] tooltip fumetto refresh wip --- 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 +- .../tables/columns/column_3way.blade.php | 78 ++++++++++++++++++- .../columns/fumetto-multiline/label.blade.php | 20 ++--- .../fumetto-multiline/lastcheck.blade.php | 17 +++- .../columns/fumetto-multiline/odds.blade.php | 17 ++-- .../columns/fumetto/fumetto_1x2.blade.php | 4 +- 18 files changed, 123 insertions(+), 39 deletions(-) diff --git a/app/Filament/Tables/Columns/Column3way.php b/app/Filament/Tables/Columns/Column3way.php index 241397f0..5ff5c08d 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 ?int $has_data; + protected ?bool $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 aab6f1c5..dd9b9beb 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 ?int $has_data; + protected ?bool $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 1e272b8a..df9f7ef7 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 ?int $has_data; + protected ?bool $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 ed25791f..99be59a5 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 ?int $has_data; + protected ?bool $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 819e292e..d02e7845 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 ?int $has_data; + protected ?bool $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 6aab63e1..7ea08f3e 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 ?int $has_data; + protected ?bool $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 96c680f1..8c2d7a94 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 ?int $has_data; + protected ?bool $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 92c850b7..3ba9f0cd 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 ?int $has_data; + protected ?bool $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 b194cada..bd992ebc 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 ?int $has_data; + protected ?bool $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 e8a0eb75..e87d3eb7 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 ?int $has_data; + protected ?bool $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 ec3cf7d3..9e5ad1a0 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 ?int $has_data; + protected ?bool $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 c7da8211..fd8bf720 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 ?int $has_data; + protected ?bool $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 672c9d53..30819962 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 ?int $has_data; + protected ?bool $has_data; public function bookmakers(?array $bookmakers): static { diff --git a/resources/views/filament/tables/columns/column_3way.blade.php b/resources/views/filament/tables/columns/column_3way.blade.php index e4bb1637..fdf06534 100644 --- a/resources/views/filament/tables/columns/column_3way.blade.php +++ b/resources/views/filament/tables/columns/column_3way.blade.php @@ -1,20 +1,92 @@ @php $loadData($record); $act = $getAct(); + $max = $getMax(); + $min = $getMin(); @endphp @if ($hasData()) - @include('filament.tables.columns.fumetto.fumetto_1x2') +
+ + + +
- @include('filament.tables.columns.multiline.label', ['labels' => ['1', 'X', '2']]) + @include('filament.tables.columns.multiline.label', [ + 'labels' => ['1', 'X', '2'], + 'twice' => false, + ]) @foreach ($getBookmaker() as $bookmaker_id) @foreach ($record->odds_3ways as $item) @if ($item->bookmaker_id == $bookmaker_id && in_array($item->bookmaker_id, $getSlots())) - @include('filament.tables.columns.multiline.bkm', [ 'bookmaker_id' => $item->bookmaker_id, 'icon' => $item->bookmaker->icon ?? '', diff --git a/resources/views/filament/tables/columns/fumetto-multiline/label.blade.php b/resources/views/filament/tables/columns/fumetto-multiline/label.blade.php index 39a53914..3ddc6fa3 100644 --- a/resources/views/filament/tables/columns/fumetto-multiline/label.blade.php +++ b/resources/views/filament/tables/columns/fumetto-multiline/label.blade.php @@ -3,16 +3,16 @@
{{ $label }}
@endforeach
Margin
-
Lastcheck
+
Check
-@if($twice) +@if ($twice) -
-
Book
-@foreach ($labels as $label) -
{{ $label }}
-@endforeach -
Margin
-
Lastcheck
+
+
Book
+ @foreach ($labels as $label) +
{{ $label }}
+ @endforeach +
Margin
+
Check
-@endif \ No newline at end of file +@endif diff --git a/resources/views/filament/tables/columns/fumetto-multiline/lastcheck.blade.php b/resources/views/filament/tables/columns/fumetto-multiline/lastcheck.blade.php index 7c2d0b48..62917a0e 100644 --- a/resources/views/filament/tables/columns/fumetto-multiline/lastcheck.blade.php +++ b/resources/views/filament/tables/columns/fumetto-multiline/lastcheck.blade.php @@ -1,5 +1,18 @@ @php -use Illuminate\Support\Carbon; + use Illuminate\Support\Carbon; + $lastcheck_5min = Carbon::createFromDate($lastcheck)->addMinutes(5); + $lastcheck_30min = Carbon::createFromDate($lastcheck)->addMinutes(30); + $now = Carbon::now(); @endphp -
{{Carbon::createFromDate($lastcheck)->format('d.m H:i')}}
\ No newline at end of file +@if ($lastcheck_30min->lt($now)) +
+ {{ Carbon::createFromDate($lastcheck)->format('H:i') }} +
+@elseif ($lastcheck_5min->lt($now)) +
+ {{ Carbon::createFromDate($lastcheck)->format('H:i') }} +
+@else +
{{ Carbon::createFromDate($lastcheck)->format('H:i') }}
+@endif diff --git a/resources/views/filament/tables/columns/fumetto-multiline/odds.blade.php b/resources/views/filament/tables/columns/fumetto-multiline/odds.blade.php index c936e916..44f02d9c 100644 --- a/resources/views/filament/tables/columns/fumetto-multiline/odds.blade.php +++ b/resources/views/filament/tables/columns/fumetto-multiline/odds.blade.php @@ -1,17 +1,14 @@ -
  - @if (isset($odd)) - {{ number_format($odd, $dec) }} - @endif + @if (isset($odd)) + {{ number_format($odd, $dec) }} + @endif  
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 5af75eaf..367a0776 100644 --- a/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php +++ b/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php @@ -16,6 +16,8 @@ ]) @endif +
{{ $time }}
+ @php $max = $getMax(); @@ -71,7 +73,7 @@ allowHTML: true, theme: $store.theme, appendTo: $root, - interactive: true + interactive: true, }" />
@endif