From 99b901009c90004b9b5d08c1d5dcf3391468587a Mon Sep 17 00:00:00 2001
From: salam <hermann.telser@gmail.com>
Date: Sun, 4 Jan 2026 15:56:53 +0100
Subject: [PATCH] popup highest max and min wip

---
 app/Filament/Tables/Columns/Column3way.php    | 47 ++++++++----
 app/Filament/Tables/Columns/ColumnDc.php      | 27 +++++--
 app/Filament/Tables/Columns/ColumnDnb.php     | 27 +++++--
 app/Filament/Tables/Columns/ColumnGgng.php    | 27 +++++--
 app/Filament/Tables/Columns/ColumnTotal.php   | 27 +++++--
 app/Filament/Tables/Columns/ColumnTq.php      | 27 +++++--
 .../tables/columns/column-dc.blade.php        | 76 +++++--------------
 .../tables/columns/column-dnb.blade.php       | 52 +++----------
 .../tables/columns/column-ggng.blade.php      | 51 +++----------
 .../tables/columns/column-total.blade.php     | 63 +++------------
 .../tables/columns/column-tq.blade.php        | 52 +++----------
 .../tables/columns/column_3way.blade.php      | 26 +++----
 .../columns/fumetto/fumetto_1x2.blade.php     | 35 +++++----
 .../columns/fumetto/fumetto_dc.blade.php      | 32 ++++----
 .../columns/fumetto/fumetto_dnb.blade.php     | 16 ++--
 .../columns/fumetto/fumetto_ggng.blade.php    | 16 ++--
 .../columns/fumetto/fumetto_total.blade.php   | 20 ++---
 .../columns/fumetto/fumetto_tq.blade.php      | 16 ++--
 .../tables/columns/multiline/fums.blade.php   | 17 +++++
 .../tables/columns/multiline/odds.blade.php   | 11 +--
 20 files changed, 292 insertions(+), 373 deletions(-)
 create mode 100644 resources/views/filament/tables/columns/multiline/fums.blade.php

diff --git a/app/Filament/Tables/Columns/Column3way.php b/app/Filament/Tables/Columns/Column3way.php
index 26cd199b..10c43a2c 100644
--- a/app/Filament/Tables/Columns/Column3way.php
+++ b/app/Filament/Tables/Columns/Column3way.php
@@ -10,6 +10,12 @@ class Column3way extends Column
 
     protected ?array $bookmakers;
 
+    protected $max;
+
+    protected $min;
+
+    protected $act;
+
     protected ?bool $has_data;
 
     public function bookmakers(?array $bookmakers): static
@@ -30,21 +36,34 @@ class Column3way extends Column
     {
         $this->has_data = count($record->odds_3way) ? true : false;
 
-        $tmp = [];
-        $tmp['max_h3w'] = $record->odds_3way->max('h3w');
-        $tmp['min_h3w'] = $record->odds_3way->min('h3w');
-        $tmp['max_d3w'] = $record->odds_3way->max('d3w');
-        $tmp['min_d3w'] = $record->odds_3way->min('d3w');
-        $tmp['max_a3w'] = $record->odds_3way->max('a3w');
-        $tmp['min_a3w'] = $record->odds_3way->min('a3w');
+        $this->act = $record->odds_3way->where('bookmaker_id', auth()->user()->bookmaker_id)->first();
 
-        foreach ($record->odds_3way as $key => $value) {
-            if ($value->h3w == $tmp['max_h3w']) {
-                $record->odds_3way->key->max_h3w = true;
-            } else {
-                $record->odds_3way->key->max_h3w = false;
-            }
-        }
+        $this->max['h3w'] = $record->odds_3way->max('h3w');
+
+        $this->max['d3w'] = $record->odds_3way->max('d3w');
+
+        $this->max['a3w'] = $record->odds_3way->max('a3w');
+
+        $this->min['h3w'] = $record->odds_3way->min('h3w');
+
+        $this->min['d3w'] = $record->odds_3way->min('d3w');
+
+        $this->min['a3w'] = $record->odds_3way->min('a3w');
+    }
+
+    public function getAct()
+    {
+        return $this->act;
+    }
+
+    public function getMax()
+    {
+        return $this->max;
+    }
+
+    public function getMin()
+    {
+        return $this->min;
     }
 
     public function hasData()
diff --git a/app/Filament/Tables/Columns/ColumnDc.php b/app/Filament/Tables/Columns/ColumnDc.php
index bb9e094c..a128ee8f 100644
--- a/app/Filament/Tables/Columns/ColumnDc.php
+++ b/app/Filament/Tables/Columns/ColumnDc.php
@@ -8,9 +8,11 @@ class ColumnDc extends Column
 {
     protected string $view = 'filament.tables.columns.column-dc';
 
-    protected ?array $max;
+    protected $max;
 
-    protected ?array $min;
+    protected $min;
+
+    protected $act;
 
     protected ?array $bookmakers;
 
@@ -18,6 +20,8 @@ class ColumnDc extends Column
 
     public function bookmakers(?array $bookmakers): static
     {
+        array_unshift($bookmakers, auth()->user()->bookmaker_id);
+
         $this->bookmakers = $bookmakers;
 
         return $this;
@@ -30,19 +34,26 @@ class ColumnDc extends Column
 
     public function loadData($record)
     {
+        $this->has_data = count($record->odds_dc) ? true : false;
+
+        $this->act = $record->odds_dc->where('bookmaker_id', auth()->user()->bookmaker_id)->first();
+
         $this->max['dc1x'] = $record->odds_dc->max('dc1x');
-        $this->min['dc1x'] = $record->odds_dc->min('dc1x');
 
         $this->max['dc12'] = $record->odds_dc->max('dc12');
-        $this->min['dc12'] = $record->odds_dc->min('dc12');
 
         $this->max['dcx2'] = $record->odds_dc->max('dcx2');
+
+        $this->min['dc1x'] = $record->odds_dc->min('dc1x');
+
+        $this->min['dc12'] = $record->odds_dc->min('dc12');
+
         $this->min['dcx2'] = $record->odds_dc->min('dcx2');
+    }
 
-        $this->max['margin'] = $record->odds_dc->max('margin');
-        $this->min['margin'] = $record->odds_dc->min('margin');
-
-        $this->has_data = count($record->odds_dc) ? true : false;
+    public function getAct()
+    {
+        return $this->act;
     }
 
     public function getMax()
diff --git a/app/Filament/Tables/Columns/ColumnDnb.php b/app/Filament/Tables/Columns/ColumnDnb.php
index d7ce931a..5606d7b0 100644
--- a/app/Filament/Tables/Columns/ColumnDnb.php
+++ b/app/Filament/Tables/Columns/ColumnDnb.php
@@ -8,16 +8,20 @@ class ColumnDnb extends Column
 {
     protected string $view = 'filament.tables.columns.column-dnb';
 
-    protected ?array $max;
-
-    protected ?array $min;
-
     protected ?array $bookmakers;
 
+    protected $max;
+
+    protected $min;
+
+    protected $act;
+
     protected ?bool $has_data;
 
     public function bookmakers(?array $bookmakers): static
     {
+        array_unshift($bookmakers, auth()->user()->bookmaker_id);
+
         $this->bookmakers = $bookmakers;
 
         return $this;
@@ -30,16 +34,23 @@ class ColumnDnb extends Column
 
     public function loadData($record)
     {
+        $this->has_data = count($record->odds_dnb) ? true : false;
+
+        $this->act = $record->odds_dnb->where('bookmaker_id', auth()->user()->bookmaker_id)->first();
+
         $this->max['dnb1'] = $record->odds_dnb->max('dnb1');
-        $this->min['dnb1'] = $record->odds_dnb->min('dnb1');
 
         $this->max['dnb2'] = $record->odds_dnb->max('dnb2');
+
+        $this->min['dnb1'] = $record->odds_dnb->min('dnb1');
+
         $this->min['dnb2'] = $record->odds_dnb->min('dnb2');
 
-        $this->max['margin'] = $record->odds_dnb->max('margin');
-        $this->min['margin'] = $record->odds_dnb->min('margin');
+    }
 
-        $this->has_data = count($record->odds_dnb) ? true : false;
+    public function getAct()
+    {
+        return $this->act;
     }
 
     public function getMax()
diff --git a/app/Filament/Tables/Columns/ColumnGgng.php b/app/Filament/Tables/Columns/ColumnGgng.php
index 7a24900e..5556a534 100644
--- a/app/Filament/Tables/Columns/ColumnGgng.php
+++ b/app/Filament/Tables/Columns/ColumnGgng.php
@@ -8,16 +8,20 @@ class ColumnGgng extends Column
 {
     protected string $view = 'filament.tables.columns.column-ggng';
 
-    protected ?array $max;
-
-    protected ?array $min;
-
     protected ?array $bookmakers;
 
+    protected $max;
+
+    protected $min;
+
+    protected $act;
+
     protected ?bool $has_data;
 
     public function bookmakers(?array $bookmakers): static
     {
+        array_unshift($bookmakers, auth()->user()->bookmaker_id);
+
         $this->bookmakers = $bookmakers;
 
         return $this;
@@ -30,16 +34,23 @@ class ColumnGgng extends Column
 
     public function loadData($record)
     {
+        $this->has_data = count($record->odds_ggng) ? true : false;
+
+        $this->act = $record->odds_ggng->where('bookmaker_id', auth()->user()->bookmaker_id)->first();
+
         $this->max['gg'] = $record->odds_ggng->max('gg');
-        $this->min['gg'] = $record->odds_ggng->min('gg');
 
         $this->max['ng'] = $record->odds_ggng->max('ng');
+
+        $this->min['gg'] = $record->odds_ggng->min('gg');
+
         $this->min['ng'] = $record->odds_ggng->min('ng');
 
-        $this->max['margin'] = $record->odds_ggng->max('margin');
-        $this->min['margin'] = $record->odds_ggng->min('margin');
+    }
 
-        $this->has_data = count($record->odds_ggng) ? true : false;
+    public function getAct()
+    {
+        return $this->act;
     }
 
     public function getMax()
diff --git a/app/Filament/Tables/Columns/ColumnTotal.php b/app/Filament/Tables/Columns/ColumnTotal.php
index 9e623e9c..4f174d03 100644
--- a/app/Filament/Tables/Columns/ColumnTotal.php
+++ b/app/Filament/Tables/Columns/ColumnTotal.php
@@ -8,16 +8,20 @@ class ColumnTotal extends Column
 {
     protected string $view = 'filament.tables.columns.column-total';
 
-    protected ?array $max;
-
-    protected ?array $min;
-
     protected ?array $bookmakers;
 
+    protected $max;
+
+    protected $min;
+
+    protected $act;
+
     protected ?bool $has_data;
 
     public function bookmakers(?array $bookmakers): static
     {
+        array_unshift($bookmakers, auth()->user()->bookmaker_id);
+
         $this->bookmakers = $bookmakers;
 
         return $this;
@@ -30,16 +34,23 @@ class ColumnTotal extends Column
 
     public function loadData($record)
     {
+        $this->has_data = count($record->odds_total) ? true : false;
+
+        $this->act = $record->odds_total->where('bookmaker_id', auth()->user()->bookmaker_id)->first();
+
         $this->max['over'] = $record->odds_total->max('over');
-        $this->min['over'] = $record->odds_total->min('over');
 
         $this->max['under'] = $record->odds_total->max('under');
+
+        $this->min['over'] = $record->odds_total->min('over');
+
         $this->min['under'] = $record->odds_total->min('under');
 
-        $this->max['margin'] = $record->odds_total->max('margin');
-        $this->min['margin'] = $record->odds_total->min('margin');
+    }
 
-        $this->has_data = count($record->odds_total) ? true : false;
+    public function getAct()
+    {
+        return $this->act;
     }
 
     public function getMax()
diff --git a/app/Filament/Tables/Columns/ColumnTq.php b/app/Filament/Tables/Columns/ColumnTq.php
index be3f4791..832fa882 100644
--- a/app/Filament/Tables/Columns/ColumnTq.php
+++ b/app/Filament/Tables/Columns/ColumnTq.php
@@ -8,16 +8,20 @@ class ColumnTq extends Column
 {
     protected string $view = 'filament.tables.columns.column-tq';
 
-    protected ?array $max;
-
-    protected ?array $min;
-
     protected ?array $bookmakers;
 
+    protected $max;
+
+    protected $min;
+
+    protected $act;
+
     protected ?bool $has_data;
 
     public function bookmakers(?array $bookmakers): static
     {
+        array_unshift($bookmakers, auth()->user()->bookmaker_id);
+
         $this->bookmakers = $bookmakers;
 
         return $this;
@@ -30,16 +34,23 @@ class ColumnTq extends Column
 
     public function loadData($record)
     {
+        $this->has_data = count($record->odds_tq) ? true : false;
+
+        $this->act = $record->odds_tq->where('bookmaker_id', auth()->user()->bookmaker_id)->first();
+
         $this->max['htq'] = $record->odds_tq->max('htq');
-        $this->min['htq'] = $record->odds_tq->min('htq');
 
         $this->max['atq'] = $record->odds_tq->max('atq');
+
+        $this->min['htq'] = $record->odds_tq->min('htq');
+
         $this->min['atq'] = $record->odds_tq->min('atq');
 
-        $this->max['margin'] = $record->odds_tq->max('margin');
-        $this->min['margin'] = $record->odds_tq->min('margin');
+    }
 
-        $this->has_data = count($record->odds_tq) ? true : false;
+    public function getAct()
+    {
+        return $this->act;
     }
 
     public function getMax()
diff --git a/resources/views/filament/tables/columns/column-dc.blade.php b/resources/views/filament/tables/columns/column-dc.blade.php
index 57fd47e8..86f7c265 100644
--- a/resources/views/filament/tables/columns/column-dc.blade.php
+++ b/resources/views/filament/tables/columns/column-dc.blade.php
@@ -10,82 +10,44 @@
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['1X', '12', 'X2']])
 
-        @foreach ($record->odds_dc as $item)
-            @if ($item->bookmaker_id == auth()->user()->bookmaker_id)
-                @include('filament.tables.columns.multiline.bkm', [
+        @php
+            $act = $getAct();
+        @endphp
+
+        @foreach ($getBookmaker() as $bookmaker_id)
+            @foreach ($record->odds_dc as $item)
+                @if ($item->bookmaker_id == $bookmaker_id)
+                    @include('filament.tables.columns.multiline.bkm', [
                     'bookmaker_id' => $item->bookmaker_id,
                     'icon' => $item->bookmaker->icon ?? '',
                 ])
 
                 @include('filament.tables.columns.multiline.odds', [
                     'odd' => $item->dc1x,
-                    'decimal' => 2,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
+                    'dec' => 2,
+                    'hig' => isset($act['dc1x']) && $item->dc1x >= $act['dc1x'] ? 1: 0,
+                    'has' => isset($act['dc1x']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                 ])
 
                 @include('filament.tables.columns.multiline.odds', [
                     'odd' => $item->dc12,
-                    'decimal' => 2,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
+                    'dec' => 2,
+                    'hig' => isset($act['dc12']) && $item->dc12 >= $act['dc12'] ? 1: 0,
+                    'has' => isset($act['dc12']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                 ])
 
                 @include('filament.tables.columns.multiline.odds', [
                     'odd' => $item->dcx2,
-                    'decimal' => 2,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
+                    'dec' => 2,
+                    'hig' => isset($act['dcx2']) && $item->dcx2 >= $act['dcx2'] ? 1: 0,
+                    'has' => isset($act['dcx2']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                 ])
 
                 @include('filament.tables.columns.multiline.odds', [
                     'odd' => $item->margin,
-                    'decimal' => 1,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
+                    'dec' => 1,
+                    'has' => false
                 ])
-            @endif
-        @endforeach
-
-        @foreach ($getBookmaker() as $bookmaker_id)
-            @foreach ($record->odds_dc as $item)
-                @if ($item->bookmaker_id == $bookmaker_id)
-                    @include('filament.tables.columns.multiline.bkm', [
-                        'bookmaker_id' => $item->bookmaker_id,
-                        'icon' => $item->bookmaker->icon ?? '',
-                    ])
-
-                    @include('filament.tables.columns.multiline.odds', [
-                        'odd' => $item->dc1x,
-                        'decimal' => 2,
-                        'max' => false,
-                        'min' => false,
-                    ])
-
-                    @include('filament.tables.columns.multiline.odds', [
-                        'odd' => $item->dc12,
-                        'decimal' => 2,
-                        'max' => false,
-                        'min' => false,
-                    ])
-
-                    @include('filament.tables.columns.multiline.odds', [
-                        'odd' => $item->dcx2,
-                        'decimal' => 2,
-                        'max' => false,
-                        'min' => false,
-                    ])
-
-                    @include('filament.tables.columns.multiline.odds', [
-                        'odd' => $item->margin,
-                        'decimal' => 1,
-                        'max' => false,
-                        'min' => false,
-                    ])
                 @endif
             @endforeach
         @endforeach
diff --git a/resources/views/filament/tables/columns/column-dnb.blade.php b/resources/views/filament/tables/columns/column-dnb.blade.php
index 50310bd8..a8355f56 100644
--- a/resources/views/filament/tables/columns/column-dnb.blade.php
+++ b/resources/views/filament/tables/columns/column-dnb.blade.php
@@ -10,38 +10,9 @@
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['DNB1', 'DNB2']])
 
-        @foreach ($record->odds_dnb as $item)
-            @if ($item->bookmaker_id == auth()->user()->bookmaker_id)
-                @include('filament.tables.columns.multiline.bkm', [
-                    'bookmaker_id' => $item->bookmaker_id,
-                    'icon' => $item->bookmaker->icon ?? '',
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->dnb1,
-                    'decimal' => 2,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->dnb2,
-                    'decimal' => 2,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->margin,
-                    'decimal' => 1,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-            @endif
-        @endforeach
+        @php
+            $act = $getAct();
+        @endphp
 
         @foreach ($getBookmaker() as $bookmaker_id)
             @foreach ($record->odds_dnb as $item)
@@ -53,23 +24,22 @@
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->dnb1,
-                        'decimal' => 2,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 2,
+                        'hig' => isset($act['dnb1']) && $item->dnb1 >= $act['dnb1'] ? 1: 0,
+                        'has' => isset($act['dnb1']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                     ])
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->dnb2,
-                        'decimal' => 2,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 2,
+                        'hig' => isset($act['dnb2']) && $item->dnb2 >= $act['dnb2'] ? 1: 0,
+                        'has' => isset($act['dnb2']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                     ])
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->margin,
-                        'decimal' => 1,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 1,
+                        'has' => false,
                     ])
                 @endif
             @endforeach
diff --git a/resources/views/filament/tables/columns/column-ggng.blade.php b/resources/views/filament/tables/columns/column-ggng.blade.php
index 4aaa9e6c..0d14db40 100644
--- a/resources/views/filament/tables/columns/column-ggng.blade.php
+++ b/resources/views/filament/tables/columns/column-ggng.blade.php
@@ -10,38 +10,10 @@
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['GG', 'NG']])
 
-        @foreach ($record->odds_ggng as $item)
-            @if ($item->bookmaker_id == auth()->user()->bookmaker_id)
-                @include('filament.tables.columns.multiline.bkm', [
-                    'bookmaker_id' => $item->bookmaker_id,
-                    'icon' => $item->bookmaker->icon ?? '',
-                ])
+        @php
+            $act = $getAct();
+        @endphp
 
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->gg,
-                    'decimal' => 2,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->ng,
-                    'decimal' => 2,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->margin,
-                    'decimal' => 1,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-            @endif
-        @endforeach
 
         @foreach ($getBookmaker() as $bookmaker_id)
             @foreach ($record->odds_ggng as $item)
@@ -53,23 +25,22 @@
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->gg,
-                        'decimal' => 2,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 2,
+                        'hig' => isset($act['gg']) && $item->gg >= $act['gg'] ? 1: 0,
+                        'has' => isset($act['gg']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                     ])
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->ng,
-                        'decimal' => 2,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 2,
+                        'hig' => isset($act['ng']) && $item->ng >= $act['ng'] ? 1: 0,
+                        'has' => isset($act['ng']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                     ])
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->margin,
-                        'decimal' => 1,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 1,
+                        'has' => false,
                     ])
                 @endif
             @endforeach
diff --git a/resources/views/filament/tables/columns/column-total.blade.php b/resources/views/filament/tables/columns/column-total.blade.php
index d931ca25..302ac6af 100644
--- a/resources/views/filament/tables/columns/column-total.blade.php
+++ b/resources/views/filament/tables/columns/column-total.blade.php
@@ -10,47 +10,6 @@
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['O', 'U', 'T']])
 
-        @foreach ($record->odds_total as $item)
-            @if ($item->bookmaker_id == auth()->user()->bookmaker_id)
-                @include('filament.tables.columns.multiline.bkm', [
-                    'bookmaker_id' => $item->bookmaker_id,
-                    'icon' => $item->bookmaker->icon ?? '',
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->over,
-                    'decimal' => 2,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->under,
-                    'decimal' => 2,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->total,
-                    'decimal' => 1,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->margin,
-                    'decimal' => 1,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-            @endif
-        @endforeach
-
         @foreach ($getBookmaker() as $bookmaker_id)
             @foreach ($record->odds_total as $item)
                 @if ($item->bookmaker_id == $bookmaker_id)
@@ -61,30 +20,28 @@
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->over,
-                        'decimal' => 2,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 2,
+                        'hig' => isset($act['over']) && $item->over >= $act['over'] ? 1: 0,
+                        'has' => isset($act['over']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                     ])
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->under,
-                        'decimal' => 2,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 2,
+                        'hig' => isset($act['under']) && $item->under >= $act['under'] ? 1: 0,
+                        'has' => isset($act['under']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                     ])
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->total,
-                        'decimal' => 1,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 1,
+                        'has' => false,
                     ])
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->margin,
-                        'decimal' => 1,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 1,
+                        'has' => false,
                     ])
                 @endif
             @endforeach
diff --git a/resources/views/filament/tables/columns/column-tq.blade.php b/resources/views/filament/tables/columns/column-tq.blade.php
index 61d1f050..0bcb2aac 100644
--- a/resources/views/filament/tables/columns/column-tq.blade.php
+++ b/resources/views/filament/tables/columns/column-tq.blade.php
@@ -10,38 +10,9 @@
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['H', 'A']])
 
-        @foreach ($record->odds_tq as $item)
-            @if ($item->bookmaker_id == auth()->user()->bookmaker_id)
-                @include('filament.tables.columns.multiline.bkm', [
-                    'bookmaker_id' => $item->bookmaker_id,
-                    'icon' => $item->bookmaker->icon ?? '',
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->htq,
-                    'decimal' => 2,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->atq,
-                    'decimal' => 2,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-
-                @include('filament.tables.columns.multiline.odds', [
-                    'odd' => $item->margin,
-                    'decimal' => 1,
-                    'max' => false,
-                    'min' => false,
-                    'main' => true,
-                ])
-            @endif
-        @endforeach
+        @php
+            $act = $getAct();
+        @endphp
 
         @foreach ($getBookmaker() as $bookmaker_id)
             @foreach ($record->odds_tq as $item)
@@ -53,23 +24,22 @@
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->htq,
-                        'decimal' => 2,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 2,
+                        'hig' => isset($act['htq']) && $item->htq >= $act['htq'] ? 1: 0,
+                        'has' => isset($act['htq']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                     ])
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->atq,
-                        'decimal' => 2,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 2,
+                        'hig' => isset($act['atq']) && $item->atq >= $act['atq'] ? 1: 0,
+                        'has' => isset($act['atq']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                     ])
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->margin,
-                        'decimal' => 1,
-                        'max' => false,
-                        'min' => false,
+                        'dec' => 1,
+                        'has' => false,
                     ])
                 @endif
             @endforeach
diff --git a/resources/views/filament/tables/columns/column_3way.blade.php b/resources/views/filament/tables/columns/column_3way.blade.php
index 24a2d005..aa746e3e 100644
--- a/resources/views/filament/tables/columns/column_3way.blade.php
+++ b/resources/views/filament/tables/columns/column_3way.blade.php
@@ -4,15 +4,18 @@
 
 @if ($hasData())
 
-    {{-- @include('filament.tables.columns.fumetto.fumetto_1x2') --}}
+    @include('filament.tables.columns.fumetto.fumetto_1x2')
 
     <div {{ $getExtraAttributeBag() }} class="grid grid-cols-5" style="width: 225px;">
 
         @include('filament.tables.columns.multiline.label', ['labels' => ['1', 'X', '2']])
 
+        @php
+            $act = $getAct();
+        @endphp
+
         @foreach ($getBookmaker() as $bookmaker_id)
             @foreach ($record->odds_3way as $item)
-
                 @if ($item->bookmaker_id == $bookmaker_id)
                     @include('filament.tables.columns.multiline.bkm', [
                         'bookmaker_id' => $item->bookmaker_id,
@@ -22,33 +25,28 @@
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->h3w,
                         'dec' => 2,
-                        'hig' => $item->max_h3w,
-                        'max' => false,
-                        'min' => false,
+                        'hig' => isset($act['h3w']) && $item->h3w >= $act['h3w'] ? 1: 0,
+                        'has' => isset($act['h3w']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                     ])
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->d3w,
                         'dec' => 2,
-                        'hig' => false,
-                        'max' => false,
-                        'min' => false,
+                        'hig' => isset($act['d3w']) && $item->d3w >= $act['d3w'] ? 1: 0,
+                        'has' => isset($act['d3w']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                     ])
                     
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->a3w,
                         'dec' => 2,
-                        'hig' => false,
-                        'max' => false,
-                        'min' => false,
+                        'hig' => isset($act['a3w']) && $item->a3w >= $act['a3w'] ? 1: 0,
+                        'has' => isset($act['a3w']) && $item->bookmaker_id != auth()->user()->bookmaker_id,
                     ])
 
                     @include('filament.tables.columns.multiline.odds', [
                         'odd' => $item->margin,
                         'dec' => 1,
-                        'hig' => false,
-                        'max' => false,
-                        'min' => false,
+                        'has' => false,
                     ])
                 @endif
             @endforeach
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 353c29b9..2997e635 100644
--- a/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php
+++ b/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php
@@ -5,36 +5,43 @@
 
                 @include('filament.tables.columns.multiline.label', ['labels' => ['1', 'X', '2']])
 
+                 @php
+                    $max = $getMax();
+                    $min = $getMin();
+                @endphp
+
                 @foreach ($record->odds_3way as $item)
                     @include('filament.tables.columns.multiline.bkm', [
                         'bookmaker_id' => $item->bookmaker_id,
                         'icon' => $item->bookmaker->icon ?? '',
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->h3w,
-                        'decimal' => 2,
-                        'max' => $item?->max_h3w,
-                        'min' => $item?->min_h3w,
+                        'dec' => 2,
+                        'max' => $item->h3w >= $max['h3w'] ? 1 :0,
+                        'min' => $item->h3w <= $min['h3w'] ? 1 :0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->d3w,
-                        'decimal' => 2,
-                        'max' => $item?->max_d3w,
-                        'min' => $item?->min_d3w,
+                        'dec' => 2,
+                        'max' => $item->d3w >= $max['d3w'] ? 1 :0,
+                        'min' => $item->d3w <= $min['d3w'] ? 1 :0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->a3w,
-                        'decimal' => 2,
-                        'max' => $item?->max_a3w,
-                        'min' => $item?->min_a3w,
+                        'dec' => 2,
+                        'max' => $item->a3w >= $max['a3w'] ? 1 :0,
+                        'min' => $item->a3w <= $min['a3w'] ? 1 :0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->margin,
-                        'decimal' => 1,
+                        'dec' => 1,
+                        'max' => false,
+                        'min' => false,
                     ])
                 @endforeach
             </div>
diff --git a/resources/views/filament/tables/columns/fumetto/fumetto_dc.blade.php b/resources/views/filament/tables/columns/fumetto/fumetto_dc.blade.php
index a51a34ed..c471e14c 100644
--- a/resources/views/filament/tables/columns/fumetto/fumetto_dc.blade.php
+++ b/resources/views/filament/tables/columns/fumetto/fumetto_dc.blade.php
@@ -16,32 +16,32 @@
                         'icon' => $item->bookmaker->icon ?? '',
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->dc1x,
-                        'decimal' => 2,
-                        'max' => $item->dc1x == $max['dc1x'] ? 1 : 0,
-                        'min' => $item->dc1x == $min['dc1x'] ? 1 : 0,
+                        'dec' => 2,
+                        'max' => $item->dc1x >= $max['dc1x'] ? 1 : 0,
+                        'min' => $item->dc1x <= $min['dc1x'] ? 1 : 0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->dc12,
-                        'decimal' => 2,
-                        'max' => $item->dc12 == $max['dc12'] ? 1 : 0,
-                        'min' => $item->dc12 == $min['dc12'] ? 1 : 0,
+                        'dec' => 2,
+                        'max' => $item->dc12 >= $max['dc12'] ? 1 : 0,
+                        'min' => $item->dc12 <= $min['dc12'] ? 1 : 0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->dcx2,
-                        'decimal' => 2,
-                        'max' => $item->dcx2 == $max['dcx2'] ? 1 : 0,
-                        'min' => $item->dcx2 == $min['dcx2'] ? 1 : 0,
+                        'dec' => 2,
+                        'max' => $item->dcx2 >= $max['dcx2'] ? 1 : 0,
+                        'min' => $item->dcx2 <= $min['dcx2'] ? 1 : 0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->margin,
-                        'decimal' => 1,
-                        'max' => $item->margin == $max['margin'] ? 1 : 0,
-                        'min' => $item->margin == $min['margin'] ? 1 : 0,
+                        'dec' => 1,
+                        'max' => false,
+                        'min' => false,
                     ])
                 @endforeach
             </div>
diff --git a/resources/views/filament/tables/columns/fumetto/fumetto_dnb.blade.php b/resources/views/filament/tables/columns/fumetto/fumetto_dnb.blade.php
index 0d32fef7..436727ee 100644
--- a/resources/views/filament/tables/columns/fumetto/fumetto_dnb.blade.php
+++ b/resources/views/filament/tables/columns/fumetto/fumetto_dnb.blade.php
@@ -16,25 +16,25 @@
                         'icon' => $item->bookmaker->icon ?? '',
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->dnb1,
-                        'decimal' => 2,
+                        'dec' => 2,
                         'max' => $item->dnb1 == $max['dnb1'] ? 1 : 0,
                         'min' => $item->dnb1 == $min['dnb1'] ? 1 : 0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->dnb2,
-                        'decimal' => 2,
+                        'dec' => 2,
                         'max' => $item->dnb2 == $max['dnb2'] ? 1 : 0,
                         'min' => $item->dnb2 == $min['dnb2'] ? 1 : 0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->margin,
-                        'decimal' => 1,
-                        'max' => $item->margin == $max['margin'] ? 1 : 0,
-                        'min' => $item->margin == $min['margin'] ? 1 : 0,
+                        'dec' => 1,
+                        'max' => false,
+                        'min' => false,
                     ])
                 @endforeach
             </div>
diff --git a/resources/views/filament/tables/columns/fumetto/fumetto_ggng.blade.php b/resources/views/filament/tables/columns/fumetto/fumetto_ggng.blade.php
index 1b118064..5a770438 100644
--- a/resources/views/filament/tables/columns/fumetto/fumetto_ggng.blade.php
+++ b/resources/views/filament/tables/columns/fumetto/fumetto_ggng.blade.php
@@ -16,25 +16,25 @@
                         'icon' => $item->bookmaker->icon ?? '',
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->gg,
-                        'decimal' => 2,
+                        'dec' => 2,
                         'max' => $item->gg == $max['gg'] ? 1 : 0,
                         'min' => $item->gg == $min['gg'] ? 1 : 0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->ng,
-                        'decimal' => 2,
+                        'dec' => 2,
                         'max' => $item->ng == $max['ng'] ? 1 : 0,
                         'min' => $item->ng == $min['ng'] ? 1 : 0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->margin,
-                        'decimal' => 1,
-                        'max' => $item->margin == $max['margin'] ? 1 : 0,
-                        'min' => $item->margin == $min['margin'] ? 1 : 0,
+                        'dec' => 1,
+                        'max' => false,
+                        'min' => false,
                     ])
                 @endforeach
             </div>
diff --git a/resources/views/filament/tables/columns/fumetto/fumetto_total.blade.php b/resources/views/filament/tables/columns/fumetto/fumetto_total.blade.php
index d0caaa57..f9be19ca 100644
--- a/resources/views/filament/tables/columns/fumetto/fumetto_total.blade.php
+++ b/resources/views/filament/tables/columns/fumetto/fumetto_total.blade.php
@@ -16,32 +16,32 @@
                         'icon' => $item->bookmaker->icon ?? '',
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->over,
-                        'decimal' => 2,
+                        'dec' => 2,
                         'max' => $item->over == $max['over'] ? 1 : 0,
                         'min' => $item->over == $min['over'] ? 1 : 0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->under,
-                        'decimal' => 2,
+                        'dec' => 2,
                         'max' => $item->under == $max['under'] ? 1 : 0,
                         'min' => $item->under == $min['under'] ? 1 : 0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->total,
-                        'decimal' => 1,
+                        'dec' => 1,
                         'max' => false,
                         'min' => false,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->margin,
-                        'decimal' => 1,
-                        'max' => $item->margin == $max['margin'] ? 1 : 0,
-                        'min' => $item->margin == $min['margin'] ? 1 : 0,
+                        'dec' => 1,
+                        'max' => false,
+                        'min' => false,
                     ])
                 @endforeach
             </div>
diff --git a/resources/views/filament/tables/columns/fumetto/fumetto_tq.blade.php b/resources/views/filament/tables/columns/fumetto/fumetto_tq.blade.php
index a0921823..07e62935 100644
--- a/resources/views/filament/tables/columns/fumetto/fumetto_tq.blade.php
+++ b/resources/views/filament/tables/columns/fumetto/fumetto_tq.blade.php
@@ -16,25 +16,25 @@
                         'icon' => $item->bookmaker->icon ?? '',
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->htq,
-                        'decimal' => 2,
+                        'dec' => 2,
                         'max' => $item->htq == $max['htq'] ? 1 : 0,
                         'min' => $item->htq == $min['htq'] ? 1 : 0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->atq,
-                        'decimal' => 2,
+                        'dec' => 2,
                         'max' => $item->atq == $max['atq'] ? 1 : 0,
                         'min' => $item->atq == $min['atq'] ? 1 : 0,
                     ])
 
-                    @include('filament.tables.columns.multiline.odds', [
+                    @include('filament.tables.columns.multiline.fums', [
                         'odd' => $item->margin,
-                        'decimal' => 1,
-                        'max' => $item->margin == $max['margin'] ? 1 : 0,
-                        'min' => $item->margin == $min['margin'] ? 1 : 0,
+                        'dec' => 1,
+                        'max' => false,
+                        'min' => false,
                     ])
                 @endforeach
             </div>
diff --git a/resources/views/filament/tables/columns/multiline/fums.blade.php b/resources/views/filament/tables/columns/multiline/fums.blade.php
new file mode 100644
index 00000000..13047141
--- /dev/null
+++ b/resources/views/filament/tables/columns/multiline/fums.blade.php
@@ -0,0 +1,17 @@
+<div style="font-size: 10.5px; text-align:center;" class="mb-0.5 ml-0.5
+
+    @if($max)
+        bg-green-600/25 rounded 
+    @endif
+
+    @if($min)
+        bg-blue-600/25 rounded 
+    @endif
+
+    ">
+    &nbsp;
+        @if (isset($odd))
+            {{ number_format($odd, $dec) }}
+        @endif
+    &nbsp;
+</div>
diff --git a/resources/views/filament/tables/columns/multiline/odds.blade.php b/resources/views/filament/tables/columns/multiline/odds.blade.php
index 857f03eb..9fdd7840 100644
--- a/resources/views/filament/tables/columns/multiline/odds.blade.php
+++ b/resources/views/filament/tables/columns/multiline/odds.blade.php
@@ -1,14 +1,7 @@
 <div style="font-size: 10.5px; text-align:center;" class="mb-0.5 ml-0.5
 
-    @if($max)
-        bg-green-600/25 rounded 
-    @endif
-
-    @if($min)
-        bg-blue-600/25 rounded 
-    @endif
-
-    @if($hig)
+    
+    @if($has && $hig)
         bg-gray-400/25 rounded 
     @endif