diff --git a/app/Console/Commands/Grap.php b/app/Console/Commands/Grap.php index de785878..db1dc631 100644 --- a/app/Console/Commands/Grap.php +++ b/app/Console/Commands/Grap.php @@ -28,7 +28,7 @@ class Grap extends Command public static string $useragent = '4'; - protected $signature = 'grp {id=0} {day=0} {--date=} {--folder=} {--d} {--r} {--f} {--R} {--S}'; + protected $signature = 'grp {id=0} {day=0} {--date=} {--folder=} {--d} {--r} {--m} {--f} {--R} {--S}'; public function handle() { @@ -42,6 +42,7 @@ class Grap extends Command $txt .= '--d debug' . PHP_EOL; $txt .= '--r restart range' . PHP_EOL; $txt .= '--f force' . PHP_EOL; + $txt .= '--m mail only' . PHP_EOL; $txt .= '--R read file' . PHP_EOL; $txt .= '--S save to file' . PHP_EOL; $txt .= '--folder' . PHP_EOL; @@ -66,12 +67,13 @@ class Grap extends Command case 1: // DAILY SetStorage::set(1); - // MoveToArchive::move(1); - Grapper::load(1); - - MakeExcel::create(); + // with m just resend + if (!self::$options['m']) { + Grapper::load(1); + MakeExcel::create(); + } SendMail::run(1); diff --git a/app/Livewire/PlayerCalculator.php b/app/Livewire/PlayerCalculator.php index e37d25a3..9a550177 100644 --- a/app/Livewire/PlayerCalculator.php +++ b/app/Livewire/PlayerCalculator.php @@ -109,7 +109,7 @@ class PlayerCalculator extends Component $everage_minutes = 0; $ecolor = ''; if ($events_played) { - $everage_minutes = round($minues_played / $events_played) . ' min'; + $everage_minutes = round($minues_played / $events_played); if ($colorlevel > 1 && $events_played < $colorlevel) { $ecolor = 'danger'; } elseif ($events_played < $colorlevel * 2) { @@ -119,13 +119,28 @@ class PlayerCalculator extends Component } } + $info = []; + if ($events_played == 1) { + $info[] = '1 Event'; + } else if ($events_played > 1) { + $info[] = $events_played . ' Events'; + } else { + $info[] = 'None'; + } + if ($preferred_foot) { + $info[] = $preferred_foot . ' Foot'; + } + if ($everage_minutes) { + $info[] = ' Ø ' . $everage_minutes . 'min'; + } + $result[$origin][] = [ 'id' => $player_id, 'name' => $name, 'origin' => $origin, 'pcolor' => $pcolor, 'ecolor' => $ecolor, - 'info' => 'Ev ' . $events_played . ', ' . $preferred_foot . ', ' . $everage_minutes, + 'info' => implode(', ', $info), ]; } diff --git a/resources/svg/soccerplayer-attack.svg b/resources/svg/soccerplayer-attack.svg new file mode 100644 index 00000000..f24d62bb --- /dev/null +++ b/resources/svg/soccerplayer-attack.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/resources/svg/soccerplayer-defence.svg b/resources/svg/soccerplayer-defence.svg new file mode 100644 index 00000000..ac3b6451 --- /dev/null +++ b/resources/svg/soccerplayer-defence.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/resources/svg/soccerplayer-goalkeeper.svg b/resources/svg/soccerplayer-goalkeeper.svg new file mode 100644 index 00000000..5699443a --- /dev/null +++ b/resources/svg/soccerplayer-goalkeeper.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/resources/svg/soccerplayer-midfield.svg b/resources/svg/soccerplayer-midfield.svg new file mode 100644 index 00000000..78cfd4cb --- /dev/null +++ b/resources/svg/soccerplayer-midfield.svg @@ -0,0 +1,66 @@ + + + + + + + + + + image/svg+xml + + + + + + + + + diff --git a/resources/views/livewire/board-dispatcher.blade.php b/resources/views/livewire/board-dispatcher.blade.php index 9c7ab694..d0e88b9e 100644 --- a/resources/views/livewire/board-dispatcher.blade.php +++ b/resources/views/livewire/board-dispatcher.blade.php @@ -1,15 +1,15 @@
-
-
- +
+
+ @foreach ($lists as $listId => $items) @if (str_starts_with($listId, 'source-')) + wire:key="tab-button-{{ $listId }}" class="cursor-pointer" + icon="icon-soccerplayer-{{ str_replace('source-', '', $listId) }}"> {{ str_replace('source-', '', $listId) }} - {{ count($items) }} @@ -52,10 +52,12 @@ - {{ $item['name'] }} -
{{ $item['info'] }}
-
+ class="flex flex-row gap-0 items-center justify-between shadow-sm cursor-grab active:cursor-grabbing"> +
{{ $item['name'] }} +
+ + {{ $item['info'] }} +
@endforeach