diff --git a/app/Filament/Tables/Columns/Column3way.php b/app/Filament/Tables/Columns/Column3way.php index 3537fd2f..5255020a 100644 --- a/app/Filament/Tables/Columns/Column3way.php +++ b/app/Filament/Tables/Columns/Column3way.php @@ -13,6 +13,8 @@ class Column3way extends Column protected ?array $max; + protected ?array $min; + protected ?array $bookmakers; protected ?bool $has_data; @@ -34,12 +36,16 @@ class Column3way extends Column $this->data = Odds3way::with('bookmaker')->where('event_id', $record->id)->get(); $this->max['h3w'] = $this->data->max('h3w'); + $this->min['h3w'] = $this->data->min('h3w'); $this->max['d3w'] = $this->data->max('d3w'); + $this->min['d3w'] = $this->data->min('d3w'); $this->max['a3w'] = $this->data->max('a3w'); + $this->min['a3w'] = $this->data->min('a3w'); $this->max['margin'] = $this->data->max('margin'); + $this->min['margin'] = $this->data->min('margin'); $this->has_data = count($this->data) ? true : false; } @@ -54,6 +60,11 @@ class Column3way extends Column return $this->max; } + public function getMin() + { + return $this->min; + } + public function hasData() { return $this->has_data; diff --git a/app/Filament/Tables/Columns/ColumnDc.php b/app/Filament/Tables/Columns/ColumnDc.php index a3559d21..cfeba355 100644 --- a/app/Filament/Tables/Columns/ColumnDc.php +++ b/app/Filament/Tables/Columns/ColumnDc.php @@ -11,6 +11,8 @@ class ColumnDc extends Column protected ?array $max; + protected ?array $min; + protected $data; protected ?array $bookmakers; @@ -34,12 +36,16 @@ class ColumnDc extends Column $this->data = OddsDc::with('bookmaker')->where('event_id', $record->id)->get(); $this->max['dc1x'] = $this->data->max('dc1x'); + $this->min['dc1x'] = $this->data->min('dc1x'); $this->max['dc12'] = $this->data->max('dc12'); + $this->min['dc12'] = $this->data->min('dc12'); $this->max['dcx2'] = $this->data->max('dcx2'); + $this->min['dcx2'] = $this->data->min('dcx2'); $this->max['margin'] = $this->data->max('margin'); + $this->min['margin'] = $this->data->min('margin'); $this->has_data = count($this->data) ? true : false; } @@ -54,6 +60,11 @@ class ColumnDc extends Column return $this->max; } + public function getMin() + { + return $this->min; + } + public function hasData() { return $this->has_data; diff --git a/app/Filament/Tables/Columns/ColumnDnb.php b/app/Filament/Tables/Columns/ColumnDnb.php index 11afb1d6..6a5c67bd 100644 --- a/app/Filament/Tables/Columns/ColumnDnb.php +++ b/app/Filament/Tables/Columns/ColumnDnb.php @@ -11,6 +11,8 @@ class ColumnDnb extends Column protected ?array $max; + protected ?array $min; + protected $data; protected ?array $bookmakers; @@ -34,10 +36,13 @@ class ColumnDnb extends Column $this->data = OddsDnb::with('bookmaker')->where('event_id', $record->id)->get(); $this->max['dnb1'] = $this->data->max('dnb1'); + $this->min['dnb1'] = $this->data->min('dnb1'); $this->max['dnb2'] = $this->data->max('dnb2'); + $this->min['dnb2'] = $this->data->min('dnb2'); $this->max['margin'] = $this->data->max('margin'); + $this->min['margin'] = $this->data->min('margin'); $this->has_data = count($this->data) ? true : false; } @@ -52,6 +57,11 @@ class ColumnDnb extends Column return $this->max; } + public function getMin() + { + return $this->min; + } + public function hasData() { return $this->has_data; diff --git a/app/Filament/Tables/Columns/ColumnGgng.php b/app/Filament/Tables/Columns/ColumnGgng.php index 274922ee..bf78d208 100644 --- a/app/Filament/Tables/Columns/ColumnGgng.php +++ b/app/Filament/Tables/Columns/ColumnGgng.php @@ -11,6 +11,8 @@ class ColumnGgng extends Column protected ?array $max; + protected ?array $min; + protected $data; protected ?array $bookmakers; @@ -34,10 +36,13 @@ class ColumnGgng extends Column $this->data = OddsGgng::with('bookmaker')->where('event_id', $record->id)->get(); $this->max['gg'] = $this->data->max('gg'); + $this->min['gg'] = $this->data->min('gg'); $this->max['ng'] = $this->data->max('ng'); + $this->min['ng'] = $this->data->min('ng'); $this->max['margin'] = $this->data->max('margin'); + $this->min['margin'] = $this->data->min('margin'); $this->has_data = count($this->data) ? true : false; } @@ -52,6 +57,11 @@ class ColumnGgng extends Column return $this->max; } + public function getMin() + { + return $this->min; + } + public function hasData() { return $this->has_data; diff --git a/app/Filament/Tables/Columns/ColumnTotal.php b/app/Filament/Tables/Columns/ColumnTotal.php index 843f54f0..48bff6d8 100644 --- a/app/Filament/Tables/Columns/ColumnTotal.php +++ b/app/Filament/Tables/Columns/ColumnTotal.php @@ -11,6 +11,8 @@ class ColumnTotal extends Column protected ?array $max; + protected ?array $min; + protected $data; protected ?array $bookmakers; @@ -34,10 +36,13 @@ class ColumnTotal extends Column $this->data = OddsTotal::with('bookmaker')->where('event_id', $record->id)->get(); $this->max['over'] = $this->data->max('over'); + $this->min['over'] = $this->data->min('over'); $this->max['under'] = $this->data->max('under'); + $this->min['under'] = $this->data->min('under'); $this->max['margin'] = $this->data->max('margin'); + $this->min['margin'] = $this->data->min('margin'); $this->has_data = count($this->data) ? true : false; } @@ -52,6 +57,11 @@ class ColumnTotal extends Column return $this->max; } + public function getMin() + { + return $this->min; + } + public function hasData() { return $this->has_data; diff --git a/app/Filament/Tables/Columns/ColumnTq.php b/app/Filament/Tables/Columns/ColumnTq.php index b539736e..a0b99445 100644 --- a/app/Filament/Tables/Columns/ColumnTq.php +++ b/app/Filament/Tables/Columns/ColumnTq.php @@ -11,6 +11,8 @@ class ColumnTq extends Column protected ?array $max; + protected ?array $min; + protected $data; protected ?array $bookmakers; @@ -34,10 +36,13 @@ class ColumnTq extends Column $this->data = OddsQualify::with('bookmaker')->where('event_id', $record->id)->get(); $this->max['htq'] = $this->data->max('htq'); + $this->min['htq'] = $this->data->min('htq'); $this->max['atq'] = $this->data->max('atq'); + $this->min['atq'] = $this->data->min('atq'); $this->max['margin'] = $this->data->max('margin'); + $this->min['margin'] = $this->data->min('margin'); $this->has_data = count($this->data) ? true : false; } @@ -52,6 +57,11 @@ class ColumnTq extends Column return $this->max; } + public function getMin() + { + return $this->min; + } + public function hasData() { return $this->has_data; diff --git a/composer.lock b/composer.lock index fe584daa..95e70337 100644 --- a/composer.lock +++ b/composer.lock @@ -4148,16 +4148,16 @@ }, { "name": "monolog/monolog", - "version": "3.9.0", + "version": "3.10.0", "source": { "type": "git", "url": "https://github.com/Seldaek/monolog.git", - "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6" + "reference": "b321dd6749f0bf7189444158a3ce785cc16d69b0" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/Seldaek/monolog/zipball/10d85740180ecba7896c87e06a166e0c95a0e3b6", - "reference": "10d85740180ecba7896c87e06a166e0c95a0e3b6", + "url": "https://api.github.com/repos/Seldaek/monolog/zipball/b321dd6749f0bf7189444158a3ce785cc16d69b0", + "reference": "b321dd6749f0bf7189444158a3ce785cc16d69b0", "shasum": "" }, "require": { @@ -4175,7 +4175,7 @@ "graylog2/gelf-php": "^1.4.2 || ^2.0", "guzzlehttp/guzzle": "^7.4.5", "guzzlehttp/psr7": "^2.2", - "mongodb/mongodb": "^1.8", + "mongodb/mongodb": "^1.8 || ^2.0", "php-amqplib/php-amqplib": "~2.4 || ^3", "php-console/php-console": "^3.1.8", "phpstan/phpstan": "^2", @@ -4235,7 +4235,7 @@ ], "support": { "issues": "https://github.com/Seldaek/monolog/issues", - "source": "https://github.com/Seldaek/monolog/tree/3.9.0" + "source": "https://github.com/Seldaek/monolog/tree/3.10.0" }, "funding": [ { @@ -4247,7 +4247,7 @@ "type": "tidelift" } ], - "time": "2025-03-24T10:02:05+00:00" + "time": "2026-01-02T08:56:05+00:00" }, { "name": "nesbot/carbon", diff --git a/resources/views/filament/tables/columns/column-dc.blade.php b/resources/views/filament/tables/columns/column-dc.blade.php index 72616fd4..1d560a06 100644 --- a/resources/views/filament/tables/columns/column-dc.blade.php +++ b/resources/views/filament/tables/columns/column-dc.blade.php @@ -22,24 +22,28 @@ '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 diff --git a/resources/views/filament/tables/columns/column-dnb.blade.php b/resources/views/filament/tables/columns/column-dnb.blade.php index c1dda267..b33172aa 100644 --- a/resources/views/filament/tables/columns/column-dnb.blade.php +++ b/resources/views/filament/tables/columns/column-dnb.blade.php @@ -22,18 +22,21 @@ 'odd' => $item->dnb1, 'decimal' => 2, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->dnb2, 'decimal' => 2, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->margin, 'decimal' => 1, 'max' => false, + 'min' => 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 55b93d3c..b88db0ac 100644 --- a/resources/views/filament/tables/columns/column-ggng.blade.php +++ b/resources/views/filament/tables/columns/column-ggng.blade.php @@ -22,18 +22,21 @@ 'odd' => $item->gg, 'decimal' => 2, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->ng, 'decimal' => 2, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->margin, 'decimal' => 1, 'max' => false, + 'min' => 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 f9f66fe8..868d8190 100644 --- a/resources/views/filament/tables/columns/column-total.blade.php +++ b/resources/views/filament/tables/columns/column-total.blade.php @@ -22,24 +22,28 @@ 'odd' => $item->over, 'decimal' => 2, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->under, 'decimal' => 2, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->total, 'decimal' => 1, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->margin, 'decimal' => 1, 'max' => false, + 'min' => 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 928825ab..50be3608 100644 --- a/resources/views/filament/tables/columns/column-tq.blade.php +++ b/resources/views/filament/tables/columns/column-tq.blade.php @@ -22,18 +22,21 @@ 'odd' => $item->htq, 'decimal' => 2, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->atq, 'decimal' => 2, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->margin, 'decimal' => 1, 'max' => false, + 'min' => 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 28d1435f..55b44c46 100644 --- a/resources/views/filament/tables/columns/column_3way.blade.php +++ b/resources/views/filament/tables/columns/column_3way.blade.php @@ -22,24 +22,28 @@ 'odd' => $item->h3w, 'decimal' => 2, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->d3w, 'decimal' => 2, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->a3w, 'decimal' => 2, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->margin, 'decimal' => 1, 'max' => false, + 'min' => 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 24937d22..26df164a 100644 --- a/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php +++ b/resources/views/filament/tables/columns/fumetto/fumetto_1x2.blade.php @@ -7,6 +7,7 @@ @php $max = $getMax(); + $min = $getMin(); @endphp @foreach ($getData() as $item) @@ -19,24 +20,28 @@ 'odd' => $item->h3w, 'decimal' => 2, 'max' => $item->h3w == $max['h3w'] ? 1 : 0, + 'min' => $item->h3w == $min['h3w'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->d3w, 'decimal' => 2, 'max' => $item->d3w == $max['d3w'] ? 1 : 0, + 'min' => $item->d3w == $min['d3w'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->a3w, 'decimal' => 2, 'max' => $item->a3w == $max['a3w'] ? 1 : 0, + 'min' => $item->a3w == $min['a3w'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->margin, 'decimal' => 1, 'max' => $item->margin == $max['margin'] ? 1 : 0, + 'min' => $item->margin == $min['margin'] ? 1 : 0, ]) @endforeach 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 f7bfac09..d1fabc4c 100644 --- a/resources/views/filament/tables/columns/fumetto/fumetto_dc.blade.php +++ b/resources/views/filament/tables/columns/fumetto/fumetto_dc.blade.php @@ -7,6 +7,7 @@ @php $max = $getMax(); + $min = $getMin(); @endphp @foreach ($getData() as $item) @@ -19,24 +20,28 @@ 'odd' => $item->dc1x, 'decimal' => 2, 'max' => $item->dc1x == $max['dc1x'] ? 1 : 0, + 'min' => $item->dc1x == $min['dc1x'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->dc12, 'decimal' => 2, 'max' => $item->dc12 == $max['dc12'] ? 1 : 0, + 'min' => $item->dc12 == $min['dc12'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->dcx2, 'decimal' => 2, 'max' => $item->dcx2 == $max['dcx2'] ? 1 : 0, + 'min' => $item->dcx2 == $min['dcx2'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->margin, 'decimal' => 1, 'max' => $item->margin == $max['margin'] ? 1 : 0, + 'min' => $item->margin == $min['margin'] ? 1 : 0, ]) @endforeach 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 dd52bb33..50fee743 100644 --- a/resources/views/filament/tables/columns/fumetto/fumetto_dnb.blade.php +++ b/resources/views/filament/tables/columns/fumetto/fumetto_dnb.blade.php @@ -7,6 +7,7 @@ @php $max = $getMax(); + $min = $getMin(); @endphp @foreach ($getData() as $item) @@ -19,18 +20,21 @@ 'odd' => $item->dnb1, 'decimal' => 2, 'max' => $item->dnb1 == $max['dnb1'] ? 1 : 0, + 'min' => $item->dnb1 == $min['dnb1'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->dnb2, 'decimal' => 2, 'max' => $item->dnb2 == $max['dnb2'] ? 1 : 0, + 'min' => $item->dnb2 == $min['dnb2'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->margin, 'decimal' => 1, 'max' => $item->margin == $max['margin'] ? 1 : 0, + 'min' => $item->margin == $min['margin'] ? 1 : 0, ]) @endforeach 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 846144fd..b01fa602 100644 --- a/resources/views/filament/tables/columns/fumetto/fumetto_ggng.blade.php +++ b/resources/views/filament/tables/columns/fumetto/fumetto_ggng.blade.php @@ -4,9 +4,12 @@
@include('filament.tables.columns.multiline.label', ['labels' => ['GG', 'NG']]) + @php $max = $getMax(); + $min = $getMin(); @endphp + @foreach ($getData() as $item) @include('filament.tables.columns.multiline.bkm', [ 'bookmaker_id' => $item->bookmaker_id, @@ -17,18 +20,21 @@ 'odd' => $item->gg, 'decimal' => 2, 'max' => $item->gg == $max['gg'] ? 1 : 0, + 'min' => $item->gg == $min['gg'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->ng, 'decimal' => 2, 'max' => $item->ng == $max['ng'] ? 1 : 0, + 'min' => $item->ng == $min['ng'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->margin, 'decimal' => 1, 'max' => $item->margin == $max['margin'] ? 1 : 0, + 'min' => $item->margin == $min['margin'] ? 1 : 0, ]) @endforeach
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 6578d014..2915e35a 100644 --- a/resources/views/filament/tables/columns/fumetto/fumetto_total.blade.php +++ b/resources/views/filament/tables/columns/fumetto/fumetto_total.blade.php @@ -4,9 +4,12 @@
@include('filament.tables.columns.multiline.label', ['labels' => ['O', 'U', 'T']]) + @php $max = $getMax(); + $min = $getMin(); @endphp + @foreach ($getData() as $item) @include('filament.tables.columns.multiline.bkm', [ 'bookmaker_id' => $item->bookmaker_id, @@ -17,24 +20,28 @@ 'odd' => $item->over, 'decimal' => 2, 'max' => $item->over == $max['over'] ? 1 : 0, + 'min' => $item->over == $min['over'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->under, 'decimal' => 2, 'max' => $item->under == $max['under'] ? 1 : 0, + 'min' => $item->under == $min['under'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->total, 'decimal' => 1, 'max' => false, + 'min' => false, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->margin, 'decimal' => 1, 'max' => $item->margin == $max['margin'] ? 1 : 0, + 'min' => $item->margin == $min['margin'] ? 1 : 0, ]) @endforeach
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 eeb3befb..06b0d8e1 100644 --- a/resources/views/filament/tables/columns/fumetto/fumetto_tq.blade.php +++ b/resources/views/filament/tables/columns/fumetto/fumetto_tq.blade.php @@ -4,9 +4,12 @@
@include('filament.tables.columns.multiline.label', ['labels' => ['H', 'A']]) + @php $max = $getMax(); + $min = $getMin(); @endphp + @foreach ($getData() as $item) @include('filament.tables.columns.multiline.bkm', [ 'bookmaker_id' => $item->bookmaker_id, @@ -17,18 +20,21 @@ 'odd' => $item->htq, 'decimal' => 2, 'max' => $item->htq == $max['htq'] ? 1 : 0, + 'min' => $item->htq == $min['htq'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->atq, 'decimal' => 2, 'max' => $item->atq == $max['atq'] ? 1 : 0, + 'min' => $item->atq == $min['atq'] ? 1 : 0, ]) @include('filament.tables.columns.multiline.odds', [ 'odd' => $item->margin, 'decimal' => 1, 'max' => $item->margin == $max['margin'] ? 1 : 0, + 'min' => $item->margin == $min['margin'] ? 1 : 0, ]) @endforeach
diff --git a/resources/views/filament/tables/columns/multiline/odds.blade.php b/resources/views/filament/tables/columns/multiline/odds.blade.php index a41f8d51..4be1f608 100644 --- a/resources/views/filament/tables/columns/multiline/odds.blade.php +++ b/resources/views/filament/tables/columns/multiline/odds.blade.php @@ -1,18 +1,11 @@ -@if (isset($max) && $max == true) -
-   - @if (isset($odd)) - {{ number_format($odd, $decimal) }} - @endif -   -
-@else -
-   - @if (isset($odd)) - {{ number_format($odd, $decimal) }} - @endif -   -
-@endif +
+   + @if (isset($odd)) + {{ number_format($odd, $decimal) }} + @endif +   +