wip

app/Filament/Resources/Events/Tables/EventsTable.php

@@ -88,64 +88,48 @@ class EventsTable
                 ColumnOdds::make('odds_2ways')->bettype('odds_2ways')
                     ->visible(fn () => in_array('odds_2ways', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->alignCenter()
-                    ->width(200)
                     ->label('ML'),
 
                 TooltipOdds::make('mls1')->bettype('odds_2ways_s1')->label('')->visible(fn () => in_array('odds_2ways_s1', self::$bettype_settings)),
                 ColumnOdds::make('odds_2ways_s1')->bettype('odds_2ways_s1')
                     ->visible(fn () => in_array('odds_2ways_s1', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->alignCenter()
-                    ->width(200)
                     ->label('ML S1'),
 
                 TooltipOdds::make('1x2')->bettype('odds_3ways')->label('')->visible(fn () => in_array('odds_3ways', self::$bettype_settings)),
                 ColumnOdds::make('odds_3ways')->bettype('odds_3ways')
                     ->visible(fn () => in_array('odds_3ways', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->alignCenter()
-                    ->width(250)
                     ->label('1X2'),
 
                 TooltipOdds::make('total')->bettype('odds_totals')->label('')->visible(fn () => in_array('odds_totals', self::$bettype_settings)),
                 ColumnOdds::make('odds_totals')->bettype('odds_totals')
                     ->visible(fn () => in_array('odds_totals', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->alignCenter()
-                    ->width(250)
                     ->label('Totals'),
 
                 TooltipOdds::make('1x2ht')->bettype('odds_3ways_ht')->label('')->visible(fn () => in_array('odds_3ways_ht', self::$bettype_settings)),
                 ColumnOdds::make('odds_3ways_ht')->bettype('odds_3ways_ht')
                     ->visible(fn () => in_array('odds_3ways_ht', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->alignCenter()
-                    ->width(250)
                     ->label('1X2 HT'),
 
                 TooltipOdds::make('total_ht')->bettype('odds_totals_ht')->label('')->visible(fn () => in_array('odds_totals_ht', self::$bettype_settings)),
                 ColumnOdds::make('odds_totals_ht')->bettype('odds_totals_ht')
                     ->visible(fn () => in_array('odds_totals_ht', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->alignCenter()
-                    ->width(250)
                     ->label('Totals HT'),
 
                 TooltipOdds::make('ggng')->bettype('odds_ggng')->label('')->visible(fn () => in_array('odds_ggng', self::$bettype_settings)),
                 ColumnOdds::make('odds_ggng')->bettype('odds_ggng')
                     ->visible(fn () => \in_array('odds_ggng', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->alignCenter()
-                    ->width(200)
                     ->label('Goal No Goal'),
 
                 TooltipOdds::make('points')->bettype('odds_points')->label('')->visible(fn () => in_array('odds_points', self::$bettype_settings)),
                 ColumnOdds::make('odds_points')->bettype('odds_points')
                     ->visible(fn () => in_array('odds_points', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->width(250)
-                    ->alignCenter()
                     ->label('Points'),
 
                 TooltipOdds::make('total_q1')->bettype('odds_totals_q1')->label('')->visible(fn () => in_array('odds_totals_q1', self::$bettype_settings)),
@@ -160,32 +144,24 @@ class EventsTable
                 ColumnOdds::make('odds_points_q1')->bettype('odds_points_q1')
                     ->visible(fn () => in_array('odds_points_q1', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->alignCenter()
-                    ->width(250)
                     ->label('Points Q1'),
 
                 TooltipOdds::make('dc')->bettype('odds_dc')->label('')->visible(fn () => in_array('odds_dc', self::$bettype_settings)),
                 ColumnOdds::make('odds_dc')->bettype('odds_dc')
                     ->visible(fn () => \in_array('odds_dc', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->alignCenter()
-                    ->width(250)
                     ->label('Double Chance'),
 
                 TooltipOdds::make('tq')->bettype('odds_tq')->label('')->visible(fn () => in_array('odds_tq', self::$bettype_settings)),
                 ColumnOdds::make('odds_tq')->bettype('odds_tq')
                     ->visible(fn () => \in_array('odds_tq', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->alignCenter()
-                    ->width(200)
                     ->label('To Qualify'),
 
                 TooltipOdds::make('dnb')->bettype('odds_dnb')->label('')->visible(fn () => in_array('odds_dnb', self::$bettype_settings)),
                 ColumnOdds::make('odds_dnb')->bettype('odds_dnb')
                     ->visible(fn () => \in_array('odds_dnb', self::$bettype_settings))
                     ->verticalAlignment(VerticalAlignment::Start)
-                    ->alignCenter()
-                    ->width(200)
                     ->label('Draw No Bet'),
 
             ])->searchable(['id', 'home.name', 'away.name', 'betsapi_id', 'betradar_id', 'bet365_id', 'bwin_id', 'magnig_id', 'magken_id', 'lognig_id', 'logcol_id'])

app/Filament/Tables/Columns/ColumnOdds.php

@@ -323,10 +323,18 @@ class ColumnOdds extends Column
                 $filter = $this->filter[$model->bookmaker_id] ?? 0;
 
                 if ($filter) {
-                    if ($model->margin <= $filter['margin']) {
+                    if ($this->bettype == 'odds_dc') {
-                        $this->compare = $this->data->where('bookmaker_id', $model->bookmaker_id)->first();
+                        if ($model->margin <= $filter['margin'] * 2) {
+                            $this->compare = $this->data->where('bookmaker_id', $model->bookmaker_id)->first();
 
-                        return;
+                            return;
+                        }
+                    } else {
+                        if ($model->margin <= $filter['margin']) {
+                            $this->compare = $this->data->where('bookmaker_id', $model->bookmaker_id)->first();
+
+                            return;
+                        }
                     }
                 }
             }

resources/css/filament/admin/theme.css

@@ -18,7 +18,7 @@ button[wire\:click="resetTableFiltersForm"] {
 }
 
 .fi-ta-content-ctn {
-    min-height: 700px;
+    min-height: 350px;
 }
 
 /* .fi-ta-header-toolbar {

resources/views/filament/tables/columns/column-odds.blade.php

@@ -13,7 +13,7 @@
 
     @if ($getColumns() == 2)
         <div {{ $getExtraAttributeBag() }} class="grid grid-cols-4 gap-1 mb-1"
-            style="font-size: 10.5px; text-align:center; width:200px;">
+            style="font-size: 10.5px; text-align:center; width:216px;">
         @else
             <div {{ $getExtraAttributeBag() }} class="grid grid-cols-5 gap-1 mb-1"
                 style="font-size: 10.5px; text-align:center; width:270px;">

resources/views/filament/tables/columns/multiline/multiline-compare.blade.php

@@ -30,12 +30,12 @@
         @case ('odds_3ways_ht')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->h3w,
-                'alarm' => 1,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->d3w,
-                'alarm' => 2,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [

resources/views/filament/tables/columns/multiline/odd-compare.blade.php

@@ -1,5 +1,5 @@
 @switch($alarm)
-    @case(1)
+    @case(3)
         <x-alarm-red>
             {{ number_format($odd, $d) }}
         </x-alarm-red>
@@ -11,7 +11,7 @@
         </x-alarm-yellow>
     @break
 
-    @case(3)
+    @case(1)
         <x-alarm-green>
             {{ number_format($odd, $d) }}
         </x-alarm-green>