From 3e3330bf809c41a96c70cc38e59848ce1f3bbf3a Mon Sep 17 00:00:00 2001 From: Hermann Telser Date: Wed, 25 Feb 2026 14:38:44 +0100 Subject: [PATCH] revert e48365cd9b9b08c1b609bed1b66aa4e90c6ac249 revert wip starttime --- app/Console/Commands/Grapper/Logifuture.php | 2 +- .../Resources/Events/Tables/EventsTable.php | 56 ++++++++++--------- .../Tables/Columns/ColumnStarttime.php | 47 ---------------- composer.lock | 26 ++++----- config/app.php | 2 +- .../tables/columns/column-starttime.blade.php | 37 ------------ setup.sh | 2 +- 7 files changed, 47 insertions(+), 125 deletions(-) delete mode 100644 app/Filament/Tables/Columns/ColumnStarttime.php delete mode 100644 resources/views/filament/tables/columns/column-starttime.blade.php diff --git a/app/Console/Commands/Grapper/Logifuture.php b/app/Console/Commands/Grapper/Logifuture.php index 34d159ea..cea052fb 100644 --- a/app/Console/Commands/Grapper/Logifuture.php +++ b/app/Console/Commands/Grapper/Logifuture.php @@ -77,7 +77,7 @@ class Logifuture 'event_id' => $event['id'], 'sport_id' => $sport_id, 'bookmaker_id' => Nuh::$options['bookmaker_id'], - ], ['in_feed' => 1, 'bmoid' => $event['id'], 'starttime' => $event['starttime']]); + ], ['in_feed' => 1, 'bmoid' => $event['id'], 'startime' => $event['starttime']]); }, 5); switch ($sport_id) { diff --git a/app/Filament/Resources/Events/Tables/EventsTable.php b/app/Filament/Resources/Events/Tables/EventsTable.php index b7c31f38..76b5cf1e 100644 --- a/app/Filament/Resources/Events/Tables/EventsTable.php +++ b/app/Filament/Resources/Events/Tables/EventsTable.php @@ -7,7 +7,6 @@ use App\Filament\Resources\Events\Tables\Tools\LoadBettypeSettings; use App\Filament\Resources\Events\Tables\Tools\LoadCompareDifferences; use App\Filament\Resources\Events\Tables\Tools\LoadMultiline; use App\Filament\Tables\Columns\ColumnOdds; -use App\Filament\Tables\Columns\ColumnStarttime; use App\Filament\Tables\Columns\EventColumn; use App\Filament\Tables\Columns\MatchIds; use App\Filament\Tables\Columns\TooltipOdds; @@ -32,6 +31,7 @@ use Filament\Forms\Components\Textarea; use Filament\Forms\Components\TextInput; use Filament\Schemas\Components\FusedGroup; use Filament\Schemas\Components\Utilities\Get; +use Filament\Support\Enums\FontWeight; use Filament\Support\Enums\VerticalAlignment; use Filament\Support\Enums\Width; use Filament\Tables\Columns\IconColumn; @@ -43,6 +43,7 @@ use Filament\Tables\Table; use Illuminate\Database\Eloquent\Builder; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\DB; +use Illuminate\Support\HtmlString; class EventsTable { @@ -79,24 +80,24 @@ class EventsTable MatchIds::make('ids')->grow(false)->visibleFrom('xl') ->visible(fn () => auth()->user()->hasRole('super_admin')), - ColumnStarttime::make('starttime')->label('Start'), + TextColumn::make('event_bookmaker.starttime') + ->timezone('CET') + ->label('Start') + ->alignCenter() + ->dateTime('H:i') + ->weight(FontWeight::Bold) + ->color(function ($record) { + $bkm = $record->event_bookmaker?->starttime ?? null; + if ($bkm) { + return $bkm != $record->starttime ? 'danger' : 'info'; + } - // TextColumn::make('event_bookmaker.starttime') - // ->timezone('CET') - // ->label('Start') - // ->alignCenter() - // ->dateTime('H:i') - // ->color(function ($record) { - // $bkm = $record->event_bookmaker?->starttime ?? null; - // if ($bkm) { - // return $bkm != $record->starttime ? 'danger' : 'info'; - // } - - // return 'gray'; - // }) - // ->state(function ($record) { - // return $record->event_bookmaker->starttime ?? $record->starttime; - // }), + return 'gray'; + }) + ->state(function ($record) { + return $record->event_bookmaker->starttime ?? $record->starttime; + }) + ->description(fn ($record): string => Carbon::createFromDate($record->event_bookmaker->starttime ?? $record->starttime)->format('d. M')), TextColumn::make('country.name') ->wrap() @@ -211,6 +212,7 @@ class EventsTable ->prefixIcon('phosphor-flag') ->hiddenLabel() ->label('') + ->multiple() ->searchable() ->preload() ->options(function () { @@ -233,7 +235,7 @@ class EventsTable ->searchable() ->options(function (Get $get) { if ($get('country_id')) { - $res = Event::where('has_markets', 1)->where('sport_id', auth()->user()->sport_id)->with('country')->with('competition_group')->where('country_id', $get('country_id'))->groupBy('competition_group_id')->get(); + $res = Event::where('has_markets', 1)->where('sport_id', auth()->user()->sport_id)->with('country')->with('competition_group')->where('country_id', $get('country_id'))->whereDate('starttime', '>', Carbon::now())->groupBy('competition_group_id')->get(); } else { $res = Event::where('has_markets', 1)->where('sport_id', auth()->user()->sport_id)->with('country')->with('competition_group')->whereDate('starttime', '>', Carbon::now())->groupBy('competition_group_id')->get(); } @@ -464,8 +466,12 @@ class EventsTable })->indicateUsing(function (array $data): array { $indicators = []; if ($data['country_id'] ?? null) { - $countries = Country::where('id', $data['country_id'])->pluck('name')->toArray(); - $indicators[] = Indicator::make('Countries: '.implode(', ', $countries))->removeField('country_id')->color('warning'); + $countries = Country::whereIn('id', $data['country_id'])->pluck('name')->toArray(); + if (count($countries) > 1) { + $indicators[] = Indicator::make('Countries: '.implode(', ', $countries))->removeField('country_id')->color('warning'); + } else { + $indicators[] = Indicator::make('Country: '.$countries[0])->removeField('country_id')->color('warning'); + } } if ($data['group_id'] ?? null) { @@ -693,10 +699,10 @@ class EventsTable ])->iconButton() ->icon('phosphor-dots-three-vertical'), - ])->toolbarActions([ - BulkActionGroup::make([ - DeleteBulkAction::make()->visible(fn () => auth()->user()->hasRole('super_admin')), - ]), + // ])->toolbarActions([ + // BulkActionGroup::make([ + // DeleteBulkAction::make()->visible(fn () => auth()->user()->hasRole('super_admin')), + // ]), ]); } } diff --git a/app/Filament/Tables/Columns/ColumnStarttime.php b/app/Filament/Tables/Columns/ColumnStarttime.php deleted file mode 100644 index b1f84587..00000000 --- a/app/Filament/Tables/Columns/ColumnStarttime.php +++ /dev/null @@ -1,47 +0,0 @@ -tx = Carbon::createFromTimestamp(strtotime($record->starttime)); - if ($record->event_bookmaker?->starttime) { - $this->cl = Carbon::createFromTimestamp(strtotime($record->event_bookmaker?->starttime)); - $this->starttime = Carbon::createFromTimestamp(strtotime($record->event_bookmaker?->starttime)); - - if ($this->tx == $this->cl) { - $this->color = 'text-green-600'; - } else { - $this->color = 'text-orange-600'; - } - } else { - $this->color = 'text-blue-600'; - $this->starttime = Carbon::createFromTimestamp(strtotime($record->starttime)); - } - } - - public function getColor() - { - return $this->color; - } - - public function getStarttime() - { - return $this->starttime; - } -} diff --git a/composer.lock b/composer.lock index e152d787..c80782d8 100644 --- a/composer.lock +++ b/composer.lock @@ -3017,16 +3017,16 @@ }, { "name": "laravel/framework", - "version": "v12.53.0", + "version": "v12.52.0", "source": { "type": "git", "url": "https://github.com/laravel/framework.git", - "reference": "f57f035c0d34503d9ff30be76159bb35a003cd1f" + "reference": "d5511fa74f4608dbb99864198b1954042aa8d5a7" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/framework/zipball/f57f035c0d34503d9ff30be76159bb35a003cd1f", - "reference": "f57f035c0d34503d9ff30be76159bb35a003cd1f", + "url": "https://api.github.com/repos/laravel/framework/zipball/d5511fa74f4608dbb99864198b1954042aa8d5a7", + "reference": "d5511fa74f4608dbb99864198b1954042aa8d5a7", "shasum": "" }, "require": { @@ -3235,7 +3235,7 @@ "issues": "https://github.com/laravel/framework/issues", "source": "https://github.com/laravel/framework" }, - "time": "2026-02-24T14:35:15+00:00" + "time": "2026-02-17T17:07:04+00:00" }, { "name": "laravel/prompts", @@ -3298,16 +3298,16 @@ }, { "name": "laravel/serializable-closure", - "version": "v2.0.10", + "version": "v2.0.9", "source": { "type": "git", "url": "https://github.com/laravel/serializable-closure.git", - "reference": "870fc81d2f879903dfc5b60bf8a0f94a1609e669" + "reference": "8f631589ab07b7b52fead814965f5a800459cb3e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/870fc81d2f879903dfc5b60bf8a0f94a1609e669", - "reference": "870fc81d2f879903dfc5b60bf8a0f94a1609e669", + "url": "https://api.github.com/repos/laravel/serializable-closure/zipball/8f631589ab07b7b52fead814965f5a800459cb3e", + "reference": "8f631589ab07b7b52fead814965f5a800459cb3e", "shasum": "" }, "require": { @@ -3355,7 +3355,7 @@ "issues": "https://github.com/laravel/serializable-closure/issues", "source": "https://github.com/laravel/serializable-closure" }, - "time": "2026-02-20T19:59:49+00:00" + "time": "2026-02-03T06:55:34+00:00" }, { "name": "laravel/tinker", @@ -13299,12 +13299,12 @@ ], "aliases": [], "minimum-stability": "stable", - "stability-flags": {}, + "stability-flags": [], "prefer-stable": true, "prefer-lowest": false, "platform": { "php": "^8.3" }, - "platform-dev": {}, - "plugin-api-version": "2.9.0" + "platform-dev": [], + "plugin-api-version": "2.6.0" } diff --git a/config/app.php b/config/app.php index 0f69d36d..28be821a 100644 --- a/config/app.php +++ b/config/app.php @@ -65,7 +65,7 @@ return [ | */ - 'timezone' => env('APP_TIMEZONE', 'Europe/Vienna'), + 'timezone' => env('APP_TIMEZONE', 'UTC'), /* |-------------------------------------------------------------------------- diff --git a/resources/views/filament/tables/columns/column-starttime.blade.php b/resources/views/filament/tables/columns/column-starttime.blade.php deleted file mode 100644 index fa8ddcb8..00000000 --- a/resources/views/filament/tables/columns/column-starttime.blade.php +++ /dev/null @@ -1,37 +0,0 @@ -@php - $setTime($record); - $starttime = $getStarttime(); - $color = $getColor(); -@endphp -
-
- - -
-
- {{ $starttime->format('H:i') }} -
-
- {{ $starttime->format('d.M') }} -
-
-
-
-{{-- {{ $getState() }} - {{ $getRecord()->starttime }} --}} diff --git a/setup.sh b/setup.sh index 3593c23f..33b7379e 100755 --- a/setup.sh +++ b/setup.sh @@ -10,7 +10,7 @@ case "$1" in # echo "DISABLED" # exit; echo "" - echo "! THIS WILL DROP ALL TABLES !" + echo "! THIS WILL TROP ALL TABLES !" echo "" echo "you want to do that?" echo "10 sec to think OR"