From d317c733b9ff7cd359c7c8c8c121ab0e0f745640 Mon Sep 17 00:00:00 2001
From: salam <hermann.telser@gmail.com>
Date: Mon, 26 Jan 2026 01:52:47 +0100
Subject: [PATCH] wip

---
 .../Commands/Grapper/TxOdds/Fixtures.php      | 10 +++---
 .../Resources/Events/EventResource.php        |  4 +--
 app/Livewire/ComparingBookmakerMenu.php       | 13 ++++---
 composer.lock                                 | 18 +++++-----
 ...5_112701_create_event_bookmakers_table.php | 34 +++++++++++--------
 .../views/components/alarm-gray.blade.php     |  4 +++
 .../views/components/alarm-green.blade.php    |  4 +++
 .../views/components/alarm-red.blade.php      |  4 +++
 .../views/components/alarm-yellow.blade.php   |  4 +++
 .../tables/columns/column-odds.blade.php      | 19 ++++++++---
 .../multiline/multiline-client.blade.php      | 34 ++++++++++++++-----
 .../multiline/multiline-compare.blade.php     | 25 +++++++++++---
 .../columns/multiline/odd-compare.blade.php   | 27 +++++++++++++--
 13 files changed, 142 insertions(+), 58 deletions(-)
 create mode 100644 resources/views/components/alarm-gray.blade.php
 create mode 100644 resources/views/components/alarm-green.blade.php
 create mode 100644 resources/views/components/alarm-red.blade.php
 create mode 100644 resources/views/components/alarm-yellow.blade.php

diff --git a/app/Console/Commands/Grapper/TxOdds/Fixtures.php b/app/Console/Commands/Grapper/TxOdds/Fixtures.php
index fc61fb3a..cbd3c658 100644
--- a/app/Console/Commands/Grapper/TxOdds/Fixtures.php
+++ b/app/Console/Commands/Grapper/TxOdds/Fixtures.php
@@ -29,8 +29,6 @@ class Fixtures
         $total_soccer = 0;
         $total_others = 0;
 
-        $now = Carbon::now();
-
         /**
          * Delete
          */
@@ -53,7 +51,11 @@ class Fixtures
 
             if ($today) {
                 Nuh::$options['days_from'] = 0;
-                Nuh::$options['days_to'] = 1;
+                if (now()->between(today(), today()->addHour())) {
+                    Nuh::$options['days_to'] = 2;
+                } else {
+                    Nuh::$options['days_to'] = 2;
+                }
             } elseif ($week) {
                 Nuh::$options['days_from'] = 0;
                 Nuh::$options['days_to'] = 6;
@@ -134,7 +136,7 @@ class Fixtures
             }
 
             if ($debug) {
-                Notice::note($now->toDateString()." - $count events processed", 'g');
+                Notice::note(now()->toDateString()." - $count events processed", 'g');
             }
         }
         if ($debug) {
diff --git a/app/Filament/Resources/Events/EventResource.php b/app/Filament/Resources/Events/EventResource.php
index dd061cbf..1d245b52 100644
--- a/app/Filament/Resources/Events/EventResource.php
+++ b/app/Filament/Resources/Events/EventResource.php
@@ -53,12 +53,12 @@ class EventResource extends Resource
     public static function getEloquentQuery(): Builder
     {
         $query = parent::getEloquentQuery()
-            ->where('starttime', '>', Carbon::now())
             ->with('competition_group')
             ->with('country')
             ->with('home')
             ->with('away')
-            ->with('event_user_star');
+            ->with('event_user_star')
+            ->where('starttime', '>=', now());
 
         if (auth()->user()->stars) {
             $query->whereHas('event_user_star');
diff --git a/app/Livewire/ComparingBookmakerMenu.php b/app/Livewire/ComparingBookmakerMenu.php
index 774b062f..555c6736 100644
--- a/app/Livewire/ComparingBookmakerMenu.php
+++ b/app/Livewire/ComparingBookmakerMenu.php
@@ -64,15 +64,13 @@ class ComparingBookmakerMenu extends Component implements HasActions, HasSchemas
                 TextColumn::make('bookmaker_id')->label('Id'),
                 BookmakerIcon::make('bookmaker.icon')->label('Icon')->size('lg'),
                 TextInputColumn::make('time_lastcheck')
-                    ->tooltip('If lastcheck is older bookmaker will be ignored')
                     ->label('Time Passed')
                     ->prefix('Seconds:')
-                    ->rules(['required', 'max:200', 'min:100']),
+                    ->rules(['required', 'integer', 'between:60,1200']),
                 TextInputColumn::make('margin_threshold')
-                    ->tooltip('If margin is higher bookmaker will be ignored')
                     ->label('Maximum Margin')
                     ->prefix('Threshold:')
-                    ->rules(['required', 'max:200', 'min:100']),
+                    ->rules(['required', 'integer', 'between:100,200']),
                 // ToggleColumn::make('is_active'),
             ])
             ->searchable(['bookmaker.name'])
@@ -96,7 +94,7 @@ class ComparingBookmakerMenu extends Component implements HasActions, HasSchemas
                                     );
                             }
                         })
-                        ->form([
+                        ->schema([
 
                             TextInput::make('time_lastcheck')
                                 ->numeric()
@@ -114,11 +112,12 @@ class ComparingBookmakerMenu extends Component implements HasActions, HasSchemas
                                     );
                             }
                         })
-                        ->form([
+                        ->schema([
                             TextInput::make('margin_threshold')
                                 ->hiddenLabel()
                                 ->numeric()
-                                ->rules(['required', 'max:200', 'min:100'])
+                                ->minValue(100)
+                                ->maxValue(250)
                                 ->prefix('Threshold'),
                         ]),
                     BulkAction::make('Switch On')
diff --git a/composer.lock b/composer.lock
index 9b09d119..0d0dcf1a 100644
--- a/composer.lock
+++ b/composer.lock
@@ -10924,16 +10924,16 @@
         },
         {
             "name": "phpstan/phpdoc-parser",
-            "version": "2.3.1",
+            "version": "2.3.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/phpstan/phpdoc-parser.git",
-                "reference": "16dbf9937da8d4528ceb2145c9c7c0bd29e26374"
+                "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/16dbf9937da8d4528ceb2145c9c7c0bd29e26374",
-                "reference": "16dbf9937da8d4528ceb2145c9c7c0bd29e26374",
+                "url": "https://api.github.com/repos/phpstan/phpdoc-parser/zipball/a004701b11273a26cd7955a61d67a7f1e525a45a",
+                "reference": "a004701b11273a26cd7955a61d67a7f1e525a45a",
                 "shasum": ""
             },
             "require": {
@@ -10965,9 +10965,9 @@
             "description": "PHPDoc parser with support for nullable, intersection and generic types",
             "support": {
                 "issues": "https://github.com/phpstan/phpdoc-parser/issues",
-                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.1"
+                "source": "https://github.com/phpstan/phpdoc-parser/tree/2.3.2"
             },
-            "time": "2026-01-12T11:33:04+00:00"
+            "time": "2026-01-25T14:56:51+00:00"
         },
         {
             "name": "phpstan/phpstan",
@@ -12814,12 +12814,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.6.0"
+    "platform-dev": {},
+    "plugin-api-version": "2.9.0"
 }
diff --git a/database/migrations/2023_05_25_112701_create_event_bookmakers_table.php b/database/migrations/2023_05_25_112701_create_event_bookmakers_table.php
index be05653d..c357f0f2 100644
--- a/database/migrations/2023_05_25_112701_create_event_bookmakers_table.php
+++ b/database/migrations/2023_05_25_112701_create_event_bookmakers_table.php
@@ -20,20 +20,26 @@ return new class extends Migration
             $table->boolean('in_feed')->default(0);
             $table->boolean('send_status')->default(0);
             $table->boolean('has_to_qualify')->index()->default(0);
-            $table->integer('bkm_2w')->nullable()->default(0);
-            $table->integer('bkm_2ws1')->nullable()->default(0);
-            $table->integer('bkm_3w')->nullable()->default(0);
-            $table->integer('bkm_3wht')->nullable()->default(0);
-            $table->integer('bkm_dc')->nullable()->default(0);
-            $table->integer('bkm_dbn')->nullable()->default(0);
-            $table->integer('bkm_ggng')->nullable()->default(0);
-            $table->integer('bkm_po')->nullable()->default(0);
-            $table->integer('bkm_poht')->nullable()->default(0);
-            $table->integer('bkm_poq1')->nullable()->default(0);
-            $table->integer('bkm_to')->nullable()->default(0);
-            $table->integer('bkm_toht')->nullable()->default(0);
-            $table->integer('bkm_toq1')->nullable()->default(0);
-            $table->integer('bkm_tq')->nullable()->default(0);
+            /**
+             * favorit client is lower then favorit from method
+             * 0.01
+             * 0.3
+             * 0.5
+             */
+            $table->integer('alarm_2w')->nullable()->default(0);
+            $table->integer('alarm_2ws1')->nullable()->default(0);
+            $table->integer('alarm_3w')->nullable()->default(0);
+            $table->integer('alarm_3wht')->nullable()->default(0);
+            $table->integer('alarm_dc')->nullable()->default(0);
+            $table->integer('alarm_dbn')->nullable()->default(0);
+            $table->integer('alarm_ggng')->nullable()->default(0);
+            $table->integer('alarm_po')->nullable()->default(0);
+            $table->integer('alarm_poht')->nullable()->default(0);
+            $table->integer('alarm_poq1')->nullable()->default(0);
+            $table->integer('alarm_to')->nullable()->default(0);
+            $table->integer('alarm_toht')->nullable()->default(0);
+            $table->integer('alarm_toq1')->nullable()->default(0);
+            $table->integer('alarm_tq')->nullable()->default(0);
 
             $table->timestamps();
         });
diff --git a/resources/views/components/alarm-gray.blade.php b/resources/views/components/alarm-gray.blade.php
new file mode 100644
index 00000000..3c6d95d0
--- /dev/null
+++ b/resources/views/components/alarm-gray.blade.php
@@ -0,0 +1,4 @@
+<div
+    class="text-gray-600 dark:text-gray-500 border border-gray-300 dark:border-gray-700 bg-gray-50 dark:bg-gray-100/10 rounded">
+    {{ $slot }}
+</div>
diff --git a/resources/views/components/alarm-green.blade.php b/resources/views/components/alarm-green.blade.php
new file mode 100644
index 00000000..5f07f1de
--- /dev/null
+++ b/resources/views/components/alarm-green.blade.php
@@ -0,0 +1,4 @@
+<div
+    class="text-green-600 dark:text-green-500 border border-green-300 dark:border-green-700 bg-green-50 dark:bg-green-100/10 rounded">
+    {{ $slot }}
+</div>
diff --git a/resources/views/components/alarm-red.blade.php b/resources/views/components/alarm-red.blade.php
new file mode 100644
index 00000000..b90e1f3d
--- /dev/null
+++ b/resources/views/components/alarm-red.blade.php
@@ -0,0 +1,4 @@
+<div
+    class="text-red-600 dark:text-red-500 border border-red-300 dark:border-red-700 bg-red-50 dark:bg-red-100/10 rounded">
+    {{ $slot }}
+</div>
diff --git a/resources/views/components/alarm-yellow.blade.php b/resources/views/components/alarm-yellow.blade.php
new file mode 100644
index 00000000..3497c98c
--- /dev/null
+++ b/resources/views/components/alarm-yellow.blade.php
@@ -0,0 +1,4 @@
+<div
+    class="text-amber-600 dark:text-yellow-500 border border-amber-500 dark:border-yellow-700 bg-amber-50 dark:bg-yellow-100/10 rounded">
+    {{ $slot }}
+</div>
diff --git a/resources/views/filament/tables/columns/column-odds.blade.php b/resources/views/filament/tables/columns/column-odds.blade.php
index 9cdf8315..5fb66982 100644
--- a/resources/views/filament/tables/columns/column-odds.blade.php
+++ b/resources/views/filament/tables/columns/column-odds.blade.php
@@ -12,10 +12,11 @@
     @endphp
 
     @if ($getColumns() == 2)
-        <div {{ $getExtraAttributeBag() }} class="grid grid-cols-4 gap-1 mb-1" style="font-size: 10.5px; text-align:center; width:200px;">
+        <div {{ $getExtraAttributeBag() }} class="grid grid-cols-4 gap-1 mb-1"
+            style="font-size: 10.5px; text-align:center; width:200px;">
         @else
             <div {{ $getExtraAttributeBag() }} class="grid grid-cols-5 gap-1 mb-1"
-                style="font-size: 10.5px; text-align:center; width:250px;">
+                style="font-size: 10.5px; text-align:center; width:270px;">
     @endif
 
 
@@ -26,9 +27,17 @@
     @include('filament.tables.columns.multiline.multiline-compare')
 
     @if (auth()->user()->is_multiline_direct)
-        @include('filament.tables.columns.multiline.multilines-all', ['multilines' => $data,  'client' => $client, 'slots' => $getSlots()])
+        @include('filament.tables.columns.multiline.multilines-all', [
+            'multilines' => $data,
+            'client' => $client,
+            'slots' => $getSlots(),
+        ])
     @else
-        @include('filament.tables.columns.multiline.multilines-slots', ['multilines' => $data,  'client' => $client, 'slots' => $getSlots()])
+        @include('filament.tables.columns.multiline.multilines-slots', [
+            'multilines' => $data,
+            'client' => $client,
+            'slots' => $getSlots(),
+        ])
     @endif
-    
+
 @endif
diff --git a/resources/views/filament/tables/columns/multiline/multiline-client.blade.php b/resources/views/filament/tables/columns/multiline/multiline-client.blade.php
index 2952dbb2..b35eedd3 100644
--- a/resources/views/filament/tables/columns/multiline/multiline-client.blade.php
+++ b/resources/views/filament/tables/columns/multiline/multiline-client.blade.php
@@ -2,7 +2,7 @@
     $client = $getClient();
 @endphp
 
-@if($getState() && $client)
+@if ($getState() && $client)
     @include('filament.tables.columns.multiline.bkm', [
         'bookmaker_id' => $client->bookmaker_id,
         'icon' => auth()->user()->bookmaker->icon ?? '',
@@ -16,10 +16,12 @@
         @case ('odds_2ways_s1')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->h2w,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->a2w,
+                'alarm' => 0,
                 'd' => 2,
             ])
         @break;
@@ -28,50 +30,58 @@
         @case ('odds_3ways_ht')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->h3w,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->d3w,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->a3w,
+                'alarm' => 0,
                 'd' => 2,
             ])
         @break;
         @case ('odds_dc')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->dc1x,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->dc12,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->dcx2,
+                'alarm' => 0,
                 'd' => 2,
             ])
         @break;
         @case ('odds_dnb')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->dnb1,
-                
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->dnb2,
+                'alarm' => 0,
                 'd' => 2,
             ])
         @break;
         @case ('odds_ggng')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->gg,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->ng,
-                
+                'alarm' => 0,
                 'd' => 2,
             ])
         @break;
@@ -82,14 +92,17 @@
         @case ('odds_points_q1')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->home,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->away,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->handicap,
+                'alarm' => 0,
                 'd' => 1,
             ])
         @break;
@@ -100,14 +113,17 @@
         @case ('odds_totals_q1')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->over,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->under,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $client->total,
+                'alarm' => 0,
                 'd' => 1,
             ])
         @break;
@@ -116,19 +132,19 @@
 
     @include('filament.tables.columns.multiline.odd-compare', [
         'odd' => $client->margin,
-        
+        'alarm' => 0,
         'd' => 1,
     ])
 @else
-    {{-- @include('filament.tables.columns.multiline.bkm', [
+    @include('filament.tables.columns.multiline.bkm', [
         'bookmaker_id' => auth()->user()->bookmaker_id,
         'icon' => auth()->user()->bookmaker->icon ?? '',
-    ]) --}}
-    <div>&nbsp;</div>
+    ])
+    {{-- <div>&nbsp;</div> --}}
     <div></div>
     <div></div>
     <div></div>
     @if ($getColumns() == 3)
-    <div></div>
+        <div></div>
     @endif
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/filament/tables/columns/multiline/multiline-compare.blade.php b/resources/views/filament/tables/columns/multiline/multiline-compare.blade.php
index 23319d17..19bd3ecd 100644
--- a/resources/views/filament/tables/columns/multiline/multiline-compare.blade.php
+++ b/resources/views/filament/tables/columns/multiline/multiline-compare.blade.php
@@ -2,7 +2,7 @@
     $compare = $getCompare();
 @endphp
 
-@if($getState() && $compare)
+@if ($getState() && $compare)
     @include('filament.tables.columns.multiline.bkm', [
         'bookmaker_id' => $compare->bookmaker_id,
         'icon' => $compare->bookmaker->icon ?? '',
@@ -16,10 +16,12 @@
         @case ('odds_2ways_s1')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->h2w,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->a2w,
+                'alarm' => 0,
                 'd' => 2,
             ])
         @break;
@@ -28,35 +30,41 @@
         @case ('odds_3ways_ht')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->h3w,
+                'alarm' => 1,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->d3w,
+                'alarm' => 2,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->a3w,
+                'alarm' => 0,
                 'd' => 2,
             ])
         @break;
         @case ('odds_dc')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->dc1x,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->dc12,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->dcx2,
+                'alarm' => 0,
                 'd' => 2,
             ])
         @break;
         @case ('odds_dnb')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->dnb1,
-                
+            
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
@@ -67,11 +75,12 @@
         @case ('odds_ggng')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->gg,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->ng,
-                
+                'alarm' => 0,
                 'd' => 2,
             ])
         @break;
@@ -82,14 +91,17 @@
         @case ('odds_points_q1')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->home,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->away,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->handicap,
+                'alarm' => 0,
                 'd' => 1,
             ])
         @break;
@@ -100,14 +112,17 @@
         @case ('odds_totals_q1')
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->over,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->under,
+                'alarm' => 0,
                 'd' => 2,
             ])
             @include('filament.tables.columns.multiline.odd-compare', [
                 'odd' => $compare->total,
+                'alarm' => 0,
                 'd' => 1,
             ])
         @break;
@@ -116,7 +131,7 @@
 
     @include('filament.tables.columns.multiline.odd-compare', [
         'odd' => $compare->margin,
-        
+        'alarm' => 0,
         'd' => 1,
     ])
-@endif
\ No newline at end of file
+@endif
diff --git a/resources/views/filament/tables/columns/multiline/odd-compare.blade.php b/resources/views/filament/tables/columns/multiline/odd-compare.blade.php
index 0ec87215..25507eb4 100644
--- a/resources/views/filament/tables/columns/multiline/odd-compare.blade.php
+++ b/resources/views/filament/tables/columns/multiline/odd-compare.blade.php
@@ -1,3 +1,24 @@
-<div class="px-1 text-blue-500 dark:text-blue-600">
-    {{ number_format($odd, $d) }}
-</div>
\ No newline at end of file
+@switch($alarm)
+    @case(1)
+        <x-alarm-red>
+            {{ number_format($odd, $d) }}
+        </x-alarm-red>
+    @break
+
+    @case(2)
+        <x-alarm-yellow>
+            {{ number_format($odd, $d) }}
+        </x-alarm-yellow>
+    @break
+
+    @case(3)
+        <x-alarm-green>
+            {{ number_format($odd, $d) }}
+        </x-alarm-green>
+    @break
+
+    @default
+        <x-alarm-gray>
+            {{ number_format($odd, $d) }}
+        </x-alarm-gray>
+@endswitch