wip

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 (Storage::directoryExists(Grap::$storage . '/' . $day)) {
-                            if (! $force && SofaScoreEventGrapped::where('id', (int) $event['id'])->exists()) {
                                 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 {
 

app/Filament/Clusters/StaticData/Resources/SofaScoreTasks/Schemas/SofaScoreTaskForm.php

@@ -34,10 +34,12 @@ class SofaScoreTaskForm
                         'excel' => '<span class="text-rose-600">Excel</span>',
                     ]),
                 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'),

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);

app/Filament/Widgets/PlayerPropsTable.php

@@ -37,9 +37,9 @@ class PlayerPropsTable extends TableWidget
                 <div>Gls</div>
                 <div>Fls</div>
                 <div>Ofs</div>
+                <div>Crd</div>
                 <div>Snt</div>
                 <div>Tsh</div>
-                <div>Crd</div>
                 <div>Foot</div>
                 <div>Evt</div>
                 <div>Min</div>
@@ -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',

resources/views/filament/tables/columns/drag-card.blade.php

@@ -11,10 +11,10 @@
             <div>{{ $record['crd'] }}</div>
             <div>{{ $record['snt'] }}</div>
             <div>{{ $record['tsh'] }}</div>
-            <div>{{ $record['foot'] }}</div>
+            <div class="text-blue-600 dark:text-blue-500">{{ $record['foot'] }}</div>
             <div>{{ $record['tot_evt'] }}</div>
             <div>{{ $record['ave_min'] }}</div>
-            <div class="bg-black text-white rounded font-bold p-0.5">{{ $record['pos'] }}</div>
+            <div class="border border-gray-400 rounded font-bold p-0.5">{{ $record['pos'] }}</div>
         </div>
         <div class="text-center">
             <div class="{{ $record['color_pos'] }}">
@@ -38,10 +38,10 @@
             <div>{{ $record['gls'] }}</div>
             <div>{{ $record['fls'] }}</div>
             <div>{{ $record['ofs'] }}</div>
+            <div>{{ $record['crd'] }}</div>
             <div>{{ $record['snt'] }}</div>
             <div>{{ $record['tsh'] }}</div>
-            <div>{{ $record['crd'] }}</div>
+            <div class="text-blue-600 dark:text-blue-500">{{ $record['foot'] }}</div>
-            <div>{{ $record['foot'] }}</div>
             <div>{{ $record['tot_evt'] }}</div>
             <div>{{ $record['ave_min'] }}</div>
             <div></div>