monitor wip

app/Console/Commands/Grapper/TxOdds/Odds/_Dc.php

@@ -20,9 +20,9 @@ class _Dc
         foreach ($offer as $value) {
             $odds['dc1x'] = (float) $value->o1;
             $odds['dc12'] = (float) $value->o2;
-            $odds['dc2x'] = (float) $value->o3;
+            $odds['dcx2'] = (float) $value->o3;
         }
-        $odds['margin'] = (float) Margin::calculate([$odds['dc1x'], $odds['dc12'], $odds['dc2x']], 1);
+        $odds['margin'] = (float) Margin::calculate([$odds['dc1x'], $odds['dc12'], $odds['dcx2']], 1);
 
         OddsDc::updateOrCreate([
             'event_id' => Nuh::$id,

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

@@ -4,6 +4,9 @@ namespace App\Filament\Resources\Events\Tables;
 
 use App\Filament\Tables\Columns\Column3way;
 use App\Filament\Tables\Columns\ColumnDc;
+use App\Filament\Tables\Columns\ColumnDnb;
+use App\Filament\Tables\Columns\ColumnGgng;
+use App\Filament\Tables\Columns\ColumnTotal;
 use App\Filament\Tables\Columns\MatchIds;
 use App\Models\BettypeUser;
 use App\Models\Country;
@@ -46,7 +49,7 @@ class EventsTable
                     ->size(IconSize::ExtraLarge)
                     ->icon(fn ($record) => $record->sport->icon)
                     ->tooltip(fn ($record) => $record->id),
-                MatchIds::make('match_ids'),
+                // MatchIds::make('match_ids'),
                 TextColumn::make('id')->hidden()->searchable(),
                 TextColumn::make('betsapi_id')->hidden()->searchable(),
                 TextColumn::make('betradar_id')->hidden()->searchable(),
@@ -69,8 +72,12 @@ class EventsTable
                     ->alignRight(),
                 TextColumn::make('away.name')
                     ->searchable(),
-                Column3way::make('odds3way')->visible(fn () => in_array(1, self::$bettype_settings))->width(280)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => '1x2'])),
-                ColumnDc::make('oddsdc')->visible(fn () => in_array(2, self::$bettype_settings))->width(280)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'dc'])),
+                Column3way::make('odds3way')->visible(fn () => in_array(1, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => '1x2'])),
+                ColumnDc::make('oddsdc')->visible(fn () => in_array(2, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'dc'])),
+                ColumnDnb::make('oddsdnb')->visible(fn () => in_array(3, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'dnb'])),
+                ColumnGgng::make('oddsggng')->visible(fn () => in_array(4, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'gg'])),
+                ColumnGgng::make('oddstq')->visible(fn () => in_array(5, self::$bettype_settings))->width(190)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'tq'])),
+                ColumnTotal::make('oddstotal')->visible(fn () => in_array(6, self::$bettype_settings))->width(225)->label(fn () => view('filament.tables.columns.multiline.labels', ['menu' => 'ou'])),
             ])
             ->poll('10s')
             ->defaultSort('starttime', 'ASC')

app/Filament/Tables/Columns/Column3way.php

@@ -37,7 +37,7 @@ class Column3way extends Column
         $this->has_odds = count($this->multiline) ? true : false;
     }
 
-    public function getMultilines(): ?array
+    public function getData(): ?array
     {
         return $this->multiline;
     }

app/Filament/Tables/Columns/ColumnDc.php

@@ -37,7 +37,7 @@ class ColumnDc extends Column
         $this->has_odds = count($this->multiline) ? true : false;
     }
 
-    public function getMultilines(): ?array
+    public function getData(): ?array
     {
         return $this->multiline;
     }

app/Filament/Tables/Columns/ColumnDnb.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use App\Models\OddsDnb;
+use Filament\Tables\Columns\Column;
+
+class ColumnDnb extends Column
+{
+    protected string $view = 'filament.tables.columns.column-dnb';
+
+    protected ?array $multiline;
+
+    protected ?array $fumetto;
+
+    protected ?bool $has_odds;
+
+    public function loadData($record, $multiline_client)
+    {
+
+        $res = OddsDnb::with('bookmaker')->where('event_id', $record->id)->get();
+
+        $this->fumetto = [];
+
+        $this->multiline = [];
+
+        foreach ($res as $item) {
+
+            $this->fumetto[] = $item;
+            foreach ($multiline_client as $slot => $bookmaker) {
+                if ($item->bookmaker_id == $bookmaker->bookmaker_id) {
+                    $this->multiline[$slot] = $item;
+                }
+            }
+        }
+
+        $this->has_odds = count($this->multiline) ? true : false;
+    }
+
+    public function getData(): ?array
+    {
+        return $this->multiline;
+    }
+
+    public function getFumetto()
+    {
+        return $this->fumetto;
+    }
+
+    public function hasodds()
+    {
+        return $this->has_odds;
+    }
+}

app/Filament/Tables/Columns/ColumnGgng.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use App\Models\OddsGgng;
+use Filament\Tables\Columns\Column;
+
+class ColumnGgng extends Column
+{
+    protected string $view = 'filament.tables.columns.column-ggng';
+
+    protected ?array $multiline;
+
+    protected ?array $fumetto;
+
+    protected ?bool $has_odds;
+
+    public function loadData($record, $multiline_client)
+    {
+
+        $res = OddsGgng::with('bookmaker')->where('event_id', $record->id)->get();
+
+        $this->fumetto = [];
+
+        $this->multiline = [];
+
+        foreach ($res as $item) {
+
+            $this->fumetto[] = $item;
+            foreach ($multiline_client as $slot => $bookmaker) {
+                if ($item->bookmaker_id == $bookmaker->bookmaker_id) {
+                    $this->multiline[$slot] = $item;
+                }
+            }
+        }
+
+        $this->has_odds = count($this->multiline) ? true : false;
+    }
+
+    public function getData(): ?array
+    {
+        return $this->multiline;
+    }
+
+    public function getFumetto()
+    {
+        return $this->fumetto;
+    }
+
+    public function hasodds()
+    {
+        return $this->has_odds;
+    }
+}

app/Filament/Tables/Columns/ColumnTotal.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use App\Models\OddsTotal;
+use Filament\Tables\Columns\Column;
+
+class ColumnTotal extends Column
+{
+    protected string $view = 'filament.tables.columns.column-total';
+
+    protected ?array $multiline;
+
+    protected ?array $fumetto;
+
+    protected ?bool $has_odds;
+
+    public function loadData($record, $multiline_client)
+    {
+
+        $res = OddsTotal::with('bookmaker')->where('event_id', $record->id)->get();
+
+        $this->fumetto = [];
+
+        $this->multiline = [];
+
+        foreach ($res as $item) {
+
+            $this->fumetto[] = $item;
+            foreach ($multiline_client as $slot => $bookmaker) {
+                if ($item->bookmaker_id == $bookmaker->bookmaker_id) {
+                    $this->multiline[$slot] = $item;
+                }
+            }
+        }
+
+        $this->has_odds = count($this->multiline) ? true : false;
+    }
+
+    public function getData(): ?array
+    {
+        return $this->multiline;
+    }
+
+    public function getFumetto()
+    {
+        return $this->fumetto;
+    }
+
+    public function hasodds()
+    {
+        return $this->has_odds;
+    }
+}

app/Filament/Tables/Columns/ColumnTq.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Filament\Tables\Columns;
+
+use App\Models\OddsQualify;
+use Filament\Tables\Columns\Column;
+
+class ColumnTq extends Column
+{
+    protected string $view = 'filament.tables.columns.column-tq';
+
+    protected ?array $multiline;
+
+    protected ?array $fumetto;
+
+    protected ?bool $has_odds;
+
+    public function loadData($record, $multiline_client)
+    {
+
+        $res = OddsQualify::with('bookmaker')->where('event_id', $record->id)->get();
+
+        $this->fumetto = [];
+
+        $this->multiline = [];
+
+        foreach ($res as $item) {
+
+            $this->fumetto[] = $item;
+            foreach ($multiline_client as $slot => $bookmaker) {
+                if ($item->bookmaker_id == $bookmaker->bookmaker_id) {
+                    $this->multiline[$slot] = $item;
+                }
+            }
+        }
+
+        $this->has_odds = count($this->multiline) ? true : false;
+    }
+
+    public function getData(): ?array
+    {
+        return $this->multiline;
+    }
+
+    public function getFumetto()
+    {
+        return $this->fumetto;
+    }
+
+    public function hasodds()
+    {
+        return $this->has_odds;
+    }
+}

app/Models/Odds2way.php

@@ -34,7 +34,7 @@ class Odds2way extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()

app/Models/Odds2wayS1.php

@@ -34,7 +34,7 @@ class Odds2wayS1 extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()

app/Models/OddsDc.php

@@ -18,7 +18,7 @@ class OddsDc extends Model
         'bmoid',
         'dc1x',
         'dc12',
-        'dc2x',
+        'dcx2',
         'margin',
         'flag',
         'nuh_check',
@@ -35,7 +35,7 @@ class OddsDc extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()

app/Models/OddsDnb.php

@@ -34,7 +34,7 @@ class OddsDnb extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()

app/Models/OddsGgng.php

@@ -34,7 +34,7 @@ class OddsGgng extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()

app/Models/OddsHandicap.php

@@ -35,7 +35,7 @@ class OddsHandicap extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()

app/Models/OddsHandicapQ1.php

@@ -35,7 +35,7 @@ class OddsHandicapQ1 extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()

app/Models/OddsQualify.php

@@ -34,7 +34,7 @@ class OddsQualify extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()

app/Models/OddsTotalQ1.php

@@ -35,7 +35,7 @@ class OddsTotalQ1 extends Model
 
     public function bookmaker()
     {
-        return $this->belongsTo(Bookmaker::class);
+        return $this->belongsTo(Bookmaker::class, 'bookmaker_id', 'txid');
     }
 
     public function event()