From b72b99273f8c5a915fc5ea6c5668eae8da0b4662 Mon Sep 17 00:00:00 2001 From: salam Date: Mon, 21 Sep 2026 22:24:29 +0200 Subject: [PATCH] wip --- app/Console/Commands/Grapper/Sofascore/Grapper.php | 10 +++++++--- .../SofaScoreTasks/Schemas/SofaScoreTaskForm.php | 2 ++ app/Filament/Widgets/PlayerPropsDrop.php | 8 ++++---- app/Filament/Widgets/PlayerPropsTable.php | 4 ++-- .../views/filament/tables/columns/drag-card.blade.php | 8 ++++---- 5 files changed, 19 insertions(+), 13 deletions(-) diff --git a/app/Console/Commands/Grapper/Sofascore/Grapper.php b/app/Console/Commands/Grapper/Sofascore/Grapper.php index ca09e343..787ecfcd 100644 --- a/app/Console/Commands/Grapper/Sofascore/Grapper.php +++ b/app/Console/Commands/Grapper/Sofascore/Grapper.php @@ -13,6 +13,7 @@ use App\Models\SofaScoreTaskTournament; use App\Utilities\Notice; use Illuminate\Support\Carbon; use Illuminate\Support\Facades\File; +use Illuminate\Support\Facades\Storage; class Grapper { @@ -101,10 +102,13 @@ class Grapper foreach ($data['events'] as $event) { Grap::$useragent = rand(1, 6); - - if (! $force && SofaScoreEventGrapped::where('id', (int) $event['id'])->exists()) { + if (Storage::directoryExists(Grap::$storage . '/' . $day)) { if ($debug) { - Notice::note('Allready grapped at ' . $day . ' - ' . $event['homeTeam']['name'] . ' vs ' . $event['awayTeam']['name'], 'g'); + Notice::note('FOLDER - Allready grapped at ' . $day . ' - ' . $event['homeTeam']['name'] . ' vs ' . $event['awayTeam']['name'], 'g'); + } + } else if (! $force && SofaScoreEventGrapped::where('id', (int) $event['id'])->exists()) { + if ($debug) { + Notice::note('DB - Allready grapped at ' . $day . ' - ' . $event['homeTeam']['name'] . ' vs ' . $event['awayTeam']['name'], 'g'); } } else { diff --git a/app/Filament/Clusters/StaticData/Resources/SofaScoreTasks/Schemas/SofaScoreTaskForm.php b/app/Filament/Clusters/StaticData/Resources/SofaScoreTasks/Schemas/SofaScoreTaskForm.php index a7a89400..d68b33fe 100644 --- a/app/Filament/Clusters/StaticData/Resources/SofaScoreTasks/Schemas/SofaScoreTaskForm.php +++ b/app/Filament/Clusters/StaticData/Resources/SofaScoreTasks/Schemas/SofaScoreTaskForm.php @@ -34,10 +34,12 @@ class SofaScoreTaskForm 'excel' => 'Excel', ]), DatePicker::make('day_from') + ->belowLabel('Full: 01.01 - Half: 01.07') ->required() ->native() ->visible(fn(Get $get): bool => in_array($get('mode'), ['date', 'range'])), DatePicker::make('day_to') + ->belowLabel('Full: 31.12 - Half: 30.06') ->required() ->native() ->visible(fn(Get $get): bool => $get('mode') === 'range'), diff --git a/app/Filament/Widgets/PlayerPropsDrop.php b/app/Filament/Widgets/PlayerPropsDrop.php index ce0f310a..648923c8 100644 --- a/app/Filament/Widgets/PlayerPropsDrop.php +++ b/app/Filament/Widgets/PlayerPropsDrop.php @@ -248,9 +248,9 @@ class PlayerPropsDrop extends Widget $this->players[$k]['gls'] = ''; $this->players[$k]['fls'] = ''; $this->players[$k]['ofs'] = ''; + $this->players[$k]['crd'] = ''; $this->players[$k]['snt'] = ''; $this->players[$k]['tsh'] = ''; - $this->players[$k]['crd'] = ''; } $this->storePlacement(); @@ -272,9 +272,9 @@ class PlayerPropsDrop extends Widget $this->players[$k]['gls'] = ''; $this->players[$k]['fls'] = ''; $this->players[$k]['ofs'] = ''; + $this->players[$k]['crd'] = ''; $this->players[$k]['snt'] = ''; $this->players[$k]['tsh'] = ''; - $this->players[$k]['crd'] = ''; } $this->player_on_field_counter = 0; @@ -335,9 +335,9 @@ class PlayerPropsDrop extends Widget $tmp[] = $row['gls']; $tmp[] = $row['fls']; $tmp[] = $row['ofs']; + $tmp[] = $row['crd']; $tmp[] = $row['snt']; $tmp[] = $row['tsh']; - $tmp[] = $row['crd']; $copystring .= implode(';', $tmp) . "\n"; } @@ -356,9 +356,9 @@ class PlayerPropsDrop extends Widget $this->players[$k]['gls'] = ''; $this->players[$k]['fls'] = ''; $this->players[$k]['ofs'] = ''; + $this->players[$k]['crd'] = ''; $this->players[$k]['snt'] = ''; $this->players[$k]['tsh'] = ''; - $this->players[$k]['crd'] = ''; } $this->dispatch('update-players', players: $this->players); diff --git a/app/Filament/Widgets/PlayerPropsTable.php b/app/Filament/Widgets/PlayerPropsTable.php index b1d6ad8a..4e3f8e70 100644 --- a/app/Filament/Widgets/PlayerPropsTable.php +++ b/app/Filament/Widgets/PlayerPropsTable.php @@ -37,9 +37,9 @@ class PlayerPropsTable extends TableWidget
Gls
Fls
Ofs
+
Crd
Snt
Tsh
-
Crd
Foot
Evt
Min
@@ -57,7 +57,7 @@ class PlayerPropsTable extends TableWidget ->emptyStateHeading('No team selected') ->columns([ ViewColumn::make('drag_card') - ->label(fn () => $this->getHeadingTable()) + ->label(fn() => $this->getHeadingTable()) ->view('filament.tables.columns.drag-card'), ])->extraAttributes([ 'id' => 'playerdragtable', diff --git a/resources/views/filament/tables/columns/drag-card.blade.php b/resources/views/filament/tables/columns/drag-card.blade.php index f77e11dd..2f2d7ae6 100644 --- a/resources/views/filament/tables/columns/drag-card.blade.php +++ b/resources/views/filament/tables/columns/drag-card.blade.php @@ -11,10 +11,10 @@
{{ $record['crd'] }}
{{ $record['snt'] }}
{{ $record['tsh'] }}
-
{{ $record['foot'] }}
+
{{ $record['foot'] }}
{{ $record['tot_evt'] }}
{{ $record['ave_min'] }}
-
{{ $record['pos'] }}
+
{{ $record['pos'] }}
@@ -38,10 +38,10 @@
{{ $record['gls'] }}
{{ $record['fls'] }}
{{ $record['ofs'] }}
+
{{ $record['crd'] }}
{{ $record['snt'] }}
{{ $record['tsh'] }}
-
{{ $record['crd'] }}
-
{{ $record['foot'] }}
+
{{ $record['foot'] }}
{{ $record['tot_evt'] }}
{{ $record['ave_min'] }}